summaryrefslogtreecommitdiffstats
path: root/layout/base/nsPresShell.cpp
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2020-04-17 05:04:10 -0400
committerMatt A. Tobin <email@mattatobin.com>2020-04-17 05:04:10 -0400
commit9f6cb6874e537fd4f451e507b1832b94b04d9d97 (patch)
tree5f5203e49a079233c5959d5f5d433e412437832e /layout/base/nsPresShell.cpp
parent0d362ca50335d964a78dbba7e7d32574ee67899a (diff)
downloadUXP-9f6cb6874e537fd4f451e507b1832b94b04d9d97.tar
UXP-9f6cb6874e537fd4f451e507b1832b94b04d9d97.tar.gz
UXP-9f6cb6874e537fd4f451e507b1832b94b04d9d97.tar.lz
UXP-9f6cb6874e537fd4f451e507b1832b94b04d9d97.tar.xz
UXP-9f6cb6874e537fd4f451e507b1832b94b04d9d97.zip
Bug 1296516 - Cleanup a bit of code in layout/base
* Tidy RestyleManager::ContentStateChanged * Convert UndisplayedMap to a typed hashtable * Cleanup infallible or unchecked nsCSSFrameConstructor methods Tag #1375
Diffstat (limited to 'layout/base/nsPresShell.cpp')
-rw-r--r--layout/base/nsPresShell.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index 264b52b18..b190622c7 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -4444,14 +4444,14 @@ PresShell::NotifyCounterStylesAreDirty()
mFrameConstructor->EndUpdate();
}
-nsresult
-PresShell::ReconstructFrames(void)
+void
+PresShell::ReconstructFrames()
{
NS_PRECONDITION(!mFrameConstructor->GetRootFrame() || mDidInitialize,
"Must not have root frame before initial reflow");
if (!mDidInitialize || mIsDestroying) {
// Nothing to do here
- return NS_OK;
+ return;
}
nsCOMPtr<nsIPresShell> kungFuDeathGrip(this);
@@ -4461,16 +4461,14 @@ PresShell::ReconstructFrames(void)
mDocument->FlushPendingNotifications(Flush_ContentAndNotify);
if (mIsDestroying) {
- return NS_OK;
+ return;
}
nsAutoCauseReflowNotifier crNotifier(this);
mFrameConstructor->BeginUpdate();
- nsresult rv = mFrameConstructor->ReconstructDocElementHierarchy();
+ mFrameConstructor->ReconstructDocElementHierarchy();
VERIFY_STYLE_TREE;
mFrameConstructor->EndUpdate();
-
- return rv;
}
void