Chrome side of webkit merge to r40164.

One file added between r40124 and r40164, however, all the worker files
didn't seem to be in the xcode project so I added all of them.
Review URL: http://codereview.chromium.org/18733

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

5 files changed, 61 insertions, 12 deletions

diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index f901c90..fa4d730 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -178,6 +178,7 @@ input_files = [
     '$WEBCORE_DIR/dom/WorkerContext.cpp',
     '$WEBCORE_DIR/dom/WorkerLocation.cpp',
     '$WEBCORE_DIR/dom/WorkerMessagingProxy.cpp',
+    '$WEBCORE_DIR/dom/WorkerRunLoop.cpp',
     '$WEBCORE_DIR/dom/WorkerTask.cpp',
     '$WEBCORE_DIR/dom/WorkerThread.cpp',
     '$WEBCORE_DIR/dom/XMLTokenizer.cpp',
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index 2888166..0e5d893 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -4867,6 +4867,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\dom\WorkerRunLoop.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\dom\WorkerRunLoop.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\third_party\WebKit\WebCore\dom\WorkerTask.cpp"
 				>
 			</File>
diff --git a/webkit/glue/glue_serialize.cc b/webkit/glue/glue_serialize.cc
index dc44c20..ba2d9a9 100644
--- a/webkit/glue/glue_serialize.cc
+++ b/webkit/glue/glue_serialize.cc
@@ -244,14 +244,14 @@ static void WriteHistoryItem(const HistoryItem* item, SerializeObject* obj) {
   WriteInteger(item->scrollPoint().y(), obj);
   WriteBoolean(item->isTargetItem(), obj);
   WriteInteger(item->visitCount(), obj);
-  WriteString(item->rssFeedReferrer(), obj);
+  WriteString(item->referrer(), obj);
 
   WriteStringVector(item->documentState(), obj);
 
   // No access to formData through a const HistoryItem = lame.
   WriteFormData(const_cast<HistoryItem*>(item)->formData(), obj);
   WriteString(item->formContentType(), obj);
-  WriteString(item->formReferrer(), obj);
+  WriteString(item->referrer(), obj);
 
   // Subitems
   WriteInteger(static_cast<int>(item->children().size()), obj);
@@ -282,7 +282,7 @@ static PassRefPtr<HistoryItem> ReadHistoryItem(const SerializeObject* obj) {
   item->setScrollPoint(IntPoint(x, y));
   item->setIsTargetItem(ReadBoolean(obj));
   item->setVisitCount(ReadInteger(obj));
-  item->setRSSFeedReferrer(ReadString(obj));
+  item->setReferrer(ReadString(obj));
 
   Vector<String> document_state;
   ReadStringVector(obj, &document_state);
diff --git a/webkit/glue/glue_serialize_unittest.cc b/webkit/glue/glue_serialize_unittest.cc
index 15664ea..fb48e68 100644
--- a/webkit/glue/glue_serialize_unittest.cc
+++ b/webkit/glue/glue_serialize_unittest.cc
@@ -91,7 +91,6 @@ class GlueSerializeTest : public testing::Test {
     item->setScrollPoint(IntPoint(42, -42));
     item->setIsTargetItem(true);
     item->setVisitCount(42*42);
-    item->setRSSFeedReferrer("rssFeedReferrer");
 
     Vector<String> document_state;
     document_state.append("state1");
@@ -104,11 +103,15 @@ class GlueSerializeTest : public testing::Test {
     if (with_form_data) {
       dummy_request.setHTTPBody(MakeFormData());
       dummy_request.setHTTPContentType("formContentType");
-      dummy_request.setHTTPReferrer("formReferrer");
+      dummy_request.setHTTPReferrer("referrer");
       dummy_request.setHTTPMethod("POST");
     }
     item->setFormInfoFromRequest(dummy_request);
 
+    // Setting the FormInfo causes the referrer to be set, so we set the
+    // referrer after setting the form info.
+    item->setReferrer("referrer");
+
     // Children
     if (pregnant)
       item->addChildItem(MakeHistoryItem(false, false));
@@ -128,14 +131,13 @@ class GlueSerializeTest : public testing::Test {
     EXPECT_EQ(a->scrollPoint(), b->scrollPoint());
     EXPECT_EQ(a->isTargetItem(), b->isTargetItem());
     EXPECT_EQ(a->visitCount(), b->visitCount());
-    EXPECT_EQ(a->rssFeedReferrer(), b->rssFeedReferrer());
+    EXPECT_EQ(a->referrer(), b->referrer());
     EXPECT_EQ(a->documentState(), b->documentState());
 
     // Form Data
     EXPECT_EQ(a->formData() != NULL, b->formData() != NULL);
     if (a->formData() && b->formData())
       EXPECT_EQ(*a->formData(), *b->formData());
-    EXPECT_EQ(a->formReferrer(), b->formReferrer());
     EXPECT_EQ(a->formContentType(), b->formContentType());
 
     // Children
diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj
index c892ac9..300d5ca 100644
--- a/webkit/webkit.xcodeproj/project.pbxproj
+++ b/webkit/webkit.xcodeproj/project.pbxproj
@@ -53,6 +53,13 @@
 		4DB7F55D0E9BD66300C66CE0 /* V8XMLHttpRequestCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DB7F55B0E9BD66300C66CE0 /* V8XMLHttpRequestCustom.cpp */; };
 		4DB7FE770E9BF6D800C66CE0 /* WebSystemInterface.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DB7FE6A0E9BF69A00C66CE0 /* WebSystemInterface.m */; };
 		535EE0C00EC4D10E00939D54 /* clipboard_conversion.cc in Sources */ = {isa = PBXBuildFile; fileRef = 535EE0BE0EC4D10E00939D54 /* clipboard_conversion.cc */; };
+		5379C0CA0F2A841A0092C7DF /* WorkerThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5379C0C90F2A841A0092C7DF /* WorkerThread.cpp */; };
+		5379C0D70F2A845E0092C7DF /* Worker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5379C0CC0F2A845E0092C7DF /* Worker.cpp */; };
+		5379C0D80F2A845E0092C7DF /* WorkerContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5379C0CE0F2A845E0092C7DF /* WorkerContext.cpp */; };
+		5379C0D90F2A845E0092C7DF /* WorkerLocation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5379C0D00F2A845E0092C7DF /* WorkerLocation.cpp */; };
+		5379C0DA0F2A845E0092C7DF /* WorkerMessagingProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5379C0D20F2A845E0092C7DF /* WorkerMessagingProxy.cpp */; };
+		5379C0DB0F2A845E0092C7DF /* WorkerRunLoop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5379C0D40F2A845E0092C7DF /* WorkerRunLoop.cpp */; };
+		5379C0DC0F2A845E0092C7DF /* WorkerTask.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5379C0D60F2A845E0092C7DF /* WorkerTask.cpp */; };
 		538D819B0EC371EA00278C31 /* password_autocomplete_listener.cc in Sources */ = {isa = PBXBuildFile; fileRef = 538D81990EC371EA00278C31 /* password_autocomplete_listener.cc */; };
 		53AAC3700F291E8000233688 /* CanvasPixelArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53AAC36F0F291E8000233688 /* CanvasPixelArray.cpp */; };
 		53AAC37D0F291F0F00233688 /* DocumentThreadableLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53AAC37C0F291F0F00233688 /* DocumentThreadableLoader.cpp */; };
