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

Unified Diff: Source/core/frame/Frame.cpp

Issue 235553006: Move Document pointer from Frame to LocalFrame. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 8 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/frame/Frame.cpp
diff --git a/Source/core/frame/Frame.cpp b/Source/core/frame/Frame.cpp
index 5db5b22af87f32b74411bec46cb794b59cbc5c38..3a04fd8abc4d67bfa6be13d5e2509a86c1f3adc1 100644
--- a/Source/core/frame/Frame.cpp
+++ b/Source/core/frame/Frame.cpp
@@ -46,7 +46,6 @@
#include "core/page/FocusController.h"
#include "core/page/Page.h"
#include "core/rendering/RenderPart.h"
-#include "core/rendering/RenderView.h"
#include "public/platform/WebLayer.h"
#include "wtf/PassOwnPtr.h"
#include "wtf/RefCountedLeakCounter.h"
@@ -152,16 +151,6 @@ ChromeClient& Frame::chromeClient() const
return emptyChromeClient();
}
-Document* Frame::document() const
-{
- return m_domWindow ? m_domWindow->document() : 0;
-}
-
-RenderView* Frame::contentRenderer() const
-{
- return document() ? document()->renderView() : 0;
-}
-
RenderPart* Frame::ownerRenderer() const
{
if (!ownerElement())
@@ -205,11 +194,7 @@ bool Frame::isMainFrame() const
void Frame::disconnectOwnerElement()
{
- // FIXME: The semantics here are specific to LocalFrame and will need to change
- // when RemoteFrames no longer have Documents.
if (ownerElement()) {
- if (Document* doc = document())
- doc->topDocument().clearAXObjectCache();
ownerElement()->clearContentFrame();
if (page())
page()->decrementSubframeCount();

Powered by Google App Engine
This is Rietveld 408576698