Remove more #includes from Frame.h
authorweinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 16 Apr 2013 21:54:22 +0000 (21:54 +0000)
committerweinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 16 Apr 2013 21:54:22 +0000 (21:54 +0000)
https://bugs.webkit.org/show_bug.cgi?id=114642

Reviewed by Anders Carlsson.

Source/WebCore:

Convert Editor, FrameSelection, EventHandler and AnimationController into
OwnPtrs, to avoid inclusion.

* accessibility/AXObjectCache.cpp:
* accessibility/AccessibilityObject.cpp:
* accessibility/atk/WebKitAccessibleInterfaceEditableText.cpp:
* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
* bindings/objc/DOM.mm:
* dom/CharacterData.cpp:
* dom/ContainerNode.cpp:
* dom/Element.cpp:
* editing/AlternativeTextController.cpp:
* editing/CompositeEditCommand.cpp:
* editing/DeleteButtonController.h:
* editing/EditingStyle.cpp:
* editing/InsertLineBreakCommand.cpp:
* editing/SpellChecker.cpp:
* editing/SpellingCorrectionCommand.cpp:
* editing/TextInsertionBaseCommand.cpp:
* history/CachedFrame.cpp:
* html/HTMLAnchorElement.cpp:
* html/HTMLInputElement.cpp:
* html/HTMLPlugInElement.cpp:
* html/HTMLSelectElement.cpp:
* html/HTMLTextAreaElement.cpp:
* html/HTMLTextFormControlElement.cpp:
* html/TextFieldInputType.cpp:
* html/shadow/ClearButtonElement.cpp:
* html/shadow/MediaControlElements.cpp:
* html/shadow/SliderThumbElement.cpp:
* inspector/InspectorPageAgent.h:
* loader/FrameLoader.cpp:
* page/DOMWindow.cpp:
* page/Frame.cpp:
* page/Frame.h:
* page/FrameView.cpp:
* page/FrameView.h:
* page/Page.cpp:
* page/TouchAdjustment.cpp:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
* platform/gtk/PasteboardGtk.cpp:
* platform/qt/ClipboardQt.cpp:
* rendering/HitTestResult.cpp:
* rendering/RenderBlock.cpp:
* rendering/RenderEmbeddedObject.cpp:
* rendering/RenderLayer.cpp:
* rendering/RenderNamedFlowThread.cpp:
* rendering/RenderObject.cpp:
* rendering/RenderSnapshottedPlugIn.cpp:
* svg/graphics/SVGImage.cpp:
* testing/Internals.cpp:

Source/WebKit/mac:

* WebView/WebFrame.mm:
* WebView/WebHTMLRepresentation.mm:
* WebView/WebView.mm:

Source/WebKit/qt:

* WebCoreSupport/DragClientQt.cpp:
* WebCoreSupport/FrameLoaderClientQt.cpp:
* WebCoreSupport/QWebFrameAdapter.cpp:
* WebCoreSupport/QWebPageAdapter.cpp:

Source/WebKit2:

* WebProcess/InjectedBundle/InjectedBundleNavigationAction.cpp:
* WebProcess/Plugins/PluginView.cpp:
* WebProcess/WebPage/WebFrame.cpp:
* WebProcess/WebPage/gtk/WebPageGtk.cpp:
* WebProcess/WebPage/mac/WebPageMac.mm:
* WebProcess/WebPage/qt/WebPageQt.cpp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@148545 268f45cc-cd09-0410-ab3c-d52691b4dbfc

67 files changed:
Source/WebCore/ChangeLog
Source/WebCore/accessibility/AXObjectCache.cpp
Source/WebCore/accessibility/AccessibilityObject.cpp
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceEditableText.cpp
Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm
Source/WebCore/bindings/objc/DOM.mm
Source/WebCore/dom/CharacterData.cpp
Source/WebCore/dom/ContainerNode.cpp
Source/WebCore/dom/Element.cpp
Source/WebCore/editing/AlternativeTextController.cpp
Source/WebCore/editing/CompositeEditCommand.cpp
Source/WebCore/editing/DeleteButtonController.h
Source/WebCore/editing/EditingStyle.cpp
Source/WebCore/editing/InsertLineBreakCommand.cpp
Source/WebCore/editing/SpellChecker.cpp
Source/WebCore/editing/SpellingCorrectionCommand.cpp
Source/WebCore/editing/TextInsertionBaseCommand.cpp
Source/WebCore/history/CachedFrame.cpp
Source/WebCore/html/HTMLAnchorElement.cpp
Source/WebCore/html/HTMLInputElement.cpp
Source/WebCore/html/HTMLPlugInElement.cpp
Source/WebCore/html/HTMLSelectElement.cpp
Source/WebCore/html/HTMLTextAreaElement.cpp
Source/WebCore/html/HTMLTextFormControlElement.cpp
Source/WebCore/html/TextFieldInputType.cpp
Source/WebCore/html/shadow/ClearButtonElement.cpp
Source/WebCore/html/shadow/MediaControlElements.cpp
Source/WebCore/html/shadow/SliderThumbElement.cpp
Source/WebCore/inspector/InspectorPageAgent.h
Source/WebCore/loader/FrameLoader.cpp
Source/WebCore/page/DOMWindow.cpp
Source/WebCore/page/Frame.cpp
Source/WebCore/page/Frame.h
Source/WebCore/page/FrameView.cpp
Source/WebCore/page/FrameView.h
Source/WebCore/page/Page.cpp
Source/WebCore/page/TouchAdjustment.cpp
Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h
Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
Source/WebCore/platform/gtk/PasteboardGtk.cpp
Source/WebCore/platform/qt/ClipboardQt.cpp
Source/WebCore/rendering/HitTestResult.cpp
Source/WebCore/rendering/RenderBlock.cpp
Source/WebCore/rendering/RenderEmbeddedObject.cpp
Source/WebCore/rendering/RenderLayer.cpp
Source/WebCore/rendering/RenderNamedFlowThread.cpp
Source/WebCore/rendering/RenderObject.cpp
Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp
Source/WebCore/svg/graphics/SVGImage.cpp
Source/WebCore/testing/Internals.cpp
Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/WebView/WebFrame.mm
Source/WebKit/mac/WebView/WebHTMLRepresentation.mm
Source/WebKit/mac/WebView/WebView.mm
Source/WebKit/qt/ChangeLog
Source/WebKit/qt/WebCoreSupport/DragClientQt.cpp
Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp
Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp
Source/WebKit2/ChangeLog
Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleNavigationAction.cpp
Source/WebKit2/WebProcess/Plugins/PluginView.cpp
Source/WebKit2/WebProcess/WebPage/WebFrame.cpp
Source/WebKit2/WebProcess/WebPage/gtk/WebPageGtk.cpp
Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm
Source/WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp

