Chromium Code Reviews| 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 3640 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3651 if (webview()) { | 3651 if (webview()) { |
| 3652 webview()->setDeviceScaleFactor(device_scale_factor); | 3652 webview()->setDeviceScaleFactor(device_scale_factor); |
| 3653 webview()->settings()->setPreferCompositingToLCDTextEnabled( | 3653 webview()->settings()->setPreferCompositingToLCDTextEnabled( |
| 3654 PreferCompositingToLCDText(device_scale_factor_)); | 3654 PreferCompositingToLCDText(device_scale_factor_)); |
| 3655 webview()->settings()->setAcceleratedCompositingForTransitionEnabled( | 3655 webview()->settings()->setAcceleratedCompositingForTransitionEnabled( |
| 3656 ShouldUseTransitionCompositing(device_scale_factor_)); | 3656 ShouldUseTransitionCompositing(device_scale_factor_)); |
| 3657 } | 3657 } |
| 3658 if (auto_resize_mode_) | 3658 if (auto_resize_mode_) |
| 3659 AutoResizeCompositor(); | 3659 AutoResizeCompositor(); |
| 3660 | 3660 |
| 3661 if (browser_plugin_manager_.get()) | 3661 if (browser_plugin_manager_) |
|
lazyboy
2014/09/03 16:58:31
Same as above.
Fady Samuel
2014/09/03 17:30:52
Done.
| |
| 3662 browser_plugin_manager_->UpdateDeviceScaleFactor(device_scale_factor_); | 3662 browser_plugin_manager_->UpdateDeviceScaleFactor(); |
| 3663 } | 3663 } |
| 3664 | 3664 |
| 3665 bool RenderViewImpl::SetDeviceColorProfile( | 3665 bool RenderViewImpl::SetDeviceColorProfile( |
| 3666 const std::vector<char>& profile) { | 3666 const std::vector<char>& profile) { |
| 3667 bool changed = RenderWidget::SetDeviceColorProfile(profile); | 3667 bool changed = RenderWidget::SetDeviceColorProfile(profile); |
| 3668 if (changed && webview()) { | 3668 if (changed && webview()) { |
| 3669 // TODO(noel): notify the webview() of the color profile change so it | 3669 // TODO(noel): notify the webview() of the color profile change so it |
| 3670 // can update and repaint all color profiled page elements. | 3670 // can update and repaint all color profiled page elements. |
| 3671 } | 3671 } |
| 3672 return changed; | 3672 return changed; |
| (...skipping 518 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4191 std::vector<gfx::Size> sizes; | 4191 std::vector<gfx::Size> sizes; |
| 4192 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4192 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
| 4193 if (!url.isEmpty()) | 4193 if (!url.isEmpty()) |
| 4194 urls.push_back( | 4194 urls.push_back( |
| 4195 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4195 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
| 4196 } | 4196 } |
| 4197 SendUpdateFaviconURL(urls); | 4197 SendUpdateFaviconURL(urls); |
| 4198 } | 4198 } |
| 4199 | 4199 |
| 4200 } // namespace content | 4200 } // namespace content |
| OLD | NEW |