Changeset 134144 in webkit
- Timestamp:
- Nov 9, 2012 6:45:24 PM (11 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r134057 r134144 1 2012-11-09 Rick Byers <rbyers@chromium.org> 2 3 No tests for changing mouse cursors 4 https://bugs.webkit.org/show_bug.cgi?id=100550 5 6 Reviewed by Adam Barth. 7 8 Add necessary exports for Internals::getCurrentCursorInfo 9 10 * Source/autotools/symbols.filter: 11 1 12 2012-11-09 Laszlo Gombos <l.gombos@samsung.com> 2 13 -
trunk/LayoutTests/ChangeLog
r134138 r134144 1 2012-11-09 Rick Byers <rbyers@chromium.org> 2 3 No tests for changing mouse cursors 4 https://bugs.webkit.org/show_bug.cgi?id=100550 5 6 Reviewed by Adam Barth. 7 8 Add a simple test covering the basic scenarios of changing a mouse 9 cursor with CSS. This includes most of the cases currently covered 10 by ManualTests/*cursor*. 11 12 * fast/events/mouse-cursor-expected.txt: Added. 13 * fast/events/mouse-cursor.html: Added. 14 * platform/chromium/TestExpectations: Add failure expectation. 15 1 16 2012-11-09 Noel Gordon <noel.gordon@gmail.com> 2 17 -
trunk/LayoutTests/platform/chromium/TestExpectations
r134138 r134144 4203 4203 webkit.org/b/101618 [ Win7 Debug ] http/tests/inspector/indexeddb/database-data.html [ Crash ] 4204 4204 4205 # This test will be enabled shortly when chromium moves to the USE(LAZY_NATIVE_CURSOR) infrastructure 4206 webkit.org/b/101501 fast/events/mouse-cursor.html [ Failure ] 4207 4205 4208 # Failures following r133840: 4206 4209 webkit.org/b/101547 fast/repaint/4774354.html [ ImageOnlyFailure ] -
trunk/Source/WebCore/ChangeLog
r134142 r134144 1 2012-11-09 Rick Byers <rbyers@chromium.org> 2 3 No tests for changing mouse cursors 4 https://bugs.webkit.org/show_bug.cgi?id=100550 5 6 Reviewed by Adam Barth. 7 8 Add infrastructure to keep track of the last set mouse cursor, 9 and then to query it from DumpRenderTree. 10 11 Test: fast/events/mouse-cursor.html 12 13 * WebCore.exp.in: Add Cursor copy ctor export 14 * page/EventHandler.cpp: 15 (WebCore::EventHandler::handleMouseMoveEvent): Keep track of last set mouse cursor 16 * page/EventHandler.h: 17 (WebCore::EventHandler::currentMouseCursor): New getter for last set mouse cursor 18 * testing/Internals.cpp: 19 (WebCore::cursorTypeToString): Helper to convert cursor type to enum 20 (WebCore): 21 (WebCore::Internals::getCurrentCursorInfo): New function to return a string describing the last set mouse cursor 22 * testing/Internals.h: Declare getCurrentCursorInfo 23 * testing/Internals.idl: Declare getCurrentCursorInfo 24 1 25 2012-11-09 Huang Dongsung <luxtella@company100.net> 2 26 -
trunk/Source/WebCore/WebCore.exp.in
r133957 r134144 1712 1712 __ZN7WebCore6Cursor8fromTypeENS0_4TypeE 1713 1713 __ZN7WebCore6CursorC1EPNS_5ImageERKNS_8IntPointE 1714 __ZN7WebCore6CursorC1ERKS0_ 1714 1715 __ZN7WebCore6CursorD1Ev 1715 1716 __ZN7WebCore6CursoraSERKS0_ -
trunk/Source/WebCore/page/EventHandler.cpp
r133976 r134144 1527 1527 return pointerCursor(); 1528 1528 } 1529 1529 1530 1530 static LayoutPoint documentPointForWindowPoint(Frame* frame, const IntPoint& windowPoint) 1531 1531 { … … 1863 1863 OptionalCursor optionalCursor = selectCursor(mev, scrollbar); 1864 1864 if (optionalCursor.isCursorChange()) 1865 view->setCursor(optionalCursor.cursor()); 1865 m_currentMouseCursor = optionalCursor.cursor(); 1866 view->setCursor(m_currentMouseCursor); 1866 1867 } 1867 1868 } -
trunk/Source/WebCore/page/EventHandler.h
r132945 r134144 27 27 #define EventHandler_h 28 28 29 #include "Cursor.h" 29 30 #include "DragActions.h" 30 31 #include "DragState.h" … … 142 143 143 144 IntPoint currentMousePosition() const; 145 Cursor currentMouseCursor() const { return m_currentMouseCursor; } 144 146 145 147 static Frame* subframeForTargetNode(Node*); … … 421 423 RefPtr<Frame> m_lastMouseMoveEventSubframe; 422 424 RefPtr<Scrollbar> m_lastScrollbarUnderMouse; 425 Cursor m_currentMouseCursor; 423 426 424 427 int m_clickCount; -
trunk/Source/WebCore/testing/Internals.cpp
r133848 r134144 32 32 #include "ClientRectList.h" 33 33 #include "ComposedShadowTreeWalker.h" 34 #include "Cursor.h" 34 35 #include "DOMStringList.h" 35 36 #include "DOMWindow.h" … … 39 40 #include "Element.h" 40 41 #include "ElementShadow.h" 42 #include "EventHandler.h" 41 43 #include "ExceptionCode.h" 42 44 #include "FormController.h" … … 75 77 #include "TreeScope.h" 76 78 #include "ViewportArguments.h" 79 #include <wtf/text/StringBuffer.h> 80 77 81 78 82 #if ENABLE(INPUT_TYPE_COLOR) … … 94 98 95 99 #if ENABLE(TOUCH_ADJUSTMENT) 96 #include "EventHandler.h"97 100 #include "WebKitPoint.h" 98 101 #endif … … 1478 1481 } 1479 1482 1480 } 1483 #if USE(LAZY_NATIVE_CURSOR) 1484 static const char* cursorTypeToString(Cursor::Type cursorType) 1485 { 1486 switch (cursorType) { 1487 case Cursor::Pointer: return "TypePointer"; 1488 case Cursor::Cross: return "TypeCross"; 1489 case Cursor::Hand: return "TypeHand"; 1490 case Cursor::IBeam: return "TypeIBeam"; 1491 case Cursor::Wait: return "TypeWait"; 1492 case Cursor::Help: return "TypeHelp"; 1493 case Cursor::EastResize: return "TypeEastResize"; 1494 case Cursor::NorthResize: return "TypeNorthResize"; 1495 case Cursor::NorthEastResize: return "TypeNorthEastResize"; 1496 case Cursor::NorthWestResize: return "TypeNorthWestResize"; 1497 case Cursor::SouthResize: return "TypeSouthResize"; 1498 case Cursor::SouthEastResize: return "TypeSouthEastResize"; 1499 case Cursor::SouthWestResize: return "TypeSouthWestResize"; 1500 case Cursor::WestResize: return "TypeWestResize"; 1501 case Cursor::NorthSouthResize: return "TypeNorthSouthResize"; 1502 case Cursor::EastWestResize: return "TypeEastWestResize"; 1503 case Cursor::NorthEastSouthWestResize: return "TypeNorthEastSouthWestResize"; 1504 case Cursor::NorthWestSouthEastResize: return "TypeNorthWestSouthEastResize"; 1505 case Cursor::ColumnResize: return "TypeColumnResize"; 1506 case Cursor::RowResize: return "TypeRowResize"; 1507 case Cursor::MiddlePanning: return "TypeMiddlePanning"; 1508 case Cursor::EastPanning: return "TypeEastPanning"; 1509 case Cursor::NorthPanning: return "TypeNorthPanning"; 1510 case Cursor::NorthEastPanning: return "TypeNorthEastPanning"; 1511 case Cursor::NorthWestPanning: return "TypeNorthWestPanning"; 1512 case Cursor::SouthPanning: return "TypeSouthPanning"; 1513 case Cursor::SouthEastPanning: return "TypeSouthEastPanning"; 1514 case Cursor::SouthWestPanning: return "TypeSouthWestPanning"; 1515 case Cursor::WestPanning: return "TypeWestPanning"; 1516 case Cursor::Move: return "TypeMove"; 1517 case Cursor::VerticalText: return "TypeVerticalText"; 1518 case Cursor::Cell: return "TypeCell"; 1519 case Cursor::ContextMenu: return "TypeContextMenu"; 1520 case Cursor::Alias: return "TypeAlias"; 1521 case Cursor::Progress: return "TypeProgress"; 1522 case Cursor::NoDrop: return "TypeNoDrop"; 1523 case Cursor::Copy: return "TypeCopy"; 1524 case Cursor::None: return "TypeNone"; 1525 case Cursor::NotAllowed: return "TypeNotAllowed"; 1526 case Cursor::ZoomIn: return "TypeZoomIn"; 1527 case Cursor::ZoomOut: return "TypeZoomOut"; 1528 case Cursor::Grab: return "TypeGrab"; 1529 case Cursor::Grabbing: return "TypeGrabbing"; 1530 case Cursor::Custom: return "TypeCustom"; 1531 } 1532 1533 ASSERT_NOT_REACHED(); 1534 return "UNKNOWN"; 1535 } 1536 #endif 1537 1538 String Internals::getCurrentCursorInfo(Document* document, ExceptionCode& ec) 1539 { 1540 if (!document || !document->frame()) { 1541 ec = INVALID_ACCESS_ERR; 1542 return String(); 1543 } 1544 1545 Cursor cursor = document->frame()->eventHandler()->currentMouseCursor(); 1546 1547 #if USE(LAZY_NATIVE_CURSOR) 1548 StringBuilder result; 1549 result.append("type="); 1550 result.append(cursorTypeToString(cursor.type())); 1551 result.append(" hotSpot="); 1552 result.appendNumber(cursor.hotSpot().x()); 1553 result.append(","); 1554 result.appendNumber(cursor.hotSpot().y()); 1555 if (cursor.image()) { 1556 IntSize size = cursor.image()->size(); 1557 result.append(" image="); 1558 result.appendNumber(size.width()); 1559 result.append("x"); 1560 result.appendNumber(size.height()); 1561 } 1562 return result.toString(); 1563 #else 1564 return "FAIL: Cursor details not available on this platform."; 1565 #endif 1566 } 1567 1568 } -
trunk/Source/WebCore/testing/Internals.h
r133575 r134144 243 243 void stopTrackingRepaints(Document*, ExceptionCode&); 244 244 245 String getCurrentCursorInfo(Document*, ExceptionCode&); 246 245 247 private: 246 248 explicit Internals(Document*); -
trunk/Source/WebCore/testing/Internals.idl
r133575 r134144 211 211 void startTrackingRepaints(in Document document) raises (DOMException); 212 212 void stopTrackingRepaints(in Document document) raises (DOMException); 213 214 // Returns a string with information about the mouse cursor used at the specified client location. 215 DOMString getCurrentCursorInfo(in Document document) raises (DOMException); 213 216 }; -
trunk/Source/WebKit2/ChangeLog
r134143 r134144 1 2012-11-09 Rick Byers <rbyers@chromium.org> 2 3 No tests for changing mouse cursors 4 https://bugs.webkit.org/show_bug.cgi?id=100550 5 6 Reviewed by Adam Barth. 7 8 Add necessary exports for Internals::getCurrentCursorInfo 9 10 * win/WebKit2.def: 11 * win/WebKit2CFLite.def: 12 1 13 2012-11-09 Vivek Galatage <vivekgalatage@gmail.com> 2 14 -
trunk/Source/WebKit2/win/WebKit2.def
r133848 r134144 154 154 ??0ClientRectList@WebCore@@AAE@ABV?$Vector@VFloatQuad@WebCore@@$0A@@WTF@@@Z 155 155 ??1ClientRectList@WebCore@@QAE@XZ 156 ??1Cursor@WebCore@@QAE@XZ 157 ??0Cursor@WebCore@@QAE@ABV01@@Z 156 158 ??0String@WTF@@QAE@PBD@Z 157 159 ??0String@WTF@@QAE@PB_W@Z -
trunk/Source/WebKit2/win/WebKit2CFLite.def
r134143 r134144 147 147 ??0ClientRectList@WebCore@@AAE@ABV?$Vector@VFloatQuad@WebCore@@$0A@@WTF@@@Z 148 148 ??1ClientRectList@WebCore@@QAE@XZ 149 ??1Cursor@WebCore@@QAE@XZ 150 ??0Cursor@WebCore@@QAE@ABV01@@Z 149 151 ??0String@WTF@@QAE@PBD@Z 150 152 ??0String@WTF@@QAE@PB_W@Z -
trunk/Source/autotools/symbols.filter
r133848 r134144 163 163 _ZN7WebCore10ScrollView21setDelegatesScrollingEb; 164 164 _ZN7WebCore4Node14removedLastRefEv; 165 _ZN7WebCore6CursorC1ERKS0_; 166 _ZN7WebCore6CursorD1Ev; 165 167 _ZN7WebCore8Settings16setImagesEnabledEb; 166 168 _ZN7WebCore8Settings18setFixedFontFamilyERKN3WTF12AtomicStringE11UScriptCode;
Note: See TracChangeset
for help on using the changeset viewer.