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
excellent-media · Mar 11, 2009 · 58eb89c · 58eb89c
1 parent 67adc80
commit 58eb89c
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 46 deletions.
diff --git 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
@@ -1 +1 @@
-http://svn.webkit.org/repository/webkit/trunk@41559
+http://svn.webkit.org/repository/webkit/trunk@41530
diff --git 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
@@ -169,10 +169,6 @@
 			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\unicode\icu\CollatorICU.cpp"
 			>
 		</File>
-		<File
-			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\CrossThreadRefCounted.h"
-			>
-		</File>
 		<File
 			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\CurrentTime.h"
 			>

diff --git 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
@@ -672,22 +672,6 @@
 				RelativePath="..\..\..\third_party\WebKit\WebCore\loader\CachePolicy.h"
 				>
 			</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"
 				>
@@ -2127,6 +2111,14 @@
 					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\text\TextCodecUTF16.h"
 					>
 				</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"
 					>
@@ -3752,14 +3744,6 @@
 				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RootInlineBox.h"
 				>
 			</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"
 				>
@@ -3808,6 +3792,14 @@
 				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\SVGRootInlineBox.h"
 				>
 			</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"
 				>
@@ -7444,14 +7436,6 @@
 				RelativePath="..\..\..\third_party\WebKit\WebCore\workers\WorkerContextProxy.h"
 				>
 			</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"
 				>

diff --git 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);
   }
 }
+
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		http://svn.webkit.org/repository/webkit/trunk@41559
		http://svn.webkit.org/repository/webkit/trunk@41530
-Original file line number
+Diff line change
@@ Expand Up / @@ -169,10 +169,6 @@ @@
     			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\unicode\icu\CollatorICU.cpp"
     			>
     		</File>
-    		<File
-    			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\CrossThreadRefCounted.h"
-    			>
-    		</File>
     		<File
     			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\CurrentTime.h"
     			>
@@ Expand Down @@