Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(140)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/WebKit/chromium/WebKit.gyp

Issue 17486002: Remove WebKit/chromium/public fowarding headers (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix watchlist Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | Source/WebKit/chromium/WebKitUnitTests.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebKit/chromium/WebKit.gyp
diff --git a/Source/WebKit/chromium/WebKit.gyp b/Source/WebKit/chromium/WebKit.gyp
index ea53140ee584089facb49cb1478c5af3032817a7..9c7ac03ecddff6937c89017a4d03d84bef36326c 100644
--- a/Source/WebKit/chromium/WebKit.gyp
+++ b/Source/WebKit/chromium/WebKit.gyp
@@ -58,7 +58,7 @@
'<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
],
'include_dirs': [
- 'public',
+ '../../../public/web',
'src',
'<(angle_path)/include',
'<(DEPTH)/third_party/skia/include/utils',
@@ -69,195 +69,6 @@
],
'sources': [
'<@(webcore_platform_support_files)',
- 'public/WebAccessibilityNotification.h',
- 'public/WebAccessibilityObject.h',
- 'public/WebAccessibilityRole.h',
- 'public/WebApplicationCacheHostClient.h',
- 'public/WebArrayBuffer.h',
- 'public/WebArrayBufferView.h',
- 'public/WebAudioSourceProvider.h',
- 'public/WebAudioSourceProviderClient.h',
- 'public/WebAutofillClient.h',
- 'public/WebBindings.h',
- 'public/WebBlob.h',
- 'public/WebCache.h',
- 'public/WebCachedURLRequest.h',
- 'public/WebColorChooser.h',
- 'public/WebColorChooserClient.h',
- 'public/WebColorName.h',
- 'public/WebCommonWorkerClient.h',
- 'public/WebCompositionUnderline.h',
- 'public/WebConsoleMessage.h',
- 'public/WebContentDetectionResult.h',
- 'public/WebContextMenuData.h',
- 'public/WebCrossOriginPreflightResultCache.h',
- 'public/WebCursorInfo.h',
- 'public/WebDOMActivityLogger.h',
- 'public/WebDOMCustomEvent.h',
- 'public/WebDOMEvent.h',
- 'public/WebDOMEventListener.h',
- 'public/WebDOMMessageEvent.h',
- 'public/WebDOMMouseEvent.h',
- 'public/WebDOMMutationEvent.h',
- 'public/WebDOMProgressEvent.h',
- 'public/WebDOMResourceProgressEvent.h',
- 'public/WebDataSource.h',
- 'public/WebDatabase.h',
- 'public/WebDatabaseObserver.h',
- 'public/WebDateTimeInputType.h',
- 'public/WebDateTimeChooserCompletion.h',
- 'public/WebDateTimeChooserParams.h',
- 'public/WebDevToolsAgent.h',
- 'public/WebDevToolsAgentClient.h',
- 'public/WebDevToolsFrontend.h',
- 'public/WebDevToolsFrontendClient.h',
- 'public/WebDeviceOrientation.h',
- 'public/WebDeviceOrientationClient.h',
- 'public/WebDeviceOrientationClientMock.h',
- 'public/WebDeviceOrientationController.h',
- 'public/WebDocument.h',
- 'public/WebDocumentType.h',
- 'public/WebEditingAction.h',
- 'public/WebElement.h',
- 'public/WebExceptionCode.h',
- 'public/WebExternalPopupMenu.h',
- 'public/WebExternalPopupMenuClient.h',
- 'public/WebFileChooserCompletion.h',
- 'public/WebFileChooserParams.h',
- 'public/WebFileWriter.h',
- 'public/WebFileWriterClient.h',
- 'public/WebFindOptions.h',
- 'public/WebFont.h',
- 'public/WebFontCache.h',
- 'public/WebFontDescription.h',
- 'public/WebFormControlElement.h',
- 'public/WebFormElement.h',
- 'public/WebFrame.h',
- 'public/WebFrameClient.h',
- 'public/WebGeolocationClient.h',
- 'public/WebGeolocationClientMock.h',
- 'public/WebGeolocationController.h',
- 'public/WebGeolocationError.h',
- 'public/WebGeolocationPermissionRequest.h',
- 'public/WebGeolocationPermissionRequestManager.h',
- 'public/WebGeolocationPosition.h',
- 'public/WebGlyphCache.h',
- 'public/WebHelperPlugin.h',
- 'public/WebHistoryItem.h',
- 'public/WebHitTestResult.h',
- 'public/WebIconLoadingCompletion.h',
- 'public/WebIconURL.h',
- 'public/WebImageCache.h',
- 'public/WebImageDecoder.h',
- 'public/WebInbandTextTrack.h',
- 'public/WebInbandTextTrackClient.h',
- 'public/WebInputElement.h',
- 'public/WebInputEvent.h',
- 'public/WebKit.h',
- 'public/WebLabelElement.h',
- 'public/WebMediaPlayer.h',
- 'public/WebMediaPlayerAction.h',
- 'public/WebMediaPlayerClient.h',
- 'public/WebMediaSource.h',
- 'public/WebMediaSourceClient.h',
- 'public/WebMediaStreamRegistry.h',
- 'public/WebMemoryUsageInfo.h',
- 'public/WebMenuItemInfo.h',
- 'public/WebNavigationType.h',
- 'public/WebNetworkStateNotifier.h',
- 'public/WebNode.h',
- 'public/WebNodeCollection.h',
- 'public/WebNodeList.h',
- 'public/WebNotification.h',
- 'public/WebNotificationPermissionCallback.h',
- 'public/WebNotificationPresenter.h',
- 'public/WebOptionElement.h',
- 'public/WebPageOverlay.h',
- 'public/WebPagePopup.h',
- 'public/WebPageSerializer.h',
- 'public/WebPageSerializerClient.h',
- 'public/WebPageVisibilityState.h',
- 'public/WebPasswordFormData.h',
- 'public/WebPerformance.h',
- 'public/WebPermissionClient.h',
- 'public/WebPlugin.h',
- 'public/WebPluginAction.h',
- 'public/WebPluginContainer.h',
- 'public/WebPluginDocument.h',
- 'public/WebPluginListBuilder.h',
- 'public/WebPluginScrollbar.h',
- 'public/WebPluginScrollbarClient.h',
- 'public/WebPrintParams.h',
- 'public/WebPrintScalingOption.h',
- 'public/WebPopupMenu.h',
- 'public/WebPopupMenuInfo.h',
- 'public/WebPopupType.h',
- 'public/WebPrerendererClient.h',
- 'public/WebRange.h',
- 'public/WebRuntimeFeatures.h',
- 'public/WebScopedMicrotaskSuppression.h',
- 'public/WebScopedUserGesture.h',
- 'public/WebScreenInfo.h',
- 'public/WebScriptController.h',
- 'public/WebScriptSource.h',
- 'public/WebSearchableFormData.h',
- 'public/WebSecurityOrigin.h',
- 'public/WebSecurityPolicy.h',
- 'public/WebSelectElement.h',
- 'public/WebSerializedScriptValue.h',
- 'public/WebSettings.h',
- 'public/WebSharedWorkerClient.h',
- 'public/WebSharedWorker.h',
- 'public/WebSharedWorkerRepository.h',
- 'public/WebSocket.h',
- 'public/WebSocketClient.h',
- 'public/WebSpeechGrammar.h',
- 'public/WebSpeechInputController.h',
- 'public/WebSpeechInputListener.h',
- 'public/WebSpeechInputResult.h',
- 'public/WebSpeechRecognitionHandle.h',
- 'public/WebSpeechRecognitionParams.h',
- 'public/WebSpeechRecognitionResult.h',
- 'public/WebSpeechRecognizerClient.h',
- 'public/WebSpeechRecognizer.h',
- 'public/WebSpellCheckClient.h',
- 'public/WebStorageEventDispatcher.h',
- 'public/WebStorageQuotaCallbacks.h',
- 'public/WebStorageQuotaType.h',
- 'public/WebStorageQuotaError.h',
- 'public/WebSurroundingText.h',
- 'public/WebTextAffinity.h',
- 'public/WebTextCheckingCompletion.h',
- 'public/WebTextCheckingResult.h',
- 'public/WebTextDirection.h',
- 'public/WebTextFieldDecoratorClient.h',
- 'public/WebTextInputInfo.h',
- 'public/WebTextInputType.h',
- 'public/WebTextRun.h',
- 'public/WebTimeRange.h',
- 'public/WebURLLoaderOptions.h',
- 'public/WebUserGestureIndicator.h',
- 'public/WebUserGestureToken.h',
- 'public/WebUserMediaClient.h',
- 'public/WebUserMediaRequest.h',
- 'public/WebValidationMessageClient.h',
- 'public/WebView.h',
- 'public/WebViewBenchmarkSupport.h',
- 'public/WebViewClient.h',
- 'public/WebWidget.h',
- 'public/WebWidgetClient.h',
- 'public/WebWorkerInfo.h',
- 'public/android/WebInputEventFactory.h',
- 'public/android/WebSandboxSupport.h',
- 'public/default/WebRenderTheme.h',
- 'public/gtk/WebInputEventFactory.h',
- 'public/linux/WebFontRenderStyle.h',
- 'public/linux/WebFontRendering.h',
- 'public/mac/WebInputEventFactory.h',
- 'public/mac/WebSandboxSupport.h',
- 'public/mac/WebSubstringUtil.h',
- 'public/win/WebInputEventFactory.h',
- 'public/win/WebSandboxSupport.h',
'src/ApplicationCacheHost.cpp',
'src/ApplicationCacheHostInternal.h',
'src/AssertMatchingEnums.cpp',
@@ -583,7 +394,6 @@
'<@(core_unittest_files)',
'<@(webkit_unittest_files)',
'src/WebTestingSupport.cpp',
- 'public/WebTestingSupport.h',
'tests/WebUnitTests.cpp', # Components test runner support.
],
'conditions': [
@@ -618,7 +428,7 @@
'<(DEPTH)/build/linux/system.gyp:fontconfig',
],
'include_dirs': [
- 'public/linux',
+ '../../../public/web/linux',
],
}, {
'sources/': [
@@ -630,7 +440,7 @@
'<(DEPTH)/build/linux/system.gyp:x11',
],
'include_dirs': [
- 'public/x11',
+ '../../../public/web/x11',
],
}, {
'sources/': [
@@ -642,7 +452,7 @@
'<(DEPTH)/build/linux/system.gyp:gtk',
],
'include_dirs': [
- 'public/gtk',
+ '../../../public/web/gtk',
],
}, { # else: toolkit_uses_gtk != 1
'sources/': [
@@ -651,8 +461,8 @@
}],
['OS=="android"', {
'include_dirs': [
- 'public/android',
- 'public/linux', # We need linux/WebFontRendering.h on Android.
+ '../../../public/web/android',
+ '../../../public/web/linux', # We need linux/WebFontRendering.h on Android.
],
}, { # else: OS!="android"
'sources/': [
@@ -661,7 +471,7 @@
}],
['OS=="mac"', {
'include_dirs': [
- 'public/mac',
+ '../../../public/web/mac',
],
'link_settings': {
'libraries': [
@@ -676,7 +486,7 @@
}],
['OS=="win"', {
'include_dirs': [
- 'public/win',
+ '../../../public/web/win',
],
}, { # else: OS!="win"
'sources/': [['exclude', '/win/']],
@@ -687,12 +497,11 @@
}],
['use_default_render_theme==1', {
'include_dirs': [
- 'public/default',
+ '../../../public/web/default',
],
}, { # else use_default_render_theme==0
'sources/': [
['exclude', 'src/default/WebRenderTheme.cpp'],
- ['exclude', 'public/default/WebRenderTheme.h'],
],
}],
],
@@ -722,13 +531,12 @@
'../../core/core.gyp:webcore_test_support',
],
'include_dirs': [
- 'public',
+ '../../../public/web',
'../../core/testing/v8', # for WebCoreTestSupport.h, needed to link in window.internals code.
'../../../',
],
'sources': [
'src/WebTestingSupport.cpp',
- 'public/WebTestingSupport.h',
],
}],
],
« no previous file with comments | « no previous file | Source/WebKit/chromium/WebKitUnitTests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698