Revert merge (revision 11400) to test impact on page cycler perf.

TBR=jar

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

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

7 files changed, 26 insertions, 46 deletions

diff --git a/DEPS b/DEPS
index fbc418b..6b546c1 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
 vars = {
   "webkit_trunk":
     "http://svn.webkit.org/repository/webkit/trunk",
-  "webkit_revision": "41559",
+  "webkit_revision": "41530",
 }
 
 
@@ -19,7 +19,7 @@ deps = {
     "http://googletest.googlecode.com/svn/trunk@167",
 
   "src/third_party/WebKit":
-    "/trunk/deps/third_party/WebKit@11399",
+    "/trunk/deps/third_party/WebKit@11353",
 
   "src/third_party/icu38":
     "/trunk/deps/third_party/icu38@11389",
diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION
index c7d3fef..3bf856f 100644
--- a/WEBKIT_MERGE_REVISION
+++ b/WEBKIT_MERGE_REVISION
@@ -1 +1 @@
-http://svn.webkit.org/repository/webkit/trunk@41559
\ No newline at end of file
+http://svn.webkit.org/repository/webkit/trunk@41530
\ No newline at end of file
diff --git a/webkit/build/JavaScriptCore/SConscript b/webkit/build/JavaScriptCore/SConscript
index 08c577c..b8c612c 100644
--- a/webkit/build/JavaScriptCore/SConscript
+++ b/webkit/build/JavaScriptCore/SConscript
@@ -149,6 +149,7 @@ wtf_inputs = [
     '$WTF_DIR/ByteArray.cpp',
     '$WTF_DIR/Assertions.cpp',
     '$WTF_DIR/chromium/MainThreadChromium.cpp',
+    '$WTF_DIR/CurrentTime.cpp',
     '$WTF_DIR/dtoa.cpp',
     '$WTF_DIR/FastMalloc.cpp',
     '$WTF_DIR/HashTable.cpp',
diff --git a/webkit/build/JavaScriptCore/WTF.vcproj b/webkit/build/JavaScriptCore/WTF.vcproj
index 77bc8ef..502ca67 100644
--- a/webkit/build/JavaScriptCore/WTF.vcproj
+++ b/webkit/build/JavaScriptCore/WTF.vcproj
@@ -170,10 +170,6 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\CrossThreadRefCounted.h"
-			>
-		</File>
-		<File
 			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\CurrentTime.h"
 			>
 		</File>
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index ee72102..abce154 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -342,8 +342,6 @@ input_files = [
     '$WEBCORE_DIR/loader/CachedScript.cpp',
     '$WEBCORE_DIR/loader/CachedXBLDocument.cpp',
     '$WEBCORE_DIR/loader/CachedXSLStyleSheet.cpp',
-    '$WEBCORE_DIR/loader/CrossOriginAccessControl.cpp',
-    '$WEBCORE_DIR/loader/CrossOriginPreflightResultCache.cpp',
     '$WEBCORE_DIR/loader/DocLoader.cpp',
     '$WEBCORE_DIR/loader/DocumentLoader.cpp',
     '$WEBCORE_DIR/loader/DocumentThreadableLoader.cpp',
@@ -589,6 +587,7 @@ input_files = [
     '$WEBCORE_DIR/platform/text/TextCodecLatin1.cpp',
     '$WEBCORE_DIR/platform/text/TextCodecUserDefined.cpp',
     '$WEBCORE_DIR/platform/text/TextCodecUTF16.cpp',
+    '$WEBCORE_DIR/platform/text/TextDecoder.cpp',
     '$WEBCORE_DIR/platform/text/TextEncoding.cpp',
     '$WEBCORE_DIR/platform/text/TextEncodingRegistry.cpp',
     '$WEBCORE_DIR/platform/text/TextStream.cpp',
@@ -887,7 +886,6 @@ input_files = [
 
     '$WEBCORE_DIR/workers/Worker.cpp',
     '$WEBCORE_DIR/workers/WorkerContext.cpp',
-    '$WEBCORE_DIR/workers/WorkerImportScriptsClient.cpp',
     '$WEBCORE_DIR/workers/WorkerLocation.cpp',
     '$WEBCORE_DIR/workers/WorkerMessagingProxy.cpp',
     '$WEBCORE_DIR/workers/WorkerRunLoop.cpp',
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index 9e58f3c..9f2040b 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -673,22 +673,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\loader\CrossOriginAccessControl.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\loader\CrossOriginAccessControl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\loader\CrossOriginPreflightResultCache.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\loader\CrossOriginPreflightResultCache.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\..\third_party\WebKit\WebCore\loader\DocLoader.cpp"
 				>
 			</File>
@@ -2128,6 +2112,14 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\text\TextDecoder.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\text\TextDecoder.h"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\text\TextDirection.h"
 					>
 				</File>
@@ -3753,14 +3745,6 @@
 				>
 			</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\SVGCharacterLayoutInfo.cpp"
 				>
 			</File>
@@ -3809,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>
@@ -7445,14 +7437,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\workers\WorkerImportScriptsClient.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\workers\WorkerImportScriptsClient.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\..\third_party\WebKit\WebCore\workers\WorkerLocation.cpp"
 				>
 			</File>
diff --git a/webkit/glue/webtextinput_impl.cc b/webkit/glue/webtextinput_impl.cc
index e169dbd..3155863 100644
--- a/webkit/glue/webtextinput_impl.cc
+++ b/webkit/glue/webtextinput_impl.cc
@@ -112,8 +112,8 @@ void WebTextInputImpl::MarkedRange(std::string* range_str) {
 
   // Range::toString() returns a string different from what test expects.
   // So we need to construct the string ourselves.
-  SStringPrintf(range_str, "%d,%d", range->startPosition().m_offset,
-                range->endPosition().m_offset);
+  SStringPrintf(range_str, "%d,%d", range->startPosition().offset(),
+                range->endPosition().offset());
 }
 
 void WebTextInputImpl::SelectedRange(std::string* range_str) {
@@ -122,8 +122,8 @@ void WebTextInputImpl::SelectedRange(std::string* range_str) {
 
   // Range::toString() returns a string different from what test expects.
   // So we need to construct the string ourselves.
-  SStringPrintf(range_str, "%d,%d", range.get()->startPosition().m_offset,
-                range.get()->endPosition().m_offset);
+  SStringPrintf(range_str, "%d,%d", range.get()->startPosition().offset(),
+                range.get()->endPosition().offset());
 }
 
 void WebTextInputImpl::FirstRectForCharacterRange(int32_t location,
@@ -153,3 +153,4 @@ void WebTextInputImpl::DeleteToEndOfParagraph() {
                                 false);
   }
 }
+