@@ -1620,8 +1627,6 @@
 		4D1641280EC29E80008F024E /* ActiveDOMObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ActiveDOMObject.cpp; sourceTree = "<group>"; };
 		4D1641290EC29E80008F024E /* ActiveDOMObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ActiveDOMObject.h; sourceTree = "<group>"; };
 		4D16412A0EC29E80008F024E /* ContainerNodeAlgorithms.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContainerNodeAlgorithms.h; sourceTree = "<group>"; };
-		4D16412B0EC29E80008F024E /* DedicatedWorker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DedicatedWorker.cpp; sourceTree = "<group>"; };
-		4D16412C0EC29E80008F024E /* DedicatedWorker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DedicatedWorker.h; sourceTree = "<group>"; };
 		4D16412D0EC29E80008F024E /* ElementRareData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ElementRareData.h; sourceTree = "<group>"; };
 		4D16412E0EC29E80008F024E /* NodeWithIndex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NodeWithIndex.h; sourceTree = "<group>"; };
 		4D16412F0EC29E80008F024E /* ScriptExecutionContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptExecutionContext.cpp; sourceTree = "<group>"; };
@@ -1825,6 +1830,20 @@
 		4DDC62B50EAD142D00FB5EBE /* PluginArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginArray.h; sourceTree = "<group>"; };
 		535EE0BE0EC4D10E00939D54 /* clipboard_conversion.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = clipboard_conversion.cc; sourceTree = "<group>"; };
 		535EE0BF0EC4D10E00939D54 /* clipboard_conversion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = clipboard_conversion.h; sourceTree = "<group>"; };
+		5379C0C70F2A840D0092C7DF /* WorkerThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkerThread.h; sourceTree = "<group>"; };
+		5379C0C90F2A841A0092C7DF /* WorkerThread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkerThread.cpp; sourceTree = "<group>"; };
+		5379C0CB0F2A842E0092C7DF /* WorkerTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkerTask.h; sourceTree = "<group>"; };
+		5379C0CC0F2A845E0092C7DF /* Worker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Worker.cpp; sourceTree = "<group>"; };
+		5379C0CD0F2A845E0092C7DF /* Worker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Worker.h; sourceTree = "<group>"; };
+		5379C0CE0F2A845E0092C7DF /* WorkerContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkerContext.cpp; sourceTree = "<group>"; };
+		5379C0CF0F2A845E0092C7DF /* WorkerContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkerContext.h; sourceTree = "<group>"; };
+		5379C0D00F2A845E0092C7DF /* WorkerLocation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkerLocation.cpp; sourceTree = "<group>"; };
+		5379C0D10F2A845E0092C7DF /* WorkerLocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkerLocation.h; sourceTree = "<group>"; };
+		5379C0D20F2A845E0092C7DF /* WorkerMessagingProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkerMessagingProxy.cpp; sourceTree = "<group>"; };
+		5379C0D30F2A845E0092C7DF /* WorkerMessagingProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkerMessagingProxy.h; sourceTree = "<group>"; };
+		5379C0D40F2A845E0092C7DF /* WorkerRunLoop.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkerRunLoop.cpp; sourceTree = "<group>"; };
+		5379C0D50F2A845E0092C7DF /* WorkerRunLoop.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkerRunLoop.h; sourceTree = "<group>"; };
+		5379C0D60F2A845E0092C7DF /* WorkerTask.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkerTask.cpp; sourceTree = "<group>"; };
 		538D81990EC371EA00278C31 /* password_autocomplete_listener.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = password_autocomplete_listener.cc; sourceTree = "<group>"; };
 		538D819A0EC371EA00278C31 /* password_autocomplete_listener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = password_autocomplete_listener.h; sourceTree = "<group>"; };
 		53AAC36F0F291E8000233688 /* CanvasPixelArray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CanvasPixelArray.cpp; sourceTree = "<group>"; };
@@ -4975,8 +4994,6 @@
 				4D16412A0EC29E80008F024E /* ContainerNodeAlgorithms.h */,
 				7B5E89DB0D7F3A7C001ECF42 /* CSSMappedAttributeDeclaration.cpp */,
 				7B5E89DC0D7F3A7C001ECF42 /* CSSMappedAttributeDeclaration.h */,
