Chrome part of WebKit merge 40297:40314

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

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

5 files changed, 19 insertions, 19 deletions

diff --git a/DEPS b/DEPS
index 76d5031..9533986 100644
--- a/DEPS
+++ b/DEPS
@@ -12,7 +12,7 @@ deps = {
     "http://googletest.googlecode.com/svn/trunk@167",
 
   "src/third_party/WebKit":
-    "/trunk/deps/third_party/WebKit@8823",
+    "/trunk/deps/third_party/WebKit@8833",
 
   "src/third_party/icu38":
     "/trunk/deps/third_party/icu38@7525",
@@ -21,13 +21,13 @@ deps = {
     "http://v8.googlecode.com/svn/trunk@1177",
 
   "src/webkit/data/layout_tests/LayoutTests":
-    "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@40297",
+    "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@40314",
 
   "src/third_party/WebKit/WebKit":
-    "http://svn.webkit.org/repository/webkit/trunk/WebKit@40297",
+    "http://svn.webkit.org/repository/webkit/trunk/WebKit@40314",
 
   "src/third_party/WebKit/WebKitLibraries":
-    "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@40297",
+    "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@40314",
 }
 
 
diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION
index 274f04d..9aa97db 100644
--- a/WEBKIT_MERGE_REVISION
+++ b/WEBKIT_MERGE_REVISION
@@ -1 +1 @@
-http://svn.webkit.org/repository/webkit/trunk@40297
\ No newline at end of file
+http://svn.webkit.org/repository/webkit/trunk@40314
\ No newline at end of file
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index 04b4326..553b45e 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -432,7 +432,7 @@ input_files = [
     '$WEBCORE_DIR/platform/DragImage.cpp',
     '$WEBCORE_DIR/platform/FileChooser.cpp',
     '$WEBCORE_DIR/platform/GeolocationService.cpp',
-    '$WEBCORE_DIR/platform/GKURL.cpp',
+    '$WEBCORE_DIR/platform/KURLGoogle.cpp',
     '$WEBCORE_DIR/platform/Length.cpp',
     '$WEBCORE_DIR/platform/LinkHash.cpp',
     '$WEBCORE_DIR/platform/Logging.cpp',
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index 9e87138..d343e99 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -1051,10 +1051,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\platform\GKURL.cpp"
-				>
-			</File>
-			<File
 				RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\GlyphBuffer.h"
 				>
 			</File>
@@ -1067,15 +1063,19 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\platform\GoogleURLPrivate.h"
+				RelativePath="..\..\..\third_party\WebKit\WebCore\platform\HostWindow.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\platform\HostWindow.h"
+				RelativePath="..\..\..\third_party\WebKit\WebCore\platform\KURL.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\platform\KURL.h"
+				RelativePath="..\..\..\third_party\WebKit\WebCore\platform\KURLGoogle.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\platform\KURLGooglePrivate.h"
 				>
 			</File>
 			<File
diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj
index 5f8d6fc..5846fff 100644
--- a/webkit/webkit.xcodeproj/project.pbxproj
+++ b/webkit/webkit.xcodeproj/project.pbxproj
@@ -323,7 +323,7 @@
 		938444ED0F16B0570075F4C5 /* Geolocation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D1640D80EC29BB4008F024E /* Geolocation.cpp */; };
 		938444EE0F16B0570075F4C5 /* GeolocationService.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D1641140EC29D01008F024E /* GeolocationService.cpp */; };
 		938444EF0F16B0570075F4C5 /* Geoposition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D1640DA0EC29BB4008F024E /* Geoposition.cpp */; };
-		938444F00F16B0570075F4C5 /* GKURL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93AF525D0F002E930073C62D /* GKURL.cpp */; };
+		938444F00F16B0570075F4C5 /* KURLGoogle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93AF525D0F002E930073C62D /* KURLGoogle.cpp */; };
 		938444F10F16B0570075F4C5 /* GlyphPageTreeNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E8FDB0D7F3CC1001ECF42 /* GlyphPageTreeNode.cpp */; };
 		938444F20F16B0570075F4C5 /* GlyphPageTreeNodeMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E900F0D7F3CC1001ECF42 /* GlyphPageTreeNodeMac.cpp */; };
 		938444F30F16B0570075F4C5 /* GlyphWidthMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E8FDD0D7F3CC1001ECF42 /* GlyphWidthMap.cpp */; };
@@ -4047,8 +4047,8 @@
 		938444020F16B03C0075F4C5 /* DOMStringList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMStringList.h; sourceTree = "<group>"; };
 		93AF4D040EFAF0090073C62D /* ScrollView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollView.cpp; sourceTree = "<group>"; };
 		93AF52480F001CAB0073C62D /* media_player_private_impl.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = media_player_private_impl.cc; sourceTree = "<group>"; };
-		93AF525D0F002E930073C62D /* GKURL.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GKURL.cpp; sourceTree = "<group>"; };
-		93AF525E0F002E930073C62D /* GoogleURLPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GoogleURLPrivate.h; sourceTree = "<group>"; };
+		93AF525D0F002E930073C62D /* KURLGoogle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KURLGoogle.cpp; sourceTree = "<group>"; };
+		93AF525E0F002E930073C62D /* KURLGooglePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KURLGooglePrivate.h; sourceTree = "<group>"; };
 		93AF52630F002F680073C62D /* ChromiumDataObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ChromiumDataObject.cpp; path = chromium/ChromiumDataObject.cpp; sourceTree = "<group>"; };
 		93AF52640F002F680073C62D /* ChromiumDataObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ChromiumDataObject.h; path = chromium/ChromiumDataObject.h; sourceTree = "<group>"; };
 		93AF52650F002F680073C62D /* ClipboardChromium.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ClipboardChromium.cpp; path = chromium/ClipboardChromium.cpp; sourceTree = "<group>"; };
@@ -5744,8 +5744,8 @@
 				7B5E8FA10D7F3CC1001ECF42 /* FloatConversion.h */,
 				4D1641140EC29D01008F024E /* GeolocationService.cpp */,
 				4D1641150EC29D01008F024E /* GeolocationService.h */,
-				93AF525D0F002E930073C62D /* GKURL.cpp */,
-				93AF525E0F002E930073C62D /* GoogleURLPrivate.h */,
+				93AF525D0F002E930073C62D /* KURLGoogle.cpp */,
+				93AF525E0F002E930073C62D /* KURLGooglePrivate.h */,
 				7B5E8FA20D7F3CC1001ECF42 /* graphics */,
 				4D1641160EC29D01008F024E /* HostWindow.h */,
 				93EF1BD10F214F050070601B /* image-decoders */,
@@ -8778,7 +8778,7 @@
 				938444ED0F16B0570075F4C5 /* Geolocation.cpp in Sources */,
 				938444EE0F16B0570075F4C5 /* GeolocationService.cpp in Sources */,
 				938444EF0F16B0570075F4C5 /* Geoposition.cpp in Sources */,
-				938444F00F16B0570075F4C5 /* GKURL.cpp in Sources */,
+				938444F00F16B0570075F4C5 /* KURLGoogle.cpp in Sources */,
 				938444F10F16B0570075F4C5 /* GlyphPageTreeNode.cpp in Sources */,
 				938444F20F16B0570075F4C5 /* GlyphPageTreeNodeMac.cpp in Sources */,
 				938444F30F16B0570075F4C5 /* GlyphWidthMap.cpp in Sources */,