Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(484)

Unified Diff: content/renderer/render_view_impl.cc

Issue 2609093002: Revert of Use consistent types for ICC profiles (Closed)
Patch Set: Created 3 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | content/renderer/render_widget.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 61d635fd4d06a4ec9e62ec8ccee1f71a9cc67346..3dadf8114855141fa7ceb481c19cbc77e6b00b89 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -617,10 +617,9 @@
if (auto overridden_color_profile =
GetContentClient()->renderer()->GetImageDecodeColorProfile()) {
- webview()->setDeviceColorSpace(overridden_color_profile->GetColorSpace());
+ webview()->setDeviceColorProfile(overridden_color_profile->GetData());
} else {
- webview()->setDeviceColorSpace(
- params.image_decode_color_space.GetColorSpace());
+ webview()->setDeviceColorProfile(params.image_decode_color_space.GetData());
}
ApplyWebPreferencesInternal(webkit_preferences_, webview(), compositor_deps_);
@@ -2408,10 +2407,11 @@
BrowserPluginManager::Get()->UpdateFocusState();
}
-void RenderViewImpl::RenderWidgetDidSetColorSpace(
- const gfx::ColorSpace& color_space) {
+void RenderViewImpl::RenderWidgetDidSetColorProfile(
+ const std::vector<char>& profile) {
if (webview()) {
- webview()->setDeviceColorSpace(color_space);
+ WebVector<char> colorProfile = profile;
+ webview()->setDeviceColorProfile(colorProfile);
}
}
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | content/renderer/render_widget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698