Fix tab switching in embedding apps. Bug 139294,

r=philipl@mail.utexas.edu, sr=jst, a=asa

content/base/src/nsDocumentViewer.cpp

@@ -1105,6 +1105,7 @@ NS_NewDocumentViewer(nsIDocumentViewer** aResult)
 
 // Note: operator new zeros our memory
 DocumentViewerImpl::DocumentViewerImpl()
+  : mIsSticky(PR_TRUE)
 {
   NS_INIT_ISUPPORTS();
   PrepareToStartLoad();
@@ -1135,7 +1136,7 @@ void DocumentViewerImpl::PrepareToStartLoad()
 }
 
 DocumentViewerImpl::DocumentViewerImpl(nsIPresContext* aPresContext)
-  : mPresContext(aPresContext), mAllowPlugins(PR_TRUE), mIsSticky(PR_FALSE)
+  : mPresContext(aPresContext), mAllowPlugins(PR_TRUE), mIsSticky(PR_TRUE)
 {
   NS_INIT_ISUPPORTS();
   mHintCharsetSource = kCharsetUninitialized;

layout/base/nsDocumentViewer.cpp

@@ -1105,6 +1105,7 @@ NS_NewDocumentViewer(nsIDocumentViewer** aResult)
 
 // Note: operator new zeros our memory
 DocumentViewerImpl::DocumentViewerImpl()
+  : mIsSticky(PR_TRUE)
 {
   NS_INIT_ISUPPORTS();
   PrepareToStartLoad();
@@ -1135,7 +1136,7 @@ void DocumentViewerImpl::PrepareToStartLoad()
 }
 
 DocumentViewerImpl::DocumentViewerImpl(nsIPresContext* aPresContext)
-  : mPresContext(aPresContext), mAllowPlugins(PR_TRUE), mIsSticky(PR_FALSE)
+  : mPresContext(aPresContext), mAllowPlugins(PR_TRUE), mIsSticky(PR_TRUE)
 {
   NS_INIT_ISUPPORTS();
   mHintCharsetSource = kCharsetUninitialized;

layout/generic/nsFrameFrame.cpp

@@ -1024,6 +1024,16 @@ nsHTMLFrameInnerFrame::ShowDocShell(nsIPresContext* aPresContext)
     return NS_OK;
   }
 
+  nsCOMPtr<nsIContentViewer> content_viewer;
+  docShell->GetContentViewer(getter_AddRefs(content_viewer));
+
+  if (content_viewer) {
+    // Mark the content viewer as non-sticky so that the presentation
+    // can safely go away when this frame is destroyed.
+
+    content_viewer->SetSticky(PR_FALSE);
+  }
+
   nsCOMPtr<nsIContent> content;
   GetParentContent(getter_AddRefs(content));
 

layout/html/document/src/nsFrameFrame.cpp

@@ -1024,6 +1024,16 @@ nsHTMLFrameInnerFrame::ShowDocShell(nsIPresContext* aPresContext)
     return NS_OK;
   }
 
+  nsCOMPtr<nsIContentViewer> content_viewer;
+  docShell->GetContentViewer(getter_AddRefs(content_viewer));
+
+  if (content_viewer) {
+    // Mark the content viewer as non-sticky so that the presentation
+    // can safely go away when this frame is destroyed.
+
+    content_viewer->SetSticky(PR_FALSE);
+  }
+
   nsCOMPtr<nsIContent> content;
   GetParentContent(getter_AddRefs(content));