Remove OS(WINCE) from AccessibilityObject.h
authorparoga@webkit.org <paroga@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 25 Apr 2013 20:26:56 +0000 (20:26 +0000)
committerparoga@webkit.org <paroga@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 25 Apr 2013 20:26:56 +0000 (20:26 +0000)
https://bugs.webkit.org/show_bug.cgi?id=115192

Reviewed by Andreas Kling.

Use the same files like the the other PLATFORM(WIN) ports use.

Source/WebCore:

* PlatformWinCE.cmake:
* accessibility/AccessibilityObject.h:
(AccessibilityObject):

Source/WebKit:

* PlatformWinCE.cmake:

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

Source/WebCore/ChangeLog
Source/WebCore/PlatformWinCE.cmake
Source/WebCore/accessibility/AccessibilityObject.h
Source/WebKit/ChangeLog
Source/WebKit/PlatformWinCE.cmake

index 54f1dca7979f4e77e54c650ef4376d31855b76cc..d794286bfeee73350a8d8ec15b990b4cf7283a50 100644 (file)
@@ -1,3 +1,16 @@
+2013-04-25  Patrick Gansterer  <paroga@webkit.org>
+
+        Remove OS(WINCE) from AccessibilityObject.h
+        https://bugs.webkit.org/show_bug.cgi?id=115192
+
+        Reviewed by Andreas Kling.
+
+        Use the same files like the the other PLATFORM(WIN) ports use.
+
+        * PlatformWinCE.cmake:
+        * accessibility/AccessibilityObject.h:
+        (AccessibilityObject):
+
 2013-04-25  Alberto Garcia  <agarcia@igalia.com>
 
         Add definition of GlyphBufferGlyph for BlackBerry
index d176916d70a8b458129f8b7a3af86703ac750241..f3e8656678681ce8e2cd49dd6e105ce37babdba5 100644 (file)
@@ -1,4 +1,5 @@
 list(APPEND WebCore_INCLUDE_DIRECTORIES
+    "${WEBCORE_DIR}/accessibility/win"
     "${WEBCORE_DIR}/platform/wince"
     "${WEBCORE_DIR}/platform/win"
     "${WEBCORE_DIR}/platform/graphics/wince"
@@ -16,6 +17,8 @@ list(APPEND WebCore_INCLUDE_DIRECTORIES
 )
 
 list(APPEND WebCore_SOURCES
+    accessibility/win/AccessibilityObjectWin.cpp
+
     page/win/DragControllerWin.cpp
     page/win/EventHandlerWin.cpp
     page/wince/FrameWinCE.cpp
index ae50f7032aef05955b5aa380e8c5df31e9494795..25cfab925e09ae4e923d3460f7989eb57f536814 100644 (file)
@@ -42,7 +42,7 @@
 
 #if PLATFORM(MAC)
 #include <wtf/RetainPtr.h>
-#elif PLATFORM(WIN) && !OS(WINCE)
+#elif PLATFORM(WIN)
 #include "AccessibilityObjectWrapperWin.h"
 #include "COMPtr.h"
 #endif
@@ -877,7 +877,7 @@ protected:
 
 #if PLATFORM(MAC)
     RetainPtr<WebAccessibilityObjectWrapper> m_wrapper;
-#elif PLATFORM(WIN) && !OS(WINCE)
+#elif PLATFORM(WIN)
     COMPtr<AccessibilityObjectWrapper> m_wrapper;
 #elif PLATFORM(GTK) || (PLATFORM(EFL) && HAVE(ACCESSIBILITY))
     AtkObject* m_wrapper;
index 28c31d6ce53af8c095cdb90fd577cb5a33247b5a..421d344e38ce19b54d1a7bb195d1c2a33537db13 100644 (file)
@@ -1,3 +1,14 @@
+2013-04-25  Patrick Gansterer  <paroga@webkit.org>
+
+        Remove OS(WINCE) from AccessibilityObject.h
+        https://bugs.webkit.org/show_bug.cgi?id=115192
+
+        Reviewed by Andreas Kling.
+
+        Use the same files like the the other PLATFORM(WIN) ports use.
+
+        * PlatformWinCE.cmake:
+
 2013-04-24  Jessie Berlin  <jberlin@apple.com>
 
         Assertion failure (crash in release) attempting to delete database storage in WK1 without
index 8ad2a3aa864a46e5c58a02a7ee90de990b5e2295..f9c3ec87ee564e5a6a18fd63b1f06ae865be9d5d 100644 (file)
@@ -1,4 +1,5 @@
 list(APPEND WebKit_INCLUDE_DIRECTORIES
+    "${WEBCORE_DIR}/accessibility/win"
     "${WEBCORE_DIR}/page/win"
     "${WEBCORE_DIR}/platform/graphics/wince"
     "${WEBCORE_DIR}/platform/graphics/win"