diff options
| -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 |