Title: [124556] trunk
Revision
124556
Author
[email protected]
Date
2012-08-02 20:31:22 -0700 (Thu, 02 Aug 2012)

Log Message

Fix crashes for <input> and <textarea> with display:run-in.
https://bugs.webkit.org/show_bug.cgi?id=87300

Reviewed by Abhishek Arya.

Source/WebCore:

Introduce RenderObject::canBeReplacedWithInlineRunIn, and renderers which
should not be run-in override it so that it returns false.

Test: fast/runin/input-text-runin.html
      fast/runin/textarea-runin.html

* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::moveRunInUnderSiblingBlockIfNeeded):
Checks canBeReplacedWithInlineRunIn instead of checking tag names.
* rendering/RenderFileUploadControl.cpp:
(WebCore::RenderFileUploadControl::canBeReplacedWithInlineRunIn):
Added. Disallow run-in.
* rendering/RenderFileUploadControl.h:
(RenderFileUploadControl): Declare canBeReplacedWithInlineRunIn.
* rendering/RenderListBox.cpp:
(WebCore::RenderListBox::canBeReplacedWithInlineRunIn):
Added. Disallow run-in. This is not a behavior change.
* rendering/RenderListBox.h:
(RenderListBox): Declare canBeReplacedWithInlineRunIn.
* rendering/RenderMenuList.cpp:
(WebCore::RenderMenuList::canBeReplacedWithInlineRunIn):
Added. Disallow run-in. This is not a behavior change.
* rendering/RenderMenuList.h:
(RenderMenuList): Declare canBeReplacedWithInlineRunIn.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::canBeReplacedWithInlineRunIn):
Added. Allow run-in by default.
* rendering/RenderObject.h:
(RenderObject): Declare canBeReplacedWithInlineRunIn.
* rendering/RenderProgress.cpp:
(WebCore::RenderProgress::canBeReplacedWithInlineRunIn):
Added. Disallow run-in. This is not a behavior change.
* rendering/RenderProgress.h:
(RenderProgress): Declare canBeReplacedWithInlineRunIn.
* rendering/RenderSlider.cpp:
(WebCore::RenderSlider::canBeReplacedWithInlineRunIn):
Added. Disallow run-in.
* rendering/RenderSlider.h:
(RenderSlider): Declare canBeReplacedWithInlineRunIn.
* rendering/RenderTextControl.cpp:
(WebCore::RenderTextControl::canBeReplacedWithInlineRunIn):
Added. Disallow run-in.
* rendering/RenderTextControl.h:
(RenderTextControl): Declare canBeReplacedWithInlineRunIn.

LayoutTests:

* fast/runin/input-text-runin-expected.txt: Added.
* fast/runin/input-text-runin.html: Added.
* fast/runin/textarea-runin-expected.txt: Added.
* fast/runin/textarea-text-runin.html: Added.

Modified Paths

Added Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (124555 => 124556)


--- trunk/LayoutTests/ChangeLog	2012-08-03 03:27:08 UTC (rev 124555)
+++ trunk/LayoutTests/ChangeLog	2012-08-03 03:31:22 UTC (rev 124556)
@@ -1,3 +1,15 @@
+2012-08-02  Kent Tamura  <[email protected]>
+
+        Fix crashes for <input> and <textarea> with display:run-in.
+        https://bugs.webkit.org/show_bug.cgi?id=87300
+
+        Reviewed by Abhishek Arya.
+
+        * fast/runin/input-text-runin-expected.txt: Added.
+        * fast/runin/input-text-runin.html: Added.
+        * fast/runin/textarea-runin-expected.txt: Added.
+        * fast/runin/textarea-text-runin.html: Added.
+
 2012-08-02  Filip Pizlo  <[email protected]>
 
         ASSERTION FAILED: at(m_compileIndex).canExit() || m_isCheckingArgumentTypes

Added: trunk/LayoutTests/fast/runin/input-text-runin-expected.txt (0 => 124556)


