Title: [165839] trunk/Source/WebKit2
- Revision
- 165839
- Author
- [email protected]
- Date
- 2014-03-18 13:18:37 -0700 (Tue, 18 Mar 2014)
Log Message
WebPageCreationParameters colorSpace should be MAC not COCOA
https://bugs.webkit.org/show_bug.cgi?id=130414
Patch by Joseph Pecoraro <[email protected]> on 2014-03-18
Reviewed by Dan Bernstein.
The colorSpace param was only set and used on Mac, not iOS.
* Shared/WebPageCreationParameters.h:
* Shared/WebPageCreationParameters.cpp:
(WebKit::WebPageCreationParameters::encode):
(WebKit::WebPageCreationParameters::decode):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (165838 => 165839)
--- trunk/Source/WebKit2/ChangeLog 2014-03-18 20:07:26 UTC (rev 165838)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-18 20:18:37 UTC (rev 165839)
@@ -1,3 +1,17 @@
+2014-03-18 Joseph Pecoraro <[email protected]>
+
+ WebPageCreationParameters colorSpace should be MAC not COCOA
+ https://bugs.webkit.org/show_bug.cgi?id=130414
+
+ Reviewed by Dan Bernstein.
+
+ The colorSpace param was only set and used on Mac, not iOS.
+
+ * Shared/WebPageCreationParameters.h:
+ * Shared/WebPageCreationParameters.cpp:
+ (WebKit::WebPageCreationParameters::encode):
+ (WebKit::WebPageCreationParameters::decode):
+
2014-03-18 Simon Fraser <[email protected]>
Dan says that options should be unsigned, and enums should be signed.
Modified: trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp (165838 => 165839)
--- trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp 2014-03-18 20:07:26 UTC (rev 165838)
+++ trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp 2014-03-18 20:18:37 UTC (rev 165839)
@@ -63,7 +63,7 @@
encoder << backgroundExtendsBeyondPage;
encoder.encodeEnum(layerHostingMode);
-#if PLATFORM(COCOA)
+#if PLATFORM(MAC)
encoder << colorSpace;
#endif
#if PLATFORM(IOS)
@@ -132,7 +132,7 @@
if (!decoder.decodeEnum(parameters.layerHostingMode))
return false;
-#if PLATFORM(COCOA)
+#if PLATFORM(MAC)
if (!decoder.decode(parameters.colorSpace))
return false;
#endif
Modified: trunk/Source/WebKit2/Shared/WebPageCreationParameters.h (165838 => 165839)
--- trunk/Source/WebKit2/Shared/WebPageCreationParameters.h 2014-03-18 20:07:26 UTC (rev 165838)
+++ trunk/Source/WebKit2/Shared/WebPageCreationParameters.h 2014-03-18 20:18:37 UTC (rev 165839)
@@ -40,7 +40,7 @@
#include <WebCore/ViewState.h>
#include <wtf/text/WTFString.h>
-#if PLATFORM(COCOA)
+#if PLATFORM(MAC)
#include "ColorSpaceData.h"
#endif
@@ -103,7 +103,7 @@
LayerHostingMode layerHostingMode;
-#if PLATFORM(COCOA)
+#if PLATFORM(MAC)
ColorSpaceData colorSpace;
#endif
#if PLATFORM(IOS)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
