Changeset 134183 in webkit


Ignore:
Timestamp:
Nov 11, 2012 6:27:10 PM (11 years ago)
Author:
commit-queue@webkit.org
Message:

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).

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.
Location:
trunk
Files:
2 deleted
13 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r134144 r134183  
     12012-11-11  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r134144.
     4        http://trac.webkit.org/changeset/134144
     5        https://bugs.webkit.org/show_bug.cgi?id=101876
     6
     7        seems to break win 7 chromium browser test (Requested by
     8        hayato on #webkit).
     9
     10        * Source/autotools/symbols.filter:
     11
    1122012-11-09  Rick Byers  <rbyers@chromium.org>
    213
  • trunk/LayoutTests/ChangeLog

    r134180 r134183  
     12012-11-11  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r134144.
     4        http://trac.webkit.org/changeset/134144
     5        https://bugs.webkit.org/show_bug.cgi?id=101876
     6
     7        seems to break win 7 chromium browser test (Requested by
     8        hayato on #webkit).
     9
     10        * fast/events/mouse-cursor-expected.txt: Removed.
     11        * fast/events/mouse-cursor.html: Removed.
     12
    1132012-11-11  Kent Tamura  <tkent@chromium.org>
    214
  • trunk/Source/WebCore/ChangeLog

    r134180 r134183  
     12012-11-11  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r134144.
     4        http://trac.webkit.org/changeset/134144
     5        https://bugs.webkit.org/show_bug.cgi?id=101876
     6
     7        seems to break win 7 chromium browser test (Requested by
     8        hayato on #webkit).
     9
     10        * WebCore.exp.in:
     11        * page/EventHandler.cpp:
     12        (WebCore):
     13        (WebCore::EventHandler::handleMouseMoveEvent):
     14        * page/EventHandler.h:
     15        (EventHandler):
     16        * testing/Internals.cpp:
     17        * testing/Internals.h:
     18        * testing/Internals.idl:
     19
    1202012-11-11  Kent Tamura  <tkent@chromium.org>
    221
  • trunk/Source/WebCore/WebCore.exp.in

    r134158 r134183  
    17111711__ZN7WebCore6Cursor8fromTypeENS0_4TypeE
    17121712__ZN7WebCore6CursorC1EPNS_5ImageERKNS_8IntPointE
    1713 __ZN7WebCore6CursorC1ERKS0_
    17141713__ZN7WebCore6CursorD1Ev
    17151714__ZN7WebCore6CursoraSERKS0_
  • trunk/Source/WebCore/page/EventHandler.cpp

    r134150 r134183  
    15401540    return pointerCursor();
    15411541}
    1542 
     1542   
    15431543static LayoutPoint documentPointForWindowPoint(Frame* frame, const IntPoint& windowPoint)
    15441544{
     
    18761876            OptionalCursor optionalCursor = selectCursor(mev, scrollbar);
    18771877            if (optionalCursor.isCursorChange())
    1878                 m_currentMouseCursor = optionalCursor.cursor();
    1879                 view->setCursor(m_currentMouseCursor);
     1878                view->setCursor(optionalCursor.cursor());
    18801879        }
    18811880    }
  • trunk/Source/WebCore/page/EventHandler.h

    r134150 r134183  
    2727#define EventHandler_h
    2828
    29 #include "Cursor.h"
    3029#include "DragActions.h"
    3130#include "DragState.h"
     
    143142
    144143    IntPoint currentMousePosition() const;
    145     Cursor currentMouseCursor() const { return m_currentMouseCursor; }
    146144
    147145    static Frame* subframeForTargetNode(Node*);
     
    423421    RefPtr<Frame> m_lastMouseMoveEventSubframe;
    424422    RefPtr<Scrollbar> m_lastScrollbarUnderMouse;
    425     Cursor m_currentMouseCursor;
    426423
    427424    int m_clickCount;
  • trunk/Source/WebCore/testing/Internals.cpp

    r134144 r134183  
    3232#include "ClientRectList.h"
    3333#include "ComposedShadowTreeWalker.h"
    34 #include "Cursor.h"
    3534#include "DOMStringList.h"
    3635#include "DOMWindow.h"
     
    4039#include "Element.h"
    4140#include "ElementShadow.h"
    42 #include "EventHandler.h"
    4341#include "ExceptionCode.h"
    4442#include "FormController.h"
     
    7775#include "TreeScope.h"
    7876#include "ViewportArguments.h"
    79 #include <wtf/text/StringBuffer.h>
    80 
    8177
    8278#if ENABLE(INPUT_TYPE_COLOR)
     
    9894
    9995#if ENABLE(TOUCH_ADJUSTMENT)
     96#include "EventHandler.h"
    10097#include "WebKitPoint.h"
    10198#endif
     
    14811478}
    14821479
    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 }
     1480}
  • trunk/Source/WebCore/testing/Internals.h

    r134144 r134183  
    243243    void stopTrackingRepaints(Document*, ExceptionCode&);
    244244
    245     String getCurrentCursorInfo(Document*, ExceptionCode&);
    246 
    247245private:
    248246    explicit Internals(Document*);
  • trunk/Source/WebCore/testing/Internals.idl

    r134144 r134183  
    211211    void startTrackingRepaints(in Document document) raises (DOMException);
    212212    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);
    216213};
  • trunk/Source/WebKit2/ChangeLog

    r134173 r134183  
     12012-11-11  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r134144.
     4        http://trac.webkit.org/changeset/134144
     5        https://bugs.webkit.org/show_bug.cgi?id=101876
     6
     7        seems to break win 7 chromium browser test (Requested by
     8        hayato on #webkit).
     9
     10        * win/WebKit2.def:
     11        * win/WebKit2CFLite.def:
     12
    1132012-11-11  Kenichi Ishibashi  <bashi@chromium.org>
    214
  • trunk/Source/WebKit2/win/WebKit2.def

    r134173 r134183  
    154154        ??0ClientRectList@WebCore@@AAE@ABV?$Vector@VFloatQuad@WebCore@@$0A@@WTF@@@Z
    155155        ??1ClientRectList@WebCore@@QAE@XZ
    156         ??1Cursor@WebCore@@QAE@XZ
    157         ??0Cursor@WebCore@@QAE@ABV01@@Z
    158156        ??0String@WTF@@QAE@PBD@Z
    159157        ??0String@WTF@@QAE@PB_W@Z
  • trunk/Source/WebKit2/win/WebKit2CFLite.def

    r134173 r134183  
    147147        ??0ClientRectList@WebCore@@AAE@ABV?$Vector@VFloatQuad@WebCore@@$0A@@WTF@@@Z
    148148        ??1ClientRectList@WebCore@@QAE@XZ
    149         ??1Cursor@WebCore@@QAE@XZ
    150         ??0Cursor@WebCore@@QAE@ABV01@@Z
    151149        ??0String@WTF@@QAE@PBD@Z
    152150        ??0String@WTF@@QAE@PB_W@Z
  • trunk/Source/autotools/symbols.filter

    r134144 r134183  
    163163_ZN7WebCore10ScrollView21setDelegatesScrollingEb;
    164164_ZN7WebCore4Node14removedLastRefEv;
    165 _ZN7WebCore6CursorC1ERKS0_;
    166 _ZN7WebCore6CursorD1Ev;
    167165_ZN7WebCore8Settings16setImagesEnabledEb;
    168166_ZN7WebCore8Settings18setFixedFontFamilyERKN3WTF12AtomicStringE11UScriptCode;
Note: See TracChangeset for help on using the changeset viewer.