| 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 2114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2125 } | 2125 } |
| 2126 | 2126 |
| 2127 const std::string& RenderViewImpl::GetAcceptLanguages() const { | 2127 const std::string& RenderViewImpl::GetAcceptLanguages() const { |
| 2128 return renderer_preferences_.accept_languages; | 2128 return renderer_preferences_.accept_languages; |
| 2129 } | 2129 } |
| 2130 | 2130 |
| 2131 void RenderViewImpl::convertViewportToWindow(blink::WebRect* rect) { | 2131 void RenderViewImpl::convertViewportToWindow(blink::WebRect* rect) { |
| 2132 RenderWidget::convertViewportToWindow(rect); | 2132 RenderWidget::convertViewportToWindow(rect); |
| 2133 } | 2133 } |
| 2134 | 2134 |
| 2135 void RenderViewImpl::convertViewportToWindow(blink::WebFloatRect* rect) { |
| 2136 RenderWidget::convertViewportToWindow(rect); |
| 2137 } |
| 2138 |
| 2135 void RenderViewImpl::didChangeIcon(WebLocalFrame* frame, | 2139 void RenderViewImpl::didChangeIcon(WebLocalFrame* frame, |
| 2136 WebIconURL::Type icon_type) { | 2140 WebIconURL::Type icon_type) { |
| 2137 if (frame->parent()) | 2141 if (frame->parent()) |
| 2138 return; | 2142 return; |
| 2139 | 2143 |
| 2140 WebVector<WebIconURL> icon_urls = frame->iconURLs(icon_type); | 2144 WebVector<WebIconURL> icon_urls = frame->iconURLs(icon_type); |
| 2141 std::vector<FaviconURL> urls; | 2145 std::vector<FaviconURL> urls; |
| 2142 for (size_t i = 0; i < icon_urls.size(); i++) { | 2146 for (size_t i = 0; i < icon_urls.size(); i++) { |
| 2143 std::vector<gfx::Size> sizes; | 2147 std::vector<gfx::Size> sizes; |
| 2144 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 2148 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
| (...skipping 1565 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3710 if (IsUseZoomForDSFEnabled()) { | 3714 if (IsUseZoomForDSFEnabled()) { |
| 3711 compositor_->SetPaintedDeviceScaleFactor(device_scale_factor_); | 3715 compositor_->SetPaintedDeviceScaleFactor(device_scale_factor_); |
| 3712 webview()->setZoomFactorForDeviceScaleFactor( | 3716 webview()->setZoomFactorForDeviceScaleFactor( |
| 3713 device_scale_factor_); | 3717 device_scale_factor_); |
| 3714 } else { | 3718 } else { |
| 3715 webview()->setDeviceScaleFactor(device_scale_factor_); | 3719 webview()->setDeviceScaleFactor(device_scale_factor_); |
| 3716 } | 3720 } |
| 3717 } | 3721 } |
| 3718 | 3722 |
| 3719 } // namespace content | 3723 } // namespace content |
| OLD | NEW |