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

third_party/WebKit/Source/web/ChromeClientImpl.h

Index: third_party/WebKit/Source/web/ChromeClientImpl.h
diff --git a/third_party/WebKit/Source/web/ChromeClientImpl.h b/third_party/WebKit/Source/web/ChromeClientImpl.h
index eebc17790f4f992931a72270634da17118b2f8fd..3f7a60b388bdaf2faaf739b7099053c0148b7feb 100644
--- a/third_party/WebKit/Source/web/ChromeClientImpl.h
+++ b/third_party/WebKit/Source/web/ChromeClientImpl.h
@@ -42,6 +42,8 @@ namespace blink {
 
 class PagePopup;
 class PagePopupClient;
+class WebLayerTreeView;
+class WebLocalFrame;
 class WebViewImpl;
 struct WebCursorInfo;
 
@@ -136,10 +138,19 @@ class WEB_EXPORT ChromeClientImpl final : public ChromeClient {
   void enumerateChosenDirectory(FileChooser*) override;
   void setCursor(const Cursor&, LocalFrame*) override;
   Cursor lastSetCursorForTesting() const override;
-  void setEventListenerProperties(WebEventListenerClass,
+  void setEventListenerProperties(LocalFrame*,
+                                  WebEventListenerClass,
                                   WebEventListenerProperties) override;
+  // wjm - make this private
+  void setEventListenerProperties(WebLayerTreeView*,
+                                  WebEventListenerClass,
+                                  WebEventListenerProperties);
   WebEventListenerProperties eventListenerProperties(
+      LocalFrame*,
       WebEventListenerClass) const override;
+  WebEventListenerProperties eventListenerProperties(
+      WebLayerTreeView*,
+      WebEventListenerClass) const;
   void setHasScrollEventHandlers(bool hasEventHandlers) override;
   bool hasScrollEventHandlers() const override;
   void setTouchAction(TouchAction) override;
@@ -226,6 +237,10 @@ class WEB_EXPORT ChromeClientImpl final : public ChromeClient {
   void registerPopupOpeningObserver(PopupOpeningObserver*) override;
   void unregisterPopupOpeningObserver(PopupOpeningObserver*) override;
 
+  void setEventListenerProperties(WebLocalFrame*,
+                                  WebEventListenerClass,
+                                  WebEventListenerProperties);
+
   void setCursor(const WebCursorInfo&, LocalFrame*);
 
   WebViewImpl* m_webView;  // Weak pointer.