Changeset 107954 in webkit


Ignore:
Timestamp:
Feb 16, 2012 10:12:25 AM (12 years ago)
Author:
Adam Roben
Message:

Roll out r107887

It broke 32-bit builds due to truncation from "long long" to "int".

Original bug is <​http://webkit.org/b/76571> Add FractionalLayoutPoint/Size/Rect for
sub-pixel layout

  • CMakeLists.txt:
  • GNUmakefile.list.am:
  • WebCore.gypi:
  • WebCore.order:
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.xcodeproj/project.pbxproj:
  • platform/FractionalLayoutUnit.h:

(WebCore::FractionalLayoutUnit::isInBounds):
(WebCore::operator==):
(WebCore::operator*):

  • platform/graphics/FloatPoint.cpp:
  • platform/graphics/FloatPoint.h:

(WebCore):
(FloatPoint):
(WebCore::FloatPoint::move):
(WebCore::FloatPoint::moveBy):

  • platform/graphics/FloatRect.cpp:
  • platform/graphics/FloatRect.h:

(WebCore):

  • platform/graphics/FloatSize.cpp:
  • platform/graphics/FloatSize.h:

(WebCore):

  • platform/graphics/FractionalLayoutPoint.h: Removed.
  • platform/graphics/FractionalLayoutRect.cpp: Removed.
  • platform/graphics/FractionalLayoutRect.h: Removed.
  • platform/graphics/FractionalLayoutSize.cpp: Removed.
  • platform/graphics/FractionalLayoutSize.h: Removed.
  • platform/graphics/IntRect.cpp:
  • platform/graphics/IntRect.h:

(WebCore):
(IntRect):

