Index: Source/WebCore/page/Frame.h |
diff --git a/Source/WebCore/page/Frame.h b/Source/WebCore/page/Frame.h |
index 04fc71751d7cacfa534d1cd76a92800471ddd55e..613a89c891cae116ee1218abc6023b48042754ca 100644 |
--- a/Source/WebCore/page/Frame.h |
+++ b/Source/WebCore/page/Frame.h |
@@ -29,25 +29,36 @@ |
#define Frame_h |
#include "AdjustViewSizeOrNot.h" |
-#include "AnimationController.h" |
#include "DragImage.h" |
-#include "Editor.h" |
-#include "EventHandler.h" |
#include "FrameLoader.h" |
-#include "FrameSelection.h" |
#include "FrameTree.h" |
+#include "IntRect.h" |
#include "NavigationScheduler.h" |
+#include "ScrollTypes.h" |
+#include <wtf/RefCounted.h> |
namespace WebCore { |
+ class AnimationController; |
+ class Color; |
class Document; |
+ class Editor; |
+ class Element; |
+ class EventHandler; |
class FrameDestructionObserver; |
+ class FrameSelection; |
class FrameView; |
class HTMLTableCellElement; |
+ class IntRect; |
+ class Node; |
class RegularExpression; |
class RenderPart; |
+ class RenderView; |
class TreeScope; |
class ScriptController; |
+ class Settings; |
+ class TreeScope; |
+ class VisiblePosition; |
enum { |
LayerTreeFlagsIncludeDebugInfo = 1 << 0, |
@@ -178,11 +189,10 @@ namespace WebCore { |
RefPtr<Document> m_doc; |
OwnPtr<ScriptController> m_script; |
- |
- mutable Editor m_editor; |
- mutable FrameSelection m_selection; |
- mutable EventHandler m_eventHandler; |
- mutable AnimationController m_animationController; |
+ OwnPtr<Editor> m_editor; |
+ OwnPtr<FrameSelection> m_selection; |
+ OwnPtr<EventHandler> m_eventHandler; |
+ OwnPtr<AnimationController> m_animationController; |
float m_pageZoomFactor; |
float m_textZoomFactor; |
@@ -226,17 +236,17 @@ namespace WebCore { |
inline FrameSelection* Frame::selection() const |
{ |
- return &m_selection; |
+ return m_selection.get(); |
} |
inline Editor* Frame::editor() const |
{ |
- return &m_editor; |
+ return m_editor.get(); |
} |
inline AnimationController* Frame::animation() const |
{ |
- return &m_animationController; |
+ return m_animationController.get(); |
eseidel
2013/04/17 06:18:47
This is the only one I could imaging being at all
|
} |
inline HTMLFrameOwnerElement* Frame::ownerElement() const |
@@ -271,7 +281,7 @@ namespace WebCore { |
inline EventHandler* Frame::eventHandler() const |
{ |
- return &m_eventHandler; |
+ return m_eventHandler.get(); |
} |
} // namespace WebCore |