Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(258)

Side by Side Diff: third_party/WebKit/Source/web/WebFrame.cpp

Issue 2009453002: service worker: Don't control a subframe of an insecure context (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: refactor errorMessage Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "public/web/WebFrame.h" 5 #include "public/web/WebFrame.h"
6 6
7 #include "bindings/core/v8/WindowProxyManager.h" 7 #include "bindings/core/v8/WindowProxyManager.h"
8 #include "core/frame/FrameHost.h" 8 #include "core/frame/FrameHost.h"
9 #include "core/frame/FrameView.h" 9 #include "core/frame/FrameView.h"
10 #include "core/frame/LocalFrame.h" 10 #include "core/frame/LocalFrame.h"
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 278
279 WebFrame* WebFrame::fromFrameOwnerElement(const WebElement& webElement) 279 WebFrame* WebFrame::fromFrameOwnerElement(const WebElement& webElement)
280 { 280 {
281 Element* element = webElement; 281 Element* element = webElement;
282 282
283 if (!element->isFrameOwnerElement()) 283 if (!element->isFrameOwnerElement())
284 return nullptr; 284 return nullptr;
285 return fromFrame(toHTMLFrameOwnerElement(element)->contentFrame()); 285 return fromFrame(toHTMLFrameOwnerElement(element)->contentFrame());
286 } 286 }
287 287
288 bool WebFrame::canHaveSecureChild() const
289 {
290 Frame* frame = toImplBase()->frame();
291 if (!frame)
292 return false;
293 return frame->canHaveSecureChild();
294 }
295
288 bool WebFrame::isLoading() const 296 bool WebFrame::isLoading() const
289 { 297 {
290 if (Frame* frame = toImplBase()->frame()) 298 if (Frame* frame = toImplBase()->frame())
291 return frame->isLoading(); 299 return frame->isLoading();
292 return false; 300 return false;
293 } 301 }
294 302
295 WebFrame* WebFrame::fromFrame(Frame* frame) 303 WebFrame* WebFrame::fromFrame(Frame* frame)
296 { 304 {
297 if (!frame) 305 if (!frame)
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 void WebFrame::traceFrame(VisitorDispatcher visitor, WebFrame* frame) { trac eFrameImpl(visitor, frame); } \ 372 void WebFrame::traceFrame(VisitorDispatcher visitor, WebFrame* frame) { trac eFrameImpl(visitor, frame); } \
365 void WebFrame::traceFrames(VisitorDispatcher visitor, WebFrame* frame) { tra ceFramesImpl(visitor, frame); } \ 373 void WebFrame::traceFrames(VisitorDispatcher visitor, WebFrame* frame) { tra ceFramesImpl(visitor, frame); } \
366 void WebFrame::clearWeakFrames(VisitorDispatcher visitor) { clearWeakFramesI mpl(visitor); } 374 void WebFrame::clearWeakFrames(VisitorDispatcher visitor) { clearWeakFramesI mpl(visitor); }
367 375
368 DEFINE_VISITOR_METHOD(Visitor*) 376 DEFINE_VISITOR_METHOD(Visitor*)
369 DEFINE_VISITOR_METHOD(InlinedGlobalMarkingVisitor) 377 DEFINE_VISITOR_METHOD(InlinedGlobalMarkingVisitor)
370 378
371 #undef DEFINE_VISITOR_METHOD 379 #undef DEFINE_VISITOR_METHOD
372 380
373 } // namespace blink 381 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/Frame.cpp ('k') | third_party/WebKit/Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698