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

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

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-modules: rebase-fixes Created 4 years, 9 months 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_browsertest.cc ('k') | extensions/renderer/content_watcher.cc » ('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 1605 matching lines...) Expand 10 before | Expand all | Expand 10 after
1616 // 1616 //
1617 // TODO(alexmos): This works fine for regular origins but may break path 1617 // TODO(alexmos): This works fine for regular origins but may break path
1618 // matching for file URLs with OOP subframes that open popups. This should 1618 // matching for file URLs with OOP subframes that open popups. This should
1619 // be fixed by either moving this lookup to the browser process or removing 1619 // be fixed by either moving this lookup to the browser process or removing
1620 // path-based matching for file URLs from content settings. See 1620 // path-based matching for file URLs from content settings. See
1621 // https://crbug.com/466297. 1621 // https://crbug.com/466297.
1622 if (creator->top()->isWebLocalFrame()) { 1622 if (creator->top()->isWebLocalFrame()) {
1623 params.opener_top_level_frame_url = creator->top()->document().url(); 1623 params.opener_top_level_frame_url = creator->top()->document().url();
1624 } else { 1624 } else {
1625 params.opener_top_level_frame_url = 1625 params.opener_top_level_frame_url =
1626 blink::WebStringToGURL(creator->top()->securityOrigin().toString()); 1626 blink::WebStringToGURL(creator->top()->getSecurityOrigin().toString());
1627 } 1627 }
1628 1628
1629 GURL security_url(blink::WebStringToGURL( 1629 GURL security_url(blink::WebStringToGURL(
1630 creator->document().securityOrigin().toString())); 1630 creator->document().getSecurityOrigin().toString()));
1631 if (!security_url.is_valid()) 1631 if (!security_url.is_valid())
1632 security_url = GURL(); 1632 security_url = GURL();
1633 params.opener_security_origin = security_url; 1633 params.opener_security_origin = security_url;
1634 params.opener_suppressed = suppress_opener; 1634 params.opener_suppressed = suppress_opener;
1635 params.disposition = NavigationPolicyToDisposition(policy); 1635 params.disposition = NavigationPolicyToDisposition(policy);
1636 if (!request.isNull()) { 1636 if (!request.isNull()) {
1637 params.target_url = request.url(); 1637 params.target_url = request.url();
1638 params.referrer = GetReferrerFromRequest(creator, request); 1638 params.referrer = GetReferrerFromRequest(creator, request);
1639 } 1639 }
1640 params.features = features; 1640 params.features = features;
(...skipping 1899 matching lines...) Expand 10 before | Expand all | Expand 10 after
3540 if (IsUseZoomForDSFEnabled()) { 3540 if (IsUseZoomForDSFEnabled()) {
3541 webview()->setZoomFactorForDeviceScaleFactor(device_scale_factor_); 3541 webview()->setZoomFactorForDeviceScaleFactor(device_scale_factor_);
3542 } else { 3542 } else {
3543 webview()->setDeviceScaleFactor(device_scale_factor_); 3543 webview()->setDeviceScaleFactor(device_scale_factor_);
3544 } 3544 }
3545 webview()->settings()->setPreferCompositingToLCDTextEnabled( 3545 webview()->settings()->setPreferCompositingToLCDTextEnabled(
3546 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_)); 3546 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_));
3547 } 3547 }
3548 3548
3549 } // namespace content 3549 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_view_browsertest.cc ('k') | extensions/renderer/content_watcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698