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

Unified Diff: content/renderer/render_view_impl.cc

Issue 2649023004: Have one ICCProfile per WebScreenInfo in Blink. (Closed)
Patch Set: rebase Created 3 years, 11 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 fc848215a049636d92f519d25623adc98a83a4c7..a797669cedbf7abcd10f52932f7d0d43ef57401a 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -2332,12 +2332,6 @@ void RenderViewImpl::SetFocus(bool enable) {
BrowserPluginManager::Get()->UpdateFocusState();
}
-void RenderViewImpl::RenderWidgetDidSetColorProfile(
- const gfx::ICCProfile& profile) {
- if (webview())
- webview()->setDeviceColorProfile(profile);
-}
-
void RenderViewImpl::DidCompletePageScaleAnimation() {
GetWidget()->FocusChangeComplete();
}
@@ -2610,6 +2604,24 @@ void RenderViewImpl::SetDeviceScaleFactorForTesting(float factor) {
OnResize(params);
}
+void RenderViewImpl::SetDeviceColorProfileForTesting(
+ const gfx::ICCProfile& icc_profile) {
+ if (webview())
+ webview()->setDeviceColorProfile(icc_profile);
+
+ ResizeParams params;
+ params.screen_info = screen_info_;
+ params.screen_info.icc_profile = icc_profile;
+ params.new_size = size();
+ params.visible_viewport_size = visible_viewport_size_;
+ params.physical_backing_size = physical_backing_size_;
+ params.browser_controls_shrink_blink_size = false;
+ params.top_controls_height = 0.f;
+ params.is_fullscreen_granted = is_fullscreen_granted();
+ params.display_mode = display_mode_;
+ OnResize(params);
+}
+
void RenderViewImpl::ForceResizeForTesting(const gfx::Size& new_size) {
gfx::Rect new_window_rect(rootWindowRect().x,
rootWindowRect().y,
« 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