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

Coding style fixes

Browse source
This commit is contained in:
Cheng Zhao 2018-02-26 15:19:44 +09:00
parent 25f04d5b03
commit ccf30e0934
1 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
atom/renderer/api/atom_api_web_frame.cc
View file

@ -113,7 +113,7 @@ class FrameSpellChecker : public content::RenderFrameVisitor {
} // namespace } // namespace
WebFrame::WebFrame(v8::Isolate* isolate) WebFrame::WebFrame(v8::Isolate* isolate)
: web_frame_(blink::WebLocalFrame::FrameForCurrentContext()) { : web_frame_(blink::WebLocalFrame::FrameForCurrentContext()) {
Init(isolate); Init(isolate);
} }
@ -424,13 +424,12 @@ v8::Local<v8::Value> WebFrame::NextSibling() const {
return v8::Null(isolate()); return v8::Null(isolate());
} }
v8::Local<v8::Value> WebFrame::GetFrameForSelector(const std::string& selector) v8::Local<v8::Value> WebFrame::GetFrameForSelector(
const { const std::string& selector) const {
blink::WebElement element = blink::WebElement element = web_frame_->GetDocument().QuerySelector(
web_frame_->GetDocument() blink::WebString::FromUTF8(selector));
.QuerySelector(blink::WebString::FromUTF8(selector));
blink::WebLocalFrame* element_frame = blink::WebLocalFrame* element_frame =
blink::WebLocalFrame::FromFrameOwnerElement(element); blink::WebLocalFrame::FromFrameOwnerElement(element);
if (element_frame) if (element_frame)
return mate::CreateHandle(isolate(), return mate::CreateHandle(isolate(),
new WebFrame(isolate(), element_frame)).ToV8(); new WebFrame(isolate(), element_frame)).ToV8();
@ -439,10 +438,8 @@ const {
} }
v8::Local<v8::Value> WebFrame::FindFrameByName(const std::string& name) const { v8::Local<v8::Value> WebFrame::FindFrameByName(const std::string& name) const {
blink::WebLocalFrame* local_frame = blink::WebLocalFrame* local_frame = web_frame_->FindFrameByName(
WebFrame::web_frame_ blink::WebString::FromUTF8(name))->ToWebLocalFrame();
->FindFrameByName(blink::WebString::FromUTF8(name))
->ToWebLocalFrame();
if (local_frame) if (local_frame)
return mate::CreateHandle(isolate(), return mate::CreateHandle(isolate(),
new WebFrame(isolate(), local_frame)).ToV8(); new WebFrame(isolate(), local_frame)).ToV8();
@ -490,13 +487,13 @@ void WebFrame::BuildPrototype(
&WebFrame::SetIsolatedWorldHumanReadableName) &WebFrame::SetIsolatedWorldHumanReadableName)
.SetMethod("getResourceUsage", &WebFrame::GetResourceUsage) .SetMethod("getResourceUsage", &WebFrame::GetResourceUsage)
.SetMethod("clearCache", &WebFrame::ClearCache) .SetMethod("clearCache", &WebFrame::ClearCache)
.SetMethod("getFrameForSelector", &WebFrame::GetFrameForSelector)
.SetMethod("findFrameByName", &WebFrame::FindFrameByName)
.SetProperty("opener", &WebFrame::Opener) .SetProperty("opener", &WebFrame::Opener)
.SetProperty("parent", &WebFrame::Parent) .SetProperty("parent", &WebFrame::Parent)
.SetProperty("top", &WebFrame::Top) .SetProperty("top", &WebFrame::Top)
.SetProperty("firstChild", &WebFrame::FirstChild) .SetProperty("firstChild", &WebFrame::FirstChild)
.SetProperty("nextSibling", &WebFrame::NextSibling) .SetProperty("nextSibling", &WebFrame::NextSibling);
.SetMethod("getFrameForSelector", &WebFrame::GetFrameForSelector)
.SetMethod("findFrameByName", &WebFrame::FindFrameByName);
} }
} // namespace api } // namespace api