OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/renderer/render_view_impl.h" | 5 #include "content/renderer/render_view_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <cmath> | 8 #include <cmath> |
9 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 3667 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3678 AutoResizeCompositor(); | 3678 AutoResizeCompositor(); |
3679 | 3679 |
3680 if (browser_plugin_manager_.get()) | 3680 if (browser_plugin_manager_.get()) |
3681 browser_plugin_manager_->UpdateDeviceScaleFactor(); | 3681 browser_plugin_manager_->UpdateDeviceScaleFactor(); |
3682 } | 3682 } |
3683 | 3683 |
3684 bool RenderViewImpl::SetDeviceColorProfile( | 3684 bool RenderViewImpl::SetDeviceColorProfile( |
3685 const std::vector<char>& profile) { | 3685 const std::vector<char>& profile) { |
3686 bool changed = RenderWidget::SetDeviceColorProfile(profile); | 3686 bool changed = RenderWidget::SetDeviceColorProfile(profile); |
3687 if (changed && webview()) { | 3687 if (changed && webview()) { |
3688 // TODO(noel): notify the webview() of the color profile change so it | 3688 WebVector<char> colorProfile = profile; |
3689 // can update and repaint all color profiled page elements. | 3689 webview()->setDeviceColorProfile(colorProfile); |
Noel Gordon
2014/09/22 17:15:02
webview()->setDeviceColorProfile(profile); also wo
Noel Gordon
2014/09/30 03:52:48
Refer to https://codereview.chromium.org/261633002
| |
3690 } | 3690 } |
3691 return changed; | 3691 return changed; |
3692 } | 3692 } |
3693 | 3693 |
3694 void RenderViewImpl::ResetDeviceColorProfileForTesting() { | 3694 void RenderViewImpl::ResetDeviceColorProfileForTesting() { |
3695 RenderWidget::ResetDeviceColorProfileForTesting(); | 3695 RenderWidget::ResetDeviceColorProfileForTesting(); |
3696 if (webview()) | 3696 if (webview()) |
3697 webview()->resetDeviceColorProfile(); | 3697 webview()->resetDeviceColorProfile(); |
3698 } | 3698 } |
3699 | 3699 |
(...skipping 516 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
4216 std::vector<gfx::Size> sizes; | 4216 std::vector<gfx::Size> sizes; |
4217 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4217 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
4218 if (!url.isEmpty()) | 4218 if (!url.isEmpty()) |
4219 urls.push_back( | 4219 urls.push_back( |
4220 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4220 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
4221 } | 4221 } |
4222 SendUpdateFaviconURL(urls); | 4222 SendUpdateFaviconURL(urls); |
4223 } | 4223 } |
4224 | 4224 |
4225 } // namespace content | 4225 } // namespace content |
OLD | NEW |