[WK2] Change the remaining framework includes from WebKit2 to WebKit
authorossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 16 May 2014 08:53:19 +0000 (08:53 +0000)
committerossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 16 May 2014 08:53:19 +0000 (08:53 +0000)
https://bugs.webkit.org/show_bug.cgi?id=132956

Patch by Martin Hodovan <mhodovan.u-szeged@partner.samsung.com> on 2014-05-16
Reviewed by Sam Weinig.

Source/WebKit2:
* NetworkProcess/unix/NetworkProcessMainUnix.cpp:
* NetworkProcess/unix/NetworkProcessMainUnix.h:
* PluginProcess/unix/PluginProcessMainUnix.h:
* Shared/API/c/cairo/WKImageCairo.h:
* Shared/API/c/cf/WKURLRequestCF.h:
* Shared/API/c/cf/WKURLResponseCF.h:
* Shared/API/c/efl/WKArrayEfl.cpp:
* Shared/API/c/efl/WKArrayEfl.h:
* UIProcess/API/C/CoordinatedGraphics/WKView.h:
* UIProcess/API/C/WKBatteryManager.h:
* UIProcess/API/C/WKBatteryStatus.h:
* UIProcess/API/C/WKGrammarDetail.h:
* UIProcess/API/C/WKTextChecker.h:
* UIProcess/API/C/WKVibration.h:
* UIProcess/API/C/WKViewportAttributes.h:
* UIProcess/API/C/cairo/WKIconDatabaseCairo.h:
* UIProcess/API/C/efl/WKAPICastEfl.h:
* UIProcess/API/C/efl/WKColorPickerResultListener.h:
* UIProcess/API/C/efl/WKEventEfl.h:
* UIProcess/API/C/efl/WKPageEfl.h:
* UIProcess/API/C/efl/WKPopupItem.h:
* UIProcess/API/C/efl/WKPopupMenuListener.h:
* UIProcess/API/C/efl/WKViewEfl.cpp:
* UIProcess/API/C/efl/WKViewEfl.h:
* UIProcess/API/C/gtk/WKFullScreenClientGtk.h:
* UIProcess/API/C/gtk/WKInspectorClientGtk.h:
* UIProcess/API/C/gtk/WKView.h:
* UIProcess/API/C/gtk/WKViewPrivate.h:
* UIProcess/API/C/soup/WKContextSoup.h:
* UIProcess/API/C/soup/WKCookieManagerSoup.h:
* UIProcess/API/C/soup/WKSoupCustomProtocolRequestManager.h:
* UIProcess/API/C/soup/WKSoupRequestManager.h:
* UIProcess/API/Cocoa/WKErrorRecoveryAttempting.h:
* UIProcess/API/CoordinatedGraphics/WKCoordinatedScene.h:
* UIProcess/API/cpp/efl/WKEinaSharedString.cpp:
* UIProcess/API/cpp/efl/WKEinaSharedString.h:
* UIProcess/API/efl/EwkView.cpp:
* UIProcess/API/efl/EwkView.h:
* UIProcess/API/efl/EwkViewCallbacks.h:
* UIProcess/API/efl/GestureRecognizer.h:
* UIProcess/API/efl/ewk_application_cache_manager_private.h:
* UIProcess/API/efl/ewk_auth_request_private.h:
* UIProcess/API/efl/ewk_back_forward_list_item_private.h:
* UIProcess/API/efl/ewk_back_forward_list_private.h:
* UIProcess/API/efl/ewk_context_menu_item.cpp:
* UIProcess/API/efl/ewk_context_private.h:
* UIProcess/API/efl/ewk_cookie_manager_private.h:
* UIProcess/API/efl/ewk_database_manager_private.h:
* UIProcess/API/efl/ewk_error_private.h:
* UIProcess/API/efl/ewk_favicon_database_private.h:
* UIProcess/API/efl/ewk_file_chooser_request_private.h:
* UIProcess/API/efl/ewk_page_group_private.h:
* UIProcess/API/efl/ewk_popup_menu_item_private.h:
* UIProcess/API/efl/ewk_popup_menu_private.h:
* UIProcess/API/efl/ewk_security_origin_private.h:
* UIProcess/API/efl/ewk_settings_private.h:
* UIProcess/API/efl/ewk_storage_manager_private.h:
* UIProcess/API/efl/ewk_view.cpp:
* UIProcess/API/efl/ewk_view_private.h:
* UIProcess/API/efl/ewk_window_features_private.h:
* UIProcess/API/efl/tests/InjectedBundle/injected_bundle_sample.cpp:
* UIProcess/API/efl/tests/test_ewk2_eina_shared_string.cpp:
* UIProcess/API/gtk/WebKitDownloadClient.cpp:
* UIProcess/API/gtk/WebKitPrivate.h:
* UIProcess/CoordinatedGraphics/WKCoordinatedSceneAPICast.h:
* UIProcess/efl/BatteryProvider.h:
* UIProcess/efl/ContextHistoryClientEfl.h:
* UIProcess/efl/DownloadManagerEfl.h:
* UIProcess/efl/FindClientEfl.h:
* UIProcess/efl/FormClientEfl.h:
* UIProcess/efl/PageLoadClientEfl.h:
* UIProcess/efl/PagePolicyClientEfl.h:
* UIProcess/efl/PageUIClientEfl.h:
* UIProcess/efl/RequestManagerClientEfl.h:
* UIProcess/efl/TextCheckerClientEfl.h:
* UIProcess/efl/VibrationClientEfl.h:
* UIProcess/efl/ViewClientEfl.cpp:
* UIProcess/efl/ViewClientEfl.h:
* UIProcess/efl/WebInspectorProxyEfl.cpp:
* WebProcess/WebCoreSupport/efl/WebErrorsEfl.cpp:
* WebProcess/WebCoreSupport/gtk/WebErrorsGtk.cpp:
* WebProcess/efl/SeccompFiltersWebProcessEfl.cpp:
* WebProcess/efl/SeccompFiltersWebProcessEfl.h:
* WebProcess/efl/WebProcessMainEfl.cpp:
* WebProcess/efl/WebProcessMainEfl.h:
* WebProcess/gtk/WebGtkInjectedBundleMain.cpp:
* WebProcess/gtk/WebProcessMainGtk.cpp:
* WebProcess/gtk/WebProcessMainGtk.h:
* mac/WKPreferences.h:

Tools:
* MiniBrowser/MiniBrowserWebProcessPlugIn.h:
* MiniBrowser/mac/AppDelegate.m:
* MiniBrowser/mac/WK2BrowserWindowController.m:
* TestWebKitAPI/InjectedBundleController.h:
* TestWebKitAPI/InjectedBundleMain.cpp:
* TestWebKitAPI/JavaScriptTest.cpp:
* TestWebKitAPI/PlatformUtilities.h:
* TestWebKitAPI/Tests/CustomProtocolsSyncXHRTest.mm:
* TestWebKitAPI/Tests/WebKit2/CanHandleRequest.cpp:
* TestWebKitAPI/Tests/WebKit2/CanHandleRequest_Bundle.cpp:
* TestWebKitAPI/Tests/WebKit2/CookieManager.cpp:
* TestWebKitAPI/Tests/WebKit2/CoordinatedGraphics/WKViewIsActiveSetIsActive.cpp:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKit2/CoordinatedGraphics/WKViewIsActiveSetIsActive_Bundle.cpp:
* TestWebKitAPI/Tests/WebKit2/CoordinatedGraphics/WKViewRestoreZoomAndScrollBackForward.cpp:
* TestWebKitAPI/Tests/WebKit2/CoordinatedGraphics/WKViewUserViewportToContents.cpp:
* TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionBasic.cpp:
* TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionBasic_Bundle.cpp:
* TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionNoCache_Bundle.cpp:
* TestWebKitAPI/Tests/WebKit2/DidAssociateFormControls_Bundle.cpp:
* TestWebKitAPI/Tests/WebKit2/DidNotHandleKeyDown.cpp:
* TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp:
* TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash_Bundle.cpp:
* TestWebKitAPI/Tests/WebKit2/DownloadDecideDestinationCrash.cpp:
* TestWebKitAPI/Tests/WebKit2/EphemeralSessionPushStateNoHistoryCallback.cpp:
* TestWebKitAPI/Tests/WebKit2/EvaluateJavaScript.cpp:
* TestWebKitAPI/Tests/WebKit2/FailedLoad.cpp:
* TestWebKitAPI/Tests/WebKit2/Find.cpp:
* TestWebKitAPI/Tests/WebKit2/FindMatches.mm:
* TestWebKitAPI/Tests/WebKit2/ForceRepaint.cpp:
* TestWebKitAPI/Tests/WebKit2/FrameMIMETypeHTML.cpp:
* TestWebKitAPI/Tests/WebKit2/FrameMIMETypePNG.cpp:
* TestWebKitAPI/Tests/WebKit2/Geolocation.cpp:
* TestWebKitAPI/Tests/WebKit2/GetInjectedBundleInitializationUserDataCallback.cpp:
* TestWebKitAPI/Tests/WebKit2/GetInjectedBundleInitializationUserDataCallback_Bundle.cpp:
* TestWebKitAPI/Tests/WebKit2/HitTestResultNodeHandle.cpp:
* TestWebKitAPI/Tests/WebKit2/HitTestResultNodeHandle_Bundle.cpp:
* TestWebKitAPI/Tests/WebKit2/InjectedBundleBasic.cpp:
* TestWebKitAPI/Tests/WebKit2/InjectedBundleBasic_Bundle.cpp:
* TestWebKitAPI/Tests/WebKit2/InjectedBundleFrameHitTest.cpp:
* TestWebKitAPI/Tests/WebKit2/InjectedBundleFrameHitTest_Bundle.cpp:
* TestWebKitAPI/Tests/WebKit2/InjectedBundleInitializationUserDataCallbackWins.cpp:
* TestWebKitAPI/Tests/WebKit2/InjectedBundleInitializationUserDataCallbackWins_Bundle.cpp:
* TestWebKitAPI/Tests/WebKit2/LayoutMilestonesWithAllContentInFrame.cpp:
* TestWebKitAPI/Tests/WebKit2/LoadAlternateHTMLStringWithNonDirectoryURL.cpp:
* TestWebKitAPI/Tests/WebKit2/LoadCanceledNoServerRedirectCallback.cpp:
* TestWebKitAPI/Tests/WebKit2/LoadCanceledNoServerRedirectCallback_Bundle.cpp:
* TestWebKitAPI/Tests/WebKit2/LoadPageOnCrash.cpp:
* TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayout.cpp:
* TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFails.cpp:
* TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFails_Bundle.cpp:
* TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutForImages.cpp:
* TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutForImages_Bundle.cpp:
* TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFrames.cpp:
* TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFrames_Bundle.cpp:
* TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayout_Bundle.cpp:
* TestWebKitAPI/Tests/WebKit2/PageLoadBasic.cpp:
* TestWebKitAPI/Tests/WebKit2/PageLoadDidChangeLocationWithinPageForFrame.cpp:
* TestWebKitAPI/Tests/WebKit2/ParentFrame.cpp:
* TestWebKitAPI/Tests/WebKit2/ParentFrame_Bundle.cpp:
* TestWebKitAPI/Tests/WebKit2/PasteboardNotifications.mm:
* TestWebKitAPI/Tests/WebKit2/PasteboardNotifications_Bundle.cpp:
* TestWebKitAPI/Tests/WebKit2/PreventEmptyUserAgent.cpp:
* TestWebKitAPI/Tests/WebKit2/PrivateBrowsingPushStateNoHistoryCallback.cpp:
* TestWebKitAPI/Tests/WebKit2/ReloadPageAfterCrash.cpp:
* TestWebKitAPI/Tests/WebKit2/ResizeReversePaginatedWebView.cpp:
* TestWebKitAPI/Tests/WebKit2/ResizeWindowAfterCrash.cpp:
* TestWebKitAPI/Tests/WebKit2/ScrollPinningBehaviors.cpp:
* TestWebKitAPI/Tests/WebKit2/SeccompFilters.cpp:
* TestWebKitAPI/Tests/WebKit2/ShouldGoToBackForwardListItem.cpp:
* TestWebKitAPI/Tests/WebKit2/ShouldGoToBackForwardListItem_Bundle.cpp:
* TestWebKitAPI/Tests/WebKit2/SpacebarScrolling.cpp:
* TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp:
* TestWebKitAPI/Tests/WebKit2/WKStringJSString.cpp:
* TestWebKitAPI/Tests/WebKit2/WebArchive.cpp:
* TestWebKitAPI/Tests/WebKit2/WebArchive_Bundle.cpp:
* TestWebKitAPI/Tests/WebKit2/WillLoad_Bundle.cpp:
* TestWebKitAPI/Tests/WebKit2/WillSendSubmitEvent_Bundle.cpp:
* TestWebKitAPI/Tests/WebKit2/efl/WKViewClientWebProcessCallbacks.cpp:
* TestWebKitAPI/Tests/WebKit2/efl/WKViewClientWebProcessCallbacks_Bundle.cpp:
* TestWebKitAPI/Tests/WebKit2/mac/EditorCommands.mm:
* TestWebKitAPI/Tests/WebKit2/mac/GetBackingScaleFactor.mm:
* TestWebKitAPI/Tests/WebKit2/mac/GetBackingScaleFactor_Bundle.mm:
* TestWebKitAPI/Tests/WebKit2/mac/GetPIDAfterAbortedProcessLaunch.cpp:
* TestWebKitAPI/Tests/WebKit2/mac/WeakObjCPtr.mm:
* TestWebKitAPI/Tests/WebKit2/win/AltKeyGeneratesWMSysCommand.cpp:
* TestWebKitAPI/Tests/WebKit2/win/DoNotCopyANullCFURLResponse.cpp:
* TestWebKitAPI/Tests/WebKit2/win/ResizeViewWhileHidden.cpp:
* TestWebKitAPI/Tests/WebKit2/win/TranslateMessageGeneratesWMChar.cpp:
* TestWebKitAPI/Tests/WebKit2/win/WMCloseCallsUIClientClose.cpp:
* TestWebKitAPI/Tests/WebKit2/win/WMPrint.cpp:
* TestWebKitAPI/Tests/WebKit2Cocoa/Download.mm:
* TestWebKitAPI/Tests/WebKit2ObjC/CustomProtocolsInvalidScheme.mm:
* TestWebKitAPI/Tests/WebKit2ObjC/CustomProtocolsInvalidScheme_Bundle.cpp:
* TestWebKitAPI/Tests/WebKit2ObjC/CustomProtocolsTest.mm:
* TestWebKitAPI/Tests/WebKit2ObjC/PreventImageLoadWithAutoResizing.mm:
* TestWebKitAPI/Tests/WebKit2ObjC/PreventImageLoadWithAutoResizing_Bundle.cpp:
* TestWebKitAPI/Tests/WebKit2ObjC/UserContentTest.mm:
* TestWebKitAPI/Tests/WebKit2ObjC/WKBrowsingContextGroupTest.mm:
* TestWebKitAPI/Tests/WebKit2ObjC/WKBrowsingContextLoadDelegateTest.mm:
* TestWebKitAPI/Tests/mac/DeviceScaleFactorOnBack.mm:
* TestWebKitAPI/Tests/mac/PageVisibilityStateWithWindowChanges.mm:
* TestWebKitAPI/config.h:
* TestWebKitAPI/efl/PlatformWebView.cpp:
* TestWebKitAPI/mac/JavaScriptTestMac.mm:
* TestWebKitAPI/mac/PlatformUtilitiesMac.mm:
* TestWebKitAPI/mac/PlatformWebViewMac.mm:
* TestWebKitAPI/mac/TestBrowsingContextLoadDelegate.h:
* TestWebKitAPI/mac/WebKitAgnosticTest.mm:
* WebKitTestRunner/EventSenderProxy.h:
* WebKitTestRunner/GeolocationProviderMock.cpp:
* WebKitTestRunner/GeolocationProviderMock.h:
* WebKitTestRunner/InjectedBundle/AccessibilityController.cpp:
* WebKitTestRunner/InjectedBundle/EventSendingController.cpp:
* WebKitTestRunner/InjectedBundle/EventSendingController.h:
* WebKitTestRunner/InjectedBundle/GCController.cpp:
* WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
* WebKitTestRunner/InjectedBundle/InjectedBundle.h:
* WebKitTestRunner/InjectedBundle/InjectedBundleMain.cpp:
* WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
* WebKitTestRunner/InjectedBundle/InjectedBundlePage.h:
* WebKitTestRunner/InjectedBundle/TestRunner.cpp:
* WebKitTestRunner/InjectedBundle/TestRunner.h:
* WebKitTestRunner/InjectedBundle/TextInputController.cpp:
* WebKitTestRunner/InjectedBundle/atk/AccessibilityControllerAtk.cpp:
* WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.cpp:
* WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp:
* WebKitTestRunner/InjectedBundle/cocoa/InjectedBundlePageCocoa.mm:
* WebKitTestRunner/InjectedBundle/ios/AccessibilityControllerIOS.mm:
* WebKitTestRunner/InjectedBundle/ios/EventSenderProxyIOS.mm:
* WebKitTestRunner/InjectedBundle/mac/AccessibilityControllerMac.mm:
* WebKitTestRunner/InjectedBundle/mac/AccessibilityNotificationHandler.mm:
* WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm:
* WebKitTestRunner/PlatformWebView.h:
* WebKitTestRunner/StringFunctions.h:
* WebKitTestRunner/TestController.cpp:
* WebKitTestRunner/TestController.h:
* WebKitTestRunner/TestInvocation.cpp:
* WebKitTestRunner/TestInvocation.h:
* WebKitTestRunner/WebKitTestRunnerPrefix.h:
* WebKitTestRunner/WebNotificationProvider.cpp:
* WebKitTestRunner/WebNotificationProvider.h:
* WebKitTestRunner/WorkQueueManager.cpp:
* WebKitTestRunner/cairo/TestInvocationCairo.cpp:
* WebKitTestRunner/cg/TestInvocationCG.cpp:
* WebKitTestRunner/cocoa/CrashReporterInfo.mm:
* WebKitTestRunner/config.h:
* WebKitTestRunner/efl/PlatformWebViewEfl.cpp:
* WebKitTestRunner/gtk/PlatformWebViewGtk.cpp:
* WebKitTestRunner/ios/PlatformWebViewIOS.mm:
* WebKitTestRunner/ios/TestControllerIOS.mm:
* WebKitTestRunner/mac/EventSenderProxy.mm:
* WebKitTestRunner/mac/PlatformWebViewMac.mm:
* WebKitTestRunner/mac/TestControllerMac.mm:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@168961 268f45cc-cd09-0410-ab3c-d52691b4dbfc

