OSDN Git Service

(root) / android-x86 / external-webkit.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge WebKit at r78450: Initial merge by git.
[android-x86/external-webkit.git] / Source / WebCore / WebCore.gypi
diff --git a/Source/WebCore/WebCore.gypi b/Source/WebCore/WebCore.gypi
index ca52804..eb8016c 100644 (file)
--- a/Source/WebCore/WebCore.gypi
+++ b/Source/WebCore/WebCore.gypi
@@ -245,6 +245,7 @@
             'page/BarInfo.idl',
             'page/Console.idl',
             'page/Coordinates.idl',
+            'page/Crypto.idl',
             'page/DOMSelection.idl',
             'page/DOMWindow.idl',
             'page/EventSource.idl',
@@ -677,6 +678,7 @@
             'bindings/js/JSLocationCustom.h',
             'bindings/js/JSMainThreadExecState.cpp',
             'bindings/js/JSMainThreadExecState.h',
+            'bindings/js/JSMemoryInfoCustom.cpp',
             'bindings/js/JSMessageChannelCustom.cpp',
             'bindings/js/JSMessageEventCustom.cpp',
             'bindings/js/JSMessagePortCustom.cpp',
@@ -893,6 +895,7 @@
             'bindings/v8/DOMDataStore.h',
             'bindings/v8/DOMWrapperWorld.cpp',
             'bindings/v8/DOMWrapperWorld.h',
+            'bindings/v8/IntrusiveDOMWrapperMap.h',
             'bindings/v8/IsolatedWorld.cpp',
             'bindings/v8/IsolatedWorld.h',
             'bindings/v8/JavaScriptCallFrame.cpp',
@@ -1219,6 +1222,8 @@
             'dom/DocumentMarker.h',
             'dom/DocumentMarkerController.cpp',
             'dom/DocumentMarkerController.h',
+            'dom/DocumentOrderedMap.cpp',
+            'dom/DocumentOrderedMap.h',
             'dom/DocumentParser.cpp',
             'dom/DocumentParser.h',
             'dom/DocumentTiming.h',
@@ -1986,6 +1991,8 @@
             'html/parser/HTMLScriptRunner.cpp',
             'html/parser/HTMLScriptRunner.h',
             'html/parser/HTMLScriptRunnerHost.h',
+            'html/parser/HTMLSourceTracker.cpp',
+            'html/parser/HTMLSourceTracker.h',
             'html/parser/HTMLToken.h',
             'html/parser/HTMLTokenizer.cpp',
             'html/parser/HTMLTokenizer.h',
@@ -1998,6 +2005,11 @@
             'html/parser/TextDocumentParser.h',
             'html/parser/TextViewSourceParser.cpp',
             'html/parser/TextViewSourceParser.h',
+            'html/parser/XSSFilter.cpp',
+            'html/parser/XSSFilter.h',
+            'html/shadow/MediaControls.cpp',
+            'html/shadow/MediaControls.h',
+            'html/shadow/ProgressBarValueElement.h',
             'html/shadow/SliderThumbElement.cpp',
             'html/shadow/SliderThumbElement.h',
             'inspector/ConsoleMessage.cpp',
@@ -2006,6 +2018,8 @@
             'inspector/InjectedScript.h',
             'inspector/InjectedScriptHost.cpp',
             'inspector/InjectedScriptHost.h',
+            'inspector/InspectorAgent.cpp',
+            'inspector/InspectorAgent.h',
             'inspector/InspectorApplicationCacheAgent.cpp',
             'inspector/InspectorApplicationCacheAgent.h',
             'inspector/InspectorBrowserDebuggerAgent.cpp',
@@ -2014,12 +2028,14 @@
             'inspector/InspectorClient.h',
             'inspector/InspectorConsoleAgent.cpp',
             'inspector/InspectorConsoleAgent.h',
