Diff
Modified: trunk/Source/Platform/ChangeLog (121599 => 121600)
--- trunk/Source/Platform/ChangeLog 2012-06-29 23:26:06 UTC (rev 121599)
+++ trunk/Source/Platform/ChangeLog 2012-06-29 23:40:35 UTC (rev 121600)
@@ -1,3 +1,14 @@
+2012-06-29 Tony Payne <[email protected]>
+
+ Remove type from screenColorProfile API
+ https://bugs.webkit.org/show_bug.cgi?id=90299
+
+ Reviewed by Adam Barth.
+
+ * chromium/public/Platform.h:
+ (WebKit::Platform::screenColorProfile): Removed type from chromium
+ public API's version of screenColorProfile().
+
2012-06-28 James Robinson <[email protected]>
[chromium] Remove mapRect and mapQuad from WebTransformationMatrix
Modified: trunk/Source/Platform/chromium/public/Platform.h (121599 => 121600)
--- trunk/Source/Platform/chromium/public/Platform.h 2012-06-29 23:26:06 UTC (rev 121599)
+++ trunk/Source/Platform/chromium/public/Platform.h 2012-06-29 23:40:35 UTC (rev 121600)
@@ -243,7 +243,7 @@
// Screen -------------------------------------------------------------
// Supplies the system monitor color profile ("monitor") or a named ICC profile.
- virtual void screenColorProfile(const WebString& type, WebVector<char>* profile) { }
+ virtual void screenColorProfile(WebVector<char>* profile) { }
// Sudden Termination --------------------------------------------------
Modified: trunk/Source/WebCore/ChangeLog (121599 => 121600)
--- trunk/Source/WebCore/ChangeLog 2012-06-29 23:26:06 UTC (rev 121599)
+++ trunk/Source/WebCore/ChangeLog 2012-06-29 23:40:35 UTC (rev 121600)
@@ -1,3 +1,32 @@
+2012-06-29 Tony Payne <[email protected]>
+
+ Remove type from screenColorProfile API
+ https://bugs.webkit.org/show_bug.cgi?id=90299
+
+ Reviewed by Adam Barth.
+
+ Covered by existing tests.
+
+ * platform/PlatformScreen.h:
+ (WebCore): Removed type from screenColorProfile().
+ * platform/blackberry/PlatformScreenBlackBerry.cpp:
+ (WebCore::screenColorProfile):
+ * platform/chromium/PlatformScreenChromium.cpp:
+ (WebCore::screenColorProfile):
+ * platform/efl/PlatformScreenEfl.cpp:
+ (WebCore::screenColorProfile):
+ * platform/gtk/PlatformScreenGtk.cpp:
+ (WebCore::screenColorProfile):
+ * platform/image-decoders/ImageDecoder.h:
+ (WebCore::ImageDecoder::qcmsOutputDeviceProfile): Updated call to
+ screenColorProfile() to not pass type param.
+ * platform/mac/PlatformScreenMac.mm:
+ (WebCore::screenColorProfile):
+ * platform/qt/PlatformScreenQt.cpp:
+ (WebCore::screenColorProfile):
+ * platform/win/PlatformScreenWin.cpp:
+ (WebCore::screenColorProfile):
+
2012-06-29 Emil A Eklund <[email protected]>
Allow non-borders to be adjusted to less than 1 when zoomed out
Modified: trunk/Source/WebCore/platform/PlatformScreen.h (121599 => 121600)
--- trunk/Source/WebCore/platform/PlatformScreen.h 2012-06-29 23:26:06 UTC (rev 121599)
+++ trunk/Source/WebCore/platform/PlatformScreen.h 2012-06-29 23:40:35 UTC (rev 121600)
@@ -53,7 +53,7 @@
FloatRect screenRect(Widget*);
FloatRect screenAvailableRect(Widget*);
// type can be "monitor" or the name of a profile such as "sRGB" or "Adobe RGB".
- void screenColorProfile(Widget*, const String& type, ColorProfile&);
+ void screenColorProfile(Widget*, ColorProfile&);
#if PLATFORM(MAC)
NSScreen *screenForWindow(NSWindow *);
Modified: trunk/Source/WebCore/platform/blackberry/PlatformScreenBlackBerry.cpp (121599 => 121600)
--- trunk/Source/WebCore/platform/blackberry/PlatformScreenBlackBerry.cpp 2012-06-29 23:26:06 UTC (rev 121599)
+++ trunk/Source/WebCore/platform/blackberry/PlatformScreenBlackBerry.cpp 2012-06-29 23:40:35 UTC (rev 121600)
@@ -64,7 +64,7 @@
return FloatRect(FloatPoint(), FloatSize(IntSize(BlackBerry::Platform::Graphics::Screen::primaryScreen()->size())));
}
-void screenColorProfile(Widget*, const String&, ColorProfile&)
+void screenColorProfile(Widget*, ColorProfile&)
{
notImplemented();
}
Modified: trunk/Source/WebCore/platform/chromium/PlatformScreenChromium.cpp (121599 => 121600)
--- trunk/Source/WebCore/platform/chromium/PlatformScreenChromium.cpp 2012-06-29 23:26:06 UTC (rev 121599)
+++ trunk/Source/WebCore/platform/chromium/PlatformScreenChromium.cpp 2012-06-29 23:40:35 UTC (rev 121600)
@@ -73,11 +73,11 @@
return PlatformSupport::screenAvailableRect(widget);
}
-void screenColorProfile(Widget*, const String& type, ColorProfile& toProfile)
+void screenColorProfile(Widget*, ColorProfile& toProfile)
{
// FIXME: Add support for multiple monitors.
WebKit::WebVector<char> profile;
- WebKit::Platform::current()->screenColorProfile(WebKit::WebString(type), &profile);
+ WebKit::Platform::current()->screenColorProfile(&profile);
toProfile.append(profile.data(), profile.size());
}
Modified: trunk/Source/WebCore/platform/efl/PlatformScreenEfl.cpp (121599 => 121600)
--- trunk/Source/WebCore/platform/efl/PlatformScreenEfl.cpp 2012-06-29 23:26:06 UTC (rev 121599)
+++ trunk/Source/WebCore/platform/efl/PlatformScreenEfl.cpp 2012-06-29 23:40:35 UTC (rev 121600)
@@ -98,7 +98,7 @@
return screenRect(widget);
}
-void screenColorProfile(Widget*, const String&, ColorProfile&)
+void screenColorProfile(Widget*, ColorProfile&)
{
notImplemented();
}
Modified: trunk/Source/WebCore/platform/gtk/PlatformScreenGtk.cpp (121599 => 121600)
--- trunk/Source/WebCore/platform/gtk/PlatformScreenGtk.cpp 2012-06-29 23:26:06 UTC (rev 121599)
+++ trunk/Source/WebCore/platform/gtk/PlatformScreenGtk.cpp 2012-06-29 23:40:35 UTC (rev 121600)
@@ -137,7 +137,7 @@
}
-void screenColorProfile(Widget*, const String&, ColorProfile&)
+void screenColorProfile(Widget*, ColorProfile&)
{
notImplemented();
}
Modified: trunk/Source/WebCore/platform/image-decoders/ImageDecoder.h (121599 => 121600)
--- trunk/Source/WebCore/platform/image-decoders/ImageDecoder.h 2012-06-29 23:26:06 UTC (rev 121599)
+++ trunk/Source/WebCore/platform/image-decoders/ImageDecoder.h 2012-06-29 23:40:35 UTC (rev 121600)
@@ -315,7 +315,7 @@
#else
// FIXME: add support for multiple monitors.
ColorProfile profile;
- screenColorProfile(0, "monitor", profile);
+ screenColorProfile(0, profile);
if (!profile.isEmpty())
outputDeviceProfile = qcms_profile_from_memory(profile.data(), profile.size());
#endif
Modified: trunk/Source/WebCore/platform/mac/PlatformScreenMac.mm (121599 => 121600)
--- trunk/Source/WebCore/platform/mac/PlatformScreenMac.mm 2012-06-29 23:26:06 UTC (rev 121599)
+++ trunk/Source/WebCore/platform/mac/PlatformScreenMac.mm 2012-06-29 23:40:35 UTC (rev 121600)
@@ -76,7 +76,7 @@
return toUserSpace([screenForWindow(window) visibleFrame], window);
}
-void screenColorProfile(Widget*, const String&, ColorProfile&)
+void screenColorProfile(Widget*, ColorProfile&)
{
notImplemented();
}
Modified: trunk/Source/WebCore/platform/qt/PlatformScreenQt.cpp (121599 => 121600)
--- trunk/Source/WebCore/platform/qt/PlatformScreenQt.cpp 2012-06-29 23:26:06 UTC (rev 121599)
+++ trunk/Source/WebCore/platform/qt/PlatformScreenQt.cpp 2012-06-29 23:40:35 UTC (rev 121600)
@@ -143,7 +143,7 @@
return FloatRect(r.x(), r.y(), r.width(), r.height());
}
-void screenColorProfile(Widget*, const String&, ColorProfile&)
+void screenColorProfile(Widget*, ColorProfile&)
{
notImplemented();
}
Modified: trunk/Source/WebCore/platform/win/PlatformScreenWin.cpp (121599 => 121600)
--- trunk/Source/WebCore/platform/win/PlatformScreenWin.cpp 2012-06-29 23:26:06 UTC (rev 121599)
+++ trunk/Source/WebCore/platform/win/PlatformScreenWin.cpp 2012-06-29 23:40:35 UTC (rev 121600)
@@ -118,7 +118,7 @@
return monitorInfo.rcWork;
}
-void screenColorProfile(Widget*, const String&, ColorProfile&)
+void screenColorProfile(Widget*, ColorProfile&)
{
notImplemented();
}
