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

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

Issue 68303004: [oilpan] Move EventHandler to the heap (Closed) Base URL: svn://svn.chromium.org/blink/branches/oilpan
Patch Set: Created 7 years, 1 month 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/page/EventHandler.cpp ('k') | Source/core/page/Frame.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/page/Frame.h
diff --git a/Source/core/page/Frame.h b/Source/core/page/Frame.h
index 66cb7b7875fd9296ec69b7d2ccfd19021a0408bf..d3e9e57e4b31ab79c8171e791f3c05629b6a07bf 100644
--- a/Source/core/page/Frame.h
+++ b/Source/core/page/Frame.h
@@ -97,7 +97,7 @@ namespace WebCore {
FrameView* view() const;
Editor* editor() const;
- EventHandler* eventHandler() const;
+ RESULT(EventHandler) eventHandler() const;
FrameLoader* loader() const;
NavigationScheduler* navigationScheduler() const;
FrameSelection* selection() const;
@@ -187,7 +187,7 @@ namespace WebCore {
OwnPtr<ScriptController> m_script;
OwnPtr<Editor> m_editor;
OwnPtr<FrameSelection> m_selection;
- OwnPtr<EventHandler> m_eventHandler;
+ ANNOTATED_FIELD(Persistent<EventHandler>, m_eventHandler);
OwnPtr<AnimationController> m_animationController;
float m_pageZoomFactor;
@@ -270,9 +270,9 @@ namespace WebCore {
m_page = 0;
}
- inline EventHandler* Frame::eventHandler() const
+ inline RESULT(EventHandler) Frame::eventHandler() const
{
- return m_eventHandler.get();
+ return m_eventHandler;
}
} // namespace WebCore
« no previous file with comments | « Source/core/page/EventHandler.cpp ('k') | Source/core/page/Frame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698