ChangeLog

2011-06-22  Levi Weintraub  <leviw@chromium.org>

        Reviewed by NOBODY (OOPS!).

        Create intermediate classes as a path towards getting off of pixel offsets

        https://bugs.webkit.org/show_bug.cgi?id=61896

        * wtf/Platform.h: Adding flag for toggling the typedef of the intermediate Layout* classes

        from ints to floats and defaulting it to ints (off).

2011-06-23  Oliver Hunt  <oliver@apple.com>

        Reviewed by Gavin Barraclough.

89634

Source/JavaScriptCore/wtf/Platform.h

#define ENABLE_REPAINT_THROTTLING 0

#endif

#if !defined(WTF_USE_FLOAT_LAYOUT_OFFSETS)

#define WTF_USE_FLOAT_LAYOUT_OFFSETS 0

#endif

/* Disable the JIT on versions of GCC prior to 4.1 */

#if !defined(ENABLE_JIT) && COMPILER(GCC) && !GCC_VERSION_AT_LEAST(4, 1, 0)

#define ENABLE_JIT 0

89634

Source/WebCore/ChangeLog

2011-06-22  Levi Weintraub  <leviw@chromium.org>

        Reviewed by NOBODY (OOPS!).

        Create intermediate classes as a path towards getting off of pixel offsets

        https://bugs.webkit.org/show_bug.cgi?id=61896

        Creating three intermediate typedefs to aid in moving layout and hit testing from integers

        to floats. We'll transition the render tree over to these intermediate types and add

        infrastructure to support the new types behind USE(FLOAT_LAYOUT_OFFSETS). This allows the ultimate

        changeover to be easier.

        Switching LayoutState over to this abstraction to verify it works correctly.

        No new tests since this is creating a new abstraction, not changing current behavior.

        * GNUmakefile.list.am:

        * WebCore.gypi:

        * WebCore.pro:

        * WebCore.vcproj/WebCore.vcproj:

        * WebCore.xcodeproj/project.pbxproj:

        * rendering/LayoutState.cpp:

        (WebCore::LayoutState::LayoutState):

        (WebCore::LayoutState::pageLogicalOffset):

        (WebCore::LayoutState::addForcedColumnBreak):

        * rendering/LayoutState.h:

        * rendering/LayoutTypes.h: Added.

2011-06-23  Alok Priyadarshi  <alokp@chromium.org>

        Reviewed by James Robinson.

89634

Source/WebCore/GNUmakefile.list.am

@@webcore_sources += \

	Source/WebCore/rendering/InlineTextBox.h \

	Source/WebCore/rendering/LayoutState.cpp \

	Source/WebCore/rendering/LayoutState.h \

2886 Source/WebCore/rendering/LayoutTypes.h \

	Source/WebCore/rendering/OverlapTestRequestClient.h \

	Source/WebCore/rendering/PaintInfo.h \

	Source/WebCore/rendering/PaintPhase.h \

89634

Source/WebCore/WebCore.gypi

            'rendering/InlineFlowBox.h',

            'rendering/InlineTextBox.h',

            'rendering/LayoutState.h',

968 'rendering/LayoutTypes.h',

            'rendering/OverlapTestRequestClient.h',

            'rendering/PaintInfo.h',

            'rendering/PaintPhase.h',

89634

Source/WebCore/WebCore.pro

@@HEADERS += \

    rendering/InlineFlowBox.h \

    rendering/InlineTextBox.h \

    rendering/LayoutState.h \

2137 rendering/LayoutTypes.h \

    rendering/mathml/RenderMathMLBlock.h \

    rendering/mathml/RenderMathMLFenced.h \

    rendering/mathml/RenderMathMLFraction.h \

89634

Source/WebCore/WebCore.vcproj/WebCore.vcproj

				>

			</File>

			<File

				RelativePath="..\rendering\LayoutTypes.h"

				>

			</File>

			<File

				RelativePath="..\rendering\PaintInfo.h"

				>

			</File>

89634

Source/WebCore/WebCore.xcodeproj/project.pbxproj

		B8DBDB4C130B0F8A00F5CDB1 /* SetSelectionCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = B8DBDB48130B0F8A00F5CDB1 /* SetSelectionCommand.h */; };

		B8DBDB4D130B0F8A00F5CDB1 /* SpellingCorrectionCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B8DBDB49130B0F8A00F5CDB1 /* SpellingCorrectionCommand.cpp */; };

		B8DBDB4E130B0F8A00F5CDB1 /* SpellingCorrectionCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = B8DBDB4A130B0F8A00F5CDB1 /* SpellingCorrectionCommand.h */; };