--- trunk/LayoutTests/fast/runin/input-text-runin-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/fast/runin/input-text-runin-expected.txt	2012-08-03 03:31:22 UTC (rev 124556)
@@ -0,0 +1 @@
+PASS if not crashed

Added: trunk/LayoutTests/fast/runin/input-text-runin.html (0 => 124556)


--- trunk/LayoutTests/fast/runin/input-text-runin.html	                        (rev 0)
+++ trunk/LayoutTests/fast/runin/input-text-runin.html	2012-08-03 03:31:22 UTC (rev 124556)
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<head>
+<style>
+#el0 { -webkit-appearance: none; }
+.c0 { display: run-in; }
+</style>
+</head>
+<body><input type=text id=el0>
+<script>
+if (window.testRunner)
+    testRunner.dumpAsText();
+document.body.appendChild(el0);
+document.body.appendChild(document.createElement('div'));
+document.body.offsetTop;
+el0.classList.add('c0');
+document.body.offsetTop;
+document.body.innerHTML = 'PASS if not crashed';
+</script>
+</body>

Added: trunk/LayoutTests/fast/runin/textarea-runin-expected.txt (0 => 124556)


--- trunk/LayoutTests/fast/runin/textarea-runin-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/fast/runin/textarea-runin-expected.txt	2012-08-03 03:31:22 UTC (rev 124556)
@@ -0,0 +1 @@
+PASS if not crashed

Added: trunk/LayoutTests/fast/runin/textarea-runin.html (0 => 124556)


--- trunk/LayoutTests/fast/runin/textarea-runin.html	                        (rev 0)
+++ trunk/LayoutTests/fast/runin/textarea-runin.html	2012-08-03 03:31:22 UTC (rev 124556)
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<head>
+<style>
+#el0 { -webkit-appearance: none; }
+.c0 { display: run-in; }
+</style>
+</head>
+<body><textarea id=el0></textarea>
+<script>
+if (window.testRunner)
+    testRunner.dumpAsText();
+document.body.appendChild(el0);
+document.body.appendChild(document.createElement('div'));
+document.body.offsetTop;
+el0.classList.add('c0');
+eventSender.mouseMoveTo(20, 10);
+eventSender.mouseDown();
+eventSender.mouseUp();
+document.body.innerHTML = 'PASS if not crashed';
+</script>
+</body>

Modified: trunk/Source/WebCore/ChangeLog (124555 => 124556)


--- trunk/Source/WebCore/ChangeLog	2012-08-03 03:27:08 UTC (rev 124555)
+++ trunk/Source/WebCore/ChangeLog	2012-08-03 03:31:22 UTC (rev 124556)
@@ -1,3 +1,55 @@
+2012-08-02  Kent Tamura  <[email protected]>
+
+        Fix crashes for <input> and <textarea> with display:run-in.
+        https://bugs.webkit.org/show_bug.cgi?id=87300
+
+        Reviewed by Abhishek Arya.
+
+        Introduce RenderObject::canBeReplacedWithInlineRunIn, and renderers which
+        should not be run-in override it so that it returns false.
+
+        Test: fast/runin/input-text-runin.html
+              fast/runin/textarea-runin.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::moveRunInUnderSiblingBlockIfNeeded):
+        Checks canBeReplacedWithInlineRunIn instead of checking tag names.
+        * rendering/RenderFileUploadControl.cpp:
+        (WebCore::RenderFileUploadControl::canBeReplacedWithInlineRunIn):
+        Added. Disallow run-in.
+        * rendering/RenderFileUploadControl.h:
+        (RenderFileUploadControl): Declare canBeReplacedWithInlineRunIn.
+        * rendering/RenderListBox.cpp:
+        (WebCore::RenderListBox::canBeReplacedWithInlineRunIn):
+        Added. Disallow run-in. This is not a behavior change.
+        * rendering/RenderListBox.h:
+        (RenderListBox): Declare canBeReplacedWithInlineRunIn.
+        * rendering/RenderMenuList.cpp:
+        (WebCore::RenderMenuList::canBeReplacedWithInlineRunIn):
+        Added. Disallow run-in. This is not a behavior change.
+        * rendering/RenderMenuList.h:
+        (RenderMenuList): Declare canBeReplacedWithInlineRunIn.
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::canBeReplacedWithInlineRunIn):
+        Added. Allow run-in by default.
+        * rendering/RenderObject.h:
+        (RenderObject): Declare canBeReplacedWithInlineRunIn.
+        * rendering/RenderProgress.cpp:
+        (WebCore::RenderProgress::canBeReplacedWithInlineRunIn):
+        Added. Disallow run-in. This is not a behavior change.
+        * rendering/RenderProgress.h:
+        (RenderProgress): Declare canBeReplacedWithInlineRunIn.
+        * rendering/RenderSlider.cpp:
+        (WebCore::RenderSlider::canBeReplacedWithInlineRunIn):
+        Added. Disallow run-in.
+        * rendering/RenderSlider.h:
+        (RenderSlider): Declare canBeReplacedWithInlineRunIn.
+        * rendering/RenderTextControl.cpp:
+        (WebCore::RenderTextControl::canBeReplacedWithInlineRunIn):
+        Added. Disallow run-in.
+        * rendering/RenderTextControl.h:
+        (RenderTextControl): Declare canBeReplacedWithInlineRunIn.
+
 2012-08-02  Kihong Kwon  <[email protected]>
 
         [EFL] Fix wrong assigned value of BatteryStatus

Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (124555 => 124556)


