Changeset 157810 in webkit for trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp

Timestamp:

Oct 22, 2013, 2:03:38 PM (12 years ago)

Author:

Antti Koivisto

Message:

Rename some line box functions to be just about lines
​https://bugs.webkit.org/show_bug.cgi?id=123168

Reviewed by Dave Hyatt.

firstLineBoxBaseline -> firstLineBaseline
hasInlineBoxChildren -> hasLines

Also use hasLines in a bunch of places where firstLineBox() was used.

• accessibility/AccessibilityRenderObject.cpp:

(WebCore::AccessibilityRenderObject::computeAccessibilityIsIgnored):

Also use hasRenderedText() instead of firstTextBox()

• rendering/RenderFullScreen.cpp:

Fix namespace.

File:

• trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp (modified) (2 diffs)

trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp

@@ -442 +442 @@
             // Update our height and overflow height.
             if (style()->boxAlign() == BBASELINE) {
-                LayoutUnit ascent = child->firstLineBoxBaseline();
+                LayoutUnit ascent = child->firstLineBaseline();
                 if (ascent == -1)
                     ascent = child->height() + child->marginBottom();
@@ -520 +520 @@
                     break;
                 case BBASELINE: {
-                    LayoutUnit ascent = child->firstLineBoxBaseline();
+                    LayoutUnit ascent = child->firstLineBaseline();
                     if (ascent == -1)
                         ascent = child->height() + child->marginBottom();