Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Apple Inc. All rights reserved. | 2 * Copyright (C) 2013 Apple 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 76 return adoptRefWillBeRefCountedGarbageCollected(new VTTElement(nodeType, doc ument)); | 76 return adoptRefWillBeRefCountedGarbageCollected(new VTTElement(nodeType, doc ument)); |
| 77 } | 77 } |
| 78 | 78 |
| 79 PassRefPtrWillBeRawPtr<Element> VTTElement::cloneElementWithoutAttributesAndChil dren() | 79 PassRefPtrWillBeRawPtr<Element> VTTElement::cloneElementWithoutAttributesAndChil dren() |
| 80 { | 80 { |
| 81 RefPtrWillBeRawPtr<VTTElement> clone = create(static_cast<VTTNodeType>(m_web VTTNodeType), &document()); | 81 RefPtrWillBeRawPtr<VTTElement> clone = create(static_cast<VTTNodeType>(m_web VTTNodeType), &document()); |
| 82 clone->setLanguage(m_language); | 82 clone->setLanguage(m_language); |
| 83 return clone.release(); | 83 return clone.release(); |
| 84 } | 84 } |
| 85 | 85 |
| 86 PassRefPtr<HTMLElement> VTTElement::createEquivalentHTMLElement(Document& docume nt) | 86 PassRefPtrWillBeRawPtr<HTMLElement> VTTElement::createEquivalentHTMLElement(Docu ment& document) |
| 87 { | 87 { |
| 88 RefPtr<HTMLElement> htmlElement; | 88 RefPtrWillBeRawPtr<HTMLElement> htmlElement; |
|
haraken
2014/06/04 07:06:16
= nullptr
tkent
2014/06/04 08:03:25
Done.
| |
| 89 switch (m_webVTTNodeType) { | 89 switch (m_webVTTNodeType) { |
| 90 case VTTNodeTypeClass: | 90 case VTTNodeTypeClass: |
| 91 case VTTNodeTypeLanguage: | 91 case VTTNodeTypeLanguage: |
| 92 case VTTNodeTypeVoice: | 92 case VTTNodeTypeVoice: |
| 93 htmlElement = HTMLElementFactory::createHTMLElement(HTMLNames::spanTag.l ocalName(), document); | 93 htmlElement = HTMLElementFactory::createHTMLElement(HTMLNames::spanTag.l ocalName(), document); |
| 94 htmlElement.get()->setAttribute(HTMLNames::titleAttr, getAttribute(voice AttributeName())); | 94 htmlElement.get()->setAttribute(HTMLNames::titleAttr, getAttribute(voice AttributeName())); |
| 95 htmlElement.get()->setAttribute(HTMLNames::langAttr, getAttribute(langAt tributeName())); | 95 htmlElement.get()->setAttribute(HTMLNames::langAttr, getAttribute(langAt tributeName())); |
| 96 break; | 96 break; |
| 97 case VTTNodeTypeItalic: | 97 case VTTNodeTypeItalic: |
| 98 htmlElement = HTMLElementFactory::createHTMLElement(HTMLNames::iTag.loca lName(), document); | 98 htmlElement = HTMLElementFactory::createHTMLElement(HTMLNames::iTag.loca lName(), document); |
| (...skipping 13 matching lines...) Expand all Loading... | |
| 112 default: | 112 default: |
| 113 ASSERT_NOT_REACHED(); | 113 ASSERT_NOT_REACHED(); |
| 114 } | 114 } |
| 115 | 115 |
| 116 htmlElement.get()->setAttribute(HTMLNames::classAttr, getAttribute(HTMLNames ::classAttr)); | 116 htmlElement.get()->setAttribute(HTMLNames::classAttr, getAttribute(HTMLNames ::classAttr)); |
| 117 return htmlElement; | 117 return htmlElement; |
| 118 } | 118 } |
| 119 | 119 |
| 120 } // namespace WebCore | 120 } // namespace WebCore |
| 121 | 121 |
| OLD | NEW |