WebCore: Unreviewed. Regression fix.
authortkent@chromium.org <tkent@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 30 Apr 2010 11:49:06 +0000 (11:49 +0000)
committertkent@chromium.org <tkent@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 30 Apr 2010 11:49:06 +0000 (11:49 +0000)
Revert a part of r58564 to be compatible with prior behavior
https://bugs.webkit.org/show_bug.cgi?id=38383

* rendering/RenderTextControlSingleLine.cpp:
(WebCore::RenderTextControlSingleLine::forwardEvent):
 r58564 made a region check for the cancel button stricter, but it
 made some tests failing on Chromium. So, relax the check again.

LayoutTests: Unreviewed.

Revert a part of r58564 to be compatible with prior behavior
https://bugs.webkit.org/show_bug.cgi?id=38383

* platform/chromium/test_expectations.txt: Remove expectations added by r58568.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@58572 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/platform/chromium/test_expectations.txt
WebCore/ChangeLog
WebCore/rendering/RenderTextControlSingleLine.cpp

index 84b1700..4d8fa19 100644 (file)
@@ -1,3 +1,12 @@
+2010-04-30  Kent Tamura  <tkent@chromium.org>
+
+        Unreviewed.
+
+        Revert a part of r58564 to be compatible with prior behavior
+        https://bugs.webkit.org/show_bug.cgi?id=38383
+
+        * platform/chromium/test_expectations.txt: Remove expectations added by r58568.
+
 2010-04-29  Jeremy Orlow  <jorlow@chromium.org>
 
         Reviewed by Darin Fisher.
index 97931b0..452688c 100644 (file)
@@ -2788,9 +2788,3 @@ BUGWK38360 SKIP : traversal/node-iterator-prototype.html = TEXT
 BUG42895 : media/audio-only-video-intrinsic-size.html = TIMEOUT
 BUG42895 : media/media-document-audio-size.html = TIMEOUT
 BUGYAAR MAC : svg/custom/dominant-baseline-hanging.svg = MISSING
-
-// WebKit r58563:r58565
-BUGWK38383 WIN LINUX : fast/forms/search-abs-pos-cancel-button.html = TEXT
-BUGWK38383 WIN LINUX : fast/forms/search-cancel-button-mouseup.html = TEXT
-BUGWK38383 WIN LINUX : fast/forms/search-rtl.html = IMAGE+TEXT
-BUGWK38383 WIN LINUX : fast/forms/search-zoomed.html = IMAGE+TEXT
index 42e89ef..5a8f09e 100644 (file)
@@ -1,3 +1,15 @@
+2010-04-30  Kent Tamura  <tkent@chromium.org>
+
+        Unreviewed. Regression fix.
+
+        Revert a part of r58564 to be compatible with prior behavior
+        https://bugs.webkit.org/show_bug.cgi?id=38383
+
+        * rendering/RenderTextControlSingleLine.cpp:
+        (WebCore::RenderTextControlSingleLine::forwardEvent):
+         r58564 made a region check for the cancel button stricter, but it
+         made some tests failing on Chromium. So, relax the check again.
+
 2010-04-29  Jeremy Orlow  <jorlow@chromium.org>
 
         Reviewed by Darin Fisher.
index 94bd9a1..0c323c3 100644 (file)
@@ -337,7 +337,7 @@ void RenderTextControlSingleLine::forwardEvent(Event* event)
     int textRight = innerTextRenderer->borderBoxRect().right();
     if (m_resultsButton && localPoint.x() < innerTextRenderer->borderBoxRect().x())
         m_resultsButton->defaultEventHandler(event);
-    else if (m_cancelButton && localPoint.x() > textRight && localPoint.x() < textRight + m_cancelButton->renderBox()->width())
+    else if (m_cancelButton && localPoint.x() > textRight)
         m_cancelButton->defaultEventHandler(event);
     else if (m_outerSpinButton && localPoint.x() > textRight)
         m_outerSpinButton->defaultEventHandler(event);