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

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

5 files changed, 17 insertions, 70 deletions

diff --git a/DEPS b/DEPS
index 1edb796..f0c0bd6 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@3686",
+    "/trunk/deps/third_party/WebKit@3731",
 
   "src/third_party/cygwin":
     "/trunk/deps/third_party/cygwin@3248",
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index 7a41044..2a5b89f 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -362,6 +362,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\page\Location.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\third_party\WebKit\WebCore\page\MouseEventWithHitTestResults.cpp"
 				>
 			</File>
@@ -369,7 +373,7 @@
 				RelativePath="..\..\..\third_party\WebKit\WebCore\page\MouseEventWithHitTestResults.h"
 				>
 			</File>
-						<File
+			<File
 				RelativePath="..\..\..\third_party\WebKit\WebCore\page\Navigator.cpp"
 				>
 			</File>
diff --git a/webkit/build/port/port.vcproj b/webkit/build/port/port.vcproj
index 6be5a6a..752088a 100644
--- a/webkit/build/port/port.vcproj
+++ b/webkit/build/port/port.vcproj
@@ -164,10 +164,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\port\page\Location.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\port\dom\ScheduledAction.h"
 				>
 			</File>
diff --git a/webkit/port/page/Location.cpp b/webkit/port/page/Location.cpp
index 9933287..6757b78 100644
--- a/webkit/port/page/Location.cpp
+++ b/webkit/port/page/Location.cpp
@@ -35,6 +35,7 @@
 #include "FrameLoader.h"
 #include "ScriptController.h"
 #include "CSSHelper.h"
+#include "Frame.h"
 
 namespace {
 
@@ -75,6 +76,16 @@ namespace WebCore {
   //    isSafeScript()
 #endif
 
+Location::Location(Frame* frame)
+    : m_frame(frame)
+{
+}
+
+void Location::disconnectFrame()
+{
+    m_frame = 0;
+}
+
 String Location::hash() const {
   if (!m_frame)
     return String();
diff --git a/webkit/port/page/Location.h b/webkit/port/page/Location.h
deleted file mode 100644
index 66ce396..0000000
--- a/webkit/port/page/Location.h
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-
-#ifndef Location_h
-#define Location_h
-
-#include <wtf/RefCounted.h>
-#include "Frame.h"
-
-namespace WebCore {
-
-class Location : public RefCounted<Location> {
- public:
-  static PassRefPtr<Location> create(Frame* frame)
-  {
-    return adoptRef(new Location(frame));
-  }
-
-  Frame* frame() { return m_frame; }
-
-  String protocol() const;
-  String host() const;
-  String hostname() const;
-  String port() const;
-  String pathname() const;
-  String search() const;
-  String hash() const;
-  String href() const;
-
-  String toString() const;  
-
-#if USE(V8)
-  void setHash(const String& str);
-  void setHost(const String& str);
-  void setHostname(const String&);
-  void setHref(const String&);
-  void setPathname(const String&);
-  void setPort(const String&);
-  void setProtocol(const String&);
-  void setSearch(const String&);
-
-  void reload(bool forceget);
-  void replace(const String& url);
-  void assign(const String& url);
-#endif
-
-  void disconnectFrame() { m_frame = 0; }
-
- private:
-  Location(Frame* frame) : m_frame(frame) { }
-
-  Frame* m_frame;
-
-#if USE(V8)
-  friend class WindowV8;
-#endif
-};
-
-}  // namespace WebCore
-
-#endif // Location_h
-