Devirtualize Frame::domWindow().

third_party/WebKit/Source/core/frame/LocalFrame.cpp

Index: third_party/WebKit/Source/core/frame/LocalFrame.cpp
diff --git a/third_party/WebKit/Source/core/frame/LocalFrame.cpp b/third_party/WebKit/Source/core/frame/LocalFrame.cpp
index eff2a0ca095333329cdc9880221ce0fc37ee5136..c5b2158145c0e2df2d15d8fad69158b28491d77d 100644
--- a/third_party/WebKit/Source/core/frame/LocalFrame.cpp
+++ b/third_party/WebKit/Source/core/frame/LocalFrame.cpp
@@ -349,10 +349,6 @@ DEFINE_TRACE(LocalFrame) {
   Supplementable<LocalFrame>::trace(visitor);
 }
 
-DOMWindow* LocalFrame::domWindow() const {
-  return m_domWindow.get();
-}
-
 WindowProxy* LocalFrame::windowProxy(DOMWrapperWorld& world) {
   return m_script->windowProxy(world);
 }
@@ -429,9 +425,9 @@ void LocalFrame::detach(FrameDetachType type) {
   script().clearForClose();
   setView(nullptr);
 
-  m_host->eventHandlerRegistry().didRemoveAllEventHandlers(*localDOMWindow());
+  m_host->eventHandlerRegistry().didRemoveAllEventHandlers(*domWindow());
 
-  localDOMWindow()->frameDestroyed();
+  domWindow()->frameDestroyed();
 
   // TODO: Page should take care of updating focus/scrolling instead of Frame.
   // TODO: It's unclear as to why this is called more than once, but it is,
@@ -474,7 +470,7 @@ void LocalFrame::printNavigationErrorMessage(const Frame& targetFrame,
       targetFrameDescription + " from frame with URL '" +
       document()->url().getString() + "'. " + reason + "\n";
 
-  localDOMWindow()->printErrorMessage(message);
+  domWindow()->printErrorMessage(message);
 }
 
 WindowProxyManager* LocalFrame::getWindowProxyManager() const {
@@ -500,6 +496,10 @@ void LocalFrame::documentAttached() {
   inputMethodController().documentAttached(document());
 }
 
+LocalDOMWindow* LocalFrame::domWindow() const {
+  return toLocalDOMWindow(m_domWindow);
+}
+
 void LocalFrame::setDOMWindow(LocalDOMWindow* domWindow) {
   // TODO(haraken): Update this comment.
   // Oilpan: setDOMWindow() cannot be used when finalizing. Which
@@ -519,8 +519,8 @@ void LocalFrame::setDOMWindow(LocalDOMWindow* domWindow) {
   if (domWindow)
     script().clearWindowProxy();
 
-  if (m_domWindow)
-    m_domWindow->reset();
+  if (this->domWindow())
+    this->domWindow()->reset();
   m_domWindow = domWindow;

[haraken, 2016/12/12 09:54:59]

LocalFrame::m_domWindow is reset here. Where is RemoteFrame::m_domWindow reset?
Don't we need to reset in RemoteFrame::setView()?

[dcheng, 2016/12/12 10:21:39]

LocalDOMWindow is swapped on navigation, but RemoteDOMWindow is not: none of the
properties exposed by RemoteDOMWindow are affected by navigation.  We might want
to change this to address the inconsistency at some point, but at the time, it
didn't seem to add much value.

 }