244 files changed:
Source/WebKit2/ChangeLog
Source/WebKit2/NetworkProcess/unix/NetworkProcessMainUnix.cpp
Source/WebKit2/NetworkProcess/unix/NetworkProcessMainUnix.h
Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.h
Source/WebKit2/Shared/API/c/cairo/WKImageCairo.h
Source/WebKit2/Shared/API/c/cf/WKURLRequestCF.h
Source/WebKit2/Shared/API/c/cf/WKURLResponseCF.h
Source/WebKit2/Shared/API/c/efl/WKArrayEfl.cpp
Source/WebKit2/Shared/API/c/efl/WKArrayEfl.h
Source/WebKit2/UIProcess/API/C/CoordinatedGraphics/WKView.h
Source/WebKit2/UIProcess/API/C/WKBatteryManager.h
Source/WebKit2/UIProcess/API/C/WKBatteryStatus.h
Source/WebKit2/UIProcess/API/C/WKGrammarDetail.h
Source/WebKit2/UIProcess/API/C/WKTextChecker.h
Source/WebKit2/UIProcess/API/C/WKVibration.h
Source/WebKit2/UIProcess/API/C/WKViewportAttributes.h
Source/WebKit2/UIProcess/API/C/cairo/WKIconDatabaseCairo.h
Source/WebKit2/UIProcess/API/C/efl/WKAPICastEfl.h
Source/WebKit2/UIProcess/API/C/efl/WKColorPickerResultListener.h
Source/WebKit2/UIProcess/API/C/efl/WKEventEfl.h
Source/WebKit2/UIProcess/API/C/efl/WKPageEfl.h
Source/WebKit2/UIProcess/API/C/efl/WKPopupItem.h
Source/WebKit2/UIProcess/API/C/efl/WKPopupMenuListener.h
Source/WebKit2/UIProcess/API/C/efl/WKViewEfl.cpp
Source/WebKit2/UIProcess/API/C/efl/WKViewEfl.h
Source/WebKit2/UIProcess/API/C/gtk/WKFullScreenClientGtk.h
Source/WebKit2/UIProcess/API/C/gtk/WKInspectorClientGtk.h
Source/WebKit2/UIProcess/API/C/gtk/WKView.h
Source/WebKit2/UIProcess/API/C/gtk/WKViewPrivate.h
Source/WebKit2/UIProcess/API/C/soup/WKContextSoup.h
Source/WebKit2/UIProcess/API/C/soup/WKCookieManagerSoup.h
Source/WebKit2/UIProcess/API/C/soup/WKSoupCustomProtocolRequestManager.h
Source/WebKit2/UIProcess/API/C/soup/WKSoupRequestManager.h
Source/WebKit2/UIProcess/API/Cocoa/WKErrorRecoveryAttempting.h
Source/WebKit2/UIProcess/API/CoordinatedGraphics/WKCoordinatedScene.h
Source/WebKit2/UIProcess/API/cpp/efl/WKEinaSharedString.cpp
Source/WebKit2/UIProcess/API/cpp/efl/WKEinaSharedString.h
Source/WebKit2/UIProcess/API/efl/EwkView.cpp
Source/WebKit2/UIProcess/API/efl/EwkView.h
Source/WebKit2/UIProcess/API/efl/EwkViewCallbacks.h
Source/WebKit2/UIProcess/API/efl/GestureRecognizer.h
Source/WebKit2/UIProcess/API/efl/ewk_application_cache_manager_private.h
Source/WebKit2/UIProcess/API/efl/ewk_auth_request_private.h
Source/WebKit2/UIProcess/API/efl/ewk_back_forward_list_item_private.h
Source/WebKit2/UIProcess/API/efl/ewk_back_forward_list_private.h
Source/WebKit2/UIProcess/API/efl/ewk_context_menu_item.cpp
Source/WebKit2/UIProcess/API/efl/ewk_context_private.h
Source/WebKit2/UIProcess/API/efl/ewk_cookie_manager_private.h
Source/WebKit2/UIProcess/API/efl/ewk_database_manager_private.h
Source/WebKit2/UIProcess/API/efl/ewk_error_private.h
Source/WebKit2/UIProcess/API/efl/ewk_favicon_database_private.h
Source/WebKit2/UIProcess/API/efl/ewk_file_chooser_request_private.h
Source/WebKit2/UIProcess/API/efl/ewk_page_group_private.h
Source/WebKit2/UIProcess/API/efl/ewk_popup_menu_item_private.h
Source/WebKit2/UIProcess/API/efl/ewk_popup_menu_private.h
Source/WebKit2/UIProcess/API/efl/ewk_security_origin_private.h
Source/WebKit2/UIProcess/API/efl/ewk_settings_private.h
Source/WebKit2/UIProcess/API/efl/ewk_storage_manager_private.h
Source/WebKit2/UIProcess/API/efl/ewk_view.cpp
Source/WebKit2/UIProcess/API/efl/ewk_view_private.h
Source/WebKit2/UIProcess/API/efl/ewk_window_features_private.h
Source/WebKit2/UIProcess/API/efl/tests/InjectedBundle/injected_bundle_sample.cpp
Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_eina_shared_string.cpp
Source/WebKit2/UIProcess/API/gtk/WebKitDownloadClient.cpp
Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h
Source/WebKit2/UIProcess/CoordinatedGraphics/WKCoordinatedSceneAPICast.h
Source/WebKit2/UIProcess/efl/BatteryProvider.h
Source/WebKit2/UIProcess/efl/ContextHistoryClientEfl.h
Source/WebKit2/UIProcess/efl/DownloadManagerEfl.h
Source/WebKit2/UIProcess/efl/FindClientEfl.h
Source/WebKit2/UIProcess/efl/FormClientEfl.h
Source/WebKit2/UIProcess/efl/PageLoadClientEfl.h
Source/WebKit2/UIProcess/efl/PagePolicyClientEfl.h
Source/WebKit2/UIProcess/efl/PageUIClientEfl.h
Source/WebKit2/UIProcess/efl/RequestManagerClientEfl.h
Source/WebKit2/UIProcess/efl/TextCheckerClientEfl.h
Source/WebKit2/UIProcess/efl/VibrationClientEfl.h
Source/WebKit2/UIProcess/efl/ViewClientEfl.cpp
Source/WebKit2/UIProcess/efl/ViewClientEfl.h
Source/WebKit2/UIProcess/efl/WebInspectorProxyEfl.cpp
Source/WebKit2/WebProcess/WebCoreSupport/efl/WebErrorsEfl.cpp
Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebErrorsGtk.cpp
Source/WebKit2/WebProcess/efl/SeccompFiltersWebProcessEfl.cpp
Source/WebKit2/WebProcess/efl/SeccompFiltersWebProcessEfl.h
Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp
Source/WebKit2/WebProcess/efl/WebProcessMainEfl.h
Source/WebKit2/WebProcess/gtk/WebGtkInjectedBundleMain.cpp
Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp
Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.h
Source/WebKit2/mac/WKPreferences.h
Tools/ChangeLog
Tools/MiniBrowser/MiniBrowserWebProcessPlugIn.h
Tools/MiniBrowser/mac/AppDelegate.m
Tools/MiniBrowser/mac/WK2BrowserWindowController.m
Tools/TestWebKitAPI/InjectedBundleController.h
Tools/TestWebKitAPI/InjectedBundleMain.cpp
Tools/TestWebKitAPI/JavaScriptTest.cpp
Tools/TestWebKitAPI/PlatformUtilities.h
Tools/TestWebKitAPI/Tests/CustomProtocolsSyncXHRTest.mm
Tools/TestWebKitAPI/Tests/WebKit2/CanHandleRequest.cpp
Tools/TestWebKitAPI/Tests/WebKit2/CanHandleRequest_Bundle.cpp
Tools/TestWebKitAPI/Tests/WebKit2/CookieManager.cpp
Tools/TestWebKitAPI/Tests/WebKit2/CoordinatedGraphics/WKViewIsActiveSetIsActive.cpp
Tools/TestWebKitAPI/Tests/WebKit2/CoordinatedGraphics/WKViewIsActiveSetIsActive_Bundle.cpp
Tools/TestWebKitAPI/Tests/WebKit2/CoordinatedGraphics/WKViewRestoreZoomAndScrollBackForward.cpp
Tools/TestWebKitAPI/Tests/WebKit2/CoordinatedGraphics/WKViewUserViewportToContents.cpp
Tools/TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionBasic.cpp
Tools/TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionBasic_Bundle.cpp
Tools/TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionNoCache_Bundle.cpp
Tools/TestWebKitAPI/Tests/WebKit2/DidAssociateFormControls_Bundle.cpp
Tools/TestWebKitAPI/Tests/WebKit2/DidNotHandleKeyDown.cpp
Tools/TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp
Tools/TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash_Bundle.cpp
Tools/TestWebKitAPI/Tests/WebKit2/DownloadDecideDestinationCrash.cpp
Tools/TestWebKitAPI/Tests/WebKit2/EphemeralSessionPushStateNoHistoryCallback.cpp
Tools/TestWebKitAPI/Tests/WebKit2/EvaluateJavaScript.cpp
Tools/TestWebKitAPI/Tests/WebKit2/FailedLoad.cpp
Tools/TestWebKitAPI/Tests/WebKit2/Find.cpp
Tools/TestWebKitAPI/Tests/WebKit2/FindMatches.mm
Tools/TestWebKitAPI/Tests/WebKit2/ForceRepaint.cpp
Tools/TestWebKitAPI/Tests/WebKit2/FrameMIMETypeHTML.cpp
Tools/TestWebKitAPI/Tests/WebKit2/FrameMIMETypePNG.cpp
Tools/TestWebKitAPI/Tests/WebKit2/Geolocation.cpp
Tools/TestWebKitAPI/Tests/WebKit2/GetInjectedBundleInitializationUserDataCallback.cpp
Tools/TestWebKitAPI/Tests/WebKit2/GetInjectedBundleInitializationUserDataCallback_Bundle.cpp
Tools/TestWebKitAPI/Tests/WebKit2/HitTestResultNodeHandle.cpp
Tools/TestWebKitAPI/Tests/WebKit2/HitTestResultNodeHandle_Bundle.cpp
Tools/TestWebKitAPI/Tests/WebKit2/InjectedBundleBasic.cpp
Tools/TestWebKitAPI/Tests/WebKit2/InjectedBundleBasic_Bundle.cpp
Tools/TestWebKitAPI/Tests/WebKit2/InjectedBundleFrameHitTest.cpp
Tools/TestWebKitAPI/Tests/WebKit2/InjectedBundleFrameHitTest_Bundle.cpp
Tools/TestWebKitAPI/Tests/WebKit2/InjectedBundleInitializationUserDataCallbackWins.cpp
Tools/TestWebKitAPI/Tests/WebKit2/InjectedBundleInitializationUserDataCallbackWins_Bundle.cpp
Tools/TestWebKitAPI/Tests/WebKit2/LayoutMilestonesWithAllContentInFrame.cpp
Tools/TestWebKitAPI/Tests/WebKit2/LoadAlternateHTMLStringWithNonDirectoryURL.cpp
Tools/TestWebKitAPI/Tests/WebKit2/LoadCanceledNoServerRedirectCallback.cpp
Tools/TestWebKitAPI/Tests/WebKit2/LoadCanceledNoServerRedirectCallback_Bundle.cpp
Tools/TestWebKitAPI/Tests/WebKit2/LoadPageOnCrash.cpp
Tools/TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayout.cpp
Tools/TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFails.cpp
Tools/TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFails_Bundle.cpp
Tools/TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutForImages.cpp
Tools/TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutForImages_Bundle.cpp
Tools/TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFrames.cpp
Tools/TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFrames_Bundle.cpp
Tools/TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayout_Bundle.cpp
Tools/TestWebKitAPI/Tests/WebKit2/PageLoadBasic.cpp
Tools/TestWebKitAPI/Tests/WebKit2/PageLoadDidChangeLocationWithinPageForFrame.cpp
Tools/TestWebKitAPI/Tests/WebKit2/ParentFrame.cpp
Tools/TestWebKitAPI/Tests/WebKit2/ParentFrame_Bundle.cpp
Tools/TestWebKitAPI/Tests/WebKit2/PasteboardNotifications.mm
Tools/TestWebKitAPI/Tests/WebKit2/PasteboardNotifications_Bundle.cpp
Tools/TestWebKitAPI/Tests/WebKit2/PreventEmptyUserAgent.cpp
Tools/TestWebKitAPI/Tests/WebKit2/PrivateBrowsingPushStateNoHistoryCallback.cpp
Tools/TestWebKitAPI/Tests/WebKit2/ReloadPageAfterCrash.cpp
Tools/TestWebKitAPI/Tests/WebKit2/ResizeReversePaginatedWebView.cpp
Tools/TestWebKitAPI/Tests/WebKit2/ResizeWindowAfterCrash.cpp
Tools/TestWebKitAPI/Tests/WebKit2/ScrollPinningBehaviors.cpp
Tools/TestWebKitAPI/Tests/WebKit2/SeccompFilters.cpp
Tools/TestWebKitAPI/Tests/WebKit2/ShouldGoToBackForwardListItem.cpp
Tools/TestWebKitAPI/Tests/WebKit2/ShouldGoToBackForwardListItem_Bundle.cpp
Tools/TestWebKitAPI/Tests/WebKit2/SpacebarScrolling.cpp
Tools/TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp
Tools/TestWebKitAPI/Tests/WebKit2/WKStringJSString.cpp
Tools/TestWebKitAPI/Tests/WebKit2/WebArchive.cpp
Tools/TestWebKitAPI/Tests/WebKit2/WebArchive_Bundle.cpp
Tools/TestWebKitAPI/Tests/WebKit2/WillLoad_Bundle.cpp
Tools/TestWebKitAPI/Tests/WebKit2/WillSendSubmitEvent_Bundle.cpp
Tools/TestWebKitAPI/Tests/WebKit2/efl/WKViewClientWebProcessCallbacks.cpp
Tools/TestWebKitAPI/Tests/WebKit2/efl/WKViewClientWebProcessCallbacks_Bundle.cpp
Tools/TestWebKitAPI/Tests/WebKit2/mac/EditorCommands.mm
Tools/TestWebKitAPI/Tests/WebKit2/mac/GetBackingScaleFactor.mm
Tools/TestWebKitAPI/Tests/WebKit2/mac/GetBackingScaleFactor_Bundle.mm
Tools/TestWebKitAPI/Tests/WebKit2/mac/GetPIDAfterAbortedProcessLaunch.cpp
Tools/TestWebKitAPI/Tests/WebKit2/mac/WeakObjCPtr.mm
Tools/TestWebKitAPI/Tests/WebKit2/win/AltKeyGeneratesWMSysCommand.cpp
Tools/TestWebKitAPI/Tests/WebKit2/win/DoNotCopyANullCFURLResponse.cpp
Tools/TestWebKitAPI/Tests/WebKit2/win/ResizeViewWhileHidden.cpp
Tools/TestWebKitAPI/Tests/WebKit2/win/TranslateMessageGeneratesWMChar.cpp
Tools/TestWebKitAPI/Tests/WebKit2/win/WMCloseCallsUIClientClose.cpp
Tools/TestWebKitAPI/Tests/WebKit2/win/WMPrint.cpp
Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Download.mm
Tools/TestWebKitAPI/Tests/WebKit2ObjC/CustomProtocolsInvalidScheme.mm
Tools/TestWebKitAPI/Tests/WebKit2ObjC/CustomProtocolsInvalidScheme_Bundle.cpp
Tools/TestWebKitAPI/Tests/WebKit2ObjC/CustomProtocolsTest.mm
Tools/TestWebKitAPI/Tests/WebKit2ObjC/PreventImageLoadWithAutoResizing.mm
Tools/TestWebKitAPI/Tests/WebKit2ObjC/PreventImageLoadWithAutoResizing_Bundle.cpp
Tools/TestWebKitAPI/Tests/WebKit2ObjC/UserContentTest.mm
Tools/TestWebKitAPI/Tests/WebKit2ObjC/WKBrowsingContextGroupTest.mm
Tools/TestWebKitAPI/Tests/WebKit2ObjC/WKBrowsingContextLoadDelegateTest.mm
Tools/TestWebKitAPI/Tests/mac/DeviceScaleFactorOnBack.mm
Tools/TestWebKitAPI/Tests/mac/PageVisibilityStateWithWindowChanges.mm
Tools/TestWebKitAPI/config.h
Tools/TestWebKitAPI/efl/PlatformWebView.cpp
Tools/TestWebKitAPI/mac/JavaScriptTestMac.mm
Tools/TestWebKitAPI/mac/PlatformUtilitiesMac.mm
Tools/TestWebKitAPI/mac/PlatformWebViewMac.mm
Tools/TestWebKitAPI/mac/TestBrowsingContextLoadDelegate.h
Tools/TestWebKitAPI/mac/WebKitAgnosticTest.mm
Tools/WebKitTestRunner/EventSenderProxy.h
Tools/WebKitTestRunner/GeolocationProviderMock.cpp
Tools/WebKitTestRunner/GeolocationProviderMock.h
Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.cpp
Tools/WebKitTestRunner/InjectedBundle/EventSendingController.cpp
Tools/WebKitTestRunner/InjectedBundle/EventSendingController.h
Tools/WebKitTestRunner/InjectedBundle/GCController.cpp
Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp
Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.h
Tools/WebKitTestRunner/InjectedBundle/InjectedBundleMain.cpp
Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp
Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.h
Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp
Tools/WebKitTestRunner/InjectedBundle/TestRunner.h
Tools/WebKitTestRunner/InjectedBundle/TextInputController.cpp
Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityControllerAtk.cpp
Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.cpp
Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp
Tools/WebKitTestRunner/InjectedBundle/cocoa/InjectedBundlePageCocoa.mm
Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityControllerIOS.mm
Tools/WebKitTestRunner/InjectedBundle/ios/EventSenderProxyIOS.mm
Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityControllerMac.mm
Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityNotificationHandler.mm
Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm
Tools/WebKitTestRunner/PlatformWebView.h
Tools/WebKitTestRunner/StringFunctions.h
Tools/WebKitTestRunner/TestController.cpp
Tools/WebKitTestRunner/TestController.h
Tools/WebKitTestRunner/TestInvocation.cpp
Tools/WebKitTestRunner/TestInvocation.h
Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h
Tools/WebKitTestRunner/WebNotificationProvider.cpp
Tools/WebKitTestRunner/WebNotificationProvider.h
Tools/WebKitTestRunner/WorkQueueManager.cpp
Tools/WebKitTestRunner/cairo/TestInvocationCairo.cpp
Tools/WebKitTestRunner/cg/TestInvocationCG.cpp
Tools/WebKitTestRunner/cocoa/CrashReporterInfo.mm
Tools/WebKitTestRunner/config.h
Tools/WebKitTestRunner/efl/PlatformWebViewEfl.cpp
Tools/WebKitTestRunner/gtk/PlatformWebViewGtk.cpp
Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm
Tools/WebKitTestRunner/ios/TestControllerIOS.mm
Tools/WebKitTestRunner/mac/EventSenderProxy.mm
Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm
Tools/WebKitTestRunner/mac/TestControllerMac.mm

