Changeset 214646 in webkit

Timestamp:

Mar 30, 2017, 6:36:20 PM (8 years ago)

Author:

Megan Gardner

Message:

Allow for extended color in snapshots
​https://bugs.webkit.org/show_bug.cgi?id=170314
<rdar://problem/28676092> WKImageCreateCGImage should support WideGamut in WebKit2 on macOS

Reviewed by Simon Fraser.

Piping options through snapshots to allow for wide gamut support.

• Shared/API/c/WKImage.h:
• Shared/API/c/WKSharedAPICast.h:

(WebKit::snapshotOptionsFromImageOptions):

• Shared/ImageOptions.h:

(WebKit::snapshotOptionsToImageOptions):

• Shared/WebImage.cpp:

(WebKit::WebImage::create):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/API/c/WKImage.h (modified) (1 diff)
• Shared/API/c/WKSharedAPICast.h (modified) (1 diff)
• Shared/ImageOptions.h (modified) (3 diffs)
• Shared/WebImage.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-03-30  Megan Gardner  <megan_gardner@apple.com>
+
+        Allow for extended color in snapshots
+        https://bugs.webkit.org/show_bug.cgi?id=170314
+        <rdar://problem/28676092> WKImageCreateCGImage should support WideGamut in WebKit2 on macOS
+
+        Reviewed by Simon Fraser.
+
+        Piping options through snapshots to allow for wide gamut support.
+
+        * Shared/API/c/WKImage.h:
+        * Shared/API/c/WKSharedAPICast.h:
+        (WebKit::snapshotOptionsFromImageOptions):
+        * Shared/ImageOptions.h:
+        (WebKit::snapshotOptionsToImageOptions):
+        * Shared/WebImage.cpp:
+        (WebKit::WebImage::create):
+
 2017-03-30  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebKit2/Shared/API/c/WKImage.h

@@ -48 +48 @@
     kWKSnapshotOptionsPrinting = 1 << 6,
     kWKSnapshotOptionsExcludeOverflow = 1 << 7,
+    kWKSnapshotOptionsExtendedColor = 1 << 8,
 };
 typedef uint32_t WKSnapshotOptions;

trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h

@@ -932 +932 @@
         snapshotOptions |= SnapshotOptionsShareable;
 
+    if (wkImageOptions & kWKSnapshotOptionsExtendedColor)
+        snapshotOptions |= SnapshotOptionsExtendedColor;
+    
     return snapshotOptions;
 }

trunk/Source/WebKit2/Shared/ImageOptions.h

@@ -31 +31 @@
 enum ImageOptions {
     ImageOptionsShareable = 1 << 0,
+    ImageOptionsExtendedColor = 1 << 1,
 };
 
@@ -42 +43 @@
     SnapshotOptionsForceWhiteText = 1 << 7,
     SnapshotOptionsPrinting = 1 << 8,
+    SnapshotOptionsExtendedColor = 1 << 9,
 };
 typedef uint32_t SnapshotOptions;
@@ -52 +54 @@
     if (snapshotOptions & SnapshotOptionsShareable)
         imageOptions |= ImageOptionsShareable;
+    
+    if (snapshotOptions & SnapshotOptionsExtendedColor)
+        imageOptions |= ImageOptionsExtendedColor;
+    
 
     return static_cast<ImageOptions>(imageOptions);

trunk/Source/WebKit2/Shared/WebImage.cpp

@@ -35 +35 @@
 RefPtr<WebImage> WebImage::create(const IntSize& size, ImageOptions options)
 {
+    int sharableOptions = ShareableBitmap::SupportsAlpha;
+    
+    if (options & ImageOptionsExtendedColor)
+        sharableOptions |= ShareableBitmap::SupportsExtendedColor;
     if (options & ImageOptionsShareable) {
-        auto bitmap = ShareableBitmap::createShareable(size, ShareableBitmap::SupportsAlpha);
+        auto bitmap = ShareableBitmap::createShareable(size, sharableOptions);
         if (!bitmap)
             return nullptr;
         return WebImage::create(bitmap.releaseNonNull());
     }
-    auto bitmap = ShareableBitmap::create(size, ShareableBitmap::SupportsAlpha);
+    auto bitmap = ShareableBitmap::create(size, sharableOptions);
     if (!bitmap)
         return nullptr;