[Master/Overview CL] Make PageScaleFactor work for oopif subframe.

third_party/WebKit/Source/web/WebPagePopupImpl.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 139 matching lines @@
 
   void* webView() const override { return m_popup->m_webView; }
 
   IntSize minimumWindowSize() const override { return IntSize(0, 0); }
 
   void setCursor(const Cursor& cursor, LocalFrame* localFrame) override {
     m_popup->m_widgetClient->didChangeCursor(WebCursorInfo(cursor));
   }
 
   void setEventListenerProperties(
+      LocalFrame*,
       WebEventListenerClass eventClass,
       WebEventListenerProperties properties) override {
     if (m_popup->m_layerTreeView) {
       m_popup->m_layerTreeView->setEventListenerProperties(eventClass,
                                                            properties);
       if (eventClass == WebEventListenerClass::TouchStartOrMove) {
         m_popup->widgetClient()->hasTouchEventHandlers(
             properties != WebEventListenerProperties::Nothing ||
-            eventListenerProperties(WebEventListenerClass::TouchEndOrCancel) !=
+            eventListenerProperties(nullptr,
+                                    WebEventListenerClass::TouchEndOrCancel) !=
                 WebEventListenerProperties::Nothing);
       } else if (eventClass == WebEventListenerClass::TouchEndOrCancel) {
         m_popup->widgetClient()->hasTouchEventHandlers(
             properties != WebEventListenerProperties::Nothing ||
-            eventListenerProperties(WebEventListenerClass::TouchStartOrMove) !=
+            eventListenerProperties(nullptr,
+                                    WebEventListenerClass::TouchStartOrMove) !=
                 WebEventListenerProperties::Nothing);
       }
     } else {
       m_popup->widgetClient()->hasTouchEventHandlers(true);
     }
   }
   WebEventListenerProperties eventListenerProperties(
+      LocalFrame*,
       WebEventListenerClass eventClass) const override {
     if (m_popup->m_layerTreeView)
       return m_popup->m_layerTreeView->eventListenerProperties(eventClass);
     return WebEventListenerProperties::Nothing;
   }
 
   void setHasScrollEventHandlers(bool hasEventHandlers) override {
     if (m_popup->m_layerTreeView)
       m_popup->m_layerTreeView->setHaveScrollEventHandlers(hasEventHandlers);
   }
@@ skipping 391 matching lines @@
   // A WebPagePopupImpl instance usually has two references.
   //  - One owned by the instance itself. It represents the visible widget.
   //  - One owned by a WebViewImpl. It's released when the WebViewImpl ask the
   //    WebPagePopupImpl to close.
   // We need them because the closing operation is asynchronous and the widget
   // can be closed while the WebViewImpl is unaware of it.
   return adoptRef(new WebPagePopupImpl(client)).leakRef();
 }
 
 }  // namespace blink