ChangeLog

2012-08-02  Emil A Eklund  <eae@chromium.org>

        Remove dependency on LayoutTypes.h from transformation code

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

        Reviewed by NOBODY (OOPS!).

        TransformationMatrix and HitTestingTransformState includes LayoutTypes.h

        which is in rendering. This is a layering violation.

        Remove this dependency as it is no longer needed.

        No new tests, no change in functionality.

        * platform/FractionalLayoutUnit.h:

        (WebCore::FractionalLayoutUnit::clamp):

        Add FractionalLayoutUnit::clamp method that clamps a double to a

        FractionalLayoutUnit.

        * platform/graphics/transforms/TransformationMatrix.cpp:

        (WebCore::clampEdgeValue):

        (WebCore::TransformationMatrix::clampedBoundsOfProjectedQuad):

        Use clamp/max/min from FractionalLayoutUnit instead of going through

        LayoutUnit abstraction.

        * platform/graphics/transforms/TransformationMatrix.h:

        * rendering/HitTestingTransformState.cpp:

        * rendering/HitTestingTransformState.h:

        Replace use of LayoutRect with FractionalLayoutRect as LayoutRect maps to

        FractionalLayoutRect on all platforms.

2012-08-02  Ryosuke Niwa  <rniwa@webkit.org>

        scripts in formaction should be stripped upon paste

124527

Source/WebCore/platform/FractionalLayoutUnit.h

#include <limits>

#include <math.h>

#include <stdlib.h>

38#include <wtf/MathExtras.h>

#if PLATFORM(QT)

#include <QDataStream>

@@public:

        m.m_value = std::numeric_limits<int>::min();

        return m;

    }

    static FractionalLayoutUnit clamp(double value)

    {

        return clampTo<FractionalLayoutUnit>(value, FractionalLayoutUnit::min(), FractionalLayoutUnit::max());

    }

    
private:

    static bool isInBounds(int value)

124516

Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp

#include "TransformationMatrix.h"

#include "AffineTransform.h"

31 #include "FractionalLayoutRect.h"

#include "FloatPoint3D.h"

#include "FloatRect.h"

#include "FloatQuad.h"

@@FloatQuad TransformationMatrix::projectQ

static float clampEdgeValue(float f)

{

    ASSERT(!isnan(f));

617 return min<float>(max<float>(f, -~~MAX_LAYOUT_UNIT~~ / 2), ~~MAX_LAYOUT_UNIT~~ / 2);

616 return min<float>(max<float>(f, -FractionalLayoutUnit::max() / 2), FractionalLayoutUnit::max() / 2);

618617}

619618

620 LayoutRect TransformationMatrix::clampedBoundsOfProjectedQuad(const FloatQuad& q) const

619FractionalLayoutRect TransformationMatrix::clampedBoundsOfProjectedQuad(const FloatQuad& q) const

{

    FloatRect mappedQuadBounds = projectQuad(q).boundingBox();

@@LayoutRect TransformationMatrix::clamped

    float right;

    if (isinf(mappedQuadBounds.x()) && isinf(mappedQuadBounds.width()))

629 right = ~~MAX_LAYOUT_UNIT~~ / 2;

628 right = FractionalLayoutUnit::max() / 2;

    else

        right = clampEdgeValue(ceilf(mappedQuadBounds.maxX()));

    float bottom;

    if (isinf(mappedQuadBounds.y()) && isinf(mappedQuadBounds.height()))

635 bottom = ~~MAX_LAYOUT_UNIT~~ / 2;

634 bottom = FractionalLayoutUnit::max() / 2;

636635 else

637636 bottom = clampEdgeValue(ceilf(mappedQuadBounds.maxY()));

    
    return LayoutRect(clampToLayoutUnit(left), clampToLayoutUnit(top), 

                      clampToLayoutUnit(right - left), clampToLayoutUnit(bottom - top));

    return FractionalLayoutRect(FractionalLayoutUnit::clamp(left), FractionalLayoutUnit::clamp(top), 

                                FractionalLayoutUnit::clamp(right - left), FractionalLayoutUnit::clamp(bottom - top));

}

FloatPoint TransformationMatrix::mapPoint(const FloatPoint& p) const

124516

Source/WebCore/platform/graphics/transforms/TransformationMatrix.h

#define TransformationMatrix_h

#include "FloatPoint.h"

30#include "FractionalLayoutRect.h"

3031#include "IntPoint.h"

31 #include "LayoutTypes.h"

#include <string.h> //for memcpy

#include <wtf/FastAllocBase.h>

@@public:

    FloatQuad projectQuad(const FloatQuad&) const;

    // Projects the four corners of the quad and takes a bounding box,

    // while sanitizing values created when the w component is negative.

170 LayoutRect clampedBoundsOfProjectedQuad(const FloatQuad&) const;

170 FractionalLayoutRect clampedBoundsOfProjectedQuad(const FloatQuad&) const;

    double m11() const { return m_matrix[0][0]; }

    void setM11(double f) { m_matrix[0][0] = f; }

124516

Source/WebCore/rendering/HitTestingTransformState.cpp

@@FloatQuad HitTestingTransformState::mapp

    return m_accumulatedTransform.inverse().projectQuad(m_lastPlanarArea);

}

82 LayoutRect HitTestingTransformState::boundsOfMappedArea() const

82FractionalLayoutRect HitTestingTransformState::boundsOfMappedArea() const

{

    return m_accumulatedTransform.inverse().clampedBoundsOfProjectedQuad(m_lastPlanarArea);

}

124516

Source/WebCore/rendering/HitTestingTransformState.h

@@public:

    FloatPoint mappedPoint() const;

    FloatQuad mappedQuad() const;

    FloatQuad mappedArea() const;

62 LayoutRect boundsOfMappedArea() const;

62 FractionalLayoutRect boundsOfMappedArea() const;

    void flatten();

    FloatPoint m_lastPlanarPoint;

124516