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

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 1486743002: Clean up some remaining obsolete coordinate-space naming. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed Mac compile Created 5 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 unified diff | Download patch
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | third_party/WebKit/Source/core/frame/FrameView.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 1782 matching lines...) Expand 10 before | Expand all | Expand 10 after
1793 if (sub_text_hint == blink::WebTextDirectionLeftToRight) { 1793 if (sub_text_hint == blink::WebTextDirectionLeftToRight) {
1794 *wrapped_sub_text = 1794 *wrapped_sub_text =
1795 base::i18n::GetDisplayStringInLTRDirectionality(*wrapped_sub_text); 1795 base::i18n::GetDisplayStringInLTRDirectionality(*wrapped_sub_text);
1796 } else if (sub_text_hint == blink::WebTextDirectionRightToLeft) { 1796 } else if (sub_text_hint == blink::WebTextDirectionRightToLeft) {
1797 base::i18n::WrapStringWithRTLFormatting(wrapped_sub_text); 1797 base::i18n::WrapStringWithRTLFormatting(wrapped_sub_text);
1798 } 1798 }
1799 } 1799 }
1800 } 1800 }
1801 1801
1802 void RenderViewImpl::showValidationMessage( 1802 void RenderViewImpl::showValidationMessage(
1803 const blink::WebRect& anchor_in_root_view, 1803 const blink::WebRect& anchor_in_viewport,
1804 const blink::WebString& main_text, 1804 const blink::WebString& main_text,
1805 blink::WebTextDirection main_text_hint, 1805 blink::WebTextDirection main_text_hint,
1806 const blink::WebString& sub_text, 1806 const blink::WebString& sub_text,
1807 blink::WebTextDirection sub_text_hint) { 1807 blink::WebTextDirection sub_text_hint) {
1808 base::string16 wrapped_main_text = main_text; 1808 base::string16 wrapped_main_text = main_text;
1809 base::string16 wrapped_sub_text = sub_text; 1809 base::string16 wrapped_sub_text = sub_text;
1810 1810
1811 SetValidationMessageDirection( 1811 SetValidationMessageDirection(
1812 &wrapped_main_text, main_text_hint, &wrapped_sub_text, sub_text_hint); 1812 &wrapped_main_text, main_text_hint, &wrapped_sub_text, sub_text_hint);
1813 1813
1814 Send(new ViewHostMsg_ShowValidationMessage( 1814 Send(new ViewHostMsg_ShowValidationMessage(
1815 routing_id(), AdjustValidationMessageAnchor(anchor_in_root_view), 1815 routing_id(), AdjustValidationMessageAnchor(anchor_in_viewport),
1816 wrapped_main_text, wrapped_sub_text)); 1816 wrapped_main_text, wrapped_sub_text));
1817 } 1817 }
1818 1818
1819 void RenderViewImpl::hideValidationMessage() { 1819 void RenderViewImpl::hideValidationMessage() {
1820 Send(new ViewHostMsg_HideValidationMessage(routing_id())); 1820 Send(new ViewHostMsg_HideValidationMessage(routing_id()));
1821 } 1821 }
1822 1822
1823 void RenderViewImpl::moveValidationMessage( 1823 void RenderViewImpl::moveValidationMessage(
1824 const blink::WebRect& anchor_in_root_view) { 1824 const blink::WebRect& anchor_in_viewport) {
1825 Send(new ViewHostMsg_MoveValidationMessage( 1825 Send(new ViewHostMsg_MoveValidationMessage(
1826 routing_id(), AdjustValidationMessageAnchor(anchor_in_root_view))); 1826 routing_id(), AdjustValidationMessageAnchor(anchor_in_viewport)));
1827 } 1827 }
1828 1828
1829 void RenderViewImpl::setStatusText(const WebString& text) { 1829 void RenderViewImpl::setStatusText(const WebString& text) {
1830 } 1830 }
1831 1831
1832 void RenderViewImpl::UpdateTargetURL(const GURL& url, 1832 void RenderViewImpl::UpdateTargetURL(const GURL& url,
1833 const GURL& fallback_url) { 1833 const GURL& fallback_url) {
1834 GURL latest_url = url.is_empty() ? fallback_url : url; 1834 GURL latest_url = url.is_empty() ? fallback_url : url;
1835 if (latest_url == target_url_) 1835 if (latest_url == target_url_)
1836 return; 1836 return;
(...skipping 1883 matching lines...) Expand 10 before | Expand all | Expand 10 after
3720 if (IsUseZoomForDSFEnabled()) { 3720 if (IsUseZoomForDSFEnabled()) {
3721 compositor_->SetPaintedDeviceScaleFactor(device_scale_factor_); 3721 compositor_->SetPaintedDeviceScaleFactor(device_scale_factor_);
3722 webview()->setZoomFactorForDeviceScaleFactor( 3722 webview()->setZoomFactorForDeviceScaleFactor(
3723 device_scale_factor_); 3723 device_scale_factor_);
3724 } else { 3724 } else {
3725 webview()->setDeviceScaleFactor(device_scale_factor_); 3725 webview()->setDeviceScaleFactor(device_scale_factor_);
3726 } 3726 }
3727 } 3727 }
3728 3728
3729 } // namespace content 3729 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | third_party/WebKit/Source/core/frame/FrameView.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698