Title: [167688] trunk
- Revision
- 167688
- Author
- rn...@webkit.org
- Date
- 2014-04-22 16:05:53 -0700 (Tue, 22 Apr 2014)
Log Message
Rollout r156635 since the old behavior was intentional.
Source/WebCore:
* page/EventHandler.cpp:
(WebCore::EventHandler::selectCursor):
LayoutTests:
* editing/caret/selection-with-caret-type-progress-expected.txt: Removed.
* editing/caret/selection-with-caret-type-progress.html: Removed.
Modified Paths
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (167687 => 167688)
--- trunk/LayoutTests/ChangeLog 2014-04-22 22:44:51 UTC (rev 167687)
+++ trunk/LayoutTests/ChangeLog 2014-04-22 23:05:53 UTC (rev 167688)
@@ -1,3 +1,10 @@
+2014-04-22 Ryosuke Niwa <rn...@webkit.org>
+
+ Rollout r156635 since the old behavior was intentional.
+
+ * editing/caret/selection-with-caret-type-progress-expected.txt: Removed.
+ * editing/caret/selection-with-caret-type-progress.html: Removed.
+
2014-04-22 Andreas Kling <akl...@apple.com>
REGRESSION (r151839): Subframe keeps getting mousemove events with the same coordinates after hiding a hovered element.
Deleted: trunk/LayoutTests/editing/caret/selection-with-caret-type-progress-expected.txt (167687 => 167688)
--- trunk/LayoutTests/editing/caret/selection-with-caret-type-progress-expected.txt 2014-04-22 22:44:51 UTC (rev 167687)
+++ trunk/LayoutTests/editing/caret/selection-with-caret-type-progress-expected.txt 2014-04-22 23:05:53 UTC (rev 167688)
@@ -1,11 +0,0 @@
-Tests whether explicitly set caret style is retained on performing text selection
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-Try selecting this text by dragging the mouse.
-PASS currentCursorType is "Progress"
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
Deleted: trunk/LayoutTests/editing/caret/selection-with-caret-type-progress.html (167687 => 167688)
--- trunk/LayoutTests/editing/caret/selection-with-caret-type-progress.html 2014-04-22 22:44:51 UTC (rev 167687)
+++ trunk/LayoutTests/editing/caret/selection-with-caret-type-progress.html 2014-04-22 23:05:53 UTC (rev 167688)
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<p id="description"></p>
-<div style="cursor:progress; border: 2px solid red;" id="test">Try selecting this text by dragging the mouse.</div>
-<div id="console"></div>
-<script src=""
-<script>
-description('Tests whether explicitly set caret style is retained on performing text selection');
-if (window.eventSender && window.internals) {
- var div = document.getElementById("test");
- div.focus();
-
- var y = div.offsetTop + div.offsetHeight / 2;
-
- function leapForwardAndMove(x) {
- eventSender.leapForward(200);
- eventSender.mouseMoveTo(div.offsetLeft + x, y);
- }
-
- eventSender.dragMode = false;
- leapForwardAndMove(div.offsetLeft + 5);
- eventSender.mouseDown();
-
- leapForwardAndMove(div.offsetLeft + 10);
- leapForwardAndMove(div.offsetLeft + 20);
- leapForwardAndMove(div.offsetWidth - 10);
-
- var cursorInfo = window.internals.getCurrentCursorInfo();
- var currentCursorType = cursorInfo.substring(cursorInfo.indexOf('=') + 1, cursorInfo.lastIndexOf(' '));
- shouldBeEqualToString('currentCursorType', 'Progress');
-} else {
- debug('To test manually, select the text within the red bordered div above by dragging the mouse. Progress cursor should be displayed while doing so.');
-}
-</script>
-<script src=""
-</body>
-</html>
Modified: trunk/Source/WebCore/ChangeLog (167687 => 167688)
--- trunk/Source/WebCore/ChangeLog 2014-04-22 22:44:51 UTC (rev 167687)
+++ trunk/Source/WebCore/ChangeLog 2014-04-22 23:05:53 UTC (rev 167688)
@@ -1,3 +1,10 @@
+2014-04-22 Ryosuke Niwa <rn...@webkit.org>
+
+ Rollout r156635 since the old behavior was intentional.
+
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::selectCursor):
+
2014-04-22 Commit Queue <commit-qu...@webkit.org>
Unreviewed, rolling out r167674.
Modified: trunk/Source/WebCore/page/EventHandler.cpp (167687 => 167688)
--- trunk/Source/WebCore/page/EventHandler.cpp 2014-04-22 22:44:51 UTC (rev 167687)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2014-04-22 23:05:53 UTC (rev 167688)
@@ -1373,6 +1373,17 @@
}
}
+ // During selection, use an I-beam regardless of the content beneath the cursor.
+ // If a drag may be starting or we're capturing mouse events for a particular node, don't treat this as a selection.
+ if (m_mousePressed
+ && m_mouseDownMayStartSelect
+#if ENABLE(DRAG_SUPPORT)
+ && !m_mouseDownMayStartDrag
+#endif
+ && m_frame.selection().isCaretOrRange()
+ && !m_capturingMouseEventsElement)
+ return iBeam;
+
switch (style ? style->cursor() : CURSOR_AUTO) {
case CURSOR_AUTO: {
bool editable = node->hasEditableStyle();
@@ -1388,17 +1399,6 @@
}
}
- // During selection, use an I-beam regardless of the content beneath the cursor when cursor style is not explicitly specified.
- // If a drag may be starting or we're capturing mouse events for a particular node, don't treat this as a selection.
- if (m_mousePressed && m_mouseDownMayStartSelect
-#if ENABLE(DRAG_SUPPORT)
- && !m_mouseDownMayStartDrag
-#endif
- && m_frame.selection().isCaretOrRange()
- && !m_capturingMouseEventsElement) {
- return iBeam;
- }
-
if ((editable || (renderer && renderer->isText() && node->canStartSelection())) && !inResizer && !result.scrollbar())
return iBeam;
return pointerCursor();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
