Attachment #84907 for bug #55719

View Details Raw Unified Return to Bug 55719

| Differences between

and this patch



2011-03-06  Oleg Romashin  <romaxa@gmail.com>

        Reviewed by NOBODY (OOPS!).

        Make Qt port compiling with ENABLE_PLUGIN_PROCESS=1, part2
        Make ComplexTextInput compiling for Qt
        Cover with ifdef MachPort related functionality
        https://bugs.webkit.org/show_bug.cgi?id=55719

        * PluginProcess/PluginControllerProxy.cpp:
        (WebKit::PluginControllerProxy::sendComplexTextInput):
        * PluginProcess/PluginControllerProxy.h:
        * PluginProcess/PluginProcess.cpp:
        (WebKit::PluginProcess::createWebProcessConnection):
        * PluginProcess/WebProcessConnection.cpp:
        (WebKit::WebProcessConnection::createPlugin):
        * UIProcess/API/qt/qwkpage.cpp:
        (QWKPagePrivate::setComplexTextInputEnabled):
        * UIProcess/API/qt/qwkpage_p.h:
        * UIProcess/PageClient.h:
        * UIProcess/Plugins/PluginProcessProxy.cpp:
        (WebKit::PluginProcessProxy::pluginProcessCrashedOrFailedToLaunch):
        (WebKit::PluginProcessProxy::didCreateWebProcessConnection):
        * UIProcess/Plugins/PluginProcessProxy.h:
        * UIProcess/Plugins/PluginProcessProxy.messages.in:
        * UIProcess/WebPageProxy.cpp:
        (WebKit::WebPageProxy::sendComplexTextInputToPlugin):
        * UIProcess/WebPageProxy.h:
        * UIProcess/WebPageProxy.messages.in:
        * WebProcess/Plugins/Netscape/NetscapePlugin.h:
        * WebProcess/Plugins/Netscape/qt/NetscapePluginQt.cpp:
        (WebKit::NetscapePlugin::sendComplexTextInput):
        (WebKit::NetscapePlugin::pluginComplexTextInputIdentifier):
        * WebProcess/Plugins/Plugin.h:
        * WebProcess/Plugins/PluginController.h:
        * WebProcess/Plugins/PluginProcessConnectionManager.cpp:
        (WebKit::PluginProcessConnectionManager::getPluginProcessConnection):
        * WebProcess/Plugins/PluginProxy.cpp:
        (WebKit::PluginProxy::setComplexTextInputEnabled):
        * WebProcess/Plugins/PluginProxy.h:
        * WebProcess/Plugins/PluginProxy.messages.in:
        * WebProcess/Plugins/PluginView.cpp:
        * WebProcess/Plugins/PluginView.h:
        * WebProcess/WebPage/WebPage.cpp:
        * WebProcess/WebPage/WebPage.h:
        (WebKit::WebPage::accessibilityPosition):
        * WebProcess/WebPage/WebPage.messages.in:
        * WebProcess/WebPage/qt/WebPageQt.cpp:
        (WebKit::WebPage::performDefaultBehaviorForKeyEvent):
        (WebKit::WebPage::sendComplexTextInputToPlugin):

2011-03-06  Jessie Berlin  <jberlin@apple.com>

        Reviewed by Sam Weinig.



    m_connection->connection()->send(Messages::PluginProxy::SetComplexTextInputEnabled(complexTextInputEnabled), m_pluginInstanceID);
}

#if PLATFORM(MAC)
mach_port_t PluginControllerProxy::compositingRenderServerPort()
{
    return PluginProcess::shared().compositingRenderServerPort();
}
#endif

String PluginControllerProxy::proxiesForURL(const String& urlString)
{

{
    m_plugin->windowVisibilityChanged(isVisible);
}
#endif

void PluginControllerProxy::sendComplexTextInput(const String& textInput)
{
    m_plugin->sendComplexTextInput(textInput);
}

#endif

void PluginControllerProxy::privateBrowsingStateChanged(bool isPrivateBrowsingEnabled)
{
    m_plugin->privateBrowsingStateChanged(isPrivateBrowsingEnabled);



    virtual bool isAcceleratedCompositingEnabled();
    virtual void pluginProcessCrashed();

#if PLATFORM(MAC)
    virtual void setComplexTextInputEnabled(bool);
#if PLATFORM(MAC)
    virtual mach_port_t compositingRenderServerPort();
#endif


    void windowFocusChanged(bool);
    void windowAndViewFramesChanged(const WebCore::IntRect& windowFrameInScreenCoordinates, const WebCore::IntRect& viewFrameInWindowCoordinates);
    void windowVisibilityChanged(bool);
    void sendComplexTextInput(const String& textInput);
#endif
    void sendComplexTextInput(const String& textInput);

    void privateBrowsingStateChanged(bool);


    // Whether the plug-in has canceled the manual stream load.
    bool m_pluginCanceledManualStreamLoad;

#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

Lines 29-35 Source/WebKit2/PluginProcess/PluginProcess.cpp_sec1
- Source/WebKit2/PluginProcess/PluginProcess.cpp -2 / +6 lines
29	#if ENABLE(PLUGIN_PROCESS)	29	#if ENABLE(PLUGIN_PROCESS)
30		30
31	#include "ArgumentCoders.h"	31	#include "ArgumentCoders.h"
		32	#if PLATFORM(MAC)
32	#include "MachPort.h"	33	#include "MachPort.h"
		34	#endif
33	#include "NetscapePluginModule.h"	35	#include "NetscapePluginModule.h"
34	#include "PluginProcessProxyMessages.h"	36	#include "PluginProcessProxyMessages.h"
35	#include "PluginProcessCreationParameters.h"	37	#include "PluginProcessCreationParameters.h"
Lines 127-134 void PluginProcess::initializePluginProc Source/WebKit2/PluginProcess/PluginProcess.cpp_sec2
127		129
128	void PluginProcess::createWebProcessConnection()	130	void PluginProcess::createWebProcessConnection()
129	{	131	{
130	// FIXME: This is platform specific!	132	#if PLATFORM(MAC)
131
132	// Create the listening port.	133	// Create the listening port.
133	mach_port_t listeningPort;	134	mach_port_t listeningPort;
134	mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &listeningPort);	135	mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &listeningPort);
Lines 142-147 void PluginProcess::createWebProcessConn Source/WebKit2/PluginProcess/PluginProcess.cpp_sec3
142		143
143	// Stop the shutdown timer.	144	// Stop the shutdown timer.
144	m_shutdownTimer.stop();	145	m_shutdownTimer.stop();
		146	#else
		147	ASSERT(false);
		148	#endif
145	}	149	}
146		150
147	void PluginProcess::getSitesWithData(uint64_t callbackID)	151	void PluginProcess::getSitesWithData(uint64_t callbackID)



    // Now try to initialize the plug-in.
    result = pluginControllerProxyPtr->initialize(parameters);

#if PLATFORM(MAC)
    if (result) {
        remoteLayerClientID = pluginControllerProxyPtr->remoteLayerClientID();
        return;
    }
#endif

    // We failed to initialize, remove the plug-in controller. This could cause us to be deleted.
    removePluginControllerProxy(pluginControllerProxyPtr);



    virtual HWND nativeWindow() = 0;
#endif

#if PLATFORM(MAC)
    virtual void setComplexTextInputEnabled(uint64_t pluginComplexTextInputIdentifier, bool complexTextInputEnabled) = 0;
#if PLATFORM(MAC)
    virtual void setAutodisplay(bool) = 0;
    virtual CGContextRef containingWindowGraphicsContext() = 0;
    virtual void didPerformDictionaryLookup(const String&, double scaleFactor, const DictionaryPopupInfo&) = 0;



    m_selectionState = selectionState;
}

#if PLATFORM(MAC)
// Complex text input support for plug-ins.
void WebPageProxy::sendComplexTextInputToPlugin(uint64_t pluginComplexTextInputIdentifier, const String& textInput)
{

    
    process()->send(Messages::WebPage::SendComplexTextInputToPlugin(pluginComplexTextInputIdentifier, textInput), m_pageID);
}
#endif

#if PLATFORM(WIN)
void WebPageProxy::didChangeCompositionSelection(bool hasComposition)

    m_pageClient->didFinishLoadingDataForCustomRepresentation(suggestedFilename, dataReference);
}

