YAGUB (2/2): Roll DEPS and update vcproj files

This is part two of #6389. We intentionally don't delete the files in pending to let Linux and Mac builds adjust their files. Last to deref the pending files will delete them. It's human-driven ref-counting for files!

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

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

4 files changed, 37 insertions, 37 deletions

diff --git a/DEPS b/DEPS
index 1a2844e..39c48f5 100644
--- a/DEPS
+++ b/DEPS
@@ -12,7 +12,7 @@ deps = {
     "http://googletest.googlecode.com/svn/trunk@63",
 
   "src/third_party/WebKit":
-    "/trunk/deps/third_party/WebKit@3068",
+    "/trunk/deps/third_party/WebKit@3114",
 
   "src/third_party/cygwin":
     "/trunk/deps/third_party/cygwin@3028",
diff --git a/webkit/build/JavaScriptCore/JavaScriptCore_pcre.vcproj b/webkit/build/JavaScriptCore/JavaScriptCore_pcre.vcproj
index f682430..78721ce 100644
--- a/webkit/build/JavaScriptCore/JavaScriptCore_pcre.vcproj
+++ b/webkit/build/JavaScriptCore/JavaScriptCore_pcre.vcproj
@@ -134,7 +134,7 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\pending\pcre_exec.cpp"
+			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\pcre\pcre_exec.cpp"
 			>
 		</File>
 		<File
diff --git a/webkit/build/JavaScriptCore/WTF.vcproj b/webkit/build/JavaScriptCore/WTF.vcproj
index 6de37ee..af8e9d2 100644
--- a/webkit/build/JavaScriptCore/WTF.vcproj
+++ b/webkit/build/JavaScriptCore/WTF.vcproj
@@ -290,7 +290,7 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\pending\wtf\ThreadingWin.cpp"
+			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\ThreadingWin.cpp"
 			>
 		</File>
 		<File
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index 5131ae5b..ad913c7 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -366,11 +366,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\pending\Page.cpp"
+				RelativePath="..\..\..\third_party\WebKit\WebCore\page\Page.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\pending\Page.h"
+				RelativePath="..\..\..\third_party\WebKit\WebCore\page\Page.h"
 				>
 			</File>
 			<File
@@ -394,11 +394,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\pending\Settings.cpp"
+				RelativePath="..\..\..\third_party\WebKit\WebCore\page\Settings.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\pending\Settings.h"
+				RelativePath="..\..\..\third_party\WebKit\WebCore\page\Settings.h"
 				>
 			</File>
 			<File
@@ -694,11 +694,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\pending\TextResourceDecoder.cpp"
+				RelativePath="..\..\..\third_party\WebKit\WebCore\loader\TextResourceDecoder.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\pending\TextResourceDecoder.h"
+				RelativePath="..\..\..\third_party\WebKit\WebCore\loader\TextResourceDecoder.h"
 				>
 			</File>
 			<Filter
@@ -894,11 +894,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\pending\KURL.cpp"
+				RelativePath="..\..\..\third_party\WebKit\WebCore\platform\KURL.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\pending\KURL.h"
+				RelativePath="..\..\..\third_party\WebKit\WebCore\platform\KURL.h"
 				>
 			</File>
 			<File
@@ -1249,11 +1249,11 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\pending\SimpleFontData.cpp"
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\SimpleFontData.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\pending\SimpleFontData.h"
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\SimpleFontData.h"
 					>
 				</File>
 			</Filter>
@@ -1489,7 +1489,7 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\pending\TextCodecICU.cpp"
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\text\TextCodecICU.cpp"
 					>
 				</File>
 				<File
@@ -2258,11 +2258,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\pending\RenderButton.cpp"
+				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderButton.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\pending\RenderButton.h"
+				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderButton.h"
 				>
 			</File>
 			<File
@@ -2418,11 +2418,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\pending\RenderMenuList.cpp"
+				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderMenuList.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\pending\RenderMenuList.h"
+				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderMenuList.h"
 				>
 			</File>
 			<File
@@ -2442,7 +2442,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\pending\RenderPartObject.cpp"
+				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderPartObject.cpp"
 				>
 			</File>
 			<File
@@ -2622,7 +2622,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\pending\RenderText.cpp"
+				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderText.cpp"
 				>
 			</File>
 			<File
@@ -2630,7 +2630,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\pending\RenderTextControl.cpp"
+				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderTextControl.cpp"
 				>
 			</File>
 			<File
@@ -2838,11 +2838,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\pending\XMLHttpRequest.cpp"
+				RelativePath="..\..\..\third_party\WebKit\WebCore\xml\XMLHttpRequest.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\pending\XMLHttpRequest.h"
+				RelativePath="..\..\..\third_party\WebKit\WebCore\xml\XMLHttpRequest.h"
 				>
 			</File>
 			<File
@@ -2990,7 +2990,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\pending\XSLImportRule.cpp"
+				RelativePath="..\..\..\third_party\WebKit\WebCore\xml\XSLImportRule.cpp"
 				>
 			</File>
 			<File
@@ -2998,11 +2998,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\pending\XSLStyleSheet.cpp"
+				RelativePath="..\..\..\third_party\WebKit\WebCore\xml\XSLStyleSheet.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\pending\XSLStyleSheet.h"
+				RelativePath="..\..\..\third_party\WebKit\WebCore\xml\XSLStyleSheet.h"
 				>
 			</File>
 			<File
@@ -3382,27 +3382,27 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\pending\NodeFilter.cpp"
+				RelativePath="..\..\..\third_party\WebKit\WebCore\dom\NodeFilter.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\pending\NodeFilter.h"
+				RelativePath="..\..\..\third_party\WebKit\WebCore\dom\NodeFilter.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\pending\NodeFilterCondition.cpp"
+				RelativePath="..\..\..\third_party\WebKit\WebCore\dom\NodeFilterCondition.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\pending\NodeFilterCondition.h"
+				RelativePath="..\..\..\third_party\WebKit\WebCore\dom\NodeFilterCondition.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\pending\NodeIterator.cpp"
+				RelativePath="..\..\..\third_party\WebKit\WebCore\dom\NodeIterator.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\pending\NodeIterator.h"
+				RelativePath="..\..\..\third_party\WebKit\WebCore\dom\NodeIterator.h"
 				>
 			</File>
 			<File
@@ -3554,19 +3554,19 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\pending\Traversal.cpp"
+				RelativePath="..\..\..\third_party\WebKit\WebCore\dom\Traversal.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\pending\Traversal.h"
+				RelativePath="..\..\..\third_party\WebKit\WebCore\dom\Traversal.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\pending\TreeWalker.cpp"
+				RelativePath="..\..\..\third_party\WebKit\WebCore\dom\TreeWalker.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\pending\TreeWalker.h"
+				RelativePath="..\..\..\third_party\WebKit\WebCore\dom\TreeWalker.h"
 				>
 			</File>
 			<File
@@ -3902,7 +3902,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\pending\Selection.cpp"
+				RelativePath="..\..\..\third_party\WebKit\WebCore\editing\Selection.cpp"
 				>
 			</File>
 			<File