| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef WEBKIT_GLUE_GLUE_UTIL_H_ | 5 #ifndef WEBKIT_GLUE_GLUE_UTIL_H_ |
| 6 #define WEBKIT_GLUE_GLUE_UTIL_H_ | 6 #define WEBKIT_GLUE_GLUE_UTIL_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/string16.h" | 10 #include "base/string16.h" |
| (...skipping 26 matching lines...) Expand all Loading... |
| 37 // WebCore::String -> string16. This is a direct copy of UTF-16 characters. | 37 // WebCore::String -> string16. This is a direct copy of UTF-16 characters. |
| 38 string16 StringToString16(const WebCore::String& str); | 38 string16 StringToString16(const WebCore::String& str); |
| 39 | 39 |
| 40 // WebCore::String <-> std::string. We assume the WebCore::String is UTF-16 and | 40 // WebCore::String <-> std::string. We assume the WebCore::String is UTF-16 and |
| 41 // the std::string is UTF-8, and convert as necessary. | 41 // the std::string is UTF-8, and convert as necessary. |
| 42 std::string StringToStdString(const WebCore::String& str); | 42 std::string StringToStdString(const WebCore::String& str); |
| 43 WebCore::String StdStringToString(const std::string& str); | 43 WebCore::String StdStringToString(const std::string& str); |
| 44 | 44 |
| 45 GURL KURLToGURL(const WebCore::KURL& url); | 45 GURL KURLToGURL(const WebCore::KURL& url); |
| 46 WebCore::KURL GURLToKURL(const GURL& url); | 46 WebCore::KURL GURLToKURL(const GURL& url); |
| 47 GURL StringToGURL(const WebCore::String& spec); |
| 47 | 48 |
| 48 gfx::Rect FromIntRect(const WebCore::IntRect& r); | 49 gfx::Rect FromIntRect(const WebCore::IntRect& r); |
| 49 WebCore::IntRect ToIntRect(const gfx::Rect& r); | 50 WebCore::IntRect ToIntRect(const gfx::Rect& r); |
| 50 | 51 |
| 51 } // namespace webkit_glue | 52 } // namespace webkit_glue |
| 52 | 53 |
| 53 #endif // #ifndef WEBKIT_GLUE_GLUE_UTIL_H_ | 54 #endif // #ifndef WEBKIT_GLUE_GLUE_UTIL_H_ |
| 54 | 55 |
| OLD | NEW |