Chromium side of merge 40314:40364.

Review URL: http://codereview.chromium.org/19485

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8946 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 52 insertions, 22 deletions

diff --git a/DEPS b/DEPS
index 35e8c6a..315f3d3 100644
--- a/DEPS
+++ b/DEPS
@@ -12,7 +12,7 @@ deps = {
     "http://googletest.googlecode.com/svn/trunk@167",
 
   "src/third_party/WebKit":
-    "/trunk/deps/third_party/WebKit@8907",
+    "/trunk/deps/third_party/WebKit@8945",
 
   "src/third_party/icu38":
     "/trunk/deps/third_party/icu38@7525",
@@ -21,13 +21,13 @@ deps = {
     "http://v8.googlecode.com/svn/trunk@1181",
 
   "src/webkit/data/layout_tests/LayoutTests":
-    "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@40314",
+    "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@40364",
 
   "src/third_party/WebKit/WebKit":
-    "http://svn.webkit.org/repository/webkit/trunk/WebKit@40314",
+    "http://svn.webkit.org/repository/webkit/trunk/WebKit@40364",
 
   "src/third_party/WebKit/WebKitLibraries":
-    "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@40314",
+    "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@40364",
 }
 
 
diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION
index 9aa97db..bb1bb01 100644
--- a/WEBKIT_MERGE_REVISION
+++ b/WEBKIT_MERGE_REVISION
@@ -1 +1 @@
-http://svn.webkit.org/repository/webkit/trunk@40314
\ No newline at end of file
+http://svn.webkit.org/repository/webkit/trunk@40364
\ No newline at end of file
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index 553b45e..9ab98a3 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -631,6 +631,7 @@ input_files = [
     '$WEBCORE_DIR/rendering/RenderInline.cpp',
     '$WEBCORE_DIR/rendering/RenderLayer.cpp',
     '$WEBCORE_DIR/rendering/RenderLegend.cpp',
+    '$WEBCORE_DIR/rendering/RenderLineBoxList.cpp',
     '$WEBCORE_DIR/rendering/RenderListBox.cpp',
     '$WEBCORE_DIR/rendering/RenderListItem.cpp',
     '$WEBCORE_DIR/rendering/RenderListMarker.cpp',
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index d343e99..d41b34d 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -3318,6 +3318,14 @@
 				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderLegend.h"
 				>
 			</File>
+      <File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderLineBoxList.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderLineBoxList.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderListBox.cpp"
 				>
diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc
index fcae8a1..06ecdea 100644
--- a/webkit/glue/webframe_impl.cc
+++ b/webkit/glue/webframe_impl.cc
@@ -1629,30 +1629,16 @@ PassRefPtr<Frame> WebFrameImpl::CreateChildFrame(
 
   // If we're moving in the backforward list, we might want to replace the
   // content of this child frame with whatever was there at that point.
-  // Reload will maintain the frame contents, LoadSame will not.
   if (parent_item && parent_item->children().size() != 0 &&
-      (isBackForwardLoadType(load_type) ||
-       load_type == WebCore::FrameLoadTypeReloadAllowingStaleData)) {
+      isBackForwardLoadType(load_type)) {
     HistoryItem* child_item = parent_item->childItemWithName(request.frameName());
     if (child_item) {
       // Use the original URL to ensure we get all the side-effects, such as
       // onLoad handlers, of any redirects that happened. An example of where
       // this is needed is Radar 3213556.
       new_url = child_item->originalURL();
-
-      // These behaviors implied by these loadTypes should apply to the child
-      // frames
       child_load_type = load_type;
-
-      if (isBackForwardLoadType(load_type)) {
-        // For back/forward, remember this item so we can traverse any child
-        // items as child frames load.
-        child_frame->loader()->setProvisionalHistoryItem(child_item);
-      } else {
-        // For reload, just reinstall the current item, since a new child frame
-        // was created but we won't be creating a new BF item
-        child_frame->loader()->setCurrentHistoryItem(child_item);
-      }
+      child_frame->loader()->setProvisionalHistoryItem(child_item);
     }
   }
 
diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc
index abcc551..c1ad343 100644
--- a/webkit/glue/webview_impl.cc
+++ b/webkit/glue/webview_impl.cc
@@ -1284,7 +1284,7 @@ void WebViewImpl::SetPageEncoding(const std::wstring& encoding_name) {
     // only change override encoding, don't change default encoding
     // TODO(brettw) use std::string for encoding names.
     String new_encoding_name(webkit_glue::StdWStringToString(encoding_name));
-    page_->mainFrame()->loader()->reloadAllowingStaleData(new_encoding_name);
+    page_->mainFrame()->loader()->reloadWithOverrideEncoding(new_encoding_name);
   }
 }
 
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index b09e6cd..71599c9 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -1765,5 +1765,36 @@ WIN : LayoutTests/http/tests/security/originHeader/origin-header-for-https.html
 LINUX WIN : chrome/fast/forms/textarea-metrics.html = FAIL
 WIN : LayoutTests/plugins/embed-attributes-setting.html = FAIL
 
+// Merge 40314:40364 -- new tests that need 
+// layoutTestController.keepWebHistory() implemented.
+LayoutTests/http/tests/history/redirect-meta-refresh-2-seconds.html = FAIL
+LayoutTests/http/tests/history/redirect-307.pl = FAIL
+LayoutTests/http/tests/history/redirect-js-location-assign-before-load.html = FAIL
+LayoutTests/http/tests/history/redirect-js-location-href-0-seconds.html = FAIL
+LayoutTests/http/tests/history/redirect-200-refresh-0-seconds.pl = FAIL
+LayoutTests/http/tests/history/redirect-200-refresh-2-seconds.pl = FAIL
+LayoutTests/http/tests/history/redirect-js-location-href-2-seconds.html = FAIL
+LayoutTests/http/tests/history/redirect-302.pl = FAIL
+LayoutTests/http/tests/history/redirect-js-location-0-seconds.html = FAIL
+LayoutTests/http/tests/history/redirect-js-location-2-seconds.html = FAIL
+LayoutTests/http/tests/history/redirect-js-location-href-before-load.html = FAIL
+LayoutTests/http/tests/history/redirect-js-location-replace-0-seconds.html = FAIL
+LayoutTests/http/tests/history/redirect-js-location-replace-2-seconds.html = FAIL
+LayoutTests/http/tests/history/redirect-js-document-location-0-seconds.html = FAIL
+LayoutTests/http/tests/history/redirect-js-document-location-2-seconds.html = FAIL
+LayoutTests/http/tests/history/redirect-js-location-assign-0-seconds.html = FAIL
+LayoutTests/http/tests/history/redirect-js-location-before-load.html = FAIL
+LayoutTests/http/tests/history/redirect-js-location-assign-2-seconds.html = FAIL
+LayoutTests/http/tests/history/redirect-js-location-replace-before-load.html = FAIL
+LayoutTests/http/tests/history/redirect-301.pl = FAIL
+LayoutTests/http/tests/history/redirect-js-document-location-before-load.html = FAIL
+LayoutTests/http/tests/history/redirect-meta-refresh-0-seconds.html = FAIL
+LayoutTests/http/tests/history/redirect-303.pl = FAIL
+
+// Merge 40314:40364 -- new tests
+LayoutTests/fast/transforms/transform-on-inline.html = FAIL
+LayoutTests/fast/transforms/transform-table-row.html = FAIL
+LayoutTests/editing/spelling/spelling-linebreak.html = FAIL
+
 // Started failng at build 1379 (r8741).  passes locally
 LINUX : LayoutTests/fast/text/cg-fallback-bolding.html = FAIL PASS
diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj
index 6fa7483..e4e41a2 100644
--- a/webkit/webkit.xcodeproj/project.pbxproj
+++ b/webkit/webkit.xcodeproj/project.pbxproj
@@ -46,6 +46,7 @@
 		419E80750F264BBC006564E0 /* CSSPropertyLonghand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 419E80730F264BBC006564E0 /* CSSPropertyLonghand.cpp */; };
 		41DEA0680F27C0F900E40D43 /* BackForwardListChromium.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41DEA0670F27C0F900E40D43 /* BackForwardListChromium.cpp */; };
 		453FFDF935221CD484A3AFED /* Interval.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 35DEC96C125DC674B5C9FA27 /* Interval.cpp */; };
