Diff
Modified: branches/safari-537-branch/LayoutTests/ChangeLog (151813 => 151814)
--- branches/safari-537-branch/LayoutTests/ChangeLog 2013-06-21 02:17:39 UTC (rev 151813)
+++ branches/safari-537-branch/LayoutTests/ChangeLog 2013-06-21 02:24:57 UTC (rev 151814)
@@ -1,3 +1,7 @@
+2013-06-20 Lucas Forschler <[email protected]>
+
+ Merge r151799
+
2013-06-18 Roger Fong <[email protected]>
Disable some feature flags and update test expectations.
Modified: branches/safari-537-branch/LayoutTests/fast/forms/onselect-textfield-expected.txt (151813 => 151814)
--- branches/safari-537-branch/LayoutTests/fast/forms/onselect-textfield-expected.txt 2013-06-21 02:17:39 UTC (rev 151813)
+++ branches/safari-537-branch/LayoutTests/fast/forms/onselect-textfield-expected.txt 2013-06-21 02:24:57 UTC (rev 151814)
@@ -9,11 +9,11 @@
Double clicking to make selection for text field
onselect fired for text field
-After double clicking: text field selection start: 0 end: 5
+After double clicking: text field selection start: 6 end: 10
Calling blur on text field
-After blur: text field selection start: 0 end: 5
+After blur: text field selection start: 6 end: 10
Calling focus on text field
-After focus: text field selection start: 0 end: 5
+After focus: text field selection start: 6 end: 10
Deleted: branches/safari-537-branch/LayoutTests/fast/replaced/width-and-height-of-positioned-replaced-elements-expected.png
(Binary files differ)
Deleted: branches/safari-537-branch/LayoutTests/fast/replaced/width-and-height-of-positioned-replaced-elements-expected.txt (151813 => 151814)
--- branches/safari-537-branch/LayoutTests/fast/replaced/width-and-height-of-positioned-replaced-elements-expected.txt 2013-06-21 02:17:39 UTC (rev 151813)
+++ branches/safari-537-branch/LayoutTests/fast/replaced/width-and-height-of-positioned-replaced-elements-expected.txt 2013-06-21 02:24:57 UTC (rev 151814)
@@ -1,25 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
- RenderBlock {HTML} at (0,0) size 800x51
- RenderBody {BODY} at (8,16) size 784x19
- RenderBlock {P} at (0,0) size 784x19
- RenderText {#text} at (0,0) size 581x19
- text run at (0,0) width 581: "webkit.org/b/93735: Use the replaced height and width computation for positioned form controls"
-layer at (7,32) size 408x28
- RenderTextControl {INPUT} at (7,32) size 408x28
-layer at (9,36) size 404x20
- RenderBlock {DIV} at (2,4) size 404x20
-layer at (7,82) size 56x34
- RenderButton {INPUT} at (7,82) size 56x34 [bgcolor=#C0C0C0]
- RenderBlock (anonymous) at (6,6) size 44x24
- RenderText at (6,0) size 32x24
- text run at (6,0) width 32: "text"
-layer at (7,132) size 136x28
- RenderMenuList {SELECT} at (7,132) size 136x28 [bgcolor=#FFFFFF]
- RenderBlock (anonymous) at (4,4) size 108x20
- RenderText at (0,0) size 80x20
- text run at (0,0) width 80: "test"
-layer at (7,182) size 423x48
- RenderTextControl {TEXTAREA} at (7,182) size 423x48
- RenderBlock {DIV} at (2,2) size 419x20
Modified: branches/safari-537-branch/LayoutTests/platform/mac/fast/forms/button-positioned-expected.txt (151813 => 151814)
--- branches/safari-537-branch/LayoutTests/platform/mac/fast/forms/button-positioned-expected.txt 2013-06-21 02:17:39 UTC (rev 151813)
+++ branches/safari-537-branch/LayoutTests/platform/mac/fast/forms/button-positioned-expected.txt 2013-06-21 02:24:57 UTC (rev 151814)
@@ -3,13 +3,13 @@
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
-layer at (10,10) size 170x15
- RenderButton {BUTTON} at (10,10) size 170x15 [bgcolor=#C0C0C0] [border: none (2px outset #C0C0C0) none (2px outset #C0C0C0)]
- RenderBlock (anonymous) at (8,2) size 154x13
- RenderText {#text} at (8,0) size 138x13
- text run at (8,0) width 138: "This button is positioned."
-layer at (10,10) size 191x18
- RenderButton {INPUT} at (10,10) size 191x18 [bgcolor=#C0C0C0]
- RenderBlock (anonymous) at (8,2) size 175x13
- RenderText at (8,0) size 159x13
- text run at (8,0) width 159: "This button is also positioned"
+layer at (10,10) size 154x18
+ RenderButton {BUTTON} at (10,10) size 154x18 [bgcolor=#C0C0C0] [border: none (2px outset #C0C0C0) none (2px outset #C0C0C0)]
+ RenderBlock (anonymous) at (8,2) size 138x13
+ RenderText {#text} at (0,0) size 138x13
+ text run at (0,0) width 138: "This button is positioned."
+layer at (10,10) size 175x18
+ RenderButton {INPUT} at (10,10) size 175x18 [bgcolor=#C0C0C0]
+ RenderBlock (anonymous) at (8,2) size 159x13
+ RenderText at (0,0) size 159x13
+ text run at (0,0) width 159: "This button is also positioned"
Modified: branches/safari-537-branch/LayoutTests/platform/mac/fast/forms/input-appearance-preventDefault-expected.txt (151813 => 151814)
--- branches/safari-537-branch/LayoutTests/platform/mac/fast/forms/input-appearance-preventDefault-expected.txt 2013-06-21 02:17:39 UTC (rev 151813)
+++ branches/safari-537-branch/LayoutTests/platform/mac/fast/forms/input-appearance-preventDefault-expected.txt 2013-06-21 02:24:57 UTC (rev 151814)
@@ -8,10 +8,10 @@
text run at (0,18) width 666: "This tests that preventDefault called onmousedown will prevent a caret from being placed in the text field."
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
-layer at (12,52) size 129x25
- RenderTextControl {INPUT} at (12,52) size 129x25 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-layer at (15,58) size 123x13 scrollWidth 130
- RenderBlock {DIV} at (3,6) size 123x13
+layer at (12,52) size 123x19
+ RenderTextControl {INPUT} at (12,52) size 123x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+layer at (15,55) size 117x13 scrollWidth 130
+ RenderBlock {DIV} at (3,3) size 117x13
RenderText {#text} at (0,0) size 129x13
text run at (0,0) width 129: "No caret should be here"
layer at (10,70) size 323x36
Deleted: branches/safari-537-branch/LayoutTests/platform/mac/fast/replaced/width-and-height-of-positioned-replaced-elements-expected.txt (151813 => 151814)
--- branches/safari-537-branch/LayoutTests/platform/mac/fast/replaced/width-and-height-of-positioned-replaced-elements-expected.txt 2013-06-21 02:17:39 UTC (rev 151813)
+++ branches/safari-537-branch/LayoutTests/platform/mac/fast/replaced/width-and-height-of-positioned-replaced-elements-expected.txt 2013-06-21 02:24:57 UTC (rev 151814)
@@ -1,25 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x50
- RenderBlock {HTML} at (0,0) size 800x50
- RenderBody {BODY} at (8,16) size 784x18
- RenderBlock {P} at (0,0) size 784x18
- RenderText {#text} at (0,0) size 608x18
- text run at (0,0) width 608: "webkit.org/b/93735: Use the replaced height and width computation for positioned form controls"
-layer at (7,32) size 412x32
- RenderTextControl {INPUT} at (7,32) size 412x32 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-layer at (10,38) size 406x20
- RenderBlock {DIV} at (3,6) size 406x20
-layer at (7,82) size 57x21
- RenderButton {INPUT} at (7,82) size 57x21 [bgcolor=#C0C0C0]
- RenderBlock (anonymous) at (8,2) size 41x16
- RenderText at (8,0) size 25x16
- text run at (8,0) width 25: "text"
-layer at (7,132) size 55x21
- RenderMenuList {SELECT} at (7,132) size 55x21 [bgcolor=#FFFFFF]
- RenderBlock (anonymous) at (0,0) size 55x21
- RenderText at (8,2) size 24x16
- text run at (8,2) width 24: "test"
-layer at (7,182) size 427x52 clip at (8,183) size 425x50
- RenderTextControl {TEXTAREA} at (7,182) size 427x52 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
- RenderBlock {DIV} at (3,3) size 421x20
Deleted: branches/safari-537-branch/LayoutTests/platform/mac-wk2/fast/replaced/width-and-height-of-positioned-replaced-elements-expected.txt (151813 => 151814)
--- branches/safari-537-branch/LayoutTests/platform/mac-wk2/fast/replaced/width-and-height-of-positioned-replaced-elements-expected.txt 2013-06-21 02:17:39 UTC (rev 151813)
+++ branches/safari-537-branch/LayoutTests/platform/mac-wk2/fast/replaced/width-and-height-of-positioned-replaced-elements-expected.txt 2013-06-21 02:24:57 UTC (rev 151814)
@@ -1,25 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x50
- RenderBlock {HTML} at (0,0) size 800x50
- RenderBody {BODY} at (8,16) size 784x18
- RenderBlock {P} at (0,0) size 784x18
- RenderText {#text} at (0,0) size 608x18
- text run at (0,0) width 608: "webkit.org/b/93735: Use the replaced height and width computation for positioned form controls"
-layer at (7,32) size 412x32
- RenderTextControl {INPUT} at (7,32) size 412x32 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-layer at (10,38) size 406x20
- RenderBlock {DIV} at (3,6) size 406x20
-layer at (7,82) size 57x21
- RenderButton {INPUT} at (7,82) size 57x21 [bgcolor=#C0C0C0]
- RenderBlock (anonymous) at (8,2) size 41x16
- RenderText at (8,0) size 25x16
- text run at (8,0) width 25: "text"
-layer at (7,132) size 55x21
- RenderMenuList {SELECT} at (7,132) size 55x21 [bgcolor=#FFFFFF]
- RenderBlock (anonymous) at (0,0) size 55x21
- RenderText at (8,2) size 24x16
- text run at (8,2) width 24: "test"
-layer at (7,182) size 427x52 clip at (8,183) size 425x50
- RenderTextControl {TEXTAREA} at (7,182) size 427x52 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
- RenderBlock {DIV} at (3,3) size 421x20
Modified: branches/safari-537-branch/LayoutTests/platform/qt/fast/forms/button-positioned-expected.txt (151813 => 151814)
--- branches/safari-537-branch/LayoutTests/platform/qt/fast/forms/button-positioned-expected.txt 2013-06-21 02:17:39 UTC (rev 151813)
+++ branches/safari-537-branch/LayoutTests/platform/qt/fast/forms/button-positioned-expected.txt 2013-06-21 02:24:57 UTC (rev 151814)
@@ -3,13 +3,13 @@
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
-layer at (10,10) size 174x29
- RenderButton {BUTTON} at (10,10) size 174x29 [bgcolor=#C0C0C0]
- RenderBlock (anonymous) at (6,6) size 162x19
- RenderText {#text} at (6,0) size 150x19
- text run at (6,0) width 150: "This button is positioned."
-layer at (10,10) size 198x29
- RenderButton {INPUT} at (10,10) size 198x29 [bgcolor=#C0C0C0]
- RenderBlock (anonymous) at (6,6) size 186x19
- RenderText at (6,0) size 174x19
- text run at (6,0) width 174: "This button is also positioned"
+layer at (10,10) size 162x31
+ RenderButton {BUTTON} at (10,10) size 162x31 [bgcolor=#C0C0C0]
+ RenderBlock (anonymous) at (6,6) size 150x19
+ RenderText {#text} at (0,0) size 150x19
+ text run at (0,0) width 150: "This button is positioned."
+layer at (10,10) size 186x31
+ RenderButton {INPUT} at (10,10) size 186x31 [bgcolor=#C0C0C0]
+ RenderBlock (anonymous) at (6,6) size 174x19
+ RenderText at (0,0) size 174x19
+ text run at (0,0) width 174: "This button is also positioned"
Modified: branches/safari-537-branch/LayoutTests/platform/qt/fast/forms/input-appearance-preventDefault-expected.txt (151813 => 151814)
--- branches/safari-537-branch/LayoutTests/platform/qt/fast/forms/input-appearance-preventDefault-expected.txt 2013-06-21 02:17:39 UTC (rev 151813)
+++ branches/safari-537-branch/LayoutTests/platform/qt/fast/forms/input-appearance-preventDefault-expected.txt 2013-06-21 02:24:57 UTC (rev 151814)
@@ -8,10 +8,10 @@
text run at (0,19) width 630: "This tests that preventDefault called onmousedown will prevent a caret from being placed in the text field."
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
-layer at (12,52) size 196x27
- RenderTextControl {INPUT} at (12,52) size 196x27
-layer at (14,56) size 192x19
- RenderBlock {DIV} at (2,4) size 192x19
+layer at (12,52) size 192x23
+ RenderTextControl {INPUT} at (12,52) size 192x23
+layer at (14,54) size 188x19
+ RenderBlock {DIV} at (2,2) size 188x19
RenderText {#text} at (0,0) size 146x19
text run at (0,0) width 146: "No caret should be here"
layer at (10,70) size 308x38
Modified: branches/safari-537-branch/Source/WebCore/ChangeLog (151813 => 151814)
--- branches/safari-537-branch/Source/WebCore/ChangeLog 2013-06-21 02:17:39 UTC (rev 151813)
+++ branches/safari-537-branch/Source/WebCore/ChangeLog 2013-06-21 02:24:57 UTC (rev 151814)
@@ -1,5 +1,9 @@
2013-06-20 Lucas Forschler <[email protected]>
+ Merge r151799
+
+2013-06-20 Lucas Forschler <[email protected]>
+
Merge r151762
2013-06-19 Alexey Proskuryakov <[email protected]>
Modified: branches/safari-537-branch/Source/WebCore/rendering/RenderBox.cpp (151813 => 151814)
--- branches/safari-537-branch/Source/WebCore/rendering/RenderBox.cpp 2013-06-21 02:17:39 UTC (rev 151813)
+++ branches/safari-537-branch/Source/WebCore/rendering/RenderBox.cpp 2013-06-21 02:24:57 UTC (rev 151814)
@@ -3050,15 +3050,9 @@
}
}
-static bool isReplacedElement(const RenderBox* child)
-{
- // FIXME: Bug 117267, we should make form control elements isReplaced too so that we can just check for that.
- return child->isReplaced() || (child->node() && child->node()->isElementNode() && toElement(child->node())->isFormControlElement() && !child->isFieldset());
-}
-
void RenderBox::computePositionedLogicalWidth(LogicalExtentComputedValues& computedValues, RenderRegion* region) const
{
- if (isReplacedElement(this)) {
+ if (isReplaced()) {
// FIXME: Positioned replaced elements inside a flow thread are not working properly
// with variable width regions (see https://bugs.webkit.org/show_bug.cgi?id=69896 ).
computePositionedLogicalWidthReplaced(computedValues);
@@ -3400,7 +3394,7 @@
void RenderBox::computePositionedLogicalHeight(LogicalExtentComputedValues& computedValues) const
{
- if (isReplacedElement(this)) {
+ if (isReplaced()) {
computePositionedLogicalHeightReplaced(computedValues);
return;
}
Modified: branches/safari-537-branch/Source/WebCore/rendering/RenderBox.h (151813 => 151814)
--- branches/safari-537-branch/Source/WebCore/rendering/RenderBox.h 2013-06-21 02:17:39 UTC (rev 151813)
+++ branches/safari-537-branch/Source/WebCore/rendering/RenderBox.h 2013-06-21 02:24:57 UTC (rev 151814)
@@ -399,6 +399,7 @@
return document()->inQuirksMode() && style()->logicalHeight().isAuto() && !isFloatingOrOutOfFlowPositioned() && (isRoot() || isBody()) && !document()->shouldDisplaySeamlesslyWithParent() && !isInline();
}
+ virtual LayoutSize intrinsicSize() const { return LayoutSize(); }
LayoutUnit intrinsicLogicalWidth() const { return style()->isHorizontalWritingMode() ? intrinsicSize().width() : intrinsicSize().height(); }
LayoutUnit intrinsicLogicalHeight() const { return style()->isHorizontalWritingMode() ? intrinsicSize().height() : intrinsicSize().width(); }
@@ -641,7 +642,6 @@
LayoutUnit viewLogicalHeightForPercentages() const;
- virtual LayoutSize intrinsicSize() const { return LayoutSize(); }
void computePositionedLogicalHeight(LogicalExtentComputedValues&) const;
void computePositionedLogicalWidthUsing(Length logicalWidth, const RenderBoxModelObject* containerBlock, TextDirection containerDirection,
LayoutUnit containerLogicalWidth, LayoutUnit bordersPlusPadding,
Modified: branches/safari-537-branch/Source/WebCore/rendering/RenderButton.h (151813 => 151814)
--- branches/safari-537-branch/Source/WebCore/rendering/RenderButton.h 2013-06-21 02:17:39 UTC (rev 151813)
+++ branches/safari-537-branch/Source/WebCore/rendering/RenderButton.h 2013-06-21 02:24:57 UTC (rev 151814)
@@ -67,8 +67,6 @@
void timerFired(Timer<RenderButton>*);
- virtual LayoutSize intrinsicSize() const OVERRIDE FINAL { return LayoutSize(maxPreferredLogicalWidth(), LayoutUnit()); }
-
RenderTextFragment* m_buttonText;
RenderBlock* m_inner;
Modified: branches/safari-537-branch/Source/WebCore/rendering/RenderListBox.cpp (151813 => 151814)
--- branches/safari-537-branch/Source/WebCore/rendering/RenderListBox.cpp 2013-06-21 02:17:39 UTC (rev 151813)
+++ branches/safari-537-branch/Source/WebCore/rendering/RenderListBox.cpp 2013-06-21 02:24:57 UTC (rev 151814)
@@ -89,7 +89,6 @@
, m_inAutoscroll(false)
, m_optionsWidth(0)
, m_indexOffset(0)
- , m_intrinsicLogicalHeight(0)
{
ASSERT(element);
ASSERT(element->isHTMLElement());
@@ -270,8 +269,8 @@
void RenderListBox::computeLogicalHeight(LayoutUnit, LayoutUnit logicalTop, LogicalExtentComputedValues& computedValues) const
{
- m_intrinsicLogicalHeight = itemHeight() * size() - rowSpacing + borderAndPaddingHeight();
- RenderBox::computeLogicalHeight(m_intrinsicLogicalHeight, logicalTop, computedValues);
+ LayoutUnit height = itemHeight() * size() - rowSpacing + borderAndPaddingHeight();
+ RenderBox::computeLogicalHeight(height, logicalTop, computedValues);
}
int RenderListBox::baselinePosition(FontBaseline baselineType, bool firstLine, LineDirectionMode lineDirection, LinePositionMode linePositionMode) const
Modified: branches/safari-537-branch/Source/WebCore/rendering/RenderListBox.h (151813 => 151814)
--- branches/safari-537-branch/Source/WebCore/rendering/RenderListBox.h 2013-06-21 02:17:39 UTC (rev 151813)
+++ branches/safari-537-branch/Source/WebCore/rendering/RenderListBox.h 2013-06-21 02:24:57 UTC (rev 151814)
@@ -88,8 +88,6 @@
virtual void autoscroll(const IntPoint&);
virtual void stopAutoscroll();
- virtual LayoutSize intrinsicSize() const OVERRIDE FINAL { return LayoutSize(maxPreferredLogicalWidth(), m_intrinsicLogicalHeight); }
-
virtual bool shouldPanScroll() const { return true; }
virtual void panScroll(const IntPoint&);
@@ -151,7 +149,6 @@
bool m_inAutoscroll;
int m_optionsWidth;
int m_indexOffset;
- mutable LayoutUnit m_intrinsicLogicalHeight;
RefPtr<Scrollbar> m_vBar;
};
Modified: branches/safari-537-branch/Source/WebCore/rendering/RenderMenuList.h (151813 => 151814)
--- branches/safari-537-branch/Source/WebCore/rendering/RenderMenuList.h 2013-06-21 02:17:39 UTC (rev 151813)
+++ branches/safari-537-branch/Source/WebCore/rendering/RenderMenuList.h 2013-06-21 02:24:57 UTC (rev 151814)
@@ -75,7 +75,6 @@
virtual const char* renderName() const { return "RenderMenuList"; }
- virtual LayoutSize intrinsicSize() const OVERRIDE FINAL { return LayoutSize(maxPreferredLogicalWidth(), logicalHeight()); }
virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const OVERRIDE;
virtual void computePreferredLogicalWidths() OVERRIDE;
Modified: branches/safari-537-branch/Source/WebCore/rendering/RenderReplaced.h (151813 => 151814)
--- branches/safari-537-branch/Source/WebCore/rendering/RenderReplaced.h 2013-06-21 02:17:39 UTC (rev 151813)
+++ branches/safari-537-branch/Source/WebCore/rendering/RenderReplaced.h 2013-06-21 02:24:57 UTC (rev 151814)
@@ -43,7 +43,7 @@
virtual void layout();
- virtual LayoutSize intrinsicSize() const OVERRIDE FINAL { return m_intrinsicSize; }
+ virtual LayoutSize intrinsicSize() const OVERRIDE { return m_intrinsicSize; }
virtual void computeIntrinsicRatioInformation(FloatSize& intrinsicSize, double& intrinsicRatio, bool& isPercentageIntrinsicSize) const;
virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const OVERRIDE;
Modified: branches/safari-537-branch/Source/WebCore/rendering/RenderTextControl.cpp (151813 => 151814)
--- branches/safari-537-branch/Source/WebCore/rendering/RenderTextControl.cpp 2013-06-21 02:17:39 UTC (rev 151813)
+++ branches/safari-537-branch/Source/WebCore/rendering/RenderTextControl.cpp 2013-06-21 02:24:57 UTC (rev 151814)
@@ -38,7 +38,6 @@
RenderTextControl::RenderTextControl(Element* element)
: RenderBlock(element)
- , m_intrinsicLogicalHeight(0)
{
ASSERT(isHTMLTextFormControlElement(element));
}
@@ -143,20 +142,21 @@
return ScrollbarTheme::theme()->scrollbarThickness();
}
-void RenderTextControl::computeLogicalHeight(LayoutUnit, LayoutUnit logicalTop, LogicalExtentComputedValues& computedValues) const
+void RenderTextControl::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues& computedValues) const
{
HTMLElement* innerText = innerTextElement();
ASSERT(innerText);
if (RenderBox* innerTextBox = innerText->renderBox()) {
LayoutUnit nonContentHeight = innerTextBox->borderAndPaddingHeight() + innerTextBox->marginHeight();
- m_intrinsicLogicalHeight = computeControlLogicalHeight(innerTextBox->lineHeight(true, HorizontalLine, PositionOfInteriorLineBoxes), nonContentHeight) + borderAndPaddingHeight();
+ logicalHeight = computeControlLogicalHeight(innerTextBox->lineHeight(true, HorizontalLine, PositionOfInteriorLineBoxes), nonContentHeight) + borderAndPaddingHeight();
// We are able to have a horizontal scrollbar if the overflow style is scroll, or if its auto and there's no word wrap.
if ((isHorizontalWritingMode() && (style()->overflowX() == OSCROLL || (style()->overflowX() == OAUTO && innerText->renderer()->style()->overflowWrap() == NormalOverflowWrap)))
|| (!isHorizontalWritingMode() && (style()->overflowY() == OSCROLL || (style()->overflowY() == OAUTO && innerText->renderer()->style()->overflowWrap() == NormalOverflowWrap))))
- m_intrinsicLogicalHeight += scrollbarThickness();
+ logicalHeight += scrollbarThickness();
}
- RenderBox::computeLogicalHeight(m_intrinsicLogicalHeight, logicalTop, computedValues);
+
+ RenderBox::computeLogicalHeight(logicalHeight, logicalTop, computedValues);
}
void RenderTextControl::hitInnerTextElement(HitTestResult& result, const LayoutPoint& pointInContainer, const LayoutPoint& accumulatedOffset)
Modified: branches/safari-537-branch/Source/WebCore/rendering/RenderTextControl.h (151813 => 151814)
--- branches/safari-537-branch/Source/WebCore/rendering/RenderTextControl.h 2013-06-21 02:17:39 UTC (rev 151813)
+++ branches/safari-537-branch/Source/WebCore/rendering/RenderTextControl.h 2013-06-21 02:24:57 UTC (rev 151814)
@@ -81,10 +81,6 @@
virtual bool canBeProgramaticallyScrolled() const { return true; }
virtual bool requiresForcedStyleRecalcPropagation() const { return true; }
-
- virtual LayoutSize intrinsicSize() const OVERRIDE FINAL { return LayoutSize(maxPreferredLogicalWidth(), m_intrinsicLogicalHeight); }
-
- mutable LayoutUnit m_intrinsicLogicalHeight;
};
inline RenderTextControl* toRenderTextControl(RenderObject* object)
