Title: [149139] trunk/Source
Revision
149139
Author
[email protected]
Date
2013-04-25 13:26:56 -0700 (Thu, 25 Apr 2013)

Log Message

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.

Source/WebCore:

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

Source/WebKit:

* PlatformWinCE.cmake:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (149138 => 149139)


--- trunk/Source/WebCore/ChangeLog	2013-04-25 20:11:06 UTC (rev 149138)
+++ trunk/Source/WebCore/ChangeLog	2013-04-25 20:26:56 UTC (rev 149139)
@@ -1,3 +1,16 @@
+2013-04-25  Patrick Gansterer  <[email protected]>
+
+        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  <[email protected]>
 
         Add definition of GlyphBufferGlyph for BlackBerry

Modified: trunk/Source/WebCore/PlatformWinCE.cmake (149138 => 149139)


--- trunk/Source/WebCore/PlatformWinCE.cmake	2013-04-25 20:11:06 UTC (rev 149138)
+++ trunk/Source/WebCore/PlatformWinCE.cmake	2013-04-25 20:26:56 UTC (rev 149139)
@@ -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_SOURCES
+    accessibility/win/AccessibilityObjectWin.cpp
+
     page/win/DragControllerWin.cpp
     page/win/EventHandlerWin.cpp
     page/wince/FrameWinCE.cpp

Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.h (149138 => 149139)


--- trunk/Source/WebCore/accessibility/AccessibilityObject.h	2013-04-25 20:11:06 UTC (rev 149138)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.h	2013-04-25 20:26:56 UTC (rev 149139)
@@ -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 @@
 
 #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;

Modified: trunk/Source/WebKit/ChangeLog (149138 => 149139)


--- trunk/Source/WebKit/ChangeLog	2013-04-25 20:11:06 UTC (rev 149138)
+++ trunk/Source/WebKit/ChangeLog	2013-04-25 20:26:56 UTC (rev 149139)
@@ -1,3 +1,14 @@
+2013-04-25  Patrick Gansterer  <[email protected]>
+
+        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  <[email protected]>
 
         Assertion failure (crash in release) attempting to delete database storage in WK1 without

Modified: trunk/Source/WebKit/PlatformWinCE.cmake (149138 => 149139)


--- trunk/Source/WebKit/PlatformWinCE.cmake	2013-04-25 20:11:06 UTC (rev 149138)
+++ trunk/Source/WebKit/PlatformWinCE.cmake	2013-04-25 20:26:56 UTC (rev 149139)
@@ -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"
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to