[SCM] WebKit Debian packaging branch, debian/unstable, updated. 0+svn29752-1-1645-gd3fe478
Mike Hommey
glandium at debian.org
Sat Apr 12 19:56:55 UTC 2008
The following commit has been merged in the debian/unstable branch:
commit 9105090b24a75c8f477bd37d94eb6f1f05f2431c
Merge: caefb46b1d1c9ac2ab78d4f37b86d46fb40eac80 a90e8c53d5172449eec9692d5614a0ea6c290a55
Author: Mike Hommey <glandium at debian.org>
Date: Sat Apr 12 11:23:42 2008 +0200
Merge branch 'upstream' into debian/unstable
Conflicts:
WebCore/dom/Position.cpp
WebCore/editing/Selection.cpp
WebCore/editing/SelectionController.cpp
WebCore/editing/VisiblePosition.cpp
WebCore/loader/FTPDirectoryParser.cpp
WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
WebCore/platform/text/TextStream.cpp
WebCore/platform/text/TextCodecLatin1.cpp
WebCore/platform/text/TextCodecUserDefined.cpp
WebKitTools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp
diff --combined JavaScriptCore/wtf/ASCIICType.h
index 3c4489f,7d24f0e..b58c48a
--- a/JavaScriptCore/wtf/ASCIICType.h
+++ b/JavaScriptCore/wtf/ASCIICType.h
@@@ -1,5 -1,5 +1,5 @@@
/*
- * Copyright (C) 2007 Apple Inc. All rights reserved.
+ * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@@ -50,10 -50,10 +50,10 @@@ namespace WTF
#endif
inline bool isASCIIAlpha(int c) { return (c | 0x20) >= 'a' && (c | 0x20) <= 'z'; }
- inline bool isASCIIAlphanumeric(char c) { return c >= '0' && c <= '9' || (c | 0x20) >= 'a' && (c | 0x20) <= 'z'; }
- inline bool isASCIIAlphanumeric(unsigned short c) { return c >= '0' && c <= '9' || (c | 0x20) >= 'a' && (c | 0x20) <= 'z'; }
+ inline bool isASCIIAlphanumeric(char c) { return (c >= '0' && c <= '9') || ((c | 0x20) >= 'a' && (c | 0x20) <= 'z'); }
+ inline bool isASCIIAlphanumeric(unsigned short c) { return (c >= '0' && c <= '9') || ((c | 0x20) >= 'a' && (c | 0x20) <= 'z'); }
#if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED)
- inline bool isASCIIAlphanumeric(wchar_t c) { return c >= '0' && c <= '9' || (c | 0x20) >= 'a' && (c | 0x20) <= 'z'; }
+ inline bool isASCIIAlphanumeric(wchar_t c) { return (c >= '0' && c <= '9') || ((c | 0x20) >= 'a' && (c | 0x20) <= 'z'); }
#endif
inline bool isASCIIAlphanumeric(int c) { return c >= '0' && c <= '9' || (c | 0x20) >= 'a' && (c | 0x20) <= 'z'; }
@@@ -64,10 -64,10 +64,10 @@@
#endif
inline bool isASCIIDigit(int c) { return (c >= '0') & (c <= '9'); }
- inline bool isASCIIHexDigit(char c) { return c >= '0' && c <= '9' || (c | 0x20) >= 'a' && (c | 0x20) <= 'f'; }
- inline bool isASCIIHexDigit(unsigned short c) { return c >= '0' && c <= '9' || (c | 0x20) >= 'a' && (c | 0x20) <= 'f'; }
+ inline bool isASCIIHexDigit(char c) { return (c >= '0' && c <= '9') || ((c | 0x20) >= 'a' && (c | 0x20) <= 'f'); }
+ inline bool isASCIIHexDigit(unsigned short c) { return (c >= '0' && c <= '9') || ((c | 0x20) >= 'a' && (c | 0x20) <= 'f'); }
#if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED)
- inline bool isASCIIHexDigit(wchar_t c) { return c >= '0' && c <= '9' || (c | 0x20) >= 'a' && (c | 0x20) <= 'f'; }
+ inline bool isASCIIHexDigit(wchar_t c) { return (c >= '0' && c <= '9') || ((c | 0x20) >= 'a' && (c | 0x20) <= 'f'); }
#endif
inline bool isASCIIHexDigit(int c) { return c >= '0' && c <= '9' || (c | 0x20) >= 'a' && (c | 0x20) <= 'f'; }
@@@ -85,12 -85,25 +85,25 @@@
#endif
inline bool isASCIIUpper(int c) { return c >= 'A' && c <= 'Z'; }
- inline bool isASCIISpace(char c) { return c == '\t' || c == '\n' || c == '\v' || c =='\f' || c == '\r' || c == ' '; }
- inline bool isASCIISpace(unsigned short c) { return c == '\t' || c == '\n' || c == '\v' || c =='\f' || c == '\r' || c == ' '; }
+ /*
+ Statistics from a run of Apple's page load test for callers of isASCIISpace:
+
+ character count
+ --------- -----
+ non-spaces 689383
+ 20 space 294720
+ 0A \n 89059
+ 09 \t 28320
+ 0D \r 0
+ 0C \f 0
+ 0B \v 0
+ */
+ inline bool isASCIISpace(char c) { return c <= ' ' && (c == ' ' || (c <= 0xD && c >= 0x9)); }
+ inline bool isASCIISpace(unsigned short c) { return c <= ' ' && (c == ' ' || (c <= 0xD && c >= 0x9)); }
#if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED)
- inline bool isASCIISpace(wchar_t c) { return c == '\t' || c == '\n' || c == '\v' || c =='\f' || c == '\r' || c == ' '; }
+ inline bool isASCIISpace(wchar_t c) { return c <= ' ' && (c == ' ' || (c <= 0xD && c >= 0x9)); }
#endif
- inline bool isASCIISpace(int c) { return c == '\t' || c == '\n' || c == '\v' || c =='\f' || c == '\r' || c == ' '; }
+ inline bool isASCIISpace(int c) { return c <= ' ' && (c == ' ' || (c <= 0xD && c >= 0x9)); }
inline char toASCIILower(char c) { return c | ((c >= 'A' && c <= 'Z') << 5); }
inline unsigned short toASCIILower(unsigned short c) { return c | ((c >= 'A' && c <= 'Z') << 5); }
@@@ -106,6 -119,13 +119,13 @@@
#endif
inline int toASCIIUpper(int c) { return static_cast<int>(c & ~((c >= 'a' && c <= 'z') << 5)); }
+ inline int toASCIIHexValue(char c) { ASSERT(isASCIIHexDigit(c)); return c < 'A' ? c - '0' : (c - 'A' + 10) & 0xF; }
+ inline int toASCIIHexValue(unsigned short c) { ASSERT(isASCIIHexDigit(c)); return c < 'A' ? c - '0' : (c - 'A' + 10) & 0xF; }
+ #if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED)
+ inline int toASCIIHexValue(wchar_t c) { ASSERT(isASCIIHexDigit(c)); return c < 'A' ? c - '0' : (c - 'A' + 10) & 0xF; }
+ #endif
+ inline int toASCIIHexValue(int c) { ASSERT(isASCIIHexDigit(c)); return c < 'A' ? c - '0' : (c - 'A' + 10) & 0xF; }
+
}
#endif
diff --combined WebCore/WebCore.pro
index 5cf99ad,f108df6..b02d78f
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@@ -15,6 -15,7 +15,7 @@@ CONFIG(QTDIR_build)
GENERATED_SOURCES_DIR = $$PWD/generated
include($$QT_SOURCE_TREE/src/qbase.pri)
PRECOMPILED_HEADER = $$PWD/../WebKit/qt/WebKit_pch.h
+ DEFINES *= NDEBUG
}
isEmpty(GENERATED_SOURCES_DIR):GENERATED_SOURCES_DIR = tmp
@@@ -29,8 -30,8 +30,8 @@@ INCLUDEPATH += $$GENERATED_SOURCES_DI
}
DEPENDPATH += css dom loader editing history html \
- loader page platform platform/graphics platform/network platform/text plugins rendering xml \
- bindings/js
+ loader/icon page platform platform/graphics platform/network platform/text plugins rendering xml \
+ bindings/js bridge bridge/c bridge/qt
include($$OUTPUT_DIR/config.pri)
@@@ -68,6 -69,7 +69,7 @@@ win32-g++
gtk-port: PKGCONFIG += gthread-2.0
# Optional components (look for defs in config.h and included files!)
+ !contains(DEFINES, ENABLE_CROSS_DOCUMENT_MESSAGING=.): DEFINES += ENABLE_CROSS_DOCUMENT_MESSAGING=1
!contains(DEFINES, ENABLE_DATABASE=.): DEFINES += ENABLE_DATABASE=1
!contains(DEFINES, ENABLE_ICONDATABASE=.): DEFINES += ENABLE_ICONDATABASE=1
!contains(DEFINES, ENABLE_XPATH=.): DEFINES += ENABLE_XPATH=1
@@@ -75,7 -77,8 +77,8 @@@ gtk-port:!contains(DEFINES, ENABLE_XSLT
#!contains(DEFINES, ENABLE_XBL=.): DEFINES += ENABLE_XBL=1
qt-port: !contains(DEFINES, ENABLE_SVG=.): DEFINES += ENABLE_SVG=1
gtk-port:DEFINES += ENABLE_SVG=0
- DEFINES += ENABLE_VIDEO=0
+ qt-port:contains(QT_CONFIG, phonon):DEFINES += ENABLE_VIDEO=1
+ else:DEFINES += ENABLE_VIDEO=0
DEFINES += WTF_CHANGES=1
@@@ -126,7 -129,8 +129,8 @@@ INCLUDEPATH +=
$$PWD/loader/qt \
$$PWD/page/qt \
$$PWD/../WebKit/qt/WebCoreSupport \
- $$PWD/../WebKit/qt/Api
+ $$PWD/../WebKit/qt/Api \
+ $$PWD/bridge/qt
DEPENDPATH += editing/qt history/qt loader/qt page/qt \
platform/graphics/qt ../WebKit/qt/Api ../WebKit/qt/WebCoreSupport
@@@ -135,6 -139,10 +139,10 @@@
}
gtk-port {
+ hildon {
+ DEFINES += MAEMO_CHANGES
+ PKGCONFIG += hildon-1
+ }
x11:plugins {
DEFINES += XP_UNIX
}
@@@ -154,8 -162,9 +162,9 @@@
$$PWD/platform/image-decoders/xbm \
$$PWD/loader/gtk \
$$PWD/page/gtk \
+ $$PWD/../WebKit/gtk \
$$PWD/../WebKit/gtk/WebCoreSupport \
- $$PWD/../WebKit/gtk/WebView
+ $$PWD/../WebKit/gtk/webkit
DEPENDPATH += \
platform/gtk \
@@@ -172,8 -181,9 +181,9 @@@
platform/image-decoders/xbm \
loader/gtk \
page/gtk \
+ ../WebKit/gtk \
../WebKit/gtk/WebCoreSupport \
- ../WebKit/gtk/WebView
+ ../WebKit/gtk/webkit
}
INCLUDEPATH += $$PWD \
@@@ -185,12 -195,15 +195,15 @@@
$$PWD/platform \
$$PWD/platform/network \
$$PWD/platform/graphics \
+ $$PWD/svg/animation \
$$PWD/svg/graphics \
$$PWD/svg/graphics/filters \
$$PWD/platform/sql \
$$PWD/platform/text \
$$PWD/storage \
- $$PWD/loader $$PWD/loader/icon \
+ $$PWD/loader \
+ $$PWD/loader/archive \
+ $$PWD/loader/icon \
$$PWD/css \
$$PWD/dom \
$$PWD/page \
@@@ -203,7 -216,10 +216,10 @@@
$$PWD/bindings/js \
$$PWD/svg \
$$PWD/platform/image-decoders \
- $$PWD/plugins
+ $$PWD/plugins \
+ $$PWD/bridge \
+ $$PWD/bridge/c \
+ $$PWD/bridge/qt
QT += network
lessThan(QT_MINOR_VERSION, 4): QT += xml
@@@ -237,14 -253,11 +253,11 @@@ SVGCSSVALUES = $$PWD/css/SVGCSSValueKey
STYLESHEETS_EMBED = $$PWD/css/html4.css
LUT_FILES += \
+ bindings/js/JSDOMWindowBase.cpp \
bindings/js/JSEventTargetBase.cpp \
- bindings/js/JSLocation.cpp \
+ bindings/js/JSRGBColor.cpp \
bindings/js/JSXMLHttpRequest.cpp \
- bindings/js/JSXSLTProcessor.cpp \
- bindings/js/kjs_css.cpp \
- bindings/js/kjs_events.cpp \
- bindings/js/kjs_navigator.cpp \
- bindings/js/kjs_window.cpp
+ bindings/js/JSXSLTProcessor.cpp
LUT_TABLE_FILES += \
bindings/js/JSHTMLInputElementBase.cpp
@@@ -270,6 -283,7 +283,7 @@@ IDL_BINDINGS +=
css/StyleSheetList.idl \
dom/Attr.idl \
dom/CharacterData.idl \
+ dom/Clipboard.idl \
dom/CDATASection.idl \
dom/Comment.idl \
dom/DocumentFragment.idl \
@@@ -285,7 -299,6 +299,6 @@@
# dom/EventListener.idl \
# dom/EventTarget.idl \
dom/KeyboardEvent.idl \
- dom/MessageEvent.idl \
dom/MouseEvent.idl \
dom/MutationEvent.idl \
dom/NamedNodeMap.idl \
@@@ -306,6 -319,7 +319,7 @@@
dom/WheelEvent.idl \
html/CanvasGradient.idl \
html/CanvasPattern.idl \
+ html/CanvasPixelArray.idl \
html/CanvasRenderingContext2D.idl \
html/HTMLAnchorElement.idl \
html/HTMLAppletElement.idl \
@@@ -367,12 -381,19 +381,19 @@@
html/HTMLTextAreaElement.idl \
html/HTMLTitleElement.idl \
html/HTMLUListElement.idl \
+ html/ImageData.idl \
page/BarInfo.idl \
page/Console.idl \
page/DOMSelection.idl \
page/DOMWindow.idl \
page/History.idl \
+ page/Location.idl \
page/Screen.idl \
+ page/Navigator.idl \
+ plugins/Plugin.idl \
+ plugins/MimeType.idl \
+ plugins/PluginArray.idl \
+ plugins/MimeTypeArray.idl \
xml/DOMParser.idl \
xml/XMLHttpRequestException.idl \
xml/XMLSerializer.idl
@@@ -381,18 -402,23 +402,23 @@@
SOURCES += \
bindings/js/GCController.cpp \
bindings/js/JSAttrCustom.cpp \
+ bindings/js/JSCanvasPixelArrayCustom.cpp \
bindings/js/JSCanvasRenderingContext2DCustom.cpp \
+ bindings/js/JSClipboardCustom.cpp \
bindings/js/JSCSSRuleCustom.cpp \
bindings/js/JSCSSStyleDeclarationCustom.cpp \
bindings/js/JSCSSValueCustom.cpp \
bindings/js/JSCustomVoidCallback.cpp \
bindings/js/JSCustomXPathNSResolver.cpp \
bindings/js/JSDocumentCustom.cpp \
+ bindings/js/JSDOMWindowBase.cpp \
bindings/js/JSDOMWindowCustom.cpp \
+ bindings/js/JSDOMWindowWrapper.cpp \
bindings/js/JSElementCustom.cpp \
bindings/js/JSEventCustom.cpp \
bindings/js/JSEventTargetBase.cpp \
bindings/js/JSEventTargetNode.cpp \
+ bindings/js/JSHistoryCustom.cpp \
bindings/js/JSHTMLAppletElementCustom.cpp \
bindings/js/JSHTMLCollectionCustom.cpp \
bindings/js/JSHTMLDocumentCustom.cpp \
@@@ -408,29 -434,42 +434,42 @@@
bindings/js/JSHTMLOptionElementConstructor.cpp \
bindings/js/JSHTMLOptionsCollectionCustom.cpp \
bindings/js/JSHTMLSelectElementCustom.cpp \
- bindings/js/JSLocation.cpp \
+ bindings/js/JSImageConstructor.cpp \
+ bindings/js/JSLocationCustom.cpp \
bindings/js/JSNamedNodeMapCustom.cpp \
bindings/js/JSNamedNodesCollection.cpp \
+ bindings/js/JSNavigatorCustom.cpp \
bindings/js/JSNodeCustom.cpp \
bindings/js/JSNodeFilterCondition.cpp \
bindings/js/JSNodeFilterCustom.cpp \
bindings/js/JSNodeIteratorCustom.cpp \
bindings/js/JSNodeListCustom.cpp \
+ bindings/js/JSRGBColor.cpp \
bindings/js/JSStyleSheetCustom.cpp \
bindings/js/JSStyleSheetListCustom.cpp \
bindings/js/JSTreeWalkerCustom.cpp \
bindings/js/JSXMLHttpRequest.cpp \
bindings/js/JSXSLTProcessor.cpp \
+ bindings/js/JSPluginCustom.cpp \
+ bindings/js/JSPluginArrayCustom.cpp \
+ bindings/js/JSMimeTypeArrayCustom.cpp \
bindings/js/kjs_binding.cpp \
- bindings/js/kjs_css.cpp \
- bindings/js/kjs_dom.cpp \
bindings/js/kjs_events.cpp \
bindings/js/kjs_html.cpp \
- bindings/js/kjs_navigator.cpp \
bindings/js/kjs_proxy.cpp \
- bindings/js/kjs_window.cpp \
bindings/js/PausedTimeouts.cpp \
bindings/js/ScheduledAction.cpp \
+ bridge/NP_jsobject.cpp \
+ bridge/npruntime.cpp \
+ bridge/runtime_array.cpp \
+ bridge/runtime.cpp \
+ bridge/runtime_method.cpp \
+ bridge/runtime_object.cpp \
+ bridge/runtime_root.cpp \
+ bridge/c/c_class.cpp \
+ bridge/c/c_instance.cpp \
+ bridge/c/c_runtime.cpp \
+ bridge/c/c_utility.cpp \
css/CSSBorderImageValue.cpp \
css/CSSCharsetRule.cpp \
css/CSSComputedStyleDeclaration.cpp \
@@@ -440,8 -479,10 +479,10 @@@
css/CSSFontFaceSrcValue.cpp \
css/CSSFontSelector.cpp \
css/CSSFontFaceSource.cpp \
+ css/CSSGradientValue.cpp \
css/CSSHelper.cpp \
css/CSSImageValue.cpp \
+ css/CSSImageGeneratorValue.cpp \
css/CSSImportRule.cpp \
css/CSSInheritedValue.cpp \
css/CSSInitialValue.cpp \
@@@ -506,7 -547,6 +547,6 @@@
dom/ExceptionCode.cpp \
dom/KeyboardEvent.cpp \
dom/MappedAttribute.cpp \
- dom/MessageEvent.cpp \
dom/MouseEvent.cpp \
dom/MouseRelatedEvent.cpp \
dom/MutationEvent.cpp \
@@@ -576,6 -616,7 +616,7 @@@
editing/Selection.cpp \
editing/SetNodeAttributeCommand.cpp \
editing/SmartReplace.cpp \
+ editing/SmartReplaceICU.cpp \
editing/SplitElementCommand.cpp \
editing/SplitTextNodeCommand.cpp \
editing/SplitTextNodeContainingElementCommand.cpp \
@@@ -591,6 -632,7 +632,7 @@@
history/PageCache.cpp \
html/CanvasGradient.cpp \
html/CanvasPattern.cpp \
+ html/CanvasPixelArray.cpp \
html/CanvasRenderingContext2D.cpp \
html/CanvasStyle.cpp \
html/FormDataList.cpp \
@@@ -670,6 -712,11 +712,11 @@@
html/HTMLTokenizer.cpp \
html/HTMLUListElement.cpp \
html/HTMLViewSourceDocument.cpp \
+ html/ImageData.cpp \
+ html/PreloadScanner.cpp \
+ loader/archive/ArchiveFactory.cpp \
+ loader/archive/ArchiveResource.cpp \
+ loader/archive/ArchiveResourceCollection.cpp \
loader/Cache.cpp \
loader/CachedCSSStyleSheet.cpp \
loader/CachedFont.cpp \
@@@ -697,13 -744,16 +744,16 @@@
loader/SubresourceLoader.cpp \
loader/TextDocument.cpp \
loader/TextResourceDecoder.cpp \
- page/AnimationController.cpp \
+ page/AccessibilityObject.cpp \
+ page/AnimationController.cpp \
+ page/AXObjectCache.cpp \
page/BarInfo.cpp \
page/Chrome.cpp \
page/Console.cpp \
page/ContextMenuController.cpp \
page/DOMSelection.cpp \
page/DOMWindow.cpp \
+ page/Navigator.cpp \
page/DragController.cpp \
page/EventHandler.cpp \
page/FocusController.cpp \
@@@ -712,26 -762,31 +762,31 @@@
page/FrameView.cpp \
page/History.cpp \
page/InspectorController.cpp \
+ page/JavaScriptDebugServer.cpp \
+ page/Location.cpp \
page/MouseEventWithHitTestResults.cpp \
page/Page.cpp \
+ page/PageGroup.cpp \
page/Screen.cpp \
page/Settings.cpp \
page/WindowFeatures.cpp \
+ plugins/PluginData.cpp \
+ plugins/PluginArray.cpp \
+ plugins/Plugin.cpp \
+ plugins/MimeType.cpp \
+ plugins/MimeTypeArray.cpp \
platform/Arena.cpp \
- platform/ArrayImpl.cpp \
platform/text/AtomicString.cpp \
platform/text/Base64.cpp \
platform/text/BidiContext.cpp \
platform/ContextMenu.cpp \
platform/text/CString.cpp \
- platform/DeprecatedCString.cpp \
platform/DeprecatedPtrListImpl.cpp \
- platform/DeprecatedString.cpp \
- platform/DeprecatedStringList.cpp \
platform/DeprecatedValueListImpl.cpp \
platform/DragData.cpp \
platform/DragImage.cpp \
platform/FileChooser.cpp \
+ platform/graphics/FontDescription.cpp \
platform/graphics/FontFamily.cpp \
platform/graphics/AffineTransform.cpp \
platform/graphics/BitmapImage.cpp \
@@@ -741,6 -796,8 +796,8 @@@
platform/graphics/FloatRect.cpp \
platform/graphics/FloatSize.cpp \
platform/graphics/FontData.cpp \
+ platform/graphics/GeneratedImage.cpp \
+ platform/graphics/Gradient.cpp \
platform/graphics/GraphicsContext.cpp \
platform/graphics/GraphicsTypes.cpp \
platform/graphics/Image.cpp \
@@@ -752,11 -809,12 +809,12 @@@
platform/KURL.cpp \
platform/Logging.cpp \
platform/MIMETypeRegistry.cpp \
- platform/network/AuthenticationChallenge.cpp \
+ platform/network/AuthenticationChallengeBase.cpp \
platform/network/Credential.cpp \
platform/network/FormData.cpp \
platform/network/HTTPParsers.cpp \
platform/network/ProtectionSpace.cpp \
+ platform/network/ResourceErrorBase.cpp \
platform/network/ResourceHandle.cpp \
platform/network/ResourceRequestBase.cpp \
platform/network/ResourceResponseBase.cpp \
@@@ -779,7 -837,12 +837,12 @@@
platform/Timer.cpp \
platform/text/UnicodeRange.cpp \
platform/Widget.cpp \
+ plugins/PluginDatabase.cpp \
+ plugins/PluginInfoStore.cpp \
+ plugins/PluginPackage.cpp \
plugins/PluginStream.cpp \
+ plugins/PluginView.cpp \
+ plugins/npapi.cpp \
rendering/AutoTableLayout.cpp \
rendering/bidi.cpp \
rendering/break_lines.cpp \
@@@ -881,10 -944,14 +944,14 @@@ qt-port
$$PWD/../WebKit/qt/Api/qwebpage.h \
$$PWD/../WebKit/qt/Api/qwebview.h \
$$PWD/../WebKit/qt/Api/qwebhistoryinterface.h \
+ $$PWD/../WebKit/qt/Api/qwebpluginfactory.h \
$$PWD/../WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h \
$$PWD/platform/network/qt/QNetworkReplyHandler.h
SOURCES += \
+ bridge/qt/qt_class.cpp \
+ bridge/qt/qt_instance.cpp \
+ bridge/qt/qt_runtime.cpp \
page/qt/DragControllerQt.cpp \
page/qt/EventHandlerQt.cpp \
page/qt/FrameQt.cpp \
@@@ -892,6 -959,7 +959,7 @@@
platform/graphics/qt/ColorQt.cpp \
platform/graphics/qt/FloatPointQt.cpp \
platform/graphics/qt/FloatRectQt.cpp \
+ platform/graphics/qt/GradientQt.cpp \
platform/graphics/qt/GraphicsContextQt.cpp \
platform/graphics/qt/IconQt.cpp \
platform/graphics/qt/ImageBufferQt.cpp \
@@@ -928,7 -996,6 +996,6 @@@
platform/qt/PlatformMouseEventQt.cpp \
platform/qt/PlatformScreenQt.cpp \
platform/qt/PlatformScrollBarQt.cpp \
- platform/qt/PlugInInfoStoreQt.cpp \
platform/qt/PopupMenuQt.cpp \
platform/qt/QWebPopup.cpp \
platform/qt/RenderThemeQt.cpp \
@@@ -941,9 -1008,9 +1008,9 @@@
platform/text/qt/TextBoundaries.cpp \
platform/text/qt/TextBreakIteratorQt.cpp \
platform/text/qt/TextCodecQt.cpp \
- platform/qt/ThreadingQt.cpp \
platform/qt/WheelEventQt.cpp \
platform/qt/WidgetQt.cpp \
+ plugins/qt/PluginDataQt.cpp \
../WebKit/qt/WebCoreSupport/ChromeClientQt.cpp \
../WebKit/qt/WebCoreSupport/ContextMenuClientQt.cpp \
../WebKit/qt/WebCoreSupport/DragClientQt.cpp \
@@@ -957,7 -1024,7 +1024,7 @@@
../WebKit/qt/Api/qwebhistory.cpp \
../WebKit/qt/Api/qwebsettings.cpp \
../WebKit/qt/Api/qwebhistoryinterface.cpp \
- platform/ThreadingNone.cpp
+ ../WebKit/qt/Api/qwebpluginfactory.cpp
unix: SOURCES += platform/qt/SystemTimeQt.cpp
else: SOURCES += platform/win/SystemTimeWin.cpp
@@@ -967,15 -1034,10 +1034,10 @@@
HEADERS += \
$$PWD/../WebKit/qt/Api/qwebnetworkinterface.h \
$$PWD/../WebKit/qt/Api/qwebnetworkinterface_p.h \
- $$PWD/../WebKit/qt/Api/qwebobjectplugin.h \
- $$PWD/../WebKit/qt/Api/qwebobjectplugin_p.h \
- $$PWD/../WebKit/qt/Api/qwebobjectpluginconnector.h \
$$PWD/../WebKit/qt/Api/qcookiejar.h
SOURCES += \
../WebKit/qt/Api/qwebnetworkinterface.cpp \
- ../WebKit/qt/Api/qwebobjectplugin.cpp \
- ../WebKit/qt/Api/qwebobjectpluginconnector.cpp \
../WebKit/qt/Api/qcookiejar.cpp
}
@@@ -985,13 -1047,15 +1047,15 @@@ gtk-port
HEADERS += \
../WebCore/platform/gtk/ClipboardGtk.h \
../WebCore/platform/gtk/PasteboardHelper.h \
- ../WebKit/gtk/WebView/webkit.h \
- ../WebKit/gtk/WebView/webkitdefines.h \
- ../WebKit/gtk/WebView/webkitnetworkrequest.h \
- ../WebKit/gtk/WebView/webkitprivate.h \
- ../WebKit/gtk/WebView/webkitwebframe.h \
- ../WebKit/gtk/WebView/webkitwebsettings.h \
- ../WebKit/gtk/WebView/webkitwebview.h \
+ ../WebKit/gtk/webkit/webkit.h \
+ ../WebKit/gtk/webkit/webkitdefines.h \
+ ../WebKit/gtk/webkit/webkitnetworkrequest.h \
+ ../WebKit/gtk/webkit/webkitprivate.h \
+ ../WebKit/gtk/webkit/webkitwebbackforwardlist.h \
+ ../WebKit/gtk/webkit/webkitwebframe.h \
+ ../WebKit/gtk/webkit/webkitwebhistoryitem.h \
+ ../WebKit/gtk/webkit/webkitwebsettings.h \
+ ../WebKit/gtk/webkit/webkitwebview.h \
../WebKit/gtk/WebCoreSupport/ChromeClientGtk.h \
../WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.h \
../WebKit/gtk/WebCoreSupport/DragClientGtk.h \
@@@ -1040,7 -1104,6 +1104,6 @@@
platform/gtk/SystemTimeGtk.cpp \
platform/gtk/TemporaryLinkStubs.cpp \
platform/text/gtk/TextBreakIteratorInternalICUGtk.cpp \
- platform/gtk/ThreadingGtk.cpp \
platform/gtk/WheelEventGtk.cpp \
platform/gtk/WidgetGtk.cpp \
platform/gtk/gtk2drawing.c \
@@@ -1052,6 -1115,7 +1115,7 @@@
platform/network/curl/ResourceHandleCurl.cpp \
platform/network/curl/ResourceHandleManager.cpp \
platform/graphics/cairo/AffineTransformCairo.cpp \
+ platform/graphics/cairo/FontCairo.cpp \
platform/graphics/cairo/GraphicsContextCairo.cpp \
platform/graphics/cairo/ImageBufferCairo.cpp \
platform/graphics/cairo/ImageCairo.cpp \
@@@ -1064,11 -1128,13 +1128,13 @@@
platform/image-decoders/bmp/BMPImageDecoder.cpp \
platform/image-decoders/ico/ICOImageDecoder.cpp \
platform/image-decoders/xbm/XBMImageDecoder.cpp \
- ../WebKit/gtk/WebView/webkitnetworkrequest.cpp \
- ../WebKit/gtk/WebView/webkitprivate.cpp \
- ../WebKit/gtk/WebView/webkitwebframe.cpp \
- ../WebKit/gtk/WebView/webkitwebsettings.cpp \
- ../WebKit/gtk/WebView/webkitwebview.cpp \
+ ../WebKit/gtk/webkit/webkitnetworkrequest.cpp \
+ ../WebKit/gtk/webkit/webkitprivate.cpp \
+ ../WebKit/gtk/webkit/webkitwebbackforwardlist.cpp \
+ ../WebKit/gtk/webkit/webkitwebframe.cpp \
+ ../WebKit/gtk/webkit/webkitwebhistoryitem.cpp \
+ ../WebKit/gtk/webkit/webkitwebsettings.cpp \
+ ../WebKit/gtk/webkit/webkitwebview.cpp \
../WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \
../WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp \
../WebKit/gtk/WebCoreSupport/DragClientGtk.cpp \
@@@ -1078,6 -1144,16 +1144,16 @@@
../WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp
}
+ contains(DEFINES, ENABLE_CROSS_DOCUMENT_MESSAGING=1) {
+ FEATURE_DEFINES_JAVASCRIPT += ENABLE_CROSS_DOCUMENT_MESSAGING=1
+
+ SOURCES += \
+ dom/MessageEvent.cpp
+
+ IDL_BINDINGS += \
+ dom/MessageEvent.idl
+ }
+
contains(DEFINES, ENABLE_DATABASE=1) {
FEATURE_DEFINES_JAVASCRIPT += ENABLE_DATABASE=1
@@@ -1108,6 -1184,8 +1184,8 @@@
storage/DatabaseTask.cpp \
storage/DatabaseThread.cpp \
storage/DatabaseTracker.cpp \
+ storage/OriginQuotaManager.cpp \
+ storage/OriginUsageRecord.cpp \
storage/SQLResultSet.cpp \
storage/SQLResultSetRowList.cpp \
storage/SQLStatement.cpp \
@@@ -1128,6 -1206,24 +1206,24 @@@
storage/SQLTransaction.idl
}
+ contains(DEFINES, ENABLE_DOM_STORAGE=1) {
+ FEATURE_DEFINES_JAVASCRIPT += ENABLE_DOM_STORAGE =1
+
+ SOURCES += \
+ storage/Storage.cpp \
+ storage/StorageArea.cpp \
+ storage/StorageEvent.cpp \
+ storage/StorageMap.cpp \
+ storage/SessionStorage.cpp \
+ bindings/js/JSStorage.cpp \
+ bindings/js/JSStorageCustom.cpp \
+ bindings/js/JSStorageEvent.cpp \
+
+ IDL_BINDINGS += \
+ storage/Storage.idl \
+ storage/StorageEvent.idl
+ }
+
contains(DEFINES, ENABLE_ICONDATABASE=1) {
SOURCES += \
loader/icon/IconDatabase.cpp \
@@@ -1162,6 -1258,16 +1258,16 @@@ contains(DEFINES, ENABLE_VIDEO=1)
rendering/RenderMedia.cpp \
bindings/js/JSAudioConstructor.cpp
+ qt-port {
+ HEADERS += \
+ platform/graphics/qt/MediaPlayerPrivatePhonon.h
+
+ SOURCES += \
+ platform/graphics/qt/MediaPlayerPrivatePhonon.cpp
+
+ QT += phonon
+ }
+
gtk-port {
SOURCES += \
platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp \
@@@ -1223,7 -1329,8 +1329,8 @@@ contains(DEFINES, ENABLE_SVG=1)
XLINK_NAMES = $$PWD/svg/xlinkattrs.in
- IDL_BINDINGS += svg/SVGZoomEvent.idl \
+ IDL_BINDINGS += \
+ svg/SVGZoomEvent.idl \
svg/SVGAElement.idl \
svg/SVGAngle.idl \
svg/SVGAnimateColorElement.idl \
@@@ -1355,6 -1462,10 +1462,10 @@@
svg/SVGUseElement.idl \
svg/SVGViewElement.idl
+ # ### SVG_FONTS
+ # IDL_BINDINGS += \
+ # svg/SVGAltGlyphElement.idl \
+
SOURCES += \
# TODO: this-one-is-not-auto-added! FIXME! tmp/SVGElementFactory.cpp \
bindings/js/JSSVGElementWrapperFactory.cpp \
@@@ -1373,10 -1484,9 +1484,9 @@@
rendering/PointerEventsHitRules.cpp \
svg/SVGDocumentExtensions.cpp \
svg/SVGImageLoader.cpp \
- svg/SVGTimer.cpp \
- svg/TimeScheduler.cpp \
svg/ColorDistance.cpp \
svg/SVGAElement.cpp \
+ svg/SVGAltGlyphElement.cpp \
svg/SVGAngle.cpp \
svg/SVGAnimateColorElement.cpp \
svg/SVGAnimatedPathData.cpp \
@@@ -1501,6 -1611,9 +1611,9 @@@
svg/SVGViewElement.cpp \
svg/SVGViewSpec.cpp \
svg/SVGZoomAndPan.cpp \
+ svg/animation/SMILTime.cpp \
+ svg/animation/SMILTimeContainer.cpp \
+ svg/animation/SVGSMILElement.cpp \
svg/graphics/filters/SVGFEBlend.cpp \
svg/graphics/filters/SVGFEColorMatrix.cpp \
svg/graphics/filters/SVGFEComponentTransfer.cpp \
@@@ -1758,7 -1871,7 +1871,7 @@@ qt-port:!CONFIG(QTDIR_build)
prf.files = $$PWD/../WebKit/qt/Api/qtwebkit.prf
prf.path = $$[QT_INSTALL_PREFIX]/mkspecs/features
- VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
+ #VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
win32-* {
DLLDESTDIR = $$OUTPUT_DIR/bin
@@@ -1789,7 -1902,7 +1902,7 @@@ gtk-port
target.path = $$WEBKIT_LIB_DIR
INSTALLS += target
- include($$PWD/../WebKit/gtk/WebView/headers.pri)
+ include($$PWD/../WebKit/gtk/webkit/headers.pri)
headers.files = $$WEBKIT_API_HEADERS
headers.path = $$WEBKIT_INC_DIR
INSTALLS += headers
@@@ -1809,7 -1922,7 +1922,7 @@@
QMAKE_PKGCONFIG_INSTALL_REPLACE += lib_replace
}
- GENMARSHALS = ../WebKit/gtk/WebView/webkit-marshal.list
+ GENMARSHALS = ../WebKit/gtk/webkit/webkit-marshal.list
GENMARSHALS_PREFIX = webkit_marshal
#
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list