+            'inspector/InspectorConsoleInstrumentation.h',
             'inspector/InspectorController.cpp',
             'inspector/InspectorController.h',
             'inspector/InspectorCSSAgent.cpp',
             'inspector/InspectorCSSAgent.h',
             'inspector/InspectorDatabaseAgent.cpp',
             'inspector/InspectorDatabaseAgent.h',
+            'inspector/InspectorDatabaseInstrumentation.h',
             'inspector/InspectorDatabaseResource.cpp',
             'inspector/InspectorDatabaseResource.h',
             'inspector/InspectorDebuggerAgent.cpp',
@@ -2030,8 +2046,6 @@
             'inspector/InspectorDOMStorageAgent.h',
             'inspector/InspectorDOMStorageResource.cpp',
             'inspector/InspectorDOMStorageResource.h',
-            'inspector/InspectorFileSystemAgent.cpp',
-            'inspector/InspectorFileSystemAgent.h',
             'inspector/InspectorFrontendClient.h',
             'inspector/InspectorFrontendHost.cpp',
             'inspector/InspectorFrontendHost.h',
@@ -2044,8 +2058,6 @@
             'inspector/InspectorRuntimeAgent.cpp',
             'inspector/InspectorRuntimeAgent.h',
             'inspector/InspectorState.cpp',
-            'inspector/InspectorSettings.h',
-            'inspector/InspectorSettings.cpp',
             'inspector/InspectorState.h',
             'inspector/InspectorStyleSheet.cpp',
             'inspector/InspectorStyleSheet.h',
@@ -2054,7 +2066,6 @@
             'inspector/InspectorValues.cpp',
             'inspector/InspectorValues.h',
             'inspector/InspectorWorkerResource.h',
-            'inspector/ScriptBreakpoint.cpp',
             'inspector/ScriptBreakpoint.h',
             'inspector/ScriptArguments.cpp',
             'inspector/ScriptArguments.h',
@@ -2263,10 +2274,14 @@
             'page/ChromeClient.h',
             'page/Console.cpp',
             'page/Console.h',
+            'page/ContentSecurityPolicy.cpp',
+            'page/ContentSecurityPolicy.h',
             'page/ContextMenuClient.h',
             'page/ContextMenuController.cpp',
             'page/ContextMenuController.h',
             'page/ContextMenuProvider.h',
+            'page/Crypto.cpp',
+            'page/Crypto.h',
             'page/DOMSelection.cpp',
             'page/DOMSelection.h',
             'page/DOMTimer.cpp',
@@ -2373,8 +2388,6 @@
             'page/WindowFeatures.h',
             'page/WorkerNavigator.cpp',
             'page/WorkerNavigator.h',
-            'page/XSSAuditor.cpp',
-            'page/XSSAuditor.h',
             'platform/audio/AudioArray.h',
             'platform/audio/AudioBus.h',
             'platform/audio/AudioBus.cpp',
@@ -2431,6 +2444,7 @@
             'platform/audio/VectorMath.h',
             'platform/audio/VectorMath.cpp',
             'platform/audio/chromium/AudioBusChromium.cpp',
+            'platform/audio/fftw/FFTFrameFFTW.cpp',
             'platform/audio/mac/AudioBusMac.mm',
             'platform/audio/mac/AudioDestinationMac.h',
             'platform/audio/mac/AudioDestinationMac.cpp',
@@ -2580,9 +2594,7 @@
             'platform/graphics/chromium/GraphicsLayerChromium.h',
             'platform/graphics/chromium/HarfbuzzSkia.cpp',
             'platform/graphics/chromium/HarfbuzzSkia.h',
-            'platform/graphics/chromium/IconChromiumLinux.cpp',
-            'platform/graphics/chromium/IconChromiumMac.cpp',
-            'platform/graphics/chromium/IconChromiumWin.cpp',
+            'platform/graphics/chromium/IconChromium.cpp',
             'platform/graphics/chromium/ImageBufferData.h',
             'platform/graphics/chromium/ImageChromium.cpp',
             'platform/graphics/chromium/ImageChromiumMac.mm',
