Remove webkit/glue/glue_util.{h,cc} now that the WebKit API is complete!

R=jorlow
BUG=24607
TEST=none

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

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

3 files changed, 0 insertions, 550 deletions

diff --git a/webkit/glue/glue_util.cc b/webkit/glue/glue_util.cc
deleted file mode 100644
index 3e61944..0000000
--- a/webkit/glue/glue_util.cc
+++ /dev/null
@@ -1,359 +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.
-
-// TODO(darin): This file will be deleted once we complete the move to
-// third_party/WebKit/WebKit/chromium
-
-// In this file, we pretend to be part of the WebKit implementation.
-// This is just a temporary hack while glue is still being moved into
-// third_party/WebKit/WebKit/chromium.
-#define WEBKIT_IMPLEMENTATION 1
-
-#include "config.h"
-#include "webkit/glue/glue_util.h"
-
-#include <string>
-
-#include "AccessibilityObject.h"
-#include "ChromiumDataObject.h"
-#include "CString.h"
-#include "HistoryItem.h"
-#include "HTMLFormElement.h"
-#include "IntPoint.h"
-#include "IntRect.h"
-#include "KURL.h"
-#include "Node.h"
-#include "PlatformString.h"
-#include "Range.h"
-#include "ResourceError.h"
-#include "SecurityOrigin.h"
-
-#undef LOG
-#include "base/compiler_specific.h"
-#include "base/gfx/rect.h"
-#include "base/string_piece.h"
-#include "base/string_util.h"
-#include "base/sys_string_conversions.h"
-#include "googleurl/src/gurl.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebAccessibilityObject.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebCursorInfo.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebDragData.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebFormElement.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebHistoryItem.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebNode.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebPoint.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebRange.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebRect.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebSecurityOrigin.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebSize.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebString.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebURL.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebURLError.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebURLRequest.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebURLResponse.h"
-
-namespace webkit_glue {
-
-// String conversions ----------------------------------------------------------
-
-std::string CStringToStdString(const WebCore::CString& str) {
-  const char* chars = str.data();
-  return std::string(chars ? chars : "", str.length());
-}
-
-WebCore::CString StdStringToCString(const std::string& str) {
-  return WebCore::CString(str.data(), str.size());
-}
-
-std::wstring StringToStdWString(const WebCore::String& str) {
-  const UChar* chars = str.characters();
-#if defined(WCHAR_T_IS_UTF16)
-  return std::wstring(chars ? chars : L"", str.length());
-#elif defined(WCHAR_T_IS_UTF32)
-  string16 str16(chars ? chars : reinterpret_cast<const char16 *>(L""),
-                                 str.length());
-  return UTF16ToWide(str16);
-#endif
-}
-
-string16 StringToString16(const WebCore::String& str) {
-  const UChar* chars = str.characters();
-  return string16(chars ? chars : (UChar *)L"", str.length());
-}
-
-WebCore::String String16ToString(const string16& str) {
-  return WebCore::String(reinterpret_cast<const UChar*>(str.data()),
-                         str.length());
-}
-
-std::string StringToStdString(const WebCore::String& str) {
-  std::string ret;
-  if (!str.isNull())
-    UTF16ToUTF8(str.characters(), str.length(), &ret);
-  return ret;
-}
-
-WebCore::String StdWStringToString(const std::wstring& str) {
-#if defined(WCHAR_T_IS_UTF16)
-  return WebCore::String(str.data(), static_cast<unsigned>(str.length()));
-#elif defined(WCHAR_T_IS_UTF32)
-  string16 str16 = WideToUTF16(str);
-  return WebCore::String(str16.data(), static_cast<unsigned>(str16.length()));
-#endif
-}
-
-WebCore::String StdStringToString(const std::string& str) {
-  return WebCore::String::fromUTF8(str.data(),
-                                   static_cast<unsigned>(str.length()));
-}
-
-WebKit::WebString StringToWebString(const WebCore::String& str) {
-  return str;
-}
-
-WebCore::String WebStringToString(const WebKit::WebString& str) {
-  return str;
-}
-
-WebKit::WebCString CStringToWebCString(const WebCore::CString& str) {
-  return str;
-}
-
-WebCore::CString WebCStringToCString(const WebKit::WebCString& str) {
-  return str;
-}
-
-WebKit::WebString StdStringToWebString(const std::string& str) {
-  return WebKit::WebString::fromUTF8(str.data(), str.size());
-}
-
-std::string WebStringToStdString(const WebKit::WebString& str) {
-  std::string ret;
-  if (!str.isNull())
-    UTF16ToUTF8(str.data(), str.length(), &ret);
-  return ret;
-}
-
-WebKit::WebData SharedBufferToWebData(
-    const WTF::PassRefPtr<WebCore::SharedBuffer>& buf) {
-  return buf;
-}
-
-WTF::PassRefPtr<WebCore::SharedBuffer> WebDataToSharedBuffer(
-    const WebKit::WebData& data) {
-  return data;
-}
-
-FilePath::StringType StringToFilePathString(const WebCore::String& str) {
-#if defined(OS_WIN)
-  return StringToStdWString(str);
-#elif defined(OS_POSIX)
-  return base::SysWideToNativeMB(StringToStdWString(str));
-#endif
-}
-
-WebCore::String FilePathStringToString(const FilePath::StringType& str) {
-#if defined(OS_WIN)
-  return StdWStringToString(str);
-#elif defined(OS_POSIX)
-  return StdWStringToString(base::SysNativeMBToWide(str));
-#endif
-}
-
-// URL conversions -------------------------------------------------------------
-
-GURL KURLToGURL(const WebCore::KURL& url) {
-#if USE(GOOGLEURL)
-  const WebCore::CString& spec = url.utf8String();
-  if (spec.isNull() || 0 == spec.length())
-    return GURL();
-  return GURL(spec.data(), spec.length(), url.parsed(), url.isValid());
-#else
-  return StringToGURL(url.string());
-#endif
-}
-
-WebCore::KURL GURLToKURL(const GURL& url) {
-  const std::string& spec = url.possibly_invalid_spec();
-#if USE(GOOGLEURL)
-  // Convert using the internal structures to avoid re-parsing.
-  return WebCore::KURL(WebCore::CString(spec.c_str(),
-                                        static_cast<unsigned>(spec.length())),
-                       url.parsed_for_possibly_invalid_spec(), url.is_valid());
-#else
-  return WebCore::KURL(StdWStringToString(UTF8ToWide(spec)));
-#endif
-}
-
-GURL StringToGURL(const WebCore::String& spec) {
-  return GURL(WideToUTF8(StringToStdWString(spec)));
-}
-
-WebKit::WebURL KURLToWebURL(const WebCore::KURL& url) {
-  return url;
-}
-
-WebCore::KURL WebURLToKURL(const WebKit::WebURL& url) {
-  return url;
-}
-
-// Rect conversions ------------------------------------------------------------
-
-gfx::Rect FromIntRect(const WebCore::IntRect& r) {
-    return gfx::Rect(r.x(), r.y(), r.width() < 0 ? 0 : r.width(),
-        r.height() < 0 ? 0 : r.height());
-}
-
-WebCore::IntRect ToIntRect(const gfx::Rect& r) {
-  return WebCore::IntRect(r.x(), r.y(), r.width(), r.height());
-}
-
-// Point conversions -----------------------------------------------------------
-
-WebCore::IntPoint WebPointToIntPoint(const WebKit::WebPoint& point) {
-  return point;
-}
-
-WebKit::WebPoint IntPointToWebPoint(const WebCore::IntPoint& point) {
-  return point;
-}
-
-// Rect conversions ------------------------------------------------------------
-
-WebCore::IntRect WebRectToIntRect(const WebKit::WebRect& rect) {
-  return rect;
-}
-
-WebKit::WebRect IntRectToWebRect(const WebCore::IntRect& rect) {
-  return rect;
-}
-
-// Size conversions ------------------------------------------------------------
-
-WebCore::IntSize WebSizeToIntSize(const WebKit::WebSize& size) {
-  return size;
-}
-
-WebKit::WebSize IntSizeToWebSize(const WebCore::IntSize& size) {
-  return size;
-}
-
-// Cursor conversions ----------------------------------------------------------
-
-WebKit::WebCursorInfo CursorToWebCursorInfo(const WebCore::Cursor& cursor) {
-  return WebKit::WebCursorInfo(cursor);
-}
-
-// DragData conversions --------------------------------------------------------
-
-WebKit::WebDragData ChromiumDataObjectToWebDragData(
-    const PassRefPtr<WebCore::ChromiumDataObject>& data) {
-  return data;
-}
-
-PassRefPtr<WebCore::ChromiumDataObject> WebDragDataToChromiumDataObject(
-    const WebKit::WebDragData& data) {
-  return data;
-}
-
-// WebForm conversions ---------------------------------------------------------
-
-WebKit::WebFormElement HTMLFormElementToWebFormElement(
-    const WTF::PassRefPtr<WebCore::HTMLFormElement>& form) {
-  return form;
-}
-
-WTF::PassRefPtr<WebCore::HTMLFormElement> WebFormElementToHTMLFormElement(
-    const WebKit::WebFormElement& form) {
-  return form;
-}
-
-// WebNode conversions ---------------------------------------------------------
-
-WebKit::WebNode NodeToWebNode(const WTF::PassRefPtr<WebCore::Node>& node) {
-  return node;
-}
-
-WTF::PassRefPtr<WebCore::Node> WebNodeToNode(const WebKit::WebNode& node) {
-  return node;
-}
-
-// WebHistoryItem conversions --------------------------------------------------
-
-WebKit::WebHistoryItem HistoryItemToWebHistoryItem(
-    const WTF::PassRefPtr<WebCore::HistoryItem>& item) {
-  return item;
-}
-
-WTF::PassRefPtr<WebCore::HistoryItem> WebHistoryItemToHistoryItem(
-    const WebKit::WebHistoryItem& item) {
-  return item;
-}
-
-// WebRange conversions --------------------------------------------------------
-
-WebKit::WebRange RangeToWebRange(const WTF::PassRefPtr<WebCore::Range>& range) {
-  return range;
-}
-
-WTF::PassRefPtr<WebCore::Range> WebRangeToRange(const WebKit::WebRange& range) {
-  return range;
-}
-
-// WebSecurityOrigin conversions -----------------------------------------------
-
-WebKit::WebSecurityOrigin SecurityOriginToWebSecurityOrigin(
-    const WTF::PassRefPtr<WebCore::SecurityOrigin>& origin) {
-  return origin;
-}
-
-// WebURLError conversions -----------------------------------------------------
-
-WebKit::WebURLError ResourceErrorToWebURLError(
-    const WebCore::ResourceError& error) {
-  return error;
-}
-
-WebCore::ResourceError WebURLErrorToResourceError(
-    const WebKit::WebURLError& error) {
-  return error;
-}
-
-// WebURLRequest conversions ---------------------------------------------------
-
-WebCore::ResourceRequest* WebURLRequestToMutableResourceRequest(
-    WebKit::WebURLRequest* request) {
-  return &request->toMutableResourceRequest();
-}
-
-const WebCore::ResourceRequest* WebURLRequestToResourceRequest(
-    const WebKit::WebURLRequest* request) {
-  return &request->toResourceRequest();
-}
-
-// WebURLResponse conversions --------------------------------------------------
-
-WebCore::ResourceResponse* WebURLResponseToMutableResourceResponse(
-    WebKit::WebURLResponse* response) {
-  return &response->toMutableResourceResponse();
-}
-
-const WebCore::ResourceResponse* WebURLResponseToResourceResponse(
-    const WebKit::WebURLResponse* response) {
-  return &response->toResourceResponse();
-}
-
-// WebAccessibilityObject conversions ------------------------------------------
-
-WebKit::WebAccessibilityObject AccessibilityObjectToWebAccessibilityObject(
-    const WTF::PassRefPtr<WebCore::AccessibilityObject>& object) {
-  return object;
-}
-
-WTF::PassRefPtr<WebCore::AccessibilityObject> WebAccessibilityObjectToAccessibilityObject(
-    const WebKit::WebAccessibilityObject& object) {
-  return object;
-}
-
-}  // namespace webkit_glue
diff --git a/webkit/glue/glue_util.h b/webkit/glue/glue_util.h
deleted file mode 100644
index 5fca860..0000000
--- a/webkit/glue/glue_util.h
+++ /dev/null
@@ -1,189 +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 WEBKIT_GLUE_GLUE_UTIL_H_
-#define WEBKIT_GLUE_GLUE_UTIL_H_
-
-#include "base/file_path.h"
-#include "base/string16.h"
-
-class GURL;
-
-namespace WebCore {
-class AccessibilityObject;
-class ChromiumDataObject;
-class CString;
-class Cursor;
-class HistoryItem;
-class HTMLFormElement;
-class IntPoint;
-class IntRect;
-class IntSize;
-class KURL;
-class Node;
-class Range;
-class ResourceError;
-class ResourceRequest;
-class ResourceResponse;
-class SecurityOrigin;
-class SharedBuffer;
-class String;
-}
-
-namespace WebKit {
-class WebAccessibilityObject;
-class WebCString;
-class WebData;
-class WebDragData;
-class WebFormElement;
-class WebHistoryItem;
-class WebNode;
-class WebRange;
-class WebSecurityOrigin;
-class WebString;
-class WebURL;
-class WebURLRequest;
-class WebURLResponse;
-struct WebCursorInfo;
-struct WebPoint;
-struct WebRect;
-struct WebSize;
-struct WebURLError;
-}
-
-namespace WTF {
-template <typename T> class PassRefPtr;
-}
-
-namespace gfx {
-class Rect;
-}
-
-namespace webkit_glue {
-
-// WebCore::CString <-> std::string. All characters are 8-bit and are preserved
-// unchanged.
-std::string CStringToStdString(const WebCore::CString& str);
-WebCore::CString StdStringToCString(const std::string& str);
-
-// WebCore::String <-> std::wstring. We assume that the WebCore::String is in
-// UTF-16, and will either copy to a UTF-16 std::wstring (on Windows) or convert
-// to a UTF-32 one on Linux and Mac.
-std::wstring StringToStdWString(const WebCore::String& str);
-WebCore::String StdWStringToString(const std::wstring& str);
-
-// WebCore::String -> string16. This is a direct copy of UTF-16 characters.
-string16 StringToString16(const WebCore::String& str);
-WebCore::String String16ToString(const string16& str);
-
-// WebCore::String <-> std::string. We assume the WebCore::String is UTF-16 and
-// the std::string is UTF-8, and convert as necessary.
-std::string StringToStdString(const WebCore::String& str);
-WebCore::String StdStringToString(const std::string& str);
-
-// WebCore::String <-> WebString.  No charset conversion.
-WebKit::WebString StringToWebString(const WebCore::String& str);
-WebCore::String WebStringToString(const WebKit::WebString& str);
-
-// WebCore::CString <-> WebCString.  No charset conversion.
-WebKit::WebCString CStringToWebCString(const WebCore::CString& str);
-WebCore::CString WebCStringToCString(const WebKit::WebCString& str);
-
-// std::string <-> WebString.  Conversion to/from UTF-8.
-WebKit::WebString StdStringToWebString(const std::string& str);
-std::string WebStringToStdString(const WebKit::WebString& str);
-
-// WebCore::SharedBuffer <-> WebData.  No charset conversion.
-WebKit::WebData SharedBufferToWebData(
-    const WTF::PassRefPtr<WebCore::SharedBuffer>& buf);
-WTF::PassRefPtr<WebCore::SharedBuffer> WebDataToSharedBuffer(
-    const WebKit::WebData& data);
-
-FilePath::StringType StringToFilePathString(const WebCore::String& str);
-WebCore::String FilePathStringToString(const FilePath::StringType& str);
-
-GURL KURLToGURL(const WebCore::KURL& url);
-WebCore::KURL GURLToKURL(const GURL& url);
-GURL StringToGURL(const WebCore::String& spec);
-
-WebKit::WebURL KURLToWebURL(const WebCore::KURL& url);
-WebCore::KURL WebURLToKURL(const WebKit::WebURL& url);
-
-gfx::Rect FromIntRect(const WebCore::IntRect& r);
-WebCore::IntRect ToIntRect(const gfx::Rect& r);
-
-// WebPoint <-> IntPoint
-WebCore::IntPoint WebPointToIntPoint(const WebKit::WebPoint&);
-WebKit::WebPoint IntPointToWebPoint(const WebCore::IntPoint&);
-
-// WebRect <-> IntRect
-WebCore::IntRect WebRectToIntRect(const WebKit::WebRect&);
-WebKit::WebRect IntRectToWebRect(const WebCore::IntRect&);
-
-// WebSize <-> IntSize
-WebCore::IntSize WebSizeToIntSize(const WebKit::WebSize&);
-WebKit::WebSize IntSizeToWebSize(const WebCore::IntSize&);
-
-// WebCursorInfo <- Cursor
-WebKit::WebCursorInfo CursorToWebCursorInfo(const WebCore::Cursor&);
-
-// WebNode <-> Node
-WebKit::WebNode NodeToWebNode(const WTF::PassRefPtr<WebCore::Node>&);
-WTF::PassRefPtr<WebCore::Node> WebNodeToNode(const WebKit::WebNode&);
-
-// WebDragData <-> ChromiumDataObject
-WebKit::WebDragData ChromiumDataObjectToWebDragData(
-    const WTF::PassRefPtr<WebCore::ChromiumDataObject>&);
-WTF::PassRefPtr<WebCore::ChromiumDataObject> WebDragDataToChromiumDataObject(
-    const WebKit::WebDragData&);
-
-// WebForm <-> HTMLFormElement
-WebKit::WebFormElement HTMLFormElementToWebFormElement(
-    const WTF::PassRefPtr<WebCore::HTMLFormElement>&);
-WTF::PassRefPtr<WebCore::HTMLFormElement> WebFormElementToHTMLFormElement(
-    const WebKit::WebFormElement&);
-
-// WebHistoryItem <-> HistoryItem
-WebKit::WebHistoryItem HistoryItemToWebHistoryItem(
-    const WTF::PassRefPtr<WebCore::HistoryItem>&);
-WTF::PassRefPtr<WebCore::HistoryItem> WebHistoryItemToHistoryItem(
-    const WebKit::WebHistoryItem&);
-
-// WebRange <-> Range
-WebKit::WebRange RangeToWebRange(
-    const WTF::PassRefPtr<WebCore::Range>&);
-WTF::PassRefPtr<WebCore::Range> WebRangeToRange(
-    const WebKit::WebRange&);
-
-// WebSecurityOrigin <-> SecurityOrigin
-WebKit::WebSecurityOrigin SecurityOriginToWebSecurityOrigin(
-    const WTF::PassRefPtr<WebCore::SecurityOrigin>&);
-
-// WebURLError <-> ResourceError
-WebKit::WebURLError ResourceErrorToWebURLError(
-    const WebCore::ResourceError& error);
-WebCore::ResourceError WebURLErrorToResourceError(
-    const WebKit::WebURLError& error);
-
-// Exposes the ResourceRequest contained by a WebURLRequest
-WebCore::ResourceRequest* WebURLRequestToMutableResourceRequest(
-    WebKit::WebURLRequest* req);
-const WebCore::ResourceRequest* WebURLRequestToResourceRequest(
-    const WebKit::WebURLRequest* req);
-
-// Exposes the ResourceResponse contained by a WebURLResponse
-WebCore::ResourceResponse* WebURLResponseToMutableResourceResponse(
-    WebKit::WebURLResponse* resp);
-const WebCore::ResourceResponse* WebURLResponseToResourceResponse(
-    const WebKit::WebURLResponse* resp);
-
-// WebAccessibilityObject <-> AccessibilityObject
-WebKit::WebAccessibilityObject AccessibilityObjectToWebAccessibilityObject(
-    const WTF::PassRefPtr<WebCore::AccessibilityObject>& o);
-WTF::PassRefPtr<WebCore::AccessibilityObject> WebAccessibilityObjectToAccessibilityObject(
-    const WebKit::WebAccessibilityObject&);
-
-}  // namespace webkit_glue
-
-#endif  // #ifndef WEBKIT_GLUE_GLUE_UTIL_H_
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index a1a8d9a..4784106 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -305,8 +305,6 @@
         'glue/ftp_directory_listing_response_delegate.h',
         'glue/glue_serialize.cc',
         'glue/glue_serialize.h',
-        'glue/glue_util.cc',
-        'glue/glue_util.h',
         'glue/image_decoder.cc',
         'glue/image_decoder.h',
         'glue/image_resource_fetcher.cc',