Title: [129152] trunk/Source/WebCore
- Revision
- 129152
- Author
- [email protected]
- Date
- 2012-09-20 12:09:56 -0700 (Thu, 20 Sep 2012)
Log 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 <[email protected]> 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (129151 => 129152)
--- trunk/Source/WebCore/ChangeLog 2012-09-20 18:55:29 UTC (rev 129151)
+++ trunk/Source/WebCore/ChangeLog 2012-09-20 19:09:56 UTC (rev 129152)
@@ -1,3 +1,21 @@
+2012-09-20 Sheriff Bot <[email protected]>
+
+ 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 <[email protected]>
CSP reports should send an empty 'referrer' rather than nothing.
Modified: trunk/Source/WebCore/rendering/InlineBox.h (129151 => 129152)
--- trunk/Source/WebCore/rendering/InlineBox.h 2012-09-20 18:55:29 UTC (rev 129151)
+++ trunk/Source/WebCore/rendering/InlineBox.h 2012-09-20 19:09:56 UTC (rev 129152)
@@ -262,7 +262,7 @@
virtual void clearTruncation() { }
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();
Modified: trunk/Source/WebCore/rendering/InlineTextBox.cpp (129151 => 129152)
--- trunk/Source/WebCore/rendering/InlineTextBox.cpp 2012-09-20 18:55:29 UTC (rev 129151)
+++ trunk/Source/WebCore/rendering/InlineTextBox.cpp 2012-09-20 19:09:56 UTC (rev 129152)
@@ -64,15 +64,6 @@
InlineBox::destroy(arena);
}
-void InlineTextBox::markDirty(bool dirty)
-{
- if (dirty) {
- m_len = 0;
- m_start = 0;
- }
- InlineBox::markDirty(dirty);
-}
-
LayoutRect InlineTextBox::logicalOverflowRect() const
{
if (knownToHaveNoOverflow() || !gTextBoxesWithOverflow)
Modified: trunk/Source/WebCore/rendering/InlineTextBox.h (129151 => 129152)
--- trunk/Source/WebCore/rendering/InlineTextBox.h 2012-09-20 18:55:29 UTC (rev 129151)
+++ trunk/Source/WebCore/rendering/InlineTextBox.h 2012-09-20 19:09:56 UTC (rev 129152)
@@ -64,19 +64,17 @@
void setNextTextBox(InlineTextBox* n) { m_nextTextBox = n; }
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;
using InlineBox::setHasHyphen;
using InlineBox::canHaveLeadingExpansion;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
