diff options
| author | Steve Block <steveblock@google.com> | 2012-04-12 06:43:46 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-12 06:43:46 -0700 |
| commit | a341bdb3e249b68647710bb025a166d7d20abdfb (patch) | |
| tree | 53265e3657deca3a760c23aba37576c4782db43d /Source | |
| parent | 8c7fd36cd11b84541c4579f3c6282f55603bf134 (diff) | |
| parent | 36df29d71f5315df6fe4375954add26fe3849273 (diff) | |
| download | external_webkit-a341bdb3e249b68647710bb025a166d7d20abdfb.zip external_webkit-a341bdb3e249b68647710bb025a166d7d20abdfb.tar.gz external_webkit-a341bdb3e249b68647710bb025a166d7d20abdfb.tar.bz2 | |
Merge "Cherry-pick WebKit change r91386 to fix a rendering crash"
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/WebCore/rendering/RenderBox.cpp | 2 | ||||
| -rw-r--r-- | Source/WebCore/rendering/RenderBox.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Source/WebCore/rendering/RenderBox.cpp b/Source/WebCore/rendering/RenderBox.cpp index fb1dd2c..9c40d5b 100644 --- a/Source/WebCore/rendering/RenderBox.cpp +++ b/Source/WebCore/rendering/RenderBox.cpp @@ -3260,7 +3260,7 @@ bool RenderBox::shrinkToAvoidFloats() const bool RenderBox::avoidsFloats() const { - return isReplaced() || hasOverflowClip() || isHR() || isLegend() || isWritingModeRoot(); + return isReplaced() || hasOverflowClip() || isHR() || isLegend() || isWritingModeRoot() || isDeprecatedFlexItem(); } void RenderBox::addShadowOverflow() diff --git a/Source/WebCore/rendering/RenderBox.h b/Source/WebCore/rendering/RenderBox.h index 1bee989..a5dc1b2 100644 --- a/Source/WebCore/rendering/RenderBox.h +++ b/Source/WebCore/rendering/RenderBox.h @@ -378,6 +378,8 @@ public: virtual void markForPaginationRelayoutIfNeeded() { } bool isWritingModeRoot() const { return !parent() || parent()->style()->writingMode() != style()->writingMode(); } + + bool isDeprecatedFlexItem() const { return !isInline() && !isFloatingOrPositioned() && parent() && parent()->isFlexibleBox(); } virtual int lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const; virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const; |