index 8909293..cbedb26 100644 (file)
@@ -1,3 +1,63 @@
+2013-04-15  Sam Weinig  <sam@webkit.org>
+
+        Remove more #includes from Frame.h
+        https://bugs.webkit.org/show_bug.cgi?id=114642
+
+        Reviewed by Anders Carlsson.
+
+        Convert Editor, FrameSelection, EventHandler and AnimationController into
+        OwnPtrs, to avoid inclusion.
+
+        * accessibility/AXObjectCache.cpp:
+        * accessibility/AccessibilityObject.cpp:
+        * accessibility/atk/WebKitAccessibleInterfaceEditableText.cpp:
+        * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+        * bindings/objc/DOM.mm:
+        * dom/CharacterData.cpp:
+        * dom/ContainerNode.cpp:
+        * dom/Element.cpp:
+        * editing/AlternativeTextController.cpp:
+        * editing/CompositeEditCommand.cpp:
+        * editing/DeleteButtonController.h:
+        * editing/EditingStyle.cpp:
+        * editing/InsertLineBreakCommand.cpp:
+        * editing/SpellChecker.cpp:
+        * editing/SpellingCorrectionCommand.cpp:
+        * editing/TextInsertionBaseCommand.cpp:
+        * history/CachedFrame.cpp:
+        * html/HTMLAnchorElement.cpp:
+        * html/HTMLInputElement.cpp:
+        * html/HTMLPlugInElement.cpp:
+        * html/HTMLSelectElement.cpp:
+        * html/HTMLTextAreaElement.cpp:
+        * html/HTMLTextFormControlElement.cpp:
+        * html/TextFieldInputType.cpp:
+        * html/shadow/ClearButtonElement.cpp:
+        * html/shadow/MediaControlElements.cpp:
+        * html/shadow/SliderThumbElement.cpp:
+        * inspector/InspectorPageAgent.h:
+        * loader/FrameLoader.cpp:
+        * page/DOMWindow.cpp:
+        * page/Frame.cpp:
+        * page/Frame.h:
+        * page/FrameView.cpp:
+        * page/FrameView.h:
+        * page/Page.cpp:
+        * page/TouchAdjustment.cpp:
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+        * platform/gtk/PasteboardGtk.cpp:
+        * platform/qt/ClipboardQt.cpp:
+        * rendering/HitTestResult.cpp:
+        * rendering/RenderBlock.cpp:
+        * rendering/RenderEmbeddedObject.cpp:
+        * rendering/RenderLayer.cpp:
+        * rendering/RenderNamedFlowThread.cpp:
+        * rendering/RenderObject.cpp:
+        * rendering/RenderSnapshottedPlugIn.cpp:
+        * svg/graphics/SVGImage.cpp:
+        * testing/Internals.cpp:
+
 2013-04-16  Jessie Berlin  <jberlin@apple.com>
 
         Speculative Windows build fix.
index 4d1efe8..e7eef3f 100644 (file)
@@ -56,6 +56,7 @@
 #include "AccessibilityTableHeaderContainer.h"
 #include "AccessibilityTableRow.h"
 #include "Document.h"
+#include "Editor.h"
 #include "FocusController.h"
 #include "Frame.h"
 #include "HTMLAreaElement.h"
@@ -63,9 +64,6 @@
 #include "HTMLInputElement.h"
 #include "HTMLLabelElement.h"
 #include "HTMLNames.h"
-#if ENABLE(VIDEO)
-#include "MediaControlElements.h"
-#endif
 #include "Page.h"
 #include "RenderListBox.h"
 #include "RenderMenuList.h"
 #include "RenderTableRow.h"
 #include "RenderView.h"
 #include "ScrollView.h"
-
 #include <wtf/PassRefPtr.h>
 
