Diff
Modified: tags/Safari-536.2/Source/WebCore/ChangeLog (109649 => 109650)
--- tags/Safari-536.2/Source/WebCore/ChangeLog 2012-03-03 03:18:34 UTC (rev 109649)
+++ tags/Safari-536.2/Source/WebCore/ChangeLog 2012-03-03 03:18:34 UTC (rev 109650)
@@ -1,3 +1,24 @@
+2011-03-02 Lucas Forschler <[email protected]>
+
+ Merge 109340
+
+ 2012-03-01 Nikolas Zimmermann <[email protected]>
+
+ 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-02-29 Andreas Kling <[email protected]>
IsSynchronizingStyleAttributeFlag could be purged.
Modified: tags/Safari-536.2/Source/WebCore/WebCore.exp.in (109649 => 109650)
--- tags/Safari-536.2/Source/WebCore/WebCore.exp.in 2012-03-03 03:18:34 UTC (rev 109649)
+++ tags/Safari-536.2/Source/WebCore/WebCore.exp.in 2012-03-03 03:18:34 UTC (rev 109650)
@@ -1516,9 +1516,6 @@
#endif
_wkCGContextGetShouldSmoothFonts
_wkCGContextResetClip
-#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
-_wkCGPathAddRoundedRect
-#endif
_wkCGPatternCreateWithImageAndTransform
_wkCopyCFLocalizationPreferredName
_wkCopyCFURLResponseSuggestedFilename
Modified: tags/Safari-536.2/Source/WebCore/platform/graphics/Path.cpp (109649 => 109650)
--- tags/Safari-536.2/Source/WebCore/platform/graphics/Path.cpp 2012-03-03 03:18:34 UTC (rev 109649)
+++ tags/Safari-536.2/Source/WebCore/platform/graphics/Path.cpp 2012-03-03 03:18:34 UTC (rev 109650)
@@ -115,7 +115,7 @@
if (radius.height() > halfSize.height())
radius.setHeight(halfSize.height());
- addPathForRoundedRect(rect, radius, radius, radius, radius);
+ addBeziersForRoundedRect(rect, radius, radius, radius, radius);
}
void Path::addRoundedRect(const FloatRect& rect, const FloatSize& topLeftRadius, const FloatSize& topRightRadius, const FloatSize& bottomLeftRadius, const FloatSize& bottomRightRadius)
@@ -132,15 +132,8 @@
return;
}
- 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.
// This is 1-kappa, where kappa = 4 * (sqrt(2) - 1) / 3
Modified: tags/Safari-536.2/Source/WebCore/platform/graphics/Path.h (109649 => 109650)
--- tags/Safari-536.2/Source/WebCore/platform/graphics/Path.h 2012-03-03 03:18:34 UTC (rev 109649)
+++ tags/Safari-536.2/Source/WebCore/platform/graphics/Path.h 2012-03-03 03:18:34 UTC (rev 109650)
@@ -146,7 +146,6 @@
void apply(void* info, PathApplierFunction) const;
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);
private:
Modified: tags/Safari-536.2/Source/WebCore/platform/graphics/cg/PathCG.cpp (109649 => 109650)
--- tags/Safari-536.2/Source/WebCore/platform/graphics/cg/PathCG.cpp 2012-03-03 03:18:34 UTC (rev 109649)
+++ tags/Safari-536.2/Source/WebCore/platform/graphics/cg/PathCG.cpp 2012-03-03 03:18:34 UTC (rev 109650)
@@ -39,14 +39,6 @@
#include <wtf/MathExtras.h>
#include <wtf/RetainPtr.h>
-#if PLATFORM(MAC) || PLATFORM(CHROMIUM)
-#include "WebCoreSystemInterface.h"
-#endif
-
-#if PLATFORM(WIN)
-#include <WebKitSystemInterface/WebKitSystemInterface.h>
-#endif
-
namespace WebCore {
static size_t putBytesNowhere(void*, const void*, size_t count)
@@ -234,21 +226,6 @@
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);
-}
-
void Path::closeSubpath()
{
CGPathCloseSubpath(m_path);
Modified: tags/Safari-536.2/Source/WebCore/platform/mac/WebCoreSystemInterface.h (109649 => 109650)
--- tags/Safari-536.2/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2012-03-03 03:18:34 UTC (rev 109649)
+++ tags/Safari-536.2/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2012-03-03 03:18:34 UTC (rev 109650)
@@ -41,7 +41,6 @@
typedef struct CGFont *CGFontRef;
typedef struct CGColorSpace *CGColorSpaceRef;
typedef struct CGPattern *CGPatternRef;
-typedef struct CGPath *CGMutablePathRef;
typedef unsigned short CGGlyph;
typedef struct __CFReadStream * CFReadStreamRef;
typedef struct __CFRunLoop * CFRunLoopRef;
@@ -306,10 +305,6 @@
extern bool (*wkExecutableWasLinkedOnOrBeforeLion)(void);
#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
-
}
#endif
Modified: tags/Safari-536.2/Source/WebCore/platform/mac/WebCoreSystemInterface.mm (109649 => 109650)
--- tags/Safari-536.2/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2012-03-03 03:18:34 UTC (rev 109649)
+++ tags/Safari-536.2/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2012-03-03 03:18:34 UTC (rev 109650)
@@ -185,7 +185,3 @@
NSString *(*wkGetMacOSXVersionString)(void);
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
Modified: tags/Safari-536.2/Source/WebKit/mac/ChangeLog (109649 => 109650)
--- tags/Safari-536.2/Source/WebKit/mac/ChangeLog 2012-03-03 03:18:34 UTC (rev 109649)
+++ tags/Safari-536.2/Source/WebKit/mac/ChangeLog 2012-03-03 03:18:34 UTC (rev 109650)
@@ -1,3 +1,18 @@
+2011-03-02 Lucas Forschler <[email protected]>
+
+ Merge 109340
+
+ 2012-03-01 Nikolas Zimmermann <[email protected]>
+
+ 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 Tim Horton <[email protected]>
Make use of CG rounded-rect primitives
Modified: tags/Safari-536.2/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm (109649 => 109650)
--- tags/Safari-536.2/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2012-03-03 03:18:34 UTC (rev 109649)
+++ tags/Safari-536.2/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2012-03-03 03:18:34 UTC (rev 109650)
@@ -178,9 +178,5 @@
INIT(ExecutableWasLinkedOnOrBeforeLion);
#endif
-#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
- INIT(CGPathAddRoundedRect);
-#endif
-
didInit = true;
}
Modified: tags/Safari-536.2/Source/WebKit2/ChangeLog (109649 => 109650)
--- tags/Safari-536.2/Source/WebKit2/ChangeLog 2012-03-03 03:18:34 UTC (rev 109649)
+++ tags/Safari-536.2/Source/WebKit2/ChangeLog 2012-03-03 03:18:34 UTC (rev 109650)
@@ -1,3 +1,18 @@
+2011-03-02 Lucas Forschler <[email protected]>
+
+ Merge 109340
+
+ 2012-03-01 Nikolas Zimmermann <[email protected]>
+
+ 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-02-28 Brian Weinstein <[email protected]>
WebKit2: didNewFirstVisuallyNonEmptyLayout should be sent to injected bundle
Modified: tags/Safari-536.2/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm (109649 => 109650)
--- tags/Safari-536.2/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2012-03-03 03:18:34 UTC (rev 109649)
+++ tags/Safari-536.2/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2012-03-03 03:18:34 UTC (rev 109650)
@@ -163,9 +163,5 @@
INIT(ExecutableWasLinkedOnOrBeforeLion);
#endif
-#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
- INIT(CGPathAddRoundedRect);
-#endif
-
});
}
Modified: tags/Safari-536.2/WebKitLibraries/ChangeLog (109649 => 109650)
--- tags/Safari-536.2/WebKitLibraries/ChangeLog 2012-03-03 03:18:34 UTC (rev 109649)
+++ tags/Safari-536.2/WebKitLibraries/ChangeLog 2012-03-03 03:18:34 UTC (rev 109650)
@@ -1,3 +1,20 @@
+2011-03-02 Lucas Forschler <[email protected]>
+
+ Merge 109340
+
+ 2012-03-01 Nikolas Zimmermann <[email protected]>
+
+ 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 <[email protected]>
Make use of CG rounded-rect primitives
Modified: tags/Safari-536.2/WebKitLibraries/WebKitSystemInterface.h (109649 => 109650)
--- tags/Safari-536.2/WebKitLibraries/WebKitSystemInterface.h 2012-03-03 03:18:34 UTC (rev 109649)
+++ tags/Safari-536.2/WebKitLibraries/WebKitSystemInterface.h 2012-03-03 03:18:34 UTC (rev 109650)
@@ -471,10 +471,6 @@
bool WKExecutableWasLinkedOnOrBeforeLion(void);
#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
}
#endif
Modified: tags/Safari-536.2/WebKitLibraries/libWebKitSystemInterfaceLeopard.a
(Binary files differ)
Modified: tags/Safari-536.2/WebKitLibraries/libWebKitSystemInterfaceLion.a
(Binary files differ)
Modified: tags/Safari-536.2/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a
(Binary files differ)
