Changeset 96425 in webkit

Timestamp:

Sep 30, 2011 2:23:44 PM (13 years ago)

Author:

commit-queue@webkit.org

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.bot@gmail.com> on 2011-09-30

• rendering/InlineBox.cpp:

(WebCore::InlineBox::prevOnLineExists):

• rendering/InlineBox.h:

(WebCore::InlineBox::InlineBox):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/InlineBox.cpp (modified) (2 diffs)
• rendering/InlineBox.h (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-30  Sheriff Bot  <webkit.review.bot@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  <hyatt@apple.com>
 

trunk/Source/WebCore/rendering/InlineBox.cpp

@@ -35 +35 @@
 
 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
@@ -272 +259 @@
 }
 
+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
 {

trunk/Source/WebCore/rendering/InlineBox.h

@@ -57 +57 @@
         , m_isText(false)
         , m_determinedIfNextOnLineExists(false)
+        , m_determinedIfPrevOnLineExists(false)
         , m_nextOnLineExists(false)
+        , m_prevOnLineExists(false)
         , m_expansion(0)
 #ifndef NDEBUG
@@ -89 +91 @@
         , m_isText(false)
         , m_determinedIfNextOnLineExists(false)
+        , m_determinedIfPrevOnLineExists(false)
         , m_nextOnLineExists(false)
+        , m_prevOnLineExists(false)
         , m_expansion(0)
 #ifndef NDEBUG
@@ -200 +204 @@
     }
     bool nextOnLineExists() const;
+    bool prevOnLineExists() const;
 
     virtual bool isLeaf() const { return true; }
@@ -360 +365 @@
 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