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

Fix compiler warning when building with gcc

Browse source
This commit is contained in:
Cheng Zhao 2017-11-21 21:47:51 +09:00
parent b2fdfa2710
commit 4f9c5310a9
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/api/atom_api_browser_view.cc
View file

@ -114,7 +114,7 @@ void BrowserView::SetBackgroundColor(const std::string& color_name) {
view_->SetBackgroundColor(ParseHexColor(color_name)); view_->SetBackgroundColor(ParseHexColor(color_name));
} }
v8::Local<v8::Value> BrowserView::WebContents() { v8::Local<v8::Value> BrowserView::GetWebContents() {
if (web_contents_.IsEmpty()) { if (web_contents_.IsEmpty()) {
return v8::Null(isolate()); return v8::Null(isolate());
} }
@ -131,7 +131,7 @@ void BrowserView::BuildPrototype(v8::Isolate* isolate,
.SetMethod("setAutoResize", &BrowserView::SetAutoResize) .SetMethod("setAutoResize", &BrowserView::SetAutoResize)
.SetMethod("setBounds", &BrowserView::SetBounds) .SetMethod("setBounds", &BrowserView::SetBounds)
.SetMethod("setBackgroundColor", &BrowserView::SetBackgroundColor) .SetMethod("setBackgroundColor", &BrowserView::SetBackgroundColor)
.SetProperty("webContents", &BrowserView::WebContents) .SetProperty("webContents", &BrowserView::GetWebContents)
.SetProperty("id", &BrowserView::ID); .SetProperty("id", &BrowserView::ID);
} }

2
atom/browser/api/atom_api_browser_view.h
View file

@ -56,7 +56,7 @@ class BrowserView : public mate::TrackableObject<BrowserView> {
void SetBounds(const gfx::Rect& bounds); void SetBounds(const gfx::Rect& bounds);
void SetBackgroundColor(const std::string& color_name); void SetBackgroundColor(const std::string& color_name);
v8::Local<v8::Value> WebContents(); v8::Local<v8::Value> GetWebContents();
v8::Global<v8::Value> web_contents_; v8::Global<v8::Value> web_contents_;
class WebContents* api_web_contents_; class WebContents* api_web_contents_;