Title: [125024] trunk/Source/WebKit2
- Revision
- 125024
- Author
- [email protected]
- Date
- 2012-08-08 05:42:09 -0700 (Wed, 08 Aug 2012)
Log Message
[Qt] WebProcess hangs on plugin initialization.
https://bugs.webkit.org/show_bug.cgi?id=93272
Reviewed by Kenneth Rohde Christiansen.
* UIProcess/Plugins/PluginProcessProxy.cpp:
(WebKit::PluginProcessProxy::didFinishLaunching): Ensure PluginProcessConnectionManager is informed of plugin crashes.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::WebPage): Let setIsInWindow set canStartMedia asynchronously.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (125023 => 125024)
--- trunk/Source/WebKit2/ChangeLog 2012-08-08 12:33:16 UTC (rev 125023)
+++ trunk/Source/WebKit2/ChangeLog 2012-08-08 12:42:09 UTC (rev 125024)
@@ -1,3 +1,15 @@
+2012-08-08 Allan Sandfeld Jensen <[email protected]>
+
+ [Qt] WebProcess hangs on plugin initialization.
+ https://bugs.webkit.org/show_bug.cgi?id=93272
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ * UIProcess/Plugins/PluginProcessProxy.cpp:
+ (WebKit::PluginProcessProxy::didFinishLaunching): Ensure PluginProcessConnectionManager is informed of plugin crashes.
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::WebPage): Let setIsInWindow set canStartMedia asynchronously.
+
2012-08-08 Andras Becsi <[email protected]>
[Qt][WK2] Set the fixed layout setting before creating the page
Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp (125023 => 125024)
--- trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp 2012-08-08 12:33:16 UTC (rev 125023)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp 2012-08-08 12:42:09 UTC (rev 125024)
@@ -194,10 +194,12 @@
pluginProcessCrashedOrFailedToLaunch();
return;
}
-
+
m_connection = CoreIPC::Connection::createServerConnection(connectionIdentifier, this, RunLoop::main());
#if PLATFORM(MAC)
m_connection->setShouldCloseConnectionOnMachExceptions();
+#elif PLATFORM(QT)
+ m_connection->setShouldCloseConnectionOnProcessTermination(m_processLauncher->processIdentifier());
#endif
m_connection->open();
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (125023 => 125024)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-08-08 12:33:16 UTC (rev 125023)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-08-08 12:42:09 UTC (rev 125024)
@@ -303,13 +303,7 @@
WebCore::provideVibrationTo(m_page.get(), new WebVibrationClient(this));
#endif
- // Qt does not yet call setIsInWindow. Until it does, just leave
- // this line out so plug-ins and video will work. Eventually all platforms
- // should call setIsInWindow and this comment and #if should be removed,
- // leaving behind the setCanStartMedia call.
-#if !PLATFORM(QT)
m_page->setCanStartMedia(false);
-#endif
updatePreferences(parameters.store);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
