| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #include "webkit/glue/web_io_operators.h" | 5 #include "webkit/glue/web_io_operators.h" |
| 6 | 6 |
| 7 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPoint.h" | 7 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPoint.h" |
| 8 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h" | 8 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h" |
| 9 #include "ui/gfx/point.h" | 9 #include "ui/gfx/point.h" |
| 10 #include "ui/gfx/rect.h" | 10 #include "ui/gfx/rect.h" |
| 11 | 11 |
| 12 #if defined(WCHAR_T_IS_UTF32) | 12 #if defined(WCHAR_T_IS_UTF32) |
| 13 #include "base/string16.h" | 13 #include "base/string16.h" |
| 14 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" | 14 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" |
| 15 #endif // defined(WCHAR_T_IS_UTF32) | 15 #endif // defined(WCHAR_T_IS_UTF32) |
| 16 | 16 |
| 17 namespace WebKit { | 17 namespace WebKit { |
| 18 | 18 |
| 19 #if defined(WCHAR_T_IS_UTF32) | 19 #if defined(WCHAR_T_IS_UTF32) |
| 20 std::ostream& operator<<(std::ostream& out, const WebString& s) { | 20 std::ostream& operator<<(std::ostream& out, const WebString& s) { |
| 21 return out << static_cast<string16>(s); | 21 return out << static_cast<string16>(s); |
| 22 } | 22 } |
| 23 #endif // defined(WCHAR_T_IS_UTF32) | 23 #endif // defined(WCHAR_T_IS_UTF32) |
| 24 | 24 |
| 25 std::ostream& operator<<(std::ostream& out, const WebPoint& p) { | 25 std::ostream& operator<<(std::ostream& out, const WebPoint& p) { |
| 26 return out << static_cast<gfx::Point>(p).ToString(); | 26 return out << static_cast<gfx::Point>(p).ToString(); |
| 27 } | 27 } |
| 28 | 28 |
| 29 std::ostream& operator<<(std::ostream& out, const WebRect& p) { | 29 std::ostream& operator<<(std::ostream& out, const WebRect& p) { |
| 30 return out << static_cast<gfx::Rect>(p).ToString(); | 30 return out << static_cast<gfx::Rect>(p).ToString(); |
| 31 } | 31 } |
| 32 | 32 |
| 33 } // namespace WebKit | 33 } // namespace WebKit |
| OLD | NEW |