From: commit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri, 30 Sep 2011 21:23:44 +0000 (+0000)
Subject: Unreviewed, rolling out r96422.
X-Git-Tag: 070512121124~23269
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3cf9777edf9199c37fa1d71b37aa3a8c01c2ef04;p=profile%2Fivi%2Fwebkit-efl.git

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):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@96425 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index eddb311..da39cbe 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+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>
 
         https://bugs.webkit.org/show_bug.cgi?id=69167
diff --git a/Source/WebCore/rendering/InlineBox.cpp b/Source/WebCore/rendering/InlineBox.cpp
index 18e9a1a..2eda402 100644
--- a/Source/WebCore/rendering/InlineBox.cpp
+++ b/Source/WebCore/rendering/InlineBox.cpp
@@ -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 @@ bool InlineBox::nextOnLineExists() const
     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;
diff --git a/Source/WebCore/rendering/InlineBox.h b/Source/WebCore/rendering/InlineBox.h
index 3f5d128..cf6da56 100644
--- a/Source/WebCore/rendering/InlineBox.h
+++ b/Source/WebCore/rendering/InlineBox.h
@@ -56,7 +56,9 @@ public:
         , 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 @@ public:
         , 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 @@ public:
         m_prev = prev;
     }
     bool nextOnLineExists() const;
+    bool prevOnLineExists() const;
 
     virtual bool isLeaf() const { return true; }
     
@@ -359,7 +364,9 @@ public:
     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