mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #1918 from kirkouimet/master

Browse source 
Fixing an issue compiling on Windows and improving webview interopability with other JavaScript libraries
This commit is contained in:
Cheng Zhao 2015-06-10 12:48:45 +08:00
commit d12697c657
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
atom/common/crash_reporter/crash_reporter.cc
View file

@ -46,7 +46,8 @@ std::vector<CrashReporter::UploadReportResult>
CrashReporter::GetUploadedReports(const std::string& path) {
std::string file_content;
std::vector<CrashReporter::UploadReportResult> result;
if (base::ReadFileToString(base::FilePath(path), &file_content)) {
if (base::ReadFileToString(base::FilePath::FromUTF8Unsafe(path),
&file_content)) {
std::vector<std::string> reports;
base::SplitString(file_content, '\n', &reports);
for (const std::string& report : reports) {

2
atom/renderer/lib/web-view/web-view.coffee
View file

@ -173,7 +173,7 @@ class WebViewImpl
params =
instanceId: @viewInstanceId
userAgentOverride: @userAgentOverride
for attributeName, attribute of @attributes
for own attributeName, attribute of @attributes
params[attributeName] = attribute.getValue()
# When the WebView is not participating in layout (display:none)
# then getBoundingClientRect() would report a width and height of 0.