#if PLATFORM(MAC)
void WebPageProxy::setComplexTextInputEnabled(uint64_t pluginComplexTextInputIdentifier, bool complexTextInputEnabled)
{
    m_pageClient->setComplexTextInputEnabled(pluginComplexTextInputIdentifier, complexTextInputEnabled);
}

#if PLATFORM(MAC)
void WebPageProxy::setAutodisplay(bool newState)
{
    m_pageClient->setAutodisplay(newState);



    void getMarkedRange(uint64_t& location, uint64_t& length);
    uint64_t characterIndexForPoint(const WebCore::IntPoint);
    WebCore::IntRect firstRectForCharacterRange(uint64_t, uint64_t);
    void sendComplexTextInputToPlugin(uint64_t pluginComplexTextInputIdentifier, const String& textInput);
    CGContextRef containingWindowGraphicsContext();
#endif

    void sendComplexTextInputToPlugin(uint64_t pluginComplexTextInputIdentifier, const String& textInput);

#if PLATFORM(WIN)
    void didChangeCompositionSelection(bool);
    void confirmComposition(const String&);


    void didFinishLoadingDataForCustomRepresentation(const String& suggestedFilename, const CoreIPC::DataReference&);

#if PLATFORM(MAC)
    void setComplexTextInputEnabled(uint64_t pluginComplexTextInputIdentifier, bool complexTextInputEnabled);
#endif

    static String standardUserAgent(const String& applicationName = String());




    # Geolocation messages
    RequestGeolocationPermissionForFrame(uint64_t geolocationID, uint64_t frameID, WTF::String originIdentifier)

#if PLATFORM(MAC)
    # Plug-in complex text input support messages
    SetComplexTextInputEnabled(uint64_t pluginComplexTextInputIdentifier, bool complexTextInputEnabled)
#endif

#if PLATFORM(MAC)
    # Speech messages

Lines 270-275 void QWKPagePrivate::paint(QPainter* pai Source/WebKit2/UIProcess/API/qt/qwkpage.cpp_sec1
- Source/WebKit2/UIProcess/API/qt/qwkpage.cpp +7 lines
270	painter->fillRect(area, Qt::white);	270	painter->fillRect(area, Qt::white);
271	}	271	}
272		272
		273	void
		274	QWKPagePrivate::setComplexTextInputEnabled(uint64_t pluginComplexTextInputIdentifier,
		275	bool complexTextInputEnabled)
		276	{
		277	notImplemented();
		278	}
		279
273	void QWKPagePrivate::keyPressEvent(QKeyEvent* ev)	280	void QWKPagePrivate::keyPressEvent(QKeyEvent* ev)
274	{	281	{
275	page->handleKeyboardEvent(NativeWebKeyboardEvent(ev));	282	page->handleKeyboardEvent(NativeWebKeyboardEvent(ev));

Lines 89-94 public: Source/WebKit2/UIProcess/API/qt/qwkpage_p.h_sec1
- Source/WebKit2/UIProcess/API/qt/qwkpage_p.h +1 lines
89	virtual double customRepresentationZoomFactor() { return 1; }	89	virtual double customRepresentationZoomFactor() { return 1; }
90	virtual void setCustomRepresentationZoomFactor(double) { }	90	virtual void setCustomRepresentationZoomFactor(double) { }
91	virtual void didChangeScrollbarsForMainFrame() const { }	91	virtual void didChangeScrollbarsForMainFrame() const { }
		92	virtual void setComplexTextInputEnabled(uint64_t pluginComplexTextInputIdentifier, bool complexTextInputEnabled);
92		93
93	virtual void flashBackingStoreUpdates(const Vector<WebCore::IntRect>& updateRects);	94	virtual void flashBackingStoreUpdates(const Vector<WebCore::IntRect>& updateRects);
94		95

Lines 28-34 Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp_sec1
- Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp -2 / +9 lines
28		28
29	#if ENABLE(PLUGIN_PROCESS)	29	#if ENABLE(PLUGIN_PROCESS)
30		30
		31	#if PLATFORM(MAC)
31	#include "MachPort.h"	32	#include "MachPort.h"
		33	#endif
32	#include "PluginProcessCreationParameters.h"	34	#include "PluginProcessCreationParameters.h"
33	#include "PluginProcessManager.h"	35	#include "PluginProcessManager.h"
34	#include "PluginProcessMessages.h"	36	#include "PluginProcessMessages.h"
Lines 122-129 void PluginProcessProxy::pluginProcessCr Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp_sec2
122	CoreIPC::ArgumentEncoder* reply = m_pendingConnectionReplies.first().second;	124	CoreIPC::ArgumentEncoder* reply = m_pendingConnectionReplies.first().second;
123	m_pendingConnectionReplies.removeFirst();	125	m_pendingConnectionReplies.removeFirst();
124		126
125	// FIXME: This is Mac specific.	127	#if PLATFORM(MAC)
126	reply->encode(CoreIPC::MachPort(0, MACH_MSG_TYPE_MOVE_SEND));	128	reply->encode(CoreIPC::MachPort(0, MACH_MSG_TYPE_MOVE_SEND));
		129	#else
		130	ASSERT(false);
		131	#endif
127	replyWebProcessProxy->connection()->sendSyncReply(reply);	132	replyWebProcessProxy->connection()->sendSyncReply(reply);
128	}	133	}
129		134
Lines 190-195 void PluginProcessProxy::didFinishLaunch Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp_sec3
190	m_numPendingConnectionRequests = 0;	195	m_numPendingConnectionRequests = 0;
191	}	196	}
192		197
		198	#if PLATFORM(MAC)
193	void PluginProcessProxy::didCreateWebProcessConnection(const CoreIPC::MachPort& machPort)	199	void PluginProcessProxy::didCreateWebProcessConnection(const CoreIPC::MachPort& machPort)
194	{	200	{
195	ASSERT(!m_pendingConnectionReplies.isEmpty());	201	ASSERT(!m_pendingConnectionReplies.isEmpty());
Lines 199-208 void PluginProcessProxy::didCreateWebPro Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp_sec4
199	CoreIPC::ArgumentEncoder* reply = m_pendingConnectionReplies.first().second;	205	CoreIPC::ArgumentEncoder* reply = m_pendingConnectionReplies.first().second;
200	m_pendingConnectionReplies.removeFirst();	206	m_pendingConnectionReplies.removeFirst();
201		207
202	// FIXME: This is Mac specific.
203	reply->encode(CoreIPC::MachPort(machPort.port(), MACH_MSG_TYPE_MOVE_SEND));	208	reply->encode(CoreIPC::MachPort(machPort.port(), MACH_MSG_TYPE_MOVE_SEND));
		209
204	replyWebProcessProxy->connection()->sendSyncReply(reply);	210	replyWebProcessProxy->connection()->sendSyncReply(reply);
205	}	211	}
		212	#endif
