commit ed791da741064a51080ec775001cf843ba6a3143
author Vivek Sekhar <vsekhar@codeaurora.org> Sun Feb 22 12:39:05 2015 -0800
committer Pankaj Garg <pgarg@codeaurora.org> Tue Mar 10 18:59:53 2015 -0700
tree ec3a08e5daab327bb657f6cb4e1c9a9808defaff
parent 06cd42fa8ed24a0755a49d680e4da74ada2d18d5

M42 snap browser

Change-Id: If52741ad5e34241aa9f928244942a33a91610e58

src/com/android/browser/BaseUi.java

diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java
index da9ad63..4c17b8b 100644
--- a/src/com/android/browser/BaseUi.java
+++ b/src/com/android/browser/BaseUi.java
@@ -428,14 +428,9 @@
         // container to the content view.
         FrameLayout wrapper =
                 (FrameLayout) container.findViewById(R.id.webview_wrapper);
-        ViewGroup parent = (ViewGroup) mainView.getParent();
-        if (parent != wrapper) {
-            if (parent != null) {
-                parent.removeView(mainView);
-            }
-            wrapper.addView(mainView);
-        }
-        parent = (ViewGroup) container.getParent();
+        if (wrapper != mainView.getView().getParent())
+            wrapper.addView(mainView.getView());
+        ViewGroup parent = (ViewGroup) container.getParent();
         if (parent != mContentView) {
             if (parent != null) {
                 parent.removeView(container);
@@ -458,7 +453,7 @@
         // needed by WebView.
         FrameLayout wrapper =
                 (FrameLayout) container.findViewById(R.id.webview_wrapper);
-        wrapper.removeView(mainView);
+        wrapper.removeView(mainView.getView());
         mContentView.removeView(container);
         mUiController.endActionMode();
         mUiController.removeSubWindow(tab);