Commit c5b2001d authored by weinig@apple.com's avatar weinig@apple.com

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:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@86451 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent ae7323f2
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 Levi Weintraub <leviw@chromium.org>
Reviewed by Eric Seidel.
......@@ -2132,6 +2132,7 @@ webcore_sources += \
Source/WebCore/page/animation/ImplicitAnimation.h \
Source/WebCore/page/animation/KeyframeAnimation.cpp \
Source/WebCore/page/animation/KeyframeAnimation.h \
Source/WebCore/page/AdjustViewSizeOrNot.h \
Source/WebCore/page/BarInfo.cpp \
Source/WebCore/page/BarInfo.h \
Source/WebCore/page/Chrome.cpp \
......
......@@ -937,7 +937,7 @@ __ZN7WebCore9FrameView20enterCompositingModeEv
__ZN7WebCore9FrameView21flushDeferredRepaintsEv
__ZN7WebCore9FrameView22setBaseBackgroundColorERKNS_5ColorE
__ZN7WebCore9FrameView23updateCanHaveScrollbarsEv
__ZN7WebCore9FrameView24forceLayoutForPaginationERKNS_9FloatSizeEfNS_5Frame19AdjustViewSizeOrNotE
__ZN7WebCore9FrameView24forceLayoutForPaginationERKNS_9FloatSizeEfNS_19AdjustViewSizeOrNotE
__ZN7WebCore9FrameView26adjustPageHeightDeprecatedEPffff
__ZN7WebCore9FrameView29setShouldUpdateWhileOffscreenEb
__ZN7WebCore9FrameView37updateLayoutAndStyleIfNeededRecursiveEv
......
......@@ -1832,6 +1832,7 @@ HEADERS += \
page/animation/CompositeAnimation.h \
page/animation/ImplicitAnimation.h \
page/animation/KeyframeAnimation.h \
page/AdjustViewSizeOrNot.h \
page/BarInfo.h \
page/Chrome.h \
page/Console.h \
......
......@@ -24393,6 +24393,10 @@
RelativePath="..\page\animation\AnimationControllerPrivate.h"
>
</File>
<File
RelativePath="..\page\AdjustViewSizeOrNot.h"
>
</File>
<File
RelativePath="..\page\BarInfo.cpp"
>
......@@ -5284,6 +5284,7 @@
BCEFE1EA0DCA5F6400739219 /* JSXSLTProcessor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCEFE1E80DCA5F6400739219 /* JSXSLTProcessor.cpp */; };
BCEFE1EB0DCA5F6400739219 /* JSXSLTProcessor.h in Headers */ = {isa = PBXBuildFile; fileRef = BCEFE1E90DCA5F6400739219 /* JSXSLTProcessor.h */; };
BCF34A3711A231CD00C71804 /* NamedNodeMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCF34A3611A231CD00C71804 /* NamedNodeMap.cpp */; };
BCF7E491137CD7C7001DDAE7 /* AdjustViewSizeOrNot.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF48CE61370D114004E87D6 /* AdjustViewSizeOrNot.h */; settings = {ATTRIBUTES = (Private, ); }; };
BCFA930810333193007B25D1 /* RenderOverflow.h in Headers */ = {isa = PBXBuildFile; fileRef = BCFA930710333193007B25D1 /* RenderOverflow.h */; settings = {ATTRIBUTES = (Private, ); }; };
BCFB2E5E0979E46400BA703D /* CachedResourceClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCFB2E5D0979E46400BA703D /* CachedResourceClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
BCFB2F76097A2E1A00BA703D /* Arena.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCFB2F74097A2E1A00BA703D /* Arena.cpp */; };
......@@ -11727,6 +11728,7 @@
BCEFE1E80DCA5F6400739219 /* JSXSLTProcessor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSXSLTProcessor.cpp; sourceTree = "<group>"; };
BCEFE1E90DCA5F6400739219 /* JSXSLTProcessor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSXSLTProcessor.h; sourceTree = "<group>"; };
BCF34A3611A231CD00C71804 /* NamedNodeMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NamedNodeMap.cpp; sourceTree = "<group>"; };
BCF48CE61370D114004E87D6 /* AdjustViewSizeOrNot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AdjustViewSizeOrNot.h; sourceTree = "<group>"; };
BCFA930710333193007B25D1 /* RenderOverflow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderOverflow.h; sourceTree = "<group>"; };
BCFB2E5D0979E46400BA703D /* CachedResourceClient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CachedResourceClient.h; sourceTree = "<group>"; };
BCFB2F74097A2E1A00BA703D /* Arena.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Arena.cpp; sourceTree = "<group>"; };
......@@ -14090,6 +14092,7 @@
316FE1060E6E1D8400BF6088 /* animation */,
93C09A820B064F05005ABD4D /* mac */,
8538F0000AD71770006A81D1 /* AbstractView.idl */,
BCF48CE61370D114004E87D6 /* AdjustViewSizeOrNot.h */,
BC124EE40C2641CD009E2349 /* BarInfo.cpp */,
BC124EE50C2641CD009E2349 /* BarInfo.h */,
BC124EE60C2641CD009E2349 /* BarInfo.idl */,
......@@ -22769,6 +22772,7 @@
379E371713736A6600B9E919 /* QuotedPrintable.h in Headers */,
FD1660A513787C6D001FFA7B /* DenormalDisabler.h in Headers */,
BCE5644E137A34D6007D2934 /* ConsoleTypes.h in Headers */,
BCF7E491137CD7C7001DDAE7 /* AdjustViewSizeOrNot.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -55,6 +55,7 @@
#include "LocalizedStrings.h"
#include "MathMLNames.h"
#include "NodeList.h"
#include "Page.h"
#include "ProgressTracker.h"
#include "RenderButton.h"
#include "RenderFieldset.h"
......
......@@ -28,6 +28,7 @@
#include "AXObjectCache.h"
#include "AccessibilityScrollbar.h"
#include "Frame.h"
#include "FrameView.h"
#include "HTMLFrameOwnerElement.h"
#include "RenderPart.h"
......
......@@ -31,7 +31,9 @@
#include "AccessibilityScrollbar.h"
#include "Chrome.h"
#include "ChromeClient.h"
#include "Frame.h"
#include "FrameView.h"
#include "Page.h"
#include "RenderObject.h"
#include "Scrollbar.h"
......
......@@ -33,14 +33,14 @@
#import "AXObjectCache.h"
#import "AccessibilityARIAGridRow.h"
#import "AccessibilityListBox.h"
#import "AccessibilityList.h"
#import "AccessibilityListBox.h"
#import "AccessibilityRenderObject.h"
#import "AccessibilityScrollView.h"
#import "AccessibilityTable.h"
#import "AccessibilityTableCell.h"
#import "AccessibilityTableRow.h"
#import "AccessibilityTableColumn.h"
#import "AccessibilityTableRow.h"
#import "Chrome.h"
#import "ColorMac.h"
#import "Frame.h"
......@@ -54,6 +54,7 @@
#import "HTMLNames.h"
#import "HTMLTextAreaElement.h"
#import "LocalizedStrings.h"
#import "Page.h"
#import "RenderTextControl.h"
#import "RenderView.h"
#import "RenderWidget.h"
......
......@@ -23,6 +23,7 @@
#include "CSSStyleSelector.h"
#include "Document.h"
#include "Element.h"
#include "Frame.h"
#include "FrameView.h"
#include "MediaList.h"
#include "MediaQueryEvaluator.h"
......
......@@ -23,17 +23,19 @@
#include "config.h"
#include "Range.h"
#include "RangeException.h"
#include "ClientRect.h"
#include "ClientRectList.h"
#include "DocumentFragment.h"
#include "ExceptionCode.h"
#include "FloatQuad.h"
#include "Frame.h"
#include "FrameView.h"
#include "HTMLElement.h"
#include "NodeWithIndex.h"
#include "Page.h"
#include "ProcessingInstruction.h"
#include "RangeException.h"
#include "RenderBoxModelObject.h"
#include "RenderText.h"
#include "Text.h"
......@@ -43,9 +45,9 @@
#include "markup.h"
#include "visible_units.h"
#include <stdio.h>
#include <wtf/text/CString.h>
#include <wtf/RefCountedLeakCounter.h>
#include <wtf/Vector.h>
#include <wtf/text/CString.h>
namespace WebCore {
......
......@@ -33,6 +33,7 @@
#include "FloatQuad.h"
#include "Frame.h"
#include "FrameView.h"
#include "Page.h"
#include "SpellingCorrectionCommand.h"
#include "TextCheckerClient.h"
#include "TextCheckingHelper.h"
......@@ -42,7 +43,6 @@
#include "markup.h"
#include "visible_units.h"
namespace WebCore {
using namespace std;
......
......@@ -37,6 +37,7 @@
#include "FrameView.h"
#include "HistoryItem.h"
#include "Logging.h"
#include "Page.h"
#include "PageTransitionEvent.h"
#include "SerializedScriptValue.h"
#include <wtf/text/CString.h>
......@@ -49,7 +50,6 @@
#if ENABLE(TOUCH_EVENTS)
#include "Chrome.h"
#include "ChromeClient.h"
#include "Page.h"
#endif
namespace WebCore {
......
......@@ -34,6 +34,7 @@
#include "HTMLFrameElementBase.h"
#include "HTMLNames.h"
#include "HTMLParserIdioms.h"
#include "Page.h"
#include "ScriptEventListener.h"
namespace WebCore {
......
......@@ -36,6 +36,7 @@
#include "Console.h"
#include "DOMWindow.h"
#include "Extensions3D.h"
#include "Frame.h"
#include "FrameView.h"
#include "HTMLCanvasElement.h"
#include "HTMLImageElement.h"
......@@ -47,6 +48,7 @@
#include "OESStandardDerivatives.h"
#include "OESTextureFloat.h"
#include "OESVertexArrayObject.h"
#include "Page.h"
#include "RenderBox.h"
#include "RenderLayer.h"
#include "Settings.h"
......
......@@ -26,9 +26,10 @@
#include "config.h"
#include "HTMLParserScheduler.h"
#include "FrameView.h" // Only for isLayoutTimerActive
#include "HTMLDocumentParser.h"
#include "Document.h"
#include "FrameView.h"
#include "HTMLDocumentParser.h"
#include "Page.h"
// defaultParserChunkSize is used to define how many tokens the parser will
// process before checking against parserTimeLimit and possibly yielding.
......
/*
* Copyright (C) 2011 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef AdjustViewSizeOrNot_h
#define AdjustViewSizeOrNot_h
namespace WebCore {
enum AdjustViewSizeOrNot {
DoNotAdjustViewSize,
AdjustViewSize
};
} // namespace WebCore
#endif // AdjustViewSizeOrNot_h
......@@ -30,23 +30,18 @@
#include "SpellingCorrectionController.h"
#include "EditorInsertAction.h"
#include "FloatRect.h"
#include "PlatformString.h"
#include "TextAffinity.h"
#include <wtf/Forward.h>
#include <wtf/Vector.h>
#if PLATFORM(MAC)
#ifdef __OBJC__
@class NSArray;
@class NSAttributedString;
@class NSData;
@class NSPasteboard;
@class NSString;
@class NSURL;
#else
class NSArray;
class NSAttributedString;
class NSData;
class NSPasteboard;
class NSString;
class NSURL;
......
......@@ -28,6 +28,7 @@
#ifndef Frame_h
#define Frame_h
#include "AdjustViewSizeOrNot.h"
#include "AnimationController.h"
#include "DragImage.h"
#include "Editor.h"
......@@ -146,7 +147,6 @@ namespace WebCore {
Settings* settings() const; // can be NULL
enum AdjustViewSizeOrNot { DoNotAdjustViewSize, AdjustViewSize };
void setPrinting(bool printing, const FloatSize& pageSize, float maximumShrinkRatio, AdjustViewSizeOrNot);
bool inViewSourceMode() const;
......
......@@ -2509,7 +2509,7 @@ void FrameView::forceLayout(bool allowSubtree)
layout(allowSubtree);
}
void FrameView::forceLayoutForPagination(const FloatSize& pageSize, float maximumShrinkFactor, Frame::AdjustViewSizeOrNot shouldAdjustViewSize)
void FrameView::forceLayoutForPagination(const FloatSize& pageSize, float maximumShrinkFactor, AdjustViewSizeOrNot shouldAdjustViewSize)
{
// Dumping externalRepresentation(m_frame->renderer()).ascii() is a good trick to see
// the state of things before and after the layout
......
......@@ -25,25 +25,32 @@
#ifndef FrameView_h
#define FrameView_h
#include "Frame.h"
#include "Page.h"
#include "AdjustViewSizeOrNot.h"
#include "Color.h"
#include "PaintPhase.h"
#include "ScrollView.h"
#include <wtf/Forward.h>
#include <wtf/OwnPtr.h>
#include <wtf/text/WTFString.h>
namespace WebCore {
class Color;
class Event;
class FloatSize;
class Frame;
class FrameActionScheduler;
class IntRect;
class KURL;
class Node;
class Page;
class RenderEmbeddedObject;
class RenderLayer;
class RenderObject;
class RenderEmbeddedObject;
class RenderScrollbarPart;
typedef unsigned long long DOMTimeStamp;
class FrameView : public ScrollView {
public:
friend class RenderView;
......@@ -217,7 +224,7 @@ public:
void setIsVisuallyNonEmpty() { m_isVisuallyNonEmpty = true; }
void forceLayout(bool allowSubtree = false);
void forceLayoutForPagination(const FloatSize& pageSize, float maximumShrinkFactor, Frame::AdjustViewSizeOrNot);
void forceLayoutForPagination(const FloatSize& pageSize, float maximumShrinkFactor, AdjustViewSizeOrNot);
// FIXME: This method is retained because of embedded WebViews in AppKit. When a WebView is embedded inside
// some enclosing view with auto-pagination, no call happens to resize the view. The new pagination model
......
......@@ -179,7 +179,7 @@ void PrintContext::begin(float width, float height)
float minLayoutHeight = height * printingMinimumShrinkFactor;
// This changes layout, so callers need to make sure that they don't paint to screen while in printing mode.
m_frame->setPrinting(true, FloatSize(minLayoutWidth, minLayoutHeight), printingMaximumShrinkFactor / printingMinimumShrinkFactor, Frame::AdjustViewSize);
m_frame->setPrinting(true, FloatSize(minLayoutWidth, minLayoutHeight), printingMaximumShrinkFactor / printingMinimumShrinkFactor, AdjustViewSize);
}
float PrintContext::computeAutomaticScaleFactor(const FloatSize& availablePaperSize)
......@@ -228,7 +228,7 @@ void PrintContext::end()
{
ASSERT(m_isPrinting);
m_isPrinting = false;
m_frame->setPrinting(false, FloatSize(), 0, Frame::AdjustViewSize);
m_frame->setPrinting(false, FloatSize(), 0, AdjustViewSize);
}
static RenderBoxModelObject* enclosingBoxModelObject(RenderObject* object)
......
......@@ -25,6 +25,7 @@
*/
#include "config.h"
#include "Frame.h"
#include "Document.h"
#include "FloatRect.h"
......
......@@ -26,17 +26,14 @@
#include "config.h"
#include "FrameWin.h"
#include <windows.h>
#include "BitmapInfo.h"
#include "Frame.h"
#include "FrameView.h"
#include "GraphicsContextCG.h"
#include "RenderObject.h"
#include "Settings.h"
#include <CoreGraphics/CoreGraphics.h>
using std::min;
#include <windows.h>
namespace WebCore {
......
......@@ -29,6 +29,7 @@
#include "BridgeJSC.h"
#include "Document.h"
#include "FloatRect.h"
#include "Frame.h"
#include "PrintContext.h"
#include "RenderView.h"
#include "Settings.h"
......
......@@ -27,8 +27,10 @@
#include "Chrome.h"
#include "ChromeClientEfl.h"
#include "Frame.h"
#include "FrameView.h"
#include "NotImplemented.h"
#include "Page.h"
#include "PopupMenuClient.h"
namespace WebCore {
......
......@@ -32,6 +32,7 @@
#include "ApplicationCacheHost.h"
#include "ApplicationCacheResource.h"
#include "DocumentLoader.h"
#include "Frame.h"
#include "FrameView.h"
#include "GraphicsContext.h"
#include "GraphicsLayer.h"
......
......@@ -32,12 +32,11 @@
#if ENABLE(OFFLINE_WEB_APPLICATIONS)
#include "ApplicationCacheHost.h"
#include "ApplicationCacheResource.h"
#include "DocumentLoader.h"
#endif
#import "BlockExceptions.h"
#import "DocumentLoader.h"
#import "Frame.h"
#import "FrameView.h"
#import "GraphicsContext.h"
#import "KURL.h"
......@@ -55,7 +54,6 @@
#if DRAW_FRAME_RATE
#import "Font.h"
#import "Frame.h"
#import "Document.h"
#import "RenderObject.h"
#import "RenderStyle.h"
......
......@@ -20,6 +20,7 @@
#include "config.h"
#include "MediaPlayerPrivateQt.h"
#include "Frame.h"
#include "FrameView.h"
#include "GraphicsContext.h"
#include "GraphicsLayer.h"
......
......@@ -38,6 +38,7 @@
#include "GraphicsContext.h"
#include "KURL.h"
#include "MediaPlayerPrivateTaskTimer.h"
#include "Page.h"
#include "QTCFDictionary.h"
#include "QTDecompressionSession.h"
#include "QTMovie.h"
......
......@@ -35,6 +35,7 @@
#include "GraphicsContext.h"
#include "KURL.h"
#include "MediaPlayerPrivateTaskTimer.h"
#include "Page.h"
#include "QTMovieTask.h"
#include "ScrollView.h"
#include "SoftLinking.h"
......
......@@ -30,11 +30,13 @@
#include "Chrome.h"
#include "Cursor.h"
#include "Frame.h"
#include "FrameView.h"
#include "GraphicsContext.h"
#include "GtkVersioning.h"
#include "HostWindow.h"
#include "IntRect.h"
#include "Page.h"
#include "RenderObject.h"
#include <gdk/gdk.h>
......
......@@ -32,6 +32,7 @@
#include "IFrameShimSupport.h"
#include "Element.h"
#include "Frame.h"
#include "FrameView.h"
#include "HTMLElement.h"
#include "HTMLFrameOwnerElement.h"
......
......@@ -37,6 +37,7 @@
#include "HitTestResult.h"
#include "InlineIterator.h"
#include "InlineTextBox.h"
#include "Page.h"
#include "PaintInfo.h"
#include "RenderCombineText.h"
#include "RenderFlexibleBox.h"
......
......@@ -30,6 +30,7 @@
#include "HTMLFrameOwnerElement.h"
#include "HTMLNames.h"
#include "ImageBuffer.h"
#include "Page.h"
#include "Path.h"
#include "RenderBlock.h"
#include "RenderInline.h"
......
......@@ -26,6 +26,7 @@
#include "config.h"
#include "RenderFrameBase.h"
#include "Frame.h"
#include "FrameView.h"
#include "HTMLFrameElementBase.h"
#include "RenderView.h"
......
......@@ -26,9 +26,11 @@
#include "config.h"
#include "RenderIFrame.h"
#include "Frame.h"
#include "FrameView.h"
#include "HTMLNames.h"
#include "HTMLIFrameElement.h"
#include "HTMLNames.h"
#include "Page.h"
#include "RenderView.h"
#include "Settings.h"
......
......@@ -35,6 +35,7 @@
#include "NodeRenderStyle.h"
#include "OptionElement.h"
#include "OptionGroupElement.h"
#include "Page.h"
#include "PopupMenu.h"
#include "RenderBR.h"