| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 KURLStructTraits_h | 5 #ifndef KURLStructTraits_h |
| 6 #define KURLStructTraits_h | 6 #define KURLStructTraits_h |
| 7 | 7 |
| 8 #include "platform/weborigin/KURL.h" | 8 #include "platform/weborigin/KURL.h" |
| 9 #include "url/mojo/url.mojom-blink.h" | 9 #include "url/mojo/url.mojom-blink.h" |
| 10 #include "url/url_constants.h" | 10 #include "url/url_constants.h" |
| 11 #include "wtf/text/WTFString.h" | 11 #include "wtf/text/WTFString.h" |
| 12 | 12 |
| 13 namespace mojo { | 13 namespace mojo { |
| 14 | 14 |
| 15 template <> | 15 template <> |
| 16 struct StructTraits<url::mojom::blink::Url, ::blink::KURL> { | 16 struct StructTraits<url::mojom::blink::Url::DataView, ::blink::KURL> { |
| 17 static WTF::String url(const ::blink::KURL& blinkUrl) | 17 static WTF::String url(const ::blink::KURL& blinkUrl) |
| 18 { | 18 { |
| 19 if (!blinkUrl.isValid() || blinkUrl.getString().length() > url::kMaxURLC
hars) { | 19 if (!blinkUrl.isValid() || blinkUrl.getString().length() > url::kMaxURLC
hars) { |
| 20 return emptyString(); | 20 return emptyString(); |
| 21 } | 21 } |
| 22 | 22 |
| 23 return blinkUrl.getString(); | 23 return blinkUrl.getString(); |
| 24 } | 24 } |
| 25 static bool Read(url::mojom::blink::UrlDataView data, ::blink::KURL* out) | 25 static bool Read(url::mojom::blink::Url::DataView data, ::blink::KURL* out) |
| 26 { | 26 { |
| 27 WTF::String urlString; | 27 WTF::String urlString; |
| 28 if (!data.ReadUrl(&urlString)) | 28 if (!data.ReadUrl(&urlString)) |
| 29 return false; | 29 return false; |
| 30 | 30 |
| 31 if (urlString.length() > url::kMaxURLChars) | 31 if (urlString.length() > url::kMaxURLChars) |
| 32 return false; | 32 return false; |
| 33 | 33 |
| 34 *out = ::blink::KURL(::blink::KURL(), urlString); | 34 *out = ::blink::KURL(::blink::KURL(), urlString); |
| 35 if (!urlString.isEmpty() && !out->isValid()) | 35 if (!urlString.isEmpty() && !out->isValid()) |
| 36 return false; | 36 return false; |
| 37 | 37 |
| 38 return true; | 38 return true; |
| 39 } | 39 } |
| 40 }; | 40 }; |
| 41 } | 41 } |
| 42 | 42 |
| 43 #endif // KURLStructTraits_h | 43 #endif // KURLStructTraits_h |
| OLD | NEW |