Changeset 62481 in webkit
- Timestamp:
- Jul 5, 2010 5:26:10 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 4 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/WebCore.pri
r62357 r62481 653 653 xml/XSLTProcessor.idl 654 654 655 WEBCORE_HEADERS_FOR_WEBKIT2 += \ 656 bindings/js/DOMWrapperWorld.h \ 657 platform/FileChooser.h \ 658 platform/network/qt/ResourceError.h \ 659 platform/network/qt/ResourceRequest.h \ 660 platform/network/qt/ResourceResponse.h \ 661 dom/KeyboardEvent.h \ 662 editing/EditCommand.h \ 663 history/BackForwardList.h \ 664 html/HTMLFormElement.h \ 665 html/HTMLFrameOwnerElement.h \ 666 inspector/InspectorClient.h \ 667 loader/DocumentLoader.h \ 668 loader/FormState.h \ 669 loader/FrameLoader.h \ 670 loader/FrameLoaderClient.h \ 671 loader/FrameLoaderTypes.h \ 672 loader/PolicyChecker.h \ 673 loader/ProgressTracker.h \ 674 page/Chrome.h \ 675 page/ChromeClient.h \ 676 page/ContextMenuClient.h \ 677 page/DragClient.h \ 678 page/EditorClient.h \ 679 page/EventHandler.h \ 680 page/FocusController.h \ 681 page/Frame.h \ 682 page/FrameLoadRequest.h \ 683 page/FrameView.h \ 684 page/Page.h \ 685 page/Settings.h \ 686 page/WindowFeatures.h \ 687 platform/PlatformKeyboardEvent.h \ 688 platform/PlatformMouseEvent.h \ 689 platform/PlatformWheelEvent.h \ 690 platform/Widget.h \ 691 platform/graphics/FloatRect.h \ 692 platform/graphics/GraphicsContext.h \ 693 platform/graphics/IntPoint.h \ 694 platform/graphics/IntRect.h \ 695 platform/graphics/IntSize.h \ 696 platform/graphics/Tile.h \ 697 platform/graphics/TiledBackingStore.h \ 698 platform/graphics/TiledBackingStoreClient.h \ 699 platform/text/PlatformString.h \ 700 platform/text/StringImpl.h \ 701 platform/MIMETypeRegistry.h \ 702 plugins/PluginData.h \ 703 rendering/RenderTreeAsText.h \ 704 plugins/PluginData.h \ 705 706 JSC_HEADERS_FOR_WEBKIT2 += \ 707 ../JavaScriptCore/runtime/JSObject.h \ 708 709 WEBKIT2_API_HEADERS += \ 710 ../WebKit2/UIProcess/API/C/WKAPICast.h \ 711 ../WebKit2/UIProcess/API/C/WKBase.h \ 712 ../WebKit2/UIProcess/API/C/WKContext.h \ 713 ../WebKit2/UIProcess/API/C/WKContextPrivate.h \ 714 ../WebKit2/UIProcess/API/C/WKFrame.h \ 715 ../WebKit2/UIProcess/API/C/WKFramePolicyListener.h \ 716 ../WebKit2/UIProcess/API/C/WKNavigationData.h \ 717 ../WebKit2/UIProcess/API/C/WKPage.h \ 718 ../WebKit2/UIProcess/API/C/WKPageNamespace.h \ 719 ../WebKit2/UIProcess/API/C/WKPagePrivate.h \ 720 ../WebKit2/UIProcess/API/C/WKPreferences.h \ 721 ../WebKit2/UIProcess/API/C/WKString.h \ 722 ../WebKit2/UIProcess/API/C/WKURL.h \ 723 ../WebKit2/UIProcess/API/C/WebKit2.h \ 724 ../WebKit2/UIProcess/API/cpp/WKRetainPtr.h \ 725 ../WebKit2/UIProcess/API/qt/qwkgraphicswidget.h \ 726 ../WebKit2/UIProcess/API/qt/qwkpage.h \ 727 ../WebKit2/WebProcess/InjectedBundle/API/c/WKBundleBase.h \ 728 ../WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h \ 729 655 730 contains(DEFINES, ENABLE_MATHML=1) { 656 731 mathmlnames.output = $${WC_GENERATED_SOURCES_DIR}/MathMLNames.cpp … … 809 884 addExtraCompiler(webkitversion) 810 885 886 # GENERATOR 12: Copy WebCore headers for WebKit2 887 webcoreheaders.output = ../include/WebCore/${QMAKE_FILE_BASE}.h 888 webcoreheaders.input = WEBCORE_HEADERS_FOR_WEBKIT2 889 webcoreheaders.commands = $$QMAKE_COPY ${QMAKE_FILE_NAME} ${QMAKE_FILE_OUT} 890 webcoreheaders.clean = ${QMAKE_FILE_OUT} 891 webcoreheaders.wkAddOutputToSources = false 892 addExtraCompiler(webcoreheaders) 893 894 # GENERATOR 12-B: Copy JavaScriptCore headers for WebKit2 895 jscheaders.output = ../include/JavaScriptCore/${QMAKE_FILE_BASE}.h 896 jscheaders.input = JSC_HEADERS_FOR_WEBKIT2 897 jscheaders.commands = $$QMAKE_COPY ${QMAKE_FILE_NAME} ${QMAKE_FILE_OUT} 898 jscheaders.clean = ${QMAKE_FILE_OUT} 899 jscheaders.wkAddOutputToSources = false 900 addExtraCompiler(jscheaders) 901 902 # GENERATOR 13: Copy WebKit2 headers 903 webkit2headers.output = ../include/WebKit2/${QMAKE_FILE_BASE}.h 904 webkit2headers.input = WEBKIT2_API_HEADERS 905 webkit2headers.commands = $$QMAKE_COPY ${QMAKE_FILE_NAME} ${QMAKE_FILE_OUT} 906 webkit2headers.clean = ${QMAKE_FILE_OUT} 907 webkit2headers.wkAddOutputToSources = false 908 addExtraCompiler(webkit2headers) -
trunk/WebCore/WebCore.pro
r62466 r62481 2 2 CONFIG += building-libs 3 3 CONFIG += depend_includepath 4 5 meegotouch { 6 DEFINES += WTF_USE_MEEGOTOUCH=1 7 } 4 8 5 9 symbian: { … … 3027 3031 3028 3032 include($$PWD/../WebKit/qt/Api/headers.pri) 3033 3029 3034 HEADERS += $$WEBKIT_API_HEADERS 3030 3035 … … 3147 3152 } 3148 3153 3154 CONFIG += precompile_header 3155 PRECOMPILED_HEADER = $$PWD/../WebKit2/WebKit2Prefix.h 3156 3157 INCLUDEPATH = \ 3158 $$PWD/../WebKit2/Platform \ 3159 $$PWD/../WebKit2/Platform/CoreIPC \ 3160 $$PWD/../WebKit2/Shared \ 3161 $$PWD/../WebKit2/Shared/CoreIPCSupport \ 3162 $$PWD/../WebKit2/Shared/qt \ 3163 $$PWD/../WebKit2/UIProcess \ 3164 $$PWD/../WebKit2/UIProcess/API/C \ 3165 $$PWD/../WebKit2/UIProcess/API/cpp \ 3166 $$PWD/../WebKit2/UIProcess/API/cpp/qt \ 3167 $$PWD/../WebKit2/UIProcess/API/qt \ 3168 $$PWD/../WebKit2/UIProcess/Launcher \ 3169 $$PWD/../WebKit2/UIProcess/Plugins \ 3170 $$PWD/../WebKit2/UIProcess/qt \ 3171 $$PWD/../WebKit2/WebProcess \ 3172 $$PWD/../WebKit2/WebProcess/InjectedBundle \ 3173 $$PWD/../WebKit2/WebProcess/InjectedBundle/API/c \ 3174 $$PWD/../WebKit2/WebProcess/WebCoreSupport \ 3175 $$PWD/../WebKit2/WebProcess/WebPage \ 3176 $$INCLUDEPATH \ 3177 $$OUTPUT_DIR/include \ 3178 3179 HEADERS += \ 3180 ../WebKit2/Platform/CoreIPC/ArgumentDecoder.h \ 3181 ../WebKit2/Platform/CoreIPC/ArgumentEncoder.h \ 3182 ../WebKit2/Platform/CoreIPC/Arguments.h \ 3183 ../WebKit2/Platform/CoreIPC/Attachment.h \ 3184 ../WebKit2/Platform/CoreIPC/Connection.h \ 3185 ../WebKit2/Platform/CoreIPC/CoreIPCMessageKinds.h \ 3186 ../WebKit2/Platform/CoreIPC/MessageID.h \ 3187 ../WebKit2/Platform/PlatformProcessIdentifier.h \ 3188 ../WebKit2/Platform/RunLoop.h \ 3189 ../WebKit2/Platform/WorkItem.h \ 3190 ../WebKit2/Platform/WorkQueue.h \ 3191 ../WebKit2/Shared/CoreIPCSupport/DrawingAreaMessageKinds.h \ 3192 ../WebKit2/Shared/CoreIPCSupport/DrawingAreaProxyMessageKinds.h \ 3193 ../WebKit2/Shared/CoreIPCSupport/MessageDebug.h \ 3194 ../WebKit2/Shared/CoreIPCSupport/WebPageMessageKinds.h \ 3195 ../WebKit2/Shared/CoreIPCSupport/WebPageProxyMessageKinds.h \ 3196 ../WebKit2/Shared/CoreIPCSupport/WebProcessMessageKinds.h \ 3197 ../WebKit2/Shared/NotImplemented.h \ 3198 ../WebKit2/Shared/qt/WebEventFactory.h \ 3199 ../WebKit2/Shared/WebEventConversion.h \ 3200 ../WebKit2/Shared/WebEvent.h \ 3201 ../WebKit2/Shared/WebNavigationDataStore.h \ 3202 ../WebKit2/Shared/WebPreferencesStore.h \ 3203 ../WebKit2/UIProcess/API/cpp/WKRetainPtr.h \ 3204 ../WebKit2/UIProcess/API/cpp/qt/WKStringQt.h \ 3205 ../WebKit2/UIProcess/API/cpp/qt/WKURLQt.h \ 3206 ../WebKit2/UIProcess/API/C/WebKit2.h \ 3207 ../WebKit2/UIProcess/API/C/WKAPICast.h \ 3208 ../WebKit2/UIProcess/API/C/WKBase.h \ 3209 ../WebKit2/UIProcess/API/C/WKContext.h \ 3210 ../WebKit2/UIProcess/API/C/WKContextPrivate.h \ 3211 ../WebKit2/UIProcess/API/C/WKFrame.h \ 3212 ../WebKit2/UIProcess/API/C/WKFramePolicyListener.h \ 3213 ../WebKit2/UIProcess/API/C/WKNavigationData.h \ 3214 ../WebKit2/UIProcess/API/C/WKPage.h \ 3215 ../WebKit2/UIProcess/API/C/WKPageNamespace.h \ 3216 ../WebKit2/UIProcess/API/C/WKPagePrivate.h \ 3217 ../WebKit2/UIProcess/API/C/WKPreferences.h \ 3218 ../WebKit2/UIProcess/API/C/WKString.h \ 3219 ../WebKit2/UIProcess/API/C/WKURL.h \ 3220 ../WebKit2/UIProcess/API/qt/qgraphicswkview.h \ 3221 ../WebKit2/UIProcess/API/qt/qwkpage.h \ 3222 ../WebKit2/UIProcess/API/qt/qwkpage_p.h \ 3223 ../WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.h \ 3224 ../WebKit2/UIProcess/DrawingAreaProxy.h \ 3225 ../WebKit2/UIProcess/GenericCallback.h \ 3226 ../WebKit2/UIProcess/Launcher/WebProcessLauncher.h \ 3227 ../WebKit2/UIProcess/Plugins/PluginInfoStore.h \ 3228 ../WebKit2/UIProcess/PageClient.h \ 3229 ../WebKit2/UIProcess/ProcessModel.h \ 3230 ../WebKit2/UIProcess/qt/DefaultPageLoaderClientCallbacksQt.h \ 3231 ../WebKit2/UIProcess/ResponsivenessTimer.h \ 3232 ../WebKit2/UIProcess/WebContext.h \ 3233 ../WebKit2/UIProcess/WebContextInjectedBundleClient.h \ 3234 ../WebKit2/UIProcess/WebFramePolicyListenerProxy.h \ 3235 ../WebKit2/UIProcess/WebFrameProxy.h \ 3236 ../WebKit2/UIProcess/WebHistoryClient.h \ 3237 ../WebKit2/UIProcess/WebLoaderClient.h \ 3238 ../WebKit2/UIProcess/WebNavigationData.h \ 3239 ../WebKit2/UIProcess/WebPageNamespace.h \ 3240 ../WebKit2/UIProcess/WebPageProxy.h \ 3241 ../WebKit2/UIProcess/WebPolicyClient.h \ 3242 ../WebKit2/UIProcess/WebPreferences.h \ 3243 ../WebKit2/UIProcess/WebProcessManager.h \ 3244 ../WebKit2/UIProcess/WebProcessProxy.h \ 3245 ../WebKit2/UIProcess/WebUIClient.h \ 3246 ../WebKit2/WebProcess/InjectedBundle/API/c/WKBundleBase.h \ 3247 ../WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h \ 3248 ../WebKit2/WebProcess/InjectedBundle/InjectedBundle.h \ 3249 ../WebKit2/WebProcess/InjectedBundle/InjectedBundlePageClient.h \ 3250 ../WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h \ 3251 ../WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.h \ 3252 ../WebKit2/WebProcess/WebCoreSupport/WebDragClient.h \ 3253 ../WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h \ 3254 ../WebKit2/WebProcess/WebCoreSupport/WebErrors.h \ 3255 ../WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h \ 3256 ../WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.h \ 3257 ../WebKit2/WebProcess/WebPage/ChunkedUpdateDrawingArea.h \ 3258 ../WebKit2/WebProcess/WebPage/DrawingArea.h \ 3259 ../WebKit2/WebProcess/WebPage/WebFrame.h \ 3260 ../WebKit2/WebProcess/WebPage/WebPage.h \ 3261 ../WebKit2/WebProcess/WebProcess.h \ 3262 3263 SOURCES += \ 3264 ../WebKit2/Platform/CoreIPC/ArgumentDecoder.cpp \ 3265 ../WebKit2/Platform/CoreIPC/ArgumentEncoder.cpp \ 3266 ../WebKit2/Platform/CoreIPC/Attachment.cpp \ 3267 ../WebKit2/Platform/CoreIPC/Connection.cpp \ 3268 ../WebKit2/Platform/CoreIPC/qt/ConnectionQt.cpp \ 3269 ../WebKit2/Platform/RunLoop.cpp \ 3270 ../WebKit2/Platform/WorkQueue.cpp \ 3271 ../WebKit2/Platform/qt/RunLoopQt.cpp \ 3272 ../WebKit2/Platform/qt/WorkQueueQt.cpp \ 3273 ../WebKit2/Shared/CoreIPCSupport/MessageDebug.cpp \ 3274 ../WebKit2/Shared/WebEventConversion.cpp \ 3275 ../WebKit2/Shared/WebPreferencesStore.cpp \ 3276 ../WebKit2/Shared/qt/UpdateChunk.cpp \ 3277 ../WebKit2/Shared/qt/WebEventFactory.cpp \ 3278 ../WebKit2/UIProcess/API/C/WKContext.cpp \ 3279 ../WebKit2/UIProcess/API/C/WKFrame.cpp \ 3280 ../WebKit2/UIProcess/API/C/WKFramePolicyListener.cpp \ 3281 ../WebKit2/UIProcess/API/C/WKNavigationData.cpp \ 3282 ../WebKit2/UIProcess/API/C/WKPage.cpp \ 3283 ../WebKit2/UIProcess/API/C/WKPageNamespace.cpp \ 3284 ../WebKit2/UIProcess/API/C/WKPreferences.cpp \ 3285 ../WebKit2/UIProcess/API/C/WKString.cpp \ 3286 ../WebKit2/UIProcess/API/C/WKURL.cpp \ 3287 ../WebKit2/UIProcess/API/qt/qgraphicswkview.cpp \ 3288 ../WebKit2/UIProcess/API/qt/qwkpage.cpp \ 3289 ../WebKit2/UIProcess/API/cpp/qt/WKStringQt.cpp \ 3290 ../WebKit2/UIProcess/API/cpp/qt/WKURLQt.cpp \ 3291 ../WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.cpp \ 3292 ../WebKit2/UIProcess/DrawingAreaProxy.cpp \ 3293 ../WebKit2/UIProcess/DrawingAreaProxyTiled.cpp \ 3294 ../WebKit2/UIProcess/Plugins/PluginInfoStore.cpp \ 3295 ../WebKit2/UIProcess/Plugins/qt/PluginInfoStoreQt.cpp \ 3296 ../WebKit2/UIProcess/Launcher/qt/WebProcessLauncherQt.cpp \ 3297 ../WebKit2/UIProcess/ResponsivenessTimer.cpp \ 3298 ../WebKit2/UIProcess/WebContext.cpp \ 3299 ../WebKit2/UIProcess/WebContextInjectedBundleClient.cpp \ 3300 ../WebKit2/UIProcess/WebFramePolicyListenerProxy.cpp \ 3301 ../WebKit2/UIProcess/WebFrameProxy.cpp \ 3302 ../WebKit2/UIProcess/WebHistoryClient.cpp \ 3303 ../WebKit2/UIProcess/WebLoaderClient.cpp \ 3304 ../WebKit2/UIProcess/WebNavigationData.cpp \ 3305 ../WebKit2/UIProcess/WebPageNamespace.cpp \ 3306 ../WebKit2/UIProcess/WebPageProxy.cpp \ 3307 ../WebKit2/UIProcess/WebPolicyClient.cpp \ 3308 ../WebKit2/UIProcess/WebPreferences.cpp \ 3309 ../WebKit2/UIProcess/WebProcessManager.cpp \ 3310 ../WebKit2/UIProcess/WebProcessProxy.cpp \ 3311 ../WebKit2/UIProcess/WebUIClient.cpp \ 3312 ../WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp \ 3313 ../WebKit2/WebProcess/InjectedBundle/InjectedBundlePageClient.cpp \ 3314 ../WebKit2/WebProcess/InjectedBundle/qt/InjectedBundleQt.cpp \ 3315 ../WebKit2/UIProcess/qt/DefaultPageLoaderClientCallbacksQt.cpp \ 3316 ../WebKit2/UIProcess/qt/DrawingAreaProxyTiledQt.cpp \ 3317 ../WebKit2/UIProcess/qt/ChunkedUpdateDrawingAreaProxyQt.cpp \ 3318 ../WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp \ 3319 ../WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.cpp \ 3320 ../WebKit2/WebProcess/WebCoreSupport/WebDragClient.cpp \ 3321 ../WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp \ 3322 ../WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp \ 3323 ../WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp \ 3324 ../WebKit2/WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp \ 3325 ../WebKit2/WebProcess/WebPage/ChunkedUpdateDrawingArea.cpp \ 3326 ../WebKit2/WebProcess/WebPage/DrawingArea.cpp \ 3327 ../WebKit2/WebProcess/WebPage/DrawingAreaTiled.cpp \ 3328 ../WebKit2/WebProcess/WebPage/WebFrame.cpp \ 3329 ../WebKit2/WebProcess/WebPage/WebPage.cpp \ 3330 ../WebKit2/WebProcess/WebPage/qt/DrawingAreaTiledQt.cpp \ 3331 ../WebKit2/WebProcess/WebPage/qt/ChunkedUpdateDrawingAreaQt.cpp \ 3332 ../WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp \ 3333 ../WebKit2/WebProcess/WebProcess.cpp \ 3334 3335 3149 3336 symbian { 3150 3337 shared { -
trunk/WebKit.pro
r61882 r62481 13 13 exists($$PWD/WebKit/qt/declarative): SUBDIRS += WebKit/qt/declarative 14 14 } 15 exists($$PWD/WebKitTools/MiniBrowser/qt/MiniBrowser.pro): SUBDIRS += WebKitTools/MiniBrowser/qt/MiniBrowser.pro 16 exists($$PWD/WebKit2/WebKit2.pro): SUBDIRS += WebKit2/WebKit2.pro 15 17 exists($$PWD/JavaScriptCore/jsc.pro): SUBDIRS += JavaScriptCore/jsc.pro 16 18 exists($$PWD/WebKit/qt/tests): SUBDIRS += WebKit/qt/tests -
trunk/WebKit2/ChangeLog
r62471 r62481 1 2010-07-05 Antti Koivisto <koivisto@iki.fi> 2 3 Reviewed by Kenneth Rohde Christiansen. 4 5 [Qt] Initial WebKit2 implementation 6 https://bugs.webkit.org/show_bug.cgi?id=40233 7 8 Implement ChunkedUpdateDrawingArea + Proxy for Qt. Not built yet. 9 10 * UIProcess/ChunkedUpdateDrawingAreaProxy.h: 11 * UIProcess/qt: Added. 12 * UIProcess/qt/ChunkedUpdateDrawingAreaProxyQt.cpp: Added. 13 (WebKit::ChunkedUpdateDrawingAreaProxy::page): 14 (WebKit::ChunkedUpdateDrawingAreaProxy::ensureBackingStore): 15 (WebKit::ChunkedUpdateDrawingAreaProxy::invalidateBackingStore): 16 (WebKit::ChunkedUpdateDrawingAreaProxy::platformPaint): 17 (WebKit::ChunkedUpdateDrawingAreaProxy::drawUpdateChunkIntoBackingStore): 18 * WebProcess/WebPage/qt: Added. 19 * WebProcess/WebPage/qt/ChunkedUpdateDrawingAreaQt.cpp: Added. 20 (WebKit::ChunkedUpdateDrawingArea::paintIntoUpdateChunk): 21 1 22 2010-07-04 Anders Carlsson <andersca@apple.com> 2 23 -
trunk/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.h
r62303 r62481 37 37 class WKView; 38 38 #endif 39 #elif PLATFORM(QT) 40 #include <QImage> 41 class QGraphicsWKView; 39 42 #endif 40 43 … … 49 52 class WebView; 50 53 typedef WebView PlatformWebView; 54 #elif PLATFORM(QT) 55 typedef QGraphicsWKView PlatformWebView; 51 56 #endif 52 57 … … 96 101 OwnPtr<HDC> m_backingStoreDC; 97 102 OwnPtr<HBITMAP> m_backingStoreBitmap; 103 #elif PLATFORM(QT) 104 QImage m_backingStoreImage; 98 105 #endif 99 106
Note: See TracChangeset
for help on using the changeset viewer.