Title: [96425] trunk/Source/WebCore
- Revision
- 96425
- Author
- commit-qu...@webkit.org
- Date
- 2011-09-30 14:23:44 -0700 (Fri, 30 Sep 2011)
Log Message
Unreviewed, rolling out r96422.
http://trac.webkit.org/changeset/96422
https://bugs.webkit.org/show_bug.cgi?id=69170
Broke Windows build and kling wanted to roll it out as well
(Requested by rniwa on #webkit).
Patch by Sheriff Bot <webkit.review....@gmail.com> on 2011-09-30
* rendering/InlineBox.cpp:
(WebCore::InlineBox::prevOnLineExists):
* rendering/InlineBox.h:
(WebCore::InlineBox::InlineBox):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (96424 => 96425)
--- trunk/Source/WebCore/ChangeLog 2011-09-30 21:15:04 UTC (rev 96424)
+++ trunk/Source/WebCore/ChangeLog 2011-09-30 21:23:44 UTC (rev 96425)
@@ -1,3 +1,17 @@
+2011-09-30 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r96422.
+ http://trac.webkit.org/changeset/96422
+ https://bugs.webkit.org/show_bug.cgi?id=69170
+
+ Broke Windows build and kling wanted to roll it out as well
+ (Requested by rniwa on #webkit).
+
+ * rendering/InlineBox.cpp:
+ (WebCore::InlineBox::prevOnLineExists):
+ * rendering/InlineBox.h:
+ (WebCore::InlineBox::InlineBox):
+
2011-09-30 David Hyatt <hy...@apple.com>
https://bugs.webkit.org/show_bug.cgi?id=69167
Modified: trunk/Source/WebCore/rendering/InlineBox.cpp (96424 => 96425)
--- trunk/Source/WebCore/rendering/InlineBox.cpp 2011-09-30 21:15:04 UTC (rev 96424)
+++ trunk/Source/WebCore/rendering/InlineBox.cpp 2011-09-30 21:23:44 UTC (rev 96425)
@@ -34,19 +34,6 @@
using namespace std;
namespace WebCore {
-
-class SameSizeAsInlineBox {
- virtual ~SameSizeAsInlineBox() { }
- void* a[4];
- FloatPoint b;
- float c;
- uint32_t d;
-#ifndef NDEBUG
- bool e;
-#endif
-};
-
-COMPILE_ASSERT(sizeof(InlineBox) == sizeof(SameSizeAsInlineBox), InlineBox_size_guard);
#ifndef NDEBUG
static bool inInlineBoxDetach;
@@ -271,6 +258,21 @@
return m_nextOnLineExists;
}
+bool InlineBox::prevOnLineExists() const
+{
+ if (!m_determinedIfPrevOnLineExists) {
+ m_determinedIfPrevOnLineExists = true;
+
+ if (!parent())
+ m_prevOnLineExists = false;
+ else if (prevOnLine())
+ m_prevOnLineExists = true;
+ else
+ m_prevOnLineExists = parent()->prevOnLineExists();
+ }
+ return m_prevOnLineExists;
+}
+
InlineBox* InlineBox::nextLeafChild() const
{
InlineBox* leaf = 0;
Modified: trunk/Source/WebCore/rendering/InlineBox.h (96424 => 96425)
--- trunk/Source/WebCore/rendering/InlineBox.h 2011-09-30 21:15:04 UTC (rev 96424)
+++ trunk/Source/WebCore/rendering/InlineBox.h 2011-09-30 21:23:44 UTC (rev 96425)
@@ -56,7 +56,9 @@
, m_dirOverride(false)
, m_isText(false)
, m_determinedIfNextOnLineExists(false)
+ , m_determinedIfPrevOnLineExists(false)
, m_nextOnLineExists(false)
+ , m_prevOnLineExists(false)
, m_expansion(0)
#ifndef NDEBUG
, m_hasBadParent(false)
@@ -88,7 +90,9 @@
, m_dirOverride(false)
, m_isText(false)
, m_determinedIfNextOnLineExists(false)
+ , m_determinedIfPrevOnLineExists(false)
, m_nextOnLineExists(false)
+ , m_prevOnLineExists(false)
, m_expansion(0)
#ifndef NDEBUG
, m_hasBadParent(false)
@@ -199,6 +203,7 @@
m_prev = prev;
}
bool nextOnLineExists() const;
+ bool prevOnLineExists() const;
virtual bool isLeaf() const { return true; }
@@ -359,7 +364,9 @@
bool m_isText : 1; // Whether or not this object represents text with a non-zero height. Includes non-image list markers, text boxes.
protected:
mutable bool m_determinedIfNextOnLineExists : 1;
+ mutable bool m_determinedIfPrevOnLineExists : 1;
mutable bool m_nextOnLineExists : 1;
+ mutable bool m_prevOnLineExists : 1;
signed m_expansion : 11; // for justified text
#ifndef NDEBUG
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
