Unreviewed, rolling out r134144.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 12 Nov 2012 02:27:10 +0000 (02:27 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 12 Nov 2012 02:27:10 +0000 (02:27 +0000)
http://trac.webkit.org/changeset/134144
https://bugs.webkit.org/show_bug.cgi?id=101876

seems to break win 7 chromium browser test (Requested by
hayato on #webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2012-11-11

.:

* Source/autotools/symbols.filter:

Source/WebCore:

* WebCore.exp.in:
* page/EventHandler.cpp:
(WebCore):
(WebCore::EventHandler::handleMouseMoveEvent):
* page/EventHandler.h:
(EventHandler):
* testing/Internals.cpp:
* testing/Internals.h:
* testing/Internals.idl:

Source/WebKit2:

* win/WebKit2.def:
* win/WebKit2CFLite.def:

LayoutTests:

* fast/events/mouse-cursor-expected.txt: Removed.
* fast/events/mouse-cursor.html: Removed.

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

15 files changed:
ChangeLog
LayoutTests/ChangeLog
LayoutTests/fast/events/mouse-cursor-expected.txt [deleted file]
LayoutTests/fast/events/mouse-cursor.html [deleted file]
Source/WebCore/ChangeLog
Source/WebCore/WebCore.exp.in
Source/WebCore/page/EventHandler.cpp
Source/WebCore/page/EventHandler.h
Source/WebCore/testing/Internals.cpp
Source/WebCore/testing/Internals.h
Source/WebCore/testing/Internals.idl
Source/WebKit2/ChangeLog
Source/WebKit2/win/WebKit2.def
Source/WebKit2/win/WebKit2CFLite.def
Source/autotools/symbols.filter

index 90aa81b..20303d2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2012-11-11  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r134144.
+        http://trac.webkit.org/changeset/134144
+        https://bugs.webkit.org/show_bug.cgi?id=101876
+
+        seems to break win 7 chromium browser test (Requested by
+        hayato on #webkit).
+
+        * Source/autotools/symbols.filter:
+
 2012-11-09  Rick Byers  <rbyers@chromium.org>
 
         No tests for changing mouse cursors
index 44845cc..c2ae9db 100644 (file)
@@ -1,3 +1,15 @@
+2012-11-11  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r134144.
+        http://trac.webkit.org/changeset/134144
+        https://bugs.webkit.org/show_bug.cgi?id=101876
+
+        seems to break win 7 chromium browser test (Requested by
+        hayato on #webkit).
+
+        * fast/events/mouse-cursor-expected.txt: Removed.
+        * fast/events/mouse-cursor.html: Removed.
+
 2012-11-11  Kent Tamura  <tkent@chromium.org>
 
         Internals: MockPagePopup should not update DOM structure during detach()
diff --git a/LayoutTests/fast/events/mouse-cursor-expected.txt b/LayoutTests/fast/events/mouse-cursor-expected.txt
deleted file mode 100644 (file)
index 8c15a91..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-Test that mouse cursors are applied correctly.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-Bug 100550
-
-TEST CASE: Implicit default cursor
-Cursor Info: type=TypeIBeam hotSpot=0,0
-
-TEST CASE: Explicit default
-Cursor Info: type=TypePointer hotSpot=0,0
-
-TEST CASE: Explicit auto
-Cursor Info: type=TypeIBeam hotSpot=0,0
-
-TEST CASE: No cursor
-Cursor Info: type=TypeNone hotSpot=0,0
-
-TEST CASE: Pointer
-Cursor Info: type=TypeHand hotSpot=0,0
-
-TEST CASE: -webkit-grabbing
-Cursor Info: type=TypeGrabbing hotSpot=0,0
-
-TEST CASE: Existing 25x25 image
-Cursor Info: type=TypeCustom hotSpot=0,0 image=25x25
-
-TEST CASE: Invalid URL with fallback to pointer
-Cursor Info: type=TypeHand hotSpot=0,0
-
-TEST CASE: Invalid with fallback to 25x25 image
-Cursor Info: type=TypeCustom hotSpot=0,0 image=25x25
-
-TEST CASE: Image with explicit hot spot at (0,0)
-Cursor Info: type=TypeCustom hotSpot=0,0 image=25x25
-
-TEST CASE: Image with explicit hot spot at (20,10)
-Cursor Info: type=TypeCustom hotSpot=20,10 image=25x25
-
-TEST CASE: Image with explicit hot spot at (-1,-1)
-Cursor Info: type=TypeCustom hotSpot=0,0 image=25x25
-
-TEST CASE: Image with explicit hot spot outside image at (30,30)
-Cursor Info: type=TypeCustom hotSpot=0,0 image=25x25
-
-TEST CASE: Over large image with fallback to pointer
-Cursor Info: type=TypeHand hotSpot=0,0
-
-TEST CASE: SVG cursor
-Cursor Info: type=TypeCustom hotSpot=0,0 image=25x25
-
-TEST CASE: Multiple invalid cursors with fallback to pointer
-Cursor Info: type=TypeHand hotSpot=0,0
-
-TEST CASE: Nonexistent SVG cursor with fallback to pointer
-Cursor Info: type=TypeHand hotSpot=0,0
-
-TEST CASE: A link with default cursor
-Cursor Info: type=TypeHand hotSpot=0,0
-
-TEST CASE: Link with default cursor overriding wait
-Cursor Info: type=TypeHand hotSpot=0,0
-
-TEST CASE: Wait cursor which should not be affected by unknown cursor rule
-Cursor Info: type=TypeWait hotSpot=0,0
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/fast/events/mouse-cursor.html b/LayoutTests/fast/events/mouse-cursor.html
deleted file mode 100644 (file)
index 167d785..0000000
+++ /dev/null
@@ -1,117 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script src="../js/resources/js-test-pre.js"></script>
-<style type="text/css">
-</style>
-</head>
-<body>
-<p id="description"></p>
-<p><a href=https://bugs.webkit.org/show_bug.cgi?id=100550>Bug 100550</a></p>
-<svg xmlns="http://www.w3.org/2000/svg" 
-     xmlns:xlink="http://www.w3.org/1999/xlink" width="0" height="0">
-  <defs>
-    <cursor id="greenbox" xlink:href="resources/greenbox.png" x="0" y="0"/>
-  </defs>
-</svg>
-<div id="test-container">
-  <div>Implicit default cursor</div>
-  <div style='cursor: default'>Explicit default</div>
-  <div style='cursor: auto'>Explicit auto</div>
-  <div style='cursor: none'>No cursor</div>
-  <div style='cursor: pointer'>Pointer</div>
-  <div style='cursor: -webkit-grabbing'>-webkit-grabbing</div>
-  <div style='cursor: url(resources/greenbox.png), hand'>Existing 25x25 image</div>
-  <div style='cursor: url(doesntexist.png), pointer'>Invalid URL with fallback to pointer</div>
-  <div style='cursor: url(doesntexist.png), url(resources/greenbox.png), pointer'>Invalid with fallback to 25x25 image</div>
-  <div style='cursor: url(resources/greenbox.png) 0 0, pointer'>Image with explicit hot spot at (0,0)</div>
-  <div style='cursor: url(resources/greenbox.png) 20 10, pointer'>Image with explicit hot spot at (20,10)</div>
-  <div style='cursor: url(resources/greenbox.png) -1 -1, pointer'>Image with explicit hot spot at (-1,-1)</div>
-  <div style='cursor: url(resources/greenbox.png) 30 30, pointer'>Image with explicit hot spot outside image at (30,30)</div>
-  <div style='cursor: url(resources/onload-image.png), pointer'>Over large image with fallback to pointer</div>
-  <div style='cursor: url(#greenbox), pointer'>SVG cursor</div>
-  <div style='cursor: url(mouse-cursor.html), url(unknown-scheme:cursor.png), pointer'>Multiple invalid cursors with fallback to pointer</div>
-  <div style='cursor: url(#nonexistent), pointer'>Nonexistent SVG cursor with fallback to pointer</div>
-  <div><a href='#'>A link with default cursor</a></div>
-  <div style='cursor: wait'><a href='#'>Link with default cursor overriding wait</a></div>
-  <div style='cursor: wait'><div style='cursor: doesntexist'>Wait cursor which should not be affected by unknown cursor rule</div></div>
-</div>
-<br/>
-<div id="console"></div>
-<script>
-var imagesLeftToLoad = 0;
-
-function onImageLoad(e) {
-
-    // This debug output is non-deterministic and contains absolute URLs - only show when
-    // not running in DRT
-    if (!window.testRunner)
-        debug( 'Event "' + e.type + '": ' + e.target.src);
-        
-    imagesLeftToLoad--;
-    if (imagesLeftToLoad == 0)
-        runTests();
-    if (imagesLeftToLoad < 0)
-        testFailed('Got more load/error callback than expected.');
-}
-
-function onImageUnexpected(e) {
-       imagesLeftToLoad--;
-    testFailed('Got unexpected \'' + e.type + '\' event for image: ' + e.target.src); 
-}
-
-function runTests() {
-    // Can't do anything useful here without eventSender
-    if (window.eventSender) {
-        var nodesToTest = document.querySelectorAll('#test-container > div');
-        for (var i = 0; i < nodesToTest.length; i++) {
-            var node = nodesToTest[i];
-            debug('TEST CASE: ' + node.textContent);
-            eventSender.mouseMoveTo(node.offsetLeft + 3, node.offsetTop + 3);
-            // Note that we could return structured data which we then validate, but that's a lot more
-            // work and is redundant with relying on the expected output anyway.  Better to just dump
-            // it and inspect that it matches the description.
-            debug('Cursor Info: ' + window.internals.getCurrentCursorInfo(document));
-            debug('');
-        }
-        // This text is redundant with the test output - hide it
-        document.getElementById('test-container').style.display = 'none';
-    }
-    
-    finishJSTest();
-}
-
-description("Test that mouse cursors are applied correctly.");
-
-if (!window.eventSender) {
-    testFailed('This test requires DumpRenderTree');
-}
-
-if (window.testRunner) {
-    testRunner.dumpAsText();
-    testRunner.waitUntilDone();
-    window.jsTestIsAsync = true;
-}
-
-// Now wait for each image to load or fail to load before starting tests.
-// Without this we can get null images in the cursors - eg. no known size.
-var imagesToLoad = [
-    { url: 'resources/greenbox.png' },
-    { url: 'resources/onload-image.png' },
-    { url: 'doesntexist.png', error: true },
-    { url: 'unknown-scheme:cursor.png', error: true },
-    { url: 'mouse-cursor.html', error: true },
-    { url: '#nonexistent', error: true } ];
-imagesLeftToLoad = imagesToLoad.length;
-for (var i = 0; i < imagesToLoad.length; i++) {
-    var img = new Image();
-    var expectError = imagesToLoad[i].error; 
-    img.addEventListener('load', expectError ? onImageUnexpected : onImageLoad);
-    img.addEventListener('error', expectError ? onImageLoad : onImageUnexpected);
-    img.src = imagesToLoad[i].url;
-}
-
-</script>
-<script src="../../fast/js/resources/js-test-post.js"></script>
-</body>
-</html>
index 16e43c3..836d97e 100644 (file)
@@ -1,3 +1,22 @@
+2012-11-11  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r134144.
+        http://trac.webkit.org/changeset/134144
+        https://bugs.webkit.org/show_bug.cgi?id=101876
+
+        seems to break win 7 chromium browser test (Requested by
+        hayato on #webkit).
+
+        * WebCore.exp.in:
+        * page/EventHandler.cpp:
+        (WebCore):
+        (WebCore::EventHandler::handleMouseMoveEvent):
+        * page/EventHandler.h:
+        (EventHandler):
+        * testing/Internals.cpp:
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
 2012-11-11  Kent Tamura  <tkent@chromium.org>
 
         Internals: MockPagePopup should not update DOM structure during detach()
index eaa3dc6..84d88fb 100644 (file)
@@ -1710,7 +1710,6 @@ __ZN7WebCore4Page21windowScreenDidChangeEj
 __ZN7WebCore5Frame9nodeImageEPNS_4NodeE
 __ZN7WebCore6Cursor8fromTypeENS0_4TypeE
 __ZN7WebCore6CursorC1EPNS_5ImageERKNS_8IntPointE
-__ZN7WebCore6CursorC1ERKS0_
 __ZN7WebCore6CursorD1Ev
 __ZN7WebCore6CursoraSERKS0_
 __ZN7WebCore6Editor13canDHTMLPasteEv
index 4b0de64..c4baf02 100644 (file)
@@ -1539,7 +1539,7 @@ OptionalCursor EventHandler::selectCursor(const MouseEventWithHitTestResults& ev
     }
     return pointerCursor();
 }
-
+    
 static LayoutPoint documentPointForWindowPoint(Frame* frame, const IntPoint& windowPoint)
 {
     FrameView* view = frame->view();
@@ -1875,8 +1875,7 @@ bool EventHandler::handleMouseMoveEvent(const PlatformMouseEvent& mouseEvent, Hi
         if (FrameView* view = m_frame->view()) {
             OptionalCursor optionalCursor = selectCursor(mev, scrollbar);
             if (optionalCursor.isCursorChange())
-                m_currentMouseCursor = optionalCursor.cursor();
-                view->setCursor(m_currentMouseCursor);
+                view->setCursor(optionalCursor.cursor());
         }
     }
     
index 00ad0a4..9e725db 100644 (file)
@@ -26,7 +26,6 @@
 #ifndef EventHandler_h
 #define EventHandler_h
 
-#include "Cursor.h"
 #include "DragActions.h"
 #include "DragState.h"
 #include "FocusDirection.h"
@@ -142,7 +141,6 @@ public:
     void resizeLayerDestroyed();
 
     IntPoint currentMousePosition() const;
-    Cursor currentMouseCursor() const { return m_currentMouseCursor; }
 
     static Frame* subframeForTargetNode(Node*);
     static Frame* subframeForHitTestResult(const MouseEventWithHitTestResults&);
@@ -422,7 +420,6 @@ private:
     RefPtr<Node> m_lastNodeUnderMouse;
     RefPtr<Frame> m_lastMouseMoveEventSubframe;
     RefPtr<Scrollbar> m_lastScrollbarUnderMouse;
-    Cursor m_currentMouseCursor;
 
     int m_clickCount;
     RefPtr<Node> m_clickNode;
index 7901b63..e4d3084 100644 (file)
@@ -31,7 +31,6 @@
 #include "ClientRect.h"
 #include "ClientRectList.h"
 #include "ComposedShadowTreeWalker.h"
-#include "Cursor.h"
 #include "DOMStringList.h"
 #include "DOMWindow.h"
 #include "Document.h"
@@ -39,7 +38,6 @@
 #include "DocumentMarkerController.h"
 #include "Element.h"
 #include "ElementShadow.h"
-#include "EventHandler.h"
 #include "ExceptionCode.h"
 #include "FormController.h"
 #include "Frame.h"
@@ -76,8 +74,6 @@
 #include "TextIterator.h"
 #include "TreeScope.h"
 #include "ViewportArguments.h"
-#include <wtf/text/StringBuffer.h>
-
 
 #if ENABLE(INPUT_TYPE_COLOR)
 #include "ColorChooser.h"
@@ -97,6 +93,7 @@
 #endif
 
 #if ENABLE(TOUCH_ADJUSTMENT)
+#include "EventHandler.h"
 #include "WebKitPoint.h"
 #endif
 
@@ -1480,89 +1477,4 @@ void Internals::stopTrackingRepaints(Document* document, ExceptionCode& ec)
     frameView->setTracksRepaints(false);
 }
 
-#if USE(LAZY_NATIVE_CURSOR)
-static const char* cursorTypeToString(Cursor::Type cursorType)
-{
-    switch (cursorType) {
-    case Cursor::Pointer: return "TypePointer";
-    case Cursor::Cross: return "TypeCross";
-    case Cursor::Hand: return "TypeHand";
-    case Cursor::IBeam: return "TypeIBeam";
-    case Cursor::Wait: return "TypeWait";
-    case Cursor::Help: return "TypeHelp";
-    case Cursor::EastResize: return "TypeEastResize";
-    case Cursor::NorthResize: return "TypeNorthResize";
-    case Cursor::NorthEastResize: return "TypeNorthEastResize";
-    case Cursor::NorthWestResize: return "TypeNorthWestResize";
-    case Cursor::SouthResize: return "TypeSouthResize";
-    case Cursor::SouthEastResize: return "TypeSouthEastResize";
-    case Cursor::SouthWestResize: return "TypeSouthWestResize";
-    case Cursor::WestResize: return "TypeWestResize";
-    case Cursor::NorthSouthResize: return "TypeNorthSouthResize";
-    case Cursor::EastWestResize: return "TypeEastWestResize";
-    case Cursor::NorthEastSouthWestResize: return "TypeNorthEastSouthWestResize";
-    case Cursor::NorthWestSouthEastResize: return "TypeNorthWestSouthEastResize";
-    case Cursor::ColumnResize: return "TypeColumnResize";
-    case Cursor::RowResize: return "TypeRowResize";
-    case Cursor::MiddlePanning: return "TypeMiddlePanning";
-    case Cursor::EastPanning: return "TypeEastPanning";
-    case Cursor::NorthPanning: return "TypeNorthPanning";
-    case Cursor::NorthEastPanning: return "TypeNorthEastPanning";
-    case Cursor::NorthWestPanning: return "TypeNorthWestPanning";
-    case Cursor::SouthPanning: return "TypeSouthPanning";
-    case Cursor::SouthEastPanning: return "TypeSouthEastPanning";
-    case Cursor::SouthWestPanning: return "TypeSouthWestPanning";
-    case Cursor::WestPanning: return "TypeWestPanning";
-    case Cursor::Move: return "TypeMove";
-    case Cursor::VerticalText: return "TypeVerticalText";
-    case Cursor::Cell: return "TypeCell";
-    case Cursor::ContextMenu: return "TypeContextMenu";
-    case Cursor::Alias: return "TypeAlias";
-    case Cursor::Progress: return "TypeProgress";
-    case Cursor::NoDrop: return "TypeNoDrop";
-    case Cursor::Copy: return "TypeCopy";
-    case Cursor::None: return "TypeNone";
-    case Cursor::NotAllowed: return "TypeNotAllowed";
-    case Cursor::ZoomIn: return "TypeZoomIn";
-    case Cursor::ZoomOut: return "TypeZoomOut";
-    case Cursor::Grab: return "TypeGrab";
-    case Cursor::Grabbing: return "TypeGrabbing";
-    case Cursor::Custom: return "TypeCustom";
-    }
-
-    ASSERT_NOT_REACHED();
-    return "UNKNOWN";
-}
-#endif
-
-String Internals::getCurrentCursorInfo(Document* document, ExceptionCode& ec)
-{
-    if (!document || !document->frame()) {
-        ec = INVALID_ACCESS_ERR;
-        return String();
-    }
-
-    Cursor cursor = document->frame()->eventHandler()->currentMouseCursor();
-
-#if USE(LAZY_NATIVE_CURSOR)
-    StringBuilder result;
-    result.append("type=");
-    result.append(cursorTypeToString(cursor.type()));
-    result.append(" hotSpot=");
-    result.appendNumber(cursor.hotSpot().x());
-    result.append(",");
-    result.appendNumber(cursor.hotSpot().y());
-    if (cursor.image()) {
-        IntSize size = cursor.image()->size();
-        result.append(" image=");
-        result.appendNumber(size.width());
-        result.append("x");
-        result.appendNumber(size.height());
-    }
-    return result.toString();
-#else
-    return "FAIL: Cursor details not available on this platform.";
-#endif
-}
-
 }
index 84fa012..2111739 100644 (file)
@@ -242,8 +242,6 @@ public:
     void startTrackingRepaints(Document*, ExceptionCode&);
     void stopTrackingRepaints(Document*, ExceptionCode&);
 
-    String getCurrentCursorInfo(Document*, ExceptionCode&);
-
 private:
     explicit Internals(Document*);
     Document* contextDocument() const;
index 064d011..7a5ab7b 100644 (file)
     //  startTrackingRepaints, repaintRectsAsText, stopTrackingRepaints.
     void startTrackingRepaints(in Document document) raises (DOMException);
     void stopTrackingRepaints(in Document document) raises (DOMException);
-
-    // Returns a string with information about the mouse cursor used at the specified client location.
-    DOMString getCurrentCursorInfo(in Document document) raises (DOMException);
 };
index 080be29..4c36bb0 100644 (file)
@@ -1,3 +1,15 @@
+2012-11-11  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r134144.
+        http://trac.webkit.org/changeset/134144
+        https://bugs.webkit.org/show_bug.cgi?id=101876
+
+        seems to break win 7 chromium browser test (Requested by
+        hayato on #webkit).
+
+        * win/WebKit2.def:
+        * win/WebKit2CFLite.def:
+
 2012-11-11  Kenichi Ishibashi  <bashi@chromium.org>
 
         WTFString::utf8() should have a mode of conversion to use replacement character
index 414545b..ce6d344 100644 (file)
@@ -153,8 +153,6 @@ EXPORTS
         ??0ClientRectList@WebCore@@AAE@XZ
         ??0ClientRectList@WebCore@@AAE@ABV?$Vector@VFloatQuad@WebCore@@$0A@@WTF@@@Z
         ??1ClientRectList@WebCore@@QAE@XZ
-        ??1Cursor@WebCore@@QAE@XZ
-        ??0Cursor@WebCore@@QAE@ABV01@@Z
         ??0String@WTF@@QAE@PBD@Z
         ??0String@WTF@@QAE@PB_W@Z
         ?absoluteBoundingBoxRect@RenderObject@WebCore@@QBE?AVIntRect@2@_N@Z
index b517756..2db0ccd 100644 (file)
@@ -146,8 +146,6 @@ EXPORTS
         ??0ClientRectList@WebCore@@AAE@XZ
         ??0ClientRectList@WebCore@@AAE@ABV?$Vector@VFloatQuad@WebCore@@$0A@@WTF@@@Z
         ??1ClientRectList@WebCore@@QAE@XZ
-        ??1Cursor@WebCore@@QAE@XZ
-        ??0Cursor@WebCore@@QAE@ABV01@@Z
         ??0String@WTF@@QAE@PBD@Z
         ??0String@WTF@@QAE@PB_W@Z
         ?absoluteBoundingBoxRect@RenderObject@WebCore@@QBE?AVIntRect@2@_N@Z
index a169a89..d82f179 100644 (file)
@@ -162,8 +162,6 @@ _ZN7WebCore14ScrollableArea28setScrollOffsetFromInternalsERKNS_8IntPointE;
 _ZN7WebCore10ScrollView23setScrollbarsSuppressedEbb;
 _ZN7WebCore10ScrollView21setDelegatesScrollingEb;
 _ZN7WebCore4Node14removedLastRefEv;
-_ZN7WebCore6CursorC1ERKS0_;
-_ZN7WebCore6CursorD1Ev;
 _ZN7WebCore8Settings16setImagesEnabledEb;
 _ZN7WebCore8Settings18setFixedFontFamilyERKN3WTF12AtomicStringE11UScriptCode;
 _ZN7WebCore8Settings18setSerifFontFamilyERKN3WTF12AtomicStringE11UScriptCode;