Merge "DO NOT MERGE remove defunct javascript interface" into jb-dev

gcondra · Android (Google) Code Review · commit a22000d24491 · 2012-10-09T21:32:01.000-07:00
diff --git a/core/java/android/webkit/BrowserFrame.java b/core/java/android/webkit/BrowserFrame.java
@@ -245,7 +245,6 @@ public BrowserFrame(Context context, WebViewCore w, CallbackProxy proxy,
         mWebViewCore = w;
 
         mSearchBox = new SearchBoxImpl(mWebViewCore, mCallbackProxy);
-        mJavaScriptObjects.put(SearchBoxImpl.JS_INTERFACE_NAME, mSearchBox);
 
         AssetManager am = context.getAssets();
         nativeCreateFrame(w, am, proxy.getBackForwardList());
@@ -598,8 +597,6 @@ private void windowObjectCleared(int nativeFramePointer) {
             }
         }
         mRemovedJavaScriptObjects.clear();
-
-        stringByEvaluatingJavaScriptFromString(SearchBoxImpl.JS_BRIDGE);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,6 @@ public BrowserFrame(Context context, WebViewCore w, CallbackProxy proxy,`
`245`	`245`	`mWebViewCore = w;`
`246`	`246`
`247`	`247`	`mSearchBox = new SearchBoxImpl(mWebViewCore, mCallbackProxy);`
`248`		`- mJavaScriptObjects.put(SearchBoxImpl.JS_INTERFACE_NAME, mSearchBox);`
`249`	`248`
`250`	`249`	`AssetManager am = context.getAssets();`
`251`	`250`	`nativeCreateFrame(w, am, proxy.getBackForwardList());`
`@@ -598,8 +597,6 @@ private void windowObjectCleared(int nativeFramePointer) {`
`598`	`597`	`}`
`599`	`598`	`}`
`600`	`599`	`mRemovedJavaScriptObjects.clear();`
`601`		`-`
`602`		`- stringByEvaluatingJavaScriptFromString(SearchBoxImpl.JS_BRIDGE);`
`603`	`600`	`}`
`604`	`601`
`605`	`602`	`/**`