--- trunk/Source/WebCore/rendering/RenderBlock.cpp	2012-08-03 03:27:08 UTC (rev 124555)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp	2012-08-03 03:31:22 UTC (rev 124556)
@@ -1834,13 +1834,9 @@
 
     // Check if this node is allowed to run-in. E.g. <select> expects its renderer to
     // be a RenderListBox or RenderMenuList, and hence cannot be a RenderInline run-in.
-    Node* runInNode = runIn->node();
-    if (runInNode && runInNode->hasTagName(selectTag))
+    if (!runIn->canBeReplacedWithInlineRunIn())
         return;
 
-    if (runInNode && runInNode->hasTagName(progressTag))
-        return;
-
     RenderObject* curr = runIn->nextSibling();
     if (!curr || !curr->isRenderBlock() || !curr->childrenInline())
         return;

Modified: trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp (124555 => 124556)


--- trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp	2012-08-03 03:27:08 UTC (rev 124555)
+++ trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp	2012-08-03 03:31:22 UTC (rev 124556)
@@ -60,6 +60,11 @@
 {
 }
 
+bool RenderFileUploadControl::canBeReplacedWithInlineRunIn() const
+{
+    return false;
+}
+
 void RenderFileUploadControl::updateFromElement()
 {
     HTMLInputElement* input = static_cast<HTMLInputElement*>(node());

Modified: trunk/Source/WebCore/rendering/RenderFileUploadControl.h (124555 => 124556)


--- trunk/Source/WebCore/rendering/RenderFileUploadControl.h	2012-08-03 03:27:08 UTC (rev 124555)
+++ trunk/Source/WebCore/rendering/RenderFileUploadControl.h	2012-08-03 03:31:22 UTC (rev 124556)
@@ -44,6 +44,7 @@
 private:
     virtual const char* renderName() const { return "RenderFileUploadControl"; }
 
+    virtual bool canBeReplacedWithInlineRunIn() const OVERRIDE;
     virtual void updateFromElement();
     virtual void computePreferredLogicalWidths();
     virtual void paintObject(PaintInfo&, const LayoutPoint&);

Modified: trunk/Source/WebCore/rendering/RenderListBox.cpp (124555 => 124556)


--- trunk/Source/WebCore/rendering/RenderListBox.cpp	2012-08-03 03:27:08 UTC (rev 124555)
+++ trunk/Source/WebCore/rendering/RenderListBox.cpp	2012-08-03 03:31:22 UTC (rev 124556)
@@ -146,6 +146,11 @@
     }
 }
 
