Changeset 66879 in webkit

Timestamp:

Sep 7, 2010 6:27:54 AM (14 years ago)

Author:

satish@chromium.org

Message:

2010-09-07 Satish Sampath <​satish@chromium.org>

Reviewed by Steve Block.

Fix speech button's hit test logic for RTL rendering.
​https://bugs.webkit.org/show_bug.cgi?id=45288

• fast/speech/input-text-speechbutton.html: Added RTL test case and merged JS code.
• fast/speech/script-tests/input-text-speechbutton.js: Removed.

2010-09-07 Satish Sampath <​satish@chromium.org>

Reviewed by Steve Block.

Fix speech button's hit test logic for RTL rendering.
​https://bugs.webkit.org/show_bug.cgi?id=45288

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

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/speech/input-text-speechbutton.html (modified) (1 diff)
• LayoutTests/fast/speech/script-tests/input-text-speechbutton.js (deleted)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderTextControlSingleLine.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-09-07  Satish Sampath  <satish@chromium.org>
+
+        Reviewed by Steve Block.
+
+        Fix speech button's hit test logic for RTL rendering.
+        https://bugs.webkit.org/show_bug.cgi?id=45288
+
+        * fast/speech/input-text-speechbutton.html: Added RTL test case and merged JS code.
+        * fast/speech/script-tests/input-text-speechbutton.js: Removed.
+
 2010-09-07  Satish Sampath  <satish@chromium.org>
 

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

@@ -8 +8 @@
 <p id="description"></p>
 <div id="console"></div>
-<script src="script-tests/input-text-speechbutton.js"></script>
+<script type="text/javascript">
+description('Tests for speech button click with &lt;input type="text" speech>.');
+
+function onChange() {
+    shouldBeEqualToString('document.getElementById("speechInput").value', 'Pictures of the moon');
+    setTimeout(function() {
+        var input = document.getElementById('speechInput');
+        input.dir = 'rtl';
+        input.value = '';
+        input.onchange = 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();
+    }, 50);
+}
+
+function run() {
+    var input = document.createElement('input');
+    input.id = 'speechInput';
+    input.speech = 'speech';
+    input.onchange = onChange;
+    document.body.appendChild(input);
+
+    if (window.layoutTestController && window.eventSender) {
+        layoutTestController.setMockSpeechInputResult('Pictures of the moon');
+
+        // Clicking the speech button should fill in mock speech-recognized text.
+        var x = input.offsetLeft + input.offsetWidth - 4;
+        var y = input.offsetTop + input.offsetHeight / 2;
+        eventSender.mouseMoveTo(x, y);
+        eventSender.mouseDown();
+        eventSender.mouseUp();
+    }
+}
+
+window.onload = run;
+window.jsTestIsAsync = true;
+window.successfullyParsed = true;
+</script>
 <script src="../js/resources/js-test-post.js"></script>
 </body>

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-09-07  Satish Sampath  <satish@chromium.org>
+
+        Reviewed by Steve Block.
+
+        Fix speech button's hit test logic for RTL rendering.
+        https://bugs.webkit.org/show_bug.cgi?id=45288
+
+        * rendering/RenderTextControlSingleLine.cpp:
+        (WebCore::RenderTextControlSingleLine::forwardEvent):
+
 2010-09-07  Satish Sampath  <satish@chromium.org>
 

trunk/WebCore/rendering/RenderTextControlSingleLine.cpp

@@ -375 +375 @@
     }
 
-    FloatPoint localPoint = innerTextRenderer->absoluteToLocal(static_cast<MouseEvent*>(event)->absoluteLocation(), false, true);
-    int textRight = innerTextRenderer->borderBoxRect().right();
-
 #if ENABLE(INPUT_SPEECH)
     if (RenderBox* speechBox = m_speechButton ? m_speechButton->renderBox() : 0) {
-        if (localPoint.x() >= speechBox->x() && localPoint.x() < speechBox->x() + speechBox->width()) {
+        FloatPoint pointInTextControlCoords = absoluteToLocal(static_cast<MouseEvent*>(event)->absoluteLocation(), false, true);
+        if (speechBox->frameRect().contains(roundedIntPoint(pointInTextControlCoords))) {
             m_speechButton->defaultEventHandler(event);
             return;
@@ -386 +384 @@
     }
 #endif
+
+    FloatPoint localPoint = innerTextRenderer->absoluteToLocal(static_cast<MouseEvent*>(event)->absoluteLocation(), false, true);
+    int textRight = innerTextRenderer->borderBoxRect().right();
 
     if (m_resultsButton && localPoint.x() < innerTextRenderer->borderBoxRect().x())