Build fix followup to r209379:
authorhyatt@apple.com <hyatt@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 6 Dec 2016 05:39:15 +0000 (05:39 +0000)
committerhyatt@apple.com <hyatt@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 6 Dec 2016 05:39:15 +0000 (05:39 +0000)
STP 19 fails to launch on 16B255
https://bugs.webkit.org/show_bug.cgi?id=165388
-and corresponding-
rdar://problem/29514476

Patch by Brady Eidson <beidson@apple.com> on 2016-12-05
Rubberstamped by Tim Horton.

No new tests (No behavior change).

* platform/spi/cocoa/NSTouchBarSPI.h: Strategically relocate NS_ASSUME_NONNULL* macros.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@209386 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/rendering/svg/SVGResources.cpp

index ddb7a25..49bd988 100644 (file)
 
 2016-12-05  Dave Hyatt  <hyatt@apple.com>
 
+        [CSS Parser] Make sure the SVGPaint URI and currentColor style still paints using the URI
+        https://bugs.webkit.org/show_bug.cgi?id=165457
+
+        Reviewed by Zalan Bujtas.
+
+        * rendering/svg/SVGResources.cpp:
+        (WebCore::paintingResourceFromSVGPaint):
+        Add support for this paint type. The old parser doesn't use it.
+
+2016-12-05  Dave Hyatt  <hyatt@apple.com>
+
         [CSS Parser] Fix dashboard region parsing
         https://bugs.webkit.org/show_bug.cgi?id=165456
 
index fcfa064..dec92fb 100644 (file)
@@ -157,7 +157,7 @@ static inline String targetReferenceFromResource(SVGElement& element)
 
 static inline RenderSVGResourceContainer* paintingResourceFromSVGPaint(Document& document, const SVGPaint::SVGPaintType& paintType, const String& paintUri, AtomicString& id, bool& hasPendingResource)
 {
-    if (paintType != SVGPaint::SVG_PAINTTYPE_URI && paintType != SVGPaint::SVG_PAINTTYPE_URI_RGBCOLOR)
+    if (paintType != SVGPaint::SVG_PAINTTYPE_URI && paintType != SVGPaint::SVG_PAINTTYPE_URI_RGBCOLOR && paintType != SVGPaint::SVG_PAINTTYPE_URI_CURRENTCOLOR)
         return 0;
 
     id = SVGURIReference::fragmentIdentifierFromIRIString(paintUri, document);