Changeset 85190 in webkit

Timestamp:

Apr 28, 2011 9:12:14 AM (13 years ago)

Author:

satish@chromium.org

Message:

2011-04-28 Satish Sampath <​satish@chromium.org>

Reviewed by Tony Gentilcore.

Speech input button layout issues with padding and border.
​https://bugs.webkit.org/show_bug.cgi?id=59613

• fast/speech/input-text-speechbutton-expected.txt:
• fast/speech/input-text-speechbutton.html: Updated to test with padding.

2011-04-28 Satish Sampath <​satish@chromium.org>

Reviewed by Tony Gentilcore.

Speech input button layout issues with padding and border.
​https://bugs.webkit.org/show_bug.cgi?id=59613

• rendering/RenderTextControlSingleLine.cpp: (WebCore::RenderTextControlSingleLine::layout): (WebCore::RenderTextControlSingleLine::nodeAtPoint): (WebCore::RenderTextControlSingleLine::forwardEvent):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/speech/input-text-speechbutton-expected.txt (modified) (1 diff)
• LayoutTests/fast/speech/input-text-speechbutton.html (modified) (3 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderTextControlSingleLine.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-28  Satish Sampath  <satish@chromium.org>
+
+        Reviewed by Tony Gentilcore.
+
+        Speech input button layout issues with padding and border.
+        https://bugs.webkit.org/show_bug.cgi?id=59613
+
+        * fast/speech/input-text-speechbutton-expected.txt:
+        * fast/speech/input-text-speechbutton.html: Updated to test with padding.
+
 2011-04-28  Chris Fleizach  <cfleizach@apple.com>
 

trunk/LayoutTests/fast/speech/input-text-speechbutton-expected.txt

@@ -4 +4 @@
 
 
-PASS document.getElementById("speechInput").value is "Pictures of the moon"
-PASS document.getElementById("speechInput").value is "Pictures of the moon"
+PASS document.getElementById("speechInput1").value is "Pictures of the moon"
+PASS document.getElementById("speechInput2").value is "Pictures of the moon"
+PASS document.getElementById("speechInput3").value is "Pictures of the moon"
+PASS document.getElementById("speechInput4").value is "Pictures of the moon"
 PASS successfullyParsed is true
 
 TEST COMPLETE
-
+   

trunk/LayoutTests/fast/speech/input-text-speechbutton.html

@@ -11 +11 @@
 description('Tests for speech button click with <input type="text" speech>.');
 
+function startSpeechInput(id) {
+    // Clicking the speech button should fill in mock speech-recognized text.
+    var input = document.getElementById(id);
+    var x = input.offsetLeft + input.offsetWidth - 4;
+    var y = input.offsetTop + input.offsetHeight / 2;
+    if (input.style.paddingRight.length)
+        x -= parseInt(input.style.paddingRight.substr(0, input.style.paddingRight.length - 2));
+    eventSender.mouseMoveTo(x, y);
+    eventSender.mouseDown();
+    eventSender.mouseUp();
+}
+
+var testIndex = 1;
 function onWebkitSpeechChange() {
-    shouldBeEqualToString('document.getElementById("speechInput").value', 'Pictures of the moon');
+    shouldBeEqualToString('document.getElementById("speechInput' + testIndex + '").value', 'Pictures of the moon');
+    if (testIndex == 4) {
+        finishJSTest();
+        return;
+    }
+    ++testIndex;
     setTimeout(function() {
-        var input = document.getElementById('speechInput');
-        input.dir = 'rtl';
-        input.value = '';
-        input.onwebkitspeechchange = function() {
-            shouldBeEqualToString('document.getElementById("speechInput").value',
-                                  'Pictures of the moon');
-            finishJSTest();
-        };
-
-        var x = input.offsetLeft + 4;
-        var y = input.offsetTop + input.offsetHeight / 2;
-        eventSender.mouseMoveTo(x, y);
-        eventSender.mouseDown();
-        eventSender.mouseUp();
+        startSpeechInput("speechInput" + testIndex);
     }, 50);
 }
@@ -34 +39 @@
     if (window.layoutTestController && window.eventSender) {
         layoutTestController.addMockSpeechInputResult('Pictures of the moon', 1.0, '');
-
-        // Clicking the speech button should fill in mock speech-recognized text.
-        var input = document.getElementById('speechInput');
-        var x = input.offsetLeft + input.offsetWidth - 4;
-        var y = input.offsetTop + input.offsetHeight / 2;
-        eventSender.mouseMoveTo(x, y);
-        eventSender.mouseDown();
-        eventSender.mouseUp();
+        startSpeechInput("speechInput" + testIndex);
     }
 }
