| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2008, 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2008, 2010 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2010 Google Inc. All rights reserved. | 3 * Copyright (C) 2010 Google Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 { | 52 { |
| 53 } | 53 } |
| 54 | 54 |
| 55 PassRefPtr<TextControlInnerContainer> TextControlInnerContainer::create(Document
* document) | 55 PassRefPtr<TextControlInnerContainer> TextControlInnerContainer::create(Document
* document) |
| 56 { | 56 { |
| 57 return adoptRef(new TextControlInnerContainer(document)); | 57 return adoptRef(new TextControlInnerContainer(document)); |
| 58 } | 58 } |
| 59 | 59 |
| 60 RenderObject* TextControlInnerContainer::createRenderer(RenderStyle*) | 60 RenderObject* TextControlInnerContainer::createRenderer(RenderStyle*) |
| 61 { | 61 { |
| 62 return new (document()->renderArena()) RenderTextControlInnerContainer(this)
; | 62 return new RenderTextControlInnerContainer(this); |
| 63 } | 63 } |
| 64 | 64 |
| 65 TextControlInnerElement::TextControlInnerElement(Document* document) | 65 TextControlInnerElement::TextControlInnerElement(Document* document) |
| 66 : HTMLDivElement(divTag, document) | 66 : HTMLDivElement(divTag, document) |
| 67 { | 67 { |
| 68 setHasCustomStyleCallbacks(); | 68 setHasCustomStyleCallbacks(); |
| 69 } | 69 } |
| 70 | 70 |
| 71 PassRefPtr<TextControlInnerElement> TextControlInnerElement::create(Document* do
cument) | 71 PassRefPtr<TextControlInnerElement> TextControlInnerElement::create(Document* do
cument) |
| 72 { | 72 { |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 // the event up the chain. | 106 // the event up the chain. |
| 107 if (shadowAncestor) | 107 if (shadowAncestor) |
| 108 shadowAncestor->defaultEventHandler(event); | 108 shadowAncestor->defaultEventHandler(event); |
| 109 } | 109 } |
| 110 if (!event->defaultHandled()) | 110 if (!event->defaultHandled()) |
| 111 HTMLDivElement::defaultEventHandler(event); | 111 HTMLDivElement::defaultEventHandler(event); |
| 112 } | 112 } |
| 113 | 113 |
| 114 RenderObject* TextControlInnerTextElement::createRenderer(RenderStyle*) | 114 RenderObject* TextControlInnerTextElement::createRenderer(RenderStyle*) |
| 115 { | 115 { |
| 116 return new (document()->renderArena()) RenderTextControlInnerBlock(this); | 116 return new RenderTextControlInnerBlock(this); |
| 117 } | 117 } |
| 118 | 118 |
| 119 PassRefPtr<RenderStyle> TextControlInnerTextElement::customStyleForRenderer() | 119 PassRefPtr<RenderStyle> TextControlInnerTextElement::customStyleForRenderer() |
| 120 { | 120 { |
| 121 RenderTextControl* parentRenderer = toRenderTextControl(shadowHost()->render
er()); | 121 RenderTextControl* parentRenderer = toRenderTextControl(shadowHost()->render
er()); |
| 122 return parentRenderer->createInnerTextStyle(parentRenderer->style()); | 122 return parentRenderer->createInnerTextStyle(parentRenderer->style()); |
| 123 } | 123 } |
| 124 | 124 |
| 125 // ---------------------------- | 125 // ---------------------------- |
| 126 | 126 |
| (...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 434 } | 434 } |
| 435 | 435 |
| 436 void InputFieldSpeechButtonElement::stopSpeechInput() | 436 void InputFieldSpeechButtonElement::stopSpeechInput() |
| 437 { | 437 { |
| 438 if (m_state == Recording) | 438 if (m_state == Recording) |
| 439 speechInput()->stopRecording(m_listenerId); | 439 speechInput()->stopRecording(m_listenerId); |
| 440 } | 440 } |
| 441 #endif // ENABLE(INPUT_SPEECH) | 441 #endif // ENABLE(INPUT_SPEECH) |
| 442 | 442 |
| 443 } | 443 } |
| OLD | NEW |