diff options
| author | mmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-20 19:18:45 +0000 |
|---|---|---|
| committer | mmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-20 19:18:45 +0000 |
| commit | 10f50dec6835c788931faa98888f10168d269e87 (patch) | |
| tree | 5522b55316132d29a6d84dafadff7a1faae2e28b | |
| parent | c3fd33c7c7d807d79914337e9beb805b1bd1f54c (diff) | |
| download | chromium_src-10f50dec6835c788931faa98888f10168d269e87.zip chromium_src-10f50dec6835c788931faa98888f10168d269e87.tar.gz chromium_src-10f50dec6835c788931faa98888f10168d269e87.tar.bz2 | |
* Fix LayoutTests/http/tests/navigation/reloadsubframe-*frame.html on Windows.
WebFrameImpl::CreateChildFrame is based on third_party/WebKit/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp, which is based on WebKit/mac/WebView/WebFrame.mm:_loadURL. WebKit change 31264
(http://trac.webkit.org/changeset/31264/trunk/WebKit/mac/WebView/WebFrame.mm), fixed this bug on Mac, but was never ported to Windows, so webframe_impl.cc didn't get that fix. (FYI, WebFrame.mm:_loadURL has since moved to WebCore/loader/FrameLoader.cpp, with the appropriate changes.)
Note that these layout tests also fail for WebKit on Windows (disabled in LayoutTests/platform/win/Skipped). This same change still needs to be made upstream to WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp.
Review URL: http://codereview.chromium.org/7503
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3619 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/glue/webframe_impl.cc | 1 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_lists/win/tests_fixable.txt | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc index 7d7638a..98bae64 100644 --- a/webkit/glue/webframe_impl.cc +++ b/webkit/glue/webframe_impl.cc @@ -1686,7 +1686,6 @@ void WebFrameImpl::CreateChildFrame(const FrameLoadRequest& r, // Reload will maintain the frame contents, LoadSame will not. if (parentItem && parentItem->children().size() != 0 && (isBackForwardLoadType(loadType) || - loadType == WebCore::FrameLoadTypeReload || loadType == WebCore::FrameLoadTypeReloadAllowingStaleData)) { HistoryItem* childItem = parentItem->childItemWithName(r.frameName()); if (childItem) { diff --git a/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt index a4ff083..239445b 100644 --- a/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt +++ b/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt @@ -905,8 +905,6 @@ V8 | KJS # LayoutTests/fast/transforms/overflow-with-transform.html = FAIL V8 | KJS # LayoutTests/fast/transforms/shadows.html = FAIL V8 | KJS # LayoutTests/http/tests/misc/acid3.html = FAIL V8 | KJS # DEFER : LayoutTests/http/tests/misc/frame-default-enc-same-domain.html = FAIL -V8 | KJS # LayoutTests/http/tests/navigation/reload-subframe-frame.html = FAIL -V8 | KJS # LayoutTests/http/tests/navigation/reload-subframe-iframe.html = FAIL V8 | KJS # LayoutTests/http/tests/security/canvas-remote-read-remote-image.html = FAIL V8 | KJS # LayoutTests/http/tests/security/canvas-remote-read-svg-image.html = FAIL V8 | KJS # LayoutTests/http/tests/security/cross-frame-access-object-prototype.html = FAIL |