Diff
Modified: trunk/Source/WebCore/ChangeLog (149185 => 149186)
--- trunk/Source/WebCore/ChangeLog 2013-04-26 15:13:02 UTC (rev 149185)
+++ trunk/Source/WebCore/ChangeLog 2013-04-26 15:14:59 UTC (rev 149186)
@@ -1,3 +1,37 @@
+2013-04-26 Andreas Kling <akl...@apple.com>
+
+ Remove wxWebKit from WebCore.
+ <http://webkit.org/b/115255>
+
+ Reviewed by Anders Carlsson.
+
+ * DerivedSources.make:
+ * WebCorePrefix.h:
+ * bindings/js/JSInspectorFrontendHostCustom.cpp:
+ (WebCore::JSInspectorFrontendHost::port):
+ * config.h:
+ * html/HTMLFormElement.cpp:
+ * platform/ContextMenu.h:
+ (ContextMenu):
+ * platform/ContextMenuItem.h:
+ * platform/Cursor.h:
+ * platform/DragData.h:
+ * platform/DragImage.h:
+ * platform/FileSystem.h:
+ * platform/PlatformExportMacros.h:
+ * platform/PlatformKeyboardEvent.h:
+ (PlatformKeyboardEvent):
+ * platform/PlatformMenuDescription.h:
+ * platform/PlatformMouseEvent.h:
+ (PlatformMouseEvent):
+ * platform/PlatformWheelEvent.h:
+ (PlatformWheelEvent):
+ * platform/ScrollView.cpp:
+ * platform/ScrollView.h:
+ (ScrollView):
+ * platform/Widget.h:
+ * platform/win/SharedTimerWin.cpp:
+
2013-04-26 Zalan Bujtas <za...@apple.com>
use-after-free removing a frame from its parent in a beforeload event of an OBJECT element
Modified: trunk/Source/WebCore/DerivedSources.make (149185 => 149186)
--- trunk/Source/WebCore/DerivedSources.make 2013-04-26 15:13:02 UTC (rev 149185)
+++ trunk/Source/WebCore/DerivedSources.make 2013-04-26 15:14:59 UTC (rev 149186)
@@ -660,9 +660,6 @@
JS_DOM_HEADERS=$(filter-out JSMediaQueryListListener.h JSEventListener.h, $(DOM_CLASSES:%=JS%.h))
WEB_DOM_HEADERS :=
-ifeq ($(findstring BUILDING_WX,$(FEATURE_DEFINES)), BUILDING_WX)
-WEB_DOM_HEADERS := $(filter-out WebDOMXSLTProcessor.h WebDOMEventTarget.h, $(DOM_CLASSES:%=WebDOM%.h))
-endif # BUILDING_WX
all : \
$(SUPPLEMENTAL_DEPENDENCY_FILE) \
@@ -1060,13 +1057,6 @@
-include $(JS_DOM_HEADERS:.h=.dep)
-ifeq ($(findstring BUILDING_WX,$(FEATURE_DEFINES)), BUILDING_WX)
-CPP_BINDINGS_SCRIPTS = $(GENERATE_SCRIPTS) bindings/scripts/CodeGeneratorCPP.pm
-
-WebDOM%.h : %.idl $(CPP_BINDINGS_SCRIPTS)
- $(call generator_script, $(CPP_BINDINGS_SCRIPTS)) $(IDL_COMMON_ARGS) --defines "$(FEATURE_DEFINES) $(ADDITIONAL_IDL_DEFINES) LANGUAGE_CPP" --generator CPP --supplementalDependencyFile $(SUPPLEMENTAL_DEPENDENCY_FILE) $<
-endif # BUILDING_WX
-
# ------------------------
# Mac-specific rules
Modified: trunk/Source/WebCore/WebCorePrefix.h (149185 => 149186)
--- trunk/Source/WebCore/WebCorePrefix.h 2013-04-26 15:13:02 UTC (rev 149185)
+++ trunk/Source/WebCore/WebCorePrefix.h 2013-04-26 15:14:59 UTC (rev 149186)
@@ -72,11 +72,7 @@
#include <regex.h>
#endif
-// On Linux this causes conflicts with libpng because there are two impls. of
-// longjmp - see here: https://bugs.launchpad.net/ubuntu/+source/libpng/+bug/218409
-#if !PLATFORM(WX)
#include <setjmp.h>
-#endif
#include <signal.h>
#include <stdarg.h>
@@ -132,7 +128,6 @@
#include <sys/resource.h>
#endif
-#if !PLATFORM(WX)
#include <CoreFoundation/CoreFoundation.h>
#if PLATFORM(WIN_CAIRO)
#include <ConditionalMacros.h>
@@ -162,7 +157,6 @@
#endif // OS(WINDOWS)
#endif
-#endif // !PLATFORM(WX)
#ifdef __OBJC__
#if PLATFORM(IOS)
Modified: trunk/Source/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp (149185 => 149186)
--- trunk/Source/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp 2013-04-26 15:13:02 UTC (rev 149185)
+++ trunk/Source/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp 2013-04-26 15:14:59 UTC (rev 149186)
@@ -77,8 +77,6 @@
DEFINE_STATIC_LOCAL(const String, port, (ASCIILiteral("qt")));
#elif PLATFORM(GTK)
DEFINE_STATIC_LOCAL(const String, port, (ASCIILiteral("gtk")));
-#elif PLATFORM(WX)
- DEFINE_STATIC_LOCAL(const String, port, (ASCIILiteral("wx")));
#elif PLATFORM(EFL)
DEFINE_STATIC_LOCAL(const String, port, (ASCIILiteral("efl")));
#else
Modified: trunk/Source/WebCore/config.h (149185 => 149186)
--- trunk/Source/WebCore/config.h 2013-04-26 15:13:02 UTC (rev 149185)
+++ trunk/Source/WebCore/config.h 2013-04-26 15:14:59 UTC (rev 149186)
@@ -86,12 +86,6 @@
#endif
-// On MSW, wx headers need to be included before windows.h is.
-// The only way we can always ensure this is if we include wx here.
-#if PLATFORM(WX)
-#include <wx/defs.h>
-#endif
-
#include <wtf/DisallowCType.h>
#if COMPILER(MSVC)
Modified: trunk/Source/WebCore/html/HTMLFormElement.cpp (149185 => 149186)
--- trunk/Source/WebCore/html/HTMLFormElement.cpp 2013-04-26 15:13:02 UTC (rev 149185)
+++ trunk/Source/WebCore/html/HTMLFormElement.cpp 2013-04-26 15:14:59 UTC (rev 149186)
@@ -56,11 +56,6 @@
#include "ValidityState.h"
#include <limits>
-#if PLATFORM(WX)
-#include <wx/defs.h>
-#include <wx/filename.h>
-#endif
-
using namespace std;
namespace WebCore {
Modified: trunk/Source/WebCore/platform/ContextMenu.h (149185 => 149186)
--- trunk/Source/WebCore/platform/ContextMenu.h 2013-04-26 15:13:02 UTC (rev 149185)
+++ trunk/Source/WebCore/platform/ContextMenu.h 2013-04-26 15:14:59 UTC (rev 149186)
@@ -81,11 +81,6 @@
void setPlatformDescription(PlatformMenuDescription);
PlatformMenuDescription releasePlatformDescription();
-
-#if PLATFORM(WX)
- static ContextMenuItem* itemWithId(int);
-#endif
-
#endif // USE(CROSS_PLATFORM_CONTEXT_MENUS)
private:
Modified: trunk/Source/WebCore/platform/ContextMenuItem.h (149185 => 149186)
--- trunk/Source/WebCore/platform/ContextMenuItem.h 2013-04-26 15:13:02 UTC (rev 149185)
+++ trunk/Source/WebCore/platform/ContextMenuItem.h 2013-04-26 15:14:59 UTC (rev 149186)
@@ -39,8 +39,6 @@
#elif PLATFORM(GTK)
typedef struct _GtkMenuItem GtkMenuItem;
typedef struct _GtkAction GtkAction;
-#elif PLATFORM(WX)
-class wxMenuItem;
#endif
#endif // ENABLE(CONTEXT_MENUS)
@@ -181,22 +179,6 @@
typedef NSMenuItem* PlatformMenuItemDescription;
#elif PLATFORM(GTK)
typedef GtkMenuItem* PlatformMenuItemDescription;
-#elif PLATFORM(WX)
- struct PlatformMenuItemDescription {
- PlatformMenuItemDescription()
- : type(ActionType),
- action(ContextMenuItemTagNoAction),
- checked(false),
- enabled(true)
- {}
-
- ContextMenuItemType type;
- ContextMenuAction action;
- String title;
- wxMenu * subMenu;
- bool checked;
- bool enabled;
- };
#else
typedef void* PlatformMenuItemDescription;
#endif
Modified: trunk/Source/WebCore/platform/Cursor.h (149185 => 149186)
--- trunk/Source/WebCore/platform/Cursor.h 2013-04-26 15:13:02 UTC (rev 149185)
+++ trunk/Source/WebCore/platform/Cursor.h 2013-04-26 15:14:59 UTC (rev 149186)
@@ -50,16 +50,12 @@
OBJC_CLASS NSCursor;
#endif
-#if PLATFORM(WX)
-class wxCursor;
-#endif
-
#if PLATFORM(WIN)
typedef struct HICON__ *HICON;
typedef HICON HCURSOR;
#endif
-// Looks like it's just PLATFORM(WX) and PLATFORM(BLACKBERRY) still not using this?
+// Looks like it's just PLATFORM(BLACKBERRY) still not using this?
#if PLATFORM(WIN) || PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL)
#define WTF_USE_LAZY_NATIVE_CURSOR 1
#endif
@@ -88,8 +84,6 @@
#elif PLATFORM(QT) && !defined(QT_NO_CURSOR)
// Do not need to be shared but need to be created dynamically via ensurePlatformCursor.
typedef QCursor* PlatformCursor;
-#elif PLATFORM(WX)
- typedef wxCursor* PlatformCursor;
#elif PLATFORM(BLACKBERRY)
typedef BlackBerry::Platform::BlackBerryCursor PlatformCursor;
#else
Modified: trunk/Source/WebCore/platform/DragData.h (149185 => 149186)
--- trunk/Source/WebCore/platform/DragData.h 2013-04-26 15:13:02 UTC (rev 149185)
+++ trunk/Source/WebCore/platform/DragData.h 2013-04-26 15:14:59 UTC (rev 149186)
@@ -54,8 +54,6 @@
#elif PLATFORM(WIN)
typedef struct IDataObject* DragDataRef;
#include <wtf/text/WTFString.h>
-#elif PLATFORM(WX)
-typedef class wxDataObject* DragDataRef;
#elif PLATFORM(GTK)
namespace WebCore {
class DataObjectGtk;
Modified: trunk/Source/WebCore/platform/DragImage.h (149185 => 149186)
--- trunk/Source/WebCore/platform/DragImage.h 2013-04-26 15:13:02 UTC (rev 149185)
+++ trunk/Source/WebCore/platform/DragImage.h 2013-04-26 15:14:59 UTC (rev 149186)
@@ -41,8 +41,6 @@
QT_END_NAMESPACE
#elif PLATFORM(WIN)
typedef struct HBITMAP__* HBITMAP;
-#elif PLATFORM(WX)
-class wxDragImage;
#elif PLATFORM(GTK)
typedef struct _cairo_surface cairo_surface_t;
#endif
@@ -62,8 +60,6 @@
typedef QPixmap* DragImageRef;
#elif PLATFORM(WIN)
typedef HBITMAP DragImageRef;
-#elif PLATFORM(WX)
- typedef wxDragImage* DragImageRef;
#elif PLATFORM(GTK)
typedef cairo_surface_t* DragImageRef;
#elif PLATFORM(EFL) || PLATFORM(BLACKBERRY)
Modified: trunk/Source/WebCore/platform/FileSystem.h (149185 => 149186)
--- trunk/Source/WebCore/platform/FileSystem.h 2013-04-26 15:13:02 UTC (rev 149185)
+++ trunk/Source/WebCore/platform/FileSystem.h 2013-04-26 15:14:59 UTC (rev 149186)
@@ -48,11 +48,6 @@
#endif
#endif
-#if PLATFORM(WX)
-#include <wx/defs.h>
-#include <wx/file.h>
-#endif
-
#if USE(CF) || (PLATFORM(QT) && defined(Q_WS_MAC))
typedef struct __CFBundle* CFBundleRef;
typedef const struct __CFData* CFDataRef;
@@ -133,9 +128,6 @@
// FIXME: -1 is INVALID_HANDLE_VALUE, defined in <winbase.h>. Chromium tries to
// avoid using Windows headers in headers. We'd rather move this into the .cpp.
const PlatformFileHandle invalidPlatformFileHandle = reinterpret_cast<HANDLE>(-1);
-#elif PLATFORM(WX)
-typedef wxFile* PlatformFileHandle;
-const PlatformFileHandle invalidPlatformFileHandle = 0;
#else
typedef int PlatformFileHandle;
const PlatformFileHandle invalidPlatformFileHandle = -1;
Modified: trunk/Source/WebCore/platform/PlatformExportMacros.h (149185 => 149186)
--- trunk/Source/WebCore/platform/PlatformExportMacros.h 2013-04-26 15:13:02 UTC (rev 149185)
+++ trunk/Source/WebCore/platform/PlatformExportMacros.h 2013-04-26 15:14:59 UTC (rev 149186)
@@ -48,7 +48,7 @@
#else // !USE(EXPORT_MACROS)
-#if OS(WINDOWS) && !defined(BUILDING_WX__) && !COMPILER(GCC)
+#if OS(WINDOWS) && !COMPILER(GCC)
#if defined(WEBCORE_IS_LINKED_IN_SAME_BINARY)
#define WEBKIT_EXPORTDATA __declspec(dllexport)
Modified: trunk/Source/WebCore/platform/PlatformKeyboardEvent.h (149185 => 149186)
--- trunk/Source/WebCore/platform/PlatformKeyboardEvent.h 2013-04-26 15:13:02 UTC (rev 149185)
+++ trunk/Source/WebCore/platform/PlatformKeyboardEvent.h 2013-04-26 15:14:59 UTC (rev 149186)
@@ -49,10 +49,6 @@
QT_END_NAMESPACE
#endif
-#if PLATFORM(WX)
-class wxKeyEvent;
-#endif
-
#if PLATFORM(BLACKBERRY)
namespace BlackBerry {
namespace Platform {
@@ -167,10 +163,6 @@
uint32_t nativeScanCode() const;
#endif
-#if PLATFORM(WX)
- PlatformKeyboardEvent(wxKeyEvent&);
-#endif
-
#if PLATFORM(BLACKBERRY)
PlatformKeyboardEvent(const BlackBerry::Platform::KeyboardEvent&);
#endif
Modified: trunk/Source/WebCore/platform/PlatformMenuDescription.h (149185 => 149186)
--- trunk/Source/WebCore/platform/PlatformMenuDescription.h 2013-04-26 15:13:02 UTC (rev 149185)
+++ trunk/Source/WebCore/platform/PlatformMenuDescription.h 2013-04-26 15:14:59 UTC (rev 149186)
@@ -34,8 +34,6 @@
#include <qlist.h>
#elif PLATFORM(GTK)
typedef struct _GtkMenu GtkMenu;
-#elif PLATFORM(WX)
-class wxMenu;
#endif
namespace WebCore {
@@ -48,8 +46,6 @@
typedef const QList<ContextMenuItem>* PlatformMenuDescription;
#elif PLATFORM(GTK)
typedef GtkMenu* PlatformMenuDescription;
-#elif PLATFORM(WX)
- typedef wxMenu* PlatformMenuDescription;
#else
typedef void* PlatformMenuDescription;
#endif
Modified: trunk/Source/WebCore/platform/PlatformMouseEvent.h (149185 => 149186)
--- trunk/Source/WebCore/platform/PlatformMouseEvent.h 2013-04-26 15:13:02 UTC (rev 149185)
+++ trunk/Source/WebCore/platform/PlatformMouseEvent.h 2013-04-26 15:14:59 UTC (rev 149186)
@@ -43,10 +43,6 @@
typedef struct _Evas_Event_Mouse_Move Evas_Event_Mouse_Move;
#endif
-#if PLATFORM(WX)
-class wxMouseEvent;
-#endif
-
namespace WebCore {
// These button numbers match the ones used in the DOM API, 0 through 2, except for NoButton which isn't specified.
@@ -121,10 +117,6 @@
bool didActivateWebView() const { return m_didActivateWebView; }
#endif
-#if PLATFORM(WX)
- PlatformMouseEvent(const wxMouseEvent&, const wxPoint& globalPoint, int clickCount);
-#endif
-
#if PLATFORM(BLACKBERRY)
PlatformMouseEvent(const IntPoint& eventPosition, const IntPoint& globalPosition, const PlatformEvent::Type, int clickCount, MouseButton, bool shiftKey, bool ctrlKey, bool altKey, MouseInputMethod = PointingDevice);
MouseInputMethod inputMethod() const { return m_inputMethod; }
Modified: trunk/Source/WebCore/platform/PlatformWheelEvent.h (149185 => 149186)
--- trunk/Source/WebCore/platform/PlatformWheelEvent.h 2013-04-26 15:13:02 UTC (rev 149185)
+++ trunk/Source/WebCore/platform/PlatformWheelEvent.h 2013-04-26 15:14:59 UTC (rev 149186)
@@ -40,11 +40,6 @@
typedef struct _Evas_Event_Mouse_Wheel Evas_Event_Mouse_Wheel;
#endif
-#if PLATFORM(WX)
-class wxMouseEvent;
-class wxPoint;
-#endif
-
namespace WebCore {
class FloatPoint;
@@ -165,10 +160,6 @@
PlatformWheelEvent(HWND, const FloatSize& delta, const FloatPoint& location);
#endif
-#if PLATFORM(WX)
- PlatformWheelEvent(const wxMouseEvent&, const wxPoint&);
-#endif
-
protected:
IntPoint m_position;
IntPoint m_globalPosition;
Modified: trunk/Source/WebCore/platform/ScrollView.cpp (149185 => 149186)
--- trunk/Source/WebCore/platform/ScrollView.cpp 2013-04-26 15:13:02 UTC (rev 149185)
+++ trunk/Source/WebCore/platform/ScrollView.cpp 2013-04-26 15:14:59 UTC (rev 149186)
@@ -1331,7 +1331,7 @@
updateScrollbars(scrollOffset());
}
-#if !PLATFORM(WX) && !PLATFORM(EFL)
+#if !PLATFORM(EFL)
void ScrollView::platformInit()
{
@@ -1343,7 +1343,7 @@
#endif
-#if !PLATFORM(WX) && !PLATFORM(QT) && !PLATFORM(MAC)
+#if !PLATFORM(QT) && !PLATFORM(MAC)
void ScrollView::platformAddChild(Widget*)
{
@@ -1371,7 +1371,7 @@
#endif
-#if !PLATFORM(MAC) && !PLATFORM(WX)
+#if !PLATFORM(MAC)
void ScrollView::platformSetScrollbarModes()
{
Modified: trunk/Source/WebCore/platform/ScrollView.h (149185 => 149186)
--- trunk/Source/WebCore/platform/ScrollView.h 2013-04-26 15:13:02 UTC (rev 149185)
+++ trunk/Source/WebCore/platform/ScrollView.h 2013-04-26 15:14:59 UTC (rev 149186)
@@ -39,10 +39,6 @@
@protocol WebCoreFrameScrollView;
#endif
-#if PLATFORM(WX)
-class wxScrollWinEvent;
-#endif
-
namespace WebCore {
class HostWindow;
@@ -412,16 +408,6 @@
private:
NSScrollView<WebCoreFrameScrollView>* scrollView() const;
#endif
-
-#if PLATFORM(WX)
-public:
- virtual void setPlatformWidget(wxWindow*);
- void adjustScrollbars(int x = -1, int y = -1, bool refresh = true);
-private:
- class ScrollViewPrivate;
- ScrollViewPrivate* m_data;
-#endif
-
}; // class ScrollView
inline ScrollView* toScrollView(Widget* widget)
Modified: trunk/Source/WebCore/platform/Widget.h (149185 => 149186)
--- trunk/Source/WebCore/platform/Widget.h 2013-04-26 15:13:02 UTC (rev 149185)
+++ trunk/Source/WebCore/platform/Widget.h 2013-04-26 15:14:59 UTC (rev 149186)
@@ -68,11 +68,6 @@
typedef void* PlatformWidget;
#endif
-#if PLATFORM(WX)
-class wxWindow;
-typedef wxWindow* PlatformWidget;
-#endif
-
#if PLATFORM(EFL)
#if USE(EO)
typedef struct _Eo Evas_Object;
Modified: trunk/Source/WebCore/platform/win/SharedTimerWin.cpp (149185 => 149186)
--- trunk/Source/WebCore/platform/win/SharedTimerWin.cpp 2013-04-26 15:13:02 UTC (rev 149185)
+++ trunk/Source/WebCore/platform/win/SharedTimerWin.cpp 2013-04-26 15:14:59 UTC (rev 149186)
@@ -33,13 +33,6 @@
#include <wtf/Assertions.h>
#include <wtf/CurrentTime.h>
-// Note: wx headers set defines that affect the configuration of windows.h
-// so we must include the wx header first to get unicode versions of functions,
-// etc.
-#if PLATFORM(WX)
-#include <wx/wx.h>
-#endif
-
#include "WindowsExtras.h"
#include <mmsystem.h>
