diff options
| author | playmobil@google.com <playmobil@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-21 22:43:12 +0000 |
|---|---|---|
| committer | playmobil@google.com <playmobil@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-21 22:43:12 +0000 |
| commit | be17ce1ec9a35b7458c2115fdce94ccd03dd82f8 (patch) | |
| tree | d06ca0378c64e3d7678c03d3980e30c7e7cdf4e8 | |
| parent | dfac21052d6aafc62865d4636a0b7fdaf7ed88ed (diff) | |
| download | chromium_src-be17ce1ec9a35b7458c2115fdce94ccd03dd82f8.zip chromium_src-be17ce1ec9a35b7458c2115fdce94ccd03dd82f8.tar.gz chromium_src-be17ce1ec9a35b7458c2115fdce94ccd03dd82f8.tar.bz2 | |
Webkit Merge 40059:40086
Review URL: http://codereview.chromium.org/18632
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8402 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 6 | ||||
| -rw-r--r-- | WEBKIT_MERGE_REVISION | 2 | ||||
| -rw-r--r-- | webkit/build/WebCore/SConscript | 5 | ||||
| -rw-r--r-- | webkit/build/WebCore/WebCore.vcproj | 32 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_lists/tests_fixable.txt | 10 |
5 files changed, 45 insertions, 10 deletions
@@ -21,13 +21,13 @@ deps = { "http://v8.googlecode.com/svn/trunk@1103", "src/webkit/data/layout_tests/LayoutTests": - "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@40058", + "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@40086", "src/third_party/WebKit/WebKit": - "http://svn.webkit.org/repository/webkit/trunk/WebKit@40058", + "http://svn.webkit.org/repository/webkit/trunk/WebKit@40086", "src/third_party/WebKit/WebKitLibraries": - "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@40058", + "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@40086", } diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION index 3657514..0ccdcbd 100644 --- a/WEBKIT_MERGE_REVISION +++ b/WEBKIT_MERGE_REVISION @@ -1 +1 @@ -http://svn.webkit.org/repository/webkit/trunk@40058
\ No newline at end of file +http://svn.webkit.org/repository/webkit/trunk@40086
\ No newline at end of file diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript index 8dcf60f..69b170d 100644 --- a/webkit/build/WebCore/SConscript +++ b/webkit/build/WebCore/SConscript @@ -130,6 +130,8 @@ input_files = [ '$WEBCORE_DIR/dom/EventTargetNode.cpp', '$WEBCORE_DIR/dom/ExceptionBase.cpp', '$WEBCORE_DIR/dom/ExceptionCode.cpp', + '$WEBCORE_DIR/dom/FormControlElement.cpp', + '$WEBCORE_DIR/dom/InputElement.cpp', '$WEBCORE_DIR/dom/KeyboardEvent.cpp', '$WEBCORE_DIR/dom/MappedAttribute.cpp', '$WEBCORE_DIR/dom/MessageChannel.cpp', @@ -146,6 +148,8 @@ input_files = [ '$WEBCORE_DIR/dom/NodeFilterCondition.cpp', '$WEBCORE_DIR/dom/NodeIterator.cpp', '$WEBCORE_DIR/dom/Notation.cpp', + '$WEBCORE_DIR/dom/OptionGroupElement.cpp', + '$WEBCORE_DIR/dom/OptionElement.cpp', '$WEBCORE_DIR/dom/OverflowEvent.cpp', '$WEBCORE_DIR/dom/Position.cpp', '$WEBCORE_DIR/dom/PositionIterator.cpp', @@ -857,7 +861,6 @@ input_files = [ '$WEBCORE_DIR/svg/graphics/SVGResourceMarker.cpp', '$WEBCORE_DIR/svg/graphics/SVGResourceMasker.cpp', - '$WEBCORE_DIR/svg/graphics/skia/SVGPaintServerPatternSkia.cpp', '$WEBCORE_DIR/svg/graphics/skia/SVGPaintServerSkia.cpp', '$WEBCORE_DIR/svg/graphics/skia/SVGResourceFilterSkia.cpp', '$WEBCORE_DIR/svg/graphics/skia/SVGResourceMaskerSkia.cpp', diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj index ff6c54e..6b94985 100644 --- a/webkit/build/WebCore/WebCore.vcproj +++ b/webkit/build/WebCore/WebCore.vcproj @@ -4443,10 +4443,22 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\WebCore\dom\FormControlElement.cpp" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebCore\dom\FormControlElement.h" > </File> <File + RelativePath="..\..\..\third_party\WebKit\WebCore\dom\InputElement.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\dom\InputElement.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebCore\dom\KeyboardEvent.cpp" > </File> @@ -4583,6 +4595,22 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\WebCore\dom\OptionGroupElement.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\dom\OptionGroupElement.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\dom\OptionElement.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\dom\OptionElement.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebCore\dom\OverflowEvent.cpp" > </File> @@ -7137,10 +7165,6 @@ Name="skia" > <File - RelativePath="..\..\..\third_party\WebKit\WebCore\svg\graphics\skia\SVGPaintServerPatternSkia.cpp" - > - </File> - <File RelativePath="..\..\..\third_party\WebKit\WebCore\svg\graphics\skia\SVGPaintServerSkia.cpp" > </File> diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt index 2ae6093..fe5026e 100644 --- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt +++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt @@ -1865,8 +1865,16 @@ LINUX : LayoutTests/svg/custom/path-getTotalLength.svg = FAIL PASS // Merge 39972:40057 -- new tests LayoutTests/fast/regex/malformed-escapes.html = FAIL -LayoutTests/transitions/hang-with-bad-transition-list.html = PASS TIMEOUT // Merge 39972:40057 LINUX : LayoutTests/editing/selection/extend-selection-bidi.html = FAIL LINUX : LayoutTests/fast/canvas/pointInPath.html = FAIL PASS + +// Merge 40059:40086 +WIN : LayoutTests/fast/forms/disabled-select-change-index.html = FAIL +WIN : LayoutTests/fast/forms/listbox-scrollbar-incremental-load.html = FAIL +WIN : LayoutTests/fast/forms/select-block-background.html = FAIL +WIN : LayoutTests/fast/forms/select-change-popup-to-listbox.html = FAIL +WIN : LayoutTests/fast/forms/select-initial-position.html = FAIL + +LayoutTests/transitions/hang-with-bad-transition-list.html = PASS TIMEOUT
\ No newline at end of file |