Backed out changeset 300036f6c90f from bug 580869 due to test failures
authorDave Townsend <dtownsend@oxymoronical.com>
Fri, 06 Aug 2010 15:00:19 -0700
changeset 49062 312fdcee7e5093582e6df431c7c210feef2b14b0
parent 49061 1e4f621a084dcaeb128576849f05a18b615bc20d
child 49063 87be0d140fd611534baa3bc3579062b9fa8ac4e6
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs580869
milestone2.0b4pre
backs out300036f6c90f769bc2a2ce4c9b5a3cfd1b141468
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 300036f6c90f from bug 580869 due to test failures
layout/generic/nsTextFrameThebes.cpp
--- a/layout/generic/nsTextFrameThebes.cpp
+++ b/layout/generic/nsTextFrameThebes.cpp
@@ -3470,23 +3470,18 @@ nsTextFrame::Init(nsIContent*      aCont
 }
 
 void
 nsTextFrame::ClearFrameOffsetCache()
 {
   // See if we need to remove ourselves from the offset cache
   if (GetStateBits() & TEXT_IN_OFFSET_CACHE) {
     nsIFrame* primaryFrame = mContent->GetPrimaryFrame();
-    if (primaryFrame) {
-      // The primary frame might be null here.  For example, nsLineBox::DeleteLineList
-      // just destroys the frames in order, which means that the primary frame is already
-      // dead if we're a continuing text frame, in which case, all of its properties are
-      // gone, and we don't need to worry about deleting this property here.
-      primaryFrame->Properties().Delete(OffsetToFrameProperty());
-    }
+    NS_ASSERTION(primaryFrame, "We should have a primary frame");
+    primaryFrame->Properties().Delete(OffsetToFrameProperty());
     RemoveStateBits(TEXT_IN_OFFSET_CACHE);
   }
 }
 
 void
 nsTextFrame::DestroyFrom(nsIFrame* aDestructRoot)
 {
   ClearFrameOffsetCache();