Index: third_party/WebKit/Source/core/frame/RemoteFrame.cpp |
diff --git a/third_party/WebKit/Source/core/frame/RemoteFrame.cpp b/third_party/WebKit/Source/core/frame/RemoteFrame.cpp |
index 9255891a38c750394cbaab446d4244cd74ae43a7..7635c39d3880b70b1f5c1c4af8063d020d2bd203 100644 |
--- a/third_party/WebKit/Source/core/frame/RemoteFrame.cpp |
+++ b/third_party/WebKit/Source/core/frame/RemoteFrame.cpp |
@@ -72,7 +72,7 @@ void RemoteFrame::navigate(Document& originDocument, const KURL& url, bool repla |
ResourceRequest request(url); |
request.setHTTPReferrer(SecurityPolicy::generateReferrer(originDocument.getReferrerPolicy(), url, originDocument.outgoingReferrer())); |
request.setHasUserGesture(userGestureStatus == UserGestureStatus::Active); |
- remoteFrameClient()->navigate(request, replaceCurrentItem); |
+ client()->navigate(request, replaceCurrentItem); |
} |
void RemoteFrame::navigate(const FrameLoadRequest& passedRequest) |
@@ -83,7 +83,7 @@ void RemoteFrame::navigate(const FrameLoadRequest& passedRequest) |
void RemoteFrame::reload(FrameLoadType frameLoadType, ClientRedirectPolicy clientRedirectPolicy) |
{ |
- remoteFrameClient()->reload(frameLoadType, clientRedirectPolicy); |
+ client()->reload(frameLoadType, clientRedirectPolicy); |
} |
void RemoteFrame::detach(FrameDetachType type) |
@@ -125,18 +125,18 @@ bool RemoteFrame::shouldClose() |
void RemoteFrame::forwardInputEvent(Event* event) |
{ |
- remoteFrameClient()->forwardInputEvent(event); |
+ client()->forwardInputEvent(event); |
} |
void RemoteFrame::frameRectsChanged(const IntRect& frameRect) |
{ |
- remoteFrameClient()->frameRectsChanged(frameRect); |
+ client()->frameRectsChanged(frameRect); |
} |
void RemoteFrame::visibilityChanged(bool visible) |
{ |
- if (remoteFrameClient()) |
- remoteFrameClient()->visibilityChanged(visible); |
+ if (client()) |
+ client()->visibilityChanged(visible); |
} |
void RemoteFrame::setView(RemoteFrameView* view) |
@@ -169,9 +169,9 @@ void RemoteFrame::createView() |
deprecatedLocalOwner()->setWidget(m_view); |
} |
-RemoteFrameClient* RemoteFrame::remoteFrameClient() const |
+RemoteFrameClient* RemoteFrame::client() const |
{ |
- return static_cast<RemoteFrameClient*>(client()); |
+ return static_cast<RemoteFrameClient*>(Frame::client()); |
} |
void RemoteFrame::setRemotePlatformLayer(WebLayer* layer) |
@@ -188,7 +188,7 @@ void RemoteFrame::setRemotePlatformLayer(WebLayer* layer) |
void RemoteFrame::advanceFocus(WebFocusType type, LocalFrame* source) |
{ |
- remoteFrameClient()->advanceFocus(type, source); |
+ client()->advanceFocus(type, source); |
} |
} // namespace blink |