+bool RenderListBox::canBeReplacedWithInlineRunIn() const
+{
+    return false;
+}
+
 void RenderListBox::selectionChanged()
 {
     repaint();

Modified: trunk/Source/WebCore/rendering/RenderListBox.h (124555 => 124556)


--- trunk/Source/WebCore/rendering/RenderListBox.h	2012-08-03 03:27:08 UTC (rev 124555)
+++ trunk/Source/WebCore/rendering/RenderListBox.h	2012-08-03 03:31:22 UTC (rev 124556)
@@ -61,7 +61,7 @@
     virtual bool isListBox() const { return true; }
 
     virtual void updateFromElement();
-
+    virtual bool canBeReplacedWithInlineRunIn() const OVERRIDE;
     virtual bool hasControlClip() const { return true; }
     virtual void paintObject(PaintInfo&, const LayoutPoint&);
     virtual LayoutRect controlClipRect(const LayoutPoint&) const;

Modified: trunk/Source/WebCore/rendering/RenderMenuList.cpp (124555 => 124556)


--- trunk/Source/WebCore/rendering/RenderMenuList.cpp	2012-08-03 03:27:08 UTC (rev 124555)
+++ trunk/Source/WebCore/rendering/RenderMenuList.cpp	2012-08-03 03:31:22 UTC (rev 124556)
@@ -74,6 +74,11 @@
     m_popup = 0;
 }
 
+bool RenderMenuList::canBeReplacedWithInlineRunIn() const
+{
+    return false;
+}
+
 void RenderMenuList::createInnerBlock()
 {
     if (m_innerBlock) {

Modified: trunk/Source/WebCore/rendering/RenderMenuList.h (124555 => 124556)


--- trunk/Source/WebCore/rendering/RenderMenuList.h	2012-08-03 03:27:08 UTC (rev 124555)
+++ trunk/Source/WebCore/rendering/RenderMenuList.h	2012-08-03 03:31:22 UTC (rev 124556)
@@ -68,6 +68,7 @@
     virtual LayoutRect controlClipRect(const LayoutPoint&) const;
     virtual bool hasControlClip() const { return true; }
     virtual bool canHaveGeneratedChildren() const OVERRIDE { return false; }
+    virtual bool canBeReplacedWithInlineRunIn() const OVERRIDE;
 
     virtual const char* renderName() const { return "RenderMenuList"; }
 

Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (124555 => 124556)


--- trunk/Source/WebCore/rendering/RenderObject.cpp	2012-08-03 03:27:08 UTC (rev 124555)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp	2012-08-03 03:31:22 UTC (rev 124556)
@@ -2899,6 +2899,11 @@
     return canHaveChildren();
 }
 
+bool RenderObject::canBeReplacedWithInlineRunIn() const
+{
+    return true;
+}
+
 #if ENABLE(SVG)
 
 RenderSVGResourceContainer* RenderObject::toRenderSVGResourceContainer()

Modified: trunk/Source/WebCore/rendering/RenderObject.h (124555 => 124556)


--- trunk/Source/WebCore/rendering/RenderObject.h	2012-08-03 03:27:08 UTC (rev 124555)
+++ trunk/Source/WebCore/rendering/RenderObject.h	2012-08-03 03:31:22 UTC (rev 124556)
@@ -927,6 +927,8 @@
 
     virtual LayoutRect outlineBoundsForRepaint(RenderBoxModelObject* /*repaintContainer*/, LayoutPoint* /*cachedOffsetToRepaintContainer*/ = 0) const { return LayoutRect(); }
 
+    virtual bool canBeReplacedWithInlineRunIn() const;
+
 private:
     RenderStyle* firstLineStyleSlowCase() const;
     StyleDifference adjustStyleDifference(StyleDifference, unsigned contextSensitiveProperties) const;

Modified: trunk/Source/WebCore/rendering/RenderProgress.cpp (124555 => 124556)


--- trunk/Source/WebCore/rendering/RenderProgress.cpp	2012-08-03 03:27:08 UTC (rev 124555)
+++ trunk/Source/WebCore/rendering/RenderProgress.cpp	2012-08-03 03:31:22 UTC (rev 124556)
@@ -59,6 +59,11 @@
     RenderBlock::updateFromElement();
 }
 
