Diff
Modified: trunk/Source/Platform/ChangeLog (122654 => 122655)
--- trunk/Source/Platform/ChangeLog 2012-07-14 01:49:13 UTC (rev 122654)
+++ trunk/Source/Platform/ChangeLog 2012-07-14 02:03:21 UTC (rev 122655)
@@ -1,3 +1,13 @@
+2012-07-13 Tony Payne <[email protected]>
+
+ Remove Widget from screenColorProfile
+ https://bugs.webkit.org/show_bug.cgi?id=91300
+
+ Reviewed by Adam Barth.
+
+ * chromium/public/Platform.h:
+ (Platform): Updated comment to reflect that we no longer have a type param.
+
2012-07-11 Alexandre Elias <[email protected]>
[chromium] Move compositor quads to Platform/chromium/public
Modified: trunk/Source/Platform/chromium/public/Platform.h (122654 => 122655)
--- trunk/Source/Platform/chromium/public/Platform.h 2012-07-14 01:49:13 UTC (rev 122654)
+++ trunk/Source/Platform/chromium/public/Platform.h 2012-07-14 02:03:21 UTC (rev 122655)
@@ -242,7 +242,7 @@
// Screen -------------------------------------------------------------
- // Supplies the system monitor color profile ("monitor") or a named ICC profile.
+ // Supplies the system monitor color profile.
virtual void screenColorProfile(WebVector<char>* profile) { }
Modified: trunk/Source/WebCore/ChangeLog (122654 => 122655)
--- trunk/Source/WebCore/ChangeLog 2012-07-14 01:49:13 UTC (rev 122654)
+++ trunk/Source/WebCore/ChangeLog 2012-07-14 02:03:21 UTC (rev 122655)
@@ -1,3 +1,36 @@
+2012-07-13 Tony Payne <[email protected]>
+
+ Remove Widget from screenColorProfile
+ https://bugs.webkit.org/show_bug.cgi?id=91300
+
+ Reviewed by Adam Barth.
+
+ Chromium, the only platform implementing screenColorProfile, does not
+ need the Widget, so removing for simplicity.
+
+ Covered by existing tests.
+
+ * platform/PlatformScreen.h:
+ (WebCore): Updated comment to remove reference to type param that no
+ longer exists and removed Widget param.
+ * platform/blackberry/PlatformScreenBlackBerry.cpp:
+ (WebCore::screenColorProfile): Removed widget param.
+ * platform/chromium/PlatformScreenChromium.cpp:
+ (WebCore::screenColorProfile): Removed widget param.
+ * platform/efl/PlatformScreenEfl.cpp:
+ (WebCore::screenColorProfile): Removed widget param.
+ * platform/gtk/PlatformScreenGtk.cpp:
+ (WebCore::screenColorProfile): Removed widget param.
+ * platform/image-decoders/ImageDecoder.h:
+ (WebCore::ImageDecoder::qcmsOutputDeviceProfile): removed param to
+ match screenColorProfile()'s new spec.
+ * platform/mac/PlatformScreenMac.mm:
+ (WebCore::screenColorProfile): Removed widget param.
+ * platform/qt/PlatformScreenQt.cpp:
+ (WebCore::screenColorProfile): Removed widget param.
+ * platform/win/PlatformScreenWin.cpp:
+ (WebCore::screenColorProfile): Removed widget param.
+
2012-07-13 Brian Anderson <[email protected]>
[chromium] Add flushes to CCTextureUpdater::update
Modified: trunk/Source/WebCore/platform/PlatformScreen.h (122654 => 122655)
--- trunk/Source/WebCore/platform/PlatformScreen.h 2012-07-14 01:49:13 UTC (rev 122654)
+++ trunk/Source/WebCore/platform/PlatformScreen.h 2012-07-14 02:03:21 UTC (rev 122655)
@@ -52,8 +52,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*, ColorProfile&);
+ void screenColorProfile(ColorProfile&);
#if PLATFORM(MAC)
NSScreen *screenForWindow(NSWindow *);
Modified: trunk/Source/WebCore/platform/blackberry/PlatformScreenBlackBerry.cpp (122654 => 122655)
--- trunk/Source/WebCore/platform/blackberry/PlatformScreenBlackBerry.cpp 2012-07-14 01:49:13 UTC (rev 122654)
+++ trunk/Source/WebCore/platform/blackberry/PlatformScreenBlackBerry.cpp 2012-07-14 02:03:21 UTC (rev 122655)
@@ -64,7 +64,7 @@
return FloatRect(FloatPoint(), FloatSize(IntSize(BlackBerry::Platform::Graphics::Screen::primaryScreen()->size())));
}
-void screenColorProfile(Widget*, ColorProfile&)
+void screenColorProfile(ColorProfile&)
{
notImplemented();
}
Modified: trunk/Source/WebCore/platform/chromium/PlatformScreenChromium.cpp (122654 => 122655)
--- trunk/Source/WebCore/platform/chromium/PlatformScreenChromium.cpp 2012-07-14 01:49:13 UTC (rev 122654)
+++ trunk/Source/WebCore/platform/chromium/PlatformScreenChromium.cpp 2012-07-14 02:03:21 UTC (rev 122655)
@@ -73,9 +73,8 @@
return PlatformSupport::screenAvailableRect(widget);
}
-void screenColorProfile(Widget*, ColorProfile& toProfile)
+void screenColorProfile(ColorProfile& toProfile)
{
- // FIXME: Add support for multiple monitors.
WebKit::WebVector<char> profile;
WebKit::Platform::current()->screenColorProfile(&profile);
toProfile.append(profile.data(), profile.size());
Modified: trunk/Source/WebCore/platform/efl/PlatformScreenEfl.cpp (122654 => 122655)
--- trunk/Source/WebCore/platform/efl/PlatformScreenEfl.cpp 2012-07-14 01:49:13 UTC (rev 122654)
+++ trunk/Source/WebCore/platform/efl/PlatformScreenEfl.cpp 2012-07-14 02:03:21 UTC (rev 122655)
@@ -100,7 +100,7 @@
return screenRect(widget);
}
-void screenColorProfile(Widget*, ColorProfile&)
+void screenColorProfile(ColorProfile&)
{
notImplemented();
}
Modified: trunk/Source/WebCore/platform/gtk/PlatformScreenGtk.cpp (122654 => 122655)
--- trunk/Source/WebCore/platform/gtk/PlatformScreenGtk.cpp 2012-07-14 01:49:13 UTC (rev 122654)
+++ trunk/Source/WebCore/platform/gtk/PlatformScreenGtk.cpp 2012-07-14 02:03:21 UTC (rev 122655)
@@ -137,7 +137,7 @@
}
-void screenColorProfile(Widget*, ColorProfile&)
+void screenColorProfile(ColorProfile&)
{
notImplemented();
}
Modified: trunk/Source/WebCore/platform/image-decoders/ImageDecoder.h (122654 => 122655)
--- trunk/Source/WebCore/platform/image-decoders/ImageDecoder.h 2012-07-14 01:49:13 UTC (rev 122654)
+++ trunk/Source/WebCore/platform/image-decoders/ImageDecoder.h 2012-07-14 02:03:21 UTC (rev 122655)
@@ -315,7 +315,7 @@
#else
// FIXME: add support for multiple monitors.
ColorProfile profile;
- screenColorProfile(0, profile);
+ screenColorProfile(profile);
if (!profile.isEmpty())
outputDeviceProfile = qcms_profile_from_memory(profile.data(), profile.size());
#endif
Modified: trunk/Source/WebCore/platform/mac/PlatformScreenMac.mm (122654 => 122655)
--- trunk/Source/WebCore/platform/mac/PlatformScreenMac.mm 2012-07-14 01:49:13 UTC (rev 122654)
+++ trunk/Source/WebCore/platform/mac/PlatformScreenMac.mm 2012-07-14 02:03:21 UTC (rev 122655)
@@ -76,7 +76,7 @@
return toUserSpace([screenForWindow(window) visibleFrame], window);
}
-void screenColorProfile(Widget*, ColorProfile&)
+void screenColorProfile(ColorProfile&)
{
notImplemented();
}
Modified: trunk/Source/WebCore/platform/qt/PlatformScreenQt.cpp (122654 => 122655)
--- trunk/Source/WebCore/platform/qt/PlatformScreenQt.cpp 2012-07-14 01:49:13 UTC (rev 122654)
+++ trunk/Source/WebCore/platform/qt/PlatformScreenQt.cpp 2012-07-14 02:03:21 UTC (rev 122655)
@@ -143,7 +143,7 @@
return FloatRect(r.x(), r.y(), r.width(), r.height());
}
-void screenColorProfile(Widget*, ColorProfile&)
+void screenColorProfile(ColorProfile&)
{
notImplemented();
}
Modified: trunk/Source/WebCore/platform/win/PlatformScreenWin.cpp (122654 => 122655)
--- trunk/Source/WebCore/platform/win/PlatformScreenWin.cpp 2012-07-14 01:49:13 UTC (rev 122654)
+++ trunk/Source/WebCore/platform/win/PlatformScreenWin.cpp 2012-07-14 02:03:21 UTC (rev 122655)
@@ -118,7 +118,7 @@
return monitorInfo.rcWork;
}
-void screenColorProfile(Widget*, ColorProfile&)
+void screenColorProfile(ColorProfile&)
{
notImplemented();
}
