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 | |
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')
21 files changed, 124 insertions, 89 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> diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/deletionUI-single-instance-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/deletionUI-single-instance-expected.checksum index b50ebc5..42287c9 100755 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/deletionUI-single-instance-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/deletionUI-single-instance-expected.checksum @@ -1 +1 @@ -91a40e384a8174dc06866dd8e586c911
\ No newline at end of file +e54cccd7aa43aa66e6eb97b735fc0288
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/deletionUI-single-instance-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/deletionUI-single-instance-expected.png Binary files differindex 919f163..3dec877 100755 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/deletionUI-single-instance-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/deletionUI-single-instance-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/deletionUI-single-instance-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/deletionUI-single-instance-expected.txt index ec034a8..4b5d6fb 100755 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/deletionUI-single-instance-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/deletionUI-single-instance-expected.txt @@ -9,12 +9,12 @@ layer at (0,0) size 800x600 text run at (430,0) width 329: "This test makes sure that we don't make the mistake of"
text run at (0,20) width 730: "adding new m_containerElements to the DeletionUI over and over again. A successful run of the test will not have multiple"
text run at (0,40) width 381: "instances of deletion UI render objects at the same coordinates:"
- RenderBlock {DIV} at (0,76) size 784x118
-layer at (24,100) size 752x86 layerType: background only
-layer at (20,96) size 760x94
- RenderBlock (positioned) zI: -1000000 {DIV} at (-4,-4) size 760x94 [border: (4px solid #00000099)]
-layer at (24,100) size 752x86 layerType: foreground only
- RenderTable {TABLE} at (16,16) size 752x86
+ RenderBlock {DIV} at (0,76) size 784x122
+layer at (24,100) size 752x90 layerType: background only
+layer at (20,96) size 760x98
+ RenderBlock (positioned) zI: -1000000 {DIV} at (-4,-4) size 760x98 [border: (4px solid #00000099)]
+layer at (24,100) size 752x90 layerType: foreground only
+ RenderTable {TABLE} at (16,16) size 752x90
RenderTableSection {TBODY} at (0,0) size 752x86
RenderTableRow {TR} at (0,2) size 752x82
RenderTableCell {TD} at (2,2) size 748x82 [r=0 c=0 rs=1 cs=1]
@@ -23,7 +23,9 @@ layer at (24,100) size 752x86 layerType: foreground only text run at (1,21) width 744: "Donec pede. Praesent accumsan dui vitae mauris. Mauris non dui at neque lacinia pulvinar. Quisque nibh. Nulla vitae lectus. "
text run at (1,41) width 746: "Pellentesque enim. Mauris hendrerit molestie dui. Etiam pretium ligula a pede. Fusce consectetuer purus sit amet sem. Morbi "
text run at (1,61) width 229: "tincidunt mollis libero. Maecenas mole"
- RenderBlock {DIV} at (0,0) size 752x0
+ RenderTableSection (anonymous) at (0,86) size 752x4
+ RenderTableRow (anonymous) at (0,2) size 752x0
+ RenderTableCell (anonymous) at (2,2) size 748x0 [r=0 c=0 rs=1 cs=1]
layer at (7,85) size 30x30
RenderImage zI: 1000000 {IMG} at (-17,-15) size 30x30
caret: position 403 of child 0 {#text} of child 1 {TD} of child 0 {TR} of child 1 {TBODY} of child 1 {TABLE} of child 3 {DIV} of child 0 {BODY} of child 0 {HTML} of document
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/table/form-with-table-style-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/table/form-with-table-style-expected.checksum index 915a192..1781530 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/table/form-with-table-style-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/table/form-with-table-style-expected.checksum @@ -1 +1 @@ -477a323e71a721b13862d982fe418c20
\ No newline at end of file +8ab5aee1ca3232171c5d553673a7d139
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/table/form-with-table-style-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/table/form-with-table-style-expected.png Binary files differindex 7b86af8..97d3c9d 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/table/form-with-table-style-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/table/form-with-table-style-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/table/form-with-table-style-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/table/form-with-table-style-expected.txt index eac91b7..7704214 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/table/form-with-table-style-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/table/form-with-table-style-expected.txt @@ -93,7 +93,10 @@ layer at (0,0) size 800x600 RenderTableCell {FORM} at (0,0) size 104x20 [r=0 c=0 rs=1 cs=1] RenderText {#text} at (0,0) size 104x19 text run at (0,0) width 104: "display: table-cell" - RenderBlock {DIV} at (0,460) size 784x0 - RenderTable at (0,0) size 45x0 - RenderBlock {FORM} at (0,0) size 0x0 - RenderText {#text} at (0,0) size 0x0 + RenderBlock {DIV} at (0,460) size 784x76 + RenderTable at (0,0) size 45x76 + RenderBlock {FORM} at (0,0) size 45x60 + RenderText {#text} at (0,0) size 45x59 + text run at (0,0) width 45: "display:" + text run at (0,20) width 35: "table-" + text run at (0,40) width 44: "caption" diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/table/insert-row-before-form-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/table/insert-row-before-form-expected.txt index 819e2b8..b6de2e2 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/table/insert-row-before-form-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/table/insert-row-before-form-expected.txt @@ -27,4 +27,4 @@ layer at (0,0) size 800x600 RenderTableCell {TD} at (2,2) size 130x22 [r=0 c=0 rs=1 cs=1] RenderText {#text} at (1,1) size 128x19 text run at (1,1) width 128: "This should be green." - RenderBlock {FORM} at (0,0) size 134x0 + RenderBlock {FORM} at (0,0) size 0x0 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla/bugs/bug4527-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla/bugs/bug4527-expected.txt index 0edf842..5c7a4b9 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla/bugs/bug4527-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla/bugs/bug4527-expected.txt @@ -32,7 +32,7 @@ layer at (0,0) size 800x600 RenderBR {BR} at (487,60) size 0x0 RenderImage {IMG} at (0,60) size 470x10 RenderBR {BR} at (470,70) size 0x0 - RenderBlock {FORM} at (0,0) size 613x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,70) size 613x26 RenderTableCell {TD} at (126,70) size 233x25 [bgcolor=#CCCCCC] [r=1 c=1 rs=1 cs=1] RenderImage {IMG} at (0,0) size 232x25 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla/bugs/bug96343-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla/bugs/bug96343-expected.txt index 9d58605..a78b706 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla/bugs/bug96343-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla/bugs/bug96343-expected.txt @@ -9,79 +9,79 @@ layer at (0,0) size 785x1513 RenderTableCell {TD} at (2,2) size 209x22 [r=0 c=0 rs=1 cs=1] RenderText {#text} at (1,1) size 207x19 text run at (1,1) width 207: "Occasional height/width on images" - RenderBlock {FORM} at (0,0) size 213x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,26) size 213x34 RenderTableCell {TD} at (2,26) size 209x34 [r=1 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 75x32 - RenderBlock {FORM} at (0,0) size 213x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,62) size 213x24 RenderTableCell {TD} at (2,62) size 209x24 [r=2 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 44x22 - RenderBlock {FORM} at (0,0) size 213x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,88) size 213x15 RenderTableCell {TD} at (2,88) size 209x15 [r=3 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 89x13 - RenderBlock {FORM} at (0,0) size 213x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,105) size 213x15 RenderTableCell {TD} at (2,105) size 209x15 [r=4 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 89x13 - RenderBlock {FORM} at (0,0) size 213x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,122) size 213x31 RenderTableCell {TD} at (2,122) size 209x31 [r=5 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 31x29 - RenderBlock {FORM} at (0,0) size 213x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,155) size 213x23 RenderTableCell {TD} at (2,155) size 209x23 [r=6 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 62x21 - RenderBlock {FORM} at (0,0) size 213x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,180) size 213x17 RenderTableCell {TD} at (2,180) size 209x17 [r=7 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 70x15 - RenderBlock {FORM} at (0,0) size 213x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,199) size 213x28 RenderTableCell {TD} at (2,199) size 209x28 [r=8 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 42x26 - RenderBlock {FORM} at (0,0) size 213x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,229) size 213x17 RenderTableCell {TD} at (2,229) size 209x17 [r=9 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 84x15 - RenderBlock {FORM} at (0,0) size 213x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,248) size 213x17 RenderTableCell {TD} at (2,248) size 209x17 [r=10 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 90x15 - RenderBlock {FORM} at (0,0) size 213x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,267) size 213x34 RenderTableCell {TD} at (2,267) size 209x34 [r=11 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 59x32 - RenderBlock {FORM} at (0,0) size 213x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,303) size 213x17 RenderTableCell {TD} at (2,303) size 209x17 [r=12 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 90x15 - RenderBlock {FORM} at (0,0) size 213x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,322) size 213x17 RenderTableCell {TD} at (2,322) size 209x17 [r=13 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 90x15 - RenderBlock {FORM} at (0,0) size 213x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,341) size 213x21 RenderTableCell {TD} at (2,341) size 209x21 [r=14 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 83x19 - RenderBlock {FORM} at (0,0) size 213x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,364) size 213x33 RenderTableCell {TD} at (2,364) size 209x33 [r=15 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 54x31 - RenderBlock {FORM} at (0,0) size 213x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,399) size 213x27 RenderTableCell {TD} at (2,399) size 209x27 [r=16 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 56x25 - RenderBlock {FORM} at (0,0) size 213x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,428) size 213x17 RenderTableCell {TD} at (2,428) size 209x17 [r=17 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 53x15 - RenderBlock {FORM} at (0,0) size 213x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,447) size 213x31 RenderTableCell {TD} at (2,447) size 209x31 [r=18 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 31x29 - RenderBlock {FORM} at (0,0) size 213x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,480) size 213x17 RenderTableCell {TD} at (2,480) size 209x17 [r=19 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 53x15 @@ -91,79 +91,79 @@ layer at (0,0) size 785x1513 RenderTableCell {TD} at (2,2) size 244x22 [r=0 c=0 rs=1 cs=1] RenderText {#text} at (1,1) size 242x19 text run at (1,1) width 242: "Images with height/width never specified" - RenderBlock {FORM} at (0,0) size 248x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,26) size 248x34 RenderTableCell {TD} at (2,26) size 244x34 [r=1 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 75x32 - RenderBlock {FORM} at (0,0) size 248x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,62) size 248x24 RenderTableCell {TD} at (2,62) size 244x24 [r=2 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 44x22 - RenderBlock {FORM} at (0,0) size 248x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,88) size 248x15 RenderTableCell {TD} at (2,88) size 244x15 [r=3 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 89x13 - RenderBlock {FORM} at (0,0) size 248x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,105) size 248x15 RenderTableCell {TD} at (2,105) size 244x15 [r=4 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 89x13 - RenderBlock {FORM} at (0,0) size 248x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,122) size 248x31 RenderTableCell {TD} at (2,122) size 244x31 [r=5 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 31x29 - RenderBlock {FORM} at (0,0) size 248x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,155) size 248x23 RenderTableCell {TD} at (2,155) size 244x23 [r=6 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 62x21 - RenderBlock {FORM} at (0,0) size 248x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,180) size 248x17 RenderTableCell {TD} at (2,180) size 244x17 [r=7 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 70x15 - RenderBlock {FORM} at (0,0) size 248x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,199) size 248x28 RenderTableCell {TD} at (2,199) size 244x28 [r=8 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 42x26 - RenderBlock {FORM} at (0,0) size 248x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,229) size 248x17 RenderTableCell {TD} at (2,229) size 244x17 [r=9 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 84x15 - RenderBlock {FORM} at (0,0) size 248x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,248) size 248x17 RenderTableCell {TD} at (2,248) size 244x17 [r=10 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 90x15 - RenderBlock {FORM} at (0,0) size 248x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,267) size 248x34 RenderTableCell {TD} at (2,267) size 244x34 [r=11 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 59x32 - RenderBlock {FORM} at (0,0) size 248x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,303) size 248x17 RenderTableCell {TD} at (2,303) size 244x17 [r=12 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 90x15 - RenderBlock {FORM} at (0,0) size 248x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,322) size 248x17 RenderTableCell {TD} at (2,322) size 244x17 [r=13 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 90x15 - RenderBlock {FORM} at (0,0) size 248x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,341) size 248x21 RenderTableCell {TD} at (2,341) size 244x21 [r=14 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 83x19 - RenderBlock {FORM} at (0,0) size 248x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,364) size 248x33 RenderTableCell {TD} at (2,364) size 244x33 [r=15 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 54x31 - RenderBlock {FORM} at (0,0) size 248x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,399) size 248x27 RenderTableCell {TD} at (2,399) size 244x27 [r=16 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 56x25 - RenderBlock {FORM} at (0,0) size 248x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,428) size 248x17 RenderTableCell {TD} at (2,428) size 244x17 [r=17 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 53x15 - RenderBlock {FORM} at (0,0) size 248x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,447) size 248x31 RenderTableCell {TD} at (2,447) size 244x31 [r=18 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 31x29 - RenderBlock {FORM} at (0,0) size 248x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,480) size 248x17 RenderTableCell {TD} at (2,480) size 244x17 [r=19 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 53x15 @@ -173,79 +173,79 @@ layer at (0,0) size 785x1513 RenderTableCell {TD} at (2,2) size 252x22 [r=0 c=0 rs=1 cs=1] RenderText {#text} at (1,1) size 250x19 text run at (1,1) width 250: "Images with height/width always specified" - RenderBlock {FORM} at (0,0) size 256x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,26) size 256x34 RenderTableCell {TD} at (2,26) size 252x34 [r=1 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 75x32 - RenderBlock {FORM} at (0,0) size 256x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,62) size 256x24 RenderTableCell {TD} at (2,62) size 252x24 [r=2 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 44x22 - RenderBlock {FORM} at (0,0) size 256x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,88) size 256x15 RenderTableCell {TD} at (2,88) size 252x15 [r=3 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 89x13 - RenderBlock {FORM} at (0,0) size 256x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,105) size 256x15 RenderTableCell {TD} at (2,105) size 252x15 [r=4 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 89x13 - RenderBlock {FORM} at (0,0) size 256x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,122) size 256x31 RenderTableCell {TD} at (2,122) size 252x31 [r=5 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 31x29 - RenderBlock {FORM} at (0,0) size 256x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,155) size 256x23 RenderTableCell {TD} at (2,155) size 252x23 [r=6 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 62x21 - RenderBlock {FORM} at (0,0) size 256x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,180) size 256x17 RenderTableCell {TD} at (2,180) size 252x17 [r=7 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 70x15 - RenderBlock {FORM} at (0,0) size 256x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,199) size 256x28 RenderTableCell {TD} at (2,199) size 252x28 [r=8 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 42x26 - RenderBlock {FORM} at (0,0) size 256x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,229) size 256x17 RenderTableCell {TD} at (2,229) size 252x17 [r=9 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 84x15 - RenderBlock {FORM} at (0,0) size 256x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,248) size 256x17 RenderTableCell {TD} at (2,248) size 252x17 [r=10 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 90x15 - RenderBlock {FORM} at (0,0) size 256x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,267) size 256x34 RenderTableCell {TD} at (2,267) size 252x34 [r=11 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 59x32 - RenderBlock {FORM} at (0,0) size 256x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,303) size 256x17 RenderTableCell {TD} at (2,303) size 252x17 [r=12 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 90x15 - RenderBlock {FORM} at (0,0) size 256x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,322) size 256x17 RenderTableCell {TD} at (2,322) size 252x17 [r=13 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 90x15 - RenderBlock {FORM} at (0,0) size 256x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,341) size 256x21 RenderTableCell {TD} at (2,341) size 252x21 [r=14 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 83x19 - RenderBlock {FORM} at (0,0) size 256x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,364) size 256x33 RenderTableCell {TD} at (2,364) size 252x33 [r=15 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 54x31 - RenderBlock {FORM} at (0,0) size 256x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,399) size 256x27 RenderTableCell {TD} at (2,399) size 252x27 [r=16 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 56x25 - RenderBlock {FORM} at (0,0) size 256x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,428) size 256x17 RenderTableCell {TD} at (2,428) size 252x17 [r=17 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 53x15 - RenderBlock {FORM} at (0,0) size 256x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,447) size 256x31 RenderTableCell {TD} at (2,447) size 252x31 [r=18 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 31x29 - RenderBlock {FORM} at (0,0) size 256x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,480) size 256x17 RenderTableCell {TD} at (2,480) size 252x17 [r=19 c=0 rs=1 cs=1] RenderImage {IMG} at (1,1) size 53x15 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla_expected_failures/bugs/bug1725-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla_expected_failures/bugs/bug1725-expected.txt index 8c2ef04..cf7cccf 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla_expected_failures/bugs/bug1725-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla_expected_failures/bugs/bug1725-expected.txt @@ -17,7 +17,7 @@ layer at (0,0) size 800x600 RenderTableCell {TD} at (0,40) size 155x20 [bgcolor=#00FFFF] [r=2 c=0 rs=40 cs=1] RenderText {#text} at (0,0) size 8x19 text run at (0,0) width 8: "3" - RenderBlock {FORM} at (0,0) size 600x0 + RenderBlock {FORM} at (0,0) size 0x0 RenderTableRow {TR} at (0,40) size 600x28 RenderTableCell {TD} at (155,40) size 445x28 [bgcolor=#FFA500] [r=3 c=1 rs=1 cs=1] RenderTable {TABLE} at (0,0) size 440x28 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla_expected_failures/other/test4-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla_expected_failures/other/test4-expected.txt index 06ef6a6..84cd8c9 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla_expected_failures/other/test4-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla_expected_failures/other/test4-expected.txt @@ -416,9 +416,8 @@ layer at (0,0) size 785x2646 RenderTableCell {TD} at (2,2) size 90x15 [r=0 c=0 rs=1 cs=2] RenderText {#text} at (1,1) size 46x13 text run at (1,1) width 46: "FOOTER" - RenderBlock {CAPTION} at (0,0) size 186x20 - RenderText {#text} at (4,0) size 177x19 - text run at (4,0) width 177: "Table 5 has a scrolling tbody." + RenderBlock {CAPTION} at (0,0) size 0x0 + RenderText {#text} at (0,0) size 0x0 RenderBlock (anonymous) at (0,1286) size 769x40 RenderBR {BR} at (0,0) size 0x19 RenderText {#text} at (0,20) size 581x19 diff --git a/webkit/glue/dom_operations.cc b/webkit/glue/dom_operations.cc index d972263..2f178d9 100644 --- a/webkit/glue/dom_operations.cc +++ b/webkit/glue/dom_operations.cc @@ -241,7 +241,7 @@ static bool FillFormToUploadFileImpl(WebCore::HTMLFormElement* fe, // If we found both the file and the submit button, let's submit. if (file_found && submit_found) { - fe->submit(); + fe->submit(0, false, false); } fe->deref(); diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc index 06ecdea..7cd10d6 100644 --- a/webkit/glue/webframe_impl.cc +++ b/webkit/glue/webframe_impl.cc @@ -1624,7 +1624,7 @@ PassRefPtr<Frame> WebFrameImpl::CreateChildFrame( // this child frame. HistoryItem* parent_item = frame_->loader()->currentHistoryItem(); FrameLoadType load_type = frame_->loader()->loadType(); - FrameLoadType child_load_type = WebCore::FrameLoadTypeRedirectWithLockedHistory; + FrameLoadType child_load_type = WebCore::FrameLoadTypeRedirect; KURL new_url = request.resourceRequest().url(); // If we're moving in the backforward list, we might want to replace the @@ -1735,7 +1735,7 @@ bool WebFrameImpl::SetPrintingMode(bool printing, view->setScrollbarModes(WebCore::ScrollbarAuto, WebCore::ScrollbarAuto); } - DCHECK_EQ(frame()->isFrameSet(), false); + DCHECK_EQ(frame()->document()->isFrameSet(), false); SetPrinting(printing, page_width_min, page_width_max); if (!printing) diff --git a/webkit/glue/webplugin_impl.cc b/webkit/glue/webplugin_impl.cc index 4b3cdb7..292ff9e 100644 --- a/webkit/glue/webplugin_impl.cc +++ b/webkit/glue/webplugin_impl.cc @@ -508,6 +508,7 @@ RoutingStatus WebPluginImpl::RouteToFrame(const char *method, loader->loadFrameRequestWithFormAndValues( load_request, false, // lock history + false, // lock back forward list 0, // event 0, // form element HashMap<WebCore::String, WebCore::String>()); diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc index c1ad343..1dda5c1 100644 --- a/webkit/glue/webview_impl.cc +++ b/webkit/glue/webview_impl.cc @@ -831,7 +831,7 @@ void WebViewImpl::Resize(const gfx::Size& new_size) { if (main_frame()->frameview()) { main_frame()->frameview()->resize(size_.width(), size_.height()); - main_frame()->frame()->sendResizeEvent(); + main_frame()->frame()->eventHandler()->sendResizeEvent(); } if (delegate_) { diff --git a/webkit/port/bindings/v8/v8_custom.cpp b/webkit/port/bindings/v8/v8_custom.cpp index c9c9980..38336e8 100644 --- a/webkit/port/bindings/v8/v8_custom.cpp +++ b/webkit/port/bindings/v8/v8_custom.cpp @@ -3097,6 +3097,16 @@ CALLBACK_FUNC_DECL(NodeFilterAcceptNode) { return v8::Undefined(); } +CALLBACK_FUNC_DECL(HTMLFormElementSubmit) { + INC_STATS("DOM.HTMLFormElement.submit()"); + + HTMLFormElement* form = + V8Proxy::DOMWrapperToNative<HTMLFormElement>(args.Holder()); + + form->submit(0, false, false); + return v8::Undefined(); +} + static String EventNameFromAttributeName(const String& name) { ASSERT(name.startsWith("on")); String event_type = name.substring(2); diff --git a/webkit/port/bindings/v8/v8_custom.h b/webkit/port/bindings/v8/v8_custom.h index 125db8e..99eeca3 100644 --- a/webkit/port/bindings/v8/v8_custom.h +++ b/webkit/port/bindings/v8/v8_custom.h @@ -361,6 +361,9 @@ DECLARE_CALLBACK(NodeIteratorPreviousNode) // Custom implementation of NodeFilter function DECLARE_CALLBACK(NodeFilterAcceptNode) +// Custom implementation of HTMLFormElement +DECLARE_CALLBACK(HTMLFormElementSubmit) + DECLARE_INDEXED_PROPERTY_GETTER(DOMStringList) DECLARE_CALLBACK(DOMStringListItem) diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt index e5d3486..ef271a4 100644 --- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt +++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt @@ -1784,3 +1784,20 @@ LINUX WIN : LayoutTests/svg/W3C-SVG-1.1/pservers-grad-06-b.svg = FAIL // ASSERTs in Debug after this change: http://trac.webkit.org/changeset/40372 // Likely will be fixed with subsequent merge. SKIP : LayoutTests/fast/dynamic/insert-before-table-part-in-continuation.html = CRASH + +// New tests added in http://trac.webkit.org/changeset/40424 +LayoutTests/http/tests/history/redirect-js-form-submit-0-seconds.html = FAIL +LayoutTests/http/tests/history/redirect-js-form-submit-2-seconds.html = FAIL +LayoutTests/http/tests/history/redirect-js-form-submit-before-load.html = FAIL + +// Regressions from WebKit merge 40409:40464 +LayoutTests/fast/block/positioning/replaced-inside-fixed-top-bottom.html = FAIL +LayoutTests/http/tests/navigation/location-replace-adds-history-item.html = FAIL +LayoutTests/http/tests/navigation/multiple-back-forward-entries.html = FAIL +LayoutTests/http/tests/navigation/new-window-redirect-history.html = FAIL +LayoutTests/http/tests/navigation/slowtimerredirect-basic.html = FAIL +LayoutTests/http/tests/navigation/timerredirect-basic.html = FAIL +LayoutTests/http/tests/navigation/timerredirect-frames.html = FAIL +LayoutTests/http/tests/navigation/timerredirect-goback.html = FAIL +LayoutTests/http/tests/navigation/timerredirect-subframeload.html = FAIL + diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj index 7aa7945..2006da5 100644 --- a/webkit/webkit.xcodeproj/project.pbxproj +++ b/webkit/webkit.xcodeproj/project.pbxproj @@ -316,7 +316,6 @@ 938444E40F16B0570075F4C5 /* FrameChromium.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41A3624D0F003B3000778012 /* FrameChromium.cpp */; }; 938444E50F16B0570075F4C5 /* FramelessScrollView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93AF52740F002F680073C62D /* FramelessScrollView.cpp */; }; 938444E60F16B0570075F4C5 /* FrameLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E8DAC0D7F3C01001ECF42 /* FrameLoader.cpp */; }; - 938444E70F16B0570075F4C5 /* FrameLoaderClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 416F45210ED7697D008215B6 /* FrameLoaderClient.cpp */; }; 938444E80F16B0570075F4C5 /* FrameTree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E8E590D7F3C48001ECF42 /* FrameTree.cpp */; }; 938444E90F16B0570075F4C5 /* FrameView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E8E5B0D7F3C48001ECF42 /* FrameView.cpp */; }; 938444EA0F16B0570075F4C5 /* FTPDirectoryDocument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E8DB10D7F3C01001ECF42 /* FTPDirectoryDocument.cpp */; }; @@ -1298,6 +1297,7 @@ B58DCCEF0F27DF1400BF697A /* OptionElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B58DCCED0F27DF1400BF697A /* OptionElement.cpp */; }; B590A4E60F27DDAC0058FA26 /* FormControlElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B590A4E50F27DDAC0058FA26 /* FormControlElement.cpp */; }; B5B0D6890EC91D3D00EA3314 /* autofill_form.cc in Sources */ = {isa = PBXBuildFile; fileRef = B5B0D6880EC91D3D00EA3314 /* autofill_form.cc */; }; + D16FD80FC5230DA712974DAF /* RenderObjectChildList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619BC9B49D39DC88F3826A9B /* RenderObjectChildList.cpp */; }; E40054A70E9BC4C20055B38E /* RefCountedLeakCounter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E40054A60E9BC4C20055B38E /* RefCountedLeakCounter.cpp */; }; E40054B10E9BCC5C0055B38E /* CollatorICU.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E40054B00E9BCC5C0055B38E /* CollatorICU.cpp */; }; E40060DB0EA69E0B0055B38E /* ScriptController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E40060DA0EA69E0B0055B38E /* ScriptController.cpp */; }; @@ -1520,7 +1520,6 @@ 410303A10EFB0F8D008832CA /* CachedPage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedPage.h; sourceTree = "<group>"; }; 4112E7040EFB0A26001E0E7A /* RandomNumber.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RandomNumber.h; sourceTree = "<group>"; }; 4112E7050EFB0A26001E0E7A /* RandomNumber.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RandomNumber.cpp; sourceTree = "<group>"; }; - 416F45210ED7697D008215B6 /* FrameLoaderClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FrameLoaderClient.cpp; sourceTree = "<group>"; }; 41807C550F268375007BB4CC /* ByteArray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ByteArray.cpp; sourceTree = "<group>"; }; 41807C560F268375007BB4CC /* ByteArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ByteArray.h; sourceTree = "<group>"; }; 418E48770F166D9A00CF92F9 /* ColorChromium.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ColorChromium.cpp; path = chromium/ColorChromium.cpp; sourceTree = "<group>"; }; @@ -1864,6 +1863,7 @@ 53AAC3820F291F6300233688 /* ThreadableLoaderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadableLoaderClient.h; sourceTree = "<group>"; }; 53AAC3930F291FCF00233688 /* HTTPHeaderMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTTPHeaderMap.cpp; sourceTree = "<group>"; }; 53E8BE8D0EC36F4B00B3F8B0 /* autocomplete_input_listener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = autocomplete_input_listener.h; sourceTree = "<group>"; }; + 619BC9B49D39DC88F3826A9B /* RenderObjectChildList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderObjectChildList.cpp; sourceTree = "<group>"; }; 688FFA9B9CEFE9B1B66F8671 /* V8WebKitCSSMatrix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = V8WebKitCSSMatrix.cpp; sourceTree = "<group>"; }; 6A9898388068C93C5A7C011C /* ThreadTimers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ThreadTimers.cpp; sourceTree = "<group>"; }; 715E874BCC05E0A3DD5E5D8F /* GCController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GCController.cpp; path = port/bindings/v8/extensions/GCController.cpp; sourceTree = SOURCE_ROOT; }; @@ -5540,7 +5540,6 @@ 7B5E8DAB0D7F3C01001ECF42 /* FormState.h */, 7B5E8DAC0D7F3C01001ECF42 /* FrameLoader.cpp */, 7B5E8DAD0D7F3C01001ECF42 /* FrameLoader.h */, - 416F45210ED7697D008215B6 /* FrameLoaderClient.cpp */, 7B5E8DAF0D7F3C01001ECF42 /* FrameLoaderClient.h */, 7B5E8DB00D7F3C01001ECF42 /* FrameLoaderTypes.h */, 7B5E8DB10D7F3C01001ECF42 /* FTPDirectoryDocument.cpp */, @@ -6231,6 +6230,7 @@ 7B5E95680D7F3E95001ECF42 /* RenderMenuList.h */, B5C1809A0E958D81006EAF87 /* RenderObject.h */, B5C1809B0E958D81006EAF87 /* RenderObject.cpp */, + 619BC9B49D39DC88F3826A9B /* RenderObjectChildList.cpp */, 4C04BF9CDE7B0B591087B440 /* RenderObjectChildList.h */, 7B5E956B0D7F3E95001ECF42 /* RenderPart.cpp */, B5C1809D0E958D96006EAF87 /* RenderPart.h */, @@ -8773,7 +8773,6 @@ 938444E40F16B0570075F4C5 /* FrameChromium.cpp in Sources */, 938444E50F16B0570075F4C5 /* FramelessScrollView.cpp in Sources */, 938444E60F16B0570075F4C5 /* FrameLoader.cpp in Sources */, - 938444E70F16B0570075F4C5 /* FrameLoaderClient.cpp in Sources */, 938444E80F16B0570075F4C5 /* FrameTree.cpp in Sources */, 938444E90F16B0570075F4C5 /* FrameView.cpp in Sources */, 938444EA0F16B0570075F4C5 /* FTPDirectoryDocument.cpp in Sources */, @@ -9036,6 +9035,7 @@ 938445E90F16B0570075F4C5 /* RenderMedia.cpp in Sources */, 938445EA0F16B0570075F4C5 /* RenderMenuList.cpp in Sources */, 938445EB0F16B0570075F4C5 /* RenderObject.cpp in Sources */, + D16FD80FC5230DA712974DAF /* RenderObjectChildList.cpp in Sources */, 938445EC0F16B0570075F4C5 /* RenderPart.cpp in Sources */, 938445ED0F16B0570075F4C5 /* RenderPartObject.cpp in Sources */, 938445EE0F16B0570075F4C5 /* RenderPath.cpp in Sources */, |