4768 BACF290113B2A0D500781F90 /* LayoutTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = BACF290013B2A0D500781F90 /* LayoutTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };

		BC00F0040E0A185500FD04E3 /* DOMFile.h in Headers */ = {isa = PBXBuildFile; fileRef = BC00EFFE0E0A185500FD04E3 /* DOMFile.h */; };

		BC00F0050E0A185500FD04E3 /* DOMFile.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC00EFFF0E0A185500FD04E3 /* DOMFile.mm */; };

		BC00F0060E0A185500FD04E3 /* DOMFileInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = BC00F0000E0A185500FD04E3 /* DOMFileInternal.h */; };

		B8DBDB48130B0F8A00F5CDB1 /* SetSelectionCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SetSelectionCommand.h; sourceTree = "<group>"; };

		B8DBDB49130B0F8A00F5CDB1 /* SpellingCorrectionCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SpellingCorrectionCommand.cpp; sourceTree = "<group>"; };

		B8DBDB4A130B0F8A00F5CDB1 /* SpellingCorrectionCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpellingCorrectionCommand.h; sourceTree = "<group>"; };

11365 BACF290013B2A0D500781F90 /* LayoutTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LayoutTypes.h; sourceTree = "<group>"; };

		BC00EFFE0E0A185500FD04E3 /* DOMFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMFile.h; sourceTree = "<group>"; };

		BC00EFFF0E0A185500FD04E3 /* DOMFile.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMFile.mm; sourceTree = "<group>"; };

		BC00F0000E0A185500FD04E3 /* DOMFileInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMFileInternal.h; sourceTree = "<group>"; };

				BCEA481B097D93020094C9E4 /* InlineTextBox.h */,

				2D9066040BE141D400956998 /* LayoutState.cpp */,

				2D9066050BE141D400956998 /* LayoutState.h */,

19291 BACF290013B2A0D500781F90 /* LayoutTypes.h */,

				3774ABA30FA21EB400AD7DE9 /* OverlapTestRequestClient.h */,

				0885067D11DA045B00182B98 /* PaintInfo.h */,

				0885067E11DA045B00182B98 /* PaintPhase.h */,

				B1AD4E7C13A12A7200846B27 /* CueParser.h in Headers */,

				B1AD4E7D13A12A7200846B27 /* CueParserPrivate.h in Headers */,

				97B1F02F13B025D200F5103F /* SharedBufferChunkReader.h in Headers */,

23065 BACF290113B2A0D500781F90 /* LayoutTypes.h in Headers */,

				43B9336913B261B1004584BF /* SVGAnimatedPointList.h in Headers */,

				43A625F813B3304000AC94B8 /* SVGAnimatedColor.h in Headers */,

			);

89634

Source/WebCore/rendering/LayoutState.cpp

namespace WebCore {

37 LayoutState::LayoutState(LayoutState* prev, RenderBox* renderer, const IntSize& offset, int pageLogicalHeight, bool pageLogicalHeightChanged, ColumnInfo* columnInfo)

37LayoutState::LayoutState(LayoutState* prev, RenderBox* renderer, const LayoutSize& offset, LayoutUnit pageLogicalHeight, bool pageLogicalHeightChanged, ColumnInfo* columnInfo)

    : m_columnInfo(columnInfo)