+bool RenderProgress::canBeReplacedWithInlineRunIn() const
+{
+    return false;
+}
+
 double RenderProgress::animationProgress() const
 {
     return m_animating ? (fmod((currentTime() - m_animationStartTime), m_animationDuration) / m_animationDuration) : 0;

Modified: trunk/Source/WebCore/rendering/RenderProgress.h (124555 => 124556)


--- trunk/Source/WebCore/rendering/RenderProgress.h	2012-08-03 03:27:08 UTC (rev 124555)
+++ trunk/Source/WebCore/rendering/RenderProgress.h	2012-08-03 03:31:22 UTC (rev 124556)
@@ -46,6 +46,7 @@
     virtual bool isProgress() const { return true; }
     virtual bool requiresForcedStyleRecalcPropagation() const { return true; }
     virtual void updateFromElement();
+    virtual bool canBeReplacedWithInlineRunIn() const OVERRIDE;
 
     void animationTimerFired(Timer<RenderProgress>*);
     void updateAnimationState();

Modified: trunk/Source/WebCore/rendering/RenderSlider.cpp (124555 => 124556)


--- trunk/Source/WebCore/rendering/RenderSlider.cpp	2012-08-03 03:27:08 UTC (rev 124555)
+++ trunk/Source/WebCore/rendering/RenderSlider.cpp	2012-08-03 03:31:22 UTC (rev 124556)
@@ -59,6 +59,11 @@
 {
 }
 
+bool RenderSlider::canBeReplacedWithInlineRunIn() const
+{
+    return false;
+}
+
 LayoutUnit RenderSlider::baselinePosition(FontBaseline, bool /*firstLine*/, LineDirectionMode, LinePositionMode) const
 {
     // FIXME: Patch this function for writing-mode.

Modified: trunk/Source/WebCore/rendering/RenderSlider.h (124555 => 124556)


--- trunk/Source/WebCore/rendering/RenderSlider.h	2012-08-03 03:27:08 UTC (rev 124555)
+++ trunk/Source/WebCore/rendering/RenderSlider.h	2012-08-03 03:31:22 UTC (rev 124556)
@@ -39,6 +39,7 @@
     private:
         virtual const char* renderName() const { return "RenderSlider"; }
         virtual bool isSlider() const { return true; }
+        virtual bool canBeReplacedWithInlineRunIn() const OVERRIDE;
 
         virtual LayoutUnit baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const;
         virtual void computePreferredLogicalWidths();

Modified: trunk/Source/WebCore/rendering/RenderTextControl.cpp (124555 => 124556)


--- trunk/Source/WebCore/rendering/RenderTextControl.cpp	2012-08-03 03:27:08 UTC (rev 124555)
+++ trunk/Source/WebCore/rendering/RenderTextControl.cpp	2012-08-03 03:31:22 UTC (rev 124556)
@@ -299,4 +299,9 @@
     return placeholderRenderer;
 }
 
+bool RenderTextControl::canBeReplacedWithInlineRunIn() const
+{
+    return false;
+}
+
 } // namespace WebCore

Modified: trunk/Source/WebCore/rendering/RenderTextControl.h (124555 => 124556)


--- trunk/Source/WebCore/rendering/RenderTextControl.h	2012-08-03 03:27:08 UTC (rev 124555)
+++ trunk/Source/WebCore/rendering/RenderTextControl.h	2012-08-03 03:31:22 UTC (rev 124556)
@@ -72,6 +72,7 @@
     virtual void removeLeftoverAnonymousBlock(RenderBlock*) { }
     virtual bool avoidsFloats() const { return true; }
     virtual bool canHaveGeneratedChildren() const OVERRIDE { return false; }
+    virtual bool canBeReplacedWithInlineRunIn() const OVERRIDE;
     
     virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint&);
 
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to