@@ -50 +48 @@
 </script>
 <script src="../js/resources/js-test-post.js"></script>
-<input id='speechInput' x-webkit-speech onwebkitspeechchange="onWebkitSpeechChange()">
+<input id='speechInput1' x-webkit-speech onwebkitspeechchange="onWebkitSpeechChange()">
+<input id='speechInput2' x-webkit-speech onwebkitspeechchange="onWebkitSpeechChange()" dir="rtl">
+<input id='speechInput3' x-webkit-speech onwebkitspeechchange="onWebkitSpeechChange()" style="padding:5px 10px">
+<input id='speechInput4' x-webkit-speech onwebkitspeechchange="onWebkitSpeechChange()" style="padding:5px 10px" dir="rtl">
 </body>
 </html>
+

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-28  Satish Sampath  <satish@chromium.org>
+
+        Reviewed by Tony Gentilcore.
+
+        Speech input button layout issues with padding and border.
+        https://bugs.webkit.org/show_bug.cgi?id=59613
+
+        * rendering/RenderTextControlSingleLine.cpp:
+        (WebCore::RenderTextControlSingleLine::layout):
+        (WebCore::RenderTextControlSingleLine::nodeAtPoint):
+        (WebCore::RenderTextControlSingleLine::forwardEvent):
+
 2011-04-28  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp

@@ -309 +309 @@
             button->setLocation(x, y);
         } else {
-            // For non-search fields which are simpler and we let the defaut layout handle things
-            // except for small tweaking below.
-            button->setLocation(button->x() + paddingRight(), (height() - button->height()) / 2);
+            int x = width() - borderRight() - paddingRight() - button->width();
+            RenderBox* spinBox = m_innerSpinButton ? m_innerSpinButton->renderBox() : 0;
+            if (style()->isLeftToRightDirection())
+                x -= spinBox ? spinBox->width() : 0;
+            else
+                innerTextRenderer->setX(paddingLeft() + borderLeft() + (spinBox ? spinBox->width() : 0));
+            int y = (height() - button->height()) / 2;
+            button->setLocation(x, y);
         }
     }
@@ -370 +375 @@
         innerNode = m_resultsButton.get();
 
+#if ENABLE(INPUT_SPEECH)
+    if (!innerNode && m_speechButton && m_speechButton->renderer()) {
+        int buttonLeft = tx + x() + innerBlockRenderer->x() + innerBlockRenderer->width() - m_speechButton->renderBox()->width();
+        if (xPos >= buttonLeft)
+            innerNode = m_speechButton.get();
+    }
+#endif
+
     if (!innerNode) {
         int textRight = textLeft + innerTextRenderer->width();
@@ -406 +419 @@
 #if ENABLE(INPUT_SPEECH)
     if (RenderBox* speechBox = m_speechButton ? m_speechButton->renderBox() : 0) {
-        FloatPoint pointInTextControlCoords = absoluteToLocal(static_cast<MouseEvent*>(event)->absoluteLocation(), false, true);
+        RenderBox* parent = innerTextRenderer ? innerTextRenderer : this;
+        FloatPoint pointInTextControlCoords = parent->absoluteToLocal(static_cast<MouseEvent*>(event)->absoluteLocation(), false, true);
         if (speechBox->frameRect().contains(roundedIntPoint(pointInTextControlCoords))) {
             m_speechButton->defaultEventHandler(event);