Changeset 109123 in webkit

Timestamp:

Feb 28, 2012 10:51:47 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Remove unused focusedNodeChange notifications from the Chrome client.
​https://bugs.webkit.org/show_bug.cgi?id=79794

Patch by Mike Fenton <​mifenton@rim.com> on 2012-02-28
Reviewed by Rob Buis.

Remove unused notification for focusedNodeChanged.

Internally reviewed by Gen Mak.

• Api/WebPageClient.h:
• WebCoreSupport/ChromeClientBlackBerry.cpp:

(WebCore::ChromeClientBlackBerry::focusedNodeChanged):

Location:

trunk/Source/WebKit/blackberry

Files:

• Api/WebPageClient.h (modified) (2 diffs)
• ChangeLog (modified) (1 diff)
• WebCoreSupport/ChromeClientBlackBerry.cpp (modified) (1 diff)

trunk/Source/WebKit/blackberry/Api/WebPageClient.h

@@ -67 +67 @@
     };
 
-    enum FocusType {
-        FocusUnknown = 0,
-        FocusNone,
-        FocusCanvas,
-        FocusImage,
-        FocusInputButton,
-        FocusInputCheckBox,
-        FocusInputColor,
-        FocusInputDate,
-        FocusInputDateTime,
-        FocusInputDateTimeLocal,
-        FocusInputEmail,
-        FocusInputFile,
-        FocusInputImage,
-        FocusInputMonth,
-        FocusInputNumber,
-        FocusInputPassword,
-        FocusInputRadio,
-        FocusInputRange,
-        FocusInputReset,
-        FocusInputSearch,
-        FocusInputSubmit,
-        FocusInputTelephone,
-        FocusInputText,
-        FocusInputTime,
-        FocusInputURL,
-        FocusInputWeek,
-        FocusInputUnknown,
-        FocusLink,
-        FocusObject,
-        FocusSelect,
-        FocusSVGElement,
-        FocusTextArea,
-        FocusVideo,
-    };
-
     enum AlertType {
         MediaOK = 0,
@@ -166 +130 @@
     virtual void hideTapHighlight() = 0;
 
-    virtual void focusChanged(FocusType, int elementId) = 0;
     virtual void inputFocusGained(Platform::BlackBerryInputType, int inputStyle, bool waitForExplicitKeyboardShowCall) = 0;
     virtual void inputFocusLost() = 0;

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2012-02-28  Mike Fenton  <mifenton@rim.com>
+
+        [BlackBerry] Remove unused focusedNodeChange notifications from the Chrome client.
+        https://bugs.webkit.org/show_bug.cgi?id=79794
+
+        Reviewed by Rob Buis.
+
+        Remove unused notification for focusedNodeChanged.
+
+        Internally reviewed by Gen Mak.
+
+        * Api/WebPageClient.h:
+        * WebCoreSupport/ChromeClientBlackBerry.cpp:
+        (WebCore::ChromeClientBlackBerry::focusedNodeChanged):
+
 2012-02-27  Jacky Jiang  <zhajiang@rim.com>
 

trunk/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.cpp

@@ -191 +191 @@
 void ChromeClientBlackBerry::focusedNodeChanged(Node* node)
 {
-    WebPageClient::FocusType type = WebPageClient::FocusUnknown;
-
-    if (!node)
-        type = WebPageClient::FocusNone;
-    else if (node->isSVGElement())
-        type = WebPageClient::FocusSVGElement;
-    else if (node->isHTMLElement()) {
-        if (node->hasTagName(HTMLNames::aTag)) {
-            type = WebPageClient::FocusLink;
-        } else if (node->hasTagName(HTMLNames::inputTag)) {
-            HTMLInputElement* inputElement = static_cast<HTMLInputElement*>(node);
-            if (inputElement->hasTagName(HTMLNames::isindexTag) || inputElement->isInputTypeHidden())
-                type = WebPageClient::FocusInputUnknown;
-            else if (inputElement->isTextButton())
-                type = WebPageClient::FocusInputButton;
-            else if (inputElement->isCheckbox())
-                type = WebPageClient::FocusInputCheckBox;
-#if ENABLE(INPUT_COLOR)
-            else if (inputElement->isColorControl())
-                type = WebPageClient::FocusInputColor;
-#endif
-            else if (inputElement->isDateControl())
-                type = WebPageClient::FocusInputDate;
-            else if (inputElement->isDateTimeControl())
-                type = WebPageClient::FocusInputDateTime;
-            else if (inputElement->isDateTimeLocalControl())
-                type = WebPageClient::FocusInputDateTimeLocal;
-            else if (inputElement->isEmailField())
-                type = WebPageClient::FocusInputEmail;
-            else if (inputElement->isFileUpload())
-                type = WebPageClient::FocusInputFile;
-            else if (inputElement->isImageButton())
-                type = WebPageClient::FocusInputImage;
-            else if (inputElement->isMonthControl())
-                type = WebPageClient::FocusInputMonth;
-            else if (inputElement->isNumberField())
-                type = WebPageClient::FocusInputNumber;
-            else if (inputElement->isPasswordField())
-                type = WebPageClient::FocusInputPassword;
-            else if (inputElement->isRadioButton())
-                type = WebPageClient::FocusInputRadio;
-            else if (inputElement->isRangeControl())
-                type = WebPageClient::FocusInputRange;
-            else if (inputElement->isResetButton())
-                type = WebPageClient::FocusInputReset;
-            else if (inputElement->isSearchField())
-                type = WebPageClient::FocusInputSearch;
-            else if (inputElement->isSubmitButton())
-                type = WebPageClient::FocusInputSubmit;
-            else if (inputElement->isTelephoneField())
-                type = WebPageClient::FocusInputTelephone;
-            else if (inputElement->isURLField())
-                type = WebPageClient::FocusInputURL;
-            else if (inputElement->isTextField())
-                type = WebPageClient::FocusInputText;
-            else if (inputElement->isTimeControl())
-                type = WebPageClient::FocusInputTime;
-            // FIXME: missing WEEK popup selector
-            else
-                type = WebPageClient::FocusInputUnknown;
-        } else if (node->hasTagName(HTMLNames::imgTag))
-            type = WebPageClient::FocusImage;
-        else if (node->hasTagName(HTMLNames::objectTag))
-            type = WebPageClient::FocusObject;
-        else if (node->hasTagName(HTMLNames::videoTag))
-            type = WebPageClient::FocusVideo;
-        else if (node->hasTagName(HTMLNames::selectTag))
-            type = WebPageClient::FocusSelect;
-        else if (node->hasTagName(HTMLNames::textareaTag))
-            type = WebPageClient::FocusTextArea;
-        else if (node->hasTagName(HTMLNames::canvasTag))
-            type = WebPageClient::FocusCanvas;
-    }
-
     m_webPagePrivate->m_inputHandler->nodeFocused(node);
-
-    m_webPagePrivate->m_client->focusChanged(type, reinterpret_cast<int>(node));
 }