Attachment 455299 Details for Bug 130078

[patch] patch post 513162

tmp.txt (text/plain), 1.42 KB, created by Jim Mathies [:jimm]

(hide)

Description:

Filename:

MIME Type:

Creator: Jim Mathies [:jimm]

Size: 1.42 KB

patch

obsolete

>diff --git a/layout/base/nsDocumentViewer.cpp b/layout/base/nsDocumentViewer.cpp
>--- a/layout/base/nsDocumentViewer.cpp
>+++ b/layout/base/nsDocumentViewer.cpp
>@@ -2365,27 +2365,21 @@ DocumentViewerImpl::DetachFromTopLevelWi
>   mAttachedToParent = PR_FALSE;
> }
> 
> nsIView*
> DocumentViewerImpl::FindContainerView()
> {
>   nsIView* containerView = nsnull;
> 
>-  nsCOMPtr<nsIContent> containerElement;
>-  nsCOMPtr<nsIDocShellTreeItem> docShellItem = do_QueryReferent(mContainer);
>-  nsCOMPtr<nsPIDOMWindow> pwin(do_GetInterface(docShellItem));
>-  if (pwin) {
>-    containerElement = do_QueryInterface(pwin->GetFrameElementInternal());
>-  }
>-        
>-  if (mParentWidget) {
>-    containerView = nsIView::GetViewFor(mParentWidget);
>-  } else {
>-    if (mContainer) {
>+  if (mContainer) {
>+    nsCOMPtr<nsIDocShellTreeItem> docShellItem = do_QueryReferent(mContainer);
>+    nsCOMPtr<nsPIDOMWindow> pwin(do_GetInterface(docShellItem));
>+    if (pwin) {
>+      nsCOMPtr<nsIContent> containerElement = do_QueryInterface(pwin->GetFrameElementInternal());
>       nsCOMPtr<nsIPresShell> parentPresShell;
>       if (docShellItem) {
>         nsCOMPtr<nsIDocShellTreeItem> parentDocShellItem;
>         docShellItem->GetParent(getter_AddRefs(parentDocShellItem));
>         if (parentDocShellItem) {
>           nsCOMPtr<nsIDocShell> parentDocShell = do_QueryInterface(parentDocShellItem);
>           parentDocShell->GetPresShell(getter_AddRefs(parentPresShell));
>         }

Actions: View | Diff | Review

Attachments on bug 130078: 130172 | 191565 | 206053 | 209787 | 220348 | 220737 | 241004 | 260724 | 260725 | 285010 | 285029 | 425945 | 425946 | 427177 | 449631 | 449633 | 453999 | 454424 | 454426 | 455299 | 462530 | 464587 | 465752 | 467516 | 468409