+		489B04B64226A8BC625C0DDB /* RenderLineBoxList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 03F1A9ED31C43E9C91A48AE0 /* RenderLineBoxList.cpp */; };
 		4D114BB60F17F0D5009F37AA /* SkewTransformOperation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3CBAF5FA0EFC893600E752CB /* SkewTransformOperation.cpp */; };
 		4D35557D0ED4ACF600FB28B1 /* dtoa.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D35557B0ED4ACF600FB28B1 /* dtoa.cpp */; };
 		4DB043A40EB1577900A5633C /* webcursor.cc in Sources */ = {isa = PBXBuildFile; fileRef = 825405300D92E3DA0006B936 /* webcursor.cc */; };
@@ -1475,6 +1476,7 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		03F1A9ED31C43E9C91A48AE0 /* RenderLineBoxList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderLineBoxList.cpp; sourceTree = "<group>"; };
 		040BA91E0F0077E800BFA8E5 /* FormDataBuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FormDataBuilder.cpp; sourceTree = "<group>"; };
 		040BA9200F0077EE00BFA8E5 /* FormDataBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FormDataBuilder.h; sourceTree = "<group>"; };
 		04C3AFC20EF1E43D0046D578 /* NavigatorBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NavigatorBase.cpp; sourceTree = "<group>"; };
@@ -6138,6 +6140,7 @@
 			isa = PBXGroup;
 			children = (
 				B5C180A00E958E85006EAF87 /* style */,
+				03F1A9ED31C43E9C91A48AE0 /* RenderLineBoxList.cpp */,
 				7B5E95160D7F3E94001ECF42 /* AutoTableLayout.cpp */,
 				7B5E95170D7F3E94001ECF42 /* AutoTableLayout.h */,
 				B5C180950E958D23006EAF87 /* bidi.cpp */,
@@ -9021,6 +9024,7 @@
 				938445E20F16B0570075F4C5 /* RenderInline.cpp in Sources */,
 				938445E30F16B0570075F4C5 /* RenderLayer.cpp in Sources */,
 				938445E40F16B0570075F4C5 /* RenderLegend.cpp in Sources */,
+				489B04B64226A8BC625C0DDB /* RenderLineBoxList.cpp in Sources */,
 				938445E50F16B0570075F4C5 /* RenderListBox.cpp in Sources */,
 				938445E60F16B0570075F4C5 /* RenderListItem.cpp in Sources */,
 				938445E70F16B0570075F4C5 /* RenderListMarker.cpp in Sources */,