@@ -2622,6 +2634,7 @@
             'platform/graphics/chromium/WebGLLayerChromium.h',
             'platform/graphics/cocoa/FontPlatformData.h',
             'platform/graphics/cocoa/FontPlatformDataCocoa.mm',
+            'platform/graphics/filters/DistantLightSource.cpp',
             'platform/graphics/filters/DistantLightSource.h',
             'platform/graphics/filters/FEBlend.cpp',
             'platform/graphics/filters/FEBlend.h',
@@ -2657,7 +2670,9 @@
             'platform/graphics/filters/FETurbulence.h',
             'platform/graphics/filters/LightSource.cpp',
             'platform/graphics/filters/LightSource.h',
+            'platform/graphics/filters/PointLightSource.cpp',
             'platform/graphics/filters/PointLightSource.h',
+            'platform/graphics/filters/SpotLightSource.cpp',
             'platform/graphics/filters/SpotLightSource.h',
             'platform/graphics/filters/Filter.h',
             'platform/graphics/filters/FilterEffect.cpp',
@@ -2907,6 +2922,7 @@
             'platform/graphics/FontFamily.cpp',
             'platform/graphics/FontFamily.h',
             'platform/graphics/FontFastPath.cpp',
+            'platform/graphics/FontMetrics.h',
             'platform/graphics/FontRenderingMode.h',
             'platform/graphics/FontSelector.h',
             'platform/graphics/FontSmoothingMode.h',
@@ -2956,6 +2972,8 @@
             'platform/graphics/RoundedIntRect.h',
             'platform/graphics/SegmentedFontData.cpp',
             'platform/graphics/SegmentedFontData.h',
+            'platform/graphics/ShadowBlur.cpp',
+            'platform/graphics/ShadowBlur.h',
             'platform/graphics/SimpleFontData.cpp',
             'platform/graphics/SimpleFontData.h',
             'platform/graphics/StringTruncator.cpp',
@@ -3305,11 +3323,12 @@
             'platform/text/BidiContext.cpp',
             'platform/text/BidiContext.h',
             'platform/text/BidiResolver.h',
-            'platform/text/CharacterNames.h',
             'platform/text/Hyphenation.cpp',
             'platform/text/Hyphenation.h',
             'platform/text/LineEnding.cpp',
             'platform/text/LineEnding.h',
+            'platform/text/LocalizedNumber.h',
+            'platform/text/LocalizedNumberNone.cpp',
             'platform/text/ParserUtilities.h',
             'platform/text/PlatformString.h',
             'platform/text/RegularExpression.cpp',
@@ -3333,6 +3352,8 @@
             'platform/text/TextCodecLatin1.h',
             'platform/text/TextCodecUTF16.cpp',
             'platform/text/TextCodecUTF16.h',
+            'platform/text/TextCodecUTF8.cpp',
+            'platform/text/TextCodecUTF8.h',
             'platform/text/TextCodecUserDefined.cpp',
             'platform/text/TextCodecUserDefined.h',
             'platform/text/TextDirection.h',
@@ -3540,6 +3561,7 @@
             'platform/Timer.cpp',
             'platform/Timer.h',
             'platform/TreeShared.h',
+            'platform/URLString.h',
             'platform/UUID.cpp',
             'platform/UUID.h',
             'platform/Widget.cpp',
@@ -3575,6 +3597,8 @@
             'plugins/DOMPlugin.h',
             'plugins/DOMPluginArray.cpp',
             'plugins/DOMPluginArray.h',
+            'plugins/IFrameShimSupport.cpp',
+            'plugins/IFrameShimSupport.h',
             'plugins/PluginData.cpp',
             'plugins/PluginData.h',
             'plugins/PluginDatabase.cpp',
