Title: [111953] releases/WebKitGTK/webkit-1.8/Source/WebCore
Diff
Modified: releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog (111952 => 111953)
--- releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog 2012-03-24 01:03:22 UTC (rev 111952)
+++ releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog 2012-03-24 01:04:50 UTC (rev 111953)
@@ -1,3 +1,18 @@
+2012-03-23 Adele Peterson <[email protected]>
+
+ REGRESSION(r96566): Cursor is I-beam upon dragging an attachment in mail
+ https://bugs.webkit.org/show_bug.cgi?id=80458
+ <rdar://problem/10873195>
+
+ Reviewed by Dan Bernstein.
+
+ No tests because we currently don't have any test machinery for cursors.
+
+ Make sure the shortcut to always use an iBeam cursor during selection isn't used during dragging.
+ Before r96566, we handled plugin cursors as a special case before calling into selectCursor, so we never hit this code path.
+
+ * page/EventHandler.cpp: (WebCore::EventHandler::selectCursor):
+
2012-03-23 Maciej Stachowiak <[email protected]>
REGRESSION(r97353): Crash when accessing location or history properties inside a navigated window
Modified: releases/WebKitGTK/webkit-1.8/Source/WebCore/page/EventHandler.cpp (111952 => 111953)
--- releases/WebKitGTK/webkit-1.8/Source/WebCore/page/EventHandler.cpp 2012-03-24 01:03:22 UTC (rev 111952)
+++ releases/WebKitGTK/webkit-1.8/Source/WebCore/page/EventHandler.cpp 2012-03-24 01:04:50 UTC (rev 111953)
@@ -1259,8 +1259,8 @@
const Cursor& iBeam = horizontalText ? iBeamCursor() : verticalTextCursor();
// During selection, use an I-beam no matter what we're over.
- // If you're capturing mouse events for a particular node, don't treat this as a selection.
- if (m_mousePressed && m_mouseDownMayStartSelect && m_frame->selection()->isCaretOrRange() && !m_capturingMouseEventsNode)
+ // 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 && !m_mouseDownMayStartDrag && m_frame->selection()->isCaretOrRange() && !m_capturingMouseEventsNode)
return iBeam;
if (renderer) {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
