Title: [186939] branches/safari-601.1-branch/Source
- Revision
- 186939
- Author
- matthew_han...@apple.com
- Date
- 2015-07-16 22:33:05 -0700 (Thu, 16 Jul 2015)
Log Message
Merge r186878. rdar://problem/21758722
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (186938 => 186939)
--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-17 05:33:00 UTC (rev 186938)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-17 05:33:05 UTC (rev 186939)
@@ -1,5 +1,20 @@
2015-07-16 Matthew Hanson <matthew_han...@apple.com>
+ Merge r186878. rdar://problem/21758722
+
+ 2015-07-15 Sam Weinig <s...@webkit.org>
+
+ Color match plug-ins
+ <rdar://problem/21758722>
+ https://bugs.webkit.org/show_bug.cgi?id=146987
+
+ Reviewed by Dean Jackson.
+
+ * platform/spi/cocoa/QuartzCoreSPI.h:
+ Add colorMatchUntaggedContent property.
+
+2015-07-16 Matthew Hanson <matthew_han...@apple.com>
+
Merge r186868. rdar://problem/21758704
2015-07-15 Dean Jackson <d...@apple.com>
Modified: branches/safari-601.1-branch/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h (186938 => 186939)
--- branches/safari-601.1-branch/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2015-07-17 05:33:00 UTC (rev 186938)
+++ branches/safari-601.1-branch/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2015-07-17 05:33:05 UTC (rev 186939)
@@ -70,6 +70,9 @@
- (void)setFencePort:(mach_port_t)port;
- (void)setFencePort:(mach_port_t)port commitHandler:(void(^)(void))block;
#endif
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+@property BOOL colorMatchUntaggedContent;
+#endif
@property (readonly) uint32_t contextId;
@property (strong) CALayer *layer;
@property CGColorSpaceRef colorSpace;
Modified: branches/safari-601.1-branch/Source/WebKit2/ChangeLog (186938 => 186939)
--- branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-17 05:33:00 UTC (rev 186938)
+++ branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-17 05:33:05 UTC (rev 186939)
@@ -1,5 +1,27 @@
2015-07-16 Matthew Hanson <matthew_han...@apple.com>
+ Merge r186878. rdar://problem/21758722
+
+ 2015-07-15 Sam Weinig <s...@webkit.org>
+
+ Color match plug-ins
+ <rdar://problem/21758722>
+ https://bugs.webkit.org/show_bug.cgi?id=146987
+
+ Reviewed by Dean Jackson.
+
+ * Platform/mac/LayerHostingContext.h:
+ * Platform/mac/LayerHostingContext.mm:
+ (WebKit::LayerHostingContext::setColorMatchUntaggedContent):
+ (WebKit::LayerHostingContext::colorMatchUntaggedContent):
+ Add setter/getter for color matching untagged content.
+
+ * PluginProcess/mac/PluginControllerProxyMac.mm:
+ (WebKit::PluginControllerProxy::updateLayerHostingContext):
+ Have plug-ins CAContext's color match untagged colors into sRGB.
+
+2015-07-16 Matthew Hanson <matthew_han...@apple.com>
+
Merge r186814. rdar://problem/21605505
2015-07-14 Anders Carlsson <ander...@apple.com>
Modified: branches/safari-601.1-branch/Source/WebKit2/Platform/mac/LayerHostingContext.h (186938 => 186939)
--- branches/safari-601.1-branch/Source/WebKit2/Platform/mac/LayerHostingContext.h 2015-07-17 05:33:00 UTC (rev 186938)
+++ branches/safari-601.1-branch/Source/WebKit2/Platform/mac/LayerHostingContext.h 2015-07-17 05:33:05 UTC (rev 186939)
@@ -62,6 +62,11 @@
void setColorSpace(CGColorSpaceRef);
CGColorSpaceRef colorSpace() const;
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+ void setColorMatchUntaggedContent(bool);
+ bool colorMatchUntaggedContent() const;
+#endif
+
// Fences only work on iOS and OS 10.10+.
void setFencePort(mach_port_t);
Modified: branches/safari-601.1-branch/Source/WebKit2/Platform/mac/LayerHostingContext.mm (186938 => 186939)
--- branches/safari-601.1-branch/Source/WebKit2/Platform/mac/LayerHostingContext.mm 2015-07-17 05:33:00 UTC (rev 186938)
+++ branches/safari-601.1-branch/Source/WebKit2/Platform/mac/LayerHostingContext.mm 2015-07-17 05:33:05 UTC (rev 186939)
@@ -102,6 +102,21 @@
return [m_context colorSpace];
}
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+void LayerHostingContext::setColorMatchUntaggedContent(bool colorMatchUntaggedContent)
+{
+ if ([m_context respondsToSelector:@selector(setColorMatchUntaggedContent:)])
+ [m_context setColorMatchUntaggedContent:colorMatchUntaggedContent];
+}
+
+bool LayerHostingContext::colorMatchUntaggedContent() const
+{
+ if ([m_context respondsToSelector:@selector(colorMatchUntaggedContent)])
+ return [m_context colorMatchUntaggedContent];
+ return false;
+}
+#endif
+
#if HAVE(COREANIMATION_FENCES)
void LayerHostingContext::setFencePort(mach_port_t fencePort)
{
Modified: branches/safari-601.1-branch/Source/WebKit2/PluginProcess/mac/PluginControllerProxyMac.mm (186938 => 186939)
--- branches/safari-601.1-branch/Source/WebKit2/PluginProcess/mac/PluginControllerProxyMac.mm 2015-07-17 05:33:00 UTC (rev 186938)
+++ branches/safari-601.1-branch/Source/WebKit2/PluginProcess/mac/PluginControllerProxyMac.mm 2015-07-17 05:33:05 UTC (rev 186939)
@@ -35,6 +35,7 @@
#import "PluginProxyMessages.h"
#import "WebProcessConnection.h"
#import <QuartzCore/QuartzCore.h>
+#import <WebCore/GraphicsContextCG.h>
using namespace WebCore;
@@ -139,6 +140,11 @@
#endif
}
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+ m_layerHostingContext->setColorSpace(sRGBColorSpaceRef());
+ m_layerHostingContext->setColorMatchUntaggedContent(true);
+#endif
+
m_layerHostingContext->setRootLayer(platformLayer);
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