-				4D16412B0EC29E80008F024E /* DedicatedWorker.cpp */,
-				4D16412C0EC29E80008F024E /* DedicatedWorker.h */,
 				7B5E89DD0D7F3A7C001ECF42 /* DocPtr.h */,
 				7B5E89DE0D7F3A7C001ECF42 /* Document.cpp */,
 				7B5E89DF0D7F3A7C001ECF42 /* Document.h */,
@@ -5112,6 +5129,20 @@
 				4DB7F1020E9BAB5600C66CE0 /* WebKitTransitionEvent.h */,
 				7B5E8A690D7F3A7D001ECF42 /* WheelEvent.cpp */,
 				7B5E8A6A0D7F3A7D001ECF42 /* WheelEvent.h */,
+				5379C0CC0F2A845E0092C7DF /* Worker.cpp */,
+				5379C0CD0F2A845E0092C7DF /* Worker.h */,
+				5379C0CE0F2A845E0092C7DF /* WorkerContext.cpp */,
+				5379C0CF0F2A845E0092C7DF /* WorkerContext.h */,
+				5379C0D00F2A845E0092C7DF /* WorkerLocation.cpp */,
+				5379C0D10F2A845E0092C7DF /* WorkerLocation.h */,
+				5379C0D20F2A845E0092C7DF /* WorkerMessagingProxy.cpp */,
+				5379C0D30F2A845E0092C7DF /* WorkerMessagingProxy.h */,
+				5379C0D40F2A845E0092C7DF /* WorkerRunLoop.cpp */,
+				5379C0D50F2A845E0092C7DF /* WorkerRunLoop.h */,
+				5379C0D60F2A845E0092C7DF /* WorkerTask.cpp */,
+				5379C0CB0F2A842E0092C7DF /* WorkerTask.h */,
+				5379C0C90F2A841A0092C7DF /* WorkerThread.cpp */,
+				5379C0C70F2A840D0092C7DF /* WorkerThread.h */,
 				7B5E8A6C0D7F3A7D001ECF42 /* XMLTokenizer.cpp */,
 				7B5E8A6D0D7F3A7D001ECF42 /* XMLTokenizer.h */,
 				ABBD246C0EB7B1DA00BEC658 /* XMLTokenizerLibxml2.cpp */,
