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

Side by Side Diff: third_party/WebKit/Source/web/WebFrame.cpp

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
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 "public/web/WebFrame.h" 5 #include "public/web/WebFrame.h"
6 6
7 #include "bindings/core/v8/WindowProxyManager.h" 7 #include "bindings/core/v8/WindowProxyManager.h"
8 #include "core/frame/FrameHost.h" 8 #include "core/frame/FrameHost.h"
9 #include "core/frame/FrameView.h" 9 #include "core/frame/FrameView.h"
10 #include "core/frame/LocalFrame.h" 10 #include "core/frame/LocalFrame.h"
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 m_parent = nullptr; 110 m_parent = nullptr;
111 111
112 return true; 112 return true;
113 } 113 }
114 114
115 void WebFrame::detach() 115 void WebFrame::detach()
116 { 116 {
117 toImplBase()->frame()->detach(FrameDetachType::Remove); 117 toImplBase()->frame()->detach(FrameDetachType::Remove);
118 } 118 }
119 119
120 WebSecurityOrigin WebFrame::securityOrigin() const 120 WebSecurityOrigin WebFrame::getSecurityOrigin() const
121 { 121 {
122 return WebSecurityOrigin(toImplBase()->frame()->securityContext()->securityO rigin()); 122 return WebSecurityOrigin(toImplBase()->frame()->securityContext()->getSecuri tyOrigin());
123 } 123 }
124 124
125 125
126 void WebFrame::setFrameOwnerSandboxFlags(WebSandboxFlags flags) 126 void WebFrame::setFrameOwnerSandboxFlags(WebSandboxFlags flags)
127 { 127 {
128 // At the moment, this is only used to replicate sandbox flags 128 // At the moment, this is only used to replicate sandbox flags
129 // for frames with a remote owner. 129 // for frames with a remote owner.
130 FrameOwner* owner = toImplBase()->frame()->owner(); 130 FrameOwner* owner = toImplBase()->frame()->owner();
131 ASSERT(owner); 131 ASSERT(owner);
132 toRemoteBridgeFrameOwner(owner)->setSandboxFlags(static_cast<SandboxFlags>(f lags)); 132 toRemoteBridgeFrameOwner(owner)->setSandboxFlags(static_cast<SandboxFlags>(f lags));
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 void WebFrame::traceFrames(VisitorDispatcher visitor, WebFrame* frame) { tra ceFramesImpl(visitor, frame); } \ 357 void WebFrame::traceFrames(VisitorDispatcher visitor, WebFrame* frame) { tra ceFramesImpl(visitor, frame); } \
358 void WebFrame::clearWeakFrames(VisitorDispatcher visitor) { clearWeakFramesI mpl(visitor); } 358 void WebFrame::clearWeakFrames(VisitorDispatcher visitor) { clearWeakFramesI mpl(visitor); }
359 359
360 DEFINE_VISITOR_METHOD(Visitor*) 360 DEFINE_VISITOR_METHOD(Visitor*)
361 DEFINE_VISITOR_METHOD(InlinedGlobalMarkingVisitor) 361 DEFINE_VISITOR_METHOD(InlinedGlobalMarkingVisitor)
362 362
363 #undef DEFINE_VISITOR_METHOD 363 #undef DEFINE_VISITOR_METHOD
364 #endif 364 #endif
365 365
366 } // namespace blink 366 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698