summaryrefslogtreecommitdiffstats
path: root/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
diff options
context:
space:
mode:
authorKonstantin Tokarev <annulen@yandex.ru>2016-09-28 16:39:37 +0300
committerKonstantin Tokarev <annulen@yandex.ru>2017-02-02 12:31:01 +0000
commit9daf1655d7e4eaaa6ed5f44055a4b4fd399fd25c (patch)
tree322337ad0acbc75732f916376ec6d36e7ec0e5bc /Source/WebKit2/WebProcess/WebPage/WebPage.cpp
parent6882a04fb36642862b11efe514251d32070c3d65 (diff)
Imported WebKit commit eb954cdcf58f9b915b2fcb6f8e4cb3a60650a4f3
Change-Id: I8dda875c38075d43b76fe3a21acb0ffa102bb82d Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/WebKit2/WebProcess/WebPage/WebPage.cpp')
-rw-r--r--Source/WebKit2/WebProcess/WebPage/WebPage.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/WebKit2/WebProcess/WebPage/WebPage.cpp b/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
index 71fe0688e..2cd709f22 100644
--- a/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
+++ b/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -834,8 +834,8 @@ EditorState WebPage::editorState(IncludePostLayoutDataHint shouldIncludePostLayo
if (!scope)
return result;
- if (isHTMLInputElement(scope)) {
- HTMLInputElement* input = toHTMLInputElement(scope);
+ if (is<HTMLInputElement>(scope)) {
+ HTMLInputElement* input = downcast<HTMLInputElement>(scope);
if (input->isTelephoneField())
result.inputMethodHints |= Qt::ImhDialableCharactersOnly;
else if (input->isNumberField())
@@ -881,8 +881,8 @@ EditorState WebPage::editorState(IncludePostLayoutDataHint shouldIncludePostLayo
// FIXME: We should only transfer innerText when it changes and do this on the UI side.
if (result.isContentEditable) {
- if (isHTMLTextFormControlElement(scope))
- result.surroundingText = toHTMLTextFormControlElement(scope)->innerTextValue();
+ if (is<HTMLTextFormControlElement>(scope))
+ result.surroundingText = downcast<HTMLTextFormControlElement>(scope)->innerTextValue();
else
result.surroundingText = scope->innerText();
@@ -2306,7 +2306,7 @@ void WebPage::highlightPotentialActivation(const IntPoint& point, const IntSize&
break;
// We always highlight focusable (form-elements), image links or content-editable elements.
- if ((node->isElementNode() && toElement(node)->isMouseFocusable()) || node->isLink() || node->isContentEditable())
+ if ((node->isElementNode() && downcast<Element>(node)->isMouseFocusable()) || node->isLink() || node->isContentEditable())
activationNode = node;
else if (node->willRespondToMouseClickEvents()) {
// Highlight elements with default mouse-click handlers, but highlight only inline elements with