Title: [201250] branches/safari-602.1.32-branch/Source/WebCore
- Revision
- 201250
- Author
- [email protected]
- Date
- 2016-05-22 09:51:42 -0700 (Sun, 22 May 2016)
Log Message
Merge r201229. rdar://problem/26396532
Modified Paths
Diff
Modified: branches/safari-602.1.32-branch/Source/WebCore/ChangeLog (201249 => 201250)
--- branches/safari-602.1.32-branch/Source/WebCore/ChangeLog 2016-05-22 16:51:40 UTC (rev 201249)
+++ branches/safari-602.1.32-branch/Source/WebCore/ChangeLog 2016-05-22 16:51:42 UTC (rev 201250)
@@ -1,5 +1,22 @@
2016-05-22 Babak Shafiei <[email protected]>
+ Merge r201229. rdar://problem/26396532
+
+ 2016-05-20 Anders Carlsson <[email protected]>
+
+ Allow named images on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=157960
+ rdar://problem/26396532
+
+ Reviewed by Dean Jackson.
+
+ USE(NEW_THEME) is false on iOS so force named images to be drawn by checking PLATFORM(IOS) as well.
+
+ * platform/graphics/NamedImageGeneratedImage.cpp:
+ (WebCore::NamedImageGeneratedImage::draw):
+
+2016-05-22 Babak Shafiei <[email protected]>
+
Merge r201233. rdar://problem/26397571
2016-05-20 Jer Noble <[email protected]>
Modified: branches/safari-602.1.32-branch/Source/WebCore/platform/graphics/NamedImageGeneratedImage.cpp (201249 => 201250)
--- branches/safari-602.1.32-branch/Source/WebCore/platform/graphics/NamedImageGeneratedImage.cpp 2016-05-22 16:51:40 UTC (rev 201249)
+++ branches/safari-602.1.32-branch/Source/WebCore/platform/graphics/NamedImageGeneratedImage.cpp 2016-05-22 16:51:42 UTC (rev 201250)
@@ -42,7 +42,7 @@
void NamedImageGeneratedImage::draw(GraphicsContext& context, const FloatRect& dstRect, const FloatRect& srcRect, CompositeOperator compositeOp, BlendMode blendMode, ImageOrientationDescription)
{
-#if USE(NEW_THEME)
+#if USE(NEW_THEME) || PLATFORM(IOS)
GraphicsContextStateSaver stateSaver(context);
context.setCompositeOperation(compositeOp, blendMode);
context.clip(dstRect);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes