Backed out changeset e6913f1de086 (bug 1552104) for causing test_bug660404.html and test_bug590573.html to perma fail CLOSED TREE
authorCiure Andrei <aciure@mozilla.com>
Thu, 16 May 2019 12:54:55 +0300
changeset 474088 82d64b7597a090702479c6f8548ba883a68b0e4a
parent 474087 0883716b330eff8ee1649e612afeb2c01f5e51bc
child 474089 0384e2221ced38f2e849f368a3274501e9c2f179
push id36022
push userncsoregi@mozilla.com
push dateThu, 16 May 2019 21:55:16 +0000
treeherdermozilla-central@96802be91766 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1552104, 660404, 590573
milestone68.0a1
backs oute6913f1de086cb75104de6f5105df44f7818ce1e
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset e6913f1de086 (bug 1552104) for causing test_bug660404.html and test_bug590573.html to perma fail CLOSED TREE
layout/base/nsDocumentViewer.cpp
layout/generic/nsSubDocumentFrame.h
--- a/layout/base/nsDocumentViewer.cpp
+++ b/layout/base/nsDocumentViewer.cpp
@@ -1726,26 +1726,16 @@ nsDocumentViewer::Destroy() {
     if (mPresShell) {
       nsViewManager* vm = mPresShell->GetViewManager();
       if (vm) {
         nsView* rootView = vm->GetRootView();
 
         if (rootView) {
           nsView* rootViewParent = rootView->GetParent();
           if (rootViewParent) {
-            nsView* subdocview = rootViewParent->GetParent();
-            if (subdocview) {
-              nsIFrame* f = subdocview->GetFrame();
-              if (f) {
-                nsSubDocumentFrame* s = do_QueryFrame(f);
-                if (s) {
-                  s->ClearDisplayItems();
-                }
-              }
-            }
             nsViewManager* parentVM = rootViewParent->GetViewManager();
             if (parentVM) {
               parentVM->RemoveChild(rootView);
             }
           }
         }
       }
     }
--- a/layout/generic/nsSubDocumentFrame.h
+++ b/layout/generic/nsSubDocumentFrame.h
@@ -117,34 +117,34 @@ class nsSubDocumentFrame final : public 
   }
 
   nsFrameLoader* FrameLoader() const;
   void ResetFrameLoader();
 
   void PropagateIsUnderHiddenEmbedderElementToSubView(
       bool aIsUnderHiddenEmbedderElement);
 
-  void ClearDisplayItems();
-
  protected:
   friend class AsyncFrameInit;
 
   // Helper method to look up the HTML marginwidth & marginheight attributes.
   mozilla::CSSIntSize GetMarginAttributes();
 
   bool IsInline() { return mIsInline; }
 
   nscoord GetIntrinsicISize();
   nscoord GetIntrinsicBSize();
 
   // Show our document viewer. The document viewer is hidden via a script
   // runner, so that we can save and restore the presentation if we're
   // being reframed.
   void ShowViewer();
 
+  void ClearDisplayItems();
+
   /* Obtains the frame we should use for intrinsic size information if we are
    * an HTML <object> or <embed>  (a replaced element - not <iframe>)
    * and our sub-document has an intrinsic size. The frame returned is the
    * frame for the document element of the document we're embedding.
    *
    * Called "Obtain*" and not "Get*" because of comment on GetDocShell that
    * says it should be called ObtainDocShell because of its side effects.
    */