WebKit merge 41498:41530.

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

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

8 files changed, 20 insertions, 2 deletions

diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index 0bcbf46..abce154 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -684,6 +684,7 @@ input_files = [
     '$WEBCORE_DIR/rendering/RenderWidget.cpp',
     '$WEBCORE_DIR/rendering/RenderWordBreak.cpp',
     '$WEBCORE_DIR/rendering/RootInlineBox.cpp',
+    '$WEBCORE_DIR/rendering/ScrollBehavior.cpp',
     '$WEBCORE_DIR/rendering/SVGCharacterLayoutInfo.cpp',
     '$WEBCORE_DIR/rendering/SVGInlineFlowBox.cpp',
     '$WEBCORE_DIR/rendering/SVGInlineTextBox.cpp',
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index 258c468..9f2040b 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -3793,6 +3793,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\ScrollBehavior.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\ScrollBehavior.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\TableLayout.h"
 				>
 			</File>
diff --git a/webkit/glue/editor_client_impl.cc b/webkit/glue/editor_client_impl.cc
index 3c25b5a..6355d5b 100644
--- a/webkit/glue/editor_client_impl.cc
+++ b/webkit/glue/editor_client_impl.cc
@@ -23,6 +23,7 @@ MSVC_PUSH_WARNING_LEVEL(0);
 #include "KeyboardEvent.h"
 #include "PlatformKeyboardEvent.h"
 #include "PlatformString.h"
+#include "RenderObject.h"
 MSVC_POP_WARNING();
 
 #include "WebKit.h"
diff --git a/webkit/glue/searchable_form_data.cc b/webkit/glue/searchable_form_data.cc
index 71453cf..93a1f94 100644
--- a/webkit/glue/searchable_form_data.cc
+++ b/webkit/glue/searchable_form_data.cc
@@ -7,6 +7,7 @@
 #include "base/compiler_specific.h"
 
 MSVC_PUSH_WARNING_LEVEL(0);
+#include "CSSHelper.h"
 #include "CString.h"
 #include "Document.h"
 #include "DocumentLoader.h"
@@ -296,7 +297,7 @@ WebCore::HTMLInputElement* GetTextElement(
 } // namespace
 
 SearchableFormData* SearchableFormData::Create(WebCore::Element* element) {
-	if (!element->isFormControlElement() || !element->isHTMLElement()) {
+  if (!element->isFormControlElement() || !element->isHTMLElement()) {
     return NULL;
   }
 
diff --git a/webkit/glue/webframeloaderclient_impl.cc b/webkit/glue/webframeloaderclient_impl.cc
index 2207fca..81dcc1d 100644
--- a/webkit/glue/webframeloaderclient_impl.cc
+++ b/webkit/glue/webframeloaderclient_impl.cc
@@ -1218,7 +1218,9 @@ void WebFrameLoaderClient::frameLoadCompleted() {
   // Note: Can be called multiple times.
   // Even if already complete, we might have set a previous item on a frame that
   // didn't do any data loading on the past transaction. Make sure to clear these out.
-  webframe_->frame()->loader()->setPreviousHistoryItem(0);
+
+  // FIXME: setPreviousHistoryItem() no longer exists. http://crbug.com/8566
+  // webframe_->frame()->loader()->setPreviousHistoryItem(0);
 }
 
 void WebFrameLoaderClient::saveViewStateToItem(HistoryItem*) {
diff --git a/webkit/port/bindings/v8/v8_proxy.cpp b/webkit/port/bindings/v8/v8_proxy.cpp
index e4ccb5b..163f1c5 100644
--- a/webkit/port/bindings/v8/v8_proxy.cpp
+++ b/webkit/port/bindings/v8/v8_proxy.cpp
@@ -132,6 +132,8 @@
 #include "Settings.h"
 #include "StyleSheet.h"
 #include "StyleSheetList.h"
+#include "SVGColor.h"
+#include "SVGPaint.h"
 #include "TextEvent.h"
 #include "TextMetrics.h"
 #include "TimeRanges.h"
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 51d19bf..d1996c4 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -124,6 +124,7 @@ DEFER : LayoutTests/fast/repaint/bugzilla-6473.html = PASS FAIL
 
 // Worker related tests (ENABLE_WORKERS):
 DEFER SKIP : LayoutTests/fast/workers = TIMEOUT FAIL
+DEFER SKIP : LayoutTests/http/tests/workers = TIMEOUT FAIL
 DEFER SKIP : LayoutTests/http/tests/xmlhttprequest/workers = TIMEOUT
 DEFER: LayoutTests/fast/events/dispatchEvent-crash.html = FAIL
 
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index de36f17..7f215d0 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -3207,6 +3207,8 @@
         '../third_party/WebKit/WebCore/rendering/RenderWordBreak.h',
         '../third_party/WebKit/WebCore/rendering/RootInlineBox.cpp',
         '../third_party/WebKit/WebCore/rendering/RootInlineBox.h',
+        '../third_party/WebKit/WebCore/rendering/ScrollBehavior.cpp',
+        '../third_party/WebKit/WebCore/rendering/ScrollBehavior.h',
         '../third_party/WebKit/WebCore/rendering/SVGCharacterLayoutInfo.cpp',
         '../third_party/WebKit/WebCore/rendering/SVGCharacterLayoutInfo.h',
         '../third_party/WebKit/WebCore/rendering/SVGInlineFlowBox.cpp',