diff options
author | Russell Brenner <russellbrenner@google.com> | 2010-11-18 17:33:13 -0800 |
---|---|---|
committer | Russell Brenner <russellbrenner@google.com> | 2010-12-02 13:47:21 -0800 |
commit | 6b70adc33054f8aee8c54d0f460458a9df11b8a5 (patch) | |
tree | 103a13998c33944d6ab3b8318c509a037e639460 /WebCore/WebCore.gypi | |
parent | bdf4ebc8e70b2d221b6ee7a65660918ecb1d33aa (diff) | |
download | external_webkit-6b70adc33054f8aee8c54d0f460458a9df11b8a5.zip external_webkit-6b70adc33054f8aee8c54d0f460458a9df11b8a5.tar.gz external_webkit-6b70adc33054f8aee8c54d0f460458a9df11b8a5.tar.bz2 |
Merge WebKit at r72274: Initial merge by git.
Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb
Diffstat (limited to 'WebCore/WebCore.gypi')
-rw-r--r-- | WebCore/WebCore.gypi | 44 |
1 files changed, 25 insertions, 19 deletions
diff --git a/WebCore/WebCore.gypi b/WebCore/WebCore.gypi index faa339a..4dfefc0 100644 --- a/WebCore/WebCore.gypi +++ b/WebCore/WebCore.gypi @@ -15,8 +15,6 @@ 'css/CSSUnknownRule.idl', 'css/CSSValue.idl', 'css/CSSValueList.idl', - 'css/CSSVariablesDeclaration.idl', - 'css/CSSVariablesRule.idl', 'css/Counter.idl', 'css/MediaList.idl', 'css/Rect.idl', @@ -113,6 +111,7 @@ 'fileapi/FileSystemCallback.idl', 'fileapi/FileWriter.idl', 'fileapi/FileWriterCallback.idl', + 'fileapi/FileWriterSync.idl', 'fileapi/Flags.idl', 'fileapi/Metadata.idl', 'fileapi/MetadataCallback.idl', @@ -245,12 +244,12 @@ 'page/History.idl', 'page/Location.idl', 'page/MemoryInfo.idl', - 'page/Navigation.idl', 'page/Navigator.idl', 'page/Performance.idl', + 'page/PerformanceNavigation.idl', + 'page/PerformanceTiming.idl', 'page/PositionError.idl', 'page/Screen.idl', - 'page/Timing.idl', 'page/WebKitPoint.idl', 'page/WorkerNavigator.idl', 'plugins/DOMMimeType.idl', @@ -676,7 +675,6 @@ 'bindings/js/JSSVGContextCache.h', 'bindings/js/JSSVGElementInstanceCustom.cpp', 'bindings/js/JSSVGLengthCustom.cpp', - 'bindings/js/JSSVGMatrixCustom.cpp', 'bindings/js/JSSVGPathSegCustom.cpp', 'bindings/js/JSSVGPathSegListCustom.cpp', 'bindings/js/JSSVGPODListCustom.h', @@ -836,7 +834,6 @@ 'bindings/v8/custom/V8SVGDocumentCustom.cpp', 'bindings/v8/custom/V8SVGElementCustom.cpp', 'bindings/v8/custom/V8SVGLengthCustom.cpp', - 'bindings/v8/custom/V8SVGMatrixCustom.cpp', 'bindings/v8/custom/V8SVGPathSegCustom.cpp', 'bindings/v8/custom/V8SharedWorkerCustom.cpp', 'bindings/v8/custom/V8StyleSheetCustom.cpp', @@ -1053,12 +1050,6 @@ 'css/CSSValue.h', 'css/CSSValueList.cpp', 'css/CSSValueList.h', - 'css/CSSVariableDependentValue.cpp', - 'css/CSSVariableDependentValue.h', - 'css/CSSVariablesDeclaration.cpp', - 'css/CSSVariablesDeclaration.h', - 'css/CSSVariablesRule.cpp', - 'css/CSSVariablesRule.h', 'css/Counter.h', 'css/DashboardRegion.h', 'css/FontFamilyValue.cpp', @@ -1157,6 +1148,7 @@ 'dom/DOMStringList.h', 'dom/DOMStringMap.cpp', 'dom/DOMStringMap.h', + 'dom/DOMTimeStamp.h', 'dom/DatasetDOMStringMap.cpp', 'dom/DatasetDOMStringMap.h', 'dom/DecodedDataDocumentParser.cpp', @@ -1202,6 +1194,8 @@ 'dom/ErrorEvent.h', 'dom/Event.cpp', 'dom/Event.h', + 'dom/EventContext.cpp', + 'dom/EventContext.h', 'dom/EventException.h', 'dom/EventListener.h', 'dom/EventNames.cpp', @@ -1337,6 +1331,8 @@ 'dom/WebKitTransitionEvent.h', 'dom/WheelEvent.cpp', 'dom/WheelEvent.h', + 'dom/WindowEventContext.cpp', + 'dom/WindowEventContext.h', 'dom/XMLDocumentParser.cpp', 'dom/XMLDocumentParser.h', 'dom/XMLDocumentParserLibxml2.cpp', @@ -1526,6 +1522,8 @@ 'fileapi/FileWriter.cpp', 'fileapi/FileWriter.h', 'fileapi/FileWriterCallback.h', + 'fileapi/FileWriterSync.cpp', + 'fileapi/FileWriterSync.h', 'fileapi/Flags.h', 'fileapi/LocalFileSystem.h', 'fileapi/Metadata.h', @@ -2102,6 +2100,8 @@ 'loader/ResourceLoader.h', 'loader/ResourceLoadNotifier.cpp', 'loader/ResourceLoadNotifier.h', + 'loader/ResourceLoadScheduler.cpp', + 'loader/ResourceLoadScheduler.h', 'loader/SinkDocument.cpp', 'loader/SinkDocument.h', 'loader/SubframeLoader.cpp', @@ -2234,9 +2234,9 @@ 'page/FrameView.h', 'page/Geolocation.cpp', 'page/Geolocation.h', + 'page/GeolocationClient.h', 'page/GeolocationController.cpp', 'page/GeolocationController.h', - 'page/GeolocationControllerClient.h', 'page/GeolocationError.h', 'page/GeolocationPosition.h', 'page/GeolocationPositionCache.cpp', @@ -2253,8 +2253,6 @@ 'page/MemoryInfo.h', 'page/MouseEventWithHitTestResults.cpp', 'page/MouseEventWithHitTestResults.h', - 'page/Navigation.cpp', - 'page/Navigation.h', 'page/Navigator.cpp', 'page/Navigator.h', 'page/NavigatorBase.cpp', @@ -2269,6 +2267,10 @@ 'page/PageGroupLoadDeferrer.h', 'page/Performance.cpp', 'page/Performance.h', + 'page/PerformanceNavigation.cpp', + 'page/PerformanceNavigation.h', + 'page/PerformanceTiming.cpp', + 'page/PerformanceTiming.h', 'page/PluginHalter.cpp', 'page/PluginHalter.h', 'page/PluginHalterClient.h', @@ -2295,8 +2297,6 @@ 'page/SpeechInputResult.h', 'page/SuspendableTimer.cpp', 'page/SuspendableTimer.h', - 'page/Timing.cpp', - 'page/Timing.h', 'page/UserContentURLPattern.cpp', 'page/UserContentURLPattern.h', 'page/UserContentTypes.h', @@ -2471,6 +2471,8 @@ 'platform/graphics/chromium/PlatformIcon.h', 'platform/graphics/chromium/PluginLayerChromium.cpp', 'platform/graphics/chromium/PluginLayerChromium.h', + 'platform/graphics/chromium/RenderSurfaceChromium.h', + 'platform/graphics/chromium/RenderSurfaceChromium.cpp', 'platform/graphics/chromium/SimpleFontDataChromiumWin.cpp', 'platform/graphics/chromium/SimpleFontDataLinux.cpp', 'platform/graphics/chromium/TransparencyWin.cpp', @@ -3968,6 +3970,7 @@ 'svg/properties/SVGAnimatedPropertySynchronizer.h', 'svg/properties/SVGAnimatedPropertyTearOff.h', 'svg/properties/SVGAnimatedStaticPropertyTearOff.h', + 'svg/properties/SVGAnimatedTransformListPropertyTearOff.h', 'svg/properties/SVGListProperty.h', 'svg/properties/SVGListPropertyTearOff.h', 'svg/properties/SVGProperty.h', @@ -3975,6 +3978,8 @@ 'svg/properties/SVGPropertyTraits.h', 'svg/properties/SVGStaticListPropertyTearOff.h', 'svg/properties/SVGStaticPropertyTearOff.h', + 'svg/properties/SVGStaticPropertyWithParentTearOff.h', + 'svg/properties/SVGTransformListPropertyTearOff.h', 'svg/ColorDistance.cpp', 'svg/ColorDistance.h', 'svg/DeprecatedSVGAnimatedProperty.h', @@ -4013,6 +4018,7 @@ 'svg/SVGAnimatedPreserveAspectRatio.h', 'svg/SVGAnimatedRect.h', 'svg/SVGAnimatedString.h', + 'svg/SVGAnimatedTransformList.h', 'svg/SVGAnimationElement.cpp', 'svg/SVGAnimationElement.h', 'svg/SVGCircleElement.cpp', @@ -4151,6 +4157,7 @@ 'svg/SVGMarkerElement.h', 'svg/SVGMaskElement.cpp', 'svg/SVGMaskElement.h', + 'svg/SVGMatrix.h', 'svg/SVGMetadataElement.cpp', 'svg/SVGMetadataElement.h', 'svg/SVGMissingGlyphElement.cpp', @@ -4471,6 +4478,7 @@ 'inspector/front-end/ResourceCategory.js', 'inspector/front-end/ResourceManager.js', 'inspector/front-end/ResourceView.js', + 'inspector/front-end/ResourcesPanel.js', 'inspector/front-end/ScopeChainSidebarPane.js', 'inspector/front-end/Script.js', 'inspector/front-end/ScriptsPanel.js', @@ -4487,7 +4495,6 @@ 'inspector/front-end/SourceTokenizer.js', 'inspector/front-end/SourceView.js', 'inspector/front-end/StatusBarButton.js', - 'inspector/front-end/StoragePanel.js', 'inspector/front-end/StylesSidebarPane.js', 'inspector/front-end/SummaryBar.js', 'inspector/front-end/TabbedPane.js', @@ -4623,7 +4630,6 @@ 'inspector/front-end/Images/statusbarMenuButtonSelected.png', 'inspector/front-end/Images/statusbarResizerHorizontal.png', 'inspector/front-end/Images/statusbarResizerVertical.png', - 'inspector/front-end/Images/storageIcon.png', 'inspector/front-end/Images/successGreenDot.png', 'inspector/front-end/Images/thumbActiveHoriz.png', 'inspector/front-end/Images/thumbActiveVert.png', |