[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 0cec2d4d2b1fb391a601c1525b5d83516ea67091..14b6d786e9bf4b8210345c6cc04b81fd3f9a9c51 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 84c66a7fe25d1fb52f07efa7c7fae81328c42ef1..db1b68653390f00513680d701f3d3ff28c59d01b 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 cb62eda2d79cb28cdbf32a9aed1fbb697b551794..6a56bd80bbdf6daaaf745cc8e906366e599a0bfa 100644 (file)
@@ -27,7 +27,7 @@
 #ifndef NetworkProcessMainUnix_h
 #define NetworkProcessMainUnix_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 namespace WebKit {
 
index 540c596aa449d1e409b96d798ee8353e866e4331..d9d699dc51741a17c4e0ae737db050dcdd9518f8 100644 (file)
@@ -27,7 +27,7 @@
 #ifndef PluginProcessMainUnix_h
 #define PluginProcessMainUnix_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 namespace WebKit {
 
index 5c1e5413f39bea614f4e13fe71842b76d5bcf457..06749f6a28ff5cec6818ce1405168e3497ffc9fd 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 fb7dab2d63b03361f7696ee6b60a5d46e0648a05..9e4a0cb0f8c76aa6ba727aa5b4eb0764524446a5 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 5ce718424b6c3716df45706127344d75fe8f6bb7..8af716fc3362c3bdb706925a5b05c93029e196c4 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 9778a99e8b8a32ff069199704d9f6498d7ad8d0d..75c282e695806869b2da8ab42315b706f2652e58 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 5533b2e0731f3bfe94a41264d55db305c5e49d36..5e24eb05e38badcae6404d49991a1d8cfc92d54a 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 b8e96be13acd5c635091c5db82ef30488236642a..f1488e3ae921bd3e38142769149dc190ebecfee8 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 75b3eafec6c0b32e792bc932327ff52e0ac597c7..5c2ce75857123f257b109adcf375a619a5ba7918 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 afa1dd931044fca0a63f1b8a66fb9e99520415f0..b32b99fd79860ec0af6df737e43c709e0961b3dc 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 c187ce6ad5d2ee7851b1fe9cafb01f7e07bcc3b6..2493c44d4c22279d34dbaf11493b5656ee0f4925 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 af72c75b7df321c9419055316450dcf4ab0b798f..a32469461f7cdd8701ccaf9c3761ca6fb16a5810 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 c18000bf17eb9e09ff6b74c997e45949687cfdbc..965749c86c4fd84c2e8fd13a49c6e53262e7e505 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 125b09cc40ef10ab14e1a04f212ce8256eb0f97c..8ab84edac578f11fc4feb8f85be900d38319b381 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 ea6231148a7f7b0959e6b83ac762b92ee289c0e8..5830177dfb52ab7977d404f0a247f1ad842da078 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 87c5f5efbd6be562d79bec3fd70915cd079cd2d3..581d408f1d4eccf13839658ac4e92d0ca4140b44 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 bfd4732c9152db865e3df71f7ecde9ff7ca23dae..f37c0b147978c6b48b60bc0ede8729eb144cf2c7 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 b5439219e8ad1b8b54035e9b0926ca1a49dc0277..f6461e9c3bae25ec09d066c3f027d11b9319bf24 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 8be7f4354e8bc185fbbff05cb51b34105a8e719c..cd4bb8a9e9f510cfee63748b0919bbb2fb3c7f44 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 b418ed526f3a78858a63b6e3cb0e8878c9b59cdd..972ba31fc034d3c867ec44aa0763d5dafbf385f7 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 854991679ed577cfa13b2066aa43460bd4e4b181..6b8f700f2ab54088b4ecbf19729745ba84f93039 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 6f25c598e2e3cbebc70d6589846e0370252e1c10..10087f18d814466c34925a49147b5da1bc8abd21 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 505d1f2848e90b71a0da4b4043e48115b7f2e209..749f82b2d9a4af962f66f95fa6c13149044cc550 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 a292dda11a6a2ed8e4d83f5a027fe577d0a36a94..cece1057b5edad69f381e7e163214cd9838176f6 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 28242da092f3d5ca4cdeb40f40e8a1d1cccfeb54..33b9eff6416154a93e228cff67a0f24e4b354dd2 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 291dfe1b646f22957e05f08d2ec310df26dfa4ba..b7d89e2dd281581c70bb81f8d762f2d767e0ea4e 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 2c1b2d1f0e24cbb6030c8d0dadf6c4351bfe9c49..acabfd3af19826d67b7e1199e76bff104b3c85b7 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 36954ffe3ace20e383b4891aa23996a58fd8fd80..cd42f397999732adc482e4c6b98fff64a5c4f171 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 0a7b4ff050d9138419d8ca0a3816b79fd39216a6..90cafca218a5968604da5f3e38427f1bda5d74cf 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 cb0edc72f4c03c6bbe0ac3b149bf09bd8a4bba68..822a762f7f166354fb108099274d60bfe6c2ac96 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 be8c0b5be9c7e36e09f90b39866d1ff59e6b0a01..f667ede068fe01c6cef5bf03b97b8f470edb8f55 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 bf141e41877494f712e8c1518c1973257d742a0e..062bdc34ffe8806338ab91d15178dd62e339f2a4 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 b330031e87035c4a0c21d91b706358e4bf9e5f06..0612128659458e6ec397a297ded21a2e84d61007 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 ecb7b5f7962632d4bcd5de3ca0826d18cf0c9b56..2db9240e6b80463179f7267a51b98984c7dde721 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 dbb5f478895dcba4da4e4821d67c2ea10f6c5327..2b7ea762461b405340e0cfeb483f89e0c9bf5f96 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 c9a60ee881ccd90f2f48f288a5d9d023bbb8e0da..c00fa9860e15ddb49ad3f2d9d505b98227627c41 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 d3617e9bd9fec3245656dd93406edb014f9f3024..d9da440ebc1bab49129a6fa4292c23244e54ac58 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 840e5cdf8f34a127dc59c59bf67d2496e353ed15..c779ee79370b6b6f2321339e8f47ba23b563842a 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 4ab002f92e379f99a6a64e6ca7e668753d9e0ea2..5990aecd5ce346b1b9a11c8a1836001a08104ae8 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 8f22c008f782ce0b8e3c66d749c56785bbd205cb..768dfbdf5b2ff1112596912a9cda9cc3b32c2f4b 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "WKApplicationCacheManager.h"
 #include "WKRetainPtr.h"
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 class EwkApplicationCacheManager {
 public:
index 7ca9be30907b2b4bb380585363ee832b13466910..796641192a8a415bbbc4fe1249891b21910b051c 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 7b6d20a48ca92039c9f70c6b319bea5c57e34ad0..ff5e171d40876bf68398d3d3060f7ae51a56cf73 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 35c209dace339646237b23f87aea72c174ec866e..bc4cc0e7fadaa467181dfda896fa77666431c04d 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 ba440e2384be2e4e111c28de925dbbc6b9d4794b..5861602d1fe719022ee805b2e85ba72a8a6c4e6d 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 c2895c0f7c98c8ba96fb9f18be1ad4f9138b8231..1729c4a12a227fc0a32d4a975616b605a7f9d459 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 5aec8d178594c267fdf784eb5e1418c28a4cfe0d..da62fe0c88c6de5017e940220c93429ba9042444 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 3cd12a9876482db48fc99a62721306c0301a216a..0ee1f0825d97b26b6bc9dd10fb63a180f91dbf8f 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 37ed8693603c8879e0229973d7f4ee7a208d6f8d..78fd8eeea4bae6ca7fa8db51c125089ef2083df9 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "WKEinaSharedString.h"
 #include <WKRetainPtr.h>
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 class EwkError {
 public:
index 4ef0ec498cb6b79261ba1047573db825b8ee299e..62e19243dbef880b126760c8e441e28012aa47cf 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 688a391762c8584776d02e424a4a539be52c1098..c586561bfa2b38710493e31921b7cb6a14886dc0 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 d503ffb1be462418232569664a94c9458bac29e9..f8eb9a274e8b4b3d2ac3a2da03ab58559f4328ca 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 19078447739b93ad373b20ec7131668c2cdc49ef..0c641b31fde30bb1a924d4314d9206496a818987 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 be29c2e86cf4d6e7bf841ada5d60ae37d4e3b785..5ec93109f682ba1048f0aad7642f950c478e61a8 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 56f6cf0f82b07ca24d30e379819f17da7f85d7a0..bf30384d5d2a5f04d9dc98efe8f343360a70eb0d 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 de9d5ad059a84bf8c09771df12bba30128ef12c6..6f3695937920accb424781eec29f9b0b80d8e96a 100644 (file)
@@ -29,7 +29,7 @@
 
 #include "WKEinaSharedString.h"
 #include "WKRetainPtr.h"
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 /**
  * \struct  Ewk_Settings
index f5dc81b02e33d2a729028462867b969a5d46461a..a91db5aecc8c02c69433a89620cd30352c768aca 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 70f0c4772b0bf31300ee01a9676c3a8ebe57c9e9..04c9b89f5c34ad12dd0e71ba12ffaeb09bdb8099 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 6de35d91e45bc7cc3cb1402e51531a34b50bd437..0e8d458eea6178a14f6a73e28315e9e9b3cd8df1 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 94f9d4d6c465160dbaaed57d775dd248575326c1..e5201673afb524f14e6b7200c4d0af2bc1c5a2cf 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 55f0f190c62752f5b0ad01cb469ba6010872eb68..74ce13b6ac6baa5c7333ec5d4ed38da9c06240a3 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <WebKit2/WKBundleInitialize.h>
+#include <WebKit/WKBundleInitialize.h>
 
 #ifdef __cplusplus
 extern "C" {
index babc07e675d50067790a06d569b6c5aea8ac7bd1..563c3b76566d874fbb09db67cc85c697c0628cce 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 2df118c053c709240d20014b9df1068d6d2e1b49..197b6b5b4cc053b692c566c9416eb12aac731d51 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 315bd16bfc03e07a2b282be1cc3bf5eac228061e..fab08653acd37d9749e708db401b7185b5785184 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 6cf199a693892a1ee02820f8ae21e30a9d9fd36c..87fb69eec7735ebd31520582988b27576e63a1b4 100644 (file)
@@ -28,7 +28,7 @@
 #ifndef WKCoordinatedSceneAPICast_h
 #define WKCoordinatedSceneAPICast_h
 
-#include <WebKit2/WKCoordinatedScene.h>
+#include <WebKit/WKCoordinatedScene.h>
 
 namespace WebCore {
 
index 7988cd9984c091eb762dc5bc9943591af629a9a8..ba886c9d6a6bc97968ce6a430366bc9d3bf01c4f 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 76acec7970b4e35d74d1f1928640265f806876b1..8c5a088c534e41bf1e07caf2f80bab15a168f772 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 09930e6fc227f541df3f4373e30876c935b33e89..1428d3dc3d8fb27197ba882c8c0c9959194f2525 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 36deeee1cc980d929abf97aab25aef2118970ee2..eab79d526a829fe804fa86c31aad68d90d076719 100644 (file)
@@ -27,7 +27,7 @@
 #ifndef FindClientEfl_h
 #define FindClientEfl_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 class EwkView;
 
index d8040d81ab97a5f43416e936d49c3e4691c544da..68a4783d45f2674e0e8cb54706dbee8ab5aa4fd3 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef FormClientEfl_h
 #define FormClientEfl_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 class EwkView;
 
index 8584bdf7f9210e28ce14a0168559136e7d4484d6..11ecc4f2e9ccba1b3dade8c2b998610e8759a873 100644 (file)
@@ -27,7 +27,7 @@
 #define PageLoadClientEfl_h
 
 #include "WKPageLoadTypes.h"
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 class EwkView;
 
index c0b2b54bf2feb4f55d68f1f3a65e7633b29da73c..8214c792c1ffbd1ce32742aab76fbde37c637618 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "WKEvent.h"
 #include "WKPageLoadTypes.h"
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 class EwkView;
 
index bf0504da66e59e62cab02b247315068cc1e26de8..651cad4ae32f3cbed4a272d40b2ae28a1bef0e2a 100644 (file)
@@ -29,7 +29,7 @@
 
 #include "WKPage.h"
 #include "WKPopupItem.h"
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 class EwkView;
 
index 8c94f691aa9e34dcbcb44a40e92b17d0d0e9b17a..c9049f6852066154a191ab40e6d6f83b14f0fd45 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 1d6c6d6c16366d9d4c5aa356582f08a8f0a21e84..3333b6cd92e4ae896f0846607f691e5f41927309 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 5c48605c98587474904350a065e0f76d93ffa2af..ea0982482a952f2788eacd52a5d8b700cc72c241 100644 (file)
@@ -28,7 +28,7 @@
 
 #if ENABLE(VIBRATION)
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 class EwkView;
 
index 2cd189c18ade95d4b9bed5e80fd0a93c0893d37d..6ee30ae40c9bb4b14bb2a25fa6ba7b12d9bca297 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 943bf95ece342da8763e4e696087a11fa675ca30..3de62982c50aba981c57f049a8e6676bb727a83d 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 9bc23a37db5acd18ad5f352e5c3edc783df229fc..eec39cce8e97c12808840b5af1424b2657144e5c 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 84cefeb2f31a1a23f5c82a8659469bb2bcd17865..d4312197eb9d3b6327217a31b01098fa8f54443b 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 7d05108a39df7dc65d18cc5cf0f51d71091eca51..d130dedfd05e2e184003ac9add46fa548d235b10 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 258f01bc6cf05e9985f2d7573f53b3f56c5d7137..d49e0be26a16103c0f302e238a4dec64096abb45 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 6e329484c3c627e5c327b3dbf9ac5cfcd5c9dffd..db40dc43bf8911b39a7091a3656300125ff36132 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 7acc8ec775ffa5bd4af2a4b9fd92da69ce613450..c625b70c173d8533516c39901099f85890ebaada 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 34d474344dbeba3cabe704e6794cda606a180da7..174fb68de5519196a968ba8854ae9ac6b7468b40 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WebProcessMainEfl_h
 #define WebProcessMainEfl_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 namespace WebKit {
 
index 84ff809cd6522088b68529c26c736b74cfd5742c..f192faa3965e9c1db8d0a2a3e4bdc069f74d513b 100644 (file)
@@ -20,7 +20,7 @@
 #include "config.h"
 
 #include "WebGtkExtensionManager.h"
-#include <WebKit2/WKBundleInitialize.h>
+#include <WebKit/WKBundleInitialize.h>
 
 using namespace WebKit;
 
index 57d4ab3e65dbc41221fc1e8daa84a504a20ebae9..471c007a743534920550ecb672a65962dbd3d59f 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 828af830e68e6c8e594c966f22ad685ac3f5b383..f518cd3155d93524c843e64ba89a9ac2bba07e20 100644 (file)
@@ -27,7 +27,7 @@
 #ifndef WebProcessMainGtk_h
 #define WebProcessMainGtk_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 namespace WebKit {
 
index 2d0690d99b73a168005f9cb32f92b2fccc3593c3..8576213d25c8a645498518fae96362b3725546a0 100644 (file)
@@ -1 +1 @@
-#import <WebKit2/WKPreferencesRef.h>
+#import <WebKit/WKPreferencesRef.h>
index 0cecb004486bfd1323c5f9428cde3a43b6d0321b..3c29d8e042be02bef694d17b27a8fb149e42f9a4 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 b996926bb94d86fbaec27b0565d4de76263f2acf..ff16bf5dc3225169f950f28b8c66b7d4c235394e 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKWebProcessPlugIn.h>
+#import <WebKit/WKWebProcessPlugIn.h>
 
 #if WK_API_ENABLED
 
index 8a82d8c06b3ec70c228428a72ff22c1127293e19..a25375bed84ccb7d6690a72c3e92a334a4591b5c 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 0695c2d2d030695ab7540889649e3955007650aa..066b86d1f354898270d73f2b9a6eb469b1e35aa5 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 0ca1125846875eda60e43e16316d99ffb5e7839f..61a096c603cb68d8063f758c38aa7d9b13466594 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 8ad6c2badcdc01b430f9cf29f5732f4ded882bd7..6715ef9f2ce06489c1f384e2c72f7388ace6cc51 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 de1848fdc12f42b0605c7ea0221a95f635e53b52..3957effa029e99cb3c5603ca1e415a34b2d9aee9 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 7b35460a43f0e9c90b9db9dc17965eebc81e812c..858e6b714ed245650a52090bb03ff49656e19fcb 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 c03b125748a07e3ad5a1600e642cc72cad490fd2..aa9a22dba6585a30bf9fc30878916f539e4c82d4 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 4c0c77963d3892131e66081fc7057d024f43a30c..005f9ff1a127eb9f2e695a4d29d236e36029c604 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 5f66b537a17e8eaf3b01a438031652ef9a0b6066..ddbe9f23d0370d392f9ffff5554e35b5049c90a2 100644 (file)
@@ -27,7 +27,7 @@
 #include "InjectedBundleTest.h"
 
 #include "PlatformUtilities.h"
-#include <WebKit2/WKBundlePage.h>
+#include <WebKit/WKBundlePage.h>
 
 namespace TestWebKitAPI {
 
index 2f17b8162035566b812c47ca3d314f08a186d8c0..fb0a321e97fbd0e6c04bb6a64c11ceb3937ae0f5 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 889bb72203337b861819877336f0d60c9acc209c..ef9625b990b5be398346cde702a7f6eadb1281c2 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 b8b1ef9bb9169d406307bbb183b55bbe1aafe4e1..a3cb1b6debde59f8700c9fd58bca79307cf81123 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "config.h"
 #include "InjectedBundleTest.h"
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKRetainPtr.h>
 
 #include <cstdlib>
 
index f208ad7dda88c77b66432330a45449a9c6df4ac3..5c556ecee55f8a50e22c223b0fd6ad4ab87143b9 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 a4b4a5adf2bf897fa93413f7d2f65b6c88a68020..70899b8da9cf2ec650d7ac26097da51404192b9e 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 06abe884bf98ffa5cd60b1d368c57014f15de483..032de6f2eb06ebcdb039a71703b7dc94193ebe42 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 5c946625a86e183518f7d442fef89b1839e7cae7..0004f277900ea52a5bacb12bc7d6bdab81d18c9a 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 680c17288939c605e0a164f9706acc2828b4eb7f..f7e0d0f080baf44b13c97a000efa571a0d339509 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 fd373d28259eed00da22406af07abd4b9f2be8cb..5989850c8075078df8f620ca1c5fb9980b9db36a 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 e0c5cb0d803997d1364593bd1f8b2d2028c80f2d..a8716f651a5c19c8e3214c72ff0327faf701b8a6 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 efdcd56a7a75e1839f3d54f0b6de362b0acdf474..3920982c539205bf7157ce50b969b6cdcfb87529 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 30805f759ee47b78c834a47227007c6628aab2e1..04a0467b8e411cbe091b24e30e85d83a16dd99e2 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 d252d95e029753928427172e533630df45bf7aa2..30c439431f40f9ecd7cb699d0dad87f55f91c8de 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 830319481442be729d259cd830a441155b035f21..4a779c84280f2988830a7f445d01c3a923e9609e 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 90ad04fd1c480d053e34e82ab7dc9bd4227cc823..0ce1f5e0f58a3d588d361148ccaa5a4430a9557e 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 ac8d6a39d77477fcddadfae39eec539843620f6f..6a2aeb763bd76ab7a0a26e8984fb2f227236b328 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 41b52eacdf0c18e2c1f0260ff14476c306341fce..b7711e70276a93570bc0e443cd683c8db1da0b51 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 18416e8e13cd5e771409929f20c5d971008811e6..bab42c5ec2b9a4d587036c8bb233ad8e422df558 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 86c6754a22d67ed6411047c63367b267c0cc5389..a454db1d41f79a08c04195590df947b7dee566cd 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 093a5747b2594cc7f245eb203161782e328b54ba..2ca6d16ae3439d04544fd326a8e1c76d0ae419ae 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 edaa7cadada99416850c8307fd79fd087f77ec20..40edd52c5d6f2a071daa37f5e4e2f39c9dd50597 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 bf7a93726a86c52cf1d30c5809b97f837a17598a..ebc238322b8d919b730592a8935e3625f23a09ba 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 fe898ffa8c3324baf74402be397c5ace544151b7..037de987d62f0fceeb7bc5461acc189153e1faff 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 97500b59b9917d303571447963d21bab4c54c30e..b304f4e71f522d0a8a8eeaf3f876a05e0585fa88 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "InjectedBundleTest.h"
 #include "PlatformUtilities.h"
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKRetainPtr.h>
 
 namespace TestWebKitAPI {
 
index 2f7c7deed733503dd542c0ac0e18d0b28d199bba..48841833e18359243bdcf93017b6f36197c366bc 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 c6aaa1fec2cf361eb934c735f78adaf25f3d8024..76a182e75063af9b6b774003b321d7ac1c9d1f30 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 1b3b3b7b6d1f3dc7d4702990fafedafe46489fd8..e38228dcbe242f61c2d7d7b3e02e2cf02c62e748 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 6a597be41400f349b9d7e0f57b4363018fcfd0fc..5cc7a4fb2e702cb297fe0b37b2ac80c1a4673a6e 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "config.h"
 #include "InjectedBundleTest.h"
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKRetainPtr.h>
 
 namespace TestWebKitAPI {
 
index acc76c01e2b30fa5e37fc7244e3a632d891553a6..b635d3e99ed2bedf3db5723f4b840f3da0b7257c 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 6ae018765f610123c507f48511c989688a55cae7..80087f2c62b02d3d0a9414ebf44c7f33e8bdb888 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 407ecceb50e363a62eaf97bc5aed1fb8c50d909f..c3d290881ed5c658b54d9a1bc83e664b5c1d5f85 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 36708a4d737498a6a65b3152c565bb16f5f04fc2..788b6ae95fa61d7e96da182ef9076e22fc50fb54 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "InjectedBundleTest.h"
 #include "PlatformUtilities.h"
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKRetainPtr.h>
 
 namespace TestWebKitAPI {
 
index ef53f5e91cd269fc48c376d157bea147eeb52b64..d22852171c84d94cf23def1d0d9401dc8895fe22 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 def60bcb90e4cf2cbe4ff934971a3614935fcfec..aa1f6369987684dadcd94471558935cf28856255 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 abf44715565420468a70e1a1a2b1ed4204ce3069..ac40126454537f2c68a50e312502bd95554e7eb2 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 13aa1106e91a9c6a0420e72a7f6e3ff415ca5db8..7a80ad9843486a0cba7369728f98f279c7f041e5 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 3228d084af45cc615bfe03edbae68febd21d49a6..08ba4d4b4e90315421fd26fda93de110a79fa611 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 640a825f88bff359cfa2df2c9259ac7aaabd1be0..9137b01ae4a2debc958442bfbfd7892697036eef 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 1568b76630bde46e5711252ebea8a8de4a6701c4..6c571114415ca507d003c2ba2a1967819f83a36a 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 b909ec9411e943289b06626dbc9a90b10ddecbef..682cc157c6048f78d2122e86b97e5de075dcb45f 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 11fc17ebdb15017e47d694289a69071501b0ee59..d45820a3adb058e318a755cfe1f9dfcd6a434359 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 bdaade77bb196e1407cd5ecc1e6ae656b1a947ce..d5bfa53e291356316bbbd36a16c37753e69e0778 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 04d6ee448ba56d5a9d762a557debe8be8ffc41fc..be6880b0433abb126a13ec5dac76755b4ffd3176 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 33e16bd3eb4c54a6b602cbd0293d9f1bec5afce3..8b5c06938ba11fef3ede8adf0d1437c9c1c7939b 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 c408c3b2c28455f406b2732e37347ffe9d9a3acd..226f9ec34937fd7c1dba028fa5d1036bd54e5485 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 cbb685ae4a9a0f6bb88ef704f21d9fa81de3fc37..603d0e68f94f10ee4b60bfcae54098b859964e42 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 8ef9bb66dc8802c467eae792e25d28caed12b252..a950f8e1d363951f81302134c53591f8ec9d660a 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 ec97ac0b0b5fb6cacf502f0e3e72af9714de6f6b..c82b99198b900ee042f0eca38bba6cedd7f60315 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 b23336293e168211ca146d129d4061678db0fb54..b08e935f4f2331db038a6c1030ff0cdc6fcf3a75 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 7ee1a5ae0f02b7408dcbdbcbe6a35038f8f6ab2e..40c75a1ebee4ecbff8c680d4f9ea56c9d2a5bad9 100644 (file)
@@ -28,7 +28,7 @@
 #include "PlatformWebView.h"
 #include "Test.h"
 
-#include <WebKit2/WKString.h>
+#include <WebKit/WKString.h>
 
 namespace TestWebKitAPI {
 
index 81bc03a760783215815806a7629ad62898282c0e..8f82fcfa865011a5a851060684f7d593389da873 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 c5acb6172543c3a1672f636d1eb951f203b1f94f..6d9bc60b8ac4058a06569c99b14b355e909b1f2e 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 b50f141b82730b21fa3f7aa92d534626fa7925a5..bf31057e4bb52690ef8c8dc8d133e2ccedc16ea7 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 fb265abc18d5ab46ec16229bdd37418665cc5e3a..f336ac78a7a1a24c957963dbf8c1aacff2dae0fc 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 af1f1e7055c12d82563ee731c24e6a28fdba269e..c777aa4d69c9e1c92a8ef0177b3d4c7718f1e6c5 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 4cd9eddb4c8fff3f11ce976b131f8552d377f868..84a3f2f24b991751dbaa75024fcc595b54180831 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 1d051e518076b45ab1e6e964f0b66282ca566a29..57c5a8befcbc44360d3079276bde6ed9ca60db6c 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 3891d8e344d9490c56562eb232fee536c698bfe0..9ca6080d3e05902550a1083cb4d2c21ec22e456f 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 5754155ed7ba352aa303f56ba636d0596b3f53cc..f0baacce7644b6c319c8a0a9f0aee4ac8c16ae71 100644 (file)
@@ -28,7 +28,7 @@
 #include "PlatformWebView.h"
 #include "Test.h"
 
-#include <WebKit2/WKString.h>
+#include <WebKit/WKString.h>
 
 namespace TestWebKitAPI {
 
index dd81bf3bffad1a62556e8aae36e1de9f7733312f..a39463919cf2b17ccca0b755afd85f6f5dffebbd 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 7bf461ee73446eb44b40d2daca959e327e524f4e..361372626af1f8f084f3cb79064b4442ae7e3c53 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 817cd120d1dc8ca701df1a8e7e07910f2ef22e3b..38183e0f479b571e5f0da37be52f4c8b2569da05 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 cdba57de4dee8b5687a20c09ef05775dc178bdcd..53568da18035db4333deab22fa1f86c6c9935a51 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#include <WebKit2/WKStringPrivate.h>
+#include <WebKit/WKStringPrivate.h>
 #include <JavaScriptCore/JSStringRef.h>
 
 namespace TestWebKitAPI {
index 7707b24ef5e4d1286483b857ba7f49434392f733..04e72067e559e0b7f04606ab681722afb133be6f 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 f588595171947e417a79f8497ae9fa89ceae823b..8ee79b100b88a7c61b9b2f904392c745cf1c4c51 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 783aebe7ad8453074ff0f321a87c45826849dc0e..04039c39fe52223b50414f468b20e95e1361a4c6 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 e85ca256feea17589e905bdf500637aee9633e12..37db2740774e6e3e967deb369fe6d1d168d5d009 100644 (file)
@@ -27,7 +27,7 @@
 #include "InjectedBundleTest.h"
 
 #include "PlatformUtilities.h"
-#include <WebKit2/WKBundlePage.h>
+#include <WebKit/WKBundlePage.h>
 
 namespace TestWebKitAPI {
 
index 6741e9f34aae45e87b4a51ee7711d9faf7d6af94..96abad47853baeab63574f1bfccaf12b53f1f5a4 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 83a95c069b7ffbc6f562cec2f9ec4b9512419f36..1c9e096179f81e88fde97c33bb993d2f65920a45 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "config.h"
 #include "InjectedBundleTest.h"
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKRetainPtr.h>
 
 namespace TestWebKitAPI {
 
index eacb7e3d240014f6794bea75af42d5ec46004458..f46ad9acd5128838bc92679f6ef602db6713a762 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 033cff56fd2c62e1eb64b8d92b1c2ac6f7eaddd9..f947a8c2fba28568a6821160db5a2a503bef3c9b 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 b8bceab48f2a21977a5161b326c46b9edfc8e826..57ee5d07bf23ccb0c1e90ca3e01e2b5c35883992 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 91586726936c313df7d270577f2760021dd3aa12..c5c3eff0164f3de69085a20d2aa059a2d827764b 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 0d0331c774d85275105cc817d8520388e3af90ac..2958c396e0a1b8e2d6822d7d2e07f9a32b188990 100644 (file)
@@ -25,7 +25,7 @@
 
 #import "config.h"
 
-#import <WebKit2/WeakObjCPtr.h>
+#import <WebKit/WeakObjCPtr.h>
 
 using WebKit::WeakObjCPtr;
 
index 000f9cdd0c026ddf00f71db18df8b9f80828ec24..b0cd07227f2eefa5e46ed5e12871b3501f36e1d1 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 44a5b30d0a3348ae3214927cc3fdd454b3268d7a..6513f50144663e3d6bdc36ec9a9e259ab9489880 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 32c8a0762ea85567cf19d1a81d21d5451cbe17d3..0a510b237dfe5781652066b2c8bd58521a2d08ba 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 844499cd6dab06896c66092b2af3c2b62e208b69..2aa86faf12ba09273e4aba2874412696ad5fefe7 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 5fa4b3a2ae311ffeb58def9ae7b210d243904173..8e2b4126d937aab706b0e5fe94372b6c216321bf 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 36a18ca41ca84d8a16e6d0089754710094cf343a..cd1ee14f4404b735a741363ac0d698c05ceaf2bb 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 24ac215f37b29f8974f4721a38fea5e2d756fc39..8c0ace8df15901b5f01633bf6165da7d8a936ded 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #import "config.h"
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
index 60bd8279f728dd1ca16a834da0d6accc4d8ecfd8..e9d3ba4d890950f774be1f0d643f26e46ba5244c 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 6908cf955030a9dbbb1a72f8813023350c9b4eda..f9bd7277b5edea2ff8f23915ffb39f14fffc92f5 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 
 #include "InjectedBundleTest.h"
-#include <WebKit2/WKBundlePage.h>
+#include <WebKit/WKBundlePage.h>
 
 namespace TestWebKitAPI {
 
index a30d99956f39dd3ae207f202345a0c2f040c282c..b7b3ed8be012441391a83da9de67a6237bbd7bb3 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 eec3497c67d23b35e7b30dc7121f351f3534f0ec..f3ea748b3f4be8ecc005ab0ec7740562416b001a 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 7a933f4ea927fb9fe24560a46d563101345ff0df..9e47780505995ba828a713ba4c2e95bf0ee1a05a 100644 (file)
@@ -28,7 +28,7 @@
 #include "PlatformUtilities.h"
 #include "Test.h"
 
-#include <WebKit2/WKBundlePage.h>
+#include <WebKit/WKBundlePage.h>
 
 #include <wtf/Assertions.h>
 
index a6b3f87300204601ddfc11010b020bedbb060c7c..a8568f9ae8a732ce785b6af80e8903ebbe14fc87 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 13b509882afd815be3afab54f869e10579477f34..2ecff16931d791df1068e31ab94b3fb99da171f3 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 dac96ce79c7d19f6c8b90e67dd59ded1c4f73a61..38f45d92db00d25fe4b9fb56ef9b5a2dcf7c2a90 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 8c454282aa3ac6180930dee9130951147f109497..71c0b1cbdd844dd6d97b6e09358691127c1f7e60 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 89ad21b51f338b374b8c7345dcba3152adb568cd..854c9fbc41fca42aa0ae5fbd7c01b00d59b4c0c9 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 8b04ded6447fd9dce79b865e50a7b53e31fe98db..313616a7eef8da7b5aa916325eaf5119aafd6887 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 60bc869a7f7203ed8eeb9a336d32746212840eb6..c75cd1ec32cc3d55d3374786f0a98bc4ae204378 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 b2526679fccc415c1243d6ab6375524aa958c332..2db2e02da4e0c3fcbfccefe62643b8cbf17b3929 100644 (file)
@@ -27,7 +27,7 @@
 #include "JavaScriptTest.h"
 
 #include <WebKit/WebView.h>
-#include <WebKit2/WKViewPrivate.h>
+#include <WebKit/WKViewPrivate.h>
 
 namespace TestWebKitAPI {
 
index 6f90dcd508dd67959814fd81664a7ce71398669c..4b7322201afe40cac0ad46eee908cef3c52a2475 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 1661074b2ab75edcdd72ae63992edb4a87aa0b6e..827e7f9d78784e7e32d4c26f2aebe33fd39880df 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 25f0cab5dd04583eb52f07de67a6711778d60859..59ffe42310b293fb34a13a3ce56c3dcb685f86a1 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WebKit2.h>
+#import <WebKit/WebKit2.h>
 
 #if WK_API_ENABLED
 
index 9c568802e6549db198dc913221d9e6fde5437f90..4b28e594fba4656711609503d51b4c41638b1e0d 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 eb8b3cbb5426a49706ae0eaf10d2343b6c9bde3f..e2a324ecf05e4a2d8f351943ef8c1c7b303536cd 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 9120258c75edce8283a9b303880d34c18f5f62fc..87b683f250eeb02af0b8a4fa5360afb1a9fdc69e 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 ff5537e461c58abcb8a09f137e95d964a76bf023..c639842911e6c7cbd073288af52af211771e1dec 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef GeolocationProviderMock_h
 #define GeolocationProviderMock_h
 
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKRetainPtr.h>
 
 namespace WTR {
 
index 7fdc2dcdce0674b119ac415bbd646f419b3bdfba..348d69172f5210530fc15fb20d1abff6044102cb 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 8b5a42a695e9a5da36626b7b234690debb8657bc..90d4f1539c2fbedf1918d8c60e227fbfc768b8b6 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 fd030b9cfa78c25b4380b87c27a463fc2ce70c5c..359f541d148d38ad4d7ef8952250f9f69adb8b7a 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 10c21dba8e3c8a0311642cbd7a419990917368ac..183ff5ed03a906d47754e6c283d61d2b6804af11 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "InjectedBundle.h"
 #include "JSGCController.h"
-#include <WebKit2/WKBundlePrivate.h>
+#include <WebKit/WKBundlePrivate.h>
 
 namespace WTR {
 
index f79a003a83ba326a658a5803dfe7fb7e4494f2ab..38454331ca5b820c569a30d4516b065026ef2df7 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 e5f1f156425bdd52399de6542e389b114ba9e40e..4aed4c6fbc30deb2cd3197322b6ccbb0515759e9 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 58af682215111c2e6eb31e54b99441a286dd700c..9c4b03ece6bc50a3ef616561748335894673422f 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 b44c410b9473dc0d865e641c062b8cbd1a99c118..dbfcc0c52d2b893bc3a07d73b74c27f09cd9c97c 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 f01b50b542fa62c42d4b07f0a412b4eb3f5caa28..bde0fd48f4e8e020981cbcb0e1cdcf431a7bd3fb 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 34467b2488d4c762437aab496964f32a6f41b02e..d085f1a2660bda289963c6aaf73d8bc3bf24c8b8 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 4b7860eb538d91b5796efda356d7fd60bf3019a6..e21fff3c6fa755cd545c0ccd71f8f751e9fd0d10 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 0087aa3016e2d8a20a96370cb0be18ff428a4049..ae737fdc1fa4621da96b1c5632a589b360057f5d 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 3573a2a5c7fceed8a4a46b5de9bc26b629b9fafc..ea0f4eaa1865696b077c2bd6995134a00267075d 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 b521072ae02e7562f63426ba648f4b16285dddbf..650ffd69682369cf7c53fa23321bbd95b677b493 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 44cae906cfafd8a61c19a7078ead8076b668a0ac..2f9bfa4db1f0ffeec9d4f787a169ccdbe0dfb344 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 6ff8e372fa2d9772c5e04682b19096d512e8e34d..ac66148f01f1c764539e5086dd32454ffcdf592c 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 f8dac8fd599395ef2c4eb55a0402a6719b4b60ee..bc69d8da2712f6df9d79866958188902b86e3ac2 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 77c35b4ce66eaed31b701231983e90c47f5b4053..cab3f18b3659f4916bd500879286d6a27c0c9f91 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 3403b706a04709fa757a953d350169f3746722ed..53fe22c3860d0a88c741ed35b0278684e969d2cf 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 a3a0233f95e378aefe88ea61aad47d1f17f3a061..23be93f6690313ff52f2cbe9363e9277bc03ba64 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 e1653f2550ef955667766c54566c41473c9fdbcf..6051c39022b1231057792aef6e26a1fe21843d28 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 52d6c971f3f59da627609b176212f73194ac79f1..42c9ef6d4fc82a38273d9978f08632ac76a7162d 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 551d86740f00a392c202f6823f1c17c36b954da7..dce761b36d024f05297e2603c65d300afeb32923 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 96a0bddee9996e54bfa5451ea605da0b3ac9972c..3107eaf96675d9394762d63bc1591fc311708238 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 908f5af2419faac7ae8060bda35f62c8c7f6686c..3472574c8ecee7db36c4134844e973f6875e9fe3 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 bd20887e33e5b3197cdf22bf9014861bf167715c..2f952b5cc4c50d23a94ac193d90d5903853f93c4 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 7ab9022984cbb93ebecf5a74b72bfe00b2f72257..2ed213cd7a3f41a751540493adb6413ba42e961a 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 3c18105c5def83fe7edcbcb1cd9152252c05bd49..5f989fc54e75111a02cc66958719a6be96eac34a 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 55064249fcc325a1ec94f0645ec46d40c3c939b7..d43b3291be09555ad45fb0d7a5802c842bedcd5c 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 fba2870fcf144c1c1c9364f7c6d4c63c9422e64b..402d110eff357faf3a82e702183532dca3f7b58f 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 e74fa34642cee2d74e865af01a6a5624deedc47e..325023d1940bff468477c7aa147e697340cb589a 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 5d9229d2aedd7d92ccadb2dedc0f4924b6b06ddd..19402cd3052c95bd97ba16808c30924bf37b9952 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 b2746d5b81609bd8093e5627f1536c4044aadc3c..7111a8e1e51d5ded43ed7414e05e725aaf5d2b99 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 374befe2c0e68ff0e050ce6a38718c4a24d5bb84..1cd0b4b8e2dcbe05a26d412859023f75d0eb96af 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 60f3998d0378401ad481bdcdd773a9bbc7c285b1..17dfb76888382889855d35c3d5d8d5208bce508b 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 846e4b73f67a134e44d7403f79c5278b972b7c4b..f316e76a15b5d00f7329fde307c3ba669b3f94e9 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 3825deb0009e9c94d24047712aba92855727ec40..324287ec9743ec0387d30ea7269d346b9f23d431 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 029f7a4d461250ff9815b0953cbabb6d6baf56e0..469766f0a24258abd8e333d71a4ac525e1cf8f20 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 241cc888a9c0c5270adda4be9c22edde6c0892d8..6f9d33f9ce1a788ec8eabd3152a68e84c383e839 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 83c53683844aa44b9ed7c50b32a284a227353f0e..c83b45c84e19d4d98a3ffca2759f1a88df66df89 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 5755b33fce715112d745eac31744f406357e5552..cd9ac1c5ce29b33ea68e9fda0de0483ad3bcb7e7 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 d0162606f8249ed3e69d0f3350637dffa7d4600d..e9424d6a63a6af824234db5c1aceea72ac052a4b 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)