Title: [193979] branches/safari-601-branch/Source/WebCore
Revision
193979
Author
matthew_han...@apple.com
Date
2015-12-11 13:56:06 -0800 (Fri, 11 Dec 2015)

Log Message

Merge r190911. rdar://problem/23732405

Modified Paths

Diff

Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193978 => 193979)


--- branches/safari-601-branch/Source/WebCore/ChangeLog	2015-12-11 21:56:04 UTC (rev 193978)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog	2015-12-11 21:56:06 UTC (rev 193979)
@@ -1,5 +1,20 @@
 2015-12-11  Matthew Hanson  <matthew_han...@apple.com>
 
+        Merge r193921. rdar://problem/23732405
+
+    2015-12-10  Matthew Hanson  <matthew_han...@apple.com>
+
+            Merge r190911. rdar://problem/23432368
+
+        2015-10-12  Simon Fraser  <simon.fra...@apple.com>
+
+                Fix iOS and Efl builds.
+
+                * platform/graphics/NamedImageGeneratedImage.cpp:
+                (WebCore::NamedImageGeneratedImage::drawPattern):
+
+2015-12-11  Matthew Hanson  <matthew_han...@apple.com>
+
         Merge r193888. rdar://problem/23732405
 
     2015-12-09  Simon Fraser  <simon.fra...@apple.com>

Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/NamedImageGeneratedImage.cpp (193978 => 193979)


--- branches/safari-601-branch/Source/WebCore/platform/graphics/NamedImageGeneratedImage.cpp	2015-12-11 21:56:04 UTC (rev 193978)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/NamedImageGeneratedImage.cpp	2015-12-11 21:56:06 UTC (rev 193979)
@@ -78,6 +78,7 @@
     UNUSED_PARAM(srcRect);
     UNUSED_PARAM(patternTransform);
     UNUSED_PARAM(phase);
+    UNUSED_PARAM(spacing);
     UNUSED_PARAM(styleColorSpace);
     UNUSED_PARAM(dstRect);
     UNUSED_PARAM(compositeOp);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to