Bug 1411754 - Rename PresShell::DestroyFramesFor to DestroyFramesForAndRestyle

Tag #1375

3 files changed, 4 insertions, 5 deletions

diff --git a/dom/base/Element.cpp b/dom/base/Element.cpp
index 5bbfbee9b..ba5ba9c72 100644
--- a/dom/base/Element.cpp
+++ b/dom/base/Element.cpp
@@ -1119,7 +1119,7 @@ Element::CreateShadowRoot(ErrorResult& aError)
 
   if (nsIDocument* doc = GetComposedDoc()) {
     if (nsIPresShell* shell = doc->GetShell()) {
-      shell->DestroyFramesFor(this);
+      shell->DestroyFramesForAndRestyle(this);
       MOZ_ASSERT(!shell->FrameManager()->GetDisplayContentsStyleFor(this));
     }
   }
diff --git a/dom/base/ShadowRoot.cpp b/dom/base/ShadowRoot.cpp
index f19cad6df..5f61b1f4d 100644
--- a/dom/base/ShadowRoot.cpp
+++ b/dom/base/ShadowRoot.cpp
@@ -265,8 +265,7 @@ ShadowRoot::DistributionChanged()
     return;
   }
 
-  // FIXME(emilio): Rename this to DestroyFramesForAndRestyle?
-  shell->DestroyFramesFor(host);
+  shell->DestroyFramesForAndRestyle(host);
 }
 
 const HTMLContentElement*
@@ -513,7 +512,7 @@ ShadowRoot::AttributeChanged(nsIDocument* aDocument,
     return;
   }
 
-  shell->DestroyFramesFor(aElement);
+  shell->DestroyFramesForAndRestyle(aElement);
 }
 
 bool
diff --git a/dom/xbl/nsXBLService.cpp b/dom/xbl/nsXBLService.cpp
index ef0d20564..b50b2c6fe 100644
--- a/dom/xbl/nsXBLService.cpp
+++ b/dom/xbl/nsXBLService.cpp
@@ -125,7 +125,7 @@ public:
     // since if the binding fetch fails then we don't want to destroy the
     // frames.
     if (nsIPresShell* shell = doc->GetShell()) {
-      shell->DestroyFramesFor(mBoundElement->AsElement());
+      shell->DestroyFramesForAndRestyle(mBoundElement->AsElement());
     }
     MOZ_ASSERT(!mBoundElement->GetPrimaryFrame());
   }