@@ -8826,6 +8857,7 @@
 				9384454C0F16B0570075F4C5 /* HTMLUListElement.cpp in Sources */,
 				9384454D0F16B0570075F4C5 /* HTMLVideoElement.cpp in Sources */,
 				9384454E0F16B0570075F4C5 /* HTMLViewSourceDocument.cpp in Sources */,
+				53AAC3940F291FCF00233688 /* HTTPHeaderMap.cpp in Sources */,
 				9384454F0F16B0570075F4C5 /* HTTPParsers.cpp in Sources */,
 				938445500F16B0570075F4C5 /* IconChromiumMac.cpp in Sources */,
 				938445510F16B0570075F4C5 /* IconDatabaseNone.cpp in Sources */,
@@ -9359,6 +9391,13 @@
 				938447620F16B0570075F4C5 /* WKSpotLightFilter.m in Sources */,
 				938447630F16B0570075F4C5 /* WKTableTransferFilter.m in Sources */,
 				938447640F16B0570075F4C5 /* WorkerNavigator.cpp in Sources */,
+				5379C0CA0F2A841A0092C7DF /* WorkerThread.cpp in Sources */,
+				5379C0D70F2A845E0092C7DF /* Worker.cpp in Sources */,
+				5379C0D80F2A845E0092C7DF /* WorkerContext.cpp in Sources */,
+				5379C0D90F2A845E0092C7DF /* WorkerLocation.cpp in Sources */,
+				5379C0DA0F2A845E0092C7DF /* WorkerMessagingProxy.cpp in Sources */,
+				5379C0DB0F2A845E0092C7DF /* WorkerRunLoop.cpp in Sources */,
+				5379C0DC0F2A845E0092C7DF /* WorkerTask.cpp in Sources */,
 				938447650F16B0570075F4C5 /* WrapContentsInDummySpanCommand.cpp in Sources */,
 				938447660F16B0570075F4C5 /* XMLHttpRequest.cpp in Sources */,
 				938447670F16B0570075F4C5 /* XMLHttpRequestUpload.cpp in Sources */,
@@ -9396,7 +9435,6 @@
 				53AAC3700F291E8000233688 /* CanvasPixelArray.cpp in Sources */,
 				53AAC37D0F291F0F00233688 /* DocumentThreadableLoader.cpp in Sources */,
 				53AAC3800F291F4400233688 /* ThreadableLoader.cpp in Sources */,
-				53AAC3940F291FCF00233688 /* HTTPHeaderMap.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};