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

Side by Side Diff: third_party/WebKit/Source/core/frame/RemoteFrame.cpp

Issue 1738613002: Rename enums/functions that collide in chromium style in core/dom/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-3
Patch Set: get-names-4: 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "core/frame/RemoteFrame.h" 5 #include "core/frame/RemoteFrame.h"
6 6
7 #include "bindings/core/v8/WindowProxy.h" 7 #include "bindings/core/v8/WindowProxy.h"
8 #include "bindings/core/v8/WindowProxyManager.h" 8 #include "bindings/core/v8/WindowProxyManager.h"
9 #include "core/dom/RemoteSecurityContext.h" 9 #include "core/dom/RemoteSecurityContext.h"
10 #include "core/frame/LocalFrame.h" 10 #include "core/frame/LocalFrame.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 ASSERT(windowProxy); 63 ASSERT(windowProxy);
64 windowProxy->initializeIfNeeded(); 64 windowProxy->initializeIfNeeded();
65 return windowProxy; 65 return windowProxy;
66 } 66 }
67 67
68 void RemoteFrame::navigate(Document& originDocument, const KURL& url, bool repla ceCurrentItem, UserGestureStatus userGestureStatus) 68 void RemoteFrame::navigate(Document& originDocument, const KURL& url, bool repla ceCurrentItem, UserGestureStatus userGestureStatus)
69 { 69 {
70 // The process where this frame actually lives won't have sufficient informa tion to determine 70 // The process where this frame actually lives won't have sufficient informa tion to determine
71 // correct referrer, since it won't have access to the originDocument. Set i t now. 71 // correct referrer, since it won't have access to the originDocument. Set i t now.
72 ResourceRequest request(url); 72 ResourceRequest request(url);
73 request.setHTTPReferrer(SecurityPolicy::generateReferrer(originDocument.refe rrerPolicy(), url, originDocument.outgoingReferrer())); 73 request.setHTTPReferrer(SecurityPolicy::generateReferrer(originDocument.getR eferrerPolicy(), url, originDocument.outgoingReferrer()));
74 request.setHasUserGesture(userGestureStatus == UserGestureStatus::Active); 74 request.setHasUserGesture(userGestureStatus == UserGestureStatus::Active);
75 remoteFrameClient()->navigate(request, replaceCurrentItem); 75 remoteFrameClient()->navigate(request, replaceCurrentItem);
76 } 76 }
77 77
78 void RemoteFrame::navigate(const FrameLoadRequest& passedRequest) 78 void RemoteFrame::navigate(const FrameLoadRequest& passedRequest)
79 { 79 {
80 UserGestureStatus gesture = UserGestureIndicator::processingUserGesture() ? UserGestureStatus::Active : UserGestureStatus::None; 80 UserGestureStatus gesture = UserGestureIndicator::processingUserGesture() ? UserGestureStatus::Active : UserGestureStatus::None;
81 navigate(*passedRequest.originDocument(), passedRequest.resourceRequest().ur l(), passedRequest.replacesCurrentItem(), gesture); 81 navigate(*passedRequest.originDocument(), passedRequest.resourceRequest().ur l(), passedRequest.replacesCurrentItem(), gesture);
82 } 82 }
83 83
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 ASSERT(owner()); 197 ASSERT(owner());
198 toHTMLFrameOwnerElement(owner())->setNeedsCompositingUpdate(); 198 toHTMLFrameOwnerElement(owner())->setNeedsCompositingUpdate();
199 } 199 }
200 200
201 void RemoteFrame::advanceFocus(WebFocusType type, LocalFrame* source) 201 void RemoteFrame::advanceFocus(WebFocusType type, LocalFrame* source)
202 { 202 {
203 remoteFrameClient()->advanceFocus(type, source); 203 remoteFrameClient()->advanceFocus(type, source);
204 } 204 }
205 205
206 } // namespace blink 206 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698