+#if ENABLE(VIDEO)
+#include "MediaControlElements.h"
+#endif
+
 namespace WebCore {
 
 using namespace HTMLNames;
index 7f3040a..c320075 100644 (file)
@@ -32,6 +32,7 @@
 #include "AXObjectCache.h"
 #include "AccessibilityRenderObject.h"
 #include "AccessibilityTable.h"
+#include "Editor.h"
 #include "FloatRect.h"
 #include "FocusController.h"
 #include "Frame.h"
index 71aa2bc..b31453d 100644 (file)
@@ -35,6 +35,7 @@
 
 #include "AccessibilityObject.h"
 #include "Document.h"
+#include "Editor.h"
 #include "Frame.h"
 #include "NotImplemented.h"
 #include "WebKitAccessibleWrapperAtk.h"
index 3dc37a8..2b069c8 100644 (file)
@@ -46,6 +46,7 @@
 #import "ChromeClient.h"
 #import "ColorMac.h"
 #import "ContextMenuController.h"
+#import "Editor.h"
 #import "Font.h"
 #import "Frame.h"
 #import "FrameLoaderClient.h"
index fbe3ce0..7145883 100644 (file)
@@ -46,6 +46,7 @@
 #import "Image.h"
 #import "JSNode.h"
 #import "NodeFilter.h"
+#import "Range.h"
 #import "RenderImage.h"
 #import "ScriptController.h"
 #import "WebScriptObjectPrivate.h"
index 2b74906..aecb0c1 100644 (file)
@@ -25,6 +25,7 @@
 #include "Document.h"
 #include "EventNames.h"
 #include "ExceptionCode.h"
+#include "FrameSelection.h"
 #include "InspectorInstrumentation.h"
 #include "MutationEvent.h"
 #include "MutationObserverInterestGroup.h"
index 49cc857..f6cfffe 100644 (file)
@@ -28,9 +28,7 @@
 #include "Chrome.h"
 #include "ChromeClient.h"
 #include "ContainerNodeAlgorithms.h"
-#if ENABLE(DELETION_UI)
-#include "DeleteButtonController.h"
-#endif
+#include "Editor.h"
 #include "EventNames.h"
 #include "ExceptionCode.h"
 #include "FloatRect.h"
 #include "InlineTextBox.h"
 #include "InsertionPoint.h"
 #include "InspectorInstrumentation.h"
+#include "JSNode.h"
 #include "LoaderStrategy.h"
 #include "MemoryCache.h"
 #include "MutationEvent.h"
 #include "NodeRenderStyle.h"
 #include "NodeTraversal.h"
-#include "ResourceLoadScheduler.h"
 #include "Page.h"
 #include "PlatformStrategies.h"
 #include "RenderBox.h"
 #include "RenderTheme.h"
 #include "RenderWidget.h"
+#include "ResourceLoadScheduler.h"
 #include "RootInlineBox.h"
 #include "TemplateContentDocumentFragment.h"
 #include <wtf/CurrentTime.h>
 #include <wtf/Vector.h>
 
-#include "JSNode.h"
+#if ENABLE(DELETION_UI)
+#include "DeleteButtonController.h"
+#endif
 
 using namespace std;
 
index 0f9feb4..13dbc33 100644 (file)
@@ -44,6 +44,7 @@
 #include "FlowThreadController.h"
 #include "FocusController.h"
 #include "Frame.h"
+#include "FrameSelection.h"
 #include "FrameView.h"
 #include "HTMLCollection.h"
 #include "HTMLDocument.h"
index d7b4dca..d648f6b 100644 (file)
@@ -31,6 +31,7 @@
 #include "Document.h"
 #include "DocumentMarkerController.h"
 #include "EditCommand.h"
+#include "Editor.h"
 #include "EditorClient.h"
 #include "Event.h"
 #include "ExceptionCodePlaceholder.h"
index a5e3a28..e78a75d 100644 (file)
 
 #include "AppendNodeCommand.h"
 #include "ApplyStyleCommand.h"
-#if ENABLE(DELETION_UI)
-#include "DeleteButtonController.h"
-#endif
 #include "DeleteFromTextNodeCommand.h"
 #include "DeleteSelectionCommand.h"
 #include "Document.h"
 #include "DocumentFragment.h"
 #include "DocumentMarkerController.h"
+#include "Editor.h"
 #include "EditorInsertAction.h"
 #include "ExceptionCodePlaceholder.h"
 #include "Frame.h"
 #include "markup.h"
 #include <wtf/unicode/CharacterNames.h>
 
+#if ENABLE(DELETION_UI)
+#include "DeleteButtonController.h"
+#endif
+
 using namespace std;
 
 namespace WebCore {
index 96c4f0c..fa0cb9f 100644 (file)
 #ifndef DeleteButtonController_h
 #define DeleteButtonController_h
 
+#if ENABLE(DELETION_UI)
+
 #include "DeleteButton.h"
+#include "Editor.h"
 #include "Frame.h"
 
 namespace WebCore {
 
-#if ENABLE(DELETION_UI)
-
 class DeleteButton;
 class HTMLElement;
 class RenderObject;
@@ -95,8 +96,8 @@ private:
     RefPtr<Frame> m_frame;
 };
 
-#endif
-
 } // namespace WebCore
 
-#endif
+#endif // ENABLE(DELETION_UI)
+
+#endif // DeleteButtonController_h
index 0b81e04..5e701dd 100644 (file)
@@ -34,6 +34,7 @@
 #include "CSSStyleRule.h"
 #include "CSSValueKeywords.h"
 #include "CSSValueList.h"
+#include "Editor.h"
 #include "Frame.h"
 #include "FrameSelection.h"
 #include "HTMLFontElement.h"
index b8b14a6..41dcc40 100644 (file)
@@ -27,7 +27,9 @@
 #include "InsertLineBreakCommand.h"
 
 #include "Document.h"
+#include "EditingStyle.h"
 #include "Frame.h"
+#include "FrameSelection.h"
 #include "HTMLElement.h"
 #include "HTMLNames.h"
 #include "Range.h"
index a90bebd..67c5b25 100644 (file)
@@ -28,6 +28,7 @@
 
 #include "Document.h"
 #include "DocumentMarkerController.h"
+#include "Editor.h"
 #include "EditorClient.h"
 #include "Frame.h"
 #include "HTMLInputElement.h"
index 114edcc..3599add 100644 (file)
@@ -29,6 +29,7 @@
 #include "AlternativeTextController.h"
 #include "Document.h"
 #include "DocumentFragment.h"
+#include "Editor.h"
 #include "Frame.h"
 #include "SetSelectionCommand.h"
 #include "TextIterator.h"
index 1dcdad8..674fb5c 100644 (file)
@@ -30,6 +30,7 @@
 #include "Document.h"
 #include "Element.h"
 #include "Frame.h"
+#include "FrameSelection.h"
 #include "Node.h"
 
 namespace WebCore {
index 8715cc0..e3c440f 100644 (file)
 #include "config.h"
 #include "CachedPage.h"
 
+#include "AnimationController.h"
 #include "CachedFramePlatformData.h"
 #include "DOMWindow.h"
 #include "Document.h"
 #include "DocumentLoader.h"
-#include "ExceptionCode.h"
+#include "EventHandler.h"
 #include "EventNames.h"
+#include "ExceptionCode.h"
 #include "FocusController.h"
 #include "Frame.h"
 #include "FrameLoader.h"
@@ -44,8 +46,8 @@
 #include "PageTransitionEvent.h"
 #include "ScriptController.h"
 #include "SerializedScriptValue.h"
-#include <wtf/text/CString.h>
 #include <wtf/RefCountedLeakCounter.h>
+#include <wtf/text/CString.h>
 
 #if ENABLE(SVG)
 #include "SVGDocumentExtensions.h"
index 465c4f5..0c6f577 100644 (file)
 
 #include "Attribute.h"
 #include "DNS.h"
+#include "EventHandler.h"
 #include "EventNames.h"
 #include "Frame.h"
 #include "FrameLoader.h"
 #include "FrameLoaderClient.h"
 #include "FrameLoaderTypes.h"
+#include "FrameSelection.h"
 #include "HTMLImageElement.h"
 #include "HTMLNames.h"
 #include "HTMLParserIdioms.h"
 #include "KeyboardEvent.h"
 #include "MouseEvent.h"
 #include "PingLoader.h"
+#include "PlatformMouseEvent.h"
 #include "RenderImage.h"
 #include "ResourceRequest.h"
 #include "SecurityOrigin.h"
index fa86f29..7ef9165 100644 (file)
@@ -35,6 +35,7 @@
 #include "CSSValueKeywords.h"
 #include "DateTimeChooser.h"
 #include "Document.h"
+#include "Editor.h"
 #include "ElementShadow.h"
 #include "EventNames.h"
 #include "ExceptionCode.h"
@@ -43,6 +44,7 @@
 #include "FileList.h"
 #include "FormController.h"
 #include "Frame.h"
+#include "FrameSelection.h"
 #include "FrameView.h"
 #include "HTMLCollection.h"
 #include "HTMLDataListElement.h"
@@ -59,6 +61,7 @@
 #include "LocalizedStrings.h"
 #include "MouseEvent.h"
 #include "PlatformLocale.h"
+#include "PlatformMouseEvent.h"
 #include "RenderTextControlSingleLine.h"
 #include "RenderTheme.h"
 #include "RuntimeEnabledFeatures.h"
index 9f91d93..af6963f 100644 (file)
@@ -29,6 +29,7 @@
 #include "CSSPropertyNames.h"
 #include "Document.h"
 #include "Event.h"
+#include "EventHandler.h"
 #include "Frame.h"
 #include "FrameLoader.h"
 #include "FrameTree.h"
index c2a1bb0..5b8d8d8 100644 (file)
@@ -32,6 +32,7 @@
 #include "Attribute.h"
 #include "Chrome.h"
 #include "ChromeClient.h"
+#include "EventHandler.h"
 #include "EventNames.h"
 #include "ExceptionCodePlaceholder.h"
 #include "FormController.h"
@@ -48,6 +49,7 @@
 #include "NodeRenderingContext.h"
 #include "NodeTraversal.h"
 #include "Page.h"
+#include "PlatformMouseEvent.h"
 #include "RenderListBox.h"
 #include "RenderMenuList.h"
 #include "RenderTheme.h"
index e2626b0..4620a8a 100644 (file)
 #include "BeforeTextInsertedEvent.h"
 #include "CSSValueKeywords.h"
 #include "Document.h"
+#include "Editor.h"
 #include "ElementShadow.h"
 #include "Event.h"
+#include "EventHandler.h"
 #include "EventNames.h"
 #include "ExceptionCode.h"
 #include "ExceptionCodePlaceholder.h"
 #include "FormController.h"
 #include "FormDataList.h"
 #include "Frame.h"
+#include "FrameSelection.h"
 #include "HTMLNames.h"
 #include "LocalizedStrings.h"
 #include "RenderTextControlMultiLine.h"
index cf8ca8a..4c6302d 100644 (file)
@@ -33,6 +33,7 @@
 #include "EventNames.h"
 #include "FeatureObserver.h"
 #include "Frame.h"
+#include "FrameSelection.h"
 #include "HTMLBRElement.h"
 #include "HTMLFormElement.h"
 #include "HTMLInputElement.h"
index 1a7fd07..05dffaf 100644 (file)
 #include "BeforeTextInsertedEvent.h"
 #include "Chrome.h"
 #include "ChromeClient.h"
+#include "Editor.h"
 #include "ElementShadow.h"
 #include "FormDataList.h"
 #include "Frame.h"
+#include "FrameSelection.h"
 #include "HTMLInputElement.h"
 #include "HTMLNames.h"
 #include "KeyboardEvent.h"
index 48d27ea..b91daa8 100644 (file)
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "ClearButtonElement.h"
 
+#include "EventHandler.h"
 #include "Frame.h"
 #include "MouseEvent.h"
 #include "RenderView.h"
index c8c49e2..0c55c19 100644 (file)
@@ -34,6 +34,7 @@
 
 #include "CaptionUserPreferences.h"
 #include "DOMTokenList.h"
+#include "EventHandler.h"
 #include "EventNames.h"
 #include "EventTarget.h"
 #include "ExceptionCodePlaceholder.h"
index 3cb857a..9fbeb5a 100644 (file)
@@ -36,6 +36,7 @@
 #include "CSSValueKeywords.h"
 #include "ElementShadow.h"
 #include "Event.h"
+#include "EventHandler.h"
 #include "Frame.h"
 #include "HTMLInputElement.h"
 #include "HTMLParserIdioms.h"
index 9e23f92..583cd59 100644 (file)
@@ -50,6 +50,7 @@ class DOMWrapperWorld;
 class DocumentLoader;
 class Frame;
 class Frontend;
+class GraphicsContext;
 class InjectedScriptManager;
 class InspectorAgent;
 class InspectorArray;
index 4a939ba..c758baf 100644 (file)
@@ -39,7 +39,6 @@
 #include "ApplicationCacheHost.h"
 #include "BackForwardController.h"
 #include "BeforeUnloadEvent.h"
-#include "MemoryCache.h"
 #include "CachedPage.h"
 #include "CachedResourceLoader.h"
 #include "Chrome.h"
@@ -56,6 +55,7 @@
 #include "EditorClient.h"
 #include "Element.h"
 #include "Event.h"
+#include "EventHandler.h"
 #include "EventNames.h"
 #include "FloatRect.h"
 #include "FormState.h"
@@ -81,6 +81,7 @@
 #include "LoaderStrategy.h"
 #include "Logging.h"
 #include "MIMETypeRegistry.h"
+#include "MemoryCache.h"
 #include "Page.h"
 #include "PageCache.h"
 #include "PageTransitionEvent.h"
index 7eac9fb..79d5823 100644 (file)
 #include "DeviceOrientationController.h"
 #include "Document.h"
 #include "DocumentLoader.h"
+#include "Editor.h"
 #include "Element.h"
 #include "EventException.h"
+#include "EventHandler.h"
 #include "EventListener.h"
 #include "EventNames.h"
 #include "ExceptionCode.h"
index f112c78..a7090bb 100644 (file)
@@ -30,6 +30,7 @@
 #include "config.h"
 #include "Frame.h"
 
+#include "AnimationController.h"
 #include "ApplyStyleCommand.h"
 #include "BackForwardController.h"
 #include "CSSComputedStyleDeclaration.h"
 #include "ChromeClient.h"
 #include "DOMWindow.h"
 #include "DocumentType.h"
+#include "Editor.h"
 #include "EditorClient.h"
 #include "Event.h"
+#include "EventHandler.h"
 #include "EventNames.h"
 #include "FloatQuad.h"
 #include "FocusController.h"
 #include "FrameDestructionObserver.h"
 #include "FrameLoader.h"
 #include "FrameLoaderClient.h"
+#include "FrameSelection.h"
 #include "FrameView.h"
 #include "GraphicsContext.h"
 #include "GraphicsLayer.h"
@@ -152,10 +156,10 @@ inline Frame::Frame(Page* page, HTMLFrameOwnerElement* ownerElement, FrameLoader
     , m_navigationScheduler(this)
     , m_ownerElement(ownerElement)
     , m_script(adoptPtr(new ScriptController(this)))
-    , m_editor(this)
-    , m_selection(this)
-    , m_eventHandler(this)
-    , m_animationController(this)
+    , m_editor(adoptPtr(new Editor(this)))
+    , m_selection(adoptPtr(new FrameSelection(this)))
+    , m_eventHandler(adoptPtr(new EventHandler(this)))
+    , m_animationController(adoptPtr(new AnimationController(this)))
     , m_pageZoomFactor(parentPageZoomFactor(this))
     , m_textZoomFactor(parentTextZoomFactor(this))
 #if ENABLE(ORIENTATION_EVENTS)
@@ -309,7 +313,7 @@ void Frame::setDocument(PassRefPtr<Document> newDoc)
     // Suspend document if this frame was created in suspended state.
     if (m_doc && activeDOMObjectsAndAnimationsSuspended()) {
         m_doc->suspendScriptedAnimationControllerCallbacks();
-        m_animationController.suspendAnimationsForDocument(m_doc.get());
+        m_animationController->suspendAnimationsForDocument(m_doc.get());
         m_doc->suspendActiveDOMObjects(ActiveDOMObject::PageWillBeSuspended);
     }
 }
@@ -914,7 +918,7 @@ void Frame::setPageAndTextZoomFactors(float pageZoomFactor, float textZoomFactor
     if (!document)
         return;
 
-    m_editor.dismissCorrectionPanelAsIgnored();
+    m_editor->dismissCorrectionPanelAsIgnored();
 
 #if ENABLE(SVG)
     // Respect SVGs zoomAndPan="disabled" property in standalone SVG documents.
index a3450bb..44a9920 100644 (file)
 #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 "UserScriptTypes.h"
+#include <wtf/RefCounted.h>
 
 #if PLATFORM(WIN)
 #include "FrameWin.h"
 #include "TiledBackingStoreClient.h"
 #endif
 
-#if PLATFORM(MAC)
-#ifndef __OBJC__
-class NSArray;
-class NSMutableDictionary;
-class NSString;
-#endif
-#endif
-
 #if PLATFORM(WIN)
 typedef struct HBITMAP__* HBITMAP;
 #endif
 
 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 TiledBackingStore;
+    class RenderView;
     class ScriptController;
+    class Settings;
+    class TiledBackingStore;
+    class TreeScope;
+    class VisiblePosition;
 
 #if !USE(TILED_BACKING_STORE)
     class TiledBackingStoreClient { };
 #endif
 
-    class TreeScope;
 
     enum {
         LayerTreeFlagsIncludeDebugInfo = 1 << 0,
@@ -218,11 +220,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;
@@ -287,17 +288,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();
     }
 
     inline HTMLFrameOwnerElement* Frame::ownerElement() const
@@ -332,7 +333,7 @@ namespace WebCore {
 
     inline EventHandler* Frame::eventHandler() const
     {
-        return &m_eventHandler;
+        return m_eventHandler.get();
     }
 
 } // namespace WebCore
index 036b342..5b920e2 100644 (file)
@@ -28,6 +28,7 @@
 #include "FrameView.h"
 
 #include "AXObjectCache.h"
+#include "AnimationController.h"
 #include "BackForwardController.h"
 #include "CachedImage.h"
 #include "CachedResourceLoader.h"
@@ -43,6 +44,7 @@
 #include "FrameActionScheduler.h"
 #include "FrameLoader.h"
 #include "FrameLoaderClient.h"
+#include "FrameSelection.h"
 #include "FrameTree.h"
 #include "GraphicsContext.h"
 #include "HTMLDocument.h"
@@ -63,6 +65,7 @@
 #include "RenderPart.h"
 #include "RenderScrollbar.h"
 #include "RenderScrollbarPart.h"
+#include "RenderStyle.h"
 #include "RenderTheme.h"
 #include "RenderView.h"
 #include "ScrollAnimator.h"
index 1898964..30730a8 100644 (file)
@@ -50,6 +50,7 @@ class RenderEmbeddedObject;
 class RenderLayer;
 class RenderObject;
 class RenderScrollbarPart;
+class RenderStyle;
 
 Pagination::Mode paginationModeForRenderStyle(RenderStyle*);
 
index 3703a39..75a5065 100644 (file)
@@ -21,6 +21,7 @@
 #include "Page.h"
 
 #include "AlternativeTextClient.h"
+#include "AnimationController.h"
 #include "BackForwardController.h"
 #include "BackForwardList.h"
 #include "Chrome.h"
@@ -32,6 +33,7 @@
 #include "DocumentMarkerController.h"
 #include "DocumentStyleSheetCollection.h"
 #include "DragController.h"
+#include "Editor.h"
 #include "EditorClient.h"
 #include "Event.h"
 #include "EventNames.h"
index 26607d4..512c8da 100644 (file)
@@ -22,6 +22,7 @@
 #include "TouchAdjustment.h"
 
 #include "ContainerNode.h"
+#include "Editor.h"
 #include "FloatPoint.h"
 #include "FloatQuad.h"
 #include "FrameView.h"
index c862527..044062e 100644 (file)
 #include "MediaPlayerPrivateAVFoundation.h"
 #include <wtf/HashMap.h>
 
-OBJC_CLASS AVURLAsset;
+OBJC_CLASS AVAssetImageGenerator;
 OBJC_CLASS AVMediaSelectionGroup;
 OBJC_CLASS AVPlayer;
 OBJC_CLASS AVPlayerItem;
 OBJC_CLASS AVPlayerItemLegibleOutput;
 OBJC_CLASS AVPlayerItemVideoOutput;
 OBJC_CLASS AVPlayerLayer;
-OBJC_CLASS AVAssetImageGenerator;
+OBJC_CLASS AVURLAsset;
+OBJC_CLASS NSArray;
 OBJC_CLASS WebCoreAVFMovieObserver;
 
 typedef struct objc_object* id;
index cb31dba..0c702ee 100644 (file)
 
 #import "BlockExceptions.h"
 #import "DataView.h"
+#import "ExceptionCodePlaceholder.h"
 #import "FloatConversion.h"
-#import "FrameView.h"
 #import "FloatConversion.h"
+#import "FrameView.h"
 #import "GraphicsContext.h"
 #import "InbandTextTrackPrivateAVFObjC.h"
 #import "KURL.h"
 #import "WebCoreAVFResourceLoader.h"
 #import "WebCoreSystemInterface.h"
 #import <objc/runtime.h>
-#import <wtf/UnusedParam.h>
-#import <wtf/Uint8Array.h>
+#import <wtf/CurrentTime.h>
 #import <wtf/Uint16Array.h>
 #import <wtf/Uint32Array.h>
-#import <wtf/CurrentTime.h>
+#import <wtf/Uint8Array.h>
+#import <wtf/UnusedParam.h>
 #import <wtf/text/CString.h>
 
 #import <AVFoundation/AVFoundation.h>
index fb1443e..40c5fe6 100644 (file)
@@ -24,6 +24,7 @@
 #include "ClipboardGtk.h"
 #include "DataObjectGtk.h"
 #include "DocumentFragment.h"
+#include "Editor.h"
 #include "Frame.h"
 #include "GOwnPtrGtk.h"
 #include "HTMLNames.h"
index b3e2f1f..1becda3 100644 (file)
@@ -33,6 +33,7 @@
 #include "DataTransferItemListQt.h"
 #include "Document.h"
 #include "DragData.h"
+#include "Editor.h"
 #include "Element.h"
 #include "FileList.h"
 #include "Frame.h"
index 5f477f8..652b18b 100644 (file)
@@ -24,6 +24,7 @@
 
 #include "CachedImage.h"
 #include "DocumentMarkerController.h"
+#include "Editor.h"
 #include "Frame.h"
 #include "FrameSelection.h"
 #include "FrameTree.h"
index 5b3ea03..87b5330 100644 (file)
@@ -27,6 +27,7 @@
 #include "AXObjectCache.h"
 #include "ColumnInfo.h"
 #include "Document.h"
+#include "Editor.h"
 #include "Element.h"
 #include "FloatQuad.h"
 #include "Frame.h"
index e6cd635..7be03df 100644 (file)
 #include "config.h"
 #include "RenderEmbeddedObject.h"
 
+#include "CSSValueKeywords.h"
 #include "Chrome.h"
 #include "ChromeClient.h"
 #include "Cursor.h"
-#include "CSSValueKeywords.h"
+#include "EventHandler.h"
 #include "Font.h"
 #include "FontSelector.h"
 #include "Frame.h"
@@ -46,6 +47,7 @@
 #include "Page.h"
 #include "PaintInfo.h"
 #include "Path.h"
+#include "PlatformMouseEvent.h"
 #include "PluginViewBase.h"
 #include "RenderTheme.h"
 #include "RenderView.h"
index 81252dc..ed0fc6b 100644 (file)
@@ -44,6 +44,7 @@
 #include "config.h"
 #include "RenderLayer.h"
 
+#include "AnimationController.h"
 #include "ColumnInfo.h"
 #include "CSSPropertyNames.h"
 #include "Chrome.h"
index 961b3b4..1ee59a2 100644 (file)
@@ -32,6 +32,7 @@
 #include "InspectorInstrumentation.h"
 #include "NodeTraversal.h"
 #include "Position.h"
+#include "Range.h"
 #include "RenderInline.h"
 #include "RenderRegion.h"
 #include "RenderText.h"
index f68aef2..3660f0a 100644 (file)
 #include "RenderObject.h"
 
 #include "AXObjectCache.h"
+#include "AnimationController.h"
 #include "Chrome.h"
 #include "ContentData.h"
 #include "CursorList.h"
 #include "DashArray.h"
 #include "EditingBoundary.h"
+#include "EventHandler.h"
 #include "FloatQuad.h"
 #include "FlowThreadController.h"
 #include "Frame.h"
+#include "FrameSelection.h"
 #include "FrameView.h"
 #include "GraphicsContext.h"
 #include "HTMLElement.h"
index ef799dc..759830a 100644 (file)
@@ -40,6 +40,7 @@
 #include "Page.h"
 #include "PaintInfo.h"
 #include "Path.h"
+#include "PlatformMouseEvent.h"
 #include "RenderView.h"
 
 namespace WebCore {
index c8aaf73..fa2cd11 100644 (file)
@@ -36,6 +36,7 @@
 #include "ImageObserver.h"
 #include "IntRect.h"
 #include "RenderSVGRoot.h"
+#include "RenderStyle.h"
 #include "SVGDocument.h"
 #include "SVGImageChromeClient.h"
 #include "SVGSVGElement.h"
index c34d3d9..3c7036e 100644 (file)
@@ -27,6 +27,7 @@
 #include "config.h"
 #include "Internals.h"
 
+#include "AnimationController.h"
 #include "BackForwardController.h"
 #include "CachedResourceLoader.h"
 #include "Chrome.h"
@@ -41,6 +42,7 @@
 #include "Document.h"
 #include "DocumentMarker.h"
 #include "DocumentMarkerController.h"
+#include "Editor.h"
 #include "Element.h"
 #include "ElementShadow.h"
 #include "EventHandler.h"
index ce47722..66401b9 100644 (file)
@@ -28,6 +28,7 @@
 #include "Chrome.h"
 #include "Console.h"
 #include "DumpRenderTreeSupportGtk.h"
+#include "Editor.h"
 #include "Element.h"
 #include "FileChooser.h"
 #include "FileIconLoader.h"
@@ -35,6 +36,7 @@
 #include "FloatRect.h"
 #include "FocusController.h"
 #include "FrameLoadRequest.h"
+#include "FrameSelection.h"
 #include "FrameView.h"
 #include "GtkUtilities.h"
 #include "GtkVersioning.h"
index 0101017..6ee9aad 100644 (file)
@@ -1,3 +1,14 @@
+2013-04-15  Sam Weinig  <sam@webkit.org>
+
+        Remove more #includes from Frame.h
+        https://bugs.webkit.org/show_bug.cgi?id=114642
+
+        Reviewed by Anders Carlsson.
+
+        * WebView/WebFrame.mm:
+        * WebView/WebHTMLRepresentation.mm:
+        * WebView/WebView.mm:
+
 2013-04-16  Alexey Proskuryakov  <ap@apple.com>
 
         Remove unused AlternativeTextClient::dismissDictationAlternativeUI
index cdf1d78..9655bdb 100644 (file)
@@ -66,6 +66,7 @@
 #import <WebCore/DocumentFragment.h>
 #import <WebCore/DocumentLoader.h>
 #import <WebCore/DocumentMarkerController.h>
+#import <WebCore/Editor.h>
 #import <WebCore/EventHandler.h>
 #import <WebCore/EventNames.h>
 #import <WebCore/Frame.h>
index ec95afd..7d73394 100644 (file)
@@ -44,6 +44,7 @@
 #import <Foundation/NSURLResponse.h>
 #import <WebCore/Document.h>
 #import <WebCore/DocumentLoader.h>
+#import <WebCore/Editor.h>
 #import <WebCore/Frame.h>
 #import <WebCore/FrameLoader.h>
 #import <WebCore/FrameLoaderClient.h>
index 7f2abb1..05bf837 100644 (file)
 #import <JavaScriptCore/APICast.h>
 #import <JavaScriptCore/JSValueRef.h>
 #import <WebCore/AlternativeTextUIController.h>
+#import <WebCore/AnimationController.h>
 #import <WebCore/ApplicationCacheStorage.h>
 #import <WebCore/BackForwardListImpl.h>
 #import <WebCore/MemoryCache.h>
index ad55ca3..331e333 100644 (file)
@@ -1,3 +1,15 @@
+2013-04-15  Sam Weinig  <sam@webkit.org>
+
+        Remove more #includes from Frame.h
+        https://bugs.webkit.org/show_bug.cgi?id=114642
+
+        Reviewed by Anders Carlsson.
+
+        * WebCoreSupport/DragClientQt.cpp:
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        * WebCoreSupport/QWebFrameAdapter.cpp:
+        * WebCoreSupport/QWebPageAdapter.cpp:
+
 2013-04-11  Allan Sandfeld Jensen  <allan.jensen@digia.com>
 
         [Qt] EventHandler should handle Space and BackSpace 
index 2e0d05e..7489317 100644 (file)
@@ -29,6 +29,7 @@
 #include "ChromeClient.h"
 #include "ClipboardQt.h"
 #include "DragController.h"
+#include "EventHandler.h"
 #include "Frame.h"
 #include "Page.h"
 #include "PlatformMouseEvent.h"
index d18eebd..1648447 100644 (file)
@@ -36,6 +36,7 @@
 #include "CSSComputedStyleDeclaration.h"
 #include "CSSPropertyNames.h"
 #include "DocumentLoader.h"
+#include "EventHandler.h"
 #include "FormState.h"
 #include "FrameLoadRequest.h"
 #include "FrameNetworkingContextQt.h"
@@ -56,6 +57,7 @@
 #include "MouseEvent.h"
 #include "NotImplemented.h"
 #include "Page.h"
+#include "PlatformMouseEvent.h"
 #include "PluginData.h"
 #include "PluginDatabase.h"
 #include "ProgressTracker.h"
index 16ee70c..1e2c9e4 100644 (file)
@@ -25,6 +25,7 @@
 #include "Chrome.h"
 #include "ChromeClientQt.h"
 #include "DocumentLoader.h"
+#include "EventHandler.h"
 #include "FocusController.h"
 #include "Frame.h"
 #include "FrameLoadRequest.h"
index f8cfbae..fa4e4c0 100644 (file)
 #include "DragController.h"
 #include "DragData.h"
 #include "DragSession.h"
+#include "Editor.h"
 #include "EditorClientQt.h"
+#include "EventHandler.h"
 #include "FocusController.h"
 #include "FrameLoadRequest.h"
+#include "FrameSelection.h"
 #include "FrameView.h"
 #if ENABLE(GEOLOCATION)
 #include "GeolocationClientMock.h"
@@ -72,6 +75,7 @@
 #include "PageGroup.h"
 #include "Pasteboard.h"
 #include "PlatformKeyboardEvent.h"
+#include "PlatformMouseEvent.h"
 #include "PlatformTouchEvent.h"
 #include "PlatformWheelEvent.h"
 #include "PluginDatabase.h"
index 01d5e5c..fbdf4d2 100644 (file)
@@ -1,3 +1,17 @@
+2013-04-15  Sam Weinig  <sam@webkit.org>
+
+        Remove more #includes from Frame.h
+        https://bugs.webkit.org/show_bug.cgi?id=114642
+
+        Reviewed by Anders Carlsson.
+
+        * WebProcess/InjectedBundle/InjectedBundleNavigationAction.cpp:
+        * WebProcess/Plugins/PluginView.cpp:
+        * WebProcess/WebPage/WebFrame.cpp:
+        * WebProcess/WebPage/gtk/WebPageGtk.cpp:
+        * WebProcess/WebPage/mac/WebPageMac.mm:
+        * WebProcess/WebPage/qt/WebPageQt.cpp:
+
 2013-04-16  Timothy Hatcher  <timothy@apple.com>
 
         Make resizing the docked Web Inspector stay in sync with the inspected view.
index 29c70df..04ccd21 100644 (file)
@@ -27,6 +27,7 @@
 #include "InjectedBundleNavigationAction.h"
 
 #include "WebFrame.h"
+#include <WebCore/EventHandler.h>
 #include <WebCore/Frame.h>
 #include <WebCore/HTMLFormElement.h>
 #include <WebCore/MouseEvent.h>
index ec4658b..56a15c8 100644 (file)
@@ -40,7 +40,7 @@
 #include <WebCore/Credential.h>
 #include <WebCore/CredentialStorage.h>
 #include <WebCore/DocumentLoader.h>
-#include <WebCore/MouseEvent.h>
+#include <WebCore/EventHandler.h>
 #include <WebCore/FocusController.h>
 #include <WebCore/Frame.h>
 #include <WebCore/FrameLoadRequest.h>
 #include <WebCore/HTMLPlugInElement.h>
 #include <WebCore/HostWindow.h>
 #include <WebCore/MIMETypeRegistry.h>
+#include <WebCore/MouseEvent.h>
 #include <WebCore/NetscapePlugInStreamLoader.h>
 #include <WebCore/NetworkingContext.h>
 #include <WebCore/Page.h>
+#include <WebCore/PlatformMouseEvent.h>
 #include <WebCore/ProtectionSpace.h>
 #include <WebCore/ProxyServer.h>
 #include <WebCore/RenderEmbeddedObject.h>
index c080f7d..9bbd096 100644 (file)
@@ -45,6 +45,7 @@
 #include <WebCore/ArchiveResource.h>
 #include <WebCore/Chrome.h>
 #include <WebCore/DocumentLoader.h>
+#include <WebCore/EventHandler.h>
 #include <WebCore/Frame.h>
 #include <WebCore/FrameView.h>
 #include <WebCore/HTMLFrameOwnerElement.h>
index 8b0db6e..a84654a 100644 (file)
@@ -33,6 +33,7 @@
 #include "WebPageAccessibilityObject.h"
 #include "WebPageProxyMessages.h"
 #include "WindowsKeyboardCodes.h"
+#include <WebCore/EventHandler.h>
 #include <WebCore/FocusController.h>
 #include <WebCore/Frame.h>
 #include <WebCore/KeyboardEvent.h>
index f831620..5a451ec 100644 (file)
@@ -45,6 +45,7 @@
 #import <PDFKit/PDFKit.h>
 #import <QuartzCore/QuartzCore.h>
 #import <WebCore/AXObjectCache.h>
+#import <WebCore/EventHandler.h>
 #import <WebCore/FocusController.h>
 #import <WebCore/Frame.h>
 #import <WebCore/FrameLoader.h>
index b960a71..096ca62 100644 (file)
@@ -36,6 +36,7 @@
 #include "WebProcess.h"
 #include <QClipboard>
 #include <QGuiApplication>
+#include <WebCore/EventHandler.h>
 #include <WebCore/FocusController.h>
 #include <WebCore/Frame.h>
 #include <WebCore/KeyboardEvent.h>