206		213
207	void PluginProcessProxy::didGetSitesWithData(const Vector<String>& sites, uint64_t callbackID)	214	void PluginProcessProxy::didGetSitesWithData(const Vector<String>& sites, uint64_t callbackID)
208	{	215	{




    // Message handlers
    void didReceivePluginProcessProxyMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*);
#if PLATFORM(MAC)
    void didCreateWebProcessConnection(const CoreIPC::MachPort&);
#endif
    void didGetSitesWithData(const Vector<String>& sites, uint64_t callbackID);
    void didClearSiteData(uint64_t callbackID);




#if ENABLE(PLUGIN_PROCESS)

messages -> PluginProcessProxy {
#if PLATFORM(MAC)
    DidCreateWebProcessConnection(CoreIPC::MachPort connectionIdentifier)
#endif

    DidGetSitesWithData(Vector<WTF::String> sites, uint64_t callbackID)
    DidClearSiteData(uint64_t callbackID)

Lines 288-293 void WebView::didChangeScrollbarsForMain Source/WebKit2/UIProcess/gtk/WebView.cpp_sec1
- Source/WebKit2/UIProcess/gtk/WebView.cpp +5 lines
288	{	288	{
289	}	289	}
290		290
		291	void WebView::setComplexTextInputEnabled(uint64_t pluginComplexTextInputIdentifier, bool complexTextInputEnabled)
		292	{
		293	notImplemented();
		294	}
		295
291	void WebView::flashBackingStoreUpdates(const Vector<IntRect>&)	296	void WebView::flashBackingStoreUpdates(const Vector<IntRect>&)
292	{	297	{
293	notImplemented();	298	notImplemented();

Lines 99-104 private: Source/WebKit2/UIProcess/gtk/WebView.h_sec1
- Source/WebKit2/UIProcess/gtk/WebView.h +1 lines
99	virtual PassRefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy*);	99	virtual PassRefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy*);
100	virtual void setFindIndicator(PassRefPtr<FindIndicator>, bool fadeOut);	100	virtual void setFindIndicator(PassRefPtr<FindIndicator>, bool fadeOut);
101	virtual void didChangeScrollbarsForMainFrame() const;	101	virtual void didChangeScrollbarsForMainFrame() const;
		102	virtual void setComplexTextInputEnabled(uint64_t pluginComplexTextInputIdentifier, bool complexTextInputEnabled);
102	virtual void flashBackingStoreUpdates(const Vector<WebCore::IntRect>& updateRects);	103	virtual void flashBackingStoreUpdates(const Vector<WebCore::IntRect>& updateRects);
103		104
104	#if USE(ACCELERATED_COMPOSITING)	105	#if USE(ACCELERATED_COMPOSITING)

Lines 1157-1162 void WebView::didChangeScrollbarsForMain Source/WebKit2/UIProcess/win/WebView.cpp_sec1
- Source/WebKit2/UIProcess/win/WebView.cpp +4 lines
1157	{	1157	{
1158	}	1158	}
1159		1159
		1160	void WebView::setComplexTextInputEnabled(uint64_t pluginComplexTextInputIdentifier, bool complexTextInputEnabled)
		1161	{
		1162	}
		1163
1160	void WebView::setIsInWindow(bool isInWindow)	1164	void WebView::setIsInWindow(bool isInWindow)
1161	{	1165	{
1162	m_isInWindow = isInWindow;	1166	m_isInWindow = isInWindow;

Lines 168-173 private: Source/WebKit2/UIProcess/win/WebView.h_sec1
- Source/WebKit2/UIProcess/win/WebView.h +1 lines
168	virtual void setCustomRepresentationZoomFactor(double);	168	virtual void setCustomRepresentationZoomFactor(double);
169	WebCore::DragOperation keyStateToDragOperation(DWORD grfKeyState) const;	169	WebCore::DragOperation keyStateToDragOperation(DWORD grfKeyState) const;
170	virtual void didChangeScrollbarsForMainFrame() const;	170	virtual void didChangeScrollbarsForMainFrame() const;
		171	virtual void setComplexTextInputEnabled(uint64_t pluginComplexTextInputIdentifier, bool complexTextInputEnabled);
171		172
172	virtual HWND nativeWindow();	173	virtual HWND nativeWindow();
173		174




    // Tells the plug-in about window visibility changes.
    virtual void windowVisibilityChanged(bool) = 0;
#endif

    // Get the per complex text input identifier.
    virtual uint64_t pluginComplexTextInputIdentifier() const = 0;

    // Send the complex text input to the plug-in.
    virtual void sendComplexTextInput(const String& textInput) = 0;
#endif

    // Called when the private browsing state for this plug-in changes.
    virtual void privateBrowsingStateChanged(bool) = 0;



    virtual HWND nativeParentWindow() = 0;
#endif

#if PLATFORM(MAC)
    // Tells the controller that complex text input be enabled or disabled for the plug-in.
    virtual void setComplexTextInputEnabled(bool) = 0;

#if PLATFORM(MAC)
    // Returns the mach port of the compositing render server.
    virtual mach_port_t compositingRenderServerPort() = 0;
#endif




#include "ArgumentDecoder.h"
#include "ArgumentEncoder.h"
#if PLATFORM(MAC)
#include "MachPort.h"
#endif
#include "PluginProcessConnection.h"
#include "WebCoreArgumentCoders.h"
#include "WebProcess.h"

    }

    CoreIPC::Connection::Identifier connectionIdentifier;
#if PLATFORM(MAC)
    CoreIPC::MachPort connectionMachPort;
    if (!WebProcess::shared().connection()->deprecatedSendSync(WebProcessProxyLegacyMessage::GetPluginProcessConnection, 0, CoreIPC::In(pluginPath), CoreIPC::Out(connectionMachPort)))
        return 0;

    connectionIdentifier = connectionMachPort.port();
#else
    connectionIdentifier = 0;
    ASSERT(connectionIdentifier);
#endif
    if (!connectionIdentifier)
        return 0;




{
    m_connection->connection()->send(Messages::PluginControllerProxy::WindowVisibilityChanged(isVisible), m_pluginInstanceID);
}
#endif

uint64_t PluginProxy::pluginComplexTextInputIdentifier() const
{

    m_connection->connection()->send(Messages::PluginControllerProxy::SendComplexTextInput(textInput), m_pluginInstanceID);
}

#endif

void PluginProxy::privateBrowsingStateChanged(bool isPrivateBrowsingEnabled)
{
    m_connection->connection()->send(Messages::PluginControllerProxy::PrivateBrowsingStateChanged(isPrivateBrowsingEnabled), m_pluginInstanceID);

    m_pluginController->setStatusbarText(statusbarText);
}

#if PLATFORM(MAC)
void PluginProxy::setComplexTextInputEnabled(bool complexTextInputEnabled)
{
    m_pluginController->setComplexTextInputEnabled(complexTextInputEnabled);
}
#endif
    
void PluginProxy::update(const IntRect& paintedRect)
{



    virtual void windowFocusChanged(bool);
    virtual void windowAndViewFramesChanged(const WebCore::IntRect& windowFrameInScreenCoordinates, const WebCore::IntRect& viewFrameInWindowCoordinates);
    virtual void windowVisibilityChanged(bool);
#endif
    virtual uint64_t pluginComplexTextInputIdentifier() const;
    virtual void sendComplexTextInput(const String& textInput);
#endif

    virtual void privateBrowsingStateChanged(bool);


    void cancelStreamLoad(uint64_t streamID);
    void cancelManualStreamLoad();
    void setStatusbarText(const String& statusbarText);
#if PLATFORM(MAC)
    void setComplexTextInputEnabled(bool);
#endif

    String m_pluginPath;




    # Set the status bar text.
    SetStatusbarText(WTF::String statusbarText)

#if PLATFORM(MAC)
    # Change whether complext text input is enabled for this plug-in.
    SetComplexTextInputEnabled(bool complexTextInputEnabled)
#endif
}

#endif




    m_plugin->windowAndViewFramesChanged(windowFrameInScreenCoordinates, viewFrameInWindowCoordinates);
}
#endif

bool PluginView::sendComplexTextInput(uint64_t pluginComplexTextInputIdentifier, const String& textInput)
{

    return true;
}

#endif

void PluginView::initializePlugin()
{
    if (m_isInitialized)

}
#endif

#if PLATFORM(MAC)
void PluginView::setComplexTextInputEnabled(bool complexTextInputEnabled)
{
    m_webPage->send(Messages::WebPageProxy::SetComplexTextInputEnabled(m_plugin->pluginComplexTextInputIdentifier(), complexTextInputEnabled));
}

#if PLATFORM(MAC)
mach_port_t PluginView::compositingRenderServerPort()
{
    return WebProcess::shared().compositingRenderServerPort();



    void setWindowIsVisible(bool);
    void setWindowIsFocused(bool);
    void windowAndViewFramesChanged(const WebCore::IntRect& windowFrameInScreenCoordinates, const WebCore::IntRect& viewFrameInWindowCoordinates);
    bool sendComplexTextInput(uint64_t pluginComplexTextInputIdentifier, const String& textInput);
#endif
    bool sendComplexTextInput(uint64_t pluginComplexTextInputIdentifier, const String& textInput);

private:
    PluginView(PassRefPtr<WebCore::HTMLPlugInElement>, PassRefPtr<Plugin>, const Plugin::Parameters& parameters);

#if PLATFORM(WIN)
    virtual HWND nativeParentWindow();
#endif
#if PLATFORM(MAC)
    virtual void setComplexTextInputEnabled(bool);
#if PLATFORM(MAC)
    virtual mach_port_t compositingRenderServerPort();
#endif
    virtual String proxiesForURL(const String&);



    virtual void windowFocusChanged(bool);
    virtual void windowAndViewFramesChanged(const WebCore::IntRect& windowFrameInScreenCoordinates, const WebCore::IntRect& viewFrameInWindowCoordinates);
    virtual void windowVisibilityChanged(bool);
#endif

    virtual uint64_t pluginComplexTextInputIdentifier() const;
    virtual void sendComplexTextInput(const String& textInput);
#endif

    virtual void privateBrowsingStateChanged(bool);




    return false;
}

void NetscapePlugin::sendComplexTextInput(const String& textInput)
{
    notImplemented();
}

uint64_t NetscapePlugin::pluginComplexTextInputIdentifier() const
{
    notImplemented();
    // Just return a dummy value; this is only called for in-process plug-ins
    return static_cast<uint64_t>(reinterpret_cast<uintptr_t>(this));
}

} // namespace WebKit



    return false;
}