Location:
trunk/Source/WebCore
Files:
5 deleted
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/CMakeLists.txt

    r107952 r107954  
    11011101    platform/graphics/Color.cpp
    11021102    platform/graphics/CrossfadeGeneratedImage.cpp
    1103     platform/graphics/FractionalLayoutRect.cpp
    1104     platform/graphics/FractionalLayoutSize.cpp
    11051103    platform/graphics/FloatPoint.cpp
    11061104    platform/graphics/FloatPoint3D.cpp

  • trunk/Source/WebCore/ChangeLog

    r107953 r107954  
     12012-02-16  Adam Roben  <aroben@apple.com>
     2
     3        Roll out r107887
     4
     5        It broke 32-bit builds due to truncation from "long long" to "int".
     6
     7        Original bug is <http://webkit.org/b/76571> Add FractionalLayoutPoint/Size/Rect for
     8        sub-pixel layout
     9
     10        * CMakeLists.txt:
     11        * GNUmakefile.list.am:
     12        * WebCore.gypi:
     13        * WebCore.order:
     14        * WebCore.vcproj/WebCore.vcproj:
     15        * WebCore.xcodeproj/project.pbxproj:
     16        * platform/FractionalLayoutUnit.h:
     17        (WebCore::FractionalLayoutUnit::isInBounds):
     18        (WebCore::operator==):
     19        (WebCore::operator*):
     20        * platform/graphics/FloatPoint.cpp:
     21        * platform/graphics/FloatPoint.h:
     22        (WebCore):
     23        (FloatPoint):
     24        (WebCore::FloatPoint::move):
     25        (WebCore::FloatPoint::moveBy):
     26        * platform/graphics/FloatRect.cpp:
     27        * platform/graphics/FloatRect.h:
     28        (WebCore):
     29        * platform/graphics/FloatSize.cpp:
     30        * platform/graphics/FloatSize.h:
     31        (WebCore):
     32        * platform/graphics/FractionalLayoutPoint.h: Removed.
     33        * platform/graphics/FractionalLayoutRect.cpp: Removed.
     34        * platform/graphics/FractionalLayoutRect.h: Removed.
     35        * platform/graphics/FractionalLayoutSize.cpp: Removed.
     36        * platform/graphics/FractionalLayoutSize.h: Removed.
     37        * platform/graphics/IntRect.cpp:
     38        * platform/graphics/IntRect.h:
     39        (WebCore):
     40        (IntRect):
     41
    1422012-02-16  Pavel Feldman  <pfeldman@google.com>
    243

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

    r107952 r107954  
    29632963        Source/WebCore/platform/graphics/filters/arm/FELightingNEON.cpp \
    29642964        Source/WebCore/platform/graphics/filters/arm/FELightingNEON.h \
    2965         Source/WebCore/platform/graphics/FractionalLayoutPoint.h \
    2966         Source/WebCore/platform/graphics/FractionalLayoutRect.cpp \
    2967         Source/WebCore/platform/graphics/FractionalLayoutRect.h \
    2968         Source/WebCore/platform/graphics/FractionalLayoutSize.cpp \
    2969         Source/WebCore/platform/graphics/FractionalLayoutSize.h \
    29702965        Source/WebCore/platform/graphics/FloatPoint3D.cpp \
    29712966        Source/WebCore/platform/graphics/FloatPoint3D.h \

  • trunk/Source/WebCore/WebCore.gypi

    r107952 r107954  
    30143014            'platform/graphics/CrossfadeGeneratedImage.h',
    30153015            'platform/graphics/Extensions3D.h',
    3016             'platform/graphics/FractionalLayoutRect.cpp',
    3017             'platform/graphics/FractionalLayoutSize.cpp',
    30183016            'platform/graphics/FloatPoint.cpp',
    30193017            'platform/graphics/FloatPoint3D.cpp',

  • trunk/Source/WebCore/WebCore.order

    r107887 r107954  
    1032110321__ZNK7WebCore22CSSImageGeneratorValue21isImageGeneratorValueEv
    1032210322__ZN7WebCore22CSSImageGeneratorValue14generatedImageEv
    10323 __ZNK7WebCore14CSSCanvasValue11isFractionalLayoutSizeEv
     10323__ZNK7WebCore14CSSCanvasValue11isFixedSizeEv
    1032410324__ZN7WebCore19StyleGeneratedImage9addClientEPNS_12RenderObjectE
    1032510325__ZN7WebCore22CSSImageGeneratorValue9addClientEPNS_12RenderObjectERKNS_7IntSizeE
    … …  
    1045510455__ZN7WebCore23BorderImageParseContext17commitBorderImageEPNS_9CSSParserEb
    1045610456__ZN7WebCore23BorderImageParseContextD1Ev
    10457 __ZNK7WebCore22CSSImageGeneratorValue11isFractionalLayoutSizeEv
     10457__ZNK7WebCore22CSSImageGeneratorValue11isFixedSizeEv
    1045810458__ZN7WebCore16CSSGradientValue5imageEPNS_12RenderObjectERKNS_7IntSizeE
    1045910459__ZNK3WTF9HashTableIPN7WebCore12RenderObjectESt4pairIS3_S4_INS1_7IntSizeEiEENS_18PairFirstExtractorIS7_EENS_7PtrHashIS3_EENS_14PairHashTraitsINS_10HashTraitsIS3_EENSD_IS6_EEEESE_E8containsIS3_NS_22IdentityHashTranslatorIS3_S7_SB_EEEEbRKT_

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

    r107887 r107954  
    2752627526                                </File>
    2752727527                                <File
    27528                                         RelativePath="..\platform\graphics\FractionalLayoutPoint.h"
    27529                                         >
    27530                                 </File>
    27531                                 <File
    27532                                         RelativePath="..\platform\graphics\FractionalLayoutRect.cpp"
    27533                                         >
    27534                                 </File>
    27535                                 <File
    27536                                         RelativePath="..\platform\graphics\FractionalLayoutRect.h"
    27537                                         >
    27538                                 </File>
    27539                                 <File
    27540                                         RelativePath="..\platform\graphics\FractionalLayoutSize.cpp"
    27541                                         >
    27542                                 </File>
    27543                                 <File
    27544                                         RelativePath="..\platform\graphics\FractionalLayoutSize.h"
    27545                                         >
    27546                                 </File>
    27547                                 <File
    2754827528                                        RelativePath="..\platform\graphics\FloatPoint.cpp"
    2754927529                                        >

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

    r107952 r107954  
    298298                1449E24C107D4A8400B5793F /* JSCallbackData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1449E24A107D4A8400B5793F /* JSCallbackData.h */; };
    299299                1449E287107D4DB400B5793F /* JSCallbackData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1449E286107D4DB400B5793F /* JSCallbackData.cpp */; };
    300                 144FCE5214EC79BC000D17A3 /* FractionalLayoutUnit.h in Headers */ = {isa = PBXBuildFile; fileRef = 144FCE5114EC79BC000D17A3 /* FractionalLayoutUnit.h */; settings = {ATTRIBUTES = (Private, ); }; };
    301                 144FCE5914EC79E7000D17A3 /* FractionalLayoutPoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 144FCE5414EC79E7000D17A3 /* FractionalLayoutPoint.h */; settings = {ATTRIBUTES = (Private, ); }; };
    302                 144FCE5A14EC79E7000D17A3 /* FractionalLayoutRect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 144FCE5514EC79E7000D17A3 /* FractionalLayoutRect.cpp */; };
    303                 144FCE5B14EC79E7000D17A3 /* FractionalLayoutRect.h in Headers */ = {isa = PBXBuildFile; fileRef = 144FCE5614EC79E7000D17A3 /* FractionalLayoutRect.h */; settings = {ATTRIBUTES = (Private, ); }; };
    304                 144FCE5C14EC79E7000D17A3 /* FractionalLayoutSize.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 144FCE5714EC79E7000D17A3 /* FractionalLayoutSize.cpp */; };
    305                 144FCE5D14EC79E7000D17A3 /* FractionalLayoutSize.h in Headers */ = {isa = PBXBuildFile; fileRef = 144FCE5814EC79E7000D17A3 /* FractionalLayoutSize.h */; settings = {ATTRIBUTES = (Private, ); }; };
    306300                1464E06C135EC10600FDB00A /* JSMediaListCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1464E06B135EC10600FDB00A /* JSMediaListCustom.cpp */; };
    307301                1477E7760BF4134A00152872 /* PageCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1477E7740BF4134A00152872 /* PageCache.cpp */; };
    … …  
    50014995                B8DBDB4D130B0F8A00F5CDB1 /* SpellingCorrectionCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B8DBDB49130B0F8A00F5CDB1 /* SpellingCorrectionCommand.cpp */; };
    50024996                B8DBDB4E130B0F8A00F5CDB1 /* SpellingCorrectionCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = B8DBDB4A130B0F8A00F5CDB1 /* SpellingCorrectionCommand.h */; };
     4997                BAB22AD414B7A02D00D8ABA6 /* FractionalLayoutUnit.h in Headers */ = {isa = PBXBuildFile; fileRef = BAB771501444CBB400EC4C4C /* FractionalLayoutUnit.h */; settings = {ATTRIBUTES = (Private, ); }; };
    50034998                BACF290113B2A0D500781F90 /* LayoutTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = BACF290013B2A0D500781F90 /* LayoutTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
    50044999                BC00F0040E0A185500FD04E3 /* DOMFile.h in Headers */ = {isa = PBXBuildFile; fileRef = BC00EFFE0E0A185500FD04E3 /* DOMFile.h */; };
    … …  
    70267021                1449E24A107D4A8400B5793F /* JSCallbackData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCallbackData.h; sourceTree = "<group>"; };
    70277022                1449E286107D4DB400B5793F /* JSCallbackData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCallbackData.cpp; sourceTree = "<group>"; };
    7028                 144FCE5114EC79BC000D17A3 /* FractionalLayoutUnit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FractionalLayoutUnit.h; sourceTree = "<group>"; };
    7029                 144FCE5414EC79E7000D17A3 /* FractionalLayoutPoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FractionalLayoutPoint.h; sourceTree = "<group>"; };
    7030                 144FCE5514EC79E7000D17A3 /* FractionalLayoutRect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FractionalLayoutRect.cpp; sourceTree = "<group>"; };
    7031                 144FCE5614EC79E7000D17A3 /* FractionalLayoutRect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FractionalLayoutRect.h; sourceTree = "<group>"; };
    7032                 144FCE5714EC79E7000D17A3 /* FractionalLayoutSize.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FractionalLayoutSize.cpp; sourceTree = "<group>"; };
    7033                 144FCE5814EC79E7000D17A3 /* FractionalLayoutSize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FractionalLayoutSize.h; sourceTree = "<group>"; };
    70347023                1464E06B135EC10600FDB00A /* JSMediaListCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMediaListCustom.cpp; sourceTree = "<group>"; };
    70357024                1477E7740BF4134A00152872 /* PageCache.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PageCache.cpp; sourceTree = "<group>"; };
    … …  
    1192511914                B8DBDB49130B0F8A00F5CDB1 /* SpellingCorrectionCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SpellingCorrectionCommand.cpp; sourceTree = "<group>"; };
    1192611915                B8DBDB4A130B0F8A00F5CDB1 /* SpellingCorrectionCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpellingCorrectionCommand.h; sourceTree = "<group>"; };
     11916                BAB771501444CBB400EC4C4C /* FractionalLayoutUnit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FractionalLayoutUnit.h; sourceTree = "<group>"; };
    1192711917                BACF290013B2A0D500781F90 /* LayoutTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LayoutTypes.h; sourceTree = "<group>"; };
    1192811918                BC00EFFE0E0A185500FD04E3 /* DOMFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMFile.h; sourceTree = "<group>"; };
    … …  
    1893518925                                3784C34A0E11AA34007D8D48 /* FontTraitsMask.h */,
    1893618926                                BCE4413512F7490B009B84B8 /* FontWidthVariant.h */,
    18937                                 144FCE5414EC79E7000D17A3 /* FractionalLayoutPoint.h */,
    18938                                 144FCE5514EC79E7000D17A3 /* FractionalLayoutRect.cpp */,
    18939                                 144FCE5614EC79E7000D17A3 /* FractionalLayoutRect.h */,
    18940                                 144FCE5714EC79E7000D17A3 /* FractionalLayoutSize.cpp */,
    18941                                 144FCE5814EC79E7000D17A3 /* FractionalLayoutSize.h */,
    1894218927                                BC23F0DA0DAFF4A4009FDC91 /* GeneratedImage.h */,
    1894318928                                BCE04C890DAFF7A0007A0F41 /* Generator.h */,
    … …  
    1981519800                                514B3F720C722047000530DF /* FileSystem.h */,
    1981619801                                BC073BA90C399B1F000F5979 /* FloatConversion.h */,
    19817                                 144FCE5114EC79BC000D17A3 /* FractionalLayoutUnit.h */,
     19802                                BAB771501444CBB400EC4C4C /* FractionalLayoutUnit.h */,
    1981819803                                A8748BDF12CBF2DC001FBA41 /* HashTools.h */,
    1981919804                                D6FDAEF2149C06190037B1E1 /* HistogramSupport.cpp */,
    … …  
    2121421199                                9B417064125662B3006B28FC /* ApplyBlockElementCommand.h in Headers */,
    2121521200                                93309DD9099E64920056E581 /* ApplyStyleCommand.h in Headers */,
     21201                                BAB22AD414B7A02D00D8ABA6 /* FractionalLayoutUnit.h in Headers */,
    2121621202                                512DD8F60D91E6AF000F89EE /* Archive.h in Headers */,
    2121721203                                512DD8FD0D91E6AF000F89EE /* ArchiveFactory.h in Headers */,
    … …  
    2429424280                                C598905714E9C28000E8D18B /* PasteboardStrategy.h in Headers */,
    2429524281                                C598905814E9C29900E8D18B /* PlatformPasteboard.h in Headers */,
    24296                                 144FCE5214EC79BC000D17A3 /* FractionalLayoutUnit.h in Headers */,
    24297                                 144FCE5914EC79E7000D17A3 /* FractionalLayoutPoint.h in Headers */,
    24298                                 144FCE5B14EC79E7000D17A3 /* FractionalLayoutRect.h in Headers */,
    24299                                 144FCE5D14EC79E7000D17A3 /* FractionalLayoutSize.h in Headers */,
    2430024282                        );
    2430124283                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    2724327225                                B6D9D27C14EAC0860090D75E /* JSFocusEvent.cpp in Sources */,
    2724427226                                C598902E14E9B0F800E8D18B /* PlatformPasteboardMac.mm in Sources */,
    27245                                 144FCE5A14EC79E7000D17A3 /* FractionalLayoutRect.cpp in Sources */,
    27246                                 144FCE5C14EC79E7000D17A3 /* FractionalLayoutSize.cpp in Sources */,
    2724727227                        );
    2724827228                        runOnlyForDeploymentPostprocessing = 0;

  • trunk/Source/WebCore/platform/FractionalLayoutUnit.h

    r107937 r107954  
    116116    inline bool isInBounds(unsigned value)
    117117    {
    118         return value < static_cast<unsigned>(std::numeric_limits<int>::max()) / kFixedPointDenominator;
     118        return value < std::numeric_limits<int>::max() / kFixedPointDenominator;
    119119    }
    120120    inline bool isInBounds(double value)
    … …  
    263263inline bool operator==(const FractionalLayoutUnit& a, int b)
    264264{
    265     return a == FractionalLayoutUnit(b);
     265    return a == FractionLayoutUnit(b);
    266266}
    267267
    268268inline bool operator==(const int a, const FractionalLayoutUnit& b)
    269269{
    270     return FractionalLayoutUnit(a) == b;
     270    return FractionLayoutUnit(a) == b;
    271271}
    272272
    … …  
    298298    FractionalLayoutUnit returnVal;
    299299    long long rawVal = static_cast<long long>(a.rawValue()) * b.rawValue() / kFixedPointDenominator;
    300     returnVal.setRawValue(rawVal);
     300    returnVal.setRawValue((a.rawValue() / kFixedPointDenominator) * b.rawValue());
    301301    return returnVal;
    302302}   

  • trunk/Source/WebCore/platform/graphics/FloatPoint.cpp

    r107887 r107954  
    2929
    3030#include "AffineTransform.h"
    31 #include "FractionalLayoutPoint.h"
     31#include "TransformationMatrix.h"
    3232#include "FloatConversion.h"
    3333#include "IntPoint.h"
    34 #include "TransformationMatrix.h"
    3534#include <limits>
    3635#include <math.h>
    … …  
    3938
    4039FloatPoint::FloatPoint(const IntPoint& p) : m_x(p.x()), m_y(p.y())
    41 {
    42 }
    43 
    44 FloatPoint::FloatPoint(const FractionalLayoutPoint& p) : m_x(p.x()), m_y(p.y())
    4540{
    4641}
    … …  
    5954{
    6055    return sqrtf(lengthSquared());
    61 }
    62 
    63 void FloatPoint::move(const FractionalLayoutSize& size)
    64 {
    65     m_x += size.width();
    66     m_y += size.height();
    67 }
    68 
    69 void FloatPoint::moveBy(const FractionalLayoutPoint& point)
    70 {
    71     m_x += point.x();
    72     m_y += point.y();
    7356}
    7457

  • trunk/Source/WebCore/platform/graphics/FloatPoint.h

    r107887 r107954  
    6161class IntPoint;
    6262class IntSize;
    63 class FractionalLayoutPoint;
    64 class FractionalLayoutSize;
    6563
    6664class FloatPoint {
    … …  
    6967    FloatPoint(float x, float y) : m_x(x), m_y(y) { }
    7068    FloatPoint(const IntPoint&);
    71     FloatPoint(const FractionalLayoutPoint&);
     69
    7270
    7371    static FloatPoint zero() { return FloatPoint(); }
    … …  
    9593        m_y += a.height();
    9694    }
    97     void move(const FractionalLayoutSize&);
    9895    void move(const FloatSize& a)
    9996    {
    … …  
    106103        m_y += a.y();
    107104    }
    108     void moveBy(const FractionalLayoutPoint&);
    109105    void moveBy(const FloatPoint& a)
    110106    {
    … …  
    134130    {
    135131        return FloatPoint(std::max(m_x, other.m_x), std::max(m_y, other.m_y));
    136     }
    137 
    138     FloatPoint shrunkTo(const FloatPoint& other) const
    139     {
    140         return FloatPoint(m_x < other.m_x ? m_x : other.m_x,
    141             m_y < other.m_y ? m_y : other.m_y);
    142     }
    143 
    144     void clampNegativeToZero()
    145     {
    146         *this = expandedTo(zero());
    147132    }
    148133
    … …  
    255240}
    256241
    257 inline FloatPoint toPoint(const FloatSize& size)
    258 {
    259     return FloatPoint(size.width(), size.height());
    260 }
    261 
    262242float findSlope(const FloatPoint& p1, const FloatPoint& p2, float& c);
    263243

  • trunk/Source/WebCore/platform/graphics/FloatRect.cpp

    r107887 r107954  
    2929
    3030#include "FloatConversion.h"
    31 #include "FractionalLayoutRect.h"
    3231#include "IntRect.h"
    3332#include <algorithm>
    … …  
    4140
    4241FloatRect::FloatRect(const IntRect& r) : m_location(r.location()), m_size(r.size())
    43 {
    44 }
    45 
    46 FloatRect::FloatRect(const FractionalLayoutRect& r) : m_location(r.location()), m_size(r.size())
    4742{
    4843}

  • trunk/Source/WebCore/platform/graphics/FloatRect.h

    r107887 r107954  
    6767#endif
    6868
    69 class FractionalLayoutRect;
    7069class IntRect;
    7170class IntPoint;
    … …  
    8483        : m_location(FloatPoint(x, y)), m_size(FloatSize(width, height)) { }
    8584    FloatRect(const IntRect&);
    86     FloatRect(const FractionalLayoutRect&);
    8785
    8886    static FloatRect narrowPrecision(double x, double y, double width, double height);

  • trunk/Source/WebCore/platform/graphics/FloatSize.cpp

    r107887 r107954  
    2828#include "FloatSize.h"
    2929
    30 #include "FractionalLayoutSize.h"
    3130#include "FloatConversion.h"
    3231#include "IntSize.h"
    … …  
    3938
    4039FloatSize::FloatSize(const IntSize& size) : m_width(size.width()), m_height(size.height())
    41 {
    42 }
    43 
    44 FloatSize::FloatSize(const FractionalLayoutSize& size) : m_width(size.width()), m_height(size.height())
    4540{
    4641}

  • trunk/Source/WebCore/platform/graphics/FloatSize.h

    r107887 r107954  
    4747
    4848class IntSize;
    49 class FractionalLayoutSize;
    5049
    5150class FloatSize {
    … …  
    5453    FloatSize(float width, float height) : m_width(width), m_height(height) { }
    5554    FloatSize(const IntSize&);
    56     FloatSize(const FractionalLayoutSize&);
    5755
    5856    static FloatSize narrowPrecision(double width, double height);

  • trunk/Source/WebCore/platform/graphics/IntRect.cpp

    r107887 r107954  
    2727#include "IntRect.h"
    2828
    29 #include "FractionalLayoutRect.h"
    3029#include "FloatRect.h"
    3130#include <algorithm>
    … …  
    3938    : m_location(IntPoint(static_cast<int>(r.x()), static_cast<int>(r.y())))
    4039    , m_size(IntSize(static_cast<int>(r.width()), static_cast<int>(r.height())))
    41 {
    42 }
    43 
    44 IntRect::IntRect(const FractionalLayoutRect& r)
    45     : m_location(flooredIntPoint(r.location()))
    46     , m_size(flooredIntSize(r.size()))
    4740{
    4841}

  • trunk/Source/WebCore/platform/graphics/IntRect.h

    r107887 r107954  
    7272
    7373class FloatRect;
    74 class FractionalLayoutRect;
    7574
    7675class IntRect {
    … …  
    8281        : m_location(IntPoint(x, y)), m_size(IntSize(width, height)) { }
    8382
    84     explicit IntRect(const FloatRect&); // don't do this implicitly since it's lossy
    85     explicit IntRect(const FractionalLayoutRect&); // don't do this implicitly since it's lossy
     83    explicit IntRect(const FloatRect& rect); // don't do this implicitly since it's lossy
    8684       
    8785    IntPoint location() const { return m_location; }
Note: See TracChangeset for help on using the changeset viewer.