diff options
Diffstat (limited to 'webkit/build')
| -rw-r--r-- | webkit/build/KJSBindings/KJSBindings.vcproj | 8 | ||||
| -rw-r--r-- | webkit/build/V8Bindings/SConscript | 3 | ||||
| -rw-r--r-- | webkit/build/V8Bindings/V8Bindings.vcproj | 44 | ||||
| -rw-r--r-- | webkit/build/WebCore/SConscript | 46 | ||||
| -rw-r--r-- | webkit/build/WebCore/WebCore.vcproj | 452 | ||||
| -rw-r--r-- | webkit/build/port/SConscript | 2 | ||||
| -rw-r--r-- | webkit/build/port/port.vcproj | 20 | ||||
| -rw-r--r-- | webkit/build/webkit_common_includes.vsprops | 2 |
8 files changed, 474 insertions, 103 deletions
diff --git a/webkit/build/KJSBindings/KJSBindings.vcproj b/webkit/build/KJSBindings/KJSBindings.vcproj index aaf3ccfd..9483d81 100644 --- a/webkit/build/KJSBindings/KJSBindings.vcproj +++ b/webkit/build/KJSBindings/KJSBindings.vcproj @@ -1029,10 +1029,6 @@ > </File> <File - RelativePath="$(IntDir)\DerivedSources\JSKeyboardEvent.cpp" - > - </File> - <File RelativePath="$(IntDir)\DerivedSources\JSKeyboardEvent.h" > </File> @@ -2569,10 +2565,6 @@ Name="page" > <File - RelativePath="..\..\..\third_party\WebKit\WebCore\page\InspectorController.cpp" - > - </File> - <File RelativePath="..\..\..\third_party\WebKit\WebCore\page\JavaScriptProfile.cpp" > </File> diff --git a/webkit/build/V8Bindings/SConscript b/webkit/build/V8Bindings/SConscript index 84a2271..06c16a0 100644 --- a/webkit/build/V8Bindings/SConscript +++ b/webkit/build/V8Bindings/SConscript @@ -140,7 +140,6 @@ inputs = [ '$DERIVED_DIR/V8HTMLQuoteElement.cpp', '$DERIVED_DIR/V8HTMLScriptElement.cpp', '$DERIVED_DIR/V8HTMLSelectElement.cpp', - '$DERIVED_DIR/V8HTMLSelectionInputElement.cpp', '$DERIVED_DIR/V8HTMLStyleElement.cpp', '$DERIVED_DIR/V8HTMLTableCaptionElement.cpp', '$DERIVED_DIR/V8HTMLTableCellElement.cpp', @@ -168,7 +167,6 @@ inputs = [ '$DERIVED_DIR/V8NodeIterator.cpp', '$DERIVED_DIR/V8NodeList.cpp', '$DERIVED_DIR/V8Notation.cpp', - '$DERIVED_DIR/V8NSResolver.cpp', '$DERIVED_DIR/V8OverflowEvent.cpp', '$DERIVED_DIR/V8Plugin.cpp', '$DERIVED_DIR/V8PluginArray.cpp', @@ -313,7 +311,6 @@ inputs = [ '$DERIVED_DIR/V8XPathResult.cpp', '$DERIVED_DIR/V8XSLTProcessor.cpp', - '$PORT_DIR/bindings/v8/JSNSResolver.cpp', '$PORT_DIR/bindings/v8/JSXPathNSResolver.cpp', '$PORT_DIR/bindings/v8/np_v8object.cpp', '$PORT_DIR/bindings/v8/npruntime.cpp', diff --git a/webkit/build/V8Bindings/V8Bindings.vcproj b/webkit/build/V8Bindings/V8Bindings.vcproj index c8e2f45..da3775c 100644 --- a/webkit/build/V8Bindings/V8Bindings.vcproj +++ b/webkit/build/V8Bindings/V8Bindings.vcproj @@ -920,14 +920,6 @@ > </File> <File - RelativePath="$(IntDir)\DerivedSources\V8HTMLSelectionInputElement.cpp" - > - </File> - <File - RelativePath="$(IntDir)\DerivedSources\V8HTMLSelectionInputElement.h" - > - </File> - <File RelativePath="$(IntDir)\DerivedSources\V8HTMLStyleElement.cpp" > </File> @@ -1048,6 +1040,14 @@ > </File> <File + RelativePath="$(IntDir)\DerivedSources\V8MessageChannel.cpp" + > + </File> + <File + RelativePath="$(IntDir)\DerivedSources\V8MessageChannel.h" + > + </File> + <File RelativePath="$(IntDir)\DerivedSources\V8MessageEvent.cpp" > </File> @@ -1056,6 +1056,14 @@ > </File> <File + RelativePath="$(IntDir)\DerivedSources\V8MessagePort.cpp" + > + </File> + <File + RelativePath="$(IntDir)\DerivedSources\V8MessagePort.h" + > + </File> + <File RelativePath="$(IntDir)\DerivedSources\V8MimeType.cpp" > </File> @@ -1144,14 +1152,6 @@ > </File> <File - RelativePath="$(IntDir)\DerivedSources\V8NSResolver.h" - > - </File> - <File - RelativePath="$(IntDir)\DerivedSources\V8NSResolver.cpp" - > - </File> - <File RelativePath="$(IntDir)\DerivedSources\V8OverflowEvent.cpp" > </File> @@ -2393,14 +2393,6 @@ > </File> <File - RelativePath="..\..\port\bindings\v8\JSNSResolver.cpp" - > - </File> - <File - RelativePath="..\..\port\bindings\v8\JSNSResolver.h" - > - </File> - <File RelativePath="..\..\port\bindings\v8\JSXPathNSResolver.cpp" > </File> @@ -2413,6 +2405,10 @@ > </File> <File + RelativePath="..\..\port\bindings\v8\V8MessagePortCustom.cpp" + > + </File> + <File RelativePath=".\precompiled_v8bindings.cpp" > <FileConfiguration diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript index 9b93740..e592c47 100644 --- a/webkit/build/WebCore/SConscript +++ b/webkit/build/WebCore/SConscript @@ -57,6 +57,7 @@ input_files = [ '$WEBCORE_DIR/css/CSSInitialValue.cpp', '$WEBCORE_DIR/css/CSSMediaRule.cpp', '$WEBCORE_DIR/css/CSSMutableStyleDeclaration.cpp', + '$WEBCORE_DIR/css/CSSNthSelector.cpp', '$WEBCORE_DIR/css/CSSPageRule.cpp', '$WEBCORE_DIR/css/CSSParser.cpp', '$WEBCORE_DIR/css/CSSParserValues.cpp', @@ -127,7 +128,9 @@ input_files = [ '$WEBCORE_DIR/dom/ExceptionCode.cpp', '$WEBCORE_DIR/dom/KeyboardEvent.cpp', '$WEBCORE_DIR/dom/MappedAttribute.cpp', + '$WEBCORE_DIR/dom/MessageChannel.cpp', '$WEBCORE_DIR/dom/MessageEvent.cpp', + '$WEBCORE_DIR/dom/MessagePort.cpp', '$WEBCORE_DIR/dom/MouseEvent.cpp', '$WEBCORE_DIR/dom/MouseRelatedEvent.cpp', '$WEBCORE_DIR/dom/MutationEvent.cpp', @@ -163,6 +166,7 @@ input_files = [ '$WEBCORE_DIR/dom/WebKitTransitionEvent.cpp', '$WEBCORE_DIR/dom/WheelEvent.cpp', '$WEBCORE_DIR/dom/XMLTokenizer.cpp', + '$WEBCORE_DIR/dom/XMLTokenizerLibxml2.cpp', '$WEBCORE_DIR/editing/AppendNodeCommand.cpp', '$WEBCORE_DIR/editing/ApplyStyleCommand.cpp', @@ -311,6 +315,7 @@ input_files = [ '$WEBCORE_DIR/loader/CachedFont.cpp', '$WEBCORE_DIR/loader/CachedImage.cpp', '$WEBCORE_DIR/loader/CachedResource.cpp', + '$WEBCORE_DIR/loader/CachedResourceHandle.cpp', '$WEBCORE_DIR/loader/CachedResourceClientWalker.cpp', '$WEBCORE_DIR/loader/CachedScript.cpp', '$WEBCORE_DIR/loader/CachedXBLDocument.cpp', @@ -322,6 +327,7 @@ input_files = [ '$WEBCORE_DIR/loader/FTPDirectoryDocument.cpp', '$WEBCORE_DIR/loader/FTPDirectoryParser.cpp', '$WEBCORE_DIR/loader/ImageDocument.cpp', + '$WEBCORE_DIR/loader/ImageLoader.cpp', '$WEBCORE_DIR/loader/loader.cpp', '$WEBCORE_DIR/loader/MainResourceLoader.cpp', '$WEBCORE_DIR/loader/NavigationAction.cpp', @@ -367,6 +373,7 @@ input_files = [ '$WEBCORE_DIR/page/Page.cpp', '$WEBCORE_DIR/page/PageGroup.cpp', '$WEBCORE_DIR/page/Screen.cpp', + '$WEBCORE_DIR/page/SecurityOrigin.cpp', '$WEBCORE_DIR/page/Settings.cpp', '$WEBCORE_DIR/page/WindowFeatures.cpp', @@ -386,8 +393,9 @@ input_files = [ '$WEBCORE_DIR/platform/KURL.cpp', '$WEBCORE_DIR/platform/Logging.cpp', '$PORT_DIR/platform/MIMETypeRegistry.cpp', - '$WEBCORE_DIR/platform/ScrollBar.cpp', - '$WEBCORE_DIR/platform/SecurityOrigin.cpp', + '$WEBCORE_DIR/platform/Scrollbar.cpp', + '$WEBCORE_DIR/platform/ScrollbarThemeComposite.cpp', + '$WEBCORE_DIR/platform/ScrollView.cpp', '$WEBCORE_DIR/platform/SharedBuffer.cpp', '$WEBCORE_DIR/platform/Timer.cpp', '$WEBCORE_DIR/platform/Widget.cpp', @@ -421,6 +429,7 @@ input_files = [ '$WEBCORE_DIR/platform/graphics/SegmentedFontData.cpp', '$WEBCORE_DIR/platform/graphics/SimpleFontData.cpp', '$WEBCORE_DIR/platform/graphics/StringTruncator.cpp', + '$WEBCORE_DIR/platform/graphics/WidthIterator.cpp', '$WEBCORE_DIR/platform/network/AuthenticationChallengeBase.cpp', '$WEBCORE_DIR/platform/network/Credential.cpp', @@ -507,6 +516,9 @@ input_files = [ '$WEBCORE_DIR/rendering/RenderPath.cpp', '$WEBCORE_DIR/rendering/RenderReplaced.cpp', '$WEBCORE_DIR/rendering/RenderReplica.cpp', + '$WEBCORE_DIR/rendering/RenderScrollbar.cpp', + '$WEBCORE_DIR/rendering/RenderScrollbarPart.cpp', + '$WEBCORE_DIR/rendering/RenderScrollbarTheme.cpp', '$WEBCORE_DIR/rendering/RenderSlider.cpp', '$WEBCORE_DIR/rendering/RenderSVGBlock.cpp', '$WEBCORE_DIR/rendering/RenderSVGContainer.cpp', @@ -539,17 +551,43 @@ input_files = [ '$WEBCORE_DIR/rendering/SVGCharacterLayoutInfo.cpp', '$WEBCORE_DIR/rendering/SVGInlineFlowBox.cpp', '$WEBCORE_DIR/rendering/SVGInlineTextBox.cpp', - '$WEBCORE_DIR/rendering/SVGRenderStyle.cpp', - '$WEBCORE_DIR/rendering/SVGRenderStyleDefs.cpp', '$WEBCORE_DIR/rendering/SVGRenderSupport.cpp', '$WEBCORE_DIR/rendering/SVGRenderTreeAsText.cpp', '$WEBCORE_DIR/rendering/SVGRootInlineBox.cpp', '$WEBCORE_DIR/rendering/TextControlInnerElements.cpp', + + '$WEBCORE_DIR/rendering/style/Animation.cpp', + '$WEBCORE_DIR/rendering/style/AnimationList.cpp', + '$WEBCORE_DIR/rendering/style/BindingURI.cpp', + '$WEBCORE_DIR/rendering/style/ContentData.cpp', + '$WEBCORE_DIR/rendering/style/CounterDirectives.cpp', + '$WEBCORE_DIR/rendering/style/FillLayer.cpp', + '$WEBCORE_DIR/rendering/style/KeyframeList.cpp', + '$WEBCORE_DIR/rendering/style/MatrixTransformOperation.cpp', '$WEBCORE_DIR/rendering/style/NinePieceImage.cpp', '$WEBCORE_DIR/rendering/style/RenderStyle.cpp', + '$WEBCORE_DIR/rendering/style/RotateTransformOperation.cpp', + '$WEBCORE_DIR/rendering/style/ScaleTransformOperation.cpp', + '$WEBCORE_DIR/rendering/style/ShadowData.cpp', + '$WEBCORE_DIR/rendering/style/SkewTransformOperation.cpp', + '$WEBCORE_DIR/rendering/style/StyleBackgroundData.cpp', + '$WEBCORE_DIR/rendering/style/StyleBoxData.cpp', '$WEBCORE_DIR/rendering/style/StyleCachedImage.cpp', + '$WEBCORE_DIR/rendering/style/StyleFlexibleBoxData.cpp', '$WEBCORE_DIR/rendering/style/StyleGeneratedImage.cpp', + '$WEBCORE_DIR/rendering/style/StyleInheritedData.cpp', + '$WEBCORE_DIR/rendering/style/StyleMarqueeData.cpp', + '$WEBCORE_DIR/rendering/style/StyleMultiColData.cpp', + '$WEBCORE_DIR/rendering/style/StyleRareInheritedData.cpp', + '$WEBCORE_DIR/rendering/style/StyleRareNonInheritedData.cpp', + '$WEBCORE_DIR/rendering/style/StyleSurroundData.cpp', + '$WEBCORE_DIR/rendering/style/StyleTransformData.cpp', + '$WEBCORE_DIR/rendering/style/StyleVisualData.cpp', + '$WEBCORE_DIR/rendering/style/SVGRenderStyle.cpp', + '$WEBCORE_DIR/rendering/style/SVGRenderStyleDefs.cpp', + '$WEBCORE_DIR/rendering/style/TransformOperations.cpp', + '$WEBCORE_DIR/rendering/style/TranslateTransformOperation.cpp', '$WEBCORE_DIR/svg/ColorDistance.cpp', '$WEBCORE_DIR/svg/Filter.cpp', diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj index 2a5b89f..1512dc7 100644 --- a/webkit/build/WebCore/WebCore.vcproj +++ b/webkit/build/WebCore/WebCore.vcproj @@ -142,6 +142,14 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\WebCore\page\AccessibilityList.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\page\AccessibilityList.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebCore\page\AccessibilityListBox.cpp" > </File> @@ -242,11 +250,11 @@ > </File> <File - RelativePath="..\..\..\third_party\WebKit\WebCore\page\Console.h" + RelativePath="..\..\..\third_party\WebKit\WebCore\page\Console.cpp" > </File> <File - RelativePath="..\..\..\third_party\WebKit\WebCore\page\Console.cpp" + RelativePath="..\..\..\third_party\WebKit\WebCore\page\Console.h" > </File> <File @@ -354,14 +362,6 @@ > </File> <File - RelativePath="..\..\..\third_party\WebKit\WebCore\page\InspectorClient.h" - > - </File> - <File - RelativePath="..\..\..\third_party\WebKit\WebCore\page\InspectorController.h" - > - </File> - <File RelativePath="..\..\..\third_party\WebKit\WebCore\page\Location.h" > </File> @@ -410,6 +410,14 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\WebCore\page\SecurityOrigin.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\page\SecurityOrigin.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebCore\page\Settings.cpp" > </File> @@ -526,6 +534,14 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\WebCore\loader\CachedResourceHandle.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\loader\CachedResourceHandle.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebCore\loader\CachedScript.cpp" > </File> @@ -622,6 +638,14 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\WebCore\loader\ImageLoader.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\loader\ImageLoader.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebCore\loader\loader.cpp" > </File> @@ -754,10 +778,6 @@ Name="platform" > <File - RelativePath="..\..\..\third_party\WebKit\WebCore\platform\Arena.cpp" - > - </File> - <File RelativePath="..\..\..\third_party\WebKit\WebCore\platform\Arena.h" > </File> @@ -818,10 +838,6 @@ > </File> <File - RelativePath="..\..\pending\DNS.h" - > - </File> - <File RelativePath="..\..\..\third_party\WebKit\WebCore\platform\DragData.cpp" > </File> @@ -910,6 +926,10 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\HostWindow.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebCore\platform\KURL.cpp" > </File> @@ -954,7 +974,7 @@ > </File> <File - RelativePath="..\..\pending\PlatformKeyboardEvent.h" + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\PlatformKeyboardEvent.h" > </File> <File @@ -982,6 +1002,10 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\PopupMenuStyle.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebCore\platform\ScrollBar.cpp" > </File> @@ -990,23 +1014,35 @@ > </File> <File - RelativePath="..\..\..\third_party\WebKit\WebCore\platform\ScrollTypes.h" + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\ScrollbarClient.h" > </File> <File - RelativePath="..\..\..\third_party\WebKit\WebCore\platform\ScrollView.h" + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\ScrollbarTheme.h" > </File> <File - RelativePath="..\..\..\third_party\WebKit\WebCore\platform\SearchPopupMenu.h" + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\ScrollbarThemeComposite.cpp" > </File> <File - RelativePath="..\..\..\third_party\WebKit\WebCore\platform\SecurityOrigin.cpp" + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\ScrollbarThemeComposite.h" > </File> <File - RelativePath="..\..\..\third_party\WebKit\WebCore\platform\SecurityOrigin.h" + RelativePath="...\..\..\third_party\WebKit\WebCore\platform\ScrollTypes.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\ScrollView.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\ScrollView.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\SearchPopupMenu.h" > </File> <File @@ -1030,7 +1066,7 @@ > </File> <File - RelativePath="..\..\pending\StaticConstructors.h" + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\StaticConstructors.h" > </File> <File @@ -1065,10 +1101,6 @@ RelativePath="..\..\..\third_party\WebKit\WebCore\platform\Widget.h" > </File> - <File - RelativePath="..\..\..\third_party\WebKit\WebCore\platform\WidgetClient.h" - > - </File> <Filter Name="graphics" > @@ -1293,7 +1325,7 @@ > </File> <File - RelativePath="..\..\pending\DNS.h" + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\network\DNS.h" > </File> <File @@ -1373,7 +1405,7 @@ Name="win" > <File - RelativePath="..\..\..\third_party\WebKit\WebCore\platform\win\FileSystemWin.cpp" + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\Arena.cpp" > </File> </Filter> @@ -1580,6 +1612,14 @@ RelativePath="..\..\..\third_party\WebKit\WebCore\platform\text\UnicodeRange.h" > </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\WidthIterator.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\WidthIterator.h" + > + </File> </Filter> </Filter> <Filter @@ -1758,6 +1798,14 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\WebCore\css\CSSNthSelector.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\css\CSSNthSelector.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebCore\css\CSSPageRule.cpp" > </File> @@ -2206,6 +2254,10 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\Length.cpp" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\Length.h" > </File> @@ -2490,6 +2542,30 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderScrollbar.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderScrollbar.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderScrollbarPart.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderScrollbarPart.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderScrollbarTheme.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderScrollbarTheme.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderSlider.cpp" > </File> @@ -2742,22 +2818,6 @@ > </File> <File - RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\SVGRenderStyle.cpp" - > - </File> - <File - RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\SVGRenderStyle.h" - > - </File> - <File - RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\SVGRenderStyleDefs.cpp" - > - </File> - <File - RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\SVGRenderStyleDefs.h" - > - </File> - <File RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\SVGRenderSupport.cpp" > </File> @@ -2797,6 +2857,102 @@ Name="style" > <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\Animation.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\Animation.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\AnimationList.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\AnimationList.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\BindingURI.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\BindingURI.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\BorderData.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\BorderValue.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\CollapsedBorderValue.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\ContentData.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\ContentData.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\CounterContent.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\CounterDirectives.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\CounterDirectives.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\CursorData.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\CursorList.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\DataRef.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\FillLayer.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\FillLayer.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\IdentityTransformOperation.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\KeyframeList.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\KeyframeList.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\MatrixTransformOperation.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\MatrixTransformOperation.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\NinePieceImage.cpp" > </File> @@ -2805,6 +2961,10 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\OutlineValue.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\RenderStyle.cpp" > </File> @@ -2813,6 +2973,58 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\RenderStyleConstants.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\RotateTransformOperation.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\RotateTransformOperation.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\ScaleTransformOperation.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\ScaleTransformOperation.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\ShadowData.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\ShadowData.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\SkewTransformOperation.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\SkewTransformOperation.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\StyleBackgroundData.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\StyleBackgroundData.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\StyleBoxData.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\StyleBoxData.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\StyleCachedImage.cpp" > </File> @@ -2821,6 +3033,14 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\StyleFlexibleBoxData.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\StyleFlexibleBoxData.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\StyleGeneratedImage.cpp" > </File> @@ -2832,6 +3052,114 @@ RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\StyleImage.h" > </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\StyleInheritedData.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\StyleInheritedData.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\StyleMarqueeData.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\StyleMarqueeData.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\StyleMultiColData.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\StyleMultiColData.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\StyleRareInheritedData.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\StyleRareInheritedData.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\StyleRareNonInheritedData.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\StyleRareNonInheritedData.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\StyleReflection.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\StyleSurroundData.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\StyleSurroundData.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\StyleTransformData.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\StyleTransformData.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\StyleVisualData.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\StyleVisualData.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\SVGRenderStyle.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\SVGRenderStyle.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\SVGRenderStyleDefs.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\SVGRenderStyleDefs.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\TimingFunction.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\TransformOperation.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\TransformOperations.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\TransformOperations.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\TranslateTransformOperation.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\TranslateTransformOperation.h" + > + </File> </Filter> </Filter> <Filter @@ -2890,7 +3218,7 @@ > </File> <File - RelativePath="..\xml\XPathException.h" + RelativePath="..\..\..\third_party\WebKit\WebCore\xml\XPathException.h" > </File> <File @@ -3314,7 +3642,7 @@ > </File> <File - RelativePath="..\..\pending\KeyboardEvent.h" + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\KeyboardEvent.h" > </File> <File @@ -3330,6 +3658,14 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\WebCore\dom\MessageChannel.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\dom\MessageChannel.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebCore\dom\MessageEvent.cpp" > </File> @@ -3338,6 +3674,14 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\WebCore\dom\MessagePort.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\dom\MessagePort.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebCore\dom\MouseEvent.cpp" > </File> @@ -3430,10 +3774,6 @@ > </File> <File - RelativePath="..\..\..\third_party\WebKit\WebCore\dom\NSResolver.h" - > - </File> - <File RelativePath="..\..\..\third_party\WebKit\WebCore\dom\OverflowEvent.cpp" > </File> @@ -3633,6 +3973,10 @@ RelativePath="..\..\..\third_party\WebKit\WebCore\dom\XMLTokenizer.h" > </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\dom\XMLTokenizerLibxml2.cpp" + > + </File> </Filter> <Filter Name="bridge" @@ -5864,7 +6208,7 @@ > </File> <File - RelativePath="..\..\pending\SVGPaintServer.h" + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\SVGPaintServer.h" > </File> <File diff --git a/webkit/build/port/SConscript b/webkit/build/port/SConscript index 53d3741..7010b0f 100644 --- a/webkit/build/port/SConscript +++ b/webkit/build/port/SConscript @@ -196,6 +196,7 @@ idl_files = [ 'dom/EventTargetNode.idl', 'dom/KeyboardEvent.idl', 'dom/MessageEvent.idl', + 'dom/MessagePort.idl', 'dom/MouseEvent.idl', 'dom/MutationEvent.idl', 'dom/NamedNodeMap.idl', @@ -204,7 +205,6 @@ idl_files = [ 'dom/NodeIterator.idl', 'dom/NodeList.idl', 'dom/Notation.idl', - 'dom/NSResolver.idl', 'dom/OverflowEvent.idl', 'dom/ProcessingInstruction.idl', 'dom/ProgressEvent.idl', diff --git a/webkit/build/port/port.vcproj b/webkit/build/port/port.vcproj index 752088a..a4d9f3c 100644 --- a/webkit/build/port/port.vcproj +++ b/webkit/build/port/port.vcproj @@ -719,7 +719,7 @@ > </File> <File - RelativePath="..\..\port\platform\win\ScreenWin.cpp" + RelativePath="..\..\port\platform\win\PlatformScreenWin.cpp" > </File> <File @@ -763,6 +763,14 @@ > </File> <File + RelativePath="..\..\port\platform\chromium\FileSystemChromium.cpp" + > + </File> + <File + RelativePath="..\..\port\platform\chromium\FileSystemChromiumWin.cpp" + > + </File> + <File RelativePath="..\..\port\platform\chromium\FramelessScrollView.cpp" > </File> @@ -783,19 +791,15 @@ > </File> <File - RelativePath="..\..\port\platform\chromium\PlatformScrollBar.h" - > - </File> - <File - RelativePath="..\..\port\platform\chromium\PlatformScrollBarChromium.cpp" + RelativePath="..\..\port\platform\chromium\PopupMenuChromium.cpp" > </File> <File - RelativePath="..\..\port\platform\chromium\PopupMenuChromium.cpp" + RelativePath="..\..\port\platform\chromium\ScrollbarThemeChromiumWin.cpp" > </File> <File - RelativePath="..\..\port\platform\chromium\ScrollViewChromium.cpp" + RelativePath="..\..\port\platform\chromium\ScrollbarThemeChromiumWin.h" > </File> <File diff --git a/webkit/build/webkit_common_includes.vsprops b/webkit/build/webkit_common_includes.vsprops index 8bd0b17..7d0b1ba 100644 --- a/webkit/build/webkit_common_includes.vsprops +++ b/webkit/build/webkit_common_includes.vsprops @@ -6,6 +6,6 @@ > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(OutDir)\obj\WebCore";"$(OutDir)\obj\WebCore\JavaScriptHeaders";"$(OutDir)\obj\WebCore\JavaScriptHeaders\JavaScriptCore";..\..\pending\;..\..\pending\kjs;..\..\pending\wtf;..\..\port\bridge;..\..\port\css;..\..\port\dom;..\..\port\history;..\..\port\loader;..\..\port\page;..\..\port\page\chromium;..\..\port\page\win;..\..\port\platform;..\..\port\platform\chromium;..\..\port\platform\win;..\..\port\platform\network\chromium;..\..\port\platform\image-decoders;..\..\port\platform\image-decoders\bmp;..\..\port\platform\image-decoders\gif;..\..\port\platform\image-decoders\ico;..\..\port\platform\image-decoders\jpeg;..\..\port\platform\image-decoders\png;..\..\port\platform\image-decoders\xbm;..\..\port\platform\network;..\..\port\plugins;..\..\port\rendering;..\..\;"$(ProjectDir)";..\..\..\third_party\WebKit\WebCore\;..\..\..\third_party\WebKit\WebCore\bridge;..\..\..\third_party\WebKit\WebCore\bridge\c;..\..\..\third_party\WebKit\WebCore\css;..\..\..\third_party\WebKit\WebCore\dom;..\..\..\third_party\WebKit\WebCore\editing;..\..\..\third_party\WebKit\WebCore\history;..\..\..\third_party\WebKit\WebCore\html;..\..\..\third_party\WebKit\WebCore\loader;..\..\..\third_party\WebKit\WebCore\loader\appcache;..\..\..\third_party\WebKit\WebCore\loader\archive;..\..\..\third_party\WebKit\WebCore\loader\icon;..\..\..\third_party\WebKit\WebCore\page;..\..\..\third_party\WebKit\WebCore\platform;..\..\..\third_party\WebKit\WebCore\page\animation;..\..\..\third_party\WebKit\WebCore\platform\text;..\..\..\third_party\WebKit\WebCore\platform\graphics;..\..\port\platform\graphics;..\..\port\platform\graphics\chromium;..\..\..\third_party\WebKit\WebCore\svg\graphics;..\..\..\third_party\WebKit\WebCore\platform\network;..\..\..\third_party\WebKit\WebCore\platform\sql;..\..\..\third_party\WebKit\WebCore\rendering;..\..\..\third_party\WebKit\WebCore\rendering\style;..\..\..\third_party\WebKit\WebCore\storage;..\..\..\third_party\WebKit\WebCore\xml;..\..\..\third_party\WebKit\WebCore;"..\..\..\third_party\WebKit\WebCore\os-win32";..\..\..\third_party\WebKit\WebCore\wtf;..\..\..\third_party\WebKit\JavaScriptCore;..\..\..\third_party\WebKit\JavaScriptCore\wtf;"..\..\..\third_party\WebKit\JavaScriptCore\os-win32";..\..\build;"$(SDKIncludes)";"$(IntDir)\..\WebCore\DerivedSources";..\..\..\third_party\WebKit\WebCore\svg;..\..\..\third_party\WebKit\WebCore\svg\animation;..\..\..\third_party\WebKit\WebCore\svg\graphics\filters;..\..\..\third_party\WebKit\WebCore\plugins" + AdditionalIncludeDirectories=""$(OutDir)\obj\WebCore";"$(OutDir)\obj\WebCore\JavaScriptHeaders";"$(OutDir)\obj\WebCore\JavaScriptHeaders\JavaScriptCore";..\..\pending\;..\..\pending\kjs;..\..\pending\wtf;..\..\port\bridge;..\..\port\css;..\..\port\dom;..\..\port\history;..\..\port\loader;..\..\port\page;..\..\port\page\chromium;..\..\port\page\win;..\..\port\platform;..\..\port\platform\chromium;..\..\port\platform\win;..\..\port\platform\network\chromium;..\..\port\platform\image-decoders;..\..\port\platform\image-decoders\bmp;..\..\port\platform\image-decoders\gif;..\..\port\platform\image-decoders\ico;..\..\port\platform\image-decoders\jpeg;..\..\port\platform\image-decoders\png;..\..\port\platform\image-decoders\xbm;..\..\port\platform\network;..\..\port\plugins;..\..\port\rendering;..\..\;"$(ProjectDir)";..\..\..\third_party\WebKit\WebCore\;..\..\..\third_party\WebKit\WebCore\bridge;..\..\..\third_party\WebKit\WebCore\bridge\c;..\..\..\third_party\WebKit\WebCore\css;..\..\..\third_party\WebKit\WebCore\dom;..\..\..\third_party\WebKit\WebCore\editing;..\..\..\third_party\WebKit\WebCore\history;..\..\..\third_party\WebKit\WebCore\html;..\..\..\third_party\WebKit\WebCore\loader;..\..\..\third_party\WebKit\WebCore\loader\appcache;..\..\..\third_party\WebKit\WebCore\loader\archive;..\..\..\third_party\WebKit\WebCore\loader\icon;..\..\..\third_party\WebKit\WebCore\page;..\..\..\third_party\WebKit\WebCore\platform;..\..\..\third_party\WebKit\WebCore\page\animation;..\..\..\third_party\WebKit\WebCore\platform\text;..\..\..\third_party\WebKit\WebCore\platform\graphics;..\..\port\platform\graphics;..\..\port\platform\graphics\chromium;..\..\..\third_party\WebKit\WebCore\svg\graphics;..\..\..\third_party\WebKit\WebCore\platform\network;..\..\..\third_party\WebKit\WebCore\platform\sql;..\..\..\third_party\WebKit\WebCore\rendering;..\..\..\third_party\WebKit\WebCore\rendering\style;..\..\..\third_party\WebKit\WebCore\storage;..\..\..\third_party\WebKit\WebCore\xml;..\..\..\third_party\WebKit\WebCore;"..\..\..\third_party\WebKit\WebCore\os-win32";..\..\..\third_party\WebKit\WebCore\wtf;..\..\..\third_party\WebKit\JavaScriptCore;..\..\..\third_party\WebKit\JavaScriptCore\wtf;"..\..\..\third_party\WebKit\JavaScriptCore\os-win32";..\..\build;"$(SDKIncludes)";"$(IntDir)\..\WebCore\DerivedSources";..\..\..\third_party\WebKit\WebCore\svg;..\..\..\third_party\WebKit\WebCore\svg\animation;..\..\..\third_party\WebKit\WebCore\svg\graphics\filters;..\..\..\third_party\WebKit\WebCore\plugins;..\..\..\third_party\WebKit\WebCore\inspector" /> </VisualStudioPropertySheet> |