diff options
| author | ericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-03 09:42:07 +0000 |
|---|---|---|
| committer | ericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-03 09:42:07 +0000 |
| commit | f8af7742f9669c056510df377c899bd8fd860834 (patch) | |
| tree | ba3ad25a70f30ed60fc89ed91bc41f0df5e9e12b /webkit/build | |
| parent | 2a9763b94b86bfb18360730d5e1259c98b2d98f9 (diff) | |
| download | chromium_src-f8af7742f9669c056510df377c899bd8fd860834.zip chromium_src-f8af7742f9669c056510df377c899bd8fd860834.tar.gz chromium_src-f8af7742f9669c056510df377c899bd8fd860834.tar.bz2 | |
WebKitMerge 40409:40464 (chromium-side).
* The death of FrameLoaderClient.cpp correspond with
<http://trac.webkit.org/changeset/40435>
* The custom V8 binding for V8HTMLFormElement::submit() corresponds with
<http://trac.webkit.org/changeset/40424>
* Changes to FrameLoader::loadFrameRequestWithFormAndValues() and
FrameLoadTypeRedirectWithLockedHistory correspond with
<http://trac.webkit.org/changeset/40432>
* No action was taken for the disable-web-security change
<http://trac.webkit.org/changeset/40449>, defaults to enabled.
* Frame::isFrameSet() moving to Document::isFrameSet corresponds with
<http://trac.webkit.org/changeset/40443>
* Frame::sendResizeEvent() moved to EventHandler::sendResizeEvent()
<http://trac.webkit.org/changeset/40444>
* Not sure which webkit change added RenderObjectChildList.cpp.
=======================
Rebaselined the following layout tests to reflect upstream changes:
=======================
* LayoutTests/fast/table/form-with-table-style.html
http://trac.webkit.org/browser/trunk/LayoutTests/platform/mac/fast/table/form-with-table-style-expected.png?rev=40457
* LayoutTests/fast/table/insert-row-before-form.html
http://trac.webkit.org/changeset/40456/trunk/LayoutTests/platform/mac/fast/table/insert-row-before-form-expected.txt?old=30635&old_path=trunk/LayoutTests/platform/mac/fast/table/insert-row-before-form-expected.txt
* LayoutTests/tables/mozilla/bugs/bug4527.html
http://trac.webkit.org/changeset/40458/trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug4527-expected.txt?old=30635&old_path=trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug4527-expected.txt
* LayoutTests/tables/mozilla/bugs/bug96343.html
http://trac.webkit.org/changeset/40458/trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug96343-expected.txt?old=30635&old_path=trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug96343-expected.txt
* LayoutTests/tables/mozilla_expected_failures/bugs/bug1725.html
http://trac.webkit.org/changeset/40459/trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug1725-expected.txt?old=30635&old_path=trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug1725-expected.txt
* LayoutTests/tables/mozilla_expected_failures/other/test4.html
http://trac.webkit.org/changeset/40460/trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/other/test4-expected.txt?old=34683&old_path=trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/other/test4-expected.txt
* LayoutTests/editing/deleting/deletionUI-single-instance-actual.png
http://trac.webkit.org/changeset/40454/trunk/LayoutTests/platform/mac/editing/deleting/deletionUI-single-instance-expected.txt?old=32226&old_path=trunk/LayoutTests/platform/mac/editing/deleting/deletionUI-single-instance-expected.txt
Review URL: http://codereview.chromium.org/21007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9077 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build')
| -rw-r--r-- | webkit/build/WebCore/SConscript | 2 | ||||
| -rw-r--r-- | webkit/build/WebCore/WebCore.vcproj | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript index 78e8a0d..fe3afb9 100644 --- a/webkit/build/WebCore/SConscript +++ b/webkit/build/WebCore/SConscript @@ -349,7 +349,6 @@ input_files = [ '$WEBCORE_DIR/loader/DocumentThreadableLoader.cpp', '$WEBCORE_DIR/loader/FormState.cpp', '$WEBCORE_DIR/loader/FrameLoader.cpp', - '$WEBCORE_DIR/loader/FrameLoaderClient.cpp', '$WEBCORE_DIR/loader/FTPDirectoryDocument.cpp', '$WEBCORE_DIR/loader/FTPDirectoryParser.cpp', '$WEBCORE_DIR/loader/ImageDocument.cpp', @@ -639,6 +638,7 @@ input_files = [ '$WEBCORE_DIR/rendering/RenderMedia.cpp', '$WEBCORE_DIR/rendering/RenderMenuList.cpp', '$WEBCORE_DIR/rendering/RenderObject.cpp', + '$WEBCORE_DIR/rendering/RenderObjectChildList.cpp', '$WEBCORE_DIR/rendering/RenderPart.cpp', '$WEBCORE_DIR/rendering/RenderPartObject.cpp', '$WEBCORE_DIR/rendering/RenderPath.cpp', diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj index 70f42d3..c58612e 100644 --- a/webkit/build/WebCore/WebCore.vcproj +++ b/webkit/build/WebCore/WebCore.vcproj @@ -703,10 +703,6 @@ > </File> <File - RelativePath="..\..\..\third_party\WebKit\WebCore\loader\FrameLoaderClient.cpp" - > - </File> - <File RelativePath="..\..\..\third_party\WebKit\WebCore\loader\FrameLoaderClient.h" > </File> @@ -3383,6 +3379,10 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderObjectChildList.cpp" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderObjectChildList.h" > </File> |