index 0cec2d4..14b6d78 100644 (file)
@@ -1,3 +1,100 @@
+2014-05-16  Martin Hodovan  <mhodovan.u-szeged@partner.samsung.com>
+
+        [WK2] Change the remaining framework includes from WebKit2 to WebKit
+        https://bugs.webkit.org/show_bug.cgi?id=132956
+
+        Reviewed by Sam Weinig.
+
+        * NetworkProcess/unix/NetworkProcessMainUnix.cpp:
+        * NetworkProcess/unix/NetworkProcessMainUnix.h:
+        * PluginProcess/unix/PluginProcessMainUnix.h:
+        * Shared/API/c/cairo/WKImageCairo.h:
+        * Shared/API/c/cf/WKURLRequestCF.h:
+        * Shared/API/c/cf/WKURLResponseCF.h:
+        * Shared/API/c/efl/WKArrayEfl.cpp:
+        * Shared/API/c/efl/WKArrayEfl.h:
+        * UIProcess/API/C/CoordinatedGraphics/WKView.h:
+        * UIProcess/API/C/WKBatteryManager.h:
+        * UIProcess/API/C/WKBatteryStatus.h:
+        * UIProcess/API/C/WKGrammarDetail.h:
+        * UIProcess/API/C/WKTextChecker.h:
+        * UIProcess/API/C/WKVibration.h:
+        * UIProcess/API/C/WKViewportAttributes.h:
+        * UIProcess/API/C/cairo/WKIconDatabaseCairo.h:
+        * UIProcess/API/C/efl/WKAPICastEfl.h:
+        * UIProcess/API/C/efl/WKColorPickerResultListener.h:
+        * UIProcess/API/C/efl/WKEventEfl.h:
+        * UIProcess/API/C/efl/WKPageEfl.h:
+        * UIProcess/API/C/efl/WKPopupItem.h:
+        * UIProcess/API/C/efl/WKPopupMenuListener.h:
+        * UIProcess/API/C/efl/WKViewEfl.cpp:
+        * UIProcess/API/C/efl/WKViewEfl.h:
+        * UIProcess/API/C/gtk/WKFullScreenClientGtk.h:
+        * UIProcess/API/C/gtk/WKInspectorClientGtk.h:
+        * UIProcess/API/C/gtk/WKView.h:
+        * UIProcess/API/C/gtk/WKViewPrivate.h:
+        * UIProcess/API/C/soup/WKContextSoup.h:
+        * UIProcess/API/C/soup/WKCookieManagerSoup.h:
+        * UIProcess/API/C/soup/WKSoupCustomProtocolRequestManager.h:
+        * UIProcess/API/C/soup/WKSoupRequestManager.h:
+        * UIProcess/API/Cocoa/WKErrorRecoveryAttempting.h:
+        * UIProcess/API/CoordinatedGraphics/WKCoordinatedScene.h:
+        * UIProcess/API/cpp/efl/WKEinaSharedString.cpp:
+        * UIProcess/API/cpp/efl/WKEinaSharedString.h:
+        * UIProcess/API/efl/EwkView.cpp:
+        * UIProcess/API/efl/EwkView.h:
+        * UIProcess/API/efl/EwkViewCallbacks.h:
+        * UIProcess/API/efl/GestureRecognizer.h:
+        * UIProcess/API/efl/ewk_application_cache_manager_private.h:
+        * UIProcess/API/efl/ewk_auth_request_private.h:
+        * UIProcess/API/efl/ewk_back_forward_list_item_private.h:
+        * UIProcess/API/efl/ewk_back_forward_list_private.h:
+        * UIProcess/API/efl/ewk_context_menu_item.cpp:
+        * UIProcess/API/efl/ewk_context_private.h:
+        * UIProcess/API/efl/ewk_cookie_manager_private.h:
+        * UIProcess/API/efl/ewk_database_manager_private.h:
+        * UIProcess/API/efl/ewk_error_private.h:
+        * UIProcess/API/efl/ewk_favicon_database_private.h:
+        * UIProcess/API/efl/ewk_file_chooser_request_private.h:
+        * UIProcess/API/efl/ewk_page_group_private.h:
+        * UIProcess/API/efl/ewk_popup_menu_item_private.h:
+        * UIProcess/API/efl/ewk_popup_menu_private.h:
+        * UIProcess/API/efl/ewk_security_origin_private.h:
+        * UIProcess/API/efl/ewk_settings_private.h:
+        * UIProcess/API/efl/ewk_storage_manager_private.h:
+        * UIProcess/API/efl/ewk_view.cpp:
+        * UIProcess/API/efl/ewk_view_private.h:
+        * UIProcess/API/efl/ewk_window_features_private.h:
+        * UIProcess/API/efl/tests/InjectedBundle/injected_bundle_sample.cpp:
+        * UIProcess/API/efl/tests/test_ewk2_eina_shared_string.cpp:
+        * UIProcess/API/gtk/WebKitDownloadClient.cpp:
+        * UIProcess/API/gtk/WebKitPrivate.h:
+        * UIProcess/CoordinatedGraphics/WKCoordinatedSceneAPICast.h:
+        * UIProcess/efl/BatteryProvider.h:
+        * UIProcess/efl/ContextHistoryClientEfl.h:
+        * UIProcess/efl/DownloadManagerEfl.h:
+        * UIProcess/efl/FindClientEfl.h:
+        * UIProcess/efl/FormClientEfl.h:
+        * UIProcess/efl/PageLoadClientEfl.h:
+        * UIProcess/efl/PagePolicyClientEfl.h:
+        * UIProcess/efl/PageUIClientEfl.h:
+        * UIProcess/efl/RequestManagerClientEfl.h:
+        * UIProcess/efl/TextCheckerClientEfl.h:
+        * UIProcess/efl/VibrationClientEfl.h:
+        * UIProcess/efl/ViewClientEfl.cpp:
+        * UIProcess/efl/ViewClientEfl.h:
+        * UIProcess/efl/WebInspectorProxyEfl.cpp:
+        * WebProcess/WebCoreSupport/efl/WebErrorsEfl.cpp:
+        * WebProcess/WebCoreSupport/gtk/WebErrorsGtk.cpp:
+        * WebProcess/efl/SeccompFiltersWebProcessEfl.cpp:
+        * WebProcess/efl/SeccompFiltersWebProcessEfl.h:
+        * WebProcess/efl/WebProcessMainEfl.cpp:
+        * WebProcess/efl/WebProcessMainEfl.h:
+        * WebProcess/gtk/WebGtkInjectedBundleMain.cpp:
+        * WebProcess/gtk/WebProcessMainGtk.cpp:
+        * WebProcess/gtk/WebProcessMainGtk.h:
+        * mac/WKPreferences.h:
+
 2014-05-15  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 
         [EFL][WK2] Skip failing unit tests
index 84c66a7..db1b686 100644 (file)
@@ -32,7 +32,7 @@
 #include "WKBase.h"
 #include "WebKit2Initialize.h"
 #include <WebCore/SoupNetworkSession.h>
-#include <WebKit2/NetworkProcess.h>
+#include <WebKit/NetworkProcess.h>
 #include <runtime/InitializeThreading.h>
 #include <stdlib.h>
 #include <wtf/MainThread.h>
index cb62eda..6a56bd8 100644 (file)
@@ -27,7 +27,7 @@
 #ifndef NetworkProcessMainUnix_h
 #define NetworkProcessMainUnix_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 namespace WebKit {
 
index 540c596..d9d699d 100644 (file)
@@ -27,7 +27,7 @@
 #ifndef PluginProcessMainUnix_h
 #define PluginProcessMainUnix_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 namespace WebKit {
 
index 5c1e541..06749f6 100644 (file)
@@ -27,8 +27,8 @@
 #ifndef WKImageCairo_h
 #define WKImageCairo_h
 
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKImage.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKImage.h>
 
 typedef struct _cairo_surface cairo_surface_t;
 
index fb7dab2..9e4a0cb 100644 (file)
@@ -27,7 +27,7 @@
 #define WKURLRequestCF_h
 
 #include <CFNetwork/CFURLRequestPriv.h>
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 5ce7184..8af716f 100644 (file)
@@ -27,7 +27,7 @@
 #define WKURLResponseCF_h
 
 #include <CFNetwork/CFURLResponsePriv.h>
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 9778a99..75c282e 100644 (file)
@@ -29,7 +29,7 @@
 #include "WKArray.h"
 #include "WKString.h"
 #include <Eina.h>
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKRetainPtr.h>
 #include <wtf/Vector.h>
 
 using namespace WebKit;
index 5533b2e..5e24eb0 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKArrayEfl_h
 #define WKArrayEfl_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 WK_EXPORT WKArrayRef WKArrayCreateWithEinaList(Eina_List*, WKTypeRef (*createWKType)(void*));
 
index b8e96be..f1488e3 100644 (file)
@@ -21,8 +21,8 @@
 #ifndef WKView_h
 #define WKView_h
 
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKGeometry.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKGeometry.h>
 
 #ifndef __cplusplus
 #include <stdbool.h>
index 75b3eaf..5c2ce75 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKBatteryManager_h
 #define WKBatteryManager_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index afa1dd9..b32b99f 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKBatteryStatus_h
 #define WKBatteryStatus_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index c187ce6..2493c44 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKGrammarDetail_h
 #define WKGrammarDetail_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index af72c75..a324694 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKTextChecker_h
 #define WKTextChecker_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index c18000b..965749c 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKVibration_h
 #define WKVibration_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 125b09c..8ab84ed 100644 (file)
