Title: [150646] trunk/Source/WebCore
- Revision
- 150646
- Author
- commit-qu...@webkit.org
- Date
- 2013-05-24 10:28:38 -0700 (Fri, 24 May 2013)
Log Message
Path: upstream the missing bits from the BlackBerry port
https://bugs.webkit.org/show_bug.cgi?id=116658
Patch by Alberto Garcia <agar...@igalia.com> on 2013-05-24
Reviewed by Xan Lopez.
PathBlackBerry was upstreamed a while ago (r144612) but a few bits
were missing from the cross-platform code.
* platform/graphics/Path.cpp:
(WebCore::Path::addPathForRoundedRect):
* platform/graphics/Path.h:
(Graphics):
(Path):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (150645 => 150646)
--- trunk/Source/WebCore/ChangeLog 2013-05-24 17:16:24 UTC (rev 150645)
+++ trunk/Source/WebCore/ChangeLog 2013-05-24 17:28:38 UTC (rev 150646)
@@ -1,3 +1,19 @@
+2013-05-24 Alberto Garcia <agar...@igalia.com>
+
+ Path: upstream the missing bits from the BlackBerry port
+ https://bugs.webkit.org/show_bug.cgi?id=116658
+
+ Reviewed by Xan Lopez.
+
+ PathBlackBerry was upstreamed a while ago (r144612) but a few bits
+ were missing from the cross-platform code.
+
+ * platform/graphics/Path.cpp:
+ (WebCore::Path::addPathForRoundedRect):
+ * platform/graphics/Path.h:
+ (Graphics):
+ (Path):
+
2013-05-24 Noam Rosenthal <n...@webkit.org>
WebProcess is crashing on http://achicu.github.io/css-presentation when direct pattern compositing is enabled
Modified: trunk/Source/WebCore/platform/graphics/Path.cpp (150645 => 150646)
--- trunk/Source/WebCore/platform/graphics/Path.cpp 2013-05-24 17:16:24 UTC (rev 150645)
+++ trunk/Source/WebCore/platform/graphics/Path.cpp 2013-05-24 17:28:38 UTC (rev 150646)
@@ -150,7 +150,7 @@
return;
}
-#if USE(CG)
+#if USE(CG) || PLATFORM(BLACKBERRY)
platformAddPathForRoundedRect(rect, topLeftRadius, topRightRadius, bottomLeftRadius, bottomRightRadius);
#else
addBeziersForRoundedRect(rect, topLeftRadius, topRightRadius, bottomLeftRadius, bottomRightRadius);
Modified: trunk/Source/WebCore/platform/graphics/Path.h (150645 => 150646)
--- trunk/Source/WebCore/platform/graphics/Path.h 2013-05-24 17:16:24 UTC (rev 150645)
+++ trunk/Source/WebCore/platform/graphics/Path.h 2013-05-24 17:28:38 UTC (rev 150646)
@@ -47,6 +47,11 @@
class PlatformPath;
}
typedef WebCore::PlatformPath PlatformPath;
+#elif PLATFORM(BLACKBERRY)
+namespace BlackBerry { namespace Platform { namespace Graphics {
+ class Path;
+} } }
+typedef BlackBerry::Platform::Graphics::Path PlatformPath;
#else
typedef void PlatformPath;
#endif
@@ -157,12 +162,12 @@
void addPathForRoundedRect(const FloatRect&, const FloatSize& topLeftRadius, const FloatSize& topRightRadius, const FloatSize& bottomLeftRadius, const FloatSize& bottomRightRadius, RoundedRectStrategy = PreferNativeRoundedRect);
void addBeziersForRoundedRect(const FloatRect&, const FloatSize& topLeftRadius, const FloatSize& topRightRadius, const FloatSize& bottomLeftRadius, const FloatSize& bottomRightRadius);
-#if USE(CG)
+#if USE(CG) || PLATFORM(BLACKBERRY)
void platformAddPathForRoundedRect(const FloatRect&, const FloatSize& topLeftRadius, const FloatSize& topRightRadius, const FloatSize& bottomLeftRadius, const FloatSize& bottomRightRadius);
#endif
#if PLATFORM(BLACKBERRY)
- Path(const SkPath&);
+ Path(const PlatformPath&);
#endif
private:
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
