| Index: webkit/glue/glue_util.cc
|
| ===================================================================
|
| --- webkit/glue/glue_util.cc (revision 3991)
|
| +++ webkit/glue/glue_util.cc (working copy)
|
| @@ -79,8 +79,7 @@
|
| return GURL();
|
| return GURL(spec.data(), spec.length(), url.parsed(), url.isValid());
|
| #else
|
| - const WebCore::String& spec = url.string();
|
| - return GURL(WideToUTF8(StringToStdWString(spec)));
|
| + return StringToGURL(url.string());
|
| #endif
|
| }
|
|
|
| @@ -95,6 +94,10 @@
|
| #endif
|
| }
|
|
|
| +GURL StringToGURL(const WebCore::String& spec) {
|
| + return GURL(WideToUTF8(StringToStdWString(spec)));
|
| +}
|
| +
|
| // Rect conversions ------------------------------------------------------------
|
|
|
| gfx::Rect FromIntRect(const WebCore::IntRect& r) {
|
|
|