Changeset 148545 in webkit


Ignore:
Timestamp:
Apr 16, 2013 2:54:22 PM (11 years ago)
Author:
weinig@apple.com
Message:

Remove more #includes from Frame.h
​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:
Location:
trunk/Source
Files:
67 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r148542 r148545  
     12013-04-15  Sam Weinig  <sam@webkit.org>
     2
     3        Remove more #includes from Frame.h
     4        https://bugs.webkit.org/show_bug.cgi?id=114642
     5
     6        Reviewed by Anders Carlsson.
     7
     8        Convert Editor, FrameSelection, EventHandler and AnimationController into
     9        OwnPtrs, to avoid inclusion.
     10
     11        * accessibility/AXObjectCache.cpp:
     12        * accessibility/AccessibilityObject.cpp:
     13        * accessibility/atk/WebKitAccessibleInterfaceEditableText.cpp:
     14        * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
     15        * bindings/objc/DOM.mm:
     16        * dom/CharacterData.cpp:
     17        * dom/ContainerNode.cpp:
     18        * dom/Element.cpp:
     19        * editing/AlternativeTextController.cpp:
     20        * editing/CompositeEditCommand.cpp:
     21        * editing/DeleteButtonController.h:
     22        * editing/EditingStyle.cpp:
     23        * editing/InsertLineBreakCommand.cpp:
     24        * editing/SpellChecker.cpp:
     25        * editing/SpellingCorrectionCommand.cpp:
     26        * editing/TextInsertionBaseCommand.cpp:
     27        * history/CachedFrame.cpp:
     28        * html/HTMLAnchorElement.cpp:
     29        * html/HTMLInputElement.cpp:
     30        * html/HTMLPlugInElement.cpp:
     31        * html/HTMLSelectElement.cpp:
     32        * html/HTMLTextAreaElement.cpp:
     33        * html/HTMLTextFormControlElement.cpp:
     34        * html/TextFieldInputType.cpp:
     35        * html/shadow/ClearButtonElement.cpp:
     36        * html/shadow/MediaControlElements.cpp:
     37        * html/shadow/SliderThumbElement.cpp:
     38        * inspector/InspectorPageAgent.h:
     39        * loader/FrameLoader.cpp:
     40        * page/DOMWindow.cpp:
     41        * page/Frame.cpp:
     42        * page/Frame.h:
     43        * page/FrameView.cpp:
     44        * page/FrameView.h:
     45        * page/Page.cpp:
     46        * page/TouchAdjustment.cpp:
     47        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
     48        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
     49        * platform/gtk/PasteboardGtk.cpp:
     50        * platform/qt/ClipboardQt.cpp:
     51        * rendering/HitTestResult.cpp:
     52        * rendering/RenderBlock.cpp:
     53        * rendering/RenderEmbeddedObject.cpp:
     54        * rendering/RenderLayer.cpp:
     55        * rendering/RenderNamedFlowThread.cpp:
     56        * rendering/RenderObject.cpp:
     57        * rendering/RenderSnapshottedPlugIn.cpp:
     58        * svg/graphics/SVGImage.cpp:
     59        * testing/Internals.cpp:
     60
    1612013-04-16  Jessie Berlin  <jberlin@apple.com>
    262

  • trunk/Source/WebCore/accessibility/AXObjectCache.cpp

    r146726 r148545  
    5757#include "AccessibilityTableRow.h"
    5858#include "Document.h"
     59#include "Editor.h"
    5960#include "FocusController.h"
    6061#include "Frame.h"
    … …  
    6465#include "HTMLLabelElement.h"
    6566#include "HTMLNames.h"
    66 #if ENABLE(VIDEO)
    67 #include "MediaControlElements.h"
    68 #endif
    6967#include "Page.h"
    7068#include "RenderListBox.h"
    … …  
    7775#include "RenderView.h"
    7876#include "ScrollView.h"
    79 
    8077#include <wtf/PassRefPtr.h>
     78
     79#if ENABLE(VIDEO)
     80#include "MediaControlElements.h"
     81#endif
    8182
    8283namespace WebCore {

  • trunk/Source/WebCore/accessibility/AccessibilityObject.cpp

    r148522 r148545  
    3333#include "AccessibilityRenderObject.h"
    3434#include "AccessibilityTable.h"
     35#include "Editor.h"
    3536#include "FloatRect.h"
    3637#include "FocusController.h"

  • trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceEditableText.cpp

    r139159 r148545  
    3636#include "AccessibilityObject.h"
    3737#include "Document.h"
     38#include "Editor.h"
    3839#include "Frame.h"
    3940#include "NotImplemented.h"

  • trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm

    r148484 r148545  
    4747#import "ColorMac.h"
    4848#import "ContextMenuController.h"
     49#import "Editor.h"
    4950#import "Font.h"
    5051#import "Frame.h"

  • trunk/Source/WebCore/bindings/objc/DOM.mm

    r148413 r148545  
    4747#import "JSNode.h"
    4848#import "NodeFilter.h"
     49#import "Range.h"
    4950#import "RenderImage.h"
    5051#import "ScriptController.h"

  • trunk/Source/WebCore/dom/CharacterData.cpp

    r141570 r148545  
    2626#include "EventNames.h"
    2727#include "ExceptionCode.h"
     28#include "FrameSelection.h"
    2829#include "InspectorInstrumentation.h"
    2930#include "MutationEvent.h"

  • trunk/Source/WebCore/dom/ContainerNode.cpp

    r148289 r148545  
    2929#include "ChromeClient.h"
    3030#include "ContainerNodeAlgorithms.h"
    31 #if ENABLE(DELETION_UI)
    32 #include "DeleteButtonController.h"
    33 #endif
     31#include "Editor.h"
    3432#include "EventNames.h"
    3533#include "ExceptionCode.h"
    … …  
    4139#include "InsertionPoint.h"
    4240#include "InspectorInstrumentation.h"
     41#include "JSNode.h"
    4342#include "LoaderStrategy.h"
    4443#include "MemoryCache.h"
    … …  
    4645#include "NodeRenderStyle.h"
    4746#include "NodeTraversal.h"
    48 #include "ResourceLoadScheduler.h"
    4947#include "Page.h"
    5048#include "PlatformStrategies.h"
    … …  
    5250#include "RenderTheme.h"
    5351#include "RenderWidget.h"
     52#include "ResourceLoadScheduler.h"
    5453#include "RootInlineBox.h"
    5554#include "TemplateContentDocumentFragment.h"
    … …  
    5756#include <wtf/Vector.h>
    5857
    59 #include "JSNode.h"
     58#if ENABLE(DELETION_UI)
     59#include "DeleteButtonController.h"
     60#endif
    6061
    6162using namespace std;

  • trunk/Source/WebCore/dom/Element.cpp

    r148365 r148545  
    4545#include "FocusController.h"
    4646#include "Frame.h"
     47#include "FrameSelection.h"
    4748#include "FrameView.h"
    4849#include "HTMLCollection.h"

  • trunk/Source/WebCore/editing/AlternativeTextController.cpp

    r144911 r148545  
    3232#include "DocumentMarkerController.h"
    3333#include "EditCommand.h"
     34#include "Editor.h"
    3435#include "EditorClient.h"
    3536#include "Event.h"

  • trunk/Source/WebCore/editing/CompositeEditCommand.cpp

    r148306 r148545  
    2929#include "AppendNodeCommand.h"
    3030#include "ApplyStyleCommand.h"
    31 #if ENABLE(DELETION_UI)
    32 #include "DeleteButtonController.h"
    33 #endif
    3431#include "DeleteFromTextNodeCommand.h"
    3532#include "DeleteSelectionCommand.h"
    … …  
    3734#include "DocumentFragment.h"
    3835#include "DocumentMarkerController.h"
     36#include "Editor.h"
    3937#include "EditorInsertAction.h"
    4038#include "ExceptionCodePlaceholder.h"
    … …  
    7068#include "markup.h"
    7169#include <wtf/unicode/CharacterNames.h>
     70
     71#if ENABLE(DELETION_UI)
     72#include "DeleteButtonController.h"
     73#endif
    7274
    7375using namespace std;

  • trunk/Source/WebCore/editing/DeleteButtonController.h

    r143030 r148545  
    2727#define DeleteButtonController_h
    2828
     29#if ENABLE(DELETION_UI)
     30
    2931#include "DeleteButton.h"
     32#include "Editor.h"
    3033#include "Frame.h"
    3134
    3235namespace WebCore {
    33 
    34 #if ENABLE(DELETION_UI)
    3536
    3637class DeleteButton;
    … …  
    9697};
    9798
    98 #endif
    99 
    10099} // namespace WebCore
    101100
    102 #endif
     101#endif // ENABLE(DELETION_UI)
     102
     103#endif // DeleteButtonController_h

  • trunk/Source/WebCore/editing/EditingStyle.cpp

    r148403 r148545  
    3535#include "CSSValueKeywords.h"
    3636#include "CSSValueList.h"
     37#include "Editor.h"
    3738#include "Frame.h"
    3839#include "FrameSelection.h"

  • trunk/Source/WebCore/editing/InsertLineBreakCommand.cpp

    r144911 r148545  
    2828
    2929#include "Document.h"
     30#include "EditingStyle.h"
    3031#include "Frame.h"
     32#include "FrameSelection.h"
    3133#include "HTMLElement.h"
    3234#include "HTMLNames.h"

  • trunk/Source/WebCore/editing/SpellChecker.cpp

    r143688 r148545  
    2929#include "Document.h"
    3030#include "DocumentMarkerController.h"
     31#include "Editor.h"
    3132#include "EditorClient.h"
    3233#include "Frame.h"

  • trunk/Source/WebCore/editing/SpellingCorrectionCommand.cpp

    r148306 r148545  
    3030#include "Document.h"
    3131#include "DocumentFragment.h"
     32#include "Editor.h"
    3233#include "Frame.h"
    3334#include "SetSelectionCommand.h"

  • trunk/Source/WebCore/editing/TextInsertionBaseCommand.cpp

    r142375 r148545  
    3131#include "Element.h"
    3232#include "Frame.h"
     33#include "FrameSelection.h"
    3334#include "Node.h"
    3435

  • trunk/Source/WebCore/history/CachedFrame.cpp

    r148373 r148545  
    2727#include "CachedPage.h"
    2828
     29#include "AnimationController.h"
    2930#include "CachedFramePlatformData.h"
    3031#include "DOMWindow.h"
    3132#include "Document.h"
    3233#include "DocumentLoader.h"
     34#include "EventHandler.h"
     35#include "EventNames.h"
    3336#include "ExceptionCode.h"
    34 #include "EventNames.h"
    3537#include "FocusController.h"
    3638#include "Frame.h"
    … …  
    4547#include "ScriptController.h"
    4648#include "SerializedScriptValue.h"
     49#include <wtf/RefCountedLeakCounter.h>
    4750#include <wtf/text/CString.h>
    48 #include <wtf/RefCountedLeakCounter.h>
    4951
    5052#if ENABLE(SVG)

  • trunk/Source/WebCore/html/HTMLAnchorElement.cpp

    r146264 r148545  
    2727#include "Attribute.h"
    2828#include "DNS.h"
     29#include "EventHandler.h"
    2930#include "EventNames.h"
    3031#include "Frame.h"
    … …  
    3233#include "FrameLoaderClient.h"
    3334#include "FrameLoaderTypes.h"
     35#include "FrameSelection.h"
    3436#include "HTMLImageElement.h"
    3537#include "HTMLNames.h"
    … …  
    3840#include "MouseEvent.h"
    3941#include "PingLoader.h"
     42#include "PlatformMouseEvent.h"
    4043#include "RenderImage.h"
    4144#include "ResourceRequest.h"

  • trunk/Source/WebCore/html/HTMLInputElement.cpp

    r147135 r148545  
    3636#include "DateTimeChooser.h"
    3737#include "Document.h"
     38#include "Editor.h"
    3839#include "ElementShadow.h"
    3940#include "EventNames.h"
    … …  
    4445#include "FormController.h"
    4546#include "Frame.h"
     47#include "FrameSelection.h"
    4648#include "FrameView.h"
    4749#include "HTMLCollection.h"
    … …  
    6062#include "MouseEvent.h"
    6163#include "PlatformLocale.h"
     64#include "PlatformMouseEvent.h"
    6265#include "RenderTextControlSingleLine.h"
    6366#include "RenderTheme.h"

  • trunk/Source/WebCore/html/HTMLPlugInElement.cpp

    r148373 r148545  
    3030#include "Document.h"
    3131#include "Event.h"
     32#include "EventHandler.h"
    3233#include "Frame.h"
    3334#include "FrameLoader.h"

  • trunk/Source/WebCore/html/HTMLSelectElement.cpp

    r148210 r148545  
    3333#include "Chrome.h"
    3434#include "ChromeClient.h"
     35#include "EventHandler.h"
    3536#include "EventNames.h"
    3637#include "ExceptionCodePlaceholder.h"
    … …  
    4950#include "NodeTraversal.h"
    5051#include "Page.h"
     52#include "PlatformMouseEvent.h"
    5153#include "RenderListBox.h"
    5254#include "RenderMenuList.h"

  • trunk/Source/WebCore/html/HTMLTextAreaElement.cpp

    r146977 r148545  
    3131#include "CSSValueKeywords.h"
    3232#include "Document.h"
     33#include "Editor.h"
    3334#include "ElementShadow.h"
    3435#include "Event.h"
     36#include "EventHandler.h"
    3537#include "EventNames.h"
    3638#include "ExceptionCode.h"
    … …  
    3941#include "FormDataList.h"
    4042#include "Frame.h"
     43#include "FrameSelection.h"
    4144#include "HTMLNames.h"
    4245#include "LocalizedStrings.h"

  • trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp

    r147205 r148545  
    3434#include "FeatureObserver.h"
    3535#include "Frame.h"
     36#include "FrameSelection.h"
    3637#include "HTMLBRElement.h"
    3738#include "HTMLFormElement.h"

  • trunk/Source/WebCore/html/TextFieldInputType.cpp

    r146029 r148545  
    3636#include "Chrome.h"
    3737#include "ChromeClient.h"
     38#include "Editor.h"
    3839#include "ElementShadow.h"
    3940#include "FormDataList.h"
    4041#include "Frame.h"
     42#include "FrameSelection.h"
    4143#include "HTMLInputElement.h"
    4244#include "HTMLNames.h"

  • trunk/Source/WebCore/html/shadow/ClearButtonElement.cpp

    r145055 r148545  
    2727#include "ClearButtonElement.h"
    2828
     29#include "EventHandler.h"
    2930#include "Frame.h"
    3031#include "MouseEvent.h"

  • trunk/Source/WebCore/html/shadow/MediaControlElements.cpp

    r148099 r148545  
    3535#include "CaptionUserPreferences.h"
    3636#include "DOMTokenList.h"
     37#include "EventHandler.h"
    3738#include "EventNames.h"
    3839#include "EventTarget.h"

  • trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp

    r147135 r148545  
    3737#include "ElementShadow.h"
    3838#include "Event.h"
     39#include "EventHandler.h"
    3940#include "Frame.h"
    4041#include "HTMLInputElement.h"

  • trunk/Source/WebCore/inspector/InspectorPageAgent.h

    r147580 r148545  
    5151class Frame;
    5252class Frontend;
     53class GraphicsContext;
    5354class InjectedScriptManager;
    5455class InspectorAgent;

  • trunk/Source/WebCore/loader/FrameLoader.cpp

    r148256 r148545  
    4040#include "BackForwardController.h"
    4141#include "BeforeUnloadEvent.h"
    42 #include "MemoryCache.h"
    4342#include "CachedPage.h"
    4443#include "CachedResourceLoader.h"
    … …  
    5756#include "Element.h"
    5857#include "Event.h"
     58#include "EventHandler.h"
    5959#include "EventNames.h"
    6060#include "FloatRect.h"
    … …  
    8282#include "Logging.h"
    8383#include "MIMETypeRegistry.h"
     84#include "MemoryCache.h"
    8485#include "Page.h"
    8586#include "PageCache.h"

  • trunk/Source/WebCore/page/DOMWindow.cpp

    r148508 r148545  
    5151#include "Document.h"
    5252#include "DocumentLoader.h"
     53#include "Editor.h"
    5354#include "Element.h"
    5455#include "EventException.h"
     56#include "EventHandler.h"
    5557#include "EventListener.h"
    5658#include "EventNames.h"

  • trunk/Source/WebCore/page/Frame.cpp

    r148373 r148545  
    3131#include "Frame.h"
    3232
     33#include "AnimationController.h"
    3334#include "ApplyStyleCommand.h"
    3435#include "BackForwardController.h"
    … …  
    4142#include "DOMWindow.h"
    4243#include "DocumentType.h"
     44#include "Editor.h"
    4345#include "EditorClient.h"
    4446#include "Event.h"
     47#include "EventHandler.h"
    4548#include "EventNames.h"
    4649#include "FloatQuad.h"
    … …  
    4952#include "FrameLoader.h"
    5053#include "FrameLoaderClient.h"
     54#include "FrameSelection.h"
    5155#include "FrameView.h"
    5256#include "GraphicsContext.h"
    … …  
    153157    , m_ownerElement(ownerElement)
    154158    , m_script(adoptPtr(new ScriptController(this)))
    155     , m_editor(this)
    156     , m_selection(this)
    157     , m_eventHandler(this)
    158     , m_animationController(this)
     159    , m_editor(adoptPtr(new Editor(this)))
     160    , m_selection(adoptPtr(new FrameSelection(this)))
     161    , m_eventHandler(adoptPtr(new EventHandler(this)))
     162    , m_animationController(adoptPtr(new AnimationController(this)))
    159163    , m_pageZoomFactor(parentPageZoomFactor(this))
    160164    , m_textZoomFactor(parentTextZoomFactor(this))
    … …  
    310314    if (m_doc && activeDOMObjectsAndAnimationsSuspended()) {
    311315        m_doc->suspendScriptedAnimationControllerCallbacks();
    312         m_animationController.suspendAnimationsForDocument(m_doc.get());
     316        m_animationController->suspendAnimationsForDocument(m_doc.get());
    313317        m_doc->suspendActiveDOMObjects(ActiveDOMObject::PageWillBeSuspended);
    314318    }
    … …  
    915919        return;
    916920
    917     m_editor.dismissCorrectionPanelAsIgnored();
     921    m_editor->dismissCorrectionPanelAsIgnored();
    918922
    919923#if ENABLE(SVG)

  • trunk/Source/WebCore/page/Frame.h

    r148413 r148545  
    3030
    3131#include "AdjustViewSizeOrNot.h"
    32 #include "AnimationController.h"
    3332#include "DragImage.h"
    34 #include "Editor.h"
    35 #include "EventHandler.h"
    3633#include "FrameLoader.h"
    37 #include "FrameSelection.h"
    3834#include "FrameTree.h"
     35#include "IntRect.h"
    3936#include "NavigationScheduler.h"
     37#include "ScrollTypes.h"
    4038#include "UserScriptTypes.h"
     39#include <wtf/RefCounted.h>
    4140
    4241#if PLATFORM(WIN)
    … …  
    4847#endif
    4948
    50 #if PLATFORM(MAC)
    51 #ifndef __OBJC__
    52 class NSArray;
    53 class NSMutableDictionary;
    54 class NSString;
    55 #endif
    56 #endif
    57 
    5849#if PLATFORM(WIN)
    5950typedef struct HBITMAP__* HBITMAP;
    … …  
    6253namespace WebCore {
    6354
     55    class AnimationController;
     56    class Color;
    6457    class Document;
     58    class Editor;
     59    class Element;
     60    class EventHandler;
    6561    class FrameDestructionObserver;
     62    class FrameSelection;
    6663    class FrameView;
    6764    class HTMLTableCellElement;
     65    class IntRect;
     66    class Node;
    6867    class RegularExpression;
    6968    class RenderPart;
     69    class RenderView;
     70    class ScriptController;
     71    class Settings;
    7072    class TiledBackingStore;
    71     class ScriptController;
     73    class TreeScope;
     74    class VisiblePosition;
    7275
    7376#if !USE(TILED_BACKING_STORE)
    … …  
    7578#endif
    7679
    77     class TreeScope;
    7880
    7981    enum {
    … …  
    219221
    220222        OwnPtr<ScriptController> m_script;
    221 
    222         mutable Editor m_editor;
    223         mutable FrameSelection m_selection;
    224         mutable EventHandler m_eventHandler;
    225         mutable AnimationController m_animationController;
     223        OwnPtr<Editor> m_editor;
     224        OwnPtr<FrameSelection> m_selection;
     225        OwnPtr<EventHandler> m_eventHandler;
     226        OwnPtr<AnimationController> m_animationController;
    226227
    227228        float m_pageZoomFactor;
    … …  
    288289    inline FrameSelection* Frame::selection() const
    289290    {
    290         return &m_selection;
     291        return m_selection.get();
    291292    }
    292293
    293294    inline Editor* Frame::editor() const
    294295    {
    295         return &m_editor;
     296        return m_editor.get();
    296297    }
    297298
    298299    inline AnimationController* Frame::animation() const
    299300    {
    300         return &m_animationController;
     301        return m_animationController.get();
    301302    }
    302303
    … …  
    333334    inline EventHandler* Frame::eventHandler() const
    334335    {
    335         return &m_eventHandler;
     336        return m_eventHandler.get();
    336337    }
    337338

  • trunk/Source/WebCore/page/FrameView.cpp

    r148482 r148545  
    2929
    3030#include "AXObjectCache.h"
     31#include "AnimationController.h"
    3132#include "BackForwardController.h"
    3233#include "CachedImage.h"
    … …  
    4445#include "FrameLoader.h"
    4546#include "FrameLoaderClient.h"
     47#include "FrameSelection.h"
    4648#include "FrameTree.h"
    4749#include "GraphicsContext.h"
    … …  
    6466#include "RenderScrollbar.h"
    6567#include "RenderScrollbarPart.h"
     68#include "RenderStyle.h"
    6669#include "RenderTheme.h"
    6770#include "RenderView.h"

  • trunk/Source/WebCore/page/FrameView.h

    r148432 r148545  
    5151class RenderObject;
    5252class RenderScrollbarPart;
     53class RenderStyle;
    5354
    5455Pagination::Mode paginationModeForRenderStyle(RenderStyle*);

  • trunk/Source/WebCore/page/Page.cpp

    r148373 r148545  
    2222
    2323#include "AlternativeTextClient.h"
     24#include "AnimationController.h"
    2425#include "BackForwardController.h"
    2526#include "BackForwardList.h"
    … …  
    3334#include "DocumentStyleSheetCollection.h"
    3435#include "DragController.h"
     36#include "Editor.h"
    3537#include "EditorClient.h"
    3638#include "Event.h"

  • trunk/Source/WebCore/page/TouchAdjustment.cpp

    r145745 r148545  
    2323
    2424#include "ContainerNode.h"
     25#include "Editor.h"
    2526#include "FloatPoint.h"
    2627#include "FloatQuad.h"

  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h

    r148291 r148545  
    3232#include <wtf/HashMap.h>
    3333
    34 OBJC_CLASS AVURLAsset;
     34OBJC_CLASS AVAssetImageGenerator;
    3535OBJC_CLASS AVMediaSelectionGroup;
    3636OBJC_CLASS AVPlayer;
    … …  
    3939OBJC_CLASS AVPlayerItemVideoOutput;
    4040OBJC_CLASS AVPlayerLayer;
    41 OBJC_CLASS AVAssetImageGenerator;
     41OBJC_CLASS AVURLAsset;
     42OBJC_CLASS NSArray;
    4243OBJC_CLASS WebCoreAVFMovieObserver;
    4344

  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm

    r148373 r148545  
    3232#import "BlockExceptions.h"
    3333#import "DataView.h"
     34#import "ExceptionCodePlaceholder.h"
     35#import "FloatConversion.h"
    3436#import "FloatConversion.h"
    3537#import "FrameView.h"
    36 #import "FloatConversion.h"
    3738#import "GraphicsContext.h"
    3839#import "InbandTextTrackPrivateAVFObjC.h"
    … …  
    4647#import "WebCoreSystemInterface.h"
    4748#import <objc/runtime.h>
    48 #import <wtf/UnusedParam.h>
    49 #import <wtf/Uint8Array.h>
     49#import <wtf/CurrentTime.h>
    5050#import <wtf/Uint16Array.h>
    5151#import <wtf/Uint32Array.h>
    52 #import <wtf/CurrentTime.h>
     52#import <wtf/Uint8Array.h>
     53#import <wtf/UnusedParam.h>
    5354#import <wtf/text/CString.h>
    5455

  • trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp

    r146835 r148545  
    2525#include "DataObjectGtk.h"
    2626#include "DocumentFragment.h"
     27#include "Editor.h"
    2728#include "Frame.h"
    2829#include "GOwnPtrGtk.h"

  • trunk/Source/WebCore/platform/qt/ClipboardQt.cpp

    r146910 r148545  
    3434#include "Document.h"
    3535#include "DragData.h"
     36#include "Editor.h"
    3637#include "Element.h"
    3738#include "FileList.h"

  • trunk/Source/WebCore/rendering/HitTestResult.cpp

    r147739 r148545  
    2525#include "CachedImage.h"
    2626#include "DocumentMarkerController.h"
     27#include "Editor.h"
    2728#include "Frame.h"
    2829#include "FrameSelection.h"

  • trunk/Source/WebCore/rendering/RenderBlock.cpp

    r148536 r148545  
    2828#include "ColumnInfo.h"
    2929#include "Document.h"
     30#include "Editor.h"
    3031#include "Element.h"
    3132#include "FloatQuad.h"

  • trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp

    r148487 r148545  
    2525#include "RenderEmbeddedObject.h"
    2626
     27#include "CSSValueKeywords.h"
    2728#include "Chrome.h"
    2829#include "ChromeClient.h"
    2930#include "Cursor.h"
    30 #include "CSSValueKeywords.h"
     31#include "EventHandler.h"
    3132#include "Font.h"
    3233#include "FontSelector.h"
    … …  
    4748#include "PaintInfo.h"
    4849#include "Path.h"
     50#include "PlatformMouseEvent.h"
    4951#include "PluginViewBase.h"
    5052#include "RenderTheme.h"

  • trunk/Source/WebCore/rendering/RenderLayer.cpp

    r148518 r148545  
    4545#include "RenderLayer.h"
    4646
     47#include "AnimationController.h"
    4748#include "ColumnInfo.h"
    4849#include "CSSPropertyNames.h"

  • trunk/Source/WebCore/rendering/RenderNamedFlowThread.cpp

    r147414 r148545  
    3333#include "NodeTraversal.h"
    3434#include "Position.h"
     35#include "Range.h"
    3536#include "RenderInline.h"
    3637#include "RenderRegion.h"

  • trunk/Source/WebCore/rendering/RenderObject.cpp

    r148536 r148545  
    2929
    3030#include "AXObjectCache.h"
     31#include "AnimationController.h"
    3132#include "Chrome.h"
    3233#include "ContentData.h"
    … …  
    3435#include "DashArray.h"
    3536#include "EditingBoundary.h"
     37#include "EventHandler.h"
    3638#include "FloatQuad.h"
    3739#include "FlowThreadController.h"
    3840#include "Frame.h"
     41#include "FrameSelection.h"
    3942#include "FrameView.h"
    4043#include "GraphicsContext.h"

  • trunk/Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp

    r148175 r148545  
    4141#include "PaintInfo.h"
    4242#include "Path.h"
     43#include "PlatformMouseEvent.h"
    4344#include "RenderView.h"
    4445

  • trunk/Source/WebCore/svg/graphics/SVGImage.cpp

    r147643 r148545  
    3737#include "IntRect.h"
    3838#include "RenderSVGRoot.h"
     39#include "RenderStyle.h"
    3940#include "SVGDocument.h"
    4041#include "SVGImageChromeClient.h"

  • trunk/Source/WebCore/testing/Internals.cpp

    r148288 r148545  
    2828#include "Internals.h"
    2929
     30#include "AnimationController.h"
    3031#include "BackForwardController.h"
    3132#include "CachedResourceLoader.h"
    … …  
    4243#include "DocumentMarker.h"
    4344#include "DocumentMarkerController.h"
     45#include "Editor.h"
    4446#include "Element.h"
    4547#include "ElementShadow.h"

  • trunk/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp

    r148536 r148545  
    2929#include "Console.h"
    3030#include "DumpRenderTreeSupportGtk.h"
     31#include "Editor.h"
    3132#include "Element.h"
    3233#include "FileChooser.h"
    … …  
    3637#include "FocusController.h"
    3738#include "FrameLoadRequest.h"
     39#include "FrameSelection.h"
    3840#include "FrameView.h"
    3941#include "GtkUtilities.h"

  • trunk/Source/WebKit/mac/ChangeLog

    r148531 r148545  
     12013-04-15  Sam Weinig  <sam@webkit.org>
     2
     3        Remove more #includes from Frame.h
     4        https://bugs.webkit.org/show_bug.cgi?id=114642
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * WebView/WebFrame.mm:
     9        * WebView/WebHTMLRepresentation.mm:
     10        * WebView/WebView.mm:
     11
    1122013-04-16  Alexey Proskuryakov  <ap@apple.com>
    213

  • trunk/Source/WebKit/mac/WebView/WebFrame.mm

    r148396 r148545  
    6767#import <WebCore/DocumentLoader.h>
    6868#import <WebCore/DocumentMarkerController.h>
     69#import <WebCore/Editor.h>
    6970#import <WebCore/EventHandler.h>
    7071#import <WebCore/EventNames.h>

  • trunk/Source/WebKit/mac/WebView/WebHTMLRepresentation.mm

    r145818 r148545  
    4545#import <WebCore/Document.h>
    4646#import <WebCore/DocumentLoader.h>
     47#import <WebCore/Editor.h>
    4748#import <WebCore/Frame.h>
    4849#import <WebCore/FrameLoader.h>

  • trunk/Source/WebKit/mac/WebView/WebView.mm

    r148531 r148545  
    113113#import <JavaScriptCore/JSValueRef.h>
    114114#import <WebCore/AlternativeTextUIController.h>
     115#import <WebCore/AnimationController.h>
    115116#import <WebCore/ApplicationCacheStorage.h>
    116117#import <WebCore/BackForwardListImpl.h>

  • trunk/Source/WebKit/qt/ChangeLog

    r148195 r148545  
     12013-04-15  Sam Weinig  <sam@webkit.org>
     2
     3        Remove more #includes from Frame.h
     4        https://bugs.webkit.org/show_bug.cgi?id=114642
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * WebCoreSupport/DragClientQt.cpp:
     9        * WebCoreSupport/FrameLoaderClientQt.cpp:
     10        * WebCoreSupport/QWebFrameAdapter.cpp:
     11        * WebCoreSupport/QWebPageAdapter.cpp:
     12
    1132013-04-11  Allan Sandfeld Jensen  <allan.jensen@digia.com>
    214

  • trunk/Source/WebKit/qt/WebCoreSupport/DragClientQt.cpp

    r135515 r148545  
    3030#include "ClipboardQt.h"
    3131#include "DragController.h"
     32#include "EventHandler.h"
    3233#include "Frame.h"
    3334#include "Page.h"

  • trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp

    r148119 r148545  
    3737#include "CSSPropertyNames.h"
    3838#include "DocumentLoader.h"
     39#include "EventHandler.h"
    3940#include "FormState.h"
    4041#include "FrameLoadRequest.h"
    … …  
    5758#include "NotImplemented.h"
    5859#include "Page.h"
     60#include "PlatformMouseEvent.h"
    5961#include "PluginData.h"
    6062#include "PluginDatabase.h"

  • trunk/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp

    r148373 r148545  
    2626#include "ChromeClientQt.h"
    2727#include "DocumentLoader.h"
     28#include "EventHandler.h"
    2829#include "FocusController.h"
    2930#include "Frame.h"

  • trunk/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp

    r148195 r148545  
    4545#include "DragData.h"
    4646#include "DragSession.h"
     47#include "Editor.h"
    4748#include "EditorClientQt.h"
     49#include "EventHandler.h"
    4850#include "FocusController.h"
    4951#include "FrameLoadRequest.h"
     52#include "FrameSelection.h"
    5053#include "FrameView.h"
    5154#if ENABLE(GEOLOCATION)
    … …  
    7376#include "Pasteboard.h"
    7477#include "PlatformKeyboardEvent.h"
     78#include "PlatformMouseEvent.h"
    7579#include "PlatformTouchEvent.h"
    7680#include "PlatformWheelEvent.h"

  • trunk/Source/WebKit2/ChangeLog

    r148538 r148545  
     12013-04-15  Sam Weinig  <sam@webkit.org>
     2
     3        Remove more #includes from Frame.h
     4        https://bugs.webkit.org/show_bug.cgi?id=114642
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * WebProcess/InjectedBundle/InjectedBundleNavigationAction.cpp:
     9        * WebProcess/Plugins/PluginView.cpp:
     10        * WebProcess/WebPage/WebFrame.cpp:
     11        * WebProcess/WebPage/gtk/WebPageGtk.cpp:
     12        * WebProcess/WebPage/mac/WebPageMac.mm:
     13        * WebProcess/WebPage/qt/WebPageQt.cpp:
     14
    1152013-04-16  Timothy Hatcher  <timothy@apple.com>
    216

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleNavigationAction.cpp

    r142977 r148545  
    2828
    2929#include "WebFrame.h"
     30#include <WebCore/EventHandler.h>
    3031#include <WebCore/Frame.h>
    3132#include <WebCore/HTMLFormElement.h>

  • trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp

    r148482 r148545  
    4141#include <WebCore/CredentialStorage.h>
    4242#include <WebCore/DocumentLoader.h>
    43 #include <WebCore/MouseEvent.h>
     43#include <WebCore/EventHandler.h>
    4444#include <WebCore/FocusController.h>
    4545#include <WebCore/Frame.h>
    … …  
    5252#include <WebCore/HostWindow.h>
    5353#include <WebCore/MIMETypeRegistry.h>
     54#include <WebCore/MouseEvent.h>
    5455#include <WebCore/NetscapePlugInStreamLoader.h>
    5556#include <WebCore/NetworkingContext.h>
    5657#include <WebCore/Page.h>
     58#include <WebCore/PlatformMouseEvent.h>
    5759#include <WebCore/ProtectionSpace.h>
    5860#include <WebCore/ProxyServer.h>

  • trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp

    r148373 r148545  
    4646#include <WebCore/Chrome.h>
    4747#include <WebCore/DocumentLoader.h>
     48#include <WebCore/EventHandler.h>
    4849#include <WebCore/Frame.h>
    4950#include <WebCore/FrameView.h>

  • trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPageGtk.cpp

    r130493 r148545  
    3434#include "WebPageProxyMessages.h"
    3535#include "WindowsKeyboardCodes.h"
     36#include <WebCore/EventHandler.h>
    3637#include <WebCore/FocusController.h>
    3738#include <WebCore/Frame.h>

  • trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm

    r148249 r148545  
    4646#import <QuartzCore/QuartzCore.h>
    4747#import <WebCore/AXObjectCache.h>
     48#import <WebCore/EventHandler.h>
    4849#import <WebCore/FocusController.h>
    4950#import <WebCore/Frame.h>

  • trunk/Source/WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp

    r148195 r148545  
    3737#include <QClipboard>
    3838#include <QGuiApplication>
     39#include <WebCore/EventHandler.h>
    3940#include <WebCore/FocusController.h>
    4041#include <WebCore/Frame.h>
Note: See TracChangeset for help on using the changeset viewer.