void NetscapePlugin::sendComplexTextInput(const String& textInput)
{
    notImplemented();
}

uint64_t NetscapePlugin::pluginComplexTextInputIdentifier() const
{
    notImplemented();
    // Just return a dummy value; this is only called for in-process plug-ins
    return static_cast<uint64_t>(reinterpret_cast<uintptr_t>(this));
}

} // namespace WebKit



    return false;
}

void NetscapePlugin::sendComplexTextInput(const String& textInput)
{
    notImplemented();
}

uint64_t NetscapePlugin::pluginComplexTextInputIdentifier() const
{
    notImplemented();
    // Just return a dummy value; this is only called for in-process plug-ins
    return static_cast<uint64_t>(reinterpret_cast<uintptr_t>(this));
}

} // namespace WebKit



#endif

#if ENABLE(PLUGIN_PROCESS)
#if PLATFORM(MAC)
#include "MachPort.h"
#endif
#endif

#if PLATFORM(QT)
#include "HitTestResult.h"

Lines 286-298 public: Source/WebKit2/WebProcess/WebPage/WebPage.h_sec1
- Source/WebKit2/WebProcess/WebPage/WebPage.h -3 / +2 lines
286		286
287	static void getLocationAndLengthFromRange(WebCore::Range*, uint64_t& location, uint64_t& length);	287	static void getLocationAndLengthFromRange(WebCore::Range*, uint64_t& location, uint64_t& length);
288		288
		289	void sendComplexTextInputToPlugin(uint64_t pluginComplexTextInputIdentifier, const String& textInput);
		290
289	#if PLATFORM(MAC)	291	#if PLATFORM(MAC)
290	void registerUIProcessAccessibilityTokens(const CoreIPC::DataReference& elemenToken, const CoreIPC::DataReference& windowToken);	292	void registerUIProcessAccessibilityTokens(const CoreIPC::DataReference& elemenToken, const CoreIPC::DataReference& windowToken);
291	AccessibilityWebPageObject* accessibilityRemoteObject();	293	AccessibilityWebPageObject* accessibilityRemoteObject();
292	WebCore::IntPoint accessibilityPosition() const { return m_accessibilityPosition; }	294	WebCore::IntPoint accessibilityPosition() const { return m_accessibilityPosition; }
293
294	void sendComplexTextInputToPlugin(uint64_t pluginComplexTextInputIdentifier, const String& textInput);
295
296	void getMarkedRange(uint64_t& location, uint64_t& length);	295	void getMarkedRange(uint64_t& location, uint64_t& length);
297	void characterIndexForPoint(const WebCore::IntPoint point, uint64_t& result);	296	void characterIndexForPoint(const WebCore::IntPoint point, uint64_t& result);
298	void firstRectForCharacterRange(uint64_t location, uint64_t length, WebCore::IntRect& resultRect);	297	void firstRectForCharacterRange(uint64_t location, uint64_t length, WebCore::IntRect& resultRect);



    SetCanRunBeforeUnloadConfirmPanel(bool canRunBeforeUnloadConfirmPanel)
    SetCanRunModal(bool canRunModal)

#if PLATFORM(MAC)
    # Complex text input support for plug-ins.
    SendComplexTextInputToPlugin(uint64_t pluginComplexTextInputIdentifier, String textInput)

#if PLATFORM(MAC)
    SetWindowIsVisible(bool windowIsVisible)
    WindowAndViewFramesChanged(WebCore::IntRect windowFrameInScreenCoordinates, WebCore::IntRect viewFrameInWindowCoordinates, WebCore::IntPoint accessibilityViewCoordinates)
    GetMarkedRange() -> (uint64_t location, uint64_t length)

Lines 31-36 Source/WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp_sec1
- Source/WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp +7 lines
31	#include <WebCore/FocusController.h>	31	#include <WebCore/FocusController.h>
32	#include <WebCore/Frame.h>	32	#include <WebCore/Frame.h>
33	#include <WebCore/KeyboardEvent.h>	33	#include <WebCore/KeyboardEvent.h>
		34	#include <WebCore/NotImplemented.h>
34	#include <WebCore/Page.h>	35	#include <WebCore/Page.h>
35	#include <WebCore/PlatformKeyboardEvent.h>	36	#include <WebCore/PlatformKeyboardEvent.h>
36	#include <WebCore/Settings.h>	37	#include <WebCore/Settings.h>
Lines 265-270 bool WebPage::performDefaultBehaviorForK Source/WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp_sec2
265	return true;	266	return true;
266	}	267	}
267		268
		269	void WebPage::sendComplexTextInputToPlugin(uint64_t pluginComplexTextInputIdentifier, const String& textInput)
		270	{
		271	// FIXME: Implement
		272	notImplemented();
		273	}
		274
268	bool WebPage::platformHasLocalDataForURL(const WebCore::KURL&)	275	bool WebPage::platformHasLocalDataForURL(const WebCore::KURL&)
269	{	276	{
270	// FIXME: Implement	277	// FIXME: Implement

Lines 342-345 void WebPage::getSelectedText(String& te Source/WebKit2/WebProcess/WebPage/win/WebPageWin.cpp_sec1
- Source/WebKit2/WebProcess/WebPage/win/WebPageWin.cpp +5 lines
342	text = selectedRange->text();	342	text = selectedRange->text();
343	}	343	}
344		344
		345	void WebPage::sendComplexTextInputToPlugin(uint64_t pluginComplexTextInputIdentifier, const String& textInput)
		346	{
		347	// FIXME: Implement
		348	}
		349
345	} // namespace WebKit	350	} // namespace WebKit

Return to Bug 55719

Lines 2003-2009 void WebPageProxy::selectionStateChanged Source/WebKit2/UIProcess/WebPageProxy.cpp_sec1
- Source/WebKit2/UIProcess/WebPageProxy.cpp -3 / +1 lines
2003	m_selectionState = selectionState;	2003	m_selectionState = selectionState;
2004	}	2004	}
2005		2005
2006	#if PLATFORM(MAC)
2007	// Complex text input support for plug-ins.	2006	// Complex text input support for plug-ins.
2008	void WebPageProxy::sendComplexTextInputToPlugin(uint64_t pluginComplexTextInputIdentifier, const String& textInput)	2007	void WebPageProxy::sendComplexTextInputToPlugin(uint64_t pluginComplexTextInputIdentifier, const String& textInput)
2009	{	2008	{
Lines 2012-2018 void WebPageProxy::sendComplexTextInputT Source/WebKit2/UIProcess/WebPageProxy.cpp_sec2
2012		2011
2013	process()->send(Messages::WebPage::SendComplexTextInputToPlugin(pluginComplexTextInputIdentifier, textInput), m_pageID);	2012	process()->send(Messages::WebPage::SendComplexTextInputToPlugin(pluginComplexTextInputIdentifier, textInput), m_pageID);
2014	}	2013	}
2015	#endif
2016		2014
2017	#if PLATFORM(WIN)	2015	#if PLATFORM(WIN)
2018	void WebPageProxy::didChangeCompositionSelection(bool hasComposition)	2016	void WebPageProxy::didChangeCompositionSelection(bool hasComposition)
Lines 2735-2746 void WebPageProxy::didFinishLoadingDataF Source/WebKit2/UIProcess/WebPageProxy.cpp_sec3
2735	m_pageClient->didFinishLoadingDataForCustomRepresentation(suggestedFilename, dataReference);	2733	m_pageClient->didFinishLoadingDataForCustomRepresentation(suggestedFilename, dataReference);
2736	}	2734	}
2737		2735
2738	#if PLATFORM(MAC)
2739	void WebPageProxy::setComplexTextInputEnabled(uint64_t pluginComplexTextInputIdentifier, bool complexTextInputEnabled)	2736	void WebPageProxy::setComplexTextInputEnabled(uint64_t pluginComplexTextInputIdentifier, bool complexTextInputEnabled)
2740	{	2737	{
2741	m_pageClient->setComplexTextInputEnabled(pluginComplexTextInputIdentifier, complexTextInputEnabled);	2738	m_pageClient->setComplexTextInputEnabled(pluginComplexTextInputIdentifier, complexTextInputEnabled);
2742	}	2739	}
2743		2740
		2741	#if PLATFORM(MAC)