@@ -26,8 +26,8 @@
 #ifndef WKViewportAttributes_h
 #define WKViewportAttributes_h
 
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKGeometry.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKGeometry.h>
 
 #ifdef __cplusplus
 extern "C" {
index ea62311..5830177 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 typedef struct _cairo_surface cairo_surface_t;
 
index 87c5f5e..581d408 100644 (file)
 #endif
 
 #include <WebCore/TextDirection.h>
-#include <WebKit2/WKPopupItem.h>
+#include <WebKit/WKPopupItem.h>
 
 #if ENABLE(TOUCH_EVENTS)
 #include "WebEvent.h"
-#include <WebKit2/WKEventEfl.h>
+#include <WebKit/WKEventEfl.h>
 #endif
 
 namespace WebKit {
index bfd4732..f37c0b1 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKColorPickerResultListener_h
 #define WKColorPickerResultListener_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index b543921..f6461e9 100644 (file)
@@ -27,8 +27,8 @@
 #ifndef WKEventEfl_h
 #define WKEventEfl_h
 
-#include <WebKit2/WKEvent.h>
-#include <WebKit2/WKGeometry.h>
+#include <WebKit/WKEvent.h>
+#include <WebKit/WKGeometry.h>
 
 #ifdef __cplusplus
 extern "C" {
index 8be7f43..cd4bb8a 100644 (file)
@@ -26,9 +26,9 @@
 #ifndef WKPageEfl_h
 #define WKPageEfl_h
 
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKGeometry.h>
-#include <WebKit2/WKPopupItem.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKGeometry.h>
+#include <WebKit/WKPopupItem.h>
 
 #ifdef __cplusplus
 extern "C" {
index b418ed5..972ba31 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKPopupItem_h
 #define WKPopupItem_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 8549916..6b8f700 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKPopupMenuListener_h
 #define WKPopupMenuListener_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 6f25c59..10087f1 100644 (file)
@@ -30,7 +30,7 @@
 #include "WKAPICast.h"
 #include "WebViewEfl.h"
 #include <Evas.h>
-#include <WebKit2/WKImageCairo.h>
+#include <WebKit/WKImageCairo.h>
 
 using namespace WebKit;
 
index 505d1f2..749f82b 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKViewEfl_h
 #define WKViewEfl_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 typedef struct _Evas_Event_Mouse_Down Evas_Event_Mouse_Down;
 typedef struct _Evas_Event_Mouse_Move Evas_Event_Mouse_Move;
index a292dda..cece105 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKFullScreenClientGtk_h
 #define WKFullScreenClientGtk_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 28242da..33b9eff 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKInspectorClientGtk_h
 #define WKInspectorClientGtk_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 291dfe1..b7d89e2 100644 (file)
@@ -28,7 +28,7 @@
 #ifndef WKView_h
 #define WKView_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 2c1b2d1..acabfd3 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKViewPrivate_h
 #define WKViewPrivate_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 36954ff..cd42f39 100644 (file)
@@ -26,8 +26,8 @@
 #ifndef WKContextSoup_h
 #define WKContextSoup_h
 
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKSoupRequestManager.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKSoupRequestManager.h>
 
 #ifdef __cplusplus
 extern "C" {
index 0a7b4ff..90cafca 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKCookieManagerSoup_h
 #define WKCookieManagerSoup_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index cb0edc7..822a762 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKSoupCustomProtocolRequestManager_h
 #define WKSoupCustomProtocolRequestManager_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index be8c0b5..f667ede 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKSoupRequestManager_h
 #define WKSoupRequestManager_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index bf141e4..062bdc3 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
 #import <Foundation/Foundation.h>
-#import <WebKit2/WKDeclarationSpecifiers.h>
+#import <WebKit/WKDeclarationSpecifiers.h>
 
 WK_EXPORT extern NSString * const WKRecoveryAttempterErrorKey;
 
index b330031..0612128 100644 (file)
@@ -28,7 +28,7 @@
 #ifndef WKCoordinatedScene_h
 #define WKCoordinatedScene_h
 
-#include <WebKit2/WKGeometry.h>
+#include <WebKit/WKGeometry.h>
 
 #ifdef __cplusplus
 extern "C" {
index ecb7b5f..2db9240 100644 (file)
@@ -26,9 +26,9 @@
 #include "config.h"
 #include "WKEinaSharedString.h"
 
-#include <WebKit2/WKAPICast.h>
-#include <WebKit2/WKString.h>
-#include <WebKit2/WKURL.h>
+#include <WebKit/WKAPICast.h>
+#include <WebKit/WKString.h>
+#include <WebKit/WKURL.h>
 #include <wtf/text/CString.h>
 
 using namespace WebKit;
index dbb5f47..2b7ea76 100644 (file)
@@ -27,8 +27,8 @@
 #define WKEinaSharedString_h
 
 #include <Eina.h>
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKRetainPtr.h>
 
 namespace WebKit {
 
index c9a60ee..c00fa98 100644 (file)
@@ -71,7 +71,7 @@
 #include <WebCore/Cursor.h>
 #include <WebCore/NotImplemented.h>
 #include <WebCore/PlatformContextCairo.h>
-#include <WebKit2/WKImageCairo.h>
+#include <WebKit/WKImageCairo.h>
 #include <wtf/NeverDestroyed.h>
 #include <wtf/StdLibExtras.h>
 
index d3617e9..d9da440 100644 (file)
@@ -32,7 +32,7 @@
 #include <WebCore/RefPtrCairo.h>
 #include <WebCore/TextDirection.h>
 #include <WebCore/Timer.h>
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #if ENABLE(TOUCH_EVENTS)
 #include "GestureRecognizer.h"
index 840e5cd..c779ee7 100644 (file)
@@ -29,7 +29,7 @@
 #include "WKEinaSharedString.h"
 #include "ewk_view.h"
 #include <Evas.h>
-#include <WebKit2/WKGeometry.h>
+#include <WebKit/WKGeometry.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/WTFString.h>
 
index 4ab002f..5990aec 100644 (file)
@@ -30,7 +30,7 @@
 #if ENABLE(TOUCH_EVENTS)
 #include "EflTypedefs.h"
 #include <WebCore/IntPoint.h>
-#include <WebKit2/WKEventEfl.h>
+#include <WebKit/WKEventEfl.h>
 
 class EwkView;
 
index 8f22c00..768dfbd 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "WKApplicationCacheManager.h"
 #include "WKRetainPtr.h"
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 class EwkApplicationCacheManager {
 public:
index 7ca9be3..7966411 100644 (file)
@@ -29,7 +29,7 @@
 #include "WKEinaSharedString.h"
 #include "WKRetainPtr.h"
 #include "ewk_object_private.h"
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/text/WTFString.h>
 
index 7b6d20a..ff5e171 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "WKEinaSharedString.h"
 #include "ewk_object_private.h"
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 #include <wtf/PassRefPtr.h>
 
 /**
index 35c209d..bc4cc0e 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "WKRetainPtr.h"
 #include "ewk_back_forward_list_item_private.h"
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 #include <wtf/HashMap.h>
 
 typedef HashMap<WKBackForwardListItemRef, RefPtr<EwkBackForwardListItem> > ItemsMap;
index ba440e2..5861602 100644 (file)
@@ -29,7 +29,7 @@
 #include "ewk_context_menu_item_private.h"
 #include "ewk_context_menu_private.h"
 #include "ewk_private.h"
-#include <WebKit2/WKContextMenuItemTypes.h>
+#include <WebKit/WKContextMenuItemTypes.h>
 #include <wtf/text/CString.h>
 
 using namespace WebKit;
index c2895c0..1729c4a 100644 (file)
@@ -23,8 +23,8 @@
 #include "ewk_context.h"
 #include "ewk_object_private.h"
 #include <JavaScriptCore/JSContextRef.h>
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKRetainPtr.h>
 #include <wtf/RefPtr.h>
 #include <wtf/text/WTFString.h>
 
index 5aec8d1..da62fe0 100644 (file)
@@ -30,7 +30,7 @@
 #include "WKCookieManagerSoup.h"
 #include "WKRetainPtr.h"
 #include "ewk_cookie_manager.h"
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 struct Cookie_Change_Handler {
     Ewk_Cookie_Manager_Changes_Watch_Cb callback;
index 3cd12a9..0ee1f08 100644 (file)
@@ -29,7 +29,7 @@
 #include "WKDatabaseManager.h"
 #include "WKRetainPtr.h"
 #include "ewk_security_origin_private.h"
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 using namespace WebKit;
 
index 37ed869..78fd8ee 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "WKEinaSharedString.h"
 #include <WKRetainPtr.h>
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 class EwkError {
 public:
index 4ef0ec4..62e1924 100644 (file)
@@ -28,7 +28,7 @@
 #define ewk_favicon_database_private_h
 
 #include "WKRetainPtr.h"
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 #include <wtf/HashMap.h>
 
 struct IconChangeCallbackData {
index 688a391..c586561 100644 (file)
@@ -29,7 +29,7 @@
 #include "APIObject.h"
 #include "WKRetainPtr.h"
 #include "ewk_object_private.h"
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 #include <wtf/PassRefPtr.h>
 
 class EwkFileChooserRequest : public EwkObject {
index d503ffb..f8eb9a2 100644 (file)
@@ -28,9 +28,9 @@
 
 #include "EflTypedefs.h"
 #include "ewk_object_private.h"
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKRetainPtr.h>
-#include <WebKit2/WKURL.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKRetainPtr.h>
+#include <WebKit/WKURL.h>
 #include <wtf/RefCounted.h>
 #include <wtf/RefPtr.h>
 
index 1907844..0c641b3 100644 (file)
@@ -29,7 +29,7 @@
 #include "WKEinaSharedString.h"
 #include "WKRetainPtr.h"
 #include "ewk_popup_menu_item.h"
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 /**
  * \struct  Ewk_Popup_Menu_Item
index be29c2e..5ec9310 100644 (file)
@@ -28,7 +28,7 @@
 #define ewk_popup_menu_private_h
 
 #include "EflTypedefs.h"
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 class EwkView;
 
index 56f6cf0..bf30384 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "WKEinaSharedString.h"
 #include "ewk_object_private.h"
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 #include <wtf/PassRefPtr.h>
 
 class EwkSecurityOrigin : public EwkObject {
index de9d5ad..6f36959 100644 (file)
@@ -29,7 +29,7 @@
 
 #include "WKEinaSharedString.h"
 #include "WKRetainPtr.h"
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 /**
  * \struct  Ewk_Settings
index f5dc81b..a91db5a 100644 (file)
@@ -29,7 +29,7 @@
 #include "WKKeyValueStorageManager.h"
 #include "WKRetainPtr.h"
 #include "ewk_security_origin_private.h"
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 using namespace WebKit;
 
index 70f0c47..04c9b89 100644 (file)
 #include "ewk_private.h"
 #include "ewk_settings_private.h"
 #include <JavaScriptCore/JSRetainPtr.h>
-#include <WebKit2/WKAPICast.h>
-#include <WebKit2/WKData.h>
-#include <WebKit2/WKEinaSharedString.h>
-#include <WebKit2/WKFindOptions.h>
-#include <WebKit2/WKInspector.h>
-#include <WebKit2/WKPageGroup.h>
-#include <WebKit2/WKRetainPtr.h>
-#include <WebKit2/WKSerializedScriptValue.h>
-#include <WebKit2/WKString.h>
-#include <WebKit2/WKURL.h>
-#include <WebKit2/WKView.h>
-#include <WebKit2/WKViewEfl.h>
+#include <WebKit/WKAPICast.h>
+#include <WebKit/WKData.h>
+#include <WebKit/WKEinaSharedString.h>
+#include <WebKit/WKFindOptions.h>
+#include <WebKit/WKInspector.h>
+#include <WebKit/WKPageGroup.h>
+#include <WebKit/WKRetainPtr.h>
+#include <WebKit/WKSerializedScriptValue.h>
+#include <WebKit/WKString.h>
+#include <WebKit/WKURL.h>
+#include <WebKit/WKView.h>
+#include <WebKit/WKViewEfl.h>
 #include <wtf/text/CString.h>
 
 #if ENABLE(INSPECTOR)
index 6de35d9..0e8d458 100644 (file)
@@ -27,7 +27,7 @@
 #define ewk_view_private_h
 
 #include <Evas.h>
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 94f9d4d..e520167 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "EflTypedefs.h"
 #include "ewk_object_private.h"
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 #include <wtf/RefCounted.h>
 
 class EwkView;
index 55f0f19..74ce13b 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <WebKit2/WKBundleInitialize.h>
+#include <WebKit/WKBundleInitialize.h>
 
 #ifdef __cplusplus
 extern "C" {
index babc07e..563c3b7 100644 (file)
@@ -27,8 +27,8 @@
 
 #include "UnitTestUtils/EWK2UnitTestBase.h"
 #include "WKEinaSharedString.h"
-#include <WebKit2/WKString.h>
-#include <WebKit2/WKURL.h>
+#include <WebKit/WKString.h>
+#include <WebKit/WKURL.h>
 
 using namespace EWK2UnitTest;
 
index 2df118c..197b6b5 100644 (file)
@@ -25,7 +25,7 @@
 #include "WebKitDownloadPrivate.h"
 #include "WebKitURIResponsePrivate.h"
 #include "WebKitWebContextPrivate.h"
-#include <WebKit2/WKString.h>
+#include <WebKit/WKString.h>
 #include <wtf/gobject/GRefPtr.h>
 #include <wtf/text/CString.h>
 
index 315bd16..fab0865 100644 (file)
 #ifndef WebKitPrivate_h
 #define WebKitPrivate_h
 
-#include <WebKit2/WKAPICast.h>
-#include <WebKit2/WKDownload.h>
-#include <WebKit2/WKFindOptions.h>
-#include <WebKit2/WKFullScreenClientGtk.h>
-#include <WebKit2/WKGeolocationManager.h>
-#include <WebKit2/WKGeolocationPermissionRequest.h>
-#include <WebKit2/WKGeolocationPosition.h>
-#include <WebKit2/WKIconDatabase.h>
-#include <WebKit2/WKInspector.h>
-#include <WebKit2/WKInspectorClientGtk.h>
-#include <WebKit2/WKRetainPtr.h>
-#include <WebKit2/WKSerializedScriptValue.h>
-#include <WebKit2/WKSoupCustomProtocolRequestManager.h>
-#include <WebKit2/WKString.h>
-#include <WebKit2/WKTextChecker.h>
-#include <WebKit2/WebKit2_C.h>
+#include <WebKit/WKAPICast.h>
+#include <WebKit/WKDownload.h>
+#include <WebKit/WKFindOptions.h>
+#include <WebKit/WKFullScreenClientGtk.h>
+#include <WebKit/WKGeolocationManager.h>
+#include <WebKit/WKGeolocationPermissionRequest.h>
+#include <WebKit/WKGeolocationPosition.h>
+#include <WebKit/WKIconDatabase.h>
+#include <WebKit/WKInspector.h>
+#include <WebKit/WKInspectorClientGtk.h>
+#include <WebKit/WKRetainPtr.h>
+#include <WebKit/WKSerializedScriptValue.h>
+#include <WebKit/WKSoupCustomProtocolRequestManager.h>
+#include <WebKit/WKString.h>
+#include <WebKit/WKTextChecker.h>
+#include <WebKit/WebKit2_C.h>
 #include <glib.h>
 #include <wtf/Assertions.h>
 
index 6cf199a..87fb69e 100644 (file)
@@ -28,7 +28,7 @@
 #ifndef WKCoordinatedSceneAPICast_h
 #define WKCoordinatedSceneAPICast_h
 
-#include <WebKit2/WKCoordinatedScene.h>
+#include <WebKit/WKCoordinatedScene.h>
 
 namespace WebCore {
 
index 7988cd9..ba886c9 100644 (file)
@@ -31,8 +31,8 @@
 #include "BatteryProviderEfl.h"
 #include "BatteryProviderEflClient.h"
 #include "BatteryStatus.h"
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKRetainPtr.h>
 #include <wtf/PassRefPtr.h>
 
 namespace WebKit {
index 76acec7..8c5a088 100644 (file)
@@ -27,8 +27,8 @@
 #define ContextHistoryClientEfl_h
 
 #include "ewk_context.h"
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKRetainPtr.h>
 
 namespace WebKit {
 
index 09930e6..1428d3d 100644 (file)
@@ -27,7 +27,7 @@
 #define DownloadManagerEfl_h
 
 #include "ewk_download_job_private.h"
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKRetainPtr.h>
 #include <wtf/HashMap.h>
 #include <wtf/RefPtr.h>
 
index 36deeee..eab79d5 100644 (file)
@@ -27,7 +27,7 @@
 #ifndef FindClientEfl_h
 #define FindClientEfl_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 class EwkView;
 
index d8040d8..68a4783 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef FormClientEfl_h
 #define FormClientEfl_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 class EwkView;
 
index 8584bdf..11ecc4f 100644 (file)
@@ -27,7 +27,7 @@
 #define PageLoadClientEfl_h
 
 #include "WKPageLoadTypes.h"
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 class EwkView;
 
index c0b2b54..8214c79 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "WKEvent.h"
 #include "WKPageLoadTypes.h"
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 class EwkView;
 
index bf0504d..651cad4 100644 (file)
@@ -29,7 +29,7 @@
 
 #include "WKPage.h"
 #include "WKPopupItem.h"
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 class EwkView;
 
index 8c94f69..c9049f6 100644 (file)
@@ -27,8 +27,8 @@
 #define RequestManagerClientEfl_h
 
 #include "ewk_context_private.h"
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKRetainPtr.h>
 #include <wtf/HashMap.h>
 #include <wtf/text/WTFString.h>
 
index 1d6c6d6..3333b6c 100644 (file)
@@ -30,8 +30,8 @@
 
 #include "TextCheckerEnchant.h"
 #include "Timer.h"
-#include <WebKit2/WKTextChecker.h>
-#include <WebKit2/ewk_text_checker_private.h>
+#include <WebKit/WKTextChecker.h>
+#include <WebKit/ewk_text_checker_private.h>
 
 namespace WebKit {
 
index 5c48605..ea09824 100644 (file)
@@ -28,7 +28,7 @@
 
 #if ENABLE(VIBRATION)
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 class EwkView;
 
index 2cd189c..6ee30ae 100644 (file)
@@ -31,9 +31,9 @@
 #include "WebViewportAttributes.h"
 #include "ewk_private.h"
 #include "ewk_view.h"
-#include <WebKit2/WKString.h>
-#include <WebKit2/WKView.h>
-#include <WebKit2/WKViewEfl.h>
+#include <WebKit/WKString.h>
+#include <WebKit/WKView.h>
+#include <WebKit/WKViewEfl.h>
 
 using namespace EwkViewCallbacks;
 using namespace WebCore;
index 943bf95..3de6298 100644 (file)
@@ -26,8 +26,8 @@
 #ifndef ViewClientEfl_h
 #define ViewClientEfl_h
 
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKGeometry.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKGeometry.h>
 
 class EwkView;
 
index 9bc23a3..eec39cc 100644 (file)
 #include "ewk_view_private.h"
 #include <WebCore/EflInspectorUtilities.h>
 #include <WebCore/NotImplemented.h>
-#include <WebKit2/WKPage.h>
-#include <WebKit2/WKPageGroup.h>
-#include <WebKit2/WKString.h>
-#include <WebKit2/WKViewEfl.h>
+#include <WebKit/WKPage.h>
+#include <WebKit/WKPageGroup.h>
+#include <WebKit/WKString.h>
+#include <WebKit/WKViewEfl.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/StringBuilder.h>
 #include <wtf/text/WTFString.h>
index 84cefeb..d431219 100644 (file)
@@ -31,7 +31,7 @@
 #include <WebCore/ResourceError.h>
 #include <WebCore/ResourceRequest.h>
 #include <WebCore/ResourceResponse.h>
-#include <WebKit2/WKError.h>
+#include <WebKit/WKError.h>
 
 using namespace WebCore;
 
index 7d05108..d130ded 100644 (file)
@@ -33,7 +33,7 @@
 #include <WebCore/ResourceError.h>
 #include <WebCore/ResourceRequest.h>
 #include <WebCore/ResourceResponse.h>
-#include <WebKit2/WKError.h>
+#include <WebKit/WKError.h>
 #include <glib/gi18n-lib.h>
 
 using namespace WebCore;
index 258f01b..d49e0be 100644 (file)
@@ -29,7 +29,7 @@
 #if ENABLE(SECCOMP_FILTERS)
 
 #include "WebProcessCreationParameters.h"
-#include <WebKit2/SeccompBroker.h>
+#include <WebKit/SeccompBroker.h>
 #include <sys/types.h>
 #include <unistd.h>
 
index 6e32948..db40dc4 100644 (file)
@@ -28,8 +28,8 @@
 
 #if ENABLE(SECCOMP_FILTERS)
 
-#include <WebKit2/SeccompFilters.h>
-#include <WebKit2/SyscallPolicy.h>
+#include <WebKit/SeccompFilters.h>
+#include <WebKit/SyscallPolicy.h>
 
 namespace WebKit {
 
index 7acc8ec..c625b70 100644 (file)
@@ -36,7 +36,7 @@
 #include <WebCore/AuthenticationChallenge.h>
 #include <WebCore/NetworkingContext.h>
 #include <WebCore/SoupNetworkSession.h>
-#include <WebKit2/WebProcess.h>
+#include <WebKit/WebProcess.h>
 #include <libsoup/soup.h>
 #include <runtime/JSCInlines.h>
 #include <unistd.h>
index 34d4743..174fb68 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WebProcessMainEfl_h
 #define WebProcessMainEfl_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 namespace WebKit {
 
index 84ff809..f192faa 100644 (file)
@@ -20,7 +20,7 @@
 #include "config.h"
 
 #include "WebGtkExtensionManager.h"
-#include <WebKit2/WKBundleInitialize.h>
+#include <WebKit/WKBundleInitialize.h>
 
 using namespace WebKit;
 
index 57d4ab3..471c007 100644 (file)
@@ -32,7 +32,7 @@
 #include <WebCore/AuthenticationChallenge.h>
 #include <WebCore/NetworkingContext.h>
 #include <WebCore/SoupNetworkSession.h>
-#include <WebKit2/WebProcess.h>
+#include <WebKit/WebProcess.h>
 #include <gtk/gtk.h>
 #include <libintl.h>
 #include <libsoup/soup.h>
index 828af83..f518cd3 100644 (file)
@@ -27,7 +27,7 @@
 #ifndef WebProcessMainGtk_h
 #define WebProcessMainGtk_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 namespace WebKit {
 
index 2d0690d..8576213 100644 (file)
@@ -1 +1 @@
-#import <WebKit2/WKPreferencesRef.h>
+#import <WebKit/WKPreferencesRef.h>
index 0cecb00..3c29d8e 100644 (file)
@@ -1,3 +1,165 @@
+2014-05-16  Martin Hodovan  <mhodovan.u-szeged@partner.samsung.com>
+
+        [WK2] Change the remaining framework includes from WebKit2 to WebKit
+        https://bugs.webkit.org/show_bug.cgi?id=132956
+
+        Reviewed by Sam Weinig.
+
+        * MiniBrowser/MiniBrowserWebProcessPlugIn.h:
+        * MiniBrowser/mac/AppDelegate.m:
+        * MiniBrowser/mac/WK2BrowserWindowController.m:
+        * TestWebKitAPI/InjectedBundleController.h:
+        * TestWebKitAPI/InjectedBundleMain.cpp:
+        * TestWebKitAPI/JavaScriptTest.cpp:
+        * TestWebKitAPI/PlatformUtilities.h:
+        * TestWebKitAPI/Tests/CustomProtocolsSyncXHRTest.mm:
+        * TestWebKitAPI/Tests/WebKit2/CanHandleRequest.cpp:
+        * TestWebKitAPI/Tests/WebKit2/CanHandleRequest_Bundle.cpp:
+        * TestWebKitAPI/Tests/WebKit2/CookieManager.cpp:
+        * TestWebKitAPI/Tests/WebKit2/CoordinatedGraphics/WKViewIsActiveSetIsActive.cpp:
+        (TestWebKitAPI::TEST):
+        * TestWebKitAPI/Tests/WebKit2/CoordinatedGraphics/WKViewIsActiveSetIsActive_Bundle.cpp:
+        * TestWebKitAPI/Tests/WebKit2/CoordinatedGraphics/WKViewRestoreZoomAndScrollBackForward.cpp:
+        * TestWebKitAPI/Tests/WebKit2/CoordinatedGraphics/WKViewUserViewportToContents.cpp:
+        * TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionBasic.cpp:
+        * TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionBasic_Bundle.cpp:
+        * TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionNoCache_Bundle.cpp:
+        * TestWebKitAPI/Tests/WebKit2/DidAssociateFormControls_Bundle.cpp:
+        * TestWebKitAPI/Tests/WebKit2/DidNotHandleKeyDown.cpp:
+        * TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp:
+        * TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash_Bundle.cpp:
+        * TestWebKitAPI/Tests/WebKit2/DownloadDecideDestinationCrash.cpp:
+        * TestWebKitAPI/Tests/WebKit2/EphemeralSessionPushStateNoHistoryCallback.cpp:
+        * TestWebKitAPI/Tests/WebKit2/EvaluateJavaScript.cpp:
+        * TestWebKitAPI/Tests/WebKit2/FailedLoad.cpp:
+        * TestWebKitAPI/Tests/WebKit2/Find.cpp:
+        * TestWebKitAPI/Tests/WebKit2/FindMatches.mm:
+        * TestWebKitAPI/Tests/WebKit2/ForceRepaint.cpp:
+        * TestWebKitAPI/Tests/WebKit2/FrameMIMETypeHTML.cpp:
+        * TestWebKitAPI/Tests/WebKit2/FrameMIMETypePNG.cpp:
+        * TestWebKitAPI/Tests/WebKit2/Geolocation.cpp:
+        * TestWebKitAPI/Tests/WebKit2/GetInjectedBundleInitializationUserDataCallback.cpp:
+        * TestWebKitAPI/Tests/WebKit2/GetInjectedBundleInitializationUserDataCallback_Bundle.cpp:
+        * TestWebKitAPI/Tests/WebKit2/HitTestResultNodeHandle.cpp:
+        * TestWebKitAPI/Tests/WebKit2/HitTestResultNodeHandle_Bundle.cpp:
+        * TestWebKitAPI/Tests/WebKit2/InjectedBundleBasic.cpp:
+        * TestWebKitAPI/Tests/WebKit2/InjectedBundleBasic_Bundle.cpp:
+        * TestWebKitAPI/Tests/WebKit2/InjectedBundleFrameHitTest.cpp:
+        * TestWebKitAPI/Tests/WebKit2/InjectedBundleFrameHitTest_Bundle.cpp:
+        * TestWebKitAPI/Tests/WebKit2/InjectedBundleInitializationUserDataCallbackWins.cpp:
+        * TestWebKitAPI/Tests/WebKit2/InjectedBundleInitializationUserDataCallbackWins_Bundle.cpp:
+        * TestWebKitAPI/Tests/WebKit2/LayoutMilestonesWithAllContentInFrame.cpp:
+        * TestWebKitAPI/Tests/WebKit2/LoadAlternateHTMLStringWithNonDirectoryURL.cpp:
+        * TestWebKitAPI/Tests/WebKit2/LoadCanceledNoServerRedirectCallback.cpp:
+        * TestWebKitAPI/Tests/WebKit2/LoadCanceledNoServerRedirectCallback_Bundle.cpp:
+        * TestWebKitAPI/Tests/WebKit2/LoadPageOnCrash.cpp:
+        * TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayout.cpp:
+        * TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFails.cpp:
+        * TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFails_Bundle.cpp:
+        * TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutForImages.cpp:
+        * TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutForImages_Bundle.cpp:
+        * TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFrames.cpp:
+        * TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFrames_Bundle.cpp:
+        * TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayout_Bundle.cpp:
+        * TestWebKitAPI/Tests/WebKit2/PageLoadBasic.cpp:
+        * TestWebKitAPI/Tests/WebKit2/PageLoadDidChangeLocationWithinPageForFrame.cpp:
+        * TestWebKitAPI/Tests/WebKit2/ParentFrame.cpp:
+        * TestWebKitAPI/Tests/WebKit2/ParentFrame_Bundle.cpp:
+        * TestWebKitAPI/Tests/WebKit2/PasteboardNotifications.mm:
+        * TestWebKitAPI/Tests/WebKit2/PasteboardNotifications_Bundle.cpp:
+        * TestWebKitAPI/Tests/WebKit2/PreventEmptyUserAgent.cpp:
+        * TestWebKitAPI/Tests/WebKit2/PrivateBrowsingPushStateNoHistoryCallback.cpp:
+        * TestWebKitAPI/Tests/WebKit2/ReloadPageAfterCrash.cpp:
+        * TestWebKitAPI/Tests/WebKit2/ResizeReversePaginatedWebView.cpp:
+        * TestWebKitAPI/Tests/WebKit2/ResizeWindowAfterCrash.cpp:
+        * TestWebKitAPI/Tests/WebKit2/ScrollPinningBehaviors.cpp:
+        * TestWebKitAPI/Tests/WebKit2/SeccompFilters.cpp:
+        * TestWebKitAPI/Tests/WebKit2/ShouldGoToBackForwardListItem.cpp:
+        * TestWebKitAPI/Tests/WebKit2/ShouldGoToBackForwardListItem_Bundle.cpp:
+        * TestWebKitAPI/Tests/WebKit2/SpacebarScrolling.cpp:
+        * TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp:
+        * TestWebKitAPI/Tests/WebKit2/WKStringJSString.cpp:
+        * TestWebKitAPI/Tests/WebKit2/WebArchive.cpp:
+        * TestWebKitAPI/Tests/WebKit2/WebArchive_Bundle.cpp:
+        * TestWebKitAPI/Tests/WebKit2/WillLoad_Bundle.cpp:
+        * TestWebKitAPI/Tests/WebKit2/WillSendSubmitEvent_Bundle.cpp:
+        * TestWebKitAPI/Tests/WebKit2/efl/WKViewClientWebProcessCallbacks.cpp:
+        * TestWebKitAPI/Tests/WebKit2/efl/WKViewClientWebProcessCallbacks_Bundle.cpp:
+        * TestWebKitAPI/Tests/WebKit2/mac/EditorCommands.mm:
+        * TestWebKitAPI/Tests/WebKit2/mac/GetBackingScaleFactor.mm:
+        * TestWebKitAPI/Tests/WebKit2/mac/GetBackingScaleFactor_Bundle.mm:
+        * TestWebKitAPI/Tests/WebKit2/mac/GetPIDAfterAbortedProcessLaunch.cpp:
+        * TestWebKitAPI/Tests/WebKit2/mac/WeakObjCPtr.mm:
+        * TestWebKitAPI/Tests/WebKit2/win/AltKeyGeneratesWMSysCommand.cpp:
+        * TestWebKitAPI/Tests/WebKit2/win/DoNotCopyANullCFURLResponse.cpp:
+        * TestWebKitAPI/Tests/WebKit2/win/ResizeViewWhileHidden.cpp:
+        * TestWebKitAPI/Tests/WebKit2/win/TranslateMessageGeneratesWMChar.cpp:
+        * TestWebKitAPI/Tests/WebKit2/win/WMCloseCallsUIClientClose.cpp:
+        * TestWebKitAPI/Tests/WebKit2/win/WMPrint.cpp:
+        * TestWebKitAPI/Tests/WebKit2Cocoa/Download.mm:
+        * TestWebKitAPI/Tests/WebKit2ObjC/CustomProtocolsInvalidScheme.mm:
+        * TestWebKitAPI/Tests/WebKit2ObjC/CustomProtocolsInvalidScheme_Bundle.cpp:
+        * TestWebKitAPI/Tests/WebKit2ObjC/CustomProtocolsTest.mm:
+        * TestWebKitAPI/Tests/WebKit2ObjC/PreventImageLoadWithAutoResizing.mm:
+        * TestWebKitAPI/Tests/WebKit2ObjC/PreventImageLoadWithAutoResizing_Bundle.cpp:
+        * TestWebKitAPI/Tests/WebKit2ObjC/UserContentTest.mm:
+        * TestWebKitAPI/Tests/WebKit2ObjC/WKBrowsingContextGroupTest.mm:
+        * TestWebKitAPI/Tests/WebKit2ObjC/WKBrowsingContextLoadDelegateTest.mm:
+        * TestWebKitAPI/Tests/mac/DeviceScaleFactorOnBack.mm:
+        * TestWebKitAPI/Tests/mac/PageVisibilityStateWithWindowChanges.mm:
+        * TestWebKitAPI/config.h:
+        * TestWebKitAPI/efl/PlatformWebView.cpp:
+        * TestWebKitAPI/mac/JavaScriptTestMac.mm:
+        * TestWebKitAPI/mac/PlatformUtilitiesMac.mm:
+        * TestWebKitAPI/mac/PlatformWebViewMac.mm:
+        * TestWebKitAPI/mac/TestBrowsingContextLoadDelegate.h:
+        * TestWebKitAPI/mac/WebKitAgnosticTest.mm:
+        * WebKitTestRunner/EventSenderProxy.h:
+        * WebKitTestRunner/GeolocationProviderMock.cpp:
+        * WebKitTestRunner/GeolocationProviderMock.h:
+        * WebKitTestRunner/InjectedBundle/AccessibilityController.cpp:
+        * WebKitTestRunner/InjectedBundle/EventSendingController.cpp:
+        * WebKitTestRunner/InjectedBundle/EventSendingController.h:
+        * WebKitTestRunner/InjectedBundle/GCController.cpp:
+        * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
+        * WebKitTestRunner/InjectedBundle/InjectedBundle.h:
+        * WebKitTestRunner/InjectedBundle/InjectedBundleMain.cpp:
+        * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+        * WebKitTestRunner/InjectedBundle/InjectedBundlePage.h:
+        * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
+        * WebKitTestRunner/InjectedBundle/TestRunner.h:
+        * WebKitTestRunner/InjectedBundle/TextInputController.cpp:
+        * WebKitTestRunner/InjectedBundle/atk/AccessibilityControllerAtk.cpp:
+        * WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.cpp:
+        * WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp:
+        * WebKitTestRunner/InjectedBundle/cocoa/InjectedBundlePageCocoa.mm:
+        * WebKitTestRunner/InjectedBundle/ios/AccessibilityControllerIOS.mm:
+        * WebKitTestRunner/InjectedBundle/ios/EventSenderProxyIOS.mm:
+        * WebKitTestRunner/InjectedBundle/mac/AccessibilityControllerMac.mm:
+        * WebKitTestRunner/InjectedBundle/mac/AccessibilityNotificationHandler.mm:
+        * WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm:
+        * WebKitTestRunner/PlatformWebView.h:
+        * WebKitTestRunner/StringFunctions.h:
+        * WebKitTestRunner/TestController.cpp:
+        * WebKitTestRunner/TestController.h:
+        * WebKitTestRunner/TestInvocation.cpp:
+        * WebKitTestRunner/TestInvocation.h:
+        * WebKitTestRunner/WebKitTestRunnerPrefix.h:
+        * WebKitTestRunner/WebNotificationProvider.cpp:
+        * WebKitTestRunner/WebNotificationProvider.h:
+        * WebKitTestRunner/WorkQueueManager.cpp:
+        * WebKitTestRunner/cairo/TestInvocationCairo.cpp:
+        * WebKitTestRunner/cg/TestInvocationCG.cpp:
+        * WebKitTestRunner/cocoa/CrashReporterInfo.mm:
+        * WebKitTestRunner/config.h:
+        * WebKitTestRunner/efl/PlatformWebViewEfl.cpp:
+        * WebKitTestRunner/gtk/PlatformWebViewGtk.cpp:
+        * WebKitTestRunner/ios/PlatformWebViewIOS.mm:
+        * WebKitTestRunner/ios/TestControllerIOS.mm:
+        * WebKitTestRunner/mac/EventSenderProxy.mm:
+        * WebKitTestRunner/mac/PlatformWebViewMac.mm:
+        * WebKitTestRunner/mac/TestControllerMac.mm:
+
 2014-05-15  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 
         [EFL][WK2] Skip failing unit tests
index b996926..ff16bf5 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKWebProcessPlugIn.h>
+#import <WebKit/WKWebProcessPlugIn.h>
 
 #if WK_API_ENABLED
 
index 8a82d8c..a25375b 100644 (file)
@@ -28,7 +28,7 @@
 #import "WK1BrowserWindowController.h"
 #import "WK2BrowserWindowController.h"
 #import <WebKit/WebHistory.h>
-#import <WebKit2/WebKit2.h>
+#import <WebKit/WebKit2.h>
 
 static NSString *defaultURL = @"http://www.webkit.org/";
 
index 0695c2d..066b86d 100644 (file)
 #if WK_API_ENABLED
 
 #import "AppDelegate.h"
-#import <WebKit2/WKFrameInfo.h>
-#import <WebKit2/WKNavigationDelegate.h>
-#import <WebKit2/WKUIDelegate.h>
-#import <WebKit2/WKWebView.h>
-#import <WebKit2/WKWebViewPrivate.h>
+#import <WebKit/WKFrameInfo.h>
+#import <WebKit/WKNavigationDelegate.h>
+#import <WebKit/WKUIDelegate.h>
+#import <WebKit/WKWebView.h>
+#import <WebKit/WKWebViewPrivate.h>
 
 static void* keyValueObservingContext = &keyValueObservingContext;
 static NSString * const WebKit2UseRemoteLayerTreeDrawingAreaKey = @"WebKit2UseRemoteLayerTreeDrawingArea";
index 0ca1125..61a096c 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef InjectedBundleController_h
 #define InjectedBundleController_h
 
-#include <WebKit2/WKBundle.h>
+#include <WebKit/WKBundle.h>
 #include <map>
 #include <string>
 
index 8ad6c2b..6715ef9 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "config.h"
 #include "InjectedBundleController.h"
-#include <WebKit2/WKBundleInitialize.h>
+#include <WebKit/WKBundleInitialize.h>
 
 #if defined(WIN32) || defined(_WIN32)
 extern "C" __declspec(dllexport) 
index de1848f..3957eff 100644 (file)
@@ -30,8 +30,8 @@
 #include "Test.h"
 #include <JavaScriptCore/JSContextRef.h>
 #include <JavaScriptCore/JSRetainPtr.h>
-#include <WebKit2/WKRetainPtr.h>
-#include <WebKit2/WKSerializedScriptValue.h>
+#include <WebKit/WKRetainPtr.h>
+#include <WebKit/WKSerializedScriptValue.h>
 #include <wtf/StdLibExtras.h>
 
 namespace TestWebKitAPI {
index 7b35460..858e6b7 100644 (file)
@@ -26,8 +26,8 @@
 #ifndef PlatformUtilities_h
 #define PlatformUtilities_h
 
-#include <WebKit2/WKNativeEvent.h>
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKNativeEvent.h>
+#include <WebKit/WKRetainPtr.h>
 #include <string>
 
 #if USE(FOUNDATION)
index c03b125..aa9a22d 100644 (file)
 #import "PlatformUtilities.h"
 #import "TestBrowsingContextLoadDelegate.h"
 #import "TestProtocol.h"
-#import <WebKit2/WKBrowsingContextGroupPrivate.h>
-#import <WebKit2/WKPreferencesPrivate.h>
-#import <WebKit2/WKRetainPtr.h>
-#import <WebKit2/WKString.h>
-#import <WebKit2/WKViewPrivate.h>
+#import <WebKit/WKBrowsingContextGroupPrivate.h>
+#import <WebKit/WKPreferencesPrivate.h>
+#import <WebKit/WKRetainPtr.h>
+#import <WebKit/WKString.h>
+#import <WebKit/WKViewPrivate.h>
 #import <wtf/RetainPtr.h>
 
 #if WK_API_ENABLED
index 4c0c779..005f9ff 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
-#include <WebKit2/WKContextPrivate.h>
+#include <WebKit/WKContextPrivate.h>
 
 namespace TestWebKitAPI {
 
index 5f66b53..ddbe9f2 100644 (file)
@@ -27,7 +27,7 @@
 #include "InjectedBundleTest.h"
 
 #include "PlatformUtilities.h"
-#include <WebKit2/WKBundlePage.h>
+#include <WebKit/WKBundlePage.h>
 
 namespace TestWebKitAPI {
 
index 2f17b81..fb0a321 100644 (file)
@@ -26,8 +26,8 @@
 #include "config.h"
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
-#include <WebKit2/WKCookieManager.h>
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKCookieManager.h>
+#include <WebKit/WKRetainPtr.h>
 
 namespace TestWebKitAPI {
 
index 889bb72..ef9625b 100644 (file)
 #include "PlatformUtilities.h"
 #include "Test.h"
 
-#include <WebKit2/WKContext.h>
-#include <WebKit2/WKPage.h>
-#include <WebKit2/WKRetainPtr.h>
-#include <WebKit2/WKView.h>
+#include <WebKit/WKContext.h>
+#include <WebKit/WKPage.h>
+#include <WebKit/WKRetainPtr.h>
+#include <WebKit/WKView.h>
 
 namespace TestWebKitAPI {
 
@@ -112,7 +112,7 @@ TEST(WebKit2, WKViewIsActive)
     didWebProcessCrash = false;
     didWebProcessRelaunch = false;
 
-    WKRetainPtr<WKURLRef> simpleUrl = adoptWK(Util::createURLForResource("../WebKit2/simple", "html"));
+    WKRetainPtr<WKURLRef> simpleUrl = adoptWK(Util::createURLForResource("../WebKit/simple", "html"));
     WKPageLoadURL(WKViewGetPage(view.get()), simpleUrl.get());
     Util::run(&didFinishLoad);
     didFinishLoad = false;
index f208ad7..5c556ec 100644 (file)
@@ -29,8 +29,8 @@
 #include "ewk_view_private.h"
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
-#include <WebKit2/WKContext.h>
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKContext.h>
+#include <WebKit/WKRetainPtr.h>
 #include "Test.h"
 
 namespace TestWebKitAPI {
index a4b4a5a..70899b8 100644 (file)
@@ -25,8 +25,8 @@
 
 #include "config.h"
 
-#include "WebKit2/WKView.h"
-#include "WebKit2/WKRetainPtr.h"
+#include "WebKit/WKView.h"
+#include "WebKit/WKRetainPtr.h"
 
 namespace TestWebKitAPI {
 
index 06abe88..032de6f 100644 (file)
@@ -27,7 +27,7 @@
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
 #include "Test.h"
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKRetainPtr.h>
 #include <wtf/Vector.h>
 
 namespace TestWebKitAPI {
index 5c94662..0004f27 100644 (file)
 
 #include "config.h"
 #include "InjectedBundleTest.h"
-#include <WebKit2/WKBundleDOMWindowExtension.h>
-#include <WebKit2/WKBundleFrame.h>
-#include <WebKit2/WKBundlePage.h>
-#include <WebKit2/WKBundlePageGroup.h>
-#include <WebKit2/WKBundlePrivate.h>
-#include <WebKit2/WKBundleScriptWorld.h>
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKBundleDOMWindowExtension.h>
+#include <WebKit/WKBundleFrame.h>
+#include <WebKit/WKBundlePage.h>
+#include <WebKit/WKBundlePageGroup.h>
+#include <WebKit/WKBundlePrivate.h>
+#include <WebKit/WKBundleScriptWorld.h>
+#include <WebKit/WKRetainPtr.h>
 #include <wtf/HashMap.h>
 #include <assert.h>
 
index 680c172..f7e0d0f 100644 (file)
 
 #include "config.h"
 #include "InjectedBundleTest.h"
-#include <WebKit2/WKBundleDOMWindowExtension.h>
-#include <WebKit2/WKBundleFrame.h>
-#include <WebKit2/WKBundlePage.h>
-#include <WebKit2/WKBundlePageGroup.h>
-#include <WebKit2/WKBundlePrivate.h>
-#include <WebKit2/WKBundleScriptWorld.h>
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKBundleDOMWindowExtension.h>
+#include <WebKit/WKBundleFrame.h>
+#include <WebKit/WKBundlePage.h>
+#include <WebKit/WKBundlePageGroup.h>
+#include <WebKit/WKBundlePrivate.h>
+#include <WebKit/WKBundleScriptWorld.h>
+#include <WebKit/WKRetainPtr.h>
 #include <wtf/HashMap.h>
 #include <assert.h>
 
index fd373d2..5989850 100644 (file)
@@ -27,8 +27,8 @@
 #include "InjectedBundleTest.h"
 
 #include "PlatformUtilities.h"
-#include <WebKit2/WKBundle.h>
-#include <WebKit2/WKBundlePage.h>
+#include <WebKit/WKBundle.h>
+#include <WebKit/WKBundlePage.h>
 
 namespace TestWebKitAPI {
 
index e0c5cb0..a8716f6 100644 (file)
@@ -27,7 +27,7 @@
 #include "JavaScriptTest.h"
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKRetainPtr.h>
 
 namespace TestWebKitAPI {
 
index efdcd56..3920982 100644 (file)
@@ -27,7 +27,7 @@
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
 #include "Test.h"
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKRetainPtr.h>
 
 namespace TestWebKitAPI {
 
index 30805f7..04a0467 100644 (file)
 
 #include "config.h"
 #include "InjectedBundleTest.h"
-#include <WebKit2/WKBundlePageGroup.h>
-#include <WebKit2/WKBundlePrivate.h>
-#include <WebKit2/WKBundleScriptWorld.h>
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKBundlePageGroup.h>
+#include <WebKit/WKBundlePrivate.h>
+#include <WebKit/WKBundleScriptWorld.h>
+#include <WebKit/WKRetainPtr.h>
 #include <assert.h>
 
 namespace TestWebKitAPI {
index d252d95..30c4394 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
-#include <WebKit2/WKDownload.h>
+#include <WebKit/WKDownload.h>
 
 namespace TestWebKitAPI {
 
index 8303194..4a779c8 100644 (file)
@@ -27,7 +27,7 @@
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
 #include "Test.h"
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKRetainPtr.h>
 
 namespace TestWebKitAPI {
 
index 90ad04f..0ce1f5e 100644 (file)
@@ -27,8 +27,8 @@
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
 #include "Test.h"
-#include <WebKit2/WKRetainPtr.h>
-#include <WebKit2/WKSerializedScriptValue.h>
+#include <WebKit/WKRetainPtr.h>
+#include <WebKit/WKSerializedScriptValue.h>
 
 namespace TestWebKitAPI {
 
index ac8d6a3..6a2aeb7 100644 (file)
@@ -27,7 +27,7 @@
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
 #include "Test.h"
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKRetainPtr.h>
 
 namespace TestWebKitAPI {
 
index 41b52ea..b7711e7 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKRetainPtr.h>
 
 namespace TestWebKitAPI {
 
index 18416e8..bab42c5 100644 (file)
@@ -28,7 +28,7 @@
 #include "PlatformWebView.h"
 #import <WebKit/WebDocumentPrivate.h>
 #import <WebKit/DOMPrivate.h>
-#include <WebKit2/WKImage.h>
+#include <WebKit/WKImage.h>
 #import <wtf/RetainPtr.h>
 
 @interface FindMatchesWK1FrameLoadDelegate : NSObject {
index 86c6754..a454db1 100644 (file)
@@ -27,7 +27,7 @@
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
 #include "Test.h"
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKRetainPtr.h>
 
 namespace TestWebKitAPI {
 
index 093a574..2ca6d16 100644 (file)
@@ -27,7 +27,7 @@
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
 #include "Test.h"
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKRetainPtr.h>
 
 namespace TestWebKitAPI {
 
index edaa7ca..40edd52 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKRetainPtr.h>
 
 namespace TestWebKitAPI {
 
index bf7a937..ebc2383 100644 (file)
@@ -27,7 +27,7 @@
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
 #include "Test.h"
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKRetainPtr.h>
 #include <string.h>
 #include <vector>
 
index fe898ff..037de98 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKRetainPtr.h>
 
 namespace TestWebKitAPI {
 
index 2f7c7de..4884183 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKRetainPtr.h>
 
 namespace TestWebKitAPI {
 
index c6aaa1f..76a182e 100644 (file)
@@ -27,9 +27,9 @@
 #include "InjectedBundleTest.h"
 #include "InjectedBundleController.h"
 #include "PlatformUtilities.h"
-#include <WebKit2/WKBundlePage.h>
-#include <WebKit2/WKBundleHitTestResult.h>
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKBundlePage.h>
+#include <WebKit/WKBundleHitTestResult.h>
+#include <WebKit/WKRetainPtr.h>
 
 namespace TestWebKitAPI {
 
index 1b3b3b7..e38228d 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKRetainPtr.h>
 
 namespace TestWebKitAPI {
 
index 6a597be..5cc7a4f 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "config.h"
 #include "InjectedBundleTest.h"
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKRetainPtr.h>
 
 namespace TestWebKitAPI {
 
index acc76c0..b635d3e 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKRetainPtr.h>
 
 namespace TestWebKitAPI {
 
index 6ae0187..80087f2 100644 (file)
 #include "config.h"
 #include "InjectedBundleTest.h"
 #include "PlatformUtilities.h"
-#include <WebKit2/WKBundle.h>
-#include <WebKit2/WKBundleFramePrivate.h>
-#include <WebKit2/WKBundleHitTestResult.h>
-#include <WebKit2/WKBundlePage.h>
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKBundle.h>
+#include <WebKit/WKBundleFramePrivate.h>
+#include <WebKit/WKBundleHitTestResult.h>
+#include <WebKit/WKBundlePage.h>
+#include <WebKit/WKRetainPtr.h>
 
 namespace TestWebKitAPI {
 
index 407ecce..c3d2908 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKRetainPtr.h>
 
 namespace TestWebKitAPI {
 
index ef53f5e..d228521 100644 (file)
@@ -27,8 +27,8 @@
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
 #include "Test.h"
-#include <WebKit2/WKContextPrivate.h>
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKContextPrivate.h>
+#include <WebKit/WKRetainPtr.h>
 
 namespace TestWebKitAPI {
 
index def60bc..aa1f636 100644 (file)
@@ -28,9 +28,9 @@
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
 
-#include <WebKit2/WKContext.h>
-#include <WebKit2/WKPage.h>
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKContext.h>
+#include <WebKit/WKPage.h>
+#include <WebKit/WKRetainPtr.h>
 
 namespace TestWebKitAPI {
     
index abf4471..ac40126 100644 (file)
@@ -28,9 +28,9 @@
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
 
-#include <WebKit2/WKContext.h>
-#include <WebKit2/WKFrame.h>
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKContext.h>
+#include <WebKit/WKFrame.h>
+#include <WebKit/WKRetainPtr.h>
 
 namespace TestWebKitAPI {
 
index 13aa110..7a80ad9 100644 (file)
@@ -28,9 +28,9 @@
 #include "PlatformUtilities.h"
 #include "Test.h"
 
-#include <WebKit2/WKBundlePage.h>
-#include <WebKit2/WKBundleFrame.h>
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKBundlePage.h>
+#include <WebKit/WKBundleFrame.h>
+#include <WebKit/WKRetainPtr.h>
 
 #include <wtf/Assertions.h>
 
index 3228d08..08ba4d4 100644 (file)
@@ -27,7 +27,7 @@
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
 #include "Test.h"
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKRetainPtr.h>
 
 namespace TestWebKitAPI {
 
index 640a825..9137b01 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
-#include <WebKit2/WKContextPrivate.h>
+#include <WebKit/WKContextPrivate.h>
 
 namespace TestWebKitAPI {
 
index 1568b76..6c57111 100644 (file)
@@ -27,8 +27,8 @@
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
 #include "Test.h"
-#include <WebKit2/WKContextPrivate.h>
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKContextPrivate.h>
+#include <WebKit/WKRetainPtr.h>
 
 namespace TestWebKitAPI {
 
index b909ec9..682cc15 100644 (file)
@@ -27,8 +27,8 @@
 #include "InjectedBundleTest.h"
 
 #include "PlatformUtilities.h"
-#include <WebKit2/WKBundlePage.h>
-#include <WebKit2/WKBundlePagePrivate.h>
+#include <WebKit/WKBundlePage.h>
+#include <WebKit/WKBundlePagePrivate.h>
 
 namespace TestWebKitAPI {
 
index 11fc17e..d45820a 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
-#include <WebKit2/WKContextPrivate.h>
+#include <WebKit/WKContextPrivate.h>
 
 namespace TestWebKitAPI {
 
index bdaade7..d5bfa53 100644 (file)
@@ -27,8 +27,8 @@
 #include "InjectedBundleTest.h"
 
 #include "PlatformUtilities.h"
-#include <WebKit2/WKBundlePage.h>
-#include <WebKit2/WKBundlePagePrivate.h>
+#include <WebKit/WKBundlePage.h>
+#include <WebKit/WKBundlePagePrivate.h>
 
 namespace TestWebKitAPI {
 
index 04d6ee4..be6880b 100644 (file)
@@ -27,8 +27,8 @@
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
 #include "Test.h"
-#include <WebKit2/WKContextPrivate.h>
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKContextPrivate.h>
+#include <WebKit/WKRetainPtr.h>
 
 namespace TestWebKitAPI {
 
index 33e16bd..8b5c069 100644 (file)
@@ -27,8 +27,8 @@
 #include "InjectedBundleTest.h"
 
 #include "PlatformUtilities.h"
-#include <WebKit2/WKBundlePage.h>
-#include <WebKit2/WKBundlePagePrivate.h>
+#include <WebKit/WKBundlePage.h>
+#include <WebKit/WKBundlePagePrivate.h>
 
 namespace TestWebKitAPI {
 
index c408c3b..226f9ec 100644 (file)
@@ -27,8 +27,8 @@
 #include "InjectedBundleTest.h"
 
 #include "PlatformUtilities.h"
-#include <WebKit2/WKBundlePage.h>
-#include <WebKit2/WKBundlePagePrivate.h>
+#include <WebKit/WKBundlePage.h>
+#include <WebKit/WKBundlePagePrivate.h>
 
 namespace TestWebKitAPI {
 
index cbb685a..603d0e6 100644 (file)
@@ -27,7 +27,7 @@
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
 #include "Test.h"
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKRetainPtr.h>
 
 namespace TestWebKitAPI {
 
index 8ef9bb6..a950f8e 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKRetainPtr.h>
 
 namespace TestWebKitAPI {
 
index ec97ac0..c82b991 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
-#include <WebKit2/WKContextPrivate.h>
+#include <WebKit/WKContextPrivate.h>
 
 namespace TestWebKitAPI {
 
index b233362..b08e935 100644 (file)
@@ -27,9 +27,9 @@
 #include "InjectedBundleTest.h"
 
 #include "PlatformUtilities.h"
-#include <WebKit2/WKBundlePage.h>
-#include <WebKit2/WKBundleFrame.h>
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKBundlePage.h>
+#include <WebKit/WKBundleFrame.h>
+#include <WebKit/WKRetainPtr.h>
 
 namespace TestWebKitAPI {
 
index 7ee1a5a..40c75a1 100644 (file)
@@ -28,7 +28,7 @@
 #include "PlatformWebView.h"
 #include "Test.h"
 
-#include <WebKit2/WKString.h>
+#include <WebKit/WKString.h>
 
 namespace TestWebKitAPI {
 
index 81bc03a..8f82fcf 100644 (file)
 #include "InjectedBundleTest.h"
 
 #include "PlatformUtilities.h"
-#include <WebKit2/WKArray.h>
-#include <WebKit2/WKBundlePage.h>
-#include <WebKit2/WKBundleBackForwardListItem.h>
-#include <WebKit2/WKWebArchive.h>
+#include <WebKit/WKArray.h>
+#include <WebKit/WKBundlePage.h>
+#include <WebKit/WKBundleBackForwardListItem.h>
+#include <WebKit/WKWebArchive.h>
 
 namespace TestWebKitAPI {
 
index c5acb61..6d9bc60 100644 (file)
@@ -28,8 +28,8 @@
 #include "PlatformWebView.h"
 #include "Test.h"
 #include <JavaScriptCore/JSContextRef.h>
-#include <WebKit2/WKRetainPtr.h>
-#include <WebKit2/WKSerializedScriptValue.h>
+#include <WebKit/WKRetainPtr.h>
+#include <WebKit/WKSerializedScriptValue.h>
 
 namespace TestWebKitAPI {
 
index b50f141..bf31057 100644 (file)
@@ -27,7 +27,7 @@
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
 #include "Test.h"
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKRetainPtr.h>
 
 namespace TestWebKitAPI {
 
index fb265ab..f336ac7 100644 (file)
@@ -27,7 +27,7 @@
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
 #include "Test.h"
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKRetainPtr.h>
 
 namespace TestWebKitAPI {
 
index af1f1e7..c777aa4 100644 (file)
@@ -29,9 +29,9 @@
 #include "PlatformWebView.h"
 #include "Test.h"
 #include <JavaScriptCore/JSContextRef.h>
-#include <WebKit2/WKContextPrivate.h>
-#include <WebKit2/WKPagePrivate.h>
-#include <WebKit2/WKSerializedScriptValue.h>
+#include <WebKit/WKContextPrivate.h>
+#include <WebKit/WKPagePrivate.h>
+#include <WebKit/WKSerializedScriptValue.h>
 
 namespace TestWebKitAPI {
 
index 4cd9edd..84a3f2f 100644 (file)
@@ -27,7 +27,7 @@
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
 #include "Test.h"
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKRetainPtr.h>
 
 namespace TestWebKitAPI {
 
index 1d051e5..57c5a8b 100644 (file)
 #include "PlatformWebView.h"
 #include "Test.h"
 #include <JavaScriptCore/JSContextRef.h>
-#include <WebKit2/WKContextPrivate.h>
-#include <WebKit2/WKPagePrivate.h>
-#include <WebKit2/WKPreferencesRefPrivate.h>
-#include <WebKit2/WKSerializedScriptValue.h>
+#include <WebKit/WKContextPrivate.h>
+#include <WebKit/WKPagePrivate.h>
+#include <WebKit/WKPreferencesRefPrivate.h>
+#include <WebKit/WKSerializedScriptValue.h>
 
 namespace TestWebKitAPI {
 
index 3891d8e..9ca6080 100644 (file)
@@ -25,9 +25,9 @@
 
 #include "config.h"
 
-#include <WebKit2/SeccompBroker.h>
-#include <WebKit2/SeccompFilters.h>
-#include <WebKit2/SyscallPolicy.h>
+#include <WebKit/SeccompBroker.h>
+#include <WebKit/SeccompFilters.h>
+#include <WebKit/SyscallPolicy.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <pthread.h>
index 5754155..f0baacc 100644 (file)
@@ -28,7 +28,7 @@
 #include "PlatformWebView.h"
 #include "Test.h"
 
-#include <WebKit2/WKString.h>
+#include <WebKit/WKString.h>
 
 namespace TestWebKitAPI {
 
index dd81bf3..a394639 100644 (file)
@@ -27,8 +27,8 @@
 #include "InjectedBundleTest.h"
 
 #include "PlatformUtilities.h"
-#include <WebKit2/WKBundlePage.h>
-#include <WebKit2/WKBundleBackForwardListItem.h>
+#include <WebKit/WKBundlePage.h>
+#include <WebKit/WKBundleBackForwardListItem.h>
 
 namespace TestWebKitAPI {
 
index 7bf461e..3613726 100644 (file)
@@ -27,8 +27,8 @@
 #include "JavaScriptTest.h"
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
-#include <WebKit2/WKRetainPtr.h>
-#include <WebKit2/WKPreferencesPrivate.h>
+#include <WebKit/WKRetainPtr.h>
+#include <WebKit/WKPreferencesPrivate.h>
 
 namespace TestWebKitAPI {
 
index 817cd12..38183e0 100644 (file)
@@ -25,8 +25,8 @@
 
 #include "config.h"
 #include "PlatformUtilities.h"
-#include <WebKit2/WKPreferencesRefPrivate.h>
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKPreferencesRefPrivate.h>
+#include <WebKit/WKRetainPtr.h>
 
 namespace TestWebKitAPI {
 
index cdba57d..53568da 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#include <WebKit2/WKStringPrivate.h>
+#include <WebKit/WKStringPrivate.h>
 #include <JavaScriptCore/JSStringRef.h>
 
 namespace TestWebKitAPI {
index 7707b24..04e7206 100644 (file)
@@ -27,8 +27,8 @@
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
 #include <CoreFoundation/CoreFoundation.h>
-#include <WebKit2/WKURLCF.h>
-#include <WebKit2/WKContextPrivate.h>
+#include <WebKit/WKURLCF.h>
+#include <WebKit/WKContextPrivate.h>
 #include <wtf/RetainPtr.h>
 
 namespace TestWebKitAPI {
index f588595..8ee79b1 100644 (file)
@@ -27,8 +27,8 @@
 #include "InjectedBundleTest.h"
 
 #include "PlatformUtilities.h"
-#include <WebKit2/WKBundlePage.h>
-#include <WebKit2/WKBundleFrame.h>
+#include <WebKit/WKBundlePage.h>
+#include <WebKit/WKBundleFrame.h>
 
 namespace TestWebKitAPI {
 
index 783aebe..04039c3 100644 (file)
@@ -27,8 +27,8 @@
 #include "InjectedBundleTest.h"
 
 #include "PlatformUtilities.h"
-#include <WebKit2/WKBundlePage.h>
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKBundlePage.h>
+#include <WebKit/WKRetainPtr.h>
 
 namespace TestWebKitAPI {
 
index e85ca25..37db274 100644 (file)
@@ -27,7 +27,7 @@
 #include "InjectedBundleTest.h"
 
 #include "PlatformUtilities.h"
-#include <WebKit2/WKBundlePage.h>
+#include <WebKit/WKBundlePage.h>
 
 namespace TestWebKitAPI {
 
index 6741e9f..96abad4 100644 (file)
@@ -29,7 +29,7 @@
 #include "PlatformWebView.h"
 #include "Test.h"
 #include "WKView.h"
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKRetainPtr.h>
 
 namespace TestWebKitAPI {
 
index eacb7e3..f46ad9a 100644 (file)
@@ -27,9 +27,9 @@
 #include "JavaScriptTest.h"
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
-#include <WebKit2/WKRetainPtr.h>
-#include <WebKit2/WKPage.h>
-#include <WebKit2/WKPreferencesPrivate.h>
+#include <WebKit/WKRetainPtr.h>
+#include <WebKit/WKPage.h>
+#include <WebKit/WKPreferencesPrivate.h>
 
 namespace TestWebKitAPI {
 
index 033cff5..f947a8c 100644 (file)
@@ -28,7 +28,7 @@
 #import "PlatformUtilities.h"
 #import "SyntheticBackingScaleFactorWindow.h"
 #import "Test.h"
-#import <WebKit2/WKViewPrivate.h>
+#import <WebKit/WKViewPrivate.h>
 #import <wtf/RetainPtr.h>
 
 namespace TestWebKitAPI {
index b8bceab..57ee5d0 100644 (file)
@@ -27,7 +27,7 @@
 
 #import "InjectedBundleTest.h"
 #import "PlatformUtilities.h"
-#import <WebKit2/WKBundlePage.h>
+#import <WebKit/WKBundlePage.h>
 #import <assert.h>
 
 namespace TestWebKitAPI {
index 9158672..c5c3eff 100644 (file)
@@ -27,8 +27,8 @@
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
 
-#include <WebKit2/WKPagePrivateMac.h>
-#include <WebKit2/WKContextPrivate.h>
+#include <WebKit/WKPagePrivateMac.h>
+#include <WebKit/WKContextPrivate.h>
 
 namespace TestWebKitAPI {
 
index 0d0331c..2958c39 100644 (file)
@@ -25,7 +25,7 @@
 
 #import "config.h"
 
-#import <WebKit2/WeakObjCPtr.h>
+#import <WebKit/WeakObjCPtr.h>
 
 using WebKit::WeakObjCPtr;
 
index 000f9cd..b0cd072 100644 (file)
@@ -27,7 +27,7 @@
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
 #include "WindowMessageObserver.h"
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKRetainPtr.h>
 
 namespace TestWebKitAPI {
 
index 44a5b30..6513f50 100644 (file)
@@ -24,8 +24,8 @@
  */
 
 #include "config.h"
-#include <WebKit2/WKRetainPtr.h>
-#include <WebKit2/WKURLResponseCF.h>
+#include <WebKit/WKRetainPtr.h>
+#include <WebKit/WKURLResponseCF.h>
 #include <wtf/RetainPtr.h>
 
 namespace TestWebKitAPI {
index 32c8a07..0a510b2 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKRetainPtr.h>
 
 namespace TestWebKitAPI {
 
index 844499c..2aa86fa 100644 (file)
@@ -27,7 +27,7 @@
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
 #include "WindowMessageObserver.h"
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKRetainPtr.h>
 
 namespace TestWebKitAPI {
 
index 5fa4b3a..8e2b412 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKRetainPtr.h>
 
 namespace TestWebKitAPI {
 
index 36a18ca..cd1ee14 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKRetainPtr.h>
 
 namespace TestWebKitAPI {
 
index 24ac215..8c0ace8 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #import "config.h"
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
index 60bd827..e9d3ba4 100644 (file)
@@ -28,7 +28,7 @@
 #import "PlatformUtilities.h"
 #import "PlatformWebView.h"
 #import "TestBrowsingContextLoadDelegate.h"
-#import <WebKit2/WebKit2.h>
+#import <WebKit/WebKit2.h>
 #import <wtf/RetainPtr.h>
 
 #if WK_API_ENABLED
index 6908cf9..f9bd727 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 
 #include "InjectedBundleTest.h"
-#include <WebKit2/WKBundlePage.h>
+#include <WebKit/WKBundlePage.h>
 
 namespace TestWebKitAPI {
 
index a30d999..b7b3ed8 100644 (file)
@@ -29,7 +29,7 @@
 #import "PlatformUtilities.h"
 #import "TestBrowsingContextLoadDelegate.h"
 #import "TestProtocol.h"
-#import <WebKit2/WebKit2.h>
+#import <WebKit/WebKit2.h>
 #import <wtf/RetainPtr.h>
 
 #if WK_API_ENABLED
index eec3497..f3ea748 100644 (file)
@@ -30,8 +30,8 @@
 #import "PlatformWebView.h"
 #import "TestBrowsingContextLoadDelegate.h"
 #import "TestProtocol.h"
-#import <WebKit2/WebKit2.h>
-#import <WebKit2/WKViewPrivate.h>
+#import <WebKit/WebKit2.h>
+#import <WebKit/WKViewPrivate.h>
 
 #if WK_API_ENABLED
 
index a6b3f87..a8568f9 100644 (file)
@@ -30,9 +30,9 @@
 #import "TestBrowsingContextLoadDelegate.h"
 #import <JavaScriptCore/JSRetainPtr.h>
 #import <JavaScriptCore/JavaScriptCore.h>
-#import <WebKit2/WKSerializedScriptValue.h>
-#import <WebKit2/WKViewPrivate.h>
-#import <WebKit2/WebKit2.h>
+#import <WebKit/WKSerializedScriptValue.h>
+#import <WebKit/WKViewPrivate.h>
+#import <WebKit/WebKit2.h>
 
 #if WK_API_ENABLED
 
index 13b5098..2ecff16 100644 (file)
@@ -26,7 +26,7 @@
 #import "config.h"
 #import "Test.h"
 
-#import <WebKit2/WKBrowsingContextGroup.h>
+#import <WebKit/WKBrowsingContextGroup.h>
 
 #if WK_API_ENABLED
 
index dac96ce..38f45d9 100644 (file)
 #import "config.h"
 #import "Test.h"
 
-#import <WebKit2/WKBrowsingContextController.h>
-#import <WebKit2/WKBrowsingContextGroup.h>
-#import <WebKit2/WKBrowsingContextLoadDelegate.h>
-#import <WebKit2/WKProcessGroup.h>
-#import <WebKit2/WKRetainPtr.h>
-#import <WebKit2/WKView.h>
+#import <WebKit/WKBrowsingContextController.h>
+#import <WebKit/WKBrowsingContextGroup.h>
+#import <WebKit/WKBrowsingContextLoadDelegate.h>
+#import <WebKit/WKProcessGroup.h>
+#import <WebKit/WKRetainPtr.h>
+#import <WebKit/WKView.h>
 
 #import "PlatformUtilities.h"
 
index 8c45428..71c0b1c 100644 (file)
@@ -29,7 +29,7 @@
 #include "JavaScriptTest.h"
 #include "PlatformUtilities.h"
 #include "SyntheticBackingScaleFactorWindow.h"
-#include <WebKit2/WKViewPrivate.h>
+#include <WebKit/WKViewPrivate.h>
 #include <wtf/RetainPtr.h>
 
 namespace TestWebKitAPI {
index 89ad21b..854c9fb 100644 (file)
@@ -28,7 +28,7 @@
 #import "Test.h"
 #import "WebKitAgnosticTest.h"
 #import <WebKit/WebViewPrivate.h>
-#import <WebKit2/WKViewPrivate.h>
+#import <WebKit/WKViewPrivate.h>
 #import <wtf/RetainPtr.h>
 
 // https://bugs.webkit.org/show_bug.cgi?id=130463
index 8b04ded..313616a 100644 (file)
@@ -65,7 +65,7 @@
 #include <stdint.h>
 
 #if !PLATFORM(IOS) && !PLATFORM(WIN) && !(PLATFORM(GTK) && !defined(BUILDING_WEBKIT2__))
-#include <WebKit2/WebKit2_C.h>
+#include <WebKit/WebKit2_C.h>
 #endif
 
 #ifdef __clang__
index 60bc869..c75cd1e 100644 (file)
@@ -29,9 +29,9 @@
 #include "PlatformWebView.h"
 
 #include "EWebKit2.h"
-#include <WebKit2/WKAPICast.h>
-#include <WebKit2/WKRetainPtr.h>
-#include <WebKit2/WKViewEfl.h>
+#include <WebKit/WKAPICast.h>
+#include <WebKit/WKRetainPtr.h>
+#include <WebKit/WKViewEfl.h>
 #include <Ecore_Evas.h>
 
 extern bool useX11Window;
index b252667..2db2e02 100644 (file)
@@ -27,7 +27,7 @@
 #include "JavaScriptTest.h"
 
 #include <WebKit/WebView.h>
-#include <WebKit2/WKViewPrivate.h>
+#include <WebKit/WKViewPrivate.h>
 
 namespace TestWebKitAPI {
 
index 6f90dcd..4b73222 100644 (file)
 #include "config.h"
 #include "PlatformUtilities.h"
 
-#include <WebKit2/WKRetainPtr.h>
-#include <WebKit2/WKStringCF.h>
-#include <WebKit2/WKURLCF.h>
-#include <WebKit2/WKURLResponseNS.h>
+#include <WebKit/WKRetainPtr.h>
+#include <WebKit/WKStringCF.h>
+#include <WebKit/WKURLCF.h>
+#include <WebKit/WKURLResponseNS.h>
 #include <wtf/RetainPtr.h>
 #include <wtf/StdLibExtras.h>
 
index 1661074..827e7f9 100644 (file)
@@ -26,7 +26,7 @@
 #import "config.h"
 #import "PlatformWebView.h"
 
-#import <WebKit2/WKViewPrivate.h>
+#import <WebKit/WKViewPrivate.h>
 #import <Carbon/Carbon.h>
 
 @interface ActiveOffscreenWindow : NSWindow
index 25f0cab..59ffe42 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WebKit2.h>
+#import <WebKit/WebKit2.h>
 
 #if WK_API_ENABLED
 
index 9c56880..4b28e59 100644 (file)
@@ -26,8 +26,8 @@
 #include "config.h"
 #include "WebKitAgnosticTest.h"
 
-#include <WebKit2/WKURLCF.h>
-#include <WebKit2/WKViewPrivate.h>
+#include <WebKit/WKURLCF.h>
+#include <WebKit/WKViewPrivate.h>
 #include <wtf/RetainPtr.h>
 
 @interface FrameLoadDelegate : NSObject {
index eb8b3cb..e2a324e 100644 (file)
@@ -36,7 +36,7 @@
 #include <gdk/gdk.h>
 #include <wtf/HashSet.h>
 #elif PLATFORM(EFL)
-#include <WebKit2/EWebKit2.h>
+#include <WebKit/EWebKit2.h>
 #endif
 
 namespace WTR {
index 9120258..87b683f 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "GeolocationProviderMock.h"
 
-#include <WebKit2/WKGeolocationManager.h>
+#include <WebKit/WKGeolocationManager.h>
 #include <string.h>
 #include <wtf/Assertions.h>
 #include <wtf/CurrentTime.h>
index ff5537e..c639842 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef GeolocationProviderMock_h
 #define GeolocationProviderMock_h
 
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKRetainPtr.h>
 
 namespace WTR {
 
index 7fdc2dc..348d691 100644 (file)
@@ -32,9 +32,9 @@
 #include "JSAccessibilityController.h"
 
 #include <JavaScriptCore/JSRetainPtr.h>
-#include <WebKit2/WKBundle.h>
-#include <WebKit2/WKBundlePage.h>
-#include <WebKit2/WKBundlePagePrivate.h>
+#include <WebKit/WKBundle.h>
+#include <WebKit/WKBundlePage.h>
+#include <WebKit/WKBundlePagePrivate.h>
 
 namespace WTR {
 
index 8b5a42a..90d4f15 100644 (file)
 #include "InjectedBundlePage.h"
 #include "JSEventSendingController.h"
 #include "StringFunctions.h"
-#include <WebKit2/WKBundle.h>
-#include <WebKit2/WKBundleFrame.h>
-#include <WebKit2/WKBundlePagePrivate.h>
-#include <WebKit2/WKBundlePrivate.h>
-#include <WebKit2/WKContextMenuItem.h>
-#include <WebKit2/WKMutableDictionary.h>
-#include <WebKit2/WKNumber.h>
+#include <WebKit/WKBundle.h>
+#include <WebKit/WKBundleFrame.h>
+#include <WebKit/WKBundlePagePrivate.h>
+#include <WebKit/WKBundlePrivate.h>
+#include <WebKit/WKContextMenuItem.h>
+#include <WebKit/WKMutableDictionary.h>
+#include <WebKit/WKNumber.h>
 #include <wtf/StdLibExtras.h>
 
 namespace WTR {
index fd030b9..359f541 100644 (file)
@@ -27,8 +27,8 @@
 #define EventSendingController_h
 
 #include "JSWrappable.h"
-#include <WebKit2/WKEvent.h>
-#include <WebKit2/WKGeometry.h>
+#include <WebKit/WKEvent.h>
+#include <WebKit/WKGeometry.h>
 #include <wtf/PassRefPtr.h>
 
 namespace WTR {
index 10c21db..183ff5e 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "InjectedBundle.h"
 #include "JSGCController.h"
-#include <WebKit2/WKBundlePrivate.h>
+#include <WebKit/WKBundlePrivate.h>
 
 namespace WTR {
 
index f79a003..3845433 100644 (file)
 #include "ActivateFonts.h"
 #include "InjectedBundlePage.h"
 #include "StringFunctions.h"
-#include <WebKit2/WKBundle.h>
-#include <WebKit2/WKBundlePage.h>
-#include <WebKit2/WKBundlePagePrivate.h>
-#include <WebKit2/WKBundlePrivate.h>
-#include <WebKit2/WKRetainPtr.h>
-#include <WebKit2/WebKit2_C.h>
+#include <WebKit/WKBundle.h>
+#include <WebKit/WKBundlePage.h>
+#include <WebKit/WKBundlePagePrivate.h>
+#include <WebKit/WKBundlePrivate.h>
+#include <WebKit/WKRetainPtr.h>
+#include <WebKit/WebKit2_C.h>
 #include <wtf/PassOwnPtr.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/StringBuilder.h>
index e5f1f15..4aed4c6 100644 (file)
@@ -31,8 +31,8 @@
 #include "GCController.h"
 #include "TestRunner.h"
 #include "TextInputController.h"
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKRetainPtr.h>
 #include <sstream>
 #include <wtf/Forward.h>
 #include <wtf/OwnPtr.h>
index 58af682..9c4b03e 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 
 #include "InjectedBundle.h"
-#include <WebKit2/WKBundleInitialize.h>
+#include <WebKit/WKBundleInitialize.h>
 
 extern "C"
 void WKBundleInitialize(WKBundleRef bundle, WKTypeRef initializationUserData)
index b44c410..dbfcc0c 100644 (file)
 #include "WebCoreTestSupport.h"
 #include <cmath>
 #include <JavaScriptCore/JSRetainPtr.h>
-#include <WebKit2/WKArray.h>
-#include <WebKit2/WKBundle.h>
-#include <WebKit2/WKBundleBackForwardList.h>
-#include <WebKit2/WKBundleBackForwardListItem.h>
-#include <WebKit2/WKBundleFrame.h>
-#include <WebKit2/WKBundleFramePrivate.h>
-#include <WebKit2/WKBundleHitTestResult.h>
-#include <WebKit2/WKBundleNavigationAction.h>
-#include <WebKit2/WKBundleNodeHandlePrivate.h>
-#include <WebKit2/WKBundlePagePrivate.h>
-#include <WebKit2/WKBundlePrivate.h>
-#include <WebKit2/WKSecurityOrigin.h>
-#include <WebKit2/WKURLRequest.h>
+#include <WebKit/WKArray.h>
+#include <WebKit/WKBundle.h>
+#include <WebKit/WKBundleBackForwardList.h>
+#include <WebKit/WKBundleBackForwardListItem.h>
+#include <WebKit/WKBundleFrame.h>
+#include <WebKit/WKBundleFramePrivate.h>
+#include <WebKit/WKBundleHitTestResult.h>
+#include <WebKit/WKBundleNavigationAction.h>
+#include <WebKit/WKBundleNodeHandlePrivate.h>
+#include <WebKit/WKBundlePagePrivate.h>
+#include <WebKit/WKBundlePrivate.h>
+#include <WebKit/WKSecurityOrigin.h>
+#include <WebKit/WKURLRequest.h>
 #include <wtf/HashMap.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/StringBuilder.h>
index f01b50b..bde0fd4 100644 (file)
@@ -26,9 +26,9 @@
 #ifndef InjectedBundlePage_h
 #define InjectedBundlePage_h
 
-#include <WebKit2/WKBundlePage.h>
-#include <WebKit2/WKBundleScriptWorld.h>
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKBundlePage.h>
+#include <WebKit/WKBundleScriptWorld.h>
+#include <WebKit/WKRetainPtr.h>
 #include <wtf/text/WTFString.h>
 
 namespace WTR {
index 34467b2..d085f1a 100644 (file)
 #include "StringFunctions.h"
 #include "TestController.h"
 #include <JavaScriptCore/JSCTestRunnerUtils.h>
-#include <WebKit2/WKBundle.h>
-#include <WebKit2/WKBundleBackForwardList.h>
-#include <WebKit2/WKBundleFrame.h>
-#include <WebKit2/WKBundleFramePrivate.h>
-#include <WebKit2/WKBundleInspector.h>
-#include <WebKit2/WKBundleNodeHandlePrivate.h>
-#include <WebKit2/WKBundlePage.h>
-#include <WebKit2/WKBundlePagePrivate.h>
-#include <WebKit2/WKBundlePrivate.h>
-#include <WebKit2/WKBundleScriptWorld.h>
-#include <WebKit2/WKData.h>
-#include <WebKit2/WKRetainPtr.h>
-#include <WebKit2/WKSerializedScriptValue.h>
-#include <WebKit2/WebKit2_C.h>
+#include <WebKit/WKBundle.h>
+#include <WebKit/WKBundleBackForwardList.h>
+#include <WebKit/WKBundleFrame.h>
+#include <WebKit/WKBundleFramePrivate.h>
+#include <WebKit/WKBundleInspector.h>
+#include <WebKit/WKBundleNodeHandlePrivate.h>
+#include <WebKit/WKBundlePage.h>
+#include <WebKit/WKBundlePagePrivate.h>
+#include <WebKit/WKBundlePrivate.h>
+#include <WebKit/WKBundleScriptWorld.h>
+#include <WebKit/WKData.h>
+#include <WebKit/WKRetainPtr.h>
+#include <WebKit/WKSerializedScriptValue.h>
+#include <WebKit/WebKit2_C.h>
 #include <wtf/CurrentTime.h>
 #include <wtf/HashMap.h>
 #include <wtf/StdLibExtras.h>
index 4b7860e..e21fff3 100644 (file)
@@ -28,8 +28,8 @@
 
 #include "JSWrappable.h"
 #include <JavaScriptCore/JSRetainPtr.h>
-#include <WebKit2/WKBundleScriptWorld.h>
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKBundleScriptWorld.h>
+#include <WebKit/WKRetainPtr.h>
 #include <string>
 #include <wtf/PassRefPtr.h>
 
index 0087aa3..ae737fd 100644 (file)
@@ -30,7 +30,7 @@
 #include "InjectedBundlePage.h"
 #include "JSTextInputController.h"
 #include "StringFunctions.h"
-#include <WebKit2/WKBundlePagePrivate.h>
+#include <WebKit/WKBundlePagePrivate.h>
 
 namespace WTR {
 
index 3573a2a..ea0f4ea 100644 (file)
@@ -33,7 +33,7 @@
 #include "InjectedBundle.h"
 #include "InjectedBundlePage.h"
 
-#include <WebKit2/WKBundlePagePrivate.h>
+#include <WebKit/WKBundlePagePrivate.h>
 #include <atk/atk.h>
 #include <cstdio>
 #include <wtf/gobject/GUniquePtr.h>
index b521072..650ffd6 100644 (file)
@@ -25,9 +25,9 @@
 #include "InjectedBundle.h"
 #include "InjectedBundlePage.h"
 #include "JSWrapper.h"
-#include <WebKit2/WKBundleFrame.h>
-#include <WebKit2/WKBundlePage.h>
-#include <WebKit2/WKBundlePagePrivate.h>
+#include <WebKit/WKBundleFrame.h>
+#include <WebKit/WKBundlePage.h>
+#include <WebKit/WKBundlePagePrivate.h>
 #include <wtf/HashMap.h>
 #include <wtf/gobject/GUniquePtr.h>
 #include <wtf/text/CString.h>
index 44cae90..2f9bfa4 100644 (file)
@@ -36,7 +36,7 @@
 #include <JavaScriptCore/JSStringRef.h>
 #include <JavaScriptCore/OpaqueJSString.h>
 #if ATK_CHECK_VERSION(2,11,90)
-#include <WebKit2/WKBundleFrame.h>
+#include <WebKit/WKBundleFrame.h>
 #endif
 #include <atk/atk.h>
 #include <wtf/Assertions.h>
index 6ff8e37..ac66148 100644 (file)
@@ -27,8 +27,8 @@
 #import "InjectedBundlePage.h"
 
 #import "CrashReporterInfo.h"
-#import <WebKit2/WKBundleFrame.h>
-#import <WebKit2/WKURLCF.h>
+#import <WebKit/WKBundleFrame.h>
+#import <WebKit/WKURLCF.h>
 
 namespace WTR {
 
index f8dac8f..bc69d8d 100644 (file)
@@ -33,9 +33,9 @@
 #import <JavaScriptCore/JSRetainPtr.h>
 #import <JavaScriptCore/JSStringRef.h>
 #import <JavaScriptCore/JSStringRefCF.h>
-#import <WebKit2/WKBundle.h>
-#import <WebKit2/WKBundlePage.h>
-#import <WebKit2/WKBundlePagePrivate.h>
+#import <WebKit/WKBundle.h>
+#import <WebKit/WKBundlePage.h>
+#import <WebKit/WKBundlePagePrivate.h>
 
 namespace WTR {
 
index 77c35b4..cab3f18 100644 (file)
@@ -30,7 +30,7 @@
 #import "StringFunctions.h"
 #import "TestController.h"
 #import <wtf/RetainPtr.h>
-#import <WebKit2/WKString.h>
+#import <WebKit/WKString.h>
 
 namespace WTR {
 
index 3403b70..53fe22c 100644 (file)
@@ -41,9 +41,9 @@
 #import <JavaScriptCore/JSRetainPtr.h>
 #import <JavaScriptCore/JSStringRef.h>
 #import <JavaScriptCore/JSStringRefCF.h>
-#import <WebKit2/WKBundle.h>
-#import <WebKit2/WKBundlePage.h>
-#import <WebKit2/WKBundlePagePrivate.h>
+#import <WebKit/WKBundle.h>
+#import <WebKit/WKBundlePage.h>
+#import <WebKit/WKBundlePagePrivate.h>
 
 namespace WTR {
 
index a3a0233..23be93f 100644 (file)
@@ -38,7 +38,7 @@
 #import <JavaScriptCore/JSRetainPtr.h>
 #import <JavaScriptCore/JSStringRef.h>
 #import <JavaScriptCore/JSStringRefCF.h>
-#import <WebKit2/WKBundleFrame.h>
+#import <WebKit/WKBundleFrame.h>
 #import <wtf/RetainPtr.h>
 
 @interface NSObject (WebAccessibilityObjectWrapperAdditions)
index e1653f2..6051c39 100644 (file)
@@ -39,7 +39,7 @@
 #import <JavaScriptCore/JSStringRef.h>
 #import <JavaScriptCore/JSStringRefCF.h>
 #import <JavaScriptCore/JSObjectRef.h>
-#import <WebKit2/WKBundleFrame.h>
+#import <WebKit/WKBundleFrame.h>
 #import <wtf/RetainPtr.h>
 #import <wtf/Vector.h>
 
index 52d6c97..42c9ef6 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef PlatformWebView_h
 #define PlatformWebView_h
 
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKRetainPtr.h>
 
 #if defined(__APPLE__) && __APPLE__
 #ifdef __OBJC__
index 551d867..dce761b 100644 (file)
 
 #include <JavaScriptCore/JSRetainPtr.h>
 #include <JavaScriptCore/JavaScript.h>
+#include <WebKit/WKRetainPtr.h>
+#include <WebKit/WKString.h>
+#include <WebKit/WKStringPrivate.h>
+#include <WebKit/WKURL.h>
 #include <sstream>
 #include <string>
-#include <WebKit2/WKRetainPtr.h>
-#include <WebKit2/WKString.h>
-#include <WebKit2/WKStringPrivate.h>
-#include <WebKit2/WKURL.h>
 #include <wtf/Platform.h>
 #include <wtf/StdLibExtras.h>
 #include <wtf/Vector.h>
index 96a0bdd..3107eaf 100644 (file)
 #include "PlatformWebView.h"
 #include "StringFunctions.h"
 #include "TestInvocation.h"
-#include <WebKit2/WKAuthenticationChallenge.h>
-#include <WebKit2/WKAuthenticationDecisionListener.h>
-#include <WebKit2/WKContextConfigurationRef.h>
-#include <WebKit2/WKContextPrivate.h>
-#include <WebKit2/WKCredential.h>
-#include <WebKit2/WKIconDatabase.h>
-#include <WebKit2/WKNotification.h>
-#include <WebKit2/WKNotificationManager.h>
-#include <WebKit2/WKNotificationPermissionRequest.h>
-#include <WebKit2/WKNumber.h>
-#include <WebKit2/WKPageGroup.h>
-#include <WebKit2/WKPagePrivate.h>
-#include <WebKit2/WKPreferencesRefPrivate.h>
-#include <WebKit2/WKProtectionSpace.h>
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKAuthenticationChallenge.h>
+#include <WebKit/WKAuthenticationDecisionListener.h>
+#include <WebKit/WKContextConfigurationRef.h>
+#include <WebKit/WKContextPrivate.h>
+#include <WebKit/WKCredential.h>
+#include <WebKit/WKIconDatabase.h>
+#include <WebKit/WKNotification.h>
+#include <WebKit/WKNotificationManager.h>
+#include <WebKit/WKNotificationPermissionRequest.h>
+#include <WebKit/WKNumber.h>
+#include <WebKit/WKPageGroup.h>
+#include <WebKit/WKPagePrivate.h>
+#include <WebKit/WKPreferencesRefPrivate.h>
+#include <WebKit/WKProtectionSpace.h>
+#include <WebKit/WKRetainPtr.h>
 #include <algorithm>
 #include <cstdio>
 #include <ctype.h>
 #include <wtf/text/CString.h>
 
 #if PLATFORM(COCOA)
-#include <WebKit2/WKPagePrivateMac.h>
+#include <WebKit/WKPagePrivateMac.h>
 #endif
 
 #if !PLATFORM(COCOA)
-#include <WebKit2/WKTextChecker.h>
+#include <WebKit/WKTextChecker.h>
 #endif
 
 namespace WTR {
index 908f5af..3472574 100644 (file)
@@ -29,7 +29,7 @@
 #include "GeolocationProviderMock.h"
 #include "WebNotificationProvider.h"
 #include "WorkQueueManager.h"
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKRetainPtr.h>
 #include <string>
 #include <vector>
 #include <wtf/OwnPtr.h>
index bd20887..2f952b5 100644 (file)
 #include "PlatformWebView.h"
 #include "StringFunctions.h"
 #include "TestController.h"
+#include <WebKit/WKContextPrivate.h>
+#include <WebKit/WKData.h>
+#include <WebKit/WKDictionary.h>
+#include <WebKit/WKInspector.h>
+#include <WebKit/WKPagePrivate.h>
+#include <WebKit/WKRetainPtr.h>
 #include <climits>
 #include <cstdio>
-#include <WebKit2/WKContextPrivate.h>
-#include <WebKit2/WKData.h>
-#include <WebKit2/WKDictionary.h>
-#include <WebKit2/WKInspector.h>
-#include <WebKit2/WKPagePrivate.h>
-#include <WebKit2/WKRetainPtr.h>
 #include <wtf/PassOwnPtr.h>
 #include <wtf/StdLibExtras.h>
 #include <wtf/text/CString.h>
@@ -47,7 +47,7 @@
 #endif
 
 #if PLATFORM(COCOA)
-#include <WebKit2/WKPagePrivateMac.h>
+#include <WebKit/WKPagePrivateMac.h>
 #endif
 
 #include <unistd.h> // For getcwd.
index 7ab9022..2ed213c 100644 (file)
@@ -26,8 +26,8 @@
 #ifndef TestInvocation_h
 #define TestInvocation_h
 
+#include <WebKit/WKRetainPtr.h>
 #include <string>
-#include <WebKit2/WKRetainPtr.h>
 #include <wtf/Noncopyable.h>
 #include <wtf/OwnPtr.h>
 #include <wtf/text/StringBuilder.h>
index 3c18105..5f989fc 100644 (file)
@@ -27,9 +27,8 @@
 #import <Foundation/Foundation.h>
 #endif
 
+#include <WebKit/WebKit2_C.h>
 #include <wtf/Platform.h>
-#include <WebKit2/WebKit2_C.h>
-
 
 /* When C++ exceptions are disabled, the C++ library defines |try| and |catch|
 * to allow C++ code that expects exceptions to build. These definitions
index 5506424..d43b329 100644 (file)
 #include "config.h"
 #include "WebNotificationProvider.h"
 
-#include <WebKit2/WKMutableArray.h>
-#include <WebKit2/WKNotification.h>
-#include <WebKit2/WKNumber.h>
-#include <WebKit2/WKSecurityOrigin.h>
+#include <WebKit/WKMutableArray.h>
+#include <WebKit/WKNotification.h>
+#include <WebKit/WKNumber.h>
+#include <WebKit/WKSecurityOrigin.h>
 #include <wtf/Assertions.h>
 
 namespace WTR {
index fba2870..402d110 100644 (file)
@@ -26,9 +26,9 @@
 #ifndef WebNotificationProvider_h
 #define WebNotificationProvider_h
 
-#include <WebKit2/WKNotificationManager.h>
-#include <WebKit2/WKNotificationProvider.h>
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKNotificationManager.h>
+#include <WebKit/WKNotificationProvider.h>
+#include <WebKit/WKRetainPtr.h>
 #include <wtf/HashSet.h>
 
 namespace WTR {
index e74fa34..325023d 100644 (file)
@@ -28,8 +28,8 @@
 
 #include "PlatformWebView.h"
 #include "TestController.h"
-#include <WebKit2/WKPage.h>
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKPage.h>
+#include <WebKit/WKRetainPtr.h>
 #include <stdio.h>
 #include <wtf/PassOwnPtr.h>
 #include <wtf/text/CString.h>
index 5d9229d..19402cd 100644 (file)
@@ -32,7 +32,7 @@
 #include "PixelDumpSupport.h"
 #include "PlatformWebView.h"
 #include "TestController.h"
-#include <WebKit2/WKImageCairo.h>
+#include <WebKit/WKImageCairo.h>
 #include <cairo/cairo.h>
 #include <cstdio>
 #include <wtf/Assertions.h>
index b2746d5..7111a8e 100644 (file)
@@ -30,7 +30,7 @@
 #include "PlatformWebView.h"
 #include "TestController.h"
 #include <ImageIO/CGImageDestination.h>
-#include <WebKit2/WKImageCG.h>
+#include <WebKit/WKImageCG.h>
 #include <wtf/MD5.h>
 #include <wtf/RetainPtr.h>
 #include <wtf/StringExtras.h>
index 374befe..1cd0b4b 100644 (file)
@@ -27,7 +27,7 @@
 #import "CrashReporterInfo.h"
 
 #import "StringFunctions.h"
-#import <WebKit2/WKURLCF.h>
+#import <WebKit/WKURLCF.h>
 #import <WebKitSystemInterface.h>
 #import <wtf/RetainPtr.h>
 
index 60f3998..17dfb76 100644 (file)
 #include "cmakeconfig.h"
 #endif
 
+#include <WebKit/WebKit2_C.h>
 #include <wtf/Platform.h>
 #include <wtf/ExportMacros.h>
 #include <runtime/JSExportMacros.h>
 
-#include <WebKit2/WebKit2_C.h>
-
 #endif
index 846e4b7..f316e76 100644 (file)
 #include "PlatformWebView.h"
 
 #include "EWebKit2.h"
-#include "WebKit2/WKAPICast.h"
+#include "WebKit/WKAPICast.h"
 #include <Ecore_Evas.h>
 #include <WebCore/RefPtrCairo.h>
-#include <WebKit2/WKImageCairo.h>
-#include <WebKit2/WKViewEfl.h>
+#include <WebKit/WKImageCairo.h>
+#include <WebKit/WKViewEfl.h>
 #include <cairo.h>
 
 using namespace WebKit;
index 3825deb..324287e 100644 (file)
@@ -28,8 +28,8 @@
 #include "config.h"
 #include "PlatformWebView.h"
 
-#include <WebKit2/WKImageCairo.h>
-#include <WebKit2/WKViewPrivate.h>
+#include <WebKit/WKImageCairo.h>
+#include <WebKit/WKViewPrivate.h>
 #include <gtk/gtk.h>
 
 namespace WTR {
index 029f7a4..469766f 100644 (file)
@@ -27,9 +27,9 @@
 #include "PlatformWebView.h"
 #include "TestController.h"
 
-#import <WebKit2/WKImageCG.h>
-#import <WebKit2/WKViewPrivate.h>
-#import <WebKit2/WKPreferencesPrivate.h>
+#import <WebKit/WKImageCG.h>
+#import <WebKit/WKViewPrivate.h>
+#import <WebKit/WKPreferencesPrivate.h>
 #import <wtf/RetainPtr.h>
 
 @interface WebKitTestRunnerWindow : UIWindow {
index 241cc88..6f9d33f 100644 (file)
@@ -29,7 +29,7 @@
 #import "CrashReporterInfo.h"
 #import "PlatformWebView.h"
 #import "TestInvocation.h"
-#import <WebKit2/WKStringCF.h>
+#import <WebKit/WKStringCF.h>
 #include <wtf/MainThread.h>
 
 namespace WTR {
index 83c5368..c83b45c 100644 (file)
@@ -31,7 +31,7 @@
 #import "StringFunctions.h"
 #import "TestController.h"
 #import <Carbon/Carbon.h>
-#import <WebKit2/WKString.h>
+#import <WebKit/WKString.h>
 #import <wtf/RetainPtr.h>
 
 @interface NSApplication (Details)
index 5755b33..cd9ac1c 100644 (file)
@@ -28,9 +28,9 @@
 
 #import "TestController.h"
 #import "WebKitTestRunnerDraggingInfo.h"
-#import <WebKit2/WKImageCG.h>
-#import <WebKit2/WKPreferencesPrivate.h>
-#import <WebKit2/WKViewPrivate.h>
+#import <WebKit/WKImageCG.h>
+#import <WebKit/WKPreferencesPrivate.h>
+#import <WebKit/WKViewPrivate.h>
 #import <wtf/RetainPtr.h>
 
 using namespace WTR;
index d016260..e9424d6 100644 (file)
@@ -31,7 +31,7 @@
 #import "PoseAsClass.h"
 #import "TestInvocation.h"
 #import "WebKitTestRunnerPasteboard.h"
-#import <WebKit2/WKStringCF.h>
+#import <WebKit/WKStringCF.h>
 #import <mach-o/dyld.h> 
 
 @interface NSSound (Details)