@@ -3814,6 +3838,8 @@
             'rendering/RenderBoxModelObject.h',
             'rendering/RenderButton.cpp',
             'rendering/RenderButton.h',
+            'rendering/RenderCombineText.cpp',
+            'rendering/RenderCombineText.h',
             'rendering/RenderCounter.cpp',
             'rendering/RenderCounter.h',
             'rendering/RenderDataGrid.cpp',
@@ -4047,8 +4073,6 @@
             'storage/IDBSQLiteDatabase.h',
             'storage/IDBSuccessEvent.cpp',
             'storage/IDBSuccessEvent.h',
-            'storage/IDBTimeoutEvent.cpp',
-            'storage/IDBTimeoutEvent.h',
             'storage/IDBTransaction.cpp',
             'storage/IDBTransaction.h',
             'storage/IDBTransactionBackendImpl.cpp',
@@ -4642,7 +4666,6 @@
             'inspector/front-end/BreakpointManager.js',
             'inspector/front-end/BreakpointsSidebarPane.js',
             'inspector/front-end/CallStackSidebarPane.js',
-            'inspector/front-end/ChangesView.js',
             'inspector/front-end/Checkbox.js',
             'inspector/front-end/Color.js',
             'inspector/front-end/ConsolePanel.js',
@@ -4659,6 +4682,7 @@
             'inspector/front-end/DatabaseTableView.js',
             'inspector/front-end/DataGrid.js',
             'inspector/front-end/DebuggerModel.js',
+            'inspector/front-end/DetailedHeapshotView.js',
             'inspector/front-end/DOMAgent.js',
             'inspector/front-end/DOMStorage.js',
             'inspector/front-end/DOMStorageItemsView.js',
@@ -4673,10 +4697,10 @@
             'inspector/front-end/ExtensionPanel.js',
             'inspector/front-end/ExtensionRegistryStub.js',
             'inspector/front-end/ExtensionServer.js',
-            'inspector/front-end/FileSystemView.js',
             'inspector/front-end/FontView.js',
             'inspector/front-end/GoToLineDialog.js',
             'inspector/front-end/HAREntry.js',
+            'inspector/front-end/HeapSnapshot.js',
             'inspector/front-end/HeapSnapshotView.js',
             'inspector/front-end/HelpScreen.js',
             'inspector/front-end/ImageView.js',
@@ -4693,6 +4717,7 @@
             'inspector/front-end/Panel.js',
             'inspector/front-end/PanelEnablerView.js',
             'inspector/front-end/Placard.js',
+            'inspector/front-end/PleaseWaitMessage.js',
             'inspector/front-end/Popover.js',
             'inspector/front-end/ProfileDataGridTree.js',
             'inspector/front-end/ProfilesPanel.js',
@@ -4713,18 +4738,18 @@
             'inspector/front-end/ScriptFormatter.js',
             'inspector/front-end/ScriptFormatterWorker.js',
             'inspector/front-end/ScriptsPanel.js',
-            'inspector/front-end/ScriptView.js',
             'inspector/front-end/ShortcutsHelp.js',
+            'inspector/front-end/ShowMoreDataGridNode.js',
             'inspector/front-end/Section.js',
             'inspector/front-end/Settings.js',
             'inspector/front-end/SidebarPane.js',
             'inspector/front-end/SidebarTreeElement.js',
             'inspector/front-end/SourceCSSTokenizer.js',
             'inspector/front-end/SourceFrame.js',
+            'inspector/front-end/SourceFrameContent.js',
             'inspector/front-end/SourceHTMLTokenizer.js',
             'inspector/front-end/SourceJavaScriptTokenizer.js',
             'inspector/front-end/SourceTokenizer.js',
-            'inspector/front-end/SourceView.js',
             'inspector/front-end/StatusBarButton.js',
             'inspector/front-end/StylesSidebarPane.js',
             'inspector/front-end/SummaryBar.js',
external/webkit
About OSDN
Find Software
Develop Software
Help