Changeset 73956 in webkit

Timestamp:

Dec 13, 2010 1:53:11 PM (13 years ago)

Author:

andersca@apple.com

Message:

Add the ability for plug-ins to toggle complex text input
​https://bugs.webkit.org/show_bug.cgi?id=50966

Reviewed by Sam Weinig.

• PluginProcess/PluginControllerProxy.cpp:

(WebKit::PluginControllerProxy::PluginControllerProxy):
Initialize m_isComplexTextInputEnabled.

(WebKit::PluginControllerProxy::setComplexTextInputEnabled):
Update m_isComplexTextInputEnabled.

• PluginProcess/PluginControllerProxy.h:
• WebProcess/Plugins/Netscape/NetscapePlugin.cpp:

(WebKit::NetscapePlugin::NetscapePlugin):
Initialize m_pluginHasFocus and m_windowHasFocus.

• WebProcess/Plugins/Netscape/NetscapePlugin.h:

(WebKit::NetscapePlugin::isWindowActive):
Return m_windowHasFocus.

• WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm:

(WebKit::NetscapePlugin::platformSetFocus):
Update m_pluginHasFocus and call setComplexTextInputEnabled.

(WebKit::NetscapePlugin::windowFocusChanged):
Update m_windowHasFocus and call setComplexTextInputEnabled.

• WebProcess/Plugins/PluginController.h:

Add setComplexTextInputEnabled.

• WebProcess/Plugins/PluginView.cpp:

(WebKit::PluginView::setComplexTextInputEnabled):

• WebProcess/Plugins/PluginView.h:

Add setComplexTextInputEnabled

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• PluginProcess/PluginControllerProxy.cpp (modified) (2 diffs)
• PluginProcess/PluginControllerProxy.h (modified) (2 diffs)
• WebProcess/Plugins/Netscape/NetscapePlugin.cpp (modified) (1 diff)
• WebProcess/Plugins/Netscape/NetscapePlugin.h (modified) (3 diffs)
• WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm (modified) (4 diffs)
• WebProcess/Plugins/PluginController.h (modified) (1 diff)
• WebProcess/Plugins/PluginView.cpp (modified) (1 diff)
• WebProcess/Plugins/PluginView.h (modified) (1 diff)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-12-13  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Add the ability for plug-ins to toggle complex text input
+        https://bugs.webkit.org/show_bug.cgi?id=50966
+
+        * PluginProcess/PluginControllerProxy.cpp:
+        (WebKit::PluginControllerProxy::PluginControllerProxy):
+        Initialize m_isComplexTextInputEnabled.
+
+        (WebKit::PluginControllerProxy::setComplexTextInputEnabled):
+        Update m_isComplexTextInputEnabled.
+
+        * PluginProcess/PluginControllerProxy.h:
+        * WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
+        (WebKit::NetscapePlugin::NetscapePlugin):
+        Initialize m_pluginHasFocus and m_windowHasFocus.
+
+        * WebProcess/Plugins/Netscape/NetscapePlugin.h:
+        (WebKit::NetscapePlugin::isWindowActive):
+        Return m_windowHasFocus.
+
+        * WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm:
+        (WebKit::NetscapePlugin::platformSetFocus):
+        Update m_pluginHasFocus and call setComplexTextInputEnabled.
+
+        (WebKit::NetscapePlugin::windowFocusChanged):
+        Update m_windowHasFocus and call setComplexTextInputEnabled.
+
+        * WebProcess/Plugins/PluginController.h:
+        Add setComplexTextInputEnabled.
+
+        * WebProcess/Plugins/PluginView.cpp:
+        (WebKit::PluginView::setComplexTextInputEnabled):
+        * WebProcess/Plugins/PluginView.h:
+        Add setComplexTextInputEnabled
+
 2010-12-13  David Hyatt  <hyatt@apple.com>
 

trunk/WebKit2/PluginProcess/PluginControllerProxy.cpp

@@ -58 +58 @@
     , m_paintTimer(RunLoop::main(), this, &PluginControllerProxy::paint)
     , m_waitingForDidUpdate(false)
+#if PLATFORM(MAC)
+    , m_isComplexTextInputEnabled(false)
+#endif
 {
 }
@@ -233 +236 @@
 }
 
+void PluginControllerProxy::setComplexTextInputEnabled(bool complexTextInputEnabled)
+{
+    if (m_isComplexTextInputEnabled == complexTextInputEnabled)
+        return;
+
+    m_isComplexTextInputEnabled = complexTextInputEnabled;
+    // FIXME: Let the web process know that this plug-in wants complex text input enabled.
+}
+
 String PluginControllerProxy::proxiesForURL(const String& urlString)
 {

trunk/WebKit2/PluginProcess/PluginControllerProxy.h

@@ -88 +88 @@
     virtual bool isAcceleratedCompositingEnabled();
     virtual void pluginProcessCrashed();
+
+#if PLATFORM(MAC)
+    virtual void setComplexTextInputEnabled(bool);
+#endif
+
     virtual String proxiesForURL(const String&);
     virtual String cookiesForURL(const String&);
@@ -149 +154 @@
     bool m_waitingForDidUpdate;
 
-    // The backing store that this plug-in draws into.
-    RefPtr<BackingStore> m_backingStore;
+#if PLATFORM(MAC)
+    // Whether complex text input is enabled for this plug-in.
+    bool m_isComplexTextInputEnabled;
 
-#if PLATFORM(MAC)
     // For CA plug-ins, this holds the information needed to export the layer hierarchy to the UI process.
     RetainPtr<WKCARemoteLayerClientRef> m_remoteLayerClient;
 #endif
+    
+    // The backing store that this plug-in draws into.
+    RefPtr<BackingStore> m_backingStore;
 };
 

trunk/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp

@@ -68 +68 @@
     , m_drawingModel(static_cast<NPDrawingModel>(-1))
     , m_eventModel(static_cast<NPEventModel>(-1))
+    , m_pluginHasFocus(false)
+    , m_windowHasFocus(false)
 #ifndef NP_NO_CARBON
     , m_nullEventTimer(RunLoop::main(), this, &NetscapePlugin::nullEventTimerFired)
     , m_npCGContext()
-    , m_isWindowActive(false)
 #endif    
 #endif

trunk/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h

@@ -56 +56 @@
 #ifndef NP_NO_CARBON
     WindowRef windowRef() const;
-    bool isWindowActive() const { return m_isWindowActive; }
+    bool isWindowActive() const { return m_windowHasFocus; }
 
     static NetscapePlugin* netscapePluginFromWindow(WindowRef);
@@ -196 +196 @@
     NPEventModel m_eventModel;
     RetainPtr<PlatformLayer> m_pluginLayer;
+
+    bool m_pluginHasFocus;
+    bool m_windowHasFocus;
+
 #ifndef NP_NO_CARBON
     void nullEventTimerFired();
@@ -203 +207 @@
     RunLoop::Timer<NetscapePlugin> m_nullEventTimer;
     NP_CGContext m_npCGContext;
-    bool m_isWindowActive;
 #endif
 #elif PLATFORM(WIN)

trunk/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm

@@ -26 +26 @@
 #include "NetscapePlugin.h"
 
+#include "PluginController.h"
 #include "WebEvent.h"
 #include <WebCore/GraphicsContext.h>
@@ -603 +604 @@
 void NetscapePlugin::platformSetFocus(bool hasFocus)
 {
+    m_pluginHasFocus = hasFocus;
+    m_pluginController->setComplexTextInputEnabled(m_pluginHasFocus && m_windowHasFocus);
+
     switch (m_eventModel) {
         case NPEventModelCocoa: {
@@ -628 +632 @@
 void NetscapePlugin::windowFocusChanged(bool hasFocus)
 {
+    m_windowHasFocus = hasFocus;
+    m_pluginController->setComplexTextInputEnabled(m_pluginHasFocus && m_windowHasFocus);
+
     switch (m_eventModel) {
         case NPEventModelCocoa: {
@@ -639 +646 @@
 #ifndef NP_NO_CARBON
         case NPEventModelCarbon: {
-            m_isWindowActive = hasFocus;
-            
             HiliteWindow(windowRef(), hasFocus);
             if (hasFocus)

trunk/WebKit2/WebProcess/Plugins/PluginController.h

@@ -89 +89 @@
 #endif
 
+#if PLATFORM(MAC)
+    // Tells the controller that complex text input be enabled or disabled for the plug-in.
+    virtual void setComplexTextInputEnabled(bool) = 0;
+#endif
+
     // Returns the proxies for the given URL or null on failure.
     virtual String proxiesForURL(const String&) = 0;

trunk/WebKit2/WebProcess/Plugins/PluginView.cpp

@@ -870 +870 @@
 #endif
 
+#if PLATFORM(MAC)
+void PluginView::setComplexTextInputEnabled(bool)
+{
+    // This should never be called.
+    ASSERT_NOT_REACHED();
+}
+#endif
+    
 String PluginView::proxiesForURL(const String& urlString)
 {

trunk/WebKit2/WebProcess/Plugins/PluginView.h

@@ -126 +126 @@
     virtual HWND nativeParentWindow();
 #endif
+#if PLATFORM(MAC)
+    virtual void setComplexTextInputEnabled(bool);
+#endif
     virtual String proxiesForURL(const String&);
     virtual String cookiesForURL(const String&);