OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 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 25 matching lines...) Expand all Loading... |
36 #include "core/html/HTMLSelectElement.h" | 36 #include "core/html/HTMLSelectElement.h" |
37 #include "public/platform/WebString.h" | 37 #include "public/platform/WebString.h" |
38 #include "wtf/PassRefPtr.h" | 38 #include "wtf/PassRefPtr.h" |
39 | 39 |
40 using namespace WebCore; | 40 using namespace WebCore; |
41 | 41 |
42 namespace blink { | 42 namespace blink { |
43 | 43 |
44 WebVector<WebElement> WebSelectElement::listItems() const | 44 WebVector<WebElement> WebSelectElement::listItems() const |
45 { | 45 { |
46 const Vector<HTMLElement*>& sourceItems = constUnwrap<HTMLSelectElement>()->
listItems(); | 46 const WillBeHeapVector<RawPtrWillBeMember<HTMLElement> >& sourceItems = cons
tUnwrap<HTMLSelectElement>()->listItems(); |
47 WebVector<WebElement> items(sourceItems.size()); | 47 WebVector<WebElement> items(sourceItems.size()); |
48 for (size_t i = 0; i < sourceItems.size(); ++i) | 48 for (size_t i = 0; i < sourceItems.size(); ++i) |
49 items[i] = WebElement(sourceItems[i]); | 49 items[i] = WebElement(sourceItems[i].get()); |
50 | 50 |
51 return items; | 51 return items; |
52 } | 52 } |
53 | 53 |
54 WebSelectElement::WebSelectElement(const PassRefPtrWillBeRawPtr<HTMLSelectElemen
t>& element) | 54 WebSelectElement::WebSelectElement(const PassRefPtrWillBeRawPtr<HTMLSelectElemen
t>& element) |
55 : WebFormControlElement(element) | 55 : WebFormControlElement(element) |
56 { | 56 { |
57 } | 57 } |
58 | 58 |
59 WebSelectElement& WebSelectElement::operator=(const PassRefPtrWillBeRawPtr<HTMLS
electElement>& element) | 59 WebSelectElement& WebSelectElement::operator=(const PassRefPtrWillBeRawPtr<HTMLS
electElement>& element) |
60 { | 60 { |
61 m_private = element; | 61 m_private = element; |
62 return *this; | 62 return *this; |
63 } | 63 } |
64 | 64 |
65 WebSelectElement::operator PassRefPtrWillBeRawPtr<HTMLSelectElement>() const | 65 WebSelectElement::operator PassRefPtrWillBeRawPtr<HTMLSelectElement>() const |
66 { | 66 { |
67 return toHTMLSelectElement(m_private.get()); | 67 return toHTMLSelectElement(m_private.get()); |
68 } | 68 } |
69 | 69 |
70 } // namespace blink | 70 } // namespace blink |
OLD | NEW |