[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
abecsi at webkit.org
abecsi at webkit.org
Wed Dec 22 11:55:45 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 56b4faa2fbc9bfc7d8ccec030ed20b8a6b9a02b4
Author: abecsi at webkit.org <abecsi at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Aug 11 15:33:54 2010 +0000
2010-08-11 Balazs Kelemen <kb at inf.u-szeged.hu>
Unreviewed build fix.
[Qt] Update WebKit2 build environment, add stub implementation of SharedMemory.
* DerivedSources.pro:
* Platform/qt/SharedMemoryQt.cpp: Added.
(WebKit::SharedMemory::Handle::Handle):
(WebKit::SharedMemory::Handle::~Handle):
(WebKit::SharedMemory::Handle::encode):
(WebKit::SharedMemory::Handle::decode):
(WebKit::SharedMemory::create):
(WebKit::SharedMemory::~SharedMemory):
(WebKit::SharedMemory::createHandle):
(WebKit::SharedMemory::systemPageSize):
* WebKit2.pro:
* WebKit2Prefix.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65158 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index e9b1dcf..7a05293 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,22 @@
+2010-08-11 Balazs Kelemen <kb at inf.u-szeged.hu>
+
+ Unreviewed build fix.
+
+ [Qt] Update WebKit2 build environment, add stub implementation of SharedMemory.
+
+ * DerivedSources.pro:
+ * Platform/qt/SharedMemoryQt.cpp: Added.
+ (WebKit::SharedMemory::Handle::Handle):
+ (WebKit::SharedMemory::Handle::~Handle):
+ (WebKit::SharedMemory::Handle::encode):
+ (WebKit::SharedMemory::Handle::decode):
+ (WebKit::SharedMemory::create):
+ (WebKit::SharedMemory::~SharedMemory):
+ (WebKit::SharedMemory::createHandle):
+ (WebKit::SharedMemory::systemPageSize):
+ * WebKit2.pro:
+ * WebKit2Prefix.h:
+
2010-08-11 Mark Rowe <mrowe at apple.com>
Build fix. Update references to StringHash.h.
diff --git a/WebKit2/DerivedSources.pro b/WebKit2/DerivedSources.pro
index 9bf2b68..7b39acb 100644
--- a/WebKit2/DerivedSources.pro
+++ b/WebKit2/DerivedSources.pro
@@ -7,6 +7,7 @@ WEBCORE_HEADERS_FOR_WEBKIT2 += \
bindings/js/DOMWrapperWorld.h \
bindings/js/GCController.h \
bindings/js/JSPluginElementFunctions.h \
+ bindings/js/ScriptController.h \
bridge/IdentifierRep.h \
bridge/npruntime_internal.h \
config.h \
@@ -15,15 +16,18 @@ WEBCORE_HEADERS_FOR_WEBKIT2 += \
dom/KeyboardEvent.h \
dom/Node.h \
dom/Range.h \
+ dom/UserTypingGestureIndicator.h \
editing/EditCommand.h \
editing/EditorInsertAction.h \
editing/TextAffinity.h \
history/BackForwardControllerClient.h \
history/BackForwardList.h \
history/HistoryItem.h \
+ html/HTMLInputElement.h \
html/HTMLFormElement.h \
html/HTMLFrameOwnerElement.h \
html/HTMLPlugInElement.h \
+ html/HTMLTextAreaElement.h \
inspector/InspectorClient.h \
loader/appcache/ApplicationCacheStorage.h \
loader/Cache.h \
@@ -52,6 +56,7 @@ WEBCORE_HEADERS_FOR_WEBKIT2 += \
page/SecurityOrigin.h \
page/Settings.h \
page/WindowFeatures.h \
+ page/ZoomMode.h \
platform/Cursor.h \
platform/FileChooser.h \
platform/FileSystem.h \
@@ -65,6 +70,7 @@ WEBCORE_HEADERS_FOR_WEBKIT2 += \
platform/graphics/IntSize.h \
platform/HostWindow.h \
platform/KURL.h \
+ platform/LinkHash.h \
platform/LocalizationStrategy.h \
platform/MIMETypeRegistry.h \
platform/network/android/ResourceError.h \
@@ -82,7 +88,6 @@ WEBCORE_HEADERS_FOR_WEBKIT2 += \
platform/SearchPopupMenu.h \
platform/SharedBuffer.h \
platform/text/PlatformString.h \
- platform/text/StringHash.h \
platform/Widget.h \
platform/win/BitmapInfo.h \
platform/WindowsKeyboardCodes.h \
@@ -97,8 +102,11 @@ WEBCORE_HEADERS_FOR_WEBKIT2 += \
rendering/RenderTreeAsText.h \
WEBCORE_GENERATED_HEADERS_FOR_WEBKIT2 += \
+ $$OUTPUT_DIR/WebCore/generated/HTMLNames.h \
+ $$OUTPUT_DIR/WebCore/generated/JSCSSStyleDeclaration.h \
+ $$OUTPUT_DIR/WebCore/generated/JSDOMWindow.h \
$$OUTPUT_DIR/WebCore/generated/JSElement.h \
- $$OUTPUT_DIR/WebCore/generated/JSCSSStyleDeclaration.h
+ $$OUTPUT_DIR/WebCore/generated/JSHTMLElement.h \
JSC_HEADERS_FOR_WEBKIT2 += \
API/APICast.h \
@@ -113,6 +121,7 @@ JSC_HEADERS_FOR_WEBKIT2 += \
runtime/JSObjectWithGlobalObject.h \
runtime/ObjectPrototype.h \
runtime/Protect.h \
+ parser/SourceCode.h \
wtf/Platform.h \
wtf/text/StringHash.h \
diff --git a/WebKit2/Platform/qt/SharedMemoryQt.cpp b/WebKit2/Platform/qt/SharedMemoryQt.cpp
new file mode 100644
index 0000000..087a2ea
--- /dev/null
+++ b/WebKit2/Platform/qt/SharedMemoryQt.cpp
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2010 Apple 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:
+ * 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 INC. 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 INC. 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 "SharedMemory.h"
+
+#include "NotImplemented.h"
+
+namespace WebKit {
+
+SharedMemory::Handle::Handle()
+{
+ notImplemented();
+}
+
+SharedMemory::Handle::~Handle()
+{
+ notImplemented();
+}
+
+void SharedMemory::Handle::encode(CoreIPC::ArgumentEncoder* encoder) const
+{
+ notImplemented();
+}
+
+bool SharedMemory::Handle::decode(CoreIPC::ArgumentDecoder* decoder, Handle& handle)
+{
+ notImplemented();
+ return false;
+}
+
+PassRefPtr<SharedMemory> SharedMemory::create(size_t size)
+{
+ notImplemented();
+ return 0;
+}
+
+PassRefPtr<SharedMemory> SharedMemory::create(const Handle& handle, Protection protection)
+{
+ notImplemented();
+ return 0;
+}
+
+SharedMemory::~SharedMemory()
+{
+ notImplemented();
+}
+
+bool SharedMemory::createHandle(Handle& handle, Protection protection)
+{
+ notImplemented();
+ return false;
+}
+
+unsigned SharedMemory::systemPageSize()
+{
+ static unsigned pageSize = 0;
+
+ return pageSize;
+}
+
+} // namespace WebKit
diff --git a/WebKit2/WebKit2.pro b/WebKit2/WebKit2.pro
index 70e2320..4ce32b2 100644
--- a/WebKit2/WebKit2.pro
+++ b/WebKit2/WebKit2.pro
@@ -17,6 +17,7 @@ QT += network
OBJECTS_DIR = obj/debug
} else { # Release
OBJECTS_DIR = obj/release
+ DEFINES += NDEBUG
}
INCLUDEPATH = \
@@ -116,8 +117,10 @@ INCLUDEPATH = \
UIProcess/qt \
WebProcess \
WebProcess/InjectedBundle \
+ WebProcess/InjectedBundle/DOM \
WebProcess/InjectedBundle/API/c \
WebProcess/Plugins \
+ WebProcess/Plugins/Netscape \
WebProcess/WebCoreSupport \
WebProcess/WebPage \
$$INCLUDEPATH
@@ -140,8 +143,10 @@ HEADERS += \
Platform/CoreIPC/Connection.h \
Platform/CoreIPC/CoreIPCMessageKinds.h \
Platform/CoreIPC/MessageID.h \
+ Platform/Module.h \
Platform/PlatformProcessIdentifier.h \
Platform/RunLoop.h \
+ Platform/SharedMemory.h \
Platform/WorkItem.h \
Platform/WorkQueue.h \
Shared/CoreIPCSupport/DrawingAreaMessageKinds.h \
@@ -149,8 +154,10 @@ HEADERS += \
Shared/CoreIPCSupport/WebPageMessageKinds.h \
Shared/CoreIPCSupport/WebPageProxyMessageKinds.h \
Shared/CoreIPCSupport/WebProcessMessageKinds.h \
+ Shared/DrawingAreaBase.h \
Shared/NotImplemented.h \
Shared/qt/WebEventFactoryQt.h \
+ Shared/VisitedLinkTable.h \
Shared/WebEventConversion.h \
Shared/WebEvent.h \
Shared/WebNavigationDataStore.h \
@@ -184,6 +191,7 @@ HEADERS += \
UIProcess/ProcessModel.h \
UIProcess/API/qt/ClientImpl.h \
UIProcess/ResponsivenessTimer.h \
+ UIProcess/VisitedLinkProvider.h \
UIProcess/WebContext.h \
UIProcess/WebContextInjectedBundleClient.h \
UIProcess/WebFramePolicyListenerProxy.h \
@@ -200,8 +208,11 @@ HEADERS += \
UIProcess/WebUIClient.h \
WebProcess/InjectedBundle/API/c/WKBundleBase.h \
WebProcess/InjectedBundle/API/c/WKBundlePage.h \
+ WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.h \
WebProcess/InjectedBundle/InjectedBundle.h \
+ WebProcess/InjectedBundle/InjectedBundlePageFormClient.h \
WebProcess/InjectedBundle/InjectedBundlePageUIClient.h \
+ WebProcess/InjectedBundle/InjectedBundleScriptWorld.h \
WebProcess/Plugins/JSNPObject.h \
WebProcess/Plugins/JSNPMethod.h \
WebProcess/Plugins/NPJSObject.h \
@@ -210,6 +221,10 @@ HEADERS += \
WebProcess/Plugins/Plugin.h \
WebProcess/Plugins/PluginController.h \
WebProcess/Plugins/PluginView.h \
+ WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp \
+ WebProcess/Plugins/Netscape/NetscapePlugin.h \
+ WebProcess/Plugins/Netscape/NetscapePluginModule.h \
+ WebProcess/Plugins/Netscape/NetscapePluginStream.h \
WebProcess/WebCoreSupport/WebChromeClient.h \
WebProcess/WebCoreSupport/WebContextMenuClient.h \
WebProcess/WebCoreSupport/WebDragClient.h \
@@ -231,11 +246,16 @@ SOURCES += \
Platform/CoreIPC/Attachment.cpp \
Platform/CoreIPC/Connection.cpp \
Platform/CoreIPC/qt/ConnectionQt.cpp \
+ Platform/Module.cpp \
Platform/RunLoop.cpp \
Platform/WorkQueue.cpp \
+ Platform/qt/ModuleQt.cpp \
Platform/qt/RunLoopQt.cpp \
+ Platform/qt/SharedMemoryQt.cpp \
Platform/qt/WorkQueueQt.cpp \
+ Shared/DrawingAreaBase.cpp \
Shared/ImmutableArray.cpp \
+ Shared/VisitedLinkTable.cpp \
Shared/WebEventConversion.cpp \
Shared/WebPreferencesStore.cpp \
Shared/qt/UpdateChunk.cpp \
@@ -261,6 +281,7 @@ SOURCES += \
UIProcess/Launcher/ProcessLauncher.cpp \
UIProcess/Launcher/qt/ProcessLauncherQt.cpp \
UIProcess/ResponsivenessTimer.cpp \
+ UIProcess/VisitedLinkProvider.cpp \
UIProcess/WebBackForwardList.cpp \
UIProcess/WebBackForwardListItem.cpp \
UIProcess/WebContext.cpp \
@@ -277,10 +298,13 @@ SOURCES += \
UIProcess/WebProcessManager.cpp \
UIProcess/WebProcessProxy.cpp \
UIProcess/WebUIClient.cpp \
+ WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp \
WebProcess/InjectedBundle/InjectedBundle.cpp \
WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp \
+ WebProcess/InjectedBundle/InjectedBundlePageFormClient.cpp \
WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp \
WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp \
+ WebProcess/InjectedBundle/InjectedBundleScriptWorld.cpp \
WebProcess/InjectedBundle/qt/InjectedBundleQt.cpp \
WebProcess/Plugins/JSNPObject.cpp \
WebProcess/Plugins/JSNPMethod.cpp \
@@ -289,6 +313,10 @@ SOURCES += \
WebProcess/Plugins/NPRuntimeUtilities.cpp \
WebProcess/Plugins/Plugin.cpp \
WebProcess/Plugins/PluginView.cpp \
+ WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp \
+ WebProcess/Plugins/Netscape/NetscapePlugin.cpp \
+ WebProcess/Plugins/Netscape/NetscapePluginModule.cpp \
+ WebProcess/Plugins/Netscape/NetscapePluginStream.cpp \
WebProcess/WebCoreSupport/WebChromeClient.cpp \
WebProcess/WebCoreSupport/WebContextMenuClient.cpp \
WebProcess/WebCoreSupport/WebDragClient.cpp \
diff --git a/WebKit2/WebKit2Prefix.h b/WebKit2/WebKit2Prefix.h
index 6685438..f38777a 100644
--- a/WebKit2/WebKit2Prefix.h
+++ b/WebKit2/WebKit2Prefix.h
@@ -34,6 +34,9 @@
#define WTF_USE_JSC 1
#define WTF_USE_V8 0
+#define JS_EXPORTDATA
+#define JS_EXPORTCLASS
+
#elif defined(__APPLE__)
#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list