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

Unified Diff: Source/core/dom/Document.cpp

Issue 189573002: Convert HTMLFrameOwnerElement and FocusController to use Frame. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Improved downcast checking. Created 6 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: Source/core/dom/Document.cpp
diff --git a/Source/core/dom/Document.cpp b/Source/core/dom/Document.cpp
index ff699d8b21e0cb702e42b06a18cc5bcce3318583..9b5b99042532a54e4da2725f2641498bd1d36814 100644
--- a/Source/core/dom/Document.cpp
+++ b/Source/core/dom/Document.cpp
@@ -995,7 +995,8 @@ PassRefPtr<Node> Document::adoptNode(PassRefPtr<Node> source, ExceptionState& ex
if (source->isFrameOwnerElement()) {
HTMLFrameOwnerElement* frameOwnerElement = toHTMLFrameOwnerElement(source.get());
- if (frame() && frame()->tree().isDescendantOf(frameOwnerElement->contentFrame())) {
+ // FIXME(kenrb): the toLocalFrame() cast should be removed when the FrameTree supports RemoteFrames.
+ if (frame() && frame()->tree().isDescendantOf(toLocalFrame(frameOwnerElement->contentFrame()))) {
exceptionState.throwDOMException(HierarchyRequestError, "The node provided is a frame which contains this document.");
return nullptr;
}
@@ -5448,9 +5449,9 @@ bool Document::hasFocus() const
Page* page = this->page();
if (!page)
return false;
- if (!page->focusController().isActive() || !page->focusController().isFocused())
+ if (!page->focusController().isActive() || !page->focusController().isFocused() || !page->focusController().focusedFrame()->isLocalFrame())
return false;
- if (LocalFrame* focusedFrame = page->focusController().focusedFrame()) {
+ if (LocalFrame* focusedFrame = toLocalFrame(page->focusController().focusedFrame())) {
if (focusedFrame->tree().isDescendantOf(frame()))
return true;
}

Powered by Google App Engine
This is Rietveld 408576698