CB-8814 Deprecate ScrollEvent

lybvinci · Apr 8, 2015 · 581252f · 581252f
1 parent b27d283
commit 581252f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 15 deletions.
diff --git a/framework/src/org/apache/cordova/CordovaWebViewEngine.java b/framework/src/org/apache/cordova/CordovaWebViewEngine.java
@@ -76,7 +76,6 @@ public interface Client {
         void onPageStarted(String newUrl);
         void onReceivedError(int errorCode, String description, String failingUrl);
         void onPageFinishedLoading(String url);
-        void onScrollChanged(int l, int t, int oldl, int oldt);
         boolean onNavigationAttempt(String url);
     }
 }
diff --git a/framework/src/org/apache/cordova/CordovaWebViewImpl.java b/framework/src/org/apache/cordova/CordovaWebViewImpl.java
@@ -573,14 +573,6 @@ public Boolean onDispatchKeyEvent(KeyEvent event) {
             return null;
         }
 
-        @Override
-        public void onScrollChanged(int l, int t, int oldl, int oldt) {
-            // TODO: scrolling is perf-sensitive, so we'd probably be better to no use postMessage
-            // here, and also not to create any new objects.
-            ScrollEvent myEvent = new ScrollEvent(l, t, oldl, oldt, getView());
-            pluginManager.postMessage("onScrollChanged", myEvent);
-        }
-
         @Override
         public boolean onNavigationAttempt(String url) {
             // Give plugins the chance to handle the url

diff --git a/framework/src/org/apache/cordova/ScrollEvent.java b/framework/src/org/apache/cordova/ScrollEvent.java
@@ -22,11 +22,9 @@ Licensed to the Apache Software Foundation (ASF) under one
 import android.view.View;
 
 /*
- * This can be used by any view, including native views
- * 
+ * @deprecated As of release 4.0. Use view.getViewTreeObserver().addOnScrollChangedListener(...) instead.
  */
-
-
+@Deprecated
 public class ScrollEvent {
 
     public int l, t, nl, nt;

diff --git a/framework/src/org/apache/cordova/engine/SystemWebView.java b/framework/src/org/apache/cordova/engine/SystemWebView.java
@@ -62,8 +62,13 @@ public void setWebChromeClient(WebChromeClient client) {
     @Override
     public void onScrollChanged(int l, int t, int oldl, int oldt)
     {
-        super.onScrollChanged(l, t, oldl, oldt);
-        parentEngine.client.onScrollChanged(l, t, oldl, oldt);
+        // TODO: scrolling is perf-sensitive, so we'd be better to not use postMessage
+        // here, and also not create any new objects. Instead, plugins should use:
+        //     webView.getView().getViewTreeObserver().addOnScrollChangedListener(...)
+        if (parentEngine != null && parentEngine.pluginManager != null) {
+            ScrollEvent myEvent = new ScrollEvent(l, t, oldl, oldt, this);
+            parentEngine.pluginManager.postMessage("onScrollChanged", myEvent);
+        }
     }
 
     @Override