2744	void WebPageProxy::setAutodisplay(bool newState)	2742	void WebPageProxy::setAutodisplay(bool newState)
2745	{	2743	{
2746	m_pageClient->setAutodisplay(newState);	2744	m_pageClient->setAutodisplay(newState);

Lines 258-266 public: Source/WebKit2/UIProcess/WebPageProxy.h_sec1
- Source/WebKit2/UIProcess/WebPageProxy.h -3 / +3 lines
258	void getMarkedRange(uint64_t& location, uint64_t& length);	258	void getMarkedRange(uint64_t& location, uint64_t& length);
259	uint64_t characterIndexForPoint(const WebCore::IntPoint);	259	uint64_t characterIndexForPoint(const WebCore::IntPoint);
260	WebCore::IntRect firstRectForCharacterRange(uint64_t, uint64_t);	260	WebCore::IntRect firstRectForCharacterRange(uint64_t, uint64_t);
261	void sendComplexTextInputToPlugin(uint64_t pluginComplexTextInputIdentifier, const String& textInput);
262	CGContextRef containingWindowGraphicsContext();	261	CGContextRef containingWindowGraphicsContext();
263	#endif	262	#endif
		263
		264	void sendComplexTextInputToPlugin(uint64_t pluginComplexTextInputIdentifier, const String& textInput);
		265
264	#if PLATFORM(WIN)	266	#if PLATFORM(WIN)
265	void didChangeCompositionSelection(bool);	267	void didChangeCompositionSelection(bool);
266	void confirmComposition(const String&);	268	void confirmComposition(const String&);
Lines 630-638 private: Source/WebKit2/UIProcess/WebPageProxy.h_sec2
630		632
631	void didFinishLoadingDataForCustomRepresentation(const String& suggestedFilename, const CoreIPC::DataReference&);	633	void didFinishLoadingDataForCustomRepresentation(const String& suggestedFilename, const CoreIPC::DataReference&);
632		634
633	#if PLATFORM(MAC)
634	void setComplexTextInputEnabled(uint64_t pluginComplexTextInputIdentifier, bool complexTextInputEnabled);	635	void setComplexTextInputEnabled(uint64_t pluginComplexTextInputIdentifier, bool complexTextInputEnabled);
635	#endif
636		636
637	static String standardUserAgent(const String& applicationName = String());	637	static String standardUserAgent(const String& applicationName = String());
638		638

Lines 177-186 messages -> WebPageProxy { Source/WebKit2/UIProcess/WebPageProxy.messages.in_sec1
- Source/WebKit2/UIProcess/WebPageProxy.messages.in -2 lines
177	# Geolocation messages	177	# Geolocation messages
178	RequestGeolocationPermissionForFrame(uint64_t geolocationID, uint64_t frameID, WTF::String originIdentifier)	178	RequestGeolocationPermissionForFrame(uint64_t geolocationID, uint64_t frameID, WTF::String originIdentifier)
179		179
180	#if PLATFORM(MAC)
181	# Plug-in complex text input support messages	180	# Plug-in complex text input support messages
182	SetComplexTextInputEnabled(uint64_t pluginComplexTextInputIdentifier, bool complexTextInputEnabled)	181	SetComplexTextInputEnabled(uint64_t pluginComplexTextInputIdentifier, bool complexTextInputEnabled)
183	#endif
184		182
185	#if PLATFORM(MAC)	183	#if PLATFORM(MAC)
186	# Speech messages	184	# Speech messages

Lines 337-342 void PluginProxy::windowVisibilityChange Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp_sec1
- Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp -4 / +1 lines
337	{	337	{
338	m_connection->connection()->send(Messages::PluginControllerProxy::WindowVisibilityChanged(isVisible), m_pluginInstanceID);	338	m_connection->connection()->send(Messages::PluginControllerProxy::WindowVisibilityChanged(isVisible), m_pluginInstanceID);
339	}	339	}
		340	#endif
340		341
341	uint64_t PluginProxy::pluginComplexTextInputIdentifier() const	342	uint64_t PluginProxy::pluginComplexTextInputIdentifier() const
342	{	343	{
Lines 348-355 void PluginProxy::sendComplexTextInput(c Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp_sec2
348	m_connection->connection()->send(Messages::PluginControllerProxy::SendComplexTextInput(textInput), m_pluginInstanceID);	349	m_connection->connection()->send(Messages::PluginControllerProxy::SendComplexTextInput(textInput), m_pluginInstanceID);
349	}	350	}
350		351
351	#endif
352
353	void PluginProxy::privateBrowsingStateChanged(bool isPrivateBrowsingEnabled)	352	void PluginProxy::privateBrowsingStateChanged(bool isPrivateBrowsingEnabled)
354	{	353	{
355	m_connection->connection()->send(Messages::PluginControllerProxy::PrivateBrowsingStateChanged(isPrivateBrowsingEnabled), m_pluginInstanceID);	354	m_connection->connection()->send(Messages::PluginControllerProxy::PrivateBrowsingStateChanged(isPrivateBrowsingEnabled), m_pluginInstanceID);
Lines 440-451 void PluginProxy::setStatusbarText(const Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp_sec3
440	m_pluginController->setStatusbarText(statusbarText);	439	m_pluginController->setStatusbarText(statusbarText);
441	}	440	}
442		441
443	#if PLATFORM(MAC)
444	void PluginProxy::setComplexTextInputEnabled(bool complexTextInputEnabled)	442	void PluginProxy::setComplexTextInputEnabled(bool complexTextInputEnabled)
445	{	443	{
446	m_pluginController->setComplexTextInputEnabled(complexTextInputEnabled);	444	m_pluginController->setComplexTextInputEnabled(complexTextInputEnabled);
447	}	445	}
448	#endif
449		446
450	void PluginProxy::update(const IntRect& paintedRect)	447	void PluginProxy::update(const IntRect& paintedRect)
451	{	448	{

Lines 397-402 void PluginView::windowAndViewFramesChan Source/WebKit2/WebProcess/Plugins/PluginView.cpp_sec1
- Source/WebKit2/WebProcess/Plugins/PluginView.cpp -3 / +2 lines
397		397
398	m_plugin->windowAndViewFramesChanged(windowFrameInScreenCoordinates, viewFrameInWindowCoordinates);	398	m_plugin->windowAndViewFramesChanged(windowFrameInScreenCoordinates, viewFrameInWindowCoordinates);
399	}	399	}
		400	#endif
400		401
401	bool PluginView::sendComplexTextInput(uint64_t pluginComplexTextInputIdentifier, const String& textInput)	402	bool PluginView::sendComplexTextInput(uint64_t pluginComplexTextInputIdentifier, const String& textInput)
402	{	403	{
Lines 410-417 bool PluginView::sendComplexTextInput(ui Source/WebKit2/WebProcess/Plugins/PluginView.cpp_sec2
410	return true;	411	return true;
411	}	412	}
412		413
413	#endif
414
415	void PluginView::initializePlugin()	414	void PluginView::initializePlugin()
416	{	415	{
417	if (m_isInitialized)	416	if (m_isInitialized)
Lines 989-1000 HWND PluginView::nativeParentWindow() Source/WebKit2/WebProcess/Plugins/PluginView.cpp_sec3
989	}	988	}
990	#endif	989	#endif
991		990
992	#if PLATFORM(MAC)
993	void PluginView::setComplexTextInputEnabled(bool complexTextInputEnabled)	991	void PluginView::setComplexTextInputEnabled(bool complexTextInputEnabled)
994	{	992	{
995	m_webPage->send(Messages::WebPageProxy::SetComplexTextInputEnabled(m_plugin->pluginComplexTextInputIdentifier(), complexTextInputEnabled));	993	m_webPage->send(Messages::WebPageProxy::SetComplexTextInputEnabled(m_plugin->pluginComplexTextInputIdentifier(), complexTextInputEnabled));
996	}	994	}
997		995
		996	#if PLATFORM(MAC)
998	mach_port_t PluginView::compositingRenderServerPort()	997	mach_port_t PluginView::compositingRenderServerPort()
999	{	998	{
1000	return WebProcess::shared().compositingRenderServerPort();	999	return WebProcess::shared().compositingRenderServerPort();

Lines 1-3 Source/WebKit2/ChangeLog_sec1
- Source/WebKit2/ChangeLog +51 lines
		1	2011-03-06 Oleg Romashin <romaxa@gmail.com>
		2
		3	Reviewed by NOBODY (OOPS!).
		4
		5	Make Qt port compiling with ENABLE_PLUGIN_PROCESS=1, part2
		6	Make ComplexTextInput compiling for Qt
		7	Cover with ifdef MachPort related functionality
		8	https://bugs.webkit.org/show_bug.cgi?id=55719
		9
		10	* PluginProcess/PluginControllerProxy.cpp:
		11	(WebKit::PluginControllerProxy::sendComplexTextInput):
		12	* PluginProcess/PluginControllerProxy.h:
		13	* PluginProcess/PluginProcess.cpp:
		14	(WebKit::PluginProcess::createWebProcessConnection):
		15	* PluginProcess/WebProcessConnection.cpp:
		16	(WebKit::WebProcessConnection::createPlugin):
		17	* UIProcess/API/qt/qwkpage.cpp:
		18	(QWKPagePrivate::setComplexTextInputEnabled):
		19	* UIProcess/API/qt/qwkpage_p.h:
		20	* UIProcess/PageClient.h:
		21	* UIProcess/Plugins/PluginProcessProxy.cpp:
		22	(WebKit::PluginProcessProxy::pluginProcessCrashedOrFailedToLaunch):
		23	(WebKit::PluginProcessProxy::didCreateWebProcessConnection):
		24	* UIProcess/Plugins/PluginProcessProxy.h:
		25	* UIProcess/Plugins/PluginProcessProxy.messages.in:
		26	* UIProcess/WebPageProxy.cpp:
		27	(WebKit::WebPageProxy::sendComplexTextInputToPlugin):
		28	* UIProcess/WebPageProxy.h:
		29	* UIProcess/WebPageProxy.messages.in:
		30	* WebProcess/Plugins/Netscape/NetscapePlugin.h:
		31	* WebProcess/Plugins/Netscape/qt/NetscapePluginQt.cpp:
		32	(WebKit::NetscapePlugin::sendComplexTextInput):
		33	(WebKit::NetscapePlugin::pluginComplexTextInputIdentifier):
		34	* WebProcess/Plugins/Plugin.h:
		35	* WebProcess/Plugins/PluginController.h:
		36	* WebProcess/Plugins/PluginProcessConnectionManager.cpp:
		37	(WebKit::PluginProcessConnectionManager::getPluginProcessConnection):
		38	* WebProcess/Plugins/PluginProxy.cpp:
		39	(WebKit::PluginProxy::setComplexTextInputEnabled):
		40	* WebProcess/Plugins/PluginProxy.h:
		41	* WebProcess/Plugins/PluginProxy.messages.in:
		42	* WebProcess/Plugins/PluginView.cpp:
		43	* WebProcess/Plugins/PluginView.h:
		44	* WebProcess/WebPage/WebPage.cpp:
		45	* WebProcess/WebPage/WebPage.h:
		46	(WebKit::WebPage::accessibilityPosition):
		47	* WebProcess/WebPage/WebPage.messages.in:
		48	* WebProcess/WebPage/qt/WebPageQt.cpp:
		49	(WebKit::WebPage::performDefaultBehaviorForKeyEvent):
		50	(WebKit::WebPage::sendComplexTextInputToPlugin):
		51
1	2011-03-06 Jessie Berlin <jberlin@apple.com>	52	2011-03-06 Jessie Berlin <jberlin@apple.com>
2		53
3	Reviewed by Sam Weinig.	54	Reviewed by Sam Weinig.

Lines 264-273 void PluginControllerProxy::setComplexTe Source/WebKit2/PluginProcess/PluginControllerProxy.cpp_sec1
- Source/WebKit2/PluginProcess/PluginControllerProxy.cpp -2 / +3 lines
264	m_connection->connection()->send(Messages::PluginProxy::SetComplexTextInputEnabled(complexTextInputEnabled), m_pluginInstanceID);	264	m_connection->connection()->send(Messages::PluginProxy::SetComplexTextInputEnabled(complexTextInputEnabled), m_pluginInstanceID);
265	}	265	}
266		266
		267	#if PLATFORM(MAC)
267	mach_port_t PluginControllerProxy::compositingRenderServerPort()	268	mach_port_t PluginControllerProxy::compositingRenderServerPort()
268	{	269	{
269	return PluginProcess::shared().compositingRenderServerPort();	270	return PluginProcess::shared().compositingRenderServerPort();
270	}	271	}
		272	#endif
271		273
272	String PluginControllerProxy::proxiesForURL(const String& urlString)	274	String PluginControllerProxy::proxiesForURL(const String& urlString)
273	{	275	{
Lines 478-491 void PluginControllerProxy::windowVisibi Source/WebKit2/PluginProcess/PluginControllerProxy.cpp_sec2
478	{	480	{
479	m_plugin->windowVisibilityChanged(isVisible);	481	m_plugin->windowVisibilityChanged(isVisible);
480	}	482	}
		483	#endif
481		484
482	void PluginControllerProxy::sendComplexTextInput(const String& textInput)	485	void PluginControllerProxy::sendComplexTextInput(const String& textInput)
483	{	486	{
484	m_plugin->sendComplexTextInput(textInput);	487	m_plugin->sendComplexTextInput(textInput);
485	}	488	}
486		489
487	#endif
488
489	void PluginControllerProxy::privateBrowsingStateChanged(bool isPrivateBrowsingEnabled)	490	void PluginControllerProxy::privateBrowsingStateChanged(bool isPrivateBrowsingEnabled)
490	{	491	{
491	m_plugin->privateBrowsingStateChanged(isPrivateBrowsingEnabled);	492	m_plugin->privateBrowsingStateChanged(isPrivateBrowsingEnabled);

Lines 90-97 private: Source/WebKit2/PluginProcess/PluginControllerProxy.h_sec1
- Source/WebKit2/PluginProcess/PluginControllerProxy.h -3 / +3 lines
90	virtual bool isAcceleratedCompositingEnabled();	90	virtual bool isAcceleratedCompositingEnabled();
91	virtual void pluginProcessCrashed();	91	virtual void pluginProcessCrashed();
92		92
93	#if PLATFORM(MAC)
94	virtual void setComplexTextInputEnabled(bool);	93	virtual void setComplexTextInputEnabled(bool);
		94	#if PLATFORM(MAC)
95	virtual mach_port_t compositingRenderServerPort();	95	virtual mach_port_t compositingRenderServerPort();
96	#endif	96	#endif
97		97
Lines 130-137 private: Source/WebKit2/PluginProcess/PluginControllerProxy.h_sec2
130	void windowFocusChanged(bool);	130	void windowFocusChanged(bool);
131	void windowAndViewFramesChanged(const WebCore::IntRect& windowFrameInScreenCoordinates, const WebCore::IntRect& viewFrameInWindowCoordinates);	131	void windowAndViewFramesChanged(const WebCore::IntRect& windowFrameInScreenCoordinates, const WebCore::IntRect& viewFrameInWindowCoordinates);
132	void windowVisibilityChanged(bool);	132	void windowVisibilityChanged(bool);
133	void sendComplexTextInput(const String& textInput);
134	#endif	133	#endif
		134	void sendComplexTextInput(const String& textInput);
135		135
136	void privateBrowsingStateChanged(bool);	136	void privateBrowsingStateChanged(bool);
137		137
Lines 172-181 private: Source/WebKit2/PluginProcess/PluginControllerProxy.h_sec3
172	// Whether the plug-in has canceled the manual stream load.	172	// Whether the plug-in has canceled the manual stream load.
173	bool m_pluginCanceledManualStreamLoad;	173	bool m_pluginCanceledManualStreamLoad;
174		174
175	#if PLATFORM(MAC)
176	// Whether complex text input is enabled for this plug-in.	175	// Whether complex text input is enabled for this plug-in.
177	bool m_isComplexTextInputEnabled;	176	bool m_isComplexTextInputEnabled;
178		177
		178	#if PLATFORM(MAC)
179	// For CA plug-ins, this holds the information needed to export the layer hierarchy to the UI process.	179	// For CA plug-ins, this holds the information needed to export the layer hierarchy to the UI process.
180	RetainPtr<WKCARemoteLayerClientRef> m_remoteLayerClient;	180	RetainPtr<WKCARemoteLayerClientRef> m_remoteLayerClient;
181	#endif	181	#endif

Lines 167-176 void WebProcessConnection::createPlugin( Source/WebKit2/PluginProcess/WebProcessConnection.cpp_sec1
- Source/WebKit2/PluginProcess/WebProcessConnection.cpp +2 lines
167	// Now try to initialize the plug-in.	167	// Now try to initialize the plug-in.
168	result = pluginControllerProxyPtr->initialize(parameters);	168	result = pluginControllerProxyPtr->initialize(parameters);
169		169
		170	#if PLATFORM(MAC)
170	if (result) {	171	if (result) {
171	remoteLayerClientID = pluginControllerProxyPtr->remoteLayerClientID();	172	remoteLayerClientID = pluginControllerProxyPtr->remoteLayerClientID();
172	return;	173	return;
173	}	174	}
		175	#endif
174		176
175	// We failed to initialize, remove the plug-in controller. This could cause us to be deleted.	177	// We failed to initialize, remove the plug-in controller. This could cause us to be deleted.
176	removePluginControllerProxy(pluginControllerProxyPtr);	178	removePluginControllerProxy(pluginControllerProxyPtr);

Lines 124-131 public: Source/WebKit2/UIProcess/PageClient.h_sec1
- Source/WebKit2/UIProcess/PageClient.h -1 / +1 lines
124	virtual HWND nativeWindow() = 0;	124	virtual HWND nativeWindow() = 0;
125	#endif	125	#endif
126		126
127	#if PLATFORM(MAC)
128	virtual void setComplexTextInputEnabled(uint64_t pluginComplexTextInputIdentifier, bool complexTextInputEnabled) = 0;	127	virtual void setComplexTextInputEnabled(uint64_t pluginComplexTextInputIdentifier, bool complexTextInputEnabled) = 0;
		128	#if PLATFORM(MAC)
129	virtual void setAutodisplay(bool) = 0;	129	virtual void setAutodisplay(bool) = 0;
130	virtual CGContextRef containingWindowGraphicsContext() = 0;	130	virtual CGContextRef containingWindowGraphicsContext() = 0;
131	virtual void didPerformDictionaryLookup(const String&, double scaleFactor, const DictionaryPopupInfo&) = 0;	131	virtual void didPerformDictionaryLookup(const String&, double scaleFactor, const DictionaryPopupInfo&) = 0;

Lines 77-83 private: Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h_sec1
- Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h +2 lines
77		77
78	// Message handlers	78	// Message handlers
79	void didReceivePluginProcessProxyMessage(CoreIPC::Connection, CoreIPC::MessageID, CoreIPC::ArgumentDecoder);	79	void didReceivePluginProcessProxyMessage(CoreIPC::Connection, CoreIPC::MessageID, CoreIPC::ArgumentDecoder);
		80	#if PLATFORM(MAC)
80	void didCreateWebProcessConnection(const CoreIPC::MachPort&);	81	void didCreateWebProcessConnection(const CoreIPC::MachPort&);
		82	#endif
81	void didGetSitesWithData(const Vector<String>& sites, uint64_t callbackID);	83	void didGetSitesWithData(const Vector<String>& sites, uint64_t callbackID);
82	void didClearSiteData(uint64_t callbackID);	84	void didClearSiteData(uint64_t callbackID);
83		85

Lines 154-166 public: Source/WebKit2/WebProcess/Plugins/Plugin.h_sec1
- Source/WebKit2/WebProcess/Plugins/Plugin.h -1 / +1 lines
154		154
155	// Tells the plug-in about window visibility changes.	155	// Tells the plug-in about window visibility changes.
156	virtual void windowVisibilityChanged(bool) = 0;	156	virtual void windowVisibilityChanged(bool) = 0;
		157	#endif
157		158
158	// Get the per complex text input identifier.	159	// Get the per complex text input identifier.
159	virtual uint64_t pluginComplexTextInputIdentifier() const = 0;	160	virtual uint64_t pluginComplexTextInputIdentifier() const = 0;
160		161
161	// Send the complex text input to the plug-in.	162	// Send the complex text input to the plug-in.
162	virtual void sendComplexTextInput(const String& textInput) = 0;	163	virtual void sendComplexTextInput(const String& textInput) = 0;
163	#endif
164		164
165	// Called when the private browsing state for this plug-in changes.	165	// Called when the private browsing state for this plug-in changes.
166	virtual void privateBrowsingStateChanged(bool) = 0;	166	virtual void privateBrowsingStateChanged(bool) = 0;

Lines 88-97 public: Source/WebKit2/WebProcess/Plugins/PluginController.h_sec1
- Source/WebKit2/WebProcess/Plugins/PluginController.h -1 / +1 lines
88	virtual HWND nativeParentWindow() = 0;	88	virtual HWND nativeParentWindow() = 0;
89	#endif	89	#endif
90		90
91	#if PLATFORM(MAC)
92	// Tells the controller that complex text input be enabled or disabled for the plug-in.	91	// Tells the controller that complex text input be enabled or disabled for the plug-in.
93	virtual void setComplexTextInputEnabled(bool) = 0;	92	virtual void setComplexTextInputEnabled(bool) = 0;
94		93
		94	#if PLATFORM(MAC)
95	// Returns the mach port of the compositing render server.	95	// Returns the mach port of the compositing render server.
96	virtual mach_port_t compositingRenderServerPort() = 0;	96	virtual mach_port_t compositingRenderServerPort() = 0;
97	#endif	97	#endif

Lines 30-36 Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.cpp_sec1
- Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.cpp +7 lines
30		30
31	#include "ArgumentDecoder.h"	31	#include "ArgumentDecoder.h"
32	#include "ArgumentEncoder.h"	32	#include "ArgumentEncoder.h"
		33	#if PLATFORM(MAC)
33	#include "MachPort.h"	34	#include "MachPort.h"
		35	#endif
34	#include "PluginProcessConnection.h"	36	#include "PluginProcessConnection.h"
35	#include "WebCoreArgumentCoders.h"	37	#include "WebCoreArgumentCoders.h"
36	#include "WebProcess.h"	38	#include "WebProcess.h"
Lines 61-71 PluginProcessConnection* PluginProcessCo Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.cpp_sec2
61	}	63	}
62		64
63	CoreIPC::Connection::Identifier connectionIdentifier;	65	CoreIPC::Connection::Identifier connectionIdentifier;
		66	#if PLATFORM(MAC)
64	CoreIPC::MachPort connectionMachPort;	67	CoreIPC::MachPort connectionMachPort;
65	if (!WebProcess::shared().connection()->deprecatedSendSync(WebProcessProxyLegacyMessage::GetPluginProcessConnection, 0, CoreIPC::In(pluginPath), CoreIPC::Out(connectionMachPort)))	68	if (!WebProcess::shared().connection()->deprecatedSendSync(WebProcessProxyLegacyMessage::GetPluginProcessConnection, 0, CoreIPC::In(pluginPath), CoreIPC::Out(connectionMachPort)))
66	return 0;	69	return 0;
67		70
68	connectionIdentifier = connectionMachPort.port();	71	connectionIdentifier = connectionMachPort.port();
		72	#else
		73	connectionIdentifier = 0;
		74	ASSERT(connectionIdentifier);
		75	#endif
69	if (!connectionIdentifier)	76	if (!connectionIdentifier)
70	return 0;	77	return 0;
71		78

Lines 92-100 private: Source/WebKit2/WebProcess/Plugins/PluginProxy.h_sec1
- Source/WebKit2/WebProcess/Plugins/PluginProxy.h -3 / +1 lines
92	virtual void windowFocusChanged(bool);	92	virtual void windowFocusChanged(bool);
93	virtual void windowAndViewFramesChanged(const WebCore::IntRect& windowFrameInScreenCoordinates, const WebCore::IntRect& viewFrameInWindowCoordinates);	93	virtual void windowAndViewFramesChanged(const WebCore::IntRect& windowFrameInScreenCoordinates, const WebCore::IntRect& viewFrameInWindowCoordinates);
94	virtual void windowVisibilityChanged(bool);	94	virtual void windowVisibilityChanged(bool);
		95	#endif
95	virtual uint64_t pluginComplexTextInputIdentifier() const;	96	virtual uint64_t pluginComplexTextInputIdentifier() const;
96	virtual void sendComplexTextInput(const String& textInput);	97	virtual void sendComplexTextInput(const String& textInput);
97	#endif
98		98
99	virtual void privateBrowsingStateChanged(bool);	99	virtual void privateBrowsingStateChanged(bool);
100		100
Lines 114-122 private: Source/WebKit2/WebProcess/Plugins/PluginProxy.h_sec2
114	void cancelStreamLoad(uint64_t streamID);	114	void cancelStreamLoad(uint64_t streamID);
115	void cancelManualStreamLoad();	115	void cancelManualStreamLoad();
116	void setStatusbarText(const String& statusbarText);	116	void setStatusbarText(const String& statusbarText);
117	#if PLATFORM(MAC)
118	void setComplexTextInputEnabled(bool);	117	void setComplexTextInputEnabled(bool);
119	#endif
120		118
121	String m_pluginPath;	119	String m_pluginPath;
122		120

Lines 56-65 messages -> PluginProxy { Source/WebKit2/WebProcess/Plugins/PluginProxy.messages.in_sec1
- Source/WebKit2/WebProcess/Plugins/PluginProxy.messages.in -2 lines
56	# Set the status bar text.	56	# Set the status bar text.
57	SetStatusbarText(WTF::String statusbarText)	57	SetStatusbarText(WTF::String statusbarText)
58		58
59	#if PLATFORM(MAC)
60	# Change whether complext text input is enabled for this plug-in.	59	# Change whether complext text input is enabled for this plug-in.
61	SetComplexTextInputEnabled(bool complexTextInputEnabled)	60	SetComplexTextInputEnabled(bool complexTextInputEnabled)
62	#endif
63	}	61	}
64		62
65	#endif	63	#endif

Lines 64-71 public: Source/WebKit2/WebProcess/Plugins/PluginView.h_sec1
- Source/WebKit2/WebProcess/Plugins/PluginView.h -2 / +2 lines
64	void setWindowIsVisible(bool);	64	void setWindowIsVisible(bool);
65	void setWindowIsFocused(bool);	65	void setWindowIsFocused(bool);
66	void windowAndViewFramesChanged(const WebCore::IntRect& windowFrameInScreenCoordinates, const WebCore::IntRect& viewFrameInWindowCoordinates);	66	void windowAndViewFramesChanged(const WebCore::IntRect& windowFrameInScreenCoordinates, const WebCore::IntRect& viewFrameInWindowCoordinates);
67	bool sendComplexTextInput(uint64_t pluginComplexTextInputIdentifier, const String& textInput);
68	#endif	67	#endif
		68	bool sendComplexTextInput(uint64_t pluginComplexTextInputIdentifier, const String& textInput);
69		69
70	private:	70	private:
71	PluginView(PassRefPtr<WebCore::HTMLPlugInElement>, PassRefPtr<Plugin>, const Plugin::Parameters& parameters);	71	PluginView(PassRefPtr<WebCore::HTMLPlugInElement>, PassRefPtr<Plugin>, const Plugin::Parameters& parameters);
Lines 132-139 private: Source/WebKit2/WebProcess/Plugins/PluginView.h_sec2
132	#if PLATFORM(WIN)	132	#if PLATFORM(WIN)
133	virtual HWND nativeParentWindow();	133	virtual HWND nativeParentWindow();
134	#endif	134	#endif
135	#if PLATFORM(MAC)
136	virtual void setComplexTextInputEnabled(bool);	135	virtual void setComplexTextInputEnabled(bool);
		136	#if PLATFORM(MAC)
137	virtual mach_port_t compositingRenderServerPort();	137	virtual mach_port_t compositingRenderServerPort();
138	#endif	138	#endif
139	virtual String proxiesForURL(const String&);	139	virtual String proxiesForURL(const String&);

Lines 172-181 private: Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h_sec1
- Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h -1 / +1 lines
172	virtual void windowFocusChanged(bool);	172	virtual void windowFocusChanged(bool);
173	virtual void windowAndViewFramesChanged(const WebCore::IntRect& windowFrameInScreenCoordinates, const WebCore::IntRect& viewFrameInWindowCoordinates);	173	virtual void windowAndViewFramesChanged(const WebCore::IntRect& windowFrameInScreenCoordinates, const WebCore::IntRect& viewFrameInWindowCoordinates);
174	virtual void windowVisibilityChanged(bool);	174	virtual void windowVisibilityChanged(bool);
		175	#endif
175		176
176	virtual uint64_t pluginComplexTextInputIdentifier() const;	177	virtual uint64_t pluginComplexTextInputIdentifier() const;
177	virtual void sendComplexTextInput(const String& textInput);	178	virtual void sendComplexTextInput(const String& textInput);
178	#endif
179		179
180	virtual void privateBrowsingStateChanged(bool);	180	virtual void privateBrowsingStateChanged(bool);
181		181

Lines 102-105 bool NetscapePlugin::platformHandleKeybo Source/WebKit2/WebProcess/Plugins/Netscape/gtk/NetscapePluginGtk.cpp_sec1
- Source/WebKit2/WebProcess/Plugins/Netscape/gtk/NetscapePluginGtk.cpp +12 lines
102	return false;	102	return false;
103	}	103	}
104		104
		105	void NetscapePlugin::sendComplexTextInput(const String& textInput)
		106	{
		107	notImplemented();
		108	}
		109
		110	uint64_t NetscapePlugin::pluginComplexTextInputIdentifier() const
		111	{
		112	notImplemented();
		113	// Just return a dummy value; this is only called for in-process plug-ins
		114	return static_cast<uint64_t>(reinterpret_cast<uintptr_t>(this));
		115	}
		116
105	} // namespace WebKit	117	} // namespace WebKit

Lines 170-179 messages -> WebPage { Source/WebKit2/WebProcess/WebPage/WebPage.messages.in_sec1
- Source/WebKit2/WebProcess/WebPage/WebPage.messages.in -1 / +1 lines
170	SetCanRunBeforeUnloadConfirmPanel(bool canRunBeforeUnloadConfirmPanel)	170	SetCanRunBeforeUnloadConfirmPanel(bool canRunBeforeUnloadConfirmPanel)
171	SetCanRunModal(bool canRunModal)	171	SetCanRunModal(bool canRunModal)
172		172
173	#if PLATFORM(MAC)
174	# Complex text input support for plug-ins.	173	# Complex text input support for plug-ins.
175	SendComplexTextInputToPlugin(uint64_t pluginComplexTextInputIdentifier, String textInput)	174	SendComplexTextInputToPlugin(uint64_t pluginComplexTextInputIdentifier, String textInput)
176		175
		176	#if PLATFORM(MAC)
177	SetWindowIsVisible(bool windowIsVisible)	177	SetWindowIsVisible(bool windowIsVisible)
178	WindowAndViewFramesChanged(WebCore::IntRect windowFrameInScreenCoordinates, WebCore::IntRect viewFrameInWindowCoordinates, WebCore::IntPoint accessibilityViewCoordinates)	178	WindowAndViewFramesChanged(WebCore::IntRect windowFrameInScreenCoordinates, WebCore::IntRect viewFrameInWindowCoordinates, WebCore::IntPoint accessibilityViewCoordinates)
179	GetMarkedRange() -> (uint64_t location, uint64_t length)	179	GetMarkedRange() -> (uint64_t location, uint64_t length)