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

Unified Diff: content/renderer/render_widget.cc

Issue 2605743002: Use consistent types for ICC profiles (Closed)
Patch Set: No export for static lib Created 4 years 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
Index: content/renderer/render_widget.cc
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 4c0fda13bb72976e3dd52db55248cf0bf05495d2..a09a0f216a4b47be7a3c3ca28901268f53b5cd19 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -388,7 +388,6 @@ RenderWidget::RenderWidget(int32_t widget_routing_id,
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()) {
@@ -1811,19 +1810,6 @@ void RenderWidget::OnSetDeviceScaleFactor(float device_scale_factor) {
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() {
}
@@ -1958,9 +1944,10 @@ void RenderWidget::UpdateSelectionBounds() {
UpdateCompositionInfo(false /* not an immediate request */);
}
-void RenderWidget::SetDeviceColorProfileForTesting(
- const std::vector<char>& color_profile) {
- SetDeviceColorProfile(color_profile);
+void RenderWidget::SetDeviceColorSpaceForTesting(
+ const gfx::ColorSpace& color_space) {
+ if (owner_delegate_)
+ owner_delegate_->RenderWidgetDidSetColorSpace(color_space);
}
void RenderWidget::DidAutoResize(const gfx::Size& new_size) {

Powered by Google App Engine
This is Rietveld 408576698