Fix RenderObject.o for iOS. Unreviewed build fix.
r156285 renamed firstChild() to firstChildSlow(), so update
occurances in IOS_TEXT_AUTOSIZING code. Also account for a
RenderObject::style reference / pointer change.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::traverseNext):
(WebCore::includeNonFixedHeight):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@161743 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index bad29ff..a0a187c 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,5 +1,17 @@
2014-01-10 Joseph Pecoraro <pecoraro@apple.com>
+ Fix RenderObject.o for iOS. Unreviewed build fix.
+
+ r156285 renamed firstChild() to firstChildSlow(), so update
+ occurances in IOS_TEXT_AUTOSIZING code. Also account for a
+ RenderObject::style reference / pointer change.
+
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::traverseNext):
+ (WebCore::includeNonFixedHeight):
+
+2014-01-10 Joseph Pecoraro <pecoraro@apple.com>
+
Fix MediaPlayerPrivateMediaSourceAVFObjC.o for iOS. Unreviewed build fix.
Import CALayer, which Mac must have been getting some other way.
diff --git a/Source/WebCore/rendering/RenderObject.cpp b/Source/WebCore/rendering/RenderObject.cpp
index 228875c..b4ae8b7 100644
--- a/Source/WebCore/rendering/RenderObject.cpp
+++ b/Source/WebCore/rendering/RenderObject.cpp
@@ -289,9 +289,10 @@
// Inspired by Node::traverseNextNode.
RenderObject* RenderObject::traverseNext(const RenderObject* stayWithin) const
{
- if (firstChild()) {
- ASSERT(!stayWithin || firstChild()->isDescendantOf(stayWithin));
- return firstChild();
+ RenderObject* child = firstChildSlow();
+ if (child) {
+ ASSERT(!stayWithin || child->isDescendantOf(stayWithin));
+ return child;
}
if (this == stayWithin)
return 0;
@@ -315,7 +316,7 @@
BlockContentHeightType overflowType;
// Check for suitable children.
- for (RenderObject* child = firstChild(); child; child = child->nextSibling()) {
+ for (RenderObject* child = firstChildSlow(); child; child = child->nextSibling()) {
overflowType = inclusionFunction(child);
if (overflowType != FixedHeight) {
currentDepth++;
@@ -359,7 +360,7 @@
RenderObject* RenderObject::traverseNext(const RenderObject* stayWithin, TraverseNextInclusionFunction inclusionFunction) const
{
- for (RenderObject* child = firstChild(); child; child = child->nextSibling()) {
+ for (RenderObject* child = firstChildSlow(); child; child = child->nextSibling()) {
if (inclusionFunction(child)) {
ASSERT(!stayWithin || child->isDescendantOf(stayWithin));
return child;
@@ -398,18 +399,16 @@
static RenderObject::BlockContentHeightType includeNonFixedHeight(const RenderObject* render)
{
- RenderStyle* style = render->style();
- if (style) {
- if (style->height().type() == Fixed) {
- if (render->isRenderBlock()) {
- const RenderBlock* block = toRenderBlock(render);
- // For fixed height styles, if the overflow size of the element spills out of the specified
- // height, assume we can apply text auto-sizing.
- if (style->overflowY() == OVISIBLE && style->height().value() < block->layoutOverflowRect().maxY())
- return RenderObject::OverflowHeight;
- }
- return RenderObject::FixedHeight;
+ const RenderStyle& style = render->style();
+ if (style.height().type() == Fixed) {
+ if (render->isRenderBlock()) {
+ const RenderBlock* block = toRenderBlock(render);
+ // For fixed height styles, if the overflow size of the element spills out of the specified
+ // height, assume we can apply text auto-sizing.
+ if (style.overflowY() == OVISIBLE && style.height().value() < block->layoutOverflowRect().maxY())
+ return RenderObject::OverflowHeight;
}
+ return RenderObject::FixedHeight;
}
return RenderObject::FlexibleHeight;
}
