Title: [171830] trunk/Source/WebCore
- Revision
- 171830
- Author
- [email protected]
- Date
- 2014-07-30 20:14:11 -0700 (Wed, 30 Jul 2014)
Log Message
Remove shadowPseudoId() from InputFieldSpeechButtonElement and SearchFieldCancelButtonElement
https://bugs.webkit.org/show_bug.cgi?id=135438
Patch by Benjamin Poulain <[email protected]> on 2014-07-30
Reviewed by Andreas Kling.
Use the generic path.
* html/shadow/TextControlInnerElements.cpp:
(WebCore::SearchFieldCancelButtonElement::SearchFieldCancelButtonElement):
(WebCore::InputFieldSpeechButtonElement::InputFieldSpeechButtonElement):
(WebCore::SearchFieldCancelButtonElement::shadowPseudoId): Deleted.
(WebCore::InputFieldSpeechButtonElement::shadowPseudoId): Deleted.
* html/shadow/TextControlInnerElements.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (171829 => 171830)
--- trunk/Source/WebCore/ChangeLog 2014-07-31 02:19:43 UTC (rev 171829)
+++ trunk/Source/WebCore/ChangeLog 2014-07-31 03:14:11 UTC (rev 171830)
@@ -1,3 +1,19 @@
+2014-07-30 Benjamin Poulain <[email protected]>
+
+ Remove shadowPseudoId() from InputFieldSpeechButtonElement and SearchFieldCancelButtonElement
+ https://bugs.webkit.org/show_bug.cgi?id=135438
+
+ Reviewed by Andreas Kling.
+
+ Use the generic path.
+
+ * html/shadow/TextControlInnerElements.cpp:
+ (WebCore::SearchFieldCancelButtonElement::SearchFieldCancelButtonElement):
+ (WebCore::InputFieldSpeechButtonElement::InputFieldSpeechButtonElement):
+ (WebCore::SearchFieldCancelButtonElement::shadowPseudoId): Deleted.
+ (WebCore::InputFieldSpeechButtonElement::shadowPseudoId): Deleted.
+ * html/shadow/TextControlInnerElements.h:
+
2014-07-30 Andy Estes <[email protected]>
USE(CONTENT_FILTERING) should be ENABLE(CONTENT_FILTERING)
Modified: trunk/Source/WebCore/html/shadow/TextControlInnerElements.cpp (171829 => 171830)
--- trunk/Source/WebCore/html/shadow/TextControlInnerElements.cpp 2014-07-31 02:19:43 UTC (rev 171829)
+++ trunk/Source/WebCore/html/shadow/TextControlInnerElements.cpp 2014-07-31 03:14:11 UTC (rev 171830)
@@ -192,6 +192,7 @@
: HTMLDivElement(divTag, document)
, m_capturing(false)
{
+ setPseudo(AtomicString("-webkit-search-cancel-button", AtomicString::ConstructFromLiteral));
setHasCustomStyleResolveCallbacks();
}
@@ -200,12 +201,6 @@
return adoptRef(new SearchFieldCancelButtonElement(document));
}
-const AtomicString& SearchFieldCancelButtonElement::shadowPseudoId() const
-{
- DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, pseudoId, ("-webkit-search-cancel-button", AtomicString::ConstructFromLiteral));
- return pseudoId;
-}
-
void SearchFieldCancelButtonElement::willDetachRenderers()
{
if (m_capturing) {
@@ -275,6 +270,7 @@
, m_state(Idle)
, m_listenerId(0)
{
+ setPseudo(AtomicString("-webkit-input-speech-button", AtomicString::ConstructFromLiteral));
setHasCustomStyleResolveCallbacks();
}
@@ -459,12 +455,6 @@
speechInput()->stopRecording(m_listenerId);
}
-const AtomicString& InputFieldSpeechButtonElement::shadowPseudoId() const
-{
- DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, pseudoId, ("-webkit-input-speech-button", AtomicString::ConstructFromLiteral));
- return pseudoId;
-}
-
#endif // ENABLE(INPUT_SPEECH)
}
Modified: trunk/Source/WebCore/html/shadow/TextControlInnerElements.h (171829 => 171830)
--- trunk/Source/WebCore/html/shadow/TextControlInnerElements.h 2014-07-31 02:19:43 UTC (rev 171829)
+++ trunk/Source/WebCore/html/shadow/TextControlInnerElements.h 2014-07-31 03:14:11 UTC (rev 171830)
@@ -103,7 +103,6 @@
private:
SearchFieldCancelButtonElement(Document&);
- virtual const AtomicString& shadowPseudoId() const override;
virtual void willDetachRenderers() override;
virtual bool isMouseFocusable() const override { return false; }
@@ -143,7 +142,6 @@
InputFieldSpeechButtonElement(Document&);
SpeechInput* speechInput();
void setState(SpeechInputState state);
- virtual const AtomicString& shadowPseudoId() const;
virtual bool isMouseFocusable() const override { return false; }
virtual void willAttachRenderers() override;
virtual void willDetachRenderers() override;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
