Changeset 187621 in webkit

Timestamp:

Jul 30, 2015 4:41:54 PM (9 years ago)

Author:

Simon Fraser

Message:

Make Path::apply() take a function reference
​https://bugs.webkit.org/show_bug.cgi?id=147472

Reviewed by Anders Carlsson.

Path::apply() should take a const reference to a std::function.

• platform/graphics/Path.h:
• platform/graphics/cairo/PathCairo.cpp:
• platform/graphics/cg/PathCG.cpp:

(WebCore::CGPathApplierToPathApplier):
(WebCore::Path::apply):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/Path.h (modified) (1 diff)
• platform/graphics/cairo/PathCairo.cpp (modified) (1 diff)
• platform/graphics/cg/PathCG.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-07-30  Simon Fraser  <simon.fraser@apple.com>
+
+        Make Path::apply() take a function reference
+        https://bugs.webkit.org/show_bug.cgi?id=147472
+
+        Reviewed by Anders Carlsson.
+
+        Path::apply() should take a const reference to a std::function.
+
+        * platform/graphics/Path.h:
+        * platform/graphics/cairo/PathCairo.cpp:
+        * platform/graphics/cg/PathCG.cpp:
+        (WebCore::CGPathApplierToPathApplier):
+        (WebCore::Path::apply):
+
 2015-07-30  Anders Carlsson  <andersca@apple.com>
 

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

@@ -156 +156 @@
         WEBCORE_EXPORT PlatformPathPtr ensurePlatformPath();
 
-        WEBCORE_EXPORT void apply(PathApplierFunction) const;
+        WEBCORE_EXPORT void apply(const PathApplierFunction&) const;
         void transform(const AffineTransform&);
 

trunk/Source/WebCore/platform/graphics/cairo/PathCairo.cpp

@@ -391 +391 @@
 }
 
-void Path::apply(PathApplierFunction function) const
+void Path::apply(const PathApplierFunction& function) const
 {
     if (isNull())

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

@@ -376 +376 @@
 }
 
-static void CGPathApplierToPathApplier(void *info, const CGPathElement* element)
-{
-    PathApplierFunction function = *(PathApplierFunction*)info;
+static void CGPathApplierToPathApplier(void* info, const CGPathElement* element)
+{
+    const PathApplierFunction& function = *(PathApplierFunction*)info;
     FloatPoint points[3];
     PathElement pelement;
@@ -404 +404 @@
 }
 
-void Path::apply(PathApplierFunction function) const
-{
-    if (isNull())
-        return;
-
-    CGPathApply(m_path, &function, CGPathApplierToPathApplier);
+void Path::apply(const PathApplierFunction& function) const
+{
+    if (isNull())
+        return;
+
+    CGPathApply(m_path, (void*)&function, CGPathApplierToPathApplier);
 }