Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 11 matching lines...) Expand all Loading... | |
| 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
| 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 #include "public/platform/WebURL.h" | 32 #include "public/platform/WebDragData.h" |
| 33 | |
| 34 #include "platform/weborigin/KURL.h" | |
| 35 | 33 |
| 36 namespace blink { | 34 namespace blink { |
| 37 | 35 |
| 38 WebURL::WebURL(const KURL& url) | 36 void WebDragData::setItems(WebVector<Item> itemList) |
|
dcheng
2015/02/25 15:37:00
You don't save a copy by doing this--you still end
tasak
2015/02/26 11:27:48
//content/renderer/render_view_impl.cc also uses s
dcheng
2015/02/27 16:53:02
Ah, I forgot about that.
Maybe just call it swapI
| |
| 39 : m_string(url.string()) | |
| 40 , m_parsed(url.parsed()) | |
| 41 , m_isValid(url.isValid()) | |
| 42 { | 37 { |
| 38 ASSERT(!isNull()); | |
| 39 m_itemList.swap(itemList); | |
| 43 } | 40 } |
| 44 | 41 |
| 45 WebURL& WebURL::operator=(const KURL& url) | 42 void WebDragData::addItem(const Item& item) |
| 46 { | 43 { |
| 47 m_string = url.string(); | 44 ASSERT(!isNull()); |
| 48 m_parsed = url.parsed(); | 45 WebVector<Item> itemList(m_itemList.size() + 1); |
| 49 m_isValid = url.isValid(); | |
| 50 return *this; | |
| 51 } | |
| 52 | 46 |
| 53 WebURL::operator KURL() const | 47 for (unsigned i = 0; i < m_itemList.size(); ++i) |
| 54 { | 48 itemList[i] = m_itemList[i]; |
| 55 return KURL(m_string, m_parsed, m_isValid); | 49 itemList[m_itemList.size()] = item; |
| 50 m_itemList.swap(itemList); | |
| 56 } | 51 } |
| 57 | 52 |
| 58 } // namespace blink | 53 } // namespace blink |
| OLD | NEW |