    , m_next(prev)

#ifndef NDEBUG

@@LayoutState::LayoutState(LayoutState* pr

    if (fixed) {

        // FIXME: This doesn't work correctly with transforms.

        FloatPoint fixedOffset = renderer->view()->localToAbsolute(FloatPoint(), true);

50 m_paintOffset = IntSize(fixedOffset.x(), fixedOffset.y()) + offset;

50 m_paintOffset = LayoutSize(fixedOffset.x(), fixedOffset.y()) + offset;

    } else

        m_paintOffset = prev->m_paintOffset + offset;

@@LayoutState::LayoutState(LayoutState* pr

    if (renderer->hasOverflowClip()) {

        RenderLayer* layer = renderer->layer();

72 IntRect clipRect(toPoint(m_paintOffset) + renderer->view()->layoutDelta(), layer->size());

72 LayoutRect clipRect(toPoint(m_paintOffset) + renderer->view()->layoutDelta(), layer->size());

        if (m_clipped)

            m_clipRect.intersect(clipRect);

        else {

@@LayoutState::LayoutState(LayoutState* pr

    // We can compare this later on to figure out what part of the page we're actually on,

    if (pageLogicalHeight || m_columnInfo) {

        m_pageLogicalHeight = pageLogicalHeight;

87 m_pageOffset = IntSize(m_layoutOffset.width() + renderer->borderLeft() + renderer->paddingLeft(),

87 m_pageOffset = LayoutSize(m_layoutOffset.width() + renderer->borderLeft() + renderer->paddingLeft(),

                               m_layoutOffset.height() + renderer->borderTop() + renderer->paddingTop());

        m_pageLogicalHeightChanged = pageLogicalHeightChanged;

    } else {

@@LayoutState::LayoutState(RenderObject* r

{

    RenderObject* container = root->container();

    FloatPoint absContentPoint = container->localToAbsolute(FloatPoint(), false, true);

121 m_paintOffset = IntSize(absContentPoint.x(), absContentPoint.y());

121 m_paintOffset = LayoutSize(absContentPoint.x(), absContentPoint.y());

    if (container->hasOverflowClip()) {

        RenderLayer* layer = toRenderBoxModelObject(container)->layer();

        m_clipped = true;

126 m_clipRect = IntRect(toPoint(m_paintOffset), layer->size());

126 m_clipRect = LayoutRect(toPoint(m_paintOffset), layer->size());

        m_paintOffset -= layer->scrolledContentOffset();

    }

}

@@void LayoutState::clearPaginationInforma

    m_columnInfo = m_next->m_columnInfo;

}

165 int LayoutState::pageLogicalOffset(int childLogicalOffset) const

165LayoutUnit LayoutState::pageLogicalOffset(LayoutUnit childLogicalOffset) const

{

    return m_layoutOffset.height() + childLogicalOffset - m_pageOffset.height();

}

170 void LayoutState::addForcedColumnBreak(int childLogicalOffset)

170void LayoutState::addForcedColumnBreak(LayoutUnit childLogicalOffset)

{

    if (!m_columnInfo || m_columnInfo->columnHeight())

        return;

89634

Source/WebCore/rendering/LayoutState.h

#ifndef LayoutState_h

#define LayoutState_h

29 #include "IntRect.h"

30 #include "IntSize.h"

29#include "LayoutTypes.h"

#include <wtf/Noncopyable.h>

namespace WebCore {

@@public:

    {

    }

55 LayoutState(LayoutState*, RenderBox*, const IntSize& offset, int pageHeight, bool pageHeightChanged, ColumnInfo*);

54 LayoutState(LayoutState*, RenderBox*, const LayoutSize& offset, LayoutUnit pageHeight, bool pageHeightChanged, ColumnInfo*);

    LayoutState(RenderObject*);

    void destroy(RenderArena*);

@@public:

    
    // The page logical offset is the object's offset from the top of the page in the page progression

    // direction (so an x-offset in vertical text and a y-offset for horizontal text).

72 int pageLogicalOffset(int childLogicalOffset) const;

71 LayoutUnit pageLogicalOffset(LayoutUnit childLogicalOffset) const;

7372

74 void addForcedColumnBreak(int childLogicalOffset);

73 void addForcedColumnBreak(LayoutUnit childLogicalOffset);

    
    bool pageLogicalHeight() const { return m_pageLogicalHeight; }

    bool pageLogicalHeightChanged() const { return m_pageLogicalHeightChanged; }

@@private:

public:

    bool m_clipped;

    IntRect m_clipRect;

    IntSize m_paintOffset; // x/y offset from container.  Includes relative positioning and scroll offsets.

    IntSize m_layoutOffset; // x/y offset from container.  Does not include relative positioning or scroll offsets.

    IntSize m_layoutDelta; // Transient offset from the final position of the object

    LayoutRect m_clipRect;

    LayoutSize m_paintOffset; // x/y offset from container. Includes relative positioning and scroll offsets.

    LayoutSize m_layoutOffset; // x/y offset from container. Does not include relative positioning or scroll offsets.

    LayoutSize m_layoutDelta; // Transient offset from the final position of the object

                           // used to ensure that repaints happen in the correct place.

                           // This is a total delta accumulated from the root.

92 int m_pageLogicalHeight; // The current page height for the pagination model that encloses us.

91 LayoutUnit m_pageLogicalHeight; // The current page height for the pagination model that encloses us.

9392 bool m_pageLogicalHeightChanged; // If our page height has changed, this will force all blocks to relayout.

94 IntSize m_pageOffset; // The offset of the start of the first page in the nearest enclosing pagination model.

93 LayoutSize m_pageOffset; // The offset of the start of the first page in the nearest enclosing pagination model.

    ColumnInfo* m_columnInfo; // If the enclosing pagination model is a column model, then this will store column information for easy retrieval/manipulation.

    LayoutState* m_next;

89634

Source/WebCore/rendering/LayoutTypes.h

/*

 * Copyright (C) 2010 Google 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:

 *

 *     * Redistributions of source code must retain the above copyright

 * notice, this list of conditions and the following disclaimer.

 *     * 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.

 *     * Neither the name of Google Inc. nor the names of its

 * contributors may be used to endorse or promote products derived from

 * this software without specific prior written permission.

 *

 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT

 * OWNER OR 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.

 */

// These typedefs are being used to abstract layout and hit testing off

// of integers and eventually replace them with floats. Once this transition

// is complete, these types will be removed. Progress can be tracked at

// https://bugs.webkit.org/show_bug.cgi?id=60318

#ifndef LayoutTypes_h

#define LayoutTypes_h

#if USE(FLOAT_LAYOUT_OFFSETS)

#include "FloatRect.h"

#else

#include "IntRect.h"

#endif

namespace WebCore {

#if USE(FLOAT_OFFSETS)

typedef float LayoutUnit;

typedef FloatPoint LayoutPoint;

typedef FloatSize LayoutSize;

typedef FloatRect LayoutRect;

#else

typedef int LayoutUnit;

typedef IntPoint LayoutPoint;

typedef IntSize LayoutSize;

typedef IntRect LayoutRect;

#endif

} // namespace WebCore

#endif // LayoutTypes_h

0