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

Unified Diff: content/renderer/render_widget.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_widget.h ('k') | content/renderer/render_widget_owner_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_widget.cc
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index a09a0f216a4b47be7a3c3ca28901268f53b5cd19..4c0fda13bb72976e3dd52db55248cf0bf05495d2 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -388,6 +388,7 @@
if (!swapped_out)
RenderProcess::current()->AddRefProcess();
DCHECK(RenderThread::Get());
+ device_color_profile_.push_back('0');
// In tests there may not be a RenderThreadImpl.
if (RenderThreadImpl::current()) {
@@ -1810,6 +1811,19 @@
physical_backing_size_ = gfx::ScaleToCeiledSize(size_, device_scale_factor_);
}
+bool RenderWidget::SetDeviceColorProfile(
+ const std::vector<char>& color_profile) {
+ if (device_color_profile_ == color_profile)
+ return false;
+
+ device_color_profile_ = color_profile;
+
+ if (owner_delegate_)
+ owner_delegate_->RenderWidgetDidSetColorProfile(color_profile);
+
+ return true;
+}
+
void RenderWidget::OnOrientationChange() {
}
@@ -1944,10 +1958,9 @@
UpdateCompositionInfo(false /* not an immediate request */);
}
-void RenderWidget::SetDeviceColorSpaceForTesting(
- const gfx::ColorSpace& color_space) {
- if (owner_delegate_)
- owner_delegate_->RenderWidgetDidSetColorSpace(color_space);
+void RenderWidget::SetDeviceColorProfileForTesting(
+ const std::vector<char>& color_profile) {
+ SetDeviceColorProfile(color_profile);
}
void RenderWidget::DidAutoResize(const gfx::Size& new_size) {
« no previous file with comments | « content/renderer/render_widget.h ('k') | content/renderer/render_widget_owner_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698