Skip to content
This repository was archived by the owner on Jun 24, 2022. It is now read-only.

Commit 1bc90ff

Browse files
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): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@165839 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 5bf5912 commit 1bc90ff

File tree

3 files changed

+18
-4
lines changed

3 files changed

+18
-4
lines changed

Source/WebKit2/ChangeLog

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
2014-03-18 Joseph Pecoraro <[email protected]>
2+
3+
WebPageCreationParameters colorSpace should be MAC not COCOA
4+
https://bugs.webkit.org/show_bug.cgi?id=130414
5+
6+
Reviewed by Dan Bernstein.
7+
8+
The colorSpace param was only set and used on Mac, not iOS.
9+
10+
* Shared/WebPageCreationParameters.h:
11+
* Shared/WebPageCreationParameters.cpp:
12+
(WebKit::WebPageCreationParameters::encode):
13+
(WebKit::WebPageCreationParameters::decode):
14+
115
2014-03-18 Simon Fraser <[email protected]>
216

317
Dan says that options should be unsigned, and enums should be signed.

Source/WebKit2/Shared/WebPageCreationParameters.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ void WebPageCreationParameters::encode(IPC::ArgumentEncoder& encoder) const
6363
encoder << backgroundExtendsBeyondPage;
6464
encoder.encodeEnum(layerHostingMode);
6565

66-
#if PLATFORM(COCOA)
66+
#if PLATFORM(MAC)
6767
encoder << colorSpace;
6868
#endif
6969
#if PLATFORM(IOS)
@@ -132,7 +132,7 @@ bool WebPageCreationParameters::decode(IPC::ArgumentDecoder& decoder, WebPageCre
132132
if (!decoder.decodeEnum(parameters.layerHostingMode))
133133
return false;
134134

135-
#if PLATFORM(COCOA)
135+
#if PLATFORM(MAC)
136136
if (!decoder.decode(parameters.colorSpace))
137137
return false;
138138
#endif

Source/WebKit2/Shared/WebPageCreationParameters.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
#include <WebCore/ViewState.h>
4141
#include <wtf/text/WTFString.h>
4242

43-
#if PLATFORM(COCOA)
43+
#if PLATFORM(MAC)
4444
#include "ColorSpaceData.h"
4545
#endif
4646

@@ -103,7 +103,7 @@ struct WebPageCreationParameters {
103103

104104
LayerHostingMode layerHostingMode;
105105

106-
#if PLATFORM(COCOA)
106+
#if PLATFORM(MAC)
107107
ColorSpaceData colorSpace;
108108
#endif
109109
#if PLATFORM(IOS)

0 commit comments

Comments
 (0)