Changeset 232151 in webkit

Timestamp:

May 24, 2018, 2:41:17 AM (8 years ago)

Author:

Carlos Garcia Campos

Message:

Unreviewed. Fix GTK+ input method unit tests after r232049.

Unit tests don't use a WebPageProxy.

• UIProcess/gtk/InputMethodFilter.cpp:

(WebKit::InputMethodFilter::isViewFocused const):
(WebKit::InputMethodFilter::setEnabled):

• UIProcess/gtk/InputMethodFilter.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/gtk/InputMethodFilter.cpp (modified) (2 diffs)
• UIProcess/gtk/InputMethodFilter.h (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-05-24  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Unreviewed. Fix GTK+ input method unit tests after r232049.
+
+        Unit tests don't use a WebPageProxy.
+
+        * UIProcess/gtk/InputMethodFilter.cpp:
+        (WebKit::InputMethodFilter::isViewFocused const):
+        (WebKit::InputMethodFilter::setEnabled):
+        * UIProcess/gtk/InputMethodFilter.h:
+
 2018-05-24  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit/UIProcess/gtk/InputMethodFilter.cpp

@@ -82 +82 @@
 }
 
+bool InputMethodFilter::isViewFocused() const
+{
+#if ENABLE(API_TESTS)
+    ASSERT(m_page || m_testingMode);
+    if (m_testingMode)
+        return true;
+#else
+    ASSERT(m_page);
+#endif
+    return m_page->isViewFocused();
+}
+
 void InputMethodFilter::setEnabled(bool enabled)
 {
-    ASSERT(m_page);
+#if ENABLE(API_TESTS)
+    ASSERT(m_page || m_testingMode);
+#else
+    ASSERT(m_page);
+#endif
 
     // Notify focus out before changing the m_enabled.
@@ -90 +106 @@
         notifyFocusedOut();
     m_enabled = enabled;
-    if (enabled && m_page->isViewFocused())
+    if (enabled && isViewFocused())
         notifyFocusedIn();
 }

trunk/Source/WebKit/UIProcess/gtk/InputMethodFilter.h

@@ -94 +94 @@
     void cancelContextComposition();
 
+    bool isViewFocused() const;
+
 #if ENABLE(API_TESTS)
     void logHandleKeyboardEventForTesting(GdkEventKey*, const String&, EventFakedForComposition);