Changeset 129152 in webkit

Timestamp:

Sep 20, 2012 12:09:56 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r129144.
​http://trac.webkit.org/changeset/129144
​https://bugs.webkit.org/show_bug.cgi?id=97244

causing lots of assertions in tests (Requested by smfr on
#webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2012-09-20

• rendering/InlineBox.h:

(WebCore::InlineBox::markDirty):

• rendering/InlineTextBox.cpp:
• rendering/InlineTextBox.h:

(WebCore::InlineTextBox::start):
(WebCore::InlineTextBox::end):
(WebCore::InlineTextBox::len):
(WebCore::InlineTextBox::offsetRun):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/InlineBox.h (modified) (1 diff)
• rendering/InlineTextBox.cpp (modified) (1 diff)
• rendering/InlineTextBox.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-20  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r129144.
+        http://trac.webkit.org/changeset/129144
+        https://bugs.webkit.org/show_bug.cgi?id=97244
+
+        causing lots of assertions in tests (Requested by smfr on
+        #webkit).
+
+        * rendering/InlineBox.h:
+        (WebCore::InlineBox::markDirty):
+        * rendering/InlineTextBox.cpp:
+        * rendering/InlineTextBox.h:
+        (WebCore::InlineTextBox::start):
+        (WebCore::InlineTextBox::end):
+        (WebCore::InlineTextBox::len):
+        (WebCore::InlineTextBox::offsetRun):
+
 2012-09-20  Mike West  <mkwst@chromium.org>
 

trunk/Source/WebCore/rendering/InlineBox.h

@@ -263 +263 @@
 
     bool isDirty() const { return m_bitfields.dirty(); }
-    virtual void markDirty(bool dirty = true) { m_bitfields.setDirty(dirty); }
+    void markDirty(bool dirty = true) { m_bitfields.setDirty(dirty); }
 
     virtual void dirtyLineBoxes();

trunk/Source/WebCore/rendering/InlineTextBox.cpp

@@ -63 +63 @@
         gTextBoxesWithOverflow->remove(this);
     InlineBox::destroy(arena);
-}
-
-void InlineTextBox::markDirty(bool dirty)
-{
-    if (dirty) {
-        m_len = 0;
-        m_start = 0;
-    }
-    InlineBox::markDirty(dirty);
 }
 

trunk/Source/WebCore/rendering/InlineTextBox.h

@@ -65 +65 @@
     void setPreviousTextBox(InlineTextBox* p) { m_prevTextBox = p; }
 
-    unsigned start() const { ASSERT(!isDirty()); return m_start; }
-    unsigned end() const { ASSERT(!isDirty()); return m_len ? m_start + m_len - 1 : m_start; }
-    unsigned len() const { ASSERT(!isDirty()); return m_len; }
+    unsigned start() const { return m_start; }
+    unsigned end() const { return m_len ? m_start + m_len - 1 : m_start; }
+    unsigned len() const { return m_len; }
 
     void setStart(unsigned start) { m_start = start; }
     void setLen(unsigned len) { m_len = len; }
 
-    void offsetRun(int d) { ASSERT(!isDirty()); m_start += d; }
+    void offsetRun(int d) { m_start += d; }
 
     unsigned short truncation() { return m_truncation; }
-
-    virtual void markDirty(bool dirty = true) OVERRIDE;
 
     using InlineBox::hasHyphen;