diff options
| -rw-r--r-- | DEPS | 8 | ||||
| -rw-r--r-- | WEBKIT_MERGE_REVISION | 2 | ||||
| -rw-r--r-- | webkit/SConscript | 2 | ||||
| -rw-r--r-- | webkit/build/WebCore/SConscript | 20 | ||||
| -rw-r--r-- | webkit/build/WebCore/WebCore.vcproj | 176 | ||||
| -rw-r--r-- | webkit/build/webkit_common_includes.vsprops | 2 | ||||
| -rw-r--r-- | webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/reflections/reflection-overflow-hidden-expected.checksum | 1 | ||||
| -rw-r--r-- | webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/reflections/reflection-overflow-hidden-expected.png | bin | 0 -> 5479 bytes | |||
| -rw-r--r-- | webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/reflections/reflection-overflow-hidden-expected.txt | 30 | ||||
| -rw-r--r-- | webkit/glue/webframeloaderclient_impl.cc | 15 | ||||
| -rw-r--r-- | webkit/glue/webframeloaderclient_impl.h | 2 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_lists/tests_fixable.txt | 7 | ||||
| -rw-r--r-- | webkit/webkit.xcodeproj/project.pbxproj | 122 |
13 files changed, 228 insertions, 159 deletions
@@ -12,7 +12,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@63", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@7278", + "/trunk/deps/third_party/WebKit@7351", "src/third_party/icu38": "/trunk/deps/third_party/icu38@7121", @@ -21,13 +21,13 @@ deps = { "http://v8.googlecode.com/svn/trunk@968", "src/webkit/data/layout_tests/LayoutTests": - "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@39369", + "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@39410", "src/third_party/WebKit/WebKit": - "http://svn.webkit.org/repository/webkit/trunk/WebKit@39369", + "http://svn.webkit.org/repository/webkit/trunk/WebKit@39410", "src/third_party/WebKit/WebKitLibraries": - "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39369", + "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39410", } diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION index f412d02..b3d0389 100644 --- a/WEBKIT_MERGE_REVISION +++ b/WEBKIT_MERGE_REVISION @@ -1 +1 @@ -http://svn.webkit.org/repository/webkit/trunk@39369
\ No newline at end of file +http://svn.webkit.org/repository/webkit/trunk@39410
\ No newline at end of file diff --git a/webkit/SConscript b/webkit/SConscript index 2cb73e7..7ad4851 100644 --- a/webkit/SConscript +++ b/webkit/SConscript @@ -134,10 +134,12 @@ env.Prepend( '$WEBKIT_DIR_PORT_INC/history', '$WEBKIT_DIR_PORT_INC/page/chromium', '$WEBKIT_DIR_PORT_INC/platform', + '$WEBKIT_DIR_PORT_INC/platform/animation', '$WEBKIT_DIR_PORT_INC/platform/chromium', '$WEBKIT_DIR_PORT_INC/platform/graphics', '$WEBKIT_DIR_PORT_INC/platform/graphics/chromium', '$WEBKIT_DIR_PORT_INC/platform/graphics/skia', + '$WEBKIT_DIR_PORT_INC/platform/graphics/transforms', '$WEBKIT_DIR_PORT_INC/platform/$WEBKIT_PLATFORM_SUBDIR', '$WEBKIT_DIR_PORT_INC/platform/network/chromium', '$WEBKIT_DIR_PORT_INC/rendering', diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript index dde370a..1235c8f 100644 --- a/webkit/build/WebCore/SConscript +++ b/webkit/build/WebCore/SConscript @@ -415,7 +415,9 @@ input_files = [ '$WEBCORE_DIR/platform/Timer.cpp', '$WEBCORE_DIR/platform/Widget.cpp', - '$WEBCORE_DIR/platform/graphics/AffineTransform.cpp', + '$WEBCORE_DIR/platform/animation/Animation.cpp', + '$WEBCORE_DIR/platform/animation/AnimationList.cpp', + '$WEBCORE_DIR/platform/graphics/BitmapImage.cpp', '$WEBCORE_DIR/platform/graphics/Color.cpp', '$WEBCORE_DIR/platform/graphics/FloatPoint.cpp', @@ -448,6 +450,14 @@ input_files = [ '$WEBCORE_DIR/platform/graphics/StringTruncator.cpp', '$WEBCORE_DIR/platform/graphics/WidthIterator.cpp', + '$WEBCORE_DIR/platform/graphics/transforms/ScaleTransformOperation.cpp', + '$WEBCORE_DIR/platform/graphics/transforms/TranslateTransformOperation.cpp', + '$WEBCORE_DIR/platform/graphics/transforms/RotateTransformOperation.cpp', + '$WEBCORE_DIR/platform/graphics/transforms/TransformOperations.cpp', + '$WEBCORE_DIR/platform/graphics/transforms/MatrixTransformOperation.cpp', + '$WEBCORE_DIR/platform/graphics/transforms/AffineTransform.cpp', + '$WEBCORE_DIR/platform/graphics/transforms/SkewTransformOperation.cpp', + '$WEBCORE_DIR/platform/network/AuthenticationChallengeBase.cpp', '$WEBCORE_DIR/platform/network/Credential.cpp', '$WEBCORE_DIR/platform/network/FormData.cpp', @@ -580,20 +590,14 @@ input_files = [ '$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', @@ -609,8 +613,6 @@ input_files = [ '$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/storage/ChangeVersionWrapper.cpp', '$WEBCORE_DIR/storage/Database.cpp', diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj index 14cb243..dbf6632 100644 --- a/webkit/build/WebCore/WebCore.vcproj +++ b/webkit/build/WebCore/WebCore.vcproj @@ -1205,14 +1205,6 @@ Name="graphics" > <File - RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\AffineTransform.cpp" - > - </File> - <File - RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\AffineTransform.h" - > - </File> - <File RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\BitmapImage.cpp" > </File> @@ -1420,6 +1412,74 @@ RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\SimpleFontData.h" > </File> + <Filter + Name="transforms" + > + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms\AffineTransform.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms\AffineTransform.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms\IdentityTransformOperation.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms\MatrixTransformOperation.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms\MatrixTransformOperation.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms\RotateTransformOperation.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms\RotateTransformOperation.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms\ScaleTransformOperation.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms\ScaleTransformOperation.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms\SkewTransformOperation.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms\SkewTransformOperation.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms\TransformOperation.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms\TransformOperations.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms\TransformOperations.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms\TranslateTransformOperation.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms\TranslateTransformOperation.h" + > + </File> + </Filter> </Filter> <Filter Name="network" @@ -1781,6 +1841,30 @@ > </File> </Filter> + <Filter + Name="animation" + > + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\animation\Animation.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\animation\Animation.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\animation\AnimationList.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\animation\AnimationList.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\animation\TimingFunction.h" + > + </File> + </Filter> </Filter> <Filter Name="css" @@ -3025,22 +3109,6 @@ 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> @@ -3101,10 +3169,6 @@ > </File> <File - RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\IdentityTransformOperation.h" - > - </File> - <File RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\style\KeyframeList.cpp" > </File> @@ -3113,14 +3177,6 @@ > </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> @@ -3145,22 +3201,6 @@ > </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> @@ -3169,14 +3209,6 @@ > </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> @@ -3304,30 +3336,6 @@ 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 diff --git a/webkit/build/webkit_common_includes.vsprops b/webkit/build/webkit_common_includes.vsprops index 6813548..d5614b2 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;..\..\port\platform\graphics\skia;..\..\..\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;..\..\..\third_party\sqlite" + 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\platform\animation;..\..\..\third_party\WebKit\WebCore\page\animation;..\..\..\third_party\WebKit\WebCore\platform\text;..\..\..\third_party\WebKit\WebCore\platform\graphics;..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms;..\..\port\platform\graphics;..\..\port\platform\graphics\chromium;..\..\port\platform\graphics\skia;..\..\..\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;..\..\..\third_party\sqlite" /> </VisualStudioPropertySheet> diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/reflections/reflection-overflow-hidden-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/reflections/reflection-overflow-hidden-expected.checksum new file mode 100644 index 0000000..29a062f --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/reflections/reflection-overflow-hidden-expected.checksum @@ -0,0 +1 @@ +8e8297705a1cb4b02ba5ac81589e997c
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/reflections/reflection-overflow-hidden-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/reflections/reflection-overflow-hidden-expected.png Binary files differnew file mode 100644 index 0000000..3bd6b2c --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/reflections/reflection-overflow-hidden-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/reflections/reflection-overflow-hidden-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/reflections/reflection-overflow-hidden-expected.txt new file mode 100644 index 0000000..2488605 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/reflections/reflection-overflow-hidden-expected.txt @@ -0,0 +1,30 @@ +layer at (0,0) size 800x600 + RenderView at (0,0) size 800x600 +layer at (0,0) size 800x140 layerType: background only +layer at (50,100) size 400x50 + RenderBlock (positioned) zI: -1 {DIV} at (50,100) size 400x50 [bgcolor=#FF0000] +layer at (50,250) size 400x50 + RenderBlock (positioned) zI: -1 {DIV} at (50,250) size 400x50 [bgcolor=#FF0000] +layer at (0,0) size 800x140 layerType: foreground only + RenderBlock {HTML} at (0,0) size 800x140 + RenderBody {BODY} at (50,50) size 700x40 + RenderBlock {P} at (0,0) size 700x40 + RenderInline {A} at (0,0) size 291x19 [color=#0000EE] + RenderText {#text} at (0,0) size 291x19 + text run at (0,0) width 291: "https://bugs.webkit.org/show_bug.cgi?id=22570" + RenderText {#text} at (291,0) size 658x39 + text run at (291,0) width 59: ". Test for " + text run at (350,0) width 308: "reflection painting on overflow:hidden element. You" + text run at (0,20) width 180: "should not see any red below." +layer at (50,100) size 400x410 + RenderBlock (positioned) {DIV} at (50,100) size 400x200 +layer at (50,100) size 400x200 + RenderBlock (relative positioned) {DIV} at (0,0) size 400x200 +layer at (50,100) size 400x50 + RenderBlock (positioned) {DIV} at (0,0) size 400x50 [bgcolor=#008000] + RenderText {#text} at (0,0) size 25x19 + text run at (0,0) width 25: "Top" +layer at (50,250) size 400x50 + RenderBlock (positioned) {DIV} at (0,150) size 400x50 [bgcolor=#008000] + RenderText {#text} at (0,0) size 45x19 + text run at (0,0) width 45: "Bottom" diff --git a/webkit/glue/webframeloaderclient_impl.cc b/webkit/glue/webframeloaderclient_impl.cc index 0fbb4af..d10749d 100644 --- a/webkit/glue/webframeloaderclient_impl.cc +++ b/webkit/glue/webframeloaderclient_impl.cc @@ -208,6 +208,15 @@ void WebFrameLoaderClient::dispatchWillSendRequest( } } +bool WebFrameLoaderClient::shouldUseCredentialStorage(DocumentLoader*, + unsigned long identifier) { + // FIXME + // Intended to call a method on the resource load delegate. + // Returns true for backward compatibility. + return true; +} + + void WebFrameLoaderClient::dispatchDidReceiveAuthenticationChallenge( DocumentLoader*, unsigned long identifier, const AuthenticationChallenge&) { // FIXME @@ -750,6 +759,12 @@ void WebFrameLoaderClient::dispatchDidFirstLayout() { // All resources have not necessarily finished loading. } +void WebFrameLoaderClient::dispatchDidFirstVisuallyNonEmptyLayout() { + // FIXME: called when webkit finished layout of a page that was visually + // non-empty. + // All resources have not necessarily finished loading. +} + Frame* WebFrameLoaderClient::dispatchCreatePage() { struct WebCore::WindowFeatures features; Page* new_page = webframe_->frame()->page()->chrome()->createWindow( diff --git a/webkit/glue/webframeloaderclient_impl.h b/webkit/glue/webframeloaderclient_impl.h index ad41622..7fd59dc 100644 --- a/webkit/glue/webframeloaderclient_impl.h +++ b/webkit/glue/webframeloaderclient_impl.h @@ -59,6 +59,7 @@ class WebFrameLoaderClient : public WebCore::FrameLoaderClient { virtual void assignIdentifierToInitialRequest(unsigned long identifier, WebCore::DocumentLoader*, const WebCore::ResourceRequest&); virtual void dispatchWillSendRequest(WebCore::DocumentLoader*, unsigned long identifier, WebCore::ResourceRequest&, const WebCore::ResourceResponse& redirectResponse); + virtual bool shouldUseCredentialStorage(WebCore::DocumentLoader*, unsigned long identifier); virtual void dispatchDidReceiveAuthenticationChallenge(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::AuthenticationChallenge&); virtual void dispatchDidCancelAuthenticationChallenge(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::AuthenticationChallenge&); virtual void dispatchDidReceiveResponse(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ResourceResponse&); @@ -82,6 +83,7 @@ class WebFrameLoaderClient : public WebCore::FrameLoaderClient { virtual void dispatchDidFinishDocumentLoad(); virtual void dispatchDidFinishLoad(); virtual void dispatchDidFirstLayout(); + virtual void dispatchDidFirstVisuallyNonEmptyLayout(); virtual WebCore::Frame* dispatchCreatePage(); virtual void dispatchShow(); diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt index 5156fe9..7a7cd75 100644 --- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt +++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt @@ -1801,3 +1801,10 @@ LINUX : LayoutTests/fast/text/shadow-no-blur.html = FAIL // Brett broke this with his font rendering effect patch and needs to fix it. LINUX WIN : LayoutTests/svg/W3C-SVG-1.1/fonts-kern-01-t.svg = FAIL + +// Merge 39369:39410: new test +LayoutTests/fast/events/popup-blocking-click-in-iframe.html = TIMEOUT + +// Merge 39369:39410: new test. Ran correctly and was baselined on Win32; +// may just need a baseline for Mac and Linux. (Might even pass there.) +MAC LINUX : LayoutTests/fast/reflections/reflection-overflow-hidden.html = PASS FAIL diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj index 9f3d04c..61e7a30 100644 --- a/webkit/webkit.xcodeproj/project.pbxproj +++ b/webkit/webkit.xcodeproj/project.pbxproj @@ -508,23 +508,15 @@ ABBD23A60EB7A95B00BEC658 /* StyleSurroundData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABBD239C0EB7A95B00BEC658 /* StyleSurroundData.cpp */; }; ABBD23A70EB7A95B00BEC658 /* StyleTransformData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABBD239E0EB7A95B00BEC658 /* StyleTransformData.cpp */; }; ABBD23A80EB7A95B00BEC658 /* StyleVisualData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABBD23A00EB7A95B00BEC658 /* StyleVisualData.cpp */; }; - ABBD23C30EB7AC1300BEC658 /* Animation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABBD23AB0EB7AC1300BEC658 /* Animation.cpp */; }; - ABBD23C40EB7AC1300BEC658 /* AnimationList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABBD23AD0EB7AC1300BEC658 /* AnimationList.cpp */; }; ABBD23C50EB7AC1300BEC658 /* BindingURI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABBD23AF0EB7AC1300BEC658 /* BindingURI.cpp */; }; ABBD23C60EB7AC1300BEC658 /* ContentData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABBD23B40EB7AC1300BEC658 /* ContentData.cpp */; }; ABBD23C70EB7AC1300BEC658 /* CounterDirectives.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABBD23B70EB7AC1300BEC658 /* CounterDirectives.cpp */; }; ABBD23C80EB7AC1300BEC658 /* FillLayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABBD23BC0EB7AC1300BEC658 /* FillLayer.cpp */; }; ABBD23C90EB7AC1300BEC658 /* KeyframeList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABBD23BF0EB7AC1300BEC658 /* KeyframeList.cpp */; }; - ABBD23CA0EB7AC1300BEC658 /* MatrixTransformOperation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABBD23C10EB7AC1300BEC658 /* MatrixTransformOperation.cpp */; }; - ABBD23EA0EB7ACA600BEC658 /* RotateTransformOperation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABBD23D50EB7ACA600BEC658 /* RotateTransformOperation.cpp */; }; - ABBD23EB0EB7ACA600BEC658 /* ScaleTransformOperation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABBD23D70EB7ACA600BEC658 /* ScaleTransformOperation.cpp */; }; ABBD23EC0EB7ACA600BEC658 /* ShadowData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABBD23D90EB7ACA600BEC658 /* ShadowData.cpp */; }; - ABBD23ED0EB7ACA600BEC658 /* SkewTransformOperation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABBD23DB0EB7ACA600BEC658 /* SkewTransformOperation.cpp */; }; ABBD23EE0EB7ACA600BEC658 /* StyleBackgroundData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABBD23DD0EB7ACA600BEC658 /* StyleBackgroundData.cpp */; }; ABBD23EF0EB7ACA600BEC658 /* StyleBoxData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABBD23DF0EB7ACA600BEC658 /* StyleBoxData.cpp */; }; ABBD23F00EB7ACA600BEC658 /* StyleFlexibleBoxData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABBD23E20EB7ACA600BEC658 /* StyleFlexibleBoxData.cpp */; }; - ABBD23F10EB7ACA600BEC658 /* TransformOperations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABBD23E60EB7ACA600BEC658 /* TransformOperations.cpp */; }; - ABBD23F20EB7ACA600BEC658 /* TranslateTransformOperation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABBD23E80EB7ACA600BEC658 /* TranslateTransformOperation.cpp */; }; ABBD24370EB7AE0700BEC658 /* V8MessagePort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABBD24020EB7AE0700BEC658 /* V8MessagePort.cpp */; }; ABBD246D0EB7B1DA00BEC658 /* MessageChannel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABBD24660EB7B1DA00BEC658 /* MessageChannel.cpp */; }; ABBD246E0EB7B1DA00BEC658 /* MessagePort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABBD24680EB7B1DA00BEC658 /* MessagePort.cpp */; }; @@ -885,7 +877,6 @@ E45624BD0E268E87005E4685 /* DragData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E8F9A0D7F3CC1001ECF42 /* DragData.cpp */; }; E45624BE0E268E87005E4685 /* DragImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E8F9C0D7F3CC1001ECF42 /* DragImage.cpp */; }; E45624BF0E268E87005E4685 /* FileChooser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E8F9E0D7F3CC1001ECF42 /* FileChooser.cpp */; }; - E45624C00E268E87005E4685 /* AffineTransform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E8FA30D7F3CC1001ECF42 /* AffineTransform.cpp */; }; E45624C10E268E87005E4685 /* BitmapImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E8FA50D7F3CC1001ECF42 /* BitmapImage.cpp */; }; E45624C20E268E87005E4685 /* Color.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E8FC40D7F3CC1001ECF42 /* Color.cpp */; }; E45624C30E268E87005E4685 /* FloatPoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E8FC60D7F3CC1001ECF42 /* FloatPoint.cpp */; }; @@ -1447,6 +1438,27 @@ 04C3AFC40EF1E4430046D578 /* NavigatorBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NavigatorBase.h; sourceTree = "<group>"; }; 04C3AFC50EF1E45F0046D578 /* WorkerNavigator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkerNavigator.cpp; sourceTree = "<group>"; }; 04C3AFC70EF1E4650046D578 /* WorkerNavigator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkerNavigator.h; sourceTree = "<group>"; }; + 3CBAF5EB0EFC892100E752CB /* Animation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Animation.cpp; sourceTree = "<group>"; }; + 3CBAF5EC0EFC892100E752CB /* Animation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Animation.h; sourceTree = "<group>"; }; + 3CBAF5ED0EFC892100E752CB /* AnimationList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AnimationList.cpp; sourceTree = "<group>"; }; + 3CBAF5EE0EFC892100E752CB /* AnimationList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AnimationList.h; sourceTree = "<group>"; }; + 3CBAF5EF0EFC892100E752CB /* TimingFunction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TimingFunction.h; sourceTree = "<group>"; }; + 3CBAF5F10EFC893600E752CB /* AffineTransform.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AffineTransform.cpp; sourceTree = "<group>"; }; + 3CBAF5F20EFC893600E752CB /* AffineTransform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AffineTransform.h; sourceTree = "<group>"; }; + 3CBAF5F30EFC893600E752CB /* IdentityTransformOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IdentityTransformOperation.h; sourceTree = "<group>"; }; + 3CBAF5F40EFC893600E752CB /* MatrixTransformOperation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MatrixTransformOperation.cpp; sourceTree = "<group>"; }; + 3CBAF5F50EFC893600E752CB /* MatrixTransformOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MatrixTransformOperation.h; sourceTree = "<group>"; }; + 3CBAF5F60EFC893600E752CB /* RotateTransformOperation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RotateTransformOperation.cpp; sourceTree = "<group>"; }; + 3CBAF5F70EFC893600E752CB /* RotateTransformOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RotateTransformOperation.h; sourceTree = "<group>"; }; + 3CBAF5F80EFC893600E752CB /* ScaleTransformOperation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScaleTransformOperation.cpp; sourceTree = "<group>"; }; + 3CBAF5F90EFC893600E752CB /* ScaleTransformOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScaleTransformOperation.h; sourceTree = "<group>"; }; + 3CBAF5FA0EFC893600E752CB /* SkewTransformOperation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SkewTransformOperation.cpp; sourceTree = "<group>"; }; + 3CBAF5FB0EFC893600E752CB /* SkewTransformOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SkewTransformOperation.h; sourceTree = "<group>"; }; + 3CBAF5FC0EFC893600E752CB /* TransformOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TransformOperation.h; sourceTree = "<group>"; }; + 3CBAF5FD0EFC893600E752CB /* TransformOperations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TransformOperations.cpp; sourceTree = "<group>"; }; + 3CBAF5FE0EFC893600E752CB /* TransformOperations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TransformOperations.h; sourceTree = "<group>"; }; + 3CBAF5FF0EFC893600E752CB /* TranslateTransformOperation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TranslateTransformOperation.cpp; sourceTree = "<group>"; }; + 3CBAF6000EFC893600E752CB /* TranslateTransformOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TranslateTransformOperation.h; sourceTree = "<group>"; }; 410303530EFB0C7C008832CA /* ScriptCachedPageData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptCachedPageData.h; sourceTree = "<group>"; }; 4103039E0EFB0F7C008832CA /* CachedPage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CachedPage.cpp; sourceTree = "<group>"; }; 410303A10EFB0F8D008832CA /* CachedPage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedPage.h; sourceTree = "<group>"; }; @@ -3023,8 +3035,6 @@ 7B5E8F9F0D7F3CC1001ECF42 /* FileChooser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileChooser.h; sourceTree = "<group>"; }; 7B5E8FA00D7F3CC1001ECF42 /* FileSystem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileSystem.h; sourceTree = "<group>"; }; 7B5E8FA10D7F3CC1001ECF42 /* FloatConversion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FloatConversion.h; sourceTree = "<group>"; }; - 7B5E8FA30D7F3CC1001ECF42 /* AffineTransform.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AffineTransform.cpp; sourceTree = "<group>"; }; - 7B5E8FA40D7F3CC1001ECF42 /* AffineTransform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AffineTransform.h; sourceTree = "<group>"; }; 7B5E8FA50D7F3CC1001ECF42 /* BitmapImage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BitmapImage.cpp; sourceTree = "<group>"; }; 7B5E8FA60D7F3CC1001ECF42 /* BitmapImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BitmapImage.h; sourceTree = "<group>"; }; 7B5E8FB40D7F3CC1001ECF42 /* AffineTransformCG.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AffineTransformCG.cpp; sourceTree = "<group>"; }; @@ -4040,10 +4050,6 @@ ABBD239F0EB7A95B00BEC658 /* StyleTransformData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StyleTransformData.h; sourceTree = "<group>"; }; ABBD23A00EB7A95B00BEC658 /* StyleVisualData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StyleVisualData.cpp; sourceTree = "<group>"; }; ABBD23A10EB7A95B00BEC658 /* StyleVisualData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StyleVisualData.h; sourceTree = "<group>"; }; - ABBD23AB0EB7AC1300BEC658 /* Animation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Animation.cpp; sourceTree = "<group>"; }; - ABBD23AC0EB7AC1300BEC658 /* Animation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Animation.h; sourceTree = "<group>"; }; - ABBD23AD0EB7AC1300BEC658 /* AnimationList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AnimationList.cpp; sourceTree = "<group>"; }; - ABBD23AE0EB7AC1300BEC658 /* AnimationList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AnimationList.h; sourceTree = "<group>"; }; ABBD23AF0EB7AC1300BEC658 /* BindingURI.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BindingURI.cpp; sourceTree = "<group>"; }; ABBD23B00EB7AC1300BEC658 /* BindingURI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BindingURI.h; sourceTree = "<group>"; }; ABBD23B10EB7AC1300BEC658 /* BorderData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BorderData.h; sourceTree = "<group>"; }; @@ -4059,21 +4065,12 @@ ABBD23BB0EB7AC1300BEC658 /* DataRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DataRef.h; sourceTree = "<group>"; }; ABBD23BC0EB7AC1300BEC658 /* FillLayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FillLayer.cpp; sourceTree = "<group>"; }; ABBD23BD0EB7AC1300BEC658 /* FillLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FillLayer.h; sourceTree = "<group>"; }; - ABBD23BE0EB7AC1300BEC658 /* IdentityTransformOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IdentityTransformOperation.h; sourceTree = "<group>"; }; ABBD23BF0EB7AC1300BEC658 /* KeyframeList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KeyframeList.cpp; sourceTree = "<group>"; }; ABBD23C00EB7AC1300BEC658 /* KeyframeList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KeyframeList.h; sourceTree = "<group>"; }; - ABBD23C10EB7AC1300BEC658 /* MatrixTransformOperation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MatrixTransformOperation.cpp; sourceTree = "<group>"; }; - ABBD23C20EB7AC1300BEC658 /* MatrixTransformOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MatrixTransformOperation.h; sourceTree = "<group>"; }; ABBD23D30EB7ACA600BEC658 /* OutlineValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OutlineValue.h; sourceTree = "<group>"; }; ABBD23D40EB7ACA600BEC658 /* RenderStyleConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderStyleConstants.h; sourceTree = "<group>"; }; - ABBD23D50EB7ACA600BEC658 /* RotateTransformOperation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RotateTransformOperation.cpp; sourceTree = "<group>"; }; - ABBD23D60EB7ACA600BEC658 /* RotateTransformOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RotateTransformOperation.h; sourceTree = "<group>"; }; - ABBD23D70EB7ACA600BEC658 /* ScaleTransformOperation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScaleTransformOperation.cpp; sourceTree = "<group>"; }; - ABBD23D80EB7ACA600BEC658 /* ScaleTransformOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScaleTransformOperation.h; sourceTree = "<group>"; }; ABBD23D90EB7ACA600BEC658 /* ShadowData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShadowData.cpp; sourceTree = "<group>"; }; ABBD23DA0EB7ACA600BEC658 /* ShadowData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShadowData.h; sourceTree = "<group>"; }; - ABBD23DB0EB7ACA600BEC658 /* SkewTransformOperation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SkewTransformOperation.cpp; sourceTree = "<group>"; }; - ABBD23DC0EB7ACA600BEC658 /* SkewTransformOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SkewTransformOperation.h; sourceTree = "<group>"; }; ABBD23DD0EB7ACA600BEC658 /* StyleBackgroundData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StyleBackgroundData.cpp; sourceTree = "<group>"; }; ABBD23DE0EB7ACA600BEC658 /* StyleBackgroundData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StyleBackgroundData.h; sourceTree = "<group>"; }; ABBD23DF0EB7ACA600BEC658 /* StyleBoxData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StyleBoxData.cpp; sourceTree = "<group>"; }; @@ -4081,12 +4078,6 @@ ABBD23E10EB7ACA600BEC658 /* StyleDashboardRegion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StyleDashboardRegion.h; sourceTree = "<group>"; }; ABBD23E20EB7ACA600BEC658 /* StyleFlexibleBoxData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StyleFlexibleBoxData.cpp; sourceTree = "<group>"; }; ABBD23E30EB7ACA600BEC658 /* StyleFlexibleBoxData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StyleFlexibleBoxData.h; sourceTree = "<group>"; }; - ABBD23E40EB7ACA600BEC658 /* TimingFunction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TimingFunction.h; sourceTree = "<group>"; }; - ABBD23E50EB7ACA600BEC658 /* TransformOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TransformOperation.h; sourceTree = "<group>"; }; - ABBD23E60EB7ACA600BEC658 /* TransformOperations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TransformOperations.cpp; sourceTree = "<group>"; }; - ABBD23E70EB7ACA600BEC658 /* TransformOperations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TransformOperations.h; sourceTree = "<group>"; }; - ABBD23E80EB7ACA600BEC658 /* TranslateTransformOperation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TranslateTransformOperation.cpp; sourceTree = "<group>"; }; - ABBD23E90EB7ACA600BEC658 /* TranslateTransformOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TranslateTransformOperation.h; sourceTree = "<group>"; }; ABBD24000EB7AE0700BEC658 /* V8Database.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = V8Database.cpp; sourceTree = "<group>"; }; ABBD24010EB7AE0700BEC658 /* V8Database.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = V8Database.h; sourceTree = "<group>"; }; ABBD24020EB7AE0700BEC658 /* V8MessagePort.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = V8MessagePort.cpp; sourceTree = "<group>"; }; @@ -4334,6 +4325,41 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 3CBAF5EA0EFC892100E752CB /* animation */ = { + isa = PBXGroup; + children = ( + 3CBAF5EB0EFC892100E752CB /* Animation.cpp */, + 3CBAF5EC0EFC892100E752CB /* Animation.h */, + 3CBAF5ED0EFC892100E752CB /* AnimationList.cpp */, + 3CBAF5EE0EFC892100E752CB /* AnimationList.h */, + 3CBAF5EF0EFC892100E752CB /* TimingFunction.h */, + ); + path = animation; + sourceTree = "<group>"; + }; + 3CBAF5F00EFC893600E752CB /* transforms */ = { + isa = PBXGroup; + children = ( + 3CBAF5F10EFC893600E752CB /* AffineTransform.cpp */, + 3CBAF5F20EFC893600E752CB /* AffineTransform.h */, + 3CBAF5F30EFC893600E752CB /* IdentityTransformOperation.h */, + 3CBAF5F40EFC893600E752CB /* MatrixTransformOperation.cpp */, + 3CBAF5F50EFC893600E752CB /* MatrixTransformOperation.h */, + 3CBAF5F60EFC893600E752CB /* RotateTransformOperation.cpp */, + 3CBAF5F70EFC893600E752CB /* RotateTransformOperation.h */, + 3CBAF5F80EFC893600E752CB /* ScaleTransformOperation.cpp */, + 3CBAF5F90EFC893600E752CB /* ScaleTransformOperation.h */, + 3CBAF5FA0EFC893600E752CB /* SkewTransformOperation.cpp */, + 3CBAF5FB0EFC893600E752CB /* SkewTransformOperation.h */, + 3CBAF5FC0EFC893600E752CB /* TransformOperation.h */, + 3CBAF5FD0EFC893600E752CB /* TransformOperations.cpp */, + 3CBAF5FE0EFC893600E752CB /* TransformOperations.h */, + 3CBAF5FF0EFC893600E752CB /* TranslateTransformOperation.cpp */, + 3CBAF6000EFC893600E752CB /* TranslateTransformOperation.h */, + ); + path = transforms; + sourceTree = "<group>"; + }; 4D1637C20EBFA485008F024E /* sql */ = { isa = PBXGroup; children = ( @@ -5606,6 +5632,7 @@ 7B5E8F7C0D7F3CC1001ECF42 /* platform */ = { isa = PBXGroup; children = ( + 3CBAF5EA0EFC892100E752CB /* animation */, 7B5E8F820D7F3CC1001ECF42 /* cf */, 7B5E8FA20D7F3CC1001ECF42 /* graphics */, 7B5E90D40D7F3CC2001ECF42 /* mac */, @@ -5702,8 +5729,7 @@ children = ( 7B5E8FB30D7F3CC1001ECF42 /* cg */, 7B5E90030D7F3CC1001ECF42 /* mac */, - 7B5E8FA30D7F3CC1001ECF42 /* AffineTransform.cpp */, - 7B5E8FA40D7F3CC1001ECF42 /* AffineTransform.h */, + 3CBAF5F00EFC893600E752CB /* transforms */, 7B5E8FA50D7F3CC1001ECF42 /* BitmapImage.cpp */, 7B5E8FA60D7F3CC1001ECF42 /* BitmapImage.h */, 7B5E8FC40D7F3CC1001ECF42 /* Color.cpp */, @@ -7718,10 +7744,6 @@ B5C180A00E958E85006EAF87 /* style */ = { isa = PBXGroup; children = ( - ABBD23AB0EB7AC1300BEC658 /* Animation.cpp */, - ABBD23AC0EB7AC1300BEC658 /* Animation.h */, - ABBD23AD0EB7AC1300BEC658 /* AnimationList.cpp */, - ABBD23AE0EB7AC1300BEC658 /* AnimationList.h */, ABBD23AF0EB7AC1300BEC658 /* BindingURI.cpp */, ABBD23B00EB7AC1300BEC658 /* BindingURI.h */, ABBD23B10EB7AC1300BEC658 /* BorderData.h */, @@ -7737,25 +7759,16 @@ ABBD23BB0EB7AC1300BEC658 /* DataRef.h */, ABBD23BC0EB7AC1300BEC658 /* FillLayer.cpp */, ABBD23BD0EB7AC1300BEC658 /* FillLayer.h */, - ABBD23BE0EB7AC1300BEC658 /* IdentityTransformOperation.h */, ABBD23BF0EB7AC1300BEC658 /* KeyframeList.cpp */, ABBD23C00EB7AC1300BEC658 /* KeyframeList.h */, - ABBD23C10EB7AC1300BEC658 /* MatrixTransformOperation.cpp */, - ABBD23C20EB7AC1300BEC658 /* MatrixTransformOperation.h */, B51C76DA0E9BC9F400D9DFC4 /* NinePieceImage.cpp */, B51C76D90E9BC9F400D9DFC4 /* NinePieceImage.h */, ABBD23D30EB7ACA600BEC658 /* OutlineValue.h */, B5C180A30E958EAA006EAF87 /* RenderStyle.cpp */, B5C1809E0E958E3D006EAF87 /* RenderStyle.h */, ABBD23D40EB7ACA600BEC658 /* RenderStyleConstants.h */, - ABBD23D50EB7ACA600BEC658 /* RotateTransformOperation.cpp */, - ABBD23D60EB7ACA600BEC658 /* RotateTransformOperation.h */, - ABBD23D70EB7ACA600BEC658 /* ScaleTransformOperation.cpp */, - ABBD23D80EB7ACA600BEC658 /* ScaleTransformOperation.h */, ABBD23D90EB7ACA600BEC658 /* ShadowData.cpp */, ABBD23DA0EB7ACA600BEC658 /* ShadowData.h */, - ABBD23DB0EB7ACA600BEC658 /* SkewTransformOperation.cpp */, - ABBD23DC0EB7ACA600BEC658 /* SkewTransformOperation.h */, ABBD23DD0EB7ACA600BEC658 /* StyleBackgroundData.cpp */, ABBD23DE0EB7ACA600BEC658 /* StyleBackgroundData.h */, ABBD23DF0EB7ACA600BEC658 /* StyleBoxData.cpp */, @@ -7789,12 +7802,6 @@ 7B5E95BD0D7F3E95001ECF42 /* SVGRenderStyle.h */, 7B5E95BE0D7F3E95001ECF42 /* SVGRenderStyleDefs.cpp */, 7B5E95BF0D7F3E95001ECF42 /* SVGRenderStyleDefs.h */, - ABBD23E40EB7ACA600BEC658 /* TimingFunction.h */, - ABBD23E50EB7ACA600BEC658 /* TransformOperation.h */, - ABBD23E60EB7ACA600BEC658 /* TransformOperations.cpp */, - ABBD23E70EB7ACA600BEC658 /* TransformOperations.h */, - ABBD23E80EB7ACA600BEC658 /* TranslateTransformOperation.cpp */, - ABBD23E90EB7ACA600BEC658 /* TranslateTransformOperation.h */, ); path = style; sourceTree = "<group>"; @@ -8502,12 +8509,9 @@ 4DB7F2040E9BAE2900C66CE0 /* AccessibilityTableHeaderContainer.cpp in Sources */, 4DB7F2050E9BAE2900C66CE0 /* AccessibilityTableRow.cpp in Sources */, 4D1641310EC29E80008F024E /* ActiveDOMObject.cpp in Sources */, - E45624C00E268E87005E4685 /* AffineTransform.cpp in Sources */, E45626810E268E87005E4685 /* AffineTransformCG.cpp in Sources */, - ABBD23C30EB7AC1300BEC658 /* Animation.cpp in Sources */, 4DB7EFE50E9BA1E400C66CE0 /* AnimationBase.cpp in Sources */, AB332F4D0E95497E0020F882 /* AnimationController.cpp in Sources */, - ABBD23C40EB7AC1300BEC658 /* AnimationList.cpp in Sources */, E45623EC0E268E87005E4685 /* AppendNodeCommand.cpp in Sources */, E45623ED0E268E87005E4685 /* ApplyStyleCommand.cpp in Sources */, 4DB7F11B0E9BAC1500C66CE0 /* ArchiveFactory.cpp in Sources */, @@ -8836,7 +8840,6 @@ E45624900E268E87005E4685 /* MainResourceLoader.cpp in Sources */, E45623CA0E268E87005E4685 /* MappedAttribute.cpp in Sources */, E45624050E268E87005E4685 /* markup.cpp in Sources */, - ABBD23CA0EB7AC1300BEC658 /* MatrixTransformOperation.cpp in Sources */, E45625560E268E87005E4685 /* MediaControlElements.cpp in Sources */, ABBD248C0EB7BEA400BEC658 /* MediaDocument.cpp in Sources */, E456239F0E268E87005E4685 /* MediaFeatureNames.cpp in Sources */, @@ -8985,8 +8988,6 @@ E45625260E268E87005E4685 /* ResourceRequestBase.cpp in Sources */, B57635F80E96C13D008A7ABC /* ResourceResponseBase.cpp in Sources */, E45625930E268E87005E4685 /* RootInlineBox.cpp in Sources */, - ABBD23EA0EB7ACA600BEC658 /* RotateTransformOperation.cpp in Sources */, - ABBD23EB0EB7ACA600BEC658 /* ScaleTransformOperation.cpp in Sources */, E45624B00E268E87005E4685 /* Screen.cpp in Sources */, 4DB7F1030E9BAB5600C66CE0 /* ScriptElement.cpp in Sources */, 4D1641330EC29E80008F024E /* ScriptExecutionContext.cpp in Sources */, @@ -9009,7 +9010,6 @@ B5442A900E9BDDF10098766D /* SharedBufferCF.cpp in Sources */, E45624E80E268E87005E4685 /* SimpleFontData.cpp in Sources */, E45624E20E268E87005E4685 /* SimpleFontDataMac.mm in Sources */, - ABBD23ED0EB7ACA600BEC658 /* SkewTransformOperation.cpp in Sources */, 93817B950EF1CD9600993F02 /* SkiaUtils.cpp in Sources */, E45624120E268E87005E4685 /* SmartReplace.cpp in Sources */, E45624130E268E87005E4685 /* SmartReplaceCF.cpp in Sources */, @@ -9257,8 +9257,6 @@ E45625460E268E87005E4685 /* TextStream.cpp in Sources */, E45625480E268E87005E4685 /* Timer.cpp in Sources */, E45624760E268E87005E4685 /* TimeRanges.cpp in Sources */, - ABBD23F10EB7ACA600BEC658 /* TransformOperations.cpp in Sources */, - ABBD23F20EB7ACA600BEC658 /* TranslateTransformOperation.cpp in Sources */, E45623E60E268E87005E4685 /* Traversal.cpp in Sources */, E45623E70E268E87005E4685 /* TreeWalker.cpp in Sources */, E45624190E268E87005E4685 /* TypingCommand.cpp in Sources */, @@ -9697,10 +9695,12 @@ "$(DIR_WEBCORE)/page/animation", "$(DIR_WEBCORE)/page/mac", "$(DIR_WEBCORE)/platform", + "$(DIR_WEBCORE)/platform/animation", "$(DIR_WEBCORE)/platform/cf", "$(DIR_WEBCORE)/platform/graphics", "$(DIR_WEBCORE)/platform/graphics/cg", "$(DIR_WEBCORE)/platform/graphics/mac", + "$(DIR_WEBCORE)/platform/graphics/transforms", "$(DIR_WEBCORE)/platform/mac", "$(DIR_WEBCORE)/platform/network", "$(DIR_WEBCORE)/platform/network/mac", @@ -9828,10 +9828,12 @@ "$(DIR_WEBCORE)/page/animation", "$(DIR_WEBCORE)/page/mac", "$(DIR_WEBCORE)/platform", + "$(DIR_WEBCORE)/platform/animation", "$(DIR_WEBCORE)/platform/cf", "$(DIR_WEBCORE)/platform/graphics", "$(DIR_WEBCORE)/platform/graphics/cg", "$(DIR_WEBCORE)/platform/graphics/mac", + "$(DIR_WEBCORE)/platform/graphics/transforms", "$(DIR_WEBCORE)/platform/mac", "$(DIR_WEBCORE)/platform/network", "$(DIR_WEBCORE)/platform/network/mac", |
