Changeset 109340 in webkit

Timestamp:

Mar 1, 2012 5:44:44 AM (12 years ago)

Author:

Nikolas Zimmermann

Message:

Unreviewed, rolling out r109255.
​http://trac.webkit.org/changeset/109255
​https://bugs.webkit.org/show_bug.cgi?id=79932

Breaks rounded rects with dashed strokes in SVG

Source/WebCore:

• WebCore.exp.in:
• platform/graphics/Path.cpp:

(WebCore::Path::addRoundedRect):

• platform/graphics/Path.h:

(Path):

• platform/graphics/cg/PathCG.cpp:
• platform/mac/WebCoreSystemInterface.h:
• platform/mac/WebCoreSystemInterface.mm:

Source/WebKit/mac:

• WebCoreSupport/WebSystemInterface.mm:

(InitWebCoreSystemInterface):

Source/WebKit2:

• WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:

(InitWebCoreSystemInterface):

WebKitLibraries:

• WebKitSystemInterface.h:
• libWebKitSystemInterfaceLeopard.a:
• libWebKitSystemInterfaceLion.a:
• libWebKitSystemInterfaceSnowLeopard.a:

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/WebCore.exp.in (modified) (1 diff)
• Source/WebCore/platform/graphics/Path.cpp (modified) (2 diffs)
• Source/WebCore/platform/graphics/Path.h (modified) (1 diff)
• Source/WebCore/platform/graphics/cg/PathCG.cpp (modified) (2 diffs)
• Source/WebCore/platform/mac/WebCoreSystemInterface.h (modified) (2 diffs)
• Source/WebCore/platform/mac/WebCoreSystemInterface.mm (modified) (1 diff)
• Source/WebKit/mac/ChangeLog (modified) (1 diff)
• Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm (modified) (1 diff)
• WebKitLibraries/ChangeLog (modified) (1 diff)
• WebKitLibraries/WebKitSystemInterface.h (modified) (1 diff)
• WebKitLibraries/libWebKitSystemInterfaceLeopard.a (modified) (previous)
• WebKitLibraries/libWebKitSystemInterfaceLion.a (modified) (previous)
• WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a (modified) (previous)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-01  Nikolas Zimmermann  <nzimmermann@rim.com>
+
+        Unreviewed, rolling out r109255.
+        http://trac.webkit.org/changeset/109255
+        https://bugs.webkit.org/show_bug.cgi?id=79932
+
+        Breaks rounded rects with dashed strokes in SVG
+
+        * WebCore.exp.in:
+        * platform/graphics/Path.cpp:
+        (WebCore::Path::addRoundedRect):
+        * platform/graphics/Path.h:
+        (Path):
+        * platform/graphics/cg/PathCG.cpp:
+        * platform/mac/WebCoreSystemInterface.h:
+        * platform/mac/WebCoreSystemInterface.mm:
+
 2012-03-01  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -1518 +1518 @@
 _wkCGContextGetShouldSmoothFonts
 _wkCGContextResetClip
-#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
-_wkCGPathAddRoundedRect
-#endif
 _wkCGPatternCreateWithImageAndTransform
 _wkCopyCFLocalizationPreferredName

trunk/Source/WebCore/platform/graphics/Path.cpp

@@ -116 +116 @@
         radius.setHeight(halfSize.height());
 
-    addPathForRoundedRect(rect, radius, radius, radius, radius);
+    addBeziersForRoundedRect(rect, radius, radius, radius, radius);
 }
 
@@ -133 +133 @@
     }
 
-    addPathForRoundedRect(rect, topLeftRadius, topRightRadius, bottomLeftRadius, bottomRightRadius);
-}
-
-#if !USE(CG)
-void Path::addPathForRoundedRect(const FloatRect& rect, const FloatSize& topLeftRadius, const FloatSize& topRightRadius, const FloatSize& bottomLeftRadius, const FloatSize& bottomRightRadius)
-{
     addBeziersForRoundedRect(rect, topLeftRadius, topRightRadius, bottomLeftRadius, bottomRightRadius);
 }
-#endif
 
 // Approximation of control point positions on a bezier to simulate a quarter of a circle.

trunk/Source/WebCore/platform/graphics/Path.h

@@ -147 +147 @@
         void transform(const AffineTransform&);
 
-        void addPathForRoundedRect(const FloatRect&, const FloatSize& topLeftRadius, const FloatSize& topRightRadius, const FloatSize& bottomLeftRadius, const FloatSize& bottomRightRadius);
         void addBeziersForRoundedRect(const FloatRect&, const FloatSize& topLeftRadius, const FloatSize& topRightRadius, const FloatSize& bottomLeftRadius, const FloatSize& bottomRightRadius);
 

trunk/Source/WebCore/platform/graphics/cg/PathCG.cpp

@@ -40 +40 @@
 #include <wtf/RetainPtr.h>
 
-#if PLATFORM(MAC) || PLATFORM(CHROMIUM)
-#include "WebCoreSystemInterface.h"
-#endif
-
-#if PLATFORM(WIN)
-#include <WebKitSystemInterface/WebKitSystemInterface.h>
-#endif
-
 namespace WebCore {
 
@@ -233 +225 @@
 {
     CGPathAddArcToPoint(m_path, 0, p1.x(), p1.y(), p2.x(), p2.y(), radius);
-}
-
-void Path::addPathForRoundedRect(const FloatRect& rect, const FloatSize& topLeftRadius, const FloatSize& topRightRadius, const FloatSize& bottomLeftRadius, const FloatSize& bottomRightRadius)
-{
-#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
-    bool equalWidths = (topLeftRadius.width() == topRightRadius.width() && topRightRadius.width() == bottomLeftRadius.width() && bottomLeftRadius.width() == bottomRightRadius.width());
-    bool equalHeights = (topLeftRadius.height() == bottomLeftRadius.height() && bottomLeftRadius.height() == topRightRadius.height() && topRightRadius.height() == bottomRightRadius.height());
-
-    if (equalWidths && equalHeights) {
-        wkCGPathAddRoundedRect(m_path, 0, rect, topLeftRadius.width(), topLeftRadius.height());
-        return;
-    }
-#endif
-
-    addBeziersForRoundedRect(rect, topLeftRadius, topRightRadius, bottomLeftRadius, bottomRightRadius);
 }
 

trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h

@@ -42 +42 @@
 typedef struct CGColorSpace *CGColorSpaceRef;
 typedef struct CGPattern *CGPatternRef;
-typedef struct CGPath *CGMutablePathRef;
 typedef unsigned short CGGlyph;
 typedef struct __CFReadStream * CFReadStreamRef;
@@ -307 +306 @@
 #endif
 
-#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
-extern void (*wkCGPathAddRoundedRect)(CGMutablePathRef path, const CGAffineTransform* matrix, CGRect rect, CGFloat cornerWidth, CGFloat cornerHeight);
-#endif
-
 }
 

trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm

@@ -186 +186 @@
 bool (*wkExecutableWasLinkedOnOrBeforeLion)(void);
 #endif
-
-#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
-void (*wkCGPathAddRoundedRect)(CGMutablePathRef path, const CGAffineTransform* matrix, CGRect rect, CGFloat cornerWidth, CGFloat cornerHeight);
-#endif

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2012-03-01  Nikolas Zimmermann  <nzimmermann@rim.com>
+
+        Unreviewed, rolling out r109255.
+        http://trac.webkit.org/changeset/109255
+        https://bugs.webkit.org/show_bug.cgi?id=79932
+
+        Breaks rounded rects with dashed strokes in SVG
+
+        * WebCoreSupport/WebSystemInterface.mm:
+        (InitWebCoreSystemInterface):
+
 2012-02-29  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm

@@ -179 +179 @@
 #endif
 
-#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
-    INIT(CGPathAddRoundedRect);
-#endif
-
     didInit = true;
 }

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-03-01  Nikolas Zimmermann  <nzimmermann@rim.com>
+
+        Unreviewed, rolling out r109255.
+        http://trac.webkit.org/changeset/109255
+        https://bugs.webkit.org/show_bug.cgi?id=79932
+
+        Breaks rounded rects with dashed strokes in SVG
+
+        * WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
+        (InitWebCoreSystemInterface):
+
 2012-03-01  Sergio Villar Senin  <svillar@igalia.com>
 

trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm

@@ -164 +164 @@
 #endif
 
-#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
-        INIT(CGPathAddRoundedRect);
-#endif
-
     });
 }

trunk/WebKitLibraries/ChangeLog

@@ +1 @@
+2012-03-01  Nikolas Zimmermann  <nzimmermann@rim.com>
+
+        Unreviewed, rolling out r109255.
+        http://trac.webkit.org/changeset/109255
+        https://bugs.webkit.org/show_bug.cgi?id=79932
+
+        Breaks rounded rects with dashed strokes in SVG
+
+        * WebKitSystemInterface.h:
+        * libWebKitSystemInterfaceLeopard.a:
+        * libWebKitSystemInterfaceLion.a:
+        * libWebKitSystemInterfaceSnowLeopard.a:
+
 2012-02-29  Tim Horton  <timothy_horton@apple.com>
 

trunk/WebKitLibraries/WebKitSystemInterface.h

@@ -472 +472 @@
 #endif
 
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
-void WKCGPathAddRoundedRect(CGMutablePathRef path, const CGAffineTransform* matrix, CGRect rect, CGFloat cornerWidth, CGFloat cornerHeight);
-#endif
-
 #ifdef __cplusplus
 }