Diff
Modified: trunk/LayoutTests/ChangeLog (134148 => 134149)
--- trunk/LayoutTests/ChangeLog 2012-11-10 05:05:47 UTC (rev 134148)
+++ trunk/LayoutTests/ChangeLog 2012-11-10 05:12:55 UTC (rev 134149)
@@ -1,5 +1,17 @@
2012-11-09 Rick Byers <rby...@chromium.org>
+ [chromium] Move to USE(LAZY_NATIVE_CURSOR)
+ https://bugs.webkit.org/show_bug.cgi?id=101501
+
+ Reviewed by Adam Barth.
+
+ Remove failure expectation for fast/events/mouse-cursor.html now that
+ chromium uses the same cursor architecture as other ports.
+
+ * platform/chromium/TestExpectations:
+
+2012-11-09 Rick Byers <rby...@chromium.org>
+
No tests for changing mouse cursors
https://bugs.webkit.org/show_bug.cgi?id=100550
Modified: trunk/LayoutTests/platform/chromium/TestExpectations (134148 => 134149)
--- trunk/LayoutTests/platform/chromium/TestExpectations 2012-11-10 05:05:47 UTC (rev 134148)
+++ trunk/LayoutTests/platform/chromium/TestExpectations 2012-11-10 05:12:55 UTC (rev 134149)
@@ -4202,9 +4202,6 @@
webkit.org/b/101618 [ Win7 Debug ] http/tests/inspector/indexeddb/database-data.html [ Crash ]
-# This test will be enabled shortly when chromium moves to the USE(LAZY_NATIVE_CURSOR) infrastructure
-webkit.org/b/101501 fast/events/mouse-cursor.html [ Failure ]
-
# Failures following r133840:
webkit.org/b/101547 fast/repaint/4774354.html [ ImageOnlyFailure ]
webkit.org/b/101547 fast/repaint/caret-outside-block.html [ ImageOnlyFailure ]
Modified: trunk/Source/WebCore/ChangeLog (134148 => 134149)
--- trunk/Source/WebCore/ChangeLog 2012-11-10 05:05:47 UTC (rev 134148)
+++ trunk/Source/WebCore/ChangeLog 2012-11-10 05:12:55 UTC (rev 134149)
@@ -1,3 +1,30 @@
+2012-11-09 Rick Byers <rby...@chromium.org>
+
+ Move chromium to USE(LAZY_NATIVE_CURSOR)
+ https://bugs.webkit.org/show_bug.cgi?id=101501
+
+ Reviewed by Adam Barth.
+
+ This simplifies cursor handling in chromium and unifies it with other
+ ports for easier code sharing and testing by moving to the
+ USE_LAZY_CURSOR model and eliminating PlatformCursor entirely.
+
+ PlatformCursor adds no value in chromium since the sandboxing model
+ requires the cursor information be marshalled to the browser process
+ before being turned into a real OS cursor.
+
+ Test: fast/events/mouse-cursor.html
+
+ * WebCore.gypi:
+ * platform/Cursor.h:
+ (WebCore):
+ * platform/chromium/CursorChromium.cpp:
+ (WebCore::Cursor::Cursor):
+ (WebCore::Cursor::operator=):
+ (WebCore::Cursor::~Cursor):
+ (WebCore::Cursor::ensurePlatformCursor):
+ * platform/chromium/PlatformCursor.h: Removed.
+
2012-11-09 Noam Rosenthal <noam.rosent...@nokia.com>
Allow ports to decide whether an image should be directly composited
Modified: trunk/Source/WebCore/WebCore.gypi (134148 => 134149)
--- trunk/Source/WebCore/WebCore.gypi 2012-11-10 05:05:47 UTC (rev 134148)
+++ trunk/Source/WebCore/WebCore.gypi 2012-11-10 05:12:55 UTC (rev 134149)
@@ -4671,7 +4671,6 @@
'platform/chromium/MIMETypeRegistryChromium.cpp',
'platform/chromium/PageClientChromium.h',
'platform/chromium/PasteboardChromium.cpp',
- 'platform/chromium/PlatformCursor.h',
'platform/chromium/PlatformKeyboardEventChromium.cpp',
'platform/chromium/PlatformScreenChromium.cpp',
'platform/chromium/PlatformSupport.h',
Modified: trunk/Source/WebCore/platform/Cursor.h (134148 => 134149)
--- trunk/Source/WebCore/platform/Cursor.h 2012-11-10 05:05:47 UTC (rev 134148)
+++ trunk/Source/WebCore/platform/Cursor.h 2012-11-10 05:12:55 UTC (rev 134149)
@@ -41,8 +41,6 @@
#include "GRefPtrGtk.h"
#elif PLATFORM(QT)
#include <QCursor>
-#elif PLATFORM(CHROMIUM)
-#include "PlatformCursor.h"
#elif PLATFORM(BLACKBERRY)
#include <BlackBerryPlatformCursor.h>
#endif
@@ -60,7 +58,8 @@
typedef HICON HCURSOR;
#endif
-#if PLATFORM(WIN) || PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL)
+// Looks like it's just PLATFORM(WX) and PLATFORM(BLACKBERRY) still not using this?
+#if PLATFORM(WIN) || PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(CHROMIUM)
#define WTF_USE_LAZY_NATIVE_CURSOR 1
#endif
@@ -90,8 +89,6 @@
typedef QCursor* PlatformCursor;
#elif PLATFORM(WX)
typedef wxCursor* PlatformCursor;
-#elif PLATFORM(CHROMIUM)
- // See PlatformCursor.h
#elif PLATFORM(BLACKBERRY)
typedef BlackBerry::Platform::BlackBerryCursor PlatformCursor;
#else
Modified: trunk/Source/WebCore/platform/chromium/CursorChromium.cpp (134148 => 134149)
--- trunk/Source/WebCore/platform/chromium/CursorChromium.cpp 2012-11-10 05:05:47 UTC (rev 134148)
+++ trunk/Source/WebCore/platform/chromium/CursorChromium.cpp 2012-11-10 05:12:55 UTC (rev 134149)
@@ -36,334 +36,30 @@
namespace WebCore {
Cursor::Cursor(const Cursor& other)
- : m_platformCursor(other.m_platformCursor)
+ : m_type(other.m_type)
+ , m_image(other.m_image)
+ , m_hotSpot(other.m_hotSpot)
+ , m_platformCursor(other.m_platformCursor)
{
}
-Cursor::Cursor(Image* image, const IntPoint& hotSpot)
- : m_platformCursor(image, hotSpot)
-{
-}
-
-Cursor::~Cursor()
-{
-}
-
Cursor& Cursor::operator=(const Cursor& other)
{
+ m_type = other.m_type;
+ m_image = other.m_image;
+ m_hotSpot = other.m_hotSpot;
m_platformCursor = other.m_platformCursor;
return *this;
}
-Cursor::Cursor(PlatformCursor c)
- : m_platformCursor(c)
+Cursor::~Cursor()
{
}
-const Cursor& pointerCursor()
+void Cursor::ensurePlatformCursor() const
{
- DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypePointer));
- return c;
+ // Chromium has no PlatformCursor.
+ UNREACHABLE_FOR_PLATFORM();
}
-const Cursor& crossCursor()
-{
- DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeCross));
- return c;
-}
-
-const Cursor& handCursor()
-{
- DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeHand));
- return c;
-}
-
-const Cursor& iBeamCursor()
-{
- DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeIBeam));
- return c;
-}
-
-const Cursor& waitCursor()
-{
- DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeWait));
- return c;
-}
-
-const Cursor& helpCursor()
-{
- DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeHelp));
- return c;
-}
-
-const Cursor& eastResizeCursor()
-{
- DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeEastResize));
- return c;
-}
-
-const Cursor& northResizeCursor()
-{
- DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeNorthResize));
- return c;
-}
-
-const Cursor& northEastResizeCursor()
-{
- DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeNorthEastResize));
- return c;
-}
-
-const Cursor& northWestResizeCursor()
-{
- DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeNorthWestResize));
- return c;
-}
-
-const Cursor& southResizeCursor()
-{
- DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeSouthResize));
- return c;
-}
-
-const Cursor& southEastResizeCursor()
-{
- DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeSouthEastResize));
- return c;
-}
-
-const Cursor& southWestResizeCursor()
-{
- DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeSouthWestResize));
- return c;
-}
-
-const Cursor& westResizeCursor()
-{
- DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeWestResize));
- return c;
-}
-
-const Cursor& northSouthResizeCursor()
-{
- DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeNorthSouthResize));
- return c;
-}
-
-const Cursor& eastWestResizeCursor()
-{
- DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeEastWestResize));
- return c;
-}
-
-const Cursor& northEastSouthWestResizeCursor()
-{
- DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeNorthEastSouthWestResize));
- return c;
-}
-
-const Cursor& northWestSouthEastResizeCursor()
-{
- DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeNorthWestSouthEastResize));
- return c;
-}
-
-const Cursor& columnResizeCursor()
-{
- DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeColumnResize));
- return c;
-}
-
-const Cursor& rowResizeCursor()
-{
- DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeRowResize));
- return c;
-}
-
-const Cursor& middlePanningCursor()
-{
- DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeMiddlePanning));
- return c;
-}
-
-const Cursor& eastPanningCursor()
-{
- DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeEastPanning));
- return c;
-}
-
-const Cursor& northPanningCursor()
-{
- DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeNorthPanning));
- return c;
-}
-
-const Cursor& northEastPanningCursor()
-{
- DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeNorthEastPanning));
- return c;
-}
-
-const Cursor& northWestPanningCursor()
-{
- DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeNorthWestPanning));
- return c;
-}
-
-const Cursor& southPanningCursor()
-{
- DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeSouthPanning));
- return c;
-}
-
-const Cursor& southEastPanningCursor()
-{
- DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeSouthEastPanning));
- return c;
-}
-
-const Cursor& southWestPanningCursor()
-{
- DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeSouthWestPanning));
- return c;
-}
-
-const Cursor& westPanningCursor()
-{
- DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeWestPanning));
- return c;
-}
-
-const Cursor& moveCursor()
-{
- DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeMove));
- return c;
-}
-
-const Cursor& verticalTextCursor()
-{
- DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeVerticalText));
- return c;
-}
-
-const Cursor& cellCursor()
-{
- DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeCell));
- return c;
-}
-
-const Cursor& contextMenuCursor()
-{
- DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeContextMenu));
- return c;
-}
-
-const Cursor& aliasCursor()
-{
- DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeAlias));
- return c;
-}
-
-const Cursor& progressCursor()
-{
- DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeProgress));
- return c;
-}
-
-const Cursor& noDropCursor()
-{
- DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeNoDrop));
- return c;
-}
-
-const Cursor& copyCursor()
-{
- DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeCopy));
- return c;
-}
-
-const Cursor& noneCursor()
-{
- DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeNone));
- return c;
-}
-
-const Cursor& notAllowedCursor()
-{
- DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeNotAllowed));
- return c;
-}
-
-const Cursor& zoomInCursor()
-{
- DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeZoomIn));
- return c;
-}
-
-const Cursor& zoomOutCursor()
-{
- DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeZoomOut));
- return c;
-}
-
-const Cursor& grabCursor()
-{
- DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeGrab));
- return c;
-}
-
-const Cursor& grabbingCursor()
-{
- DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeGrabbing));
- return c;
-}
-
} // namespace WebCore
-
-#define COMPILE_ASSERT_MATCHING_ENUM(cursor_name, platform_cursor_name) \
- COMPILE_ASSERT(int(WebCore::Cursor::cursor_name) == int(WebCore::PlatformCursor::platform_cursor_name), mismatching_enums)
-
-COMPILE_ASSERT_MATCHING_ENUM(Pointer, TypePointer);
-COMPILE_ASSERT_MATCHING_ENUM(Cross, TypeCross);
-COMPILE_ASSERT_MATCHING_ENUM(Hand, TypeHand);
-COMPILE_ASSERT_MATCHING_ENUM(IBeam, TypeIBeam);
-COMPILE_ASSERT_MATCHING_ENUM(Wait, TypeWait);
-COMPILE_ASSERT_MATCHING_ENUM(Help, TypeHelp);
-COMPILE_ASSERT_MATCHING_ENUM(EastResize, TypeEastResize);
-COMPILE_ASSERT_MATCHING_ENUM(NorthResize, TypeNorthResize);
-COMPILE_ASSERT_MATCHING_ENUM(NorthEastResize, TypeNorthEastResize);
-COMPILE_ASSERT_MATCHING_ENUM(NorthWestResize, TypeNorthWestResize);
-COMPILE_ASSERT_MATCHING_ENUM(SouthResize, TypeSouthResize);
-COMPILE_ASSERT_MATCHING_ENUM(SouthEastResize, TypeSouthEastResize);
-COMPILE_ASSERT_MATCHING_ENUM(SouthWestResize, TypeSouthWestResize);
-COMPILE_ASSERT_MATCHING_ENUM(WestResize, TypeWestResize);
-COMPILE_ASSERT_MATCHING_ENUM(NorthSouthResize, TypeNorthSouthResize);
-COMPILE_ASSERT_MATCHING_ENUM(EastWestResize, TypeEastWestResize);
-COMPILE_ASSERT_MATCHING_ENUM(NorthEastSouthWestResize, TypeNorthEastSouthWestResize);
-COMPILE_ASSERT_MATCHING_ENUM(NorthWestSouthEastResize, TypeNorthWestSouthEastResize);
-COMPILE_ASSERT_MATCHING_ENUM(ColumnResize, TypeColumnResize);
-COMPILE_ASSERT_MATCHING_ENUM(RowResize, TypeRowResize);
-COMPILE_ASSERT_MATCHING_ENUM(MiddlePanning, TypeMiddlePanning);
-COMPILE_ASSERT_MATCHING_ENUM(EastPanning, TypeEastPanning);
-COMPILE_ASSERT_MATCHING_ENUM(NorthPanning, TypeNorthPanning);
-COMPILE_ASSERT_MATCHING_ENUM(NorthEastPanning, TypeNorthEastPanning);
-COMPILE_ASSERT_MATCHING_ENUM(NorthWestPanning, TypeNorthWestPanning);
-COMPILE_ASSERT_MATCHING_ENUM(SouthPanning, TypeSouthPanning);
-COMPILE_ASSERT_MATCHING_ENUM(SouthEastPanning, TypeSouthEastPanning);
-COMPILE_ASSERT_MATCHING_ENUM(SouthWestPanning, TypeSouthWestPanning);
-COMPILE_ASSERT_MATCHING_ENUM(WestPanning, TypeWestPanning);
-COMPILE_ASSERT_MATCHING_ENUM(Move, TypeMove);
-COMPILE_ASSERT_MATCHING_ENUM(VerticalText, TypeVerticalText);
-COMPILE_ASSERT_MATCHING_ENUM(Cell, TypeCell);
-COMPILE_ASSERT_MATCHING_ENUM(ContextMenu, TypeContextMenu);
-COMPILE_ASSERT_MATCHING_ENUM(Alias, TypeAlias);
-COMPILE_ASSERT_MATCHING_ENUM(Progress, TypeProgress);
-COMPILE_ASSERT_MATCHING_ENUM(NoDrop, TypeNoDrop);
-COMPILE_ASSERT_MATCHING_ENUM(Copy, TypeCopy);
-COMPILE_ASSERT_MATCHING_ENUM(None, TypeNone);
-COMPILE_ASSERT_MATCHING_ENUM(NotAllowed, TypeNotAllowed);
-COMPILE_ASSERT_MATCHING_ENUM(ZoomIn, TypeZoomIn);
-COMPILE_ASSERT_MATCHING_ENUM(ZoomOut, TypeZoomOut);
-COMPILE_ASSERT_MATCHING_ENUM(Grab, TypeGrab);
-COMPILE_ASSERT_MATCHING_ENUM(Grabbing, TypeGrabbing);
-COMPILE_ASSERT_MATCHING_ENUM(Custom, TypeCustom);
Deleted: trunk/Source/WebCore/platform/chromium/PlatformCursor.h (134148 => 134149)
--- trunk/Source/WebCore/platform/chromium/PlatformCursor.h 2012-11-10 05:05:47 UTC (rev 134148)
+++ trunk/Source/WebCore/platform/chromium/PlatformCursor.h 2012-11-10 05:12:55 UTC (rev 134149)
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef PlatformCursor_h
-#define PlatformCursor_h
-
-#include "Image.h"
-#include "IntPoint.h"
-#include <wtf/RefPtr.h>
-
-namespace WebCore {
-
- class PlatformCursor {
- public:
- enum Type {
- TypePointer,
- TypeCross,
- TypeHand,
- TypeIBeam,
- TypeWait,
- TypeHelp,
- TypeEastResize,
- TypeNorthResize,
- TypeNorthEastResize,
- TypeNorthWestResize,
- TypeSouthResize,
- TypeSouthEastResize,
- TypeSouthWestResize,
- TypeWestResize,
- TypeNorthSouthResize,
- TypeEastWestResize,
- TypeNorthEastSouthWestResize,
- TypeNorthWestSouthEastResize,
- TypeColumnResize,
- TypeRowResize,
- TypeMiddlePanning,
- TypeEastPanning,
- TypeNorthPanning,
- TypeNorthEastPanning,
- TypeNorthWestPanning,
- TypeSouthPanning,
- TypeSouthEastPanning,
- TypeSouthWestPanning,
- TypeWestPanning,
- TypeMove,
- TypeVerticalText,
- TypeCell,
- TypeContextMenu,
- TypeAlias,
- TypeProgress,
- TypeNoDrop,
- TypeCopy,
- TypeNone,
- TypeNotAllowed,
- TypeZoomIn,
- TypeZoomOut,
- TypeGrab,
- TypeGrabbing,
- TypeCustom
- };
-
- // Cursor.h assumes that it can initialize us to 0.
- explicit PlatformCursor(int type = 0) : m_type(TypePointer) {}
-
- PlatformCursor(Type type) : m_type(type) {}
-
- PlatformCursor(Image* image, const IntPoint& hotSpot)
- : m_image(image)
- , m_hotSpot(hotSpot)
- , m_type(TypeCustom) {}
-
- PassRefPtr<Image> customImage() const { return m_image; }
- const IntPoint& hotSpot() const { return m_hotSpot; }
- Type type() const { return m_type; }
-
- private:
- RefPtr<Image> m_image;
- IntPoint m_hotSpot;
- Type m_type;
- };
-
-} // namespace WebCore
-
-#endif
Modified: trunk/Source/WebKit/chromium/ChangeLog (134148 => 134149)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-11-10 05:05:47 UTC (rev 134148)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-11-10 05:12:55 UTC (rev 134149)
@@ -1,3 +1,17 @@
+2012-11-09 Rick Byers <rby...@chromium.org>
+
+ Move chromium to USE(LAZY_NATIVE_CURSOR)
+ https://bugs.webkit.org/show_bug.cgi?id=101501
+
+ Reviewed by Adam Barth.
+
+ Update conversion from Cursor to WebCursorInfo to remove the
+ intermediate (and useless) step of PlatformCursor.
+
+ * src/AssertMatchingEnums.cpp:
+ * src/WebCursorInfo.cpp:
+ (WebKit::WebCursorInfo::WebCursorInfo):
+
2012-11-09 Alec Flett <alecfl...@chromium.org>
IndexedDB: Combine IDBBackingStore and IDBLevelDBBackingStore
Modified: trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp (134148 => 134149)
--- trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp 2012-11-10 05:05:47 UTC (rev 134148)
+++ trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp 2012-11-10 05:12:55 UTC (rev 134149)
@@ -37,6 +37,7 @@
#include "AccessibilityObject.h"
#include "ApplicationCacheHost.h"
#include "ContentSecurityPolicy.h"
+#include "Cursor.h"
#include "DocumentMarker.h"
#include "EditorInsertAction.h"
#include "ExceptionCode.h"
@@ -64,7 +65,6 @@
#include "MediaStreamSource.h"
#include "NotificationClient.h"
#include "PageVisibilityState.h"
-#include "PlatformCursor.h"
#include "RTCDataChannelDescriptor.h"
#include "RTCPeerConnectionHandlerClient.h"
#include "ReferrerPolicy.h"
@@ -280,50 +280,50 @@
COMPILE_ASSERT_MATCHING_ENUM(WebApplicationCacheHost::CachedEvent, ApplicationCacheHost::CACHED_EVENT);
COMPILE_ASSERT_MATCHING_ENUM(WebApplicationCacheHost::ObsoleteEvent, ApplicationCacheHost::OBSOLETE_EVENT);
-COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypePointer, PlatformCursor::TypePointer);
-COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeCross, PlatformCursor::TypeCross);
-COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeHand, PlatformCursor::TypeHand);
-COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeIBeam, PlatformCursor::TypeIBeam);
-COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeWait, PlatformCursor::TypeWait);
-COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeHelp, PlatformCursor::TypeHelp);
-COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeEastResize, PlatformCursor::TypeEastResize);
-COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthResize, PlatformCursor::TypeNorthResize);
-COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthEastResize, PlatformCursor::TypeNorthEastResize);
-COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthWestResize, PlatformCursor::TypeNorthWestResize);
-COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeSouthResize, PlatformCursor::TypeSouthResize);
-COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeSouthEastResize, PlatformCursor::TypeSouthEastResize);
-COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeSouthWestResize, PlatformCursor::TypeSouthWestResize);
-COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeWestResize, PlatformCursor::TypeWestResize);
-COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthSouthResize, PlatformCursor::TypeNorthSouthResize);
-COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeEastWestResize, PlatformCursor::TypeEastWestResize);
-COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthEastSouthWestResize, PlatformCursor::TypeNorthEastSouthWestResize);
-COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthWestSouthEastResize, PlatformCursor::TypeNorthWestSouthEastResize);
-COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeColumnResize, PlatformCursor::TypeColumnResize);
-COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeRowResize, PlatformCursor::TypeRowResize);
-COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeMiddlePanning, PlatformCursor::TypeMiddlePanning);
-COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeEastPanning, PlatformCursor::TypeEastPanning);
-COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthPanning, PlatformCursor::TypeNorthPanning);
-COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthEastPanning, PlatformCursor::TypeNorthEastPanning);
-COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthWestPanning, PlatformCursor::TypeNorthWestPanning);
-COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeSouthPanning, PlatformCursor::TypeSouthPanning);
-COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeSouthEastPanning, PlatformCursor::TypeSouthEastPanning);
-COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeSouthWestPanning, PlatformCursor::TypeSouthWestPanning);
-COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeWestPanning, PlatformCursor::TypeWestPanning);
-COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeMove, PlatformCursor::TypeMove);
-COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeVerticalText, PlatformCursor::TypeVerticalText);
-COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeCell, PlatformCursor::TypeCell);
-COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeContextMenu, PlatformCursor::TypeContextMenu);
-COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeAlias, PlatformCursor::TypeAlias);
-COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeProgress, PlatformCursor::TypeProgress);
-COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNoDrop, PlatformCursor::TypeNoDrop);
-COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeCopy, PlatformCursor::TypeCopy);
-COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNone, PlatformCursor::TypeNone);
-COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNotAllowed, PlatformCursor::TypeNotAllowed);
-COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeZoomIn, PlatformCursor::TypeZoomIn);
-COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeZoomOut, PlatformCursor::TypeZoomOut);
-COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeGrab, PlatformCursor::TypeGrab);
-COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeGrabbing, PlatformCursor::TypeGrabbing);
-COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeCustom, PlatformCursor::TypeCustom);
+COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypePointer, Cursor::Pointer);
+COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeCross, Cursor::Cross);
+COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeHand, Cursor::Hand);
+COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeIBeam, Cursor::IBeam);
+COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeWait, Cursor::Wait);
+COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeHelp, Cursor::Help);
+COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeEastResize, Cursor::EastResize);
+COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthResize, Cursor::NorthResize);
+COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthEastResize, Cursor::NorthEastResize);
+COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthWestResize, Cursor::NorthWestResize);
+COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeSouthResize, Cursor::SouthResize);
+COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeSouthEastResize, Cursor::SouthEastResize);
+COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeSouthWestResize, Cursor::SouthWestResize);
+COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeWestResize, Cursor::WestResize);
+COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthSouthResize, Cursor::NorthSouthResize);
+COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeEastWestResize, Cursor::EastWestResize);
+COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthEastSouthWestResize, Cursor::NorthEastSouthWestResize);
+COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthWestSouthEastResize, Cursor::NorthWestSouthEastResize);
+COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeColumnResize, Cursor::ColumnResize);
+COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeRowResize, Cursor::RowResize);
+COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeMiddlePanning, Cursor::MiddlePanning);
+COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeEastPanning, Cursor::EastPanning);
+COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthPanning, Cursor::NorthPanning);
+COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthEastPanning, Cursor::NorthEastPanning);
+COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthWestPanning, Cursor::NorthWestPanning);
+COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeSouthPanning, Cursor::SouthPanning);
+COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeSouthEastPanning, Cursor::SouthEastPanning);
+COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeSouthWestPanning, Cursor::SouthWestPanning);
+COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeWestPanning, Cursor::WestPanning);
+COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeMove, Cursor::Move);
+COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeVerticalText, Cursor::VerticalText);
+COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeCell, Cursor::Cell);
+COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeContextMenu, Cursor::ContextMenu);
+COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeAlias, Cursor::Alias);
+COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeProgress, Cursor::Progress);
+COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNoDrop, Cursor::NoDrop);
+COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeCopy, Cursor::Copy);
+COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNone, Cursor::None);
+COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNotAllowed, Cursor::NotAllowed);
+COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeZoomIn, Cursor::ZoomIn);
+COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeZoomOut, Cursor::ZoomOut);
+COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeGrab, Cursor::Grab);
+COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeGrabbing, Cursor::Grabbing);
+COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeCustom, Cursor::Custom);
COMPILE_ASSERT_MATCHING_ENUM(WebEditingActionTyped, EditorInsertActionTyped);
COMPILE_ASSERT_MATCHING_ENUM(WebEditingActionPasted, EditorInsertActionPasted);
Modified: trunk/Source/WebKit/chromium/src/WebCursorInfo.cpp (134148 => 134149)
--- trunk/Source/WebKit/chromium/src/WebCursorInfo.cpp 2012-11-10 05:05:47 UTC (rev 134148)
+++ trunk/Source/WebKit/chromium/src/WebCursorInfo.cpp 2012-11-10 05:12:55 UTC (rev 134149)
@@ -39,9 +39,9 @@
WebCursorInfo::WebCursorInfo(const Cursor& cursor)
{
- type = static_cast<Type>(cursor.impl().type());
- hotSpot = cursor.impl().hotSpot();
- customImage = cursor.impl().customImage();
+ type = static_cast<Type>(cursor.type());
+ hotSpot = cursor.hotSpot();
+ customImage = cursor.image();
#ifdef WIN32
externalHandle = 0;
#endif
