Changeset 86451 in webkit


Ignore:
Timestamp:
May 13, 2011 12:09:09 PM (13 years ago)
Author:
weinig@apple.com
Message:

2011-05-13 Sam Weinig <​sam@webkit.org>

Reviewed by Anders Carlsson.

Prune #includes from FrameView.h (Part 2)
​https://bugs.webkit.org/show_bug.cgi?id=60748

  • Update files that were depending on FrameView.h #including Frame.h or Page.h.
  • src/AutoFillPopupMenuClient.cpp:
  • src/PlatformBridge.cpp:
  • src/WebPopupMenuImpl.cpp:

2011-05-13 Sam Weinig <​sam@webkit.org>

Reviewed by Anders Carlsson.

Prune #includes from FrameView.h (Part 2)
​https://bugs.webkit.org/show_bug.cgi?id=60748

  • Update files that were depending on FrameView.h #including Frame.h or Page.h.
  • Api/qgraphicswebview.cpp:
  • WebCoreSupport/ChromeClientQt.cpp:

2011-05-13 Sam Weinig <​sam@webkit.org>

Reviewed by Anders Carlsson.

Prune #includes from FrameView.h (Part 2)
​https://bugs.webkit.org/show_bug.cgi?id=60748

  • Update files that were depending on FrameView.h #including Frame.h or Page.h.
  • WebCoreSupport/GtkAdjustmentWatcher.cpp:

2011-05-13 Sam Weinig <​sam@webkit.org>

Reviewed by Anders Carlsson.

Prune #includes from FrameView.h (Part 2)
​https://bugs.webkit.org/show_bug.cgi?id=60748

  • Update files that were depending on FrameView.h #including Frame.h or Page.h.
  • WebCoreSupport/WebChromeClient.cpp:
  • WebCoreSupport/WebDragClient.cpp:
  • WebCoreSupport/WebFrameLoaderClient.cpp:
  • WebFrame.cpp: (WebFrame::setPrinting):
  • WebView.cpp:

2011-05-13 Sam Weinig <​sam@webkit.org>

Reviewed by Anders Carlsson.

Prune #includes from FrameView.h (Part 2)
​https://bugs.webkit.org/show_bug.cgi?id=60748

  • Update files that were depending on FrameView.h #including Frame.h or Page.h.
  • WebView/WebClipView.mm:
  • WebView/WebHTMLView.mm: (-[WebHTMLView layoutToMinimumPageWidth:height:maximumPageWidth:adjustingViewSize:]):

2011-05-13 Sam Weinig <​sam@webkit.org>

Reviewed by Anders Carlsson.

Prune #includes from FrameView.h (Part 2)
​https://bugs.webkit.org/show_bug.cgi?id=60748

  • Replace #includes in FrameView.h of Frame.h and Page.h with Color.h, wtf/text/WTFString.h, and the new AdjustViewSizeOrNot.h
  • Update files that were depending on FrameView.h #including Frame.h or Page.h.
  • GNUmakefile.list.am:
  • WebCore.exp.in:
  • WebCore.pro:
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.xcodeproj/project.pbxproj:
  • accessibility/AccessibilityRenderObject.cpp:
  • accessibility/AccessibilityScrollView.cpp:
  • accessibility/chromium/AXObjectCacheChromium.cpp:
  • accessibility/mac/AccessibilityObjectWrapper.mm:
  • css/MediaQueryMatcher.cpp:
  • dom/Range.cpp:
  • editing/SpellingCorrectionController.cpp:
  • history/CachedFrame.cpp:
  • html/HTMLBodyElement.cpp:
  • html/canvas/WebGLRenderingContext.cpp:
  • html/parser/HTMLParserScheduler.cpp:
  • page/AdjustViewSizeOrNot.h: Added.
  • page/EditorClient.h:
  • page/Frame.h:
  • page/FrameView.cpp: (WebCore::FrameView::forceLayoutForPagination):
  • page/FrameView.h:
  • page/PrintContext.cpp: (WebCore::PrintContext::begin): (WebCore::PrintContext::end):
  • page/chromium/FrameChromium.cpp:
  • page/win/FrameCGWin.cpp:
  • page/win/FrameWin.cpp:
  • platform/efl/PopupMenuEfl.cpp:
  • platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
  • platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
  • platform/graphics/qt/MediaPlayerPrivateQt.cpp:
  • platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp:
  • platform/graphics/win/MediaPlayerPrivateQuickTimeWin.cpp:
  • platform/gtk/WidgetGtk.cpp:
  • plugins/IFrameShimSupport.cpp:
  • rendering/RenderBlock.cpp:
  • rendering/RenderBoxModelObject.cpp:
  • rendering/RenderFrameBase.cpp:
  • rendering/RenderIFrame.cpp:
  • rendering/RenderMenuList.cpp:
  • rendering/RenderTextControlSingleLine.cpp:
  • rendering/RenderWidget.cpp:
  • svg/SVGSVGElement.cpp:

2011-05-13 Sam Weinig <​sam@webkit.org>

Reviewed by Anders Carlsson.

Prune #includes from FrameView.h (Part 2)
​https://bugs.webkit.org/show_bug.cgi?id=60748

  • Update files that were depending on FrameView.h #including Frame.h or Page.h.
  • WebProcess/Plugins/PluginView.cpp:
  • WebProcess/WebCoreSupport/mac/WebDragClientMac.mm:
  • WebProcess/WebPage/WebContextMenu.cpp:
  • WebProcess/WebPage/mac/AccessibilityWebPageObject.mm:
Location:
trunk/Source
Files:
1 added
64 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r86449 r86451  
     12011-05-13  Sam Weinig  <sam@webkit.org>
     2
     3        Reviewed by Anders Carlsson.
     4
     5        Prune #includes from FrameView.h (Part 2)
     6        https://bugs.webkit.org/show_bug.cgi?id=60748
     7
     8        - Replace #includes in FrameView.h of Frame.h and Page.h
     9          with Color.h, wtf/text/WTFString.h, and the new AdjustViewSizeOrNot.h
     10
     11        - Update files that were depending on FrameView.h #including Frame.h or
     12          Page.h.
     13
     14        * GNUmakefile.list.am:
     15        * WebCore.exp.in:
     16        * WebCore.pro:
     17        * WebCore.vcproj/WebCore.vcproj:
     18        * WebCore.xcodeproj/project.pbxproj:
     19        * accessibility/AccessibilityRenderObject.cpp:
     20        * accessibility/AccessibilityScrollView.cpp:
     21        * accessibility/chromium/AXObjectCacheChromium.cpp:
     22        * accessibility/mac/AccessibilityObjectWrapper.mm:
     23        * css/MediaQueryMatcher.cpp:
     24        * dom/Range.cpp:
     25        * editing/SpellingCorrectionController.cpp:
     26        * history/CachedFrame.cpp:
     27        * html/HTMLBodyElement.cpp:
     28        * html/canvas/WebGLRenderingContext.cpp:
     29        * html/parser/HTMLParserScheduler.cpp:
     30        * page/AdjustViewSizeOrNot.h: Added.
     31        * page/EditorClient.h:
     32        * page/Frame.h:
     33        * page/FrameView.cpp:
     34        (WebCore::FrameView::forceLayoutForPagination):
     35        * page/FrameView.h:
     36        * page/PrintContext.cpp:
     37        (WebCore::PrintContext::begin):
     38        (WebCore::PrintContext::end):
     39        * page/chromium/FrameChromium.cpp:
     40        * page/win/FrameCGWin.cpp:
     41        * page/win/FrameWin.cpp:
     42        * platform/efl/PopupMenuEfl.cpp:
     43        * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
     44        * platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
     45        * platform/graphics/qt/MediaPlayerPrivateQt.cpp:
     46        * platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp:
     47        * platform/graphics/win/MediaPlayerPrivateQuickTimeWin.cpp:
     48        * platform/gtk/WidgetGtk.cpp:
     49        * plugins/IFrameShimSupport.cpp:
     50        * rendering/RenderBlock.cpp:
     51        * rendering/RenderBoxModelObject.cpp:
     52        * rendering/RenderFrameBase.cpp:
     53        * rendering/RenderIFrame.cpp:
     54        * rendering/RenderMenuList.cpp:
     55        * rendering/RenderTextControlSingleLine.cpp:
     56        * rendering/RenderWidget.cpp:
     57        * svg/SVGSVGElement.cpp:
     58
    1592011-05-13  Levi Weintraub  <leviw@chromium.org>
    260

  • trunk/Source/WebCore/GNUmakefile.list.am

    r86436 r86451  
    21332133        Source/WebCore/page/animation/KeyframeAnimation.cpp \
    21342134        Source/WebCore/page/animation/KeyframeAnimation.h \
     2135        Source/WebCore/page/AdjustViewSizeOrNot.h \
    21352136        Source/WebCore/page/BarInfo.cpp \
    21362137        Source/WebCore/page/BarInfo.h \

  • trunk/Source/WebCore/WebCore.exp.in

    r86415 r86451  
    938938__ZN7WebCore9FrameView22setBaseBackgroundColorERKNS_5ColorE
    939939__ZN7WebCore9FrameView23updateCanHaveScrollbarsEv
    940 __ZN7WebCore9FrameView24forceLayoutForPaginationERKNS_9FloatSizeEfNS_5Frame19AdjustViewSizeOrNotE
     940__ZN7WebCore9FrameView24forceLayoutForPaginationERKNS_9FloatSizeEfNS_19AdjustViewSizeOrNotE
    941941__ZN7WebCore9FrameView26adjustPageHeightDeprecatedEPffff
    942942__ZN7WebCore9FrameView29setShouldUpdateWhileOffscreenEb

  • trunk/Source/WebCore/WebCore.pro

    r86315 r86451  
    18331833    page/animation/ImplicitAnimation.h \
    18341834    page/animation/KeyframeAnimation.h \
     1835    page/AdjustViewSizeOrNot.h \
    18351836    page/BarInfo.h \
    18361837    page/Chrome.h \

  • trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

    r86340 r86451  
    2439524395                        </File>
    2439624396                        <File
     24397                                RelativePath="..\page\AdjustViewSizeOrNot.h"
     24398                                >
     24399                        </File>
     24400                        <File
    2439724401                                RelativePath="..\page\BarInfo.cpp"
    2439824402                                >

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r86414 r86451  
    52855285                BCEFE1EB0DCA5F6400739219 /* JSXSLTProcessor.h in Headers */ = {isa = PBXBuildFile; fileRef = BCEFE1E90DCA5F6400739219 /* JSXSLTProcessor.h */; };
    52865286                BCF34A3711A231CD00C71804 /* NamedNodeMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCF34A3611A231CD00C71804 /* NamedNodeMap.cpp */; };
     5287                BCF7E491137CD7C7001DDAE7 /* AdjustViewSizeOrNot.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF48CE61370D114004E87D6 /* AdjustViewSizeOrNot.h */; settings = {ATTRIBUTES = (Private, ); }; };
    52875288                BCFA930810333193007B25D1 /* RenderOverflow.h in Headers */ = {isa = PBXBuildFile; fileRef = BCFA930710333193007B25D1 /* RenderOverflow.h */; settings = {ATTRIBUTES = (Private, ); }; };
    52885289                BCFB2E5E0979E46400BA703D /* CachedResourceClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCFB2E5D0979E46400BA703D /* CachedResourceClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    1172811729                BCEFE1E90DCA5F6400739219 /* JSXSLTProcessor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSXSLTProcessor.h; sourceTree = "<group>"; };
    1172911730                BCF34A3611A231CD00C71804 /* NamedNodeMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NamedNodeMap.cpp; sourceTree = "<group>"; };
     11731                BCF48CE61370D114004E87D6 /* AdjustViewSizeOrNot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AdjustViewSizeOrNot.h; sourceTree = "<group>"; };
    1173011732                BCFA930710333193007B25D1 /* RenderOverflow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderOverflow.h; sourceTree = "<group>"; };
    1173111733                BCFB2E5D0979E46400BA703D /* CachedResourceClient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CachedResourceClient.h; sourceTree = "<group>"; };
    … …  
    1409114093                                93C09A820B064F05005ABD4D /* mac */,
    1409214094                                8538F0000AD71770006A81D1 /* AbstractView.idl */,
     14095                                BCF48CE61370D114004E87D6 /* AdjustViewSizeOrNot.h */,
    1409314096                                BC124EE40C2641CD009E2349 /* BarInfo.cpp */,
    1409414097                                BC124EE50C2641CD009E2349 /* BarInfo.h */,
    … …  
    2277022773                                FD1660A513787C6D001FFA7B /* DenormalDisabler.h in Headers */,
    2277122774                                BCE5644E137A34D6007D2934 /* ConsoleTypes.h in Headers */,
     22775                                BCF7E491137CD7C7001DDAE7 /* AdjustViewSizeOrNot.h in Headers */,
    2277222776                        );
    2277322777                        runOnlyForDeploymentPostprocessing = 0;

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

    r86325 r86451  
    5656#include "MathMLNames.h"
    5757#include "NodeList.h"
     58#include "Page.h"
    5859#include "ProgressTracker.h"
    5960#include "RenderButton.h"

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

    r80498 r86451  
    2929#include "AXObjectCache.h"
    3030#include "AccessibilityScrollbar.h"
     31#include "Frame.h"
    3132#include "FrameView.h"
    3233#include "HTMLFrameOwnerElement.h"

  • trunk/Source/WebCore/accessibility/chromium/AXObjectCacheChromium.cpp

    r85615 r86451  
    3232#include "Chrome.h"
    3333#include "ChromeClient.h"
     34#include "Frame.h"
    3435#include "FrameView.h"
     36#include "Page.h"
    3537#include "RenderObject.h"
    3638#include "Scrollbar.h"

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

    r86325 r86451  
    3434#import "AXObjectCache.h"
    3535#import "AccessibilityARIAGridRow.h"
     36#import "AccessibilityList.h"
    3637#import "AccessibilityListBox.h"
    37 #import "AccessibilityList.h"
    3838#import "AccessibilityRenderObject.h"
    3939#import "AccessibilityScrollView.h"
    4040#import "AccessibilityTable.h"
    4141#import "AccessibilityTableCell.h"
     42#import "AccessibilityTableColumn.h"
    4243#import "AccessibilityTableRow.h"
    43 #import "AccessibilityTableColumn.h"
    4444#import "Chrome.h"
    4545#import "ColorMac.h"
    … …  
    5555#import "HTMLTextAreaElement.h"
    5656#import "LocalizedStrings.h"
     57#import "Page.h"
    5758#import "RenderTextControl.h"
    5859#import "RenderView.h"

  • trunk/Source/WebCore/css/MediaQueryMatcher.cpp

    r85603 r86451  
    2424#include "Document.h"
    2525#include "Element.h"
     26#include "Frame.h"
    2627#include "FrameView.h"
    2728#include "MediaList.h"

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

    r86326 r86451  
    2424#include "config.h"
    2525#include "Range.h"
    26 #include "RangeException.h"
    2726
    2827#include "ClientRect.h"
    … …  
    3130#include "ExceptionCode.h"
    3231#include "FloatQuad.h"
     32#include "Frame.h"
    3333#include "FrameView.h"
    3434#include "HTMLElement.h"
    3535#include "NodeWithIndex.h"
     36#include "Page.h"
    3637#include "ProcessingInstruction.h"
     38#include "RangeException.h"
    3739#include "RenderBoxModelObject.h"
    3840#include "RenderText.h"
    … …  
    4446#include "visible_units.h"
    4547#include <stdio.h>
    46 #include <wtf/text/CString.h>
    4748#include <wtf/RefCountedLeakCounter.h>
    4849#include <wtf/Vector.h>
     50#include <wtf/text/CString.h>
    4951
    5052namespace WebCore {

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

    r86337 r86451  
    3434#include "Frame.h"
    3535#include "FrameView.h"
     36#include "Page.h"
    3637#include "SpellingCorrectionCommand.h"
    3738#include "TextCheckerClient.h"
    … …  
    4243#include "markup.h"
    4344#include "visible_units.h"
    44 
    4545
    4646namespace WebCore {

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

    r86325 r86451  
    3838#include "HistoryItem.h"
    3939#include "Logging.h"
     40#include "Page.h"
    4041#include "PageTransitionEvent.h"
    4142#include "SerializedScriptValue.h"
    … …  
    5051#include "Chrome.h"
    5152#include "ChromeClient.h"
    52 #include "Page.h"
    5353#endif
    5454

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

    r81965 r86451  
    3535#include "HTMLNames.h"
    3636#include "HTMLParserIdioms.h"
     37#include "Page.h"
    3738#include "ScriptEventListener.h"
    3839

  • trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp

    r86275 r86451  
    3737#include "DOMWindow.h"
    3838#include "Extensions3D.h"
     39#include "Frame.h"
    3940#include "FrameView.h"
    4041#include "HTMLCanvasElement.h"
    … …  
    4849#include "OESTextureFloat.h"
    4950#include "OESVertexArrayObject.h"
     51#include "Page.h"
    5052#include "RenderBox.h"
    5153#include "RenderLayer.h"

  • trunk/Source/WebCore/html/parser/HTMLParserScheduler.cpp

    r80861 r86451  
    2727#include "HTMLParserScheduler.h"
    2828
    29 #include "FrameView.h" // Only for isLayoutTimerActive
     29#include "Document.h"
     30#include "FrameView.h"
    3031#include "HTMLDocumentParser.h"
    31 #include "Document.h"
     32#include "Page.h"
    3233
    3334// defaultParserChunkSize is used to define how many tokens the parser will

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

    r85036 r86451  
    3131#include "EditorInsertAction.h"
    3232#include "FloatRect.h"
    33 #include "PlatformString.h"
    3433#include "TextAffinity.h"
    3534#include <wtf/Forward.h>
    … …  
    3837#if PLATFORM(MAC)
    3938#ifdef __OBJC__
    40 @class NSArray;
    4139@class NSAttributedString;
    42 @class NSData;
    4340@class NSPasteboard;
    4441@class NSString;
    4542@class NSURL;
    4643#else
    47 class NSArray;
    4844class NSAttributedString;
    49 class NSData;
    5045class NSPasteboard;
    5146class NSString;

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

    r86047 r86451  
    2929#define Frame_h
    3030
     31#include "AdjustViewSizeOrNot.h"
    3132#include "AnimationController.h"
    3233#include "DragImage.h"
    … …  
    147148        Settings* settings() const; // can be NULL
    148149
    149         enum AdjustViewSizeOrNot { DoNotAdjustViewSize, AdjustViewSize };
    150150        void setPrinting(bool printing, const FloatSize& pageSize, float maximumShrinkRatio, AdjustViewSizeOrNot);
    151151

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

    r86312 r86451  
    25102510}
    25112511
    2512 void FrameView::forceLayoutForPagination(const FloatSize& pageSize, float maximumShrinkFactor, Frame::AdjustViewSizeOrNot shouldAdjustViewSize)
     2512void FrameView::forceLayoutForPagination(const FloatSize& pageSize, float maximumShrinkFactor, AdjustViewSizeOrNot shouldAdjustViewSize)
    25132513{
    25142514    // Dumping externalRepresentation(m_frame->renderer()).ascii() is a good trick to see

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

    r86184 r86451  
    2626#define FrameView_h
    2727
    28 #include "Frame.h"
    29 #include "Page.h"
     28#include "AdjustViewSizeOrNot.h"
     29#include "Color.h"
    3030#include "PaintPhase.h"
    3131#include "ScrollView.h"
    3232#include <wtf/Forward.h>
    3333#include <wtf/OwnPtr.h>
     34#include <wtf/text/WTFString.h>
    3435
    3536namespace WebCore {
    … …  
    3738class Color;
    3839class Event;
     40class FloatSize;
     41class Frame;
    3942class FrameActionScheduler;
    4043class IntRect;
     44class KURL;
    4145class Node;
     46class Page;
     47class RenderEmbeddedObject;
    4248class RenderLayer;
    4349class RenderObject;
    44 class RenderEmbeddedObject;
    4550class RenderScrollbarPart;
     51
     52typedef unsigned long long DOMTimeStamp;
    4653
    4754class FrameView : public ScrollView {
    … …  
    218225
    219226    void forceLayout(bool allowSubtree = false);
    220     void forceLayoutForPagination(const FloatSize& pageSize, float maximumShrinkFactor, Frame::AdjustViewSizeOrNot);
     227    void forceLayoutForPagination(const FloatSize& pageSize, float maximumShrinkFactor, AdjustViewSizeOrNot);
    221228
    222229    // FIXME: This method is retained because of embedded WebViews in AppKit.  When a WebView is embedded inside

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

    r81625 r86451  
    180180
    181181    // This changes layout, so callers need to make sure that they don't paint to screen while in printing mode.
    182     m_frame->setPrinting(true, FloatSize(minLayoutWidth, minLayoutHeight), printingMaximumShrinkFactor / printingMinimumShrinkFactor, Frame::AdjustViewSize);
     182    m_frame->setPrinting(true, FloatSize(minLayoutWidth, minLayoutHeight), printingMaximumShrinkFactor / printingMinimumShrinkFactor, AdjustViewSize);
    183183}
    184184
    … …  
    229229    ASSERT(m_isPrinting);
    230230    m_isPrinting = false;
    231     m_frame->setPrinting(false, FloatSize(), 0, Frame::AdjustViewSize);
     231    m_frame->setPrinting(false, FloatSize(), 0, AdjustViewSize);
    232232}
    233233

  • trunk/Source/WebCore/page/chromium/FrameChromium.cpp

    r77390 r86451  
    2626
    2727#include "config.h"
     28#include "Frame.h"
    2829
    2930#include "Document.h"

  • trunk/Source/WebCore/page/win/FrameCGWin.cpp

    r85615 r86451  
    2727#include "FrameWin.h"
    2828
    29 #include <windows.h>
    30 
    3129#include "BitmapInfo.h"
     30#include "Frame.h"
    3231#include "FrameView.h"
    3332#include "GraphicsContextCG.h"
    3433#include "RenderObject.h"
    3534#include "Settings.h"
    36 
    3735#include <CoreGraphics/CoreGraphics.h>
    38 
    39 using std::min;
     36#include <windows.h>
    4037
    4138namespace WebCore {

  • trunk/Source/WebCore/page/win/FrameWin.cpp

    r79988 r86451  
    3030#include "Document.h"
    3131#include "FloatRect.h"
     32#include "Frame.h"
    3233#include "PrintContext.h"
    3334#include "RenderView.h"

  • trunk/Source/WebCore/platform/efl/PopupMenuEfl.cpp

    r66042 r86451  
    2828#include "Chrome.h"
    2929#include "ChromeClientEfl.h"
     30#include "Frame.h"
    3031#include "FrameView.h"
    3132#include "NotImplemented.h"
     33#include "Page.h"
    3234#include "PopupMenuClient.h"
    3335

  • trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp

    r86163 r86451  
    3333#include "ApplicationCacheResource.h"
    3434#include "DocumentLoader.h"
     35#include "Frame.h"
    3536#include "FrameView.h"
    3637#include "GraphicsContext.h"

  • trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm

    r86418 r86451  
    3333#include "ApplicationCacheHost.h"
    3434#include "ApplicationCacheResource.h"
    35 #include "DocumentLoader.h"
    36 #endif
    37 
     35#endif
    3836
    3937#import "BlockExceptions.h"
    4038#import "DocumentLoader.h"
     39#import "Frame.h"
    4140#import "FrameView.h"
    4241#import "GraphicsContext.h"
    … …  
    5655#if DRAW_FRAME_RATE
    5756#import "Font.h"
    58 #import "Frame.h"
    5957#import "Document.h"
    6058#import "RenderObject.h"

  • trunk/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp

    r86418 r86451  
    2121#include "MediaPlayerPrivateQt.h"
    2222
     23#include "Frame.h"
    2324#include "FrameView.h"
    2425#include "GraphicsContext.h"

  • trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp

    r86418 r86451  
    3939#include "KURL.h"
    4040#include "MediaPlayerPrivateTaskTimer.h"
     41#include "Page.h"
    4142#include "QTCFDictionary.h"
    4243#include "QTDecompressionSession.h"

  • trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeWin.cpp

    r86418 r86451  
    3636#include "KURL.h"
    3737#include "MediaPlayerPrivateTaskTimer.h"
     38#include "Page.h"
    3839#include "QTMovieTask.h"
    3940#include "ScrollView.h"

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

    r86058 r86451  
    3131#include "Chrome.h"
    3232#include "Cursor.h"
     33#include "Frame.h"
    3334#include "FrameView.h"
    3435#include "GraphicsContext.h"
    … …  
    3637#include "HostWindow.h"
    3738#include "IntRect.h"
     39#include "Page.h"
    3840#include "RenderObject.h"
    3941

  • trunk/Source/WebCore/plugins/IFrameShimSupport.cpp

    r77660 r86451  
    3333
    3434#include "Element.h"
     35#include "Frame.h"
    3536#include "FrameView.h"
    3637#include "HTMLElement.h"

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

    r86400 r86451  
    3838#include "InlineIterator.h"
    3939#include "InlineTextBox.h"
     40#include "Page.h"
    4041#include "PaintInfo.h"
    4142#include "RenderCombineText.h"

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

    r86384 r86451  
    3131#include "HTMLNames.h"
    3232#include "ImageBuffer.h"
     33#include "Page.h"
    3334#include "Path.h"
    3435#include "RenderBlock.h"

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

    r68276 r86451  
    2727#include "RenderFrameBase.h"
    2828
     29#include "Frame.h"
    2930#include "FrameView.h"
    3031#include "HTMLFrameElementBase.h"

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

    r83518 r86451  
    2727#include "RenderIFrame.h"
    2828
     29#include "Frame.h"
    2930#include "FrameView.h"
     31#include "HTMLIFrameElement.h"
    3032#include "HTMLNames.h"
    31 #include "HTMLIFrameElement.h"
     33#include "Page.h"
    3234#include "RenderView.h"
    3335#include "Settings.h"

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

    r86135 r86451  
    3636#include "OptionElement.h"
    3737#include "OptionGroupElement.h"
     38#include "Page.h"
    3839#include "PopupMenu.h"
    3940#include "RenderBR.h"

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

    r86395 r86451  
    3838#include "LocalizedStrings.h"
    3939#include "MouseEvent.h"
     40#include "Page.h"
    4041#include "PlatformKeyboardEvent.h"
    4142#include "RenderLayer.h"

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

    r86377 r86451  
    2626#include "AXObjectCache.h"
    2727#include "AnimationController.h"
     28#include "Frame.h"
    2829#include "GraphicsContext.h"
    2930#include "HitTestResult.h"

  • trunk/Source/WebCore/svg/SVGSVGElement.cpp

    r86050 r86451  
    3434#include "FloatConversion.h"
    3535#include "FloatRect.h"
     36#include "Frame.h"
    3637#include "FrameSelection.h"
    3738#include "FrameView.h"

  • trunk/Source/WebKit/chromium/ChangeLog

    r86439 r86451  
     12011-05-13  Sam Weinig  <sam@webkit.org>
     2
     3        Reviewed by Anders Carlsson.
     4
     5        Prune #includes from FrameView.h (Part 2)
     6        https://bugs.webkit.org/show_bug.cgi?id=60748
     7
     8        - Update files that were depending on FrameView.h #including Frame.h or
     9          Page.h.
     10
     11        * src/AutoFillPopupMenuClient.cpp:
     12        * src/PlatformBridge.cpp:
     13        * src/WebPopupMenuImpl.cpp:
     14
    1152011-05-13  Brett Wilson  <brettw@chromium.org>
    216

  • trunk/Source/WebKit/chromium/src/AutoFillPopupMenuClient.cpp

    r86135 r86451  
    3636#include "CSSValueKeywords.h"
    3737#include "Chrome.h"
     38#include "Frame.h"
    3839#include "FrameView.h"
    3940#include "HTMLInputElement.h"
     41#include "Page.h"
    4042#include "RenderTheme.h"
    4143#include "WebAutoFillClient.h"

  • trunk/Source/WebKit/chromium/src/PlatformBridge.cpp

    r86218 r86451  
    3636#include "Chrome.h"
    3737#include "ChromeClientImpl.h"
     38#include "Page.h"
    3839#include "WebAudioBus.h"
    3940#include "WebClipboard.h"

  • trunk/Source/WebKit/chromium/src/WebPopupMenuImpl.cpp

    r85001 r86451  
    3636#include "FrameView.h"
    3737#include "IntRect.h"
     38#include "NotImplemented.h"
    3839#include "painting/GraphicsContextBuilder.h"
    3940#include "PlatformKeyboardEvent.h"

  • trunk/Source/WebKit/gtk/ChangeLog

    r86436 r86451  
     12011-05-13  Sam Weinig  <sam@webkit.org>
     2
     3        Reviewed by Anders Carlsson.
     4
     5        Prune #includes from FrameView.h (Part 2)
     6        https://bugs.webkit.org/show_bug.cgi?id=60748
     7
     8        - Update files that were depending on FrameView.h #including Frame.h or
     9          Page.h.
     10
     11        * WebCoreSupport/GtkAdjustmentWatcher.cpp:
     12
    1132011-05-13  Martin Robinson  <mrobinson@igalia.com>
    214

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

    r86102 r86451  
    2020#include "GtkAdjustmentWatcher.h"
    2121
     22#include "Frame.h"
    2223#include "FrameView.h"
    2324#include "Page.h"

  • trunk/Source/WebKit/mac/ChangeLog

    r86415 r86451  
     12011-05-13  Sam Weinig  <sam@webkit.org>
     2
     3        Reviewed by Anders Carlsson.
     4
     5        Prune #includes from FrameView.h (Part 2)
     6        https://bugs.webkit.org/show_bug.cgi?id=60748
     7
     8        - Update files that were depending on FrameView.h #including Frame.h or
     9          Page.h.
     10
     11        * WebView/WebClipView.mm:
     12        * WebView/WebHTMLView.mm:
     13        (-[WebHTMLView layoutToMinimumPageWidth:height:maximumPageWidth:adjustingViewSize:]):
     14
    1152011-05-12  Pratik Solanki  <psolanki@apple.com>
    216

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

    r85036 r86451  
    3232#import "WebFrameView.h"
    3333#import "WebViewPrivate.h"
     34#import <WebCore/Frame.h>
    3435#import <WebCore/FrameView.h>
    3536

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

    r85864 r86451  
    30343034            if (coreFrame->document() && coreFrame->document()->renderView() && !coreFrame->document()->renderView()->style()->isHorizontalWritingMode())
    30353035                pageSize = FloatSize(minPageLogicalHeight, minPageLogicalWidth);
    3036             coreView->forceLayoutForPagination(pageSize, maxPageLogicalWidth / minPageLogicalWidth, adjustViewSize ? Frame::AdjustViewSize : Frame::DoNotAdjustViewSize);
     3036            coreView->forceLayoutForPagination(pageSize, maxPageLogicalWidth / minPageLogicalWidth, adjustViewSize ? AdjustViewSize : DoNotAdjustViewSize);
    30373037        } else {
    30383038            coreView->forceLayout(!adjustViewSize);

  • trunk/Source/WebKit/qt/Api/qgraphicswebview.cpp

    r81393 r86451  
    2828#include "qwebpage.h"
    2929#include "qwebpage_p.h"
     30#include "Page.h"
    3031#include "PageClientQt.h"
     32#include "Frame.h"
    3133#include "FrameView.h"
    3234#include "GraphicsContext.h"

  • trunk/Source/WebKit/qt/ChangeLog

    r86447 r86451  
     12011-05-13  Sam Weinig  <sam@webkit.org>
     2
     3        Reviewed by Anders Carlsson.
     4
     5        Prune #includes from FrameView.h (Part 2)
     6        https://bugs.webkit.org/show_bug.cgi?id=60748
     7
     8        - Update files that were depending on FrameView.h #including Frame.h or
     9          Page.h.
     10
     11        * Api/qgraphicswebview.cpp:
     12        * WebCoreSupport/ChromeClientQt.cpp:
     13
    1142011-05-13  Robert Hogan  <robert@webkit.org>
    215

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

    r86276 r86451  
    4949#include "NotImplemented.h"
    5050#include "NotificationPresenterClientQt.h"
     51#include "Page.h"
    5152#include "PageClientQt.h"
    5253#include "PopupMenuQt.h"

  • trunk/Source/WebKit/win/ChangeLog

    r86391 r86451  
     12011-05-13  Sam Weinig  <sam@webkit.org>
     2
     3        Reviewed by Anders Carlsson.
     4
     5        Prune #includes from FrameView.h (Part 2)
     6        https://bugs.webkit.org/show_bug.cgi?id=60748
     7
     8        - Update files that were depending on FrameView.h #including Frame.h or
     9          Page.h.
     10
     11        * WebCoreSupport/WebChromeClient.cpp:
     12        * WebCoreSupport/WebDragClient.cpp:
     13        * WebCoreSupport/WebFrameLoaderClient.cpp:
     14        * WebFrame.cpp:
     15        (WebFrame::setPrinting):
     16        * WebView.cpp:
     17
    1182011-05-12  Patrick Gansterer  <paroga@webkit.org>
    219

  • trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp

    r85699 r86451  
    4444#include <WebCore/FileChooser.h>
    4545#include <WebCore/FloatRect.h>
     46#include <WebCore/Frame.h>
    4647#include <WebCore/FrameLoadRequest.h>
    4748#include <WebCore/FrameView.h>

  • trunk/Source/WebKit/win/WebCoreSupport/WebDragClient.cpp

    r82294 r86451  
    3535#include <WebCore/DragController.h>
    3636#include <WebCore/DragData.h>
     37#include <WebCore/Frame.h>
    3738#include <WebCore/FrameView.h>
    3839#include <WebCore/GraphicsContext.h>

  • trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp

    r85785 r86451  
    5353#include <WebCore/CachedFrame.h>
    5454#include <WebCore/DocumentLoader.h>
     55#include <WebCore/Frame.h>
    5556#include <WebCore/FrameLoader.h>
    5657#include <WebCore/FrameTree.h>

  • trunk/Source/WebKit/win/WebFrame.cpp

    r85444 r86451  
    6464#include <WebCore/EventHandler.h>
    6565#include <WebCore/FormState.h>
     66#include <WebCore/Frame.h>
    6667#include <WebCore/FrameLoader.h>
    6768#include <WebCore/FrameLoadRequest.h>
    … …  
    19801981    Frame* coreFrame = core(this);
    19811982    ASSERT(coreFrame);
    1982     coreFrame->setPrinting(printing, FloatSize(minPageWidth, minPageHeight), maxPageWidth / minPageWidth, adjustViewSize ? Frame::AdjustViewSize : Frame::DoNotAdjustViewSize);
     1983    coreFrame->setPrinting(printing, FloatSize(minPageWidth, minPageHeight), maxPageWidth / minPageWidth, adjustViewSize ? AdjustViewSize : DoNotAdjustViewSize);
    19831984}
    19841985

  • trunk/Source/WebKit/win/WebView.cpp

    r86391 r86451  
    8787#include <WebCore/FloatQuad.h>
    8888#include <WebCore/FocusController.h>
     89#include <WebCore/Frame.h>
    8990#include <WebCore/FrameLoader.h>
    9091#include <WebCore/FrameSelection.h>

  • trunk/Source/WebKit2/ChangeLog

    r86436 r86451  
     12011-05-13  Sam Weinig  <sam@webkit.org>
     2
     3        Reviewed by Anders Carlsson.
     4
     5        Prune #includes from FrameView.h (Part 2)
     6        https://bugs.webkit.org/show_bug.cgi?id=60748
     7
     8        - Update files that were depending on FrameView.h #including Frame.h or
     9          Page.h.
     10
     11        * WebProcess/Plugins/PluginView.cpp:
     12        * WebProcess/WebCoreSupport/mac/WebDragClientMac.mm:
     13        * WebProcess/WebPage/WebContextMenu.cpp:
     14        * WebProcess/WebPage/mac/AccessibilityWebPageObject.mm:
     15
    1162011-05-13  Martin Robinson  <mrobinson@igalia.com>
    217

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

    r86379 r86451  
    4141#include <WebCore/Event.h>
    4242#include <WebCore/FocusController.h>
     43#include <WebCore/Frame.h>
    4344#include <WebCore/FrameLoadRequest.h>
    4445#include <WebCore/FrameLoaderClient.h>
    … …  
    4950#include <WebCore/NetscapePlugInStreamLoader.h>
    5051#include <WebCore/NetworkingContext.h>
     52#include <WebCore/Page.h>
    5153#include <WebCore/ProtectionSpace.h>
    5254#include <WebCore/ProxyServer.h>

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm

    r82853 r86451  
    3636#import <WebCore/DOMPrivate.h>
    3737#import <WebCore/DragController.h>
     38#import <WebCore/Frame.h>
    3839#import <WebCore/FrameView.h>
    3940#import <WebCore/GraphicsContext.h>

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

    r83687 r86451  
    3232#include <WebCore/ContextMenu.h>
    3333#include <WebCore/ContextMenuController.h>
     34#include <WebCore/Frame.h>
    3435#include <WebCore/FrameView.h>
    3536#include <WebCore/Page.h>

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

    r84997 r86451  
    3232#import <WebCore/Frame.h>
    3333#import <WebCore/FrameView.h>
     34#import <WebCore/Page.h>
    3435#import <WebCore/ScrollView.h>
    3536#import <WebCore/Scrollbar.h>
Note: See TracChangeset for help on using the changeset viewer.