Diff
Modified: trunk/Source/WTF/ChangeLog (149177 => 149178)
--- trunk/Source/WTF/ChangeLog 2013-04-26 13:03:23 UTC (rev 149177)
+++ trunk/Source/WTF/ChangeLog 2013-04-26 13:07:25 UTC (rev 149178)
@@ -1,3 +1,23 @@
+2013-04-26 Andreas Kling <[email protected]>
+
+ Remove wxWebKit from WTF.
+ <http://webkit.org/b/115249>
+
+ Reviewed by Antti Koivisto.
+
+ * wscript: Removed.
+ * wtf/ArrayBufferView.h:
+ (ArrayBufferView):
+ * wtf/CurrentTime.cpp:
+ * wtf/DisallowCType.h:
+ * wtf/ExportMacros.h:
+ * wtf/FeatureDefines.h:
+ * wtf/Platform.h:
+ * wtf/text/WTFString.h:
+ (String):
+ * wtf/wx/MainThreadWx.cpp: Removed.
+ * wtf/wx/StringWx.cpp: Removed.
+
2013-04-25 Filip Pizlo <[email protected]>
Unreviewed, roll out http://trac.webkit.org/changeset/148999
Deleted: trunk/Source/WTF/wscript (149177 => 149178)
--- trunk/Source/WTF/wscript 2013-04-26 13:03:23 UTC (rev 149177)
+++ trunk/Source/WTF/wscript 2013-04-26 13:07:25 UTC (rev 149178)
@@ -1,66 +0,0 @@
-#! /usr/bin/env python
-
-# Copyright (C) 2012 Kevin Ollivier All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. 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.
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. 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.
-#
-# WTF build script for the waf build system
-
-import commands
-
-from settings import *
-
-def build(bld):
-
- import Options
-
- wtf_excludes = []
- wtf_exclude_patterns = get_port_excludes(Options.options.port)
- wtf_exclude_patterns.append('*None.cpp')
-
- if Options.options.port == "wx":
- if building_on_win32:
- wtf_excludes += ['OSAllocatorPosix.cpp', 'ThreadingPthreads.cpp']
-
- bld.env.LIBDIR = output_dir
- full_dirs = get_dirs_for_features(wtf_dir, features=[Options.options.port.lower()], dirs=wtf_dirs)
- abs_dirs = []
- for adir in full_dirs:
- abs_dirs.append(os.path.join(wtf_dir, adir))
-
- wtf_excludes.extend(get_excludes_in_dirs(abs_dirs, wtf_exclude_patterns))
-
- includes = common_includes + full_dirs + [output_dir]
-
- if sys.platform.startswith('darwin'):
- includes.append(os.path.join(wtf_dir, 'icu'))
-
- wtf = bld.new_task_gen(
- features = 'cc cxx cstaticlib',
- includes = '. .. assembler ../WTF ' + ' '.join(includes),
- defines = ['BUILDING_WTF'],
- target = 'wtf',
- uselib = 'WX ICU ' + get_config(),
- uselib_local = '',
- install_path = output_dir)
-
- wtf.find_sources_in_dirs(full_dirs, excludes = wtf_excludes)
Modified: trunk/Source/WTF/wtf/ArrayBufferView.h (149177 => 149178)
--- trunk/Source/WTF/wtf/ArrayBufferView.h 2013-04-26 13:03:23 UTC (rev 149177)
+++ trunk/Source/WTF/wtf/ArrayBufferView.h 2013-04-26 13:07:25 UTC (rev 149178)
@@ -36,7 +36,7 @@
namespace WTF {
-class WTF_EXPORT_PRIVATE_RTTI ArrayBufferView : public RefCounted<ArrayBufferView> {
+class ArrayBufferView : public RefCounted<ArrayBufferView> {
public:
enum ViewType {
TypeInt8,
@@ -69,10 +69,10 @@
virtual unsigned byteLength() const = 0;
- WTF_EXPORT_PRIVATE_NO_RTTI virtual ~ArrayBufferView();
+ WTF_EXPORT_PRIVATE virtual ~ArrayBufferView();
protected:
- WTF_EXPORT_PRIVATE_NO_RTTI ArrayBufferView(PassRefPtr<ArrayBuffer>, unsigned byteOffset);
+ WTF_EXPORT_PRIVATE ArrayBufferView(PassRefPtr<ArrayBuffer>, unsigned byteOffset);
inline bool setImpl(ArrayBufferView*, unsigned byteOffset);
@@ -122,7 +122,7 @@
*numElements = std::min(remainingElements, *numElements);
}
- WTF_EXPORT_PRIVATE_NO_RTTI virtual void neuter();
+ WTF_EXPORT_PRIVATE virtual void neuter();
// This is the address of the ArrayBuffer's storage, plus the byte offset.
void* m_baseAddress;
Modified: trunk/Source/WTF/wtf/CurrentTime.cpp (149177 => 149178)
--- trunk/Source/WTF/wtf/CurrentTime.cpp 2013-04-26 13:03:23 UTC (rev 149177)
+++ trunk/Source/WTF/wtf/CurrentTime.cpp 2013-04-26 13:07:25 UTC (rev 149178)
@@ -49,8 +49,6 @@
#include <stdint.h>
#include <time.h>
-#elif PLATFORM(WX)
-#include <wx/datetime.h>
#elif PLATFORM(EFL)
#include <Ecore.h>
#else
@@ -237,14 +235,6 @@
return static_cast<double>(now.tv_sec) + static_cast<double>(now.tv_usec / 1000000.0);
}
-#elif PLATFORM(WX)
-
-double currentTime()
-{
- wxDateTime now = wxDateTime::UNow();
- return (double)now.GetTicks() + (double)(now.GetMillisecond() / 1000.0);
-}
-
#elif PLATFORM(EFL)
double currentTime()
Modified: trunk/Source/WTF/wtf/DisallowCType.h (149177 => 149178)
--- trunk/Source/WTF/wtf/DisallowCType.h 2013-04-26 13:03:23 UTC (rev 149177)
+++ trunk/Source/WTF/wtf/DisallowCType.h 2013-04-26 13:07:25 UTC (rev 149178)
@@ -41,7 +41,7 @@
// or <glib/gi18n-lib.h>, which in turn include <xlocale/_ctype.h> which uses
// isacii().
#include <wtf/Platform.h>
-#if !PLATFORM(QT) && !PLATFORM(WX) && !(OS(DARWIN) && PLATFORM(GTK)) && !OS(QNX) && !defined(_LIBCPP_VERSION)
+#if !PLATFORM(QT) && !(OS(DARWIN) && PLATFORM(GTK)) && !OS(QNX) && !defined(_LIBCPP_VERSION)
#include <ctype.h>
Modified: trunk/Source/WTF/wtf/ExportMacros.h (149177 => 149178)
--- trunk/Source/WTF/wtf/ExportMacros.h 2013-04-26 13:03:23 UTC (rev 149177)
+++ trunk/Source/WTF/wtf/ExportMacros.h 2013-04-26 13:07:25 UTC (rev 149178)
@@ -68,7 +68,7 @@
#endif
-#if defined(BUILDING_WTF) || defined(STATICALLY_LINKED_WITH_WTF) || (PLATFORM(WX) && defined(BUILDING_JavaScriptCore))
+#if defined(BUILDING_WTF) || defined(STATICALLY_LINKED_WITH_WTF)
#define WTF_IS_LINKED_IN_SAME_BINARY 1
#endif
@@ -131,16 +131,6 @@
#define WTF_EXPORT_PRIVATE WTF_IMPORT
#endif
-// wxWebKit uses RTTI because wx itself does, so use a special macro for
-// extra exports it needs.
-#if PLATFORM(WX)
-#define WTF_EXPORT_PRIVATE_RTTI WTF_EXPORT_PRIVATE
-#define WTF_EXPORT_PRIVATE_NO_RTTI
-#else
-#define WTF_EXPORT_PRIVATE_RTTI
-#define WTF_EXPORT_PRIVATE_NO_RTTI WTF_EXPORT_PRIVATE
-#endif
-
#if PLATFORM(WIN)
#define WTF_EXPORT_STRING_API
#else
Modified: trunk/Source/WTF/wtf/FeatureDefines.h (149177 => 149178)
--- trunk/Source/WTF/wtf/FeatureDefines.h 2013-04-26 13:03:23 UTC (rev 149177)
+++ trunk/Source/WTF/wtf/FeatureDefines.h 2013-04-26 13:07:25 UTC (rev 149178)
@@ -231,23 +231,6 @@
#endif /* PLATFORM(WIN_CAIRO) */
-/* --------- WX port (Mac OS and Windows) --------- */
-#if PLATFORM(WX)
-
-#if OS(DARWIN)
-#if !defined(ENABLE_WEB_ARCHIVE)
-#define ENABLE_WEB_ARCHIVE 1
-#endif
-#endif
-
-#if OS(UNIX)
-#if !defined(ENABLE_PLUGIN_PACKAGE_SIMPLE_HASH)
-#define ENABLE_PLUGIN_PACKAGE_SIMPLE_HASH 1
-#endif
-#endif
-
-#endif /* PLATFORM(WX) */
-
/* --------- EFL port (Unix) --------- */
#if PLATFORM(EFL)
Modified: trunk/Source/WTF/wtf/Platform.h (149177 => 149178)
--- trunk/Source/WTF/wtf/Platform.h 2013-04-26 13:03:23 UTC (rev 149177)
+++ trunk/Source/WTF/wtf/Platform.h 2013-04-26 13:07:25 UTC (rev 149178)
@@ -428,7 +428,6 @@
/* FIXME: these are all mixes of OS, operating environment and policy choices. */
/* PLATFORM(QT) */
-/* PLATFORM(WX) */
/* PLATFORM(EFL) */
/* PLATFORM(GTK) */
/* PLATFORM(BLACKBERRY) */
@@ -436,8 +435,6 @@
/* PLATFORM(WIN) */
#if defined(BUILDING_QT__)
#define WTF_PLATFORM_QT 1
-#elif defined(BUILDING_WX__)
-#define WTF_PLATFORM_WX 1
#elif defined(BUILDING_EFL__)
#define WTF_PLATFORM_EFL 1
#elif defined(BUILDING_GTK__)
@@ -560,20 +557,6 @@
#define WTF_USE_CFURLCACHE 1
#endif
-#if PLATFORM(WX)
-#if !CPU(PPC)
-#if !defined(ENABLE_ASSEMBLER)
-#define ENABLE_ASSEMBLER 1
-#endif
-#define ENABLE_JIT 1
-#endif
-#define ENABLE_GLOBAL_FASTMALLOC_NEW 0
-#define ENABLE_LLINT 0
-#if OS(DARWIN)
-#define WTF_USE_CF 1
-#endif
-#endif
-
#if !defined(HAVE_ACCESSIBILITY)
#if PLATFORM(IOS) || PLATFORM(MAC) || PLATFORM(WIN) || PLATFORM(GTK) || PLATFORM(EFL)
#define HAVE_ACCESSIBILITY 1
@@ -928,7 +911,7 @@
since most ports try to support sub-project independence, adding new headers
to WTF causes many ports to break, and so this way we can address the build
breakages one port at a time. */
-#if !defined(WTF_USE_EXPORT_MACROS) && (PLATFORM(MAC) || PLATFORM(QT) || PLATFORM(WX))
+#if !defined(WTF_USE_EXPORT_MACROS) && (PLATFORM(MAC) || PLATFORM(QT))
#define WTF_USE_EXPORT_MACROS 1
#endif
Modified: trunk/Source/WTF/wtf/text/WTFString.h (149177 => 149178)
--- trunk/Source/WTF/wtf/text/WTFString.h 2013-04-26 13:03:23 UTC (rev 149177)
+++ trunk/Source/WTF/wtf/text/WTFString.h 2013-04-26 13:07:25 UTC (rev 149178)
@@ -38,10 +38,6 @@
QT_END_NAMESPACE
#endif
-#if PLATFORM(WX)
-class wxString;
-#endif
-
#if PLATFORM(BLACKBERRY)
namespace BlackBerry {
namespace Platform {
@@ -431,11 +427,6 @@
WTF_EXPORT_STRING_API operator QString() const;
#endif
-#if PLATFORM(WX)
- WTF_EXPORT_PRIVATE String(const wxString&);
- WTF_EXPORT_PRIVATE operator wxString() const;
-#endif
-
#if PLATFORM(BLACKBERRY)
String(const BlackBerry::Platform::String&);
operator BlackBerry::Platform::String() const;
Deleted: trunk/Source/WTF/wtf/wx/MainThreadWx.cpp (149177 => 149178)
--- trunk/Source/WTF/wtf/wx/MainThreadWx.cpp 2013-04-26 13:03:23 UTC (rev 149177)
+++ trunk/Source/WTF/wtf/wx/MainThreadWx.cpp 2013-04-26 13:07:25 UTC (rev 149178)
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2007 Kevin Ollivier
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. Neither the name of Apple Computer, Inc. ("Apple") 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 APPLE AND ITS 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 APPLE OR ITS 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.
- */
-
-#include "config.h"
-#include "MainThread.h"
-
-#include <wx/defs.h>
-#include <wx/app.h>
-#include <wx/event.h>
-
-const wxEventType wxEVT_CALL_AFTER = wxNewEventType();
-
-class wxCallAfter : public wxEvtHandler
-{
-public:
- wxCallAfter()
- : wxEvtHandler()
- {
- wxTheApp->Connect(-1, -1, wxEVT_CALL_AFTER, wxCommandEventHandler(wxCallAfter::OnCallback));
- wxCommandEvent event(wxEVT_CALL_AFTER);
- wxPostEvent(wxTheApp, event);
- }
-
- void OnCallback(wxCommandEvent& event)
- {
- WTF::dispatchFunctionsFromMainThread();
- }
-};
-
-namespace WTF {
-
-void initializeMainThreadPlatform()
-{
-}
-
-void scheduleDispatchFunctionsOnMainThread()
-{
- wxCallAfter();
-}
-
-} // namespace WTF
Deleted: trunk/Source/WTF/wtf/wx/StringWx.cpp (149177 => 149178)
--- trunk/Source/WTF/wtf/wx/StringWx.cpp 2013-04-26 13:03:23 UTC (rev 149177)
+++ trunk/Source/WTF/wtf/wx/StringWx.cpp 2013-04-26 13:07:25 UTC (rev 149178)
@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2007 Vaclav Slavik, Kevin Ollivier <[email protected]>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. 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.
- */
-
-#include "config.h"
-
-// The wx headers must come first in this case, because the wtf/text headers
-// import windows.h, and we need to allow the wx headers to set its configuration
-// first.
-#include <wx/defs.h>
-#include <wx/string.h>
-
-#include <wtf/text/CString.h>
-#include <wtf/text/WTFString.h>
-
-namespace WTF {
-
-String::String(const wxString& wxstr)
-{
-#if !wxUSE_UNICODE
- #error "This code only works in Unicode build of wxWidgets"
-#endif
-
-#if SIZEOF_WCHAR_T == 2
-
- const UChar* str = wxstr.wc_str();
- const size_t len = wxstr.length();
-
-#else // SIZEOF_WCHAR_T == 4
-
- // NB: we can't simply use wxstr.mb_str(wxMBConvUTF16()) here because
- // the number of characters in UTF-16 encoding of the string may differ
- // from the number of UTF-32 values and we can't get the length from
- // returned buffer:
-
-#if defined(wxUSE_UNICODE_UTF8) && wxUSE_UNICODE_UTF8
- // in wx3's UTF8 mode, wc_str() returns a buffer, not raw pointer
- wxWCharBuffer wideString(wxstr.wc_str());
-#else
- const wxChar *wideString = wxstr.wc_str();
-#endif
- size_t wideLength = wxstr.length();
-
- wxMBConvUTF16 conv;
-
- const size_t utf16bufLen = conv.FromWChar(0, 0, wideString, wideLength);
- wxCharBuffer utf16buf(utf16bufLen);
-
- const UChar* str = (const UChar*)utf16buf.data();
- size_t len = conv.FromWChar(utf16buf.data(), utf16bufLen, wideString, wideLength) / 2;
-
-#endif // SIZEOF_WCHAR_T == 2
-
- m_impl = StringImpl::create(str, len);
-
-}
-
-String::operator wxString() const
-{
- return wxString(utf8().data(), wxConvUTF8);
-}
-
-} // namespace WTF
