Changeset 83540 in webkit

Timestamp:

Apr 11, 2011 5:16:10 PM (13 years ago)

Author:

rniwa@webkit.org

Message:

2011-04-11 Ryosuke Niwa <​rniwa@webkit.org>

Unreviewed, rolling out r83515.
​http://trac.webkit.org/changeset/83515
​https://bugs.webkit.org/show_bug.cgi?id=57178

Broke GTK builds. nextOnLineExists and prevOnLineExists are still used in AccessibilityObjectWrapperAtk.cpp.

• rendering/InlineBox.cpp: (WebCore::InlineBox::nextOnLineExists): (WebCore::InlineBox::prevOnLineExists):
• rendering/InlineBox.h: (WebCore::InlineBox::InlineBox):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-11  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Unreviewed, rolling out r83515.
+        http://trac.webkit.org/changeset/83515
+        https://bugs.webkit.org/show_bug.cgi?id=57178
+
+        Broke GTK builds. nextOnLineExists and prevOnLineExists are still used in AccessibilityObjectWrapperAtk.cpp.
+
+        * rendering/InlineBox.cpp:
+        (WebCore::InlineBox::nextOnLineExists):
+        (WebCore::InlineBox::prevOnLineExists):
+        * rendering/InlineBox.h:
+        (WebCore::InlineBox::InlineBox):
+
 2011-04-11  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebCore/rendering/InlineBox.cpp

@@ -212 +212 @@
 }
 
+bool InlineBox::nextOnLineExists() const
+{
+    if (!m_determinedIfNextOnLineExists) {
+        m_determinedIfNextOnLineExists = true;
+
+        if (!parent())
+            m_nextOnLineExists = false;
+        else if (nextOnLine())
+            m_nextOnLineExists = true;
+        else
+            m_nextOnLineExists = parent()->nextOnLineExists();
+    }
+    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
 {

trunk/Source/WebCore/rendering/InlineBox.h

@@ -59 +59 @@
         , m_dirOverride(false)
         , m_isText(false)
+        , m_determinedIfNextOnLineExists(false)
+        , m_determinedIfPrevOnLineExists(false)
+        , m_nextOnLineExists(false)
+        , m_prevOnLineExists(false)
         , m_expansion(0)
 #ifndef NDEBUG
@@ -90 +94 @@
         , m_dirOverride(false)
         , m_isText(false)
+        , m_determinedIfNextOnLineExists(false)
+        , m_determinedIfPrevOnLineExists(false)
+        , m_nextOnLineExists(false)
+        , m_prevOnLineExists(false)
         , m_expansion(0)
 #ifndef NDEBUG
@@ -194 +202 @@
         m_prev = prev;
     }
+    bool nextOnLineExists() const;
+    bool prevOnLineExists() const;
 
     virtual bool isLeaf() const { return true; }
@@ -348 +358 @@
     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;
     int m_expansion : 11; // for justified text