Changeset 211601 in webkit

Timestamp:

Feb 2, 2017 3:21:34 PM (7 years ago)

Author:

Megan Gardner

Message:

Don't attempt wide gammut on older OSes
​https://bugs.webkit.org/show_bug.cgi?id=167754
<rdar://problem/29931587>

Reviewed by Tim Horton.

We need to guard our extended color checks the same way throughout the code, or we will attempt to set up
support for wide gamut partially, which causes crashes when using sharable bitmap.

• WebProcess/WebCoreSupport/mac/WebDragClientMac.mm:

(WebKit::convertImageToBitmap):

• WebProcess/WebPage/ios/WebPageIOS.mm:

(WebKit::WebPage::getPositionInformation):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebCoreSupport/mac/WebDragClientMac.mm (modified) (1 diff)
• WebProcess/WebPage/ios/WebPageIOS.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-02-02  Megan Gardner  <megan_gardner@apple.com>
+
+        Don't attempt wide gammut on older OSes
+        https://bugs.webkit.org/show_bug.cgi?id=167754
+        <rdar://problem/29931587>
+
+        Reviewed by Tim Horton.
+
+        We need to guard our extended color checks the same way throughout the code, or we will attempt to set up
+        support for wide gamut partially, which causes crashes when using sharable bitmap.
+
+        * WebProcess/WebCoreSupport/mac/WebDragClientMac.mm:
+        (WebKit::convertImageToBitmap):
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::WebPage::getPositionInformation):
+
 2017-02-02  Enrica Casucci  <enrica@apple.com>
 

trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm

@@ -63 +63 @@
 {
     ShareableBitmap::Flags flags = ShareableBitmap::SupportsAlpha;
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
     if (screenSupportsExtendedColor(frame.mainFrame().view()))
         flags |= ShareableBitmap::SupportsExtendedColor;
+#endif
     auto bitmap = ShareableBitmap::createShareable(size, flags);
     if (!bitmap)

trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm

@@ -2489 +2489 @@
                                     // FIXME: Only select ExtendedColor on images known to need wide gamut
                                     ShareableBitmap::Flags flags = ShareableBitmap::SupportsAlpha;
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
                                     flags |= screenSupportsExtendedColor() ? ShareableBitmap::SupportsExtendedColor : 0;
+#endif
                                     if (RefPtr<ShareableBitmap> sharedBitmap = ShareableBitmap::createShareable(IntSize(bitmapSize), flags)) {
                                         auto graphicsContext = sharedBitmap->createGraphicsContext();