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

Unified Diff: Source/core/page/Page.h

Issue 338993003: Cleanup various WebView/WebFrame APIs to properly handle remote frames. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Remove unneeded header. Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/frame/LocalFrame.cpp ('k') | Source/core/page/Page.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/page/Page.h
diff --git a/Source/core/page/Page.h b/Source/core/page/Page.h
index 07206484f9020bd8f182b763439958b2181bd63b..5c6c27f2f53b3f1e585092d7f1e84c792647135c 100644
--- a/Source/core/page/Page.h
+++ b/Source/core/page/Page.h
@@ -128,14 +128,14 @@ public:
SpellCheckerClient& spellCheckerClient() const { return *m_spellCheckerClient; }
UndoStack& undoStack() const { return *m_undoStack; }
- void setMainFrame(PassRefPtr<Frame>);
- Frame* mainFrame() const { return m_mainFrame.get(); }
+ void setMainFrame(Frame*);
+ Frame* mainFrame() const { return m_mainFrame; }
// Escape hatch for existing code that assumes that the root frame is
// always a LocalFrame. With OOPI, this is not always the case. Code that
// depends on this will generally have to be rewritten to propagate any
// necessary state through all renderer processes for that page and/or
// coordinate/rely on the browser process to help dispatch/coordinate work.
- LocalFrame* deprecatedLocalMainFrame() const { return toLocalFrame(m_mainFrame.get()); }
+ LocalFrame* deprecatedLocalMainFrame() const { return toLocalFrame(m_mainFrame); }
void documentDetached(Document*);
@@ -259,7 +259,7 @@ private:
OwnPtr<ScrollingCoordinator> m_scrollingCoordinator;
const OwnPtrWillBeMember<UndoStack> m_undoStack;
- RefPtr<Frame> m_mainFrame;
+ Frame* m_mainFrame;
eseidel 2014/06/19 16:55:31 So the Page no longer owns its main frame. Someon
mutable RefPtr<PluginData> m_pluginData;
« no previous file with comments | « Source/core/frame/LocalFrame.cpp ('k') | Source/core/page/Page.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698