Title: [127968] trunk/Source/WebKit2
- Revision
- 127968
- Author
- [email protected]
- Date
- 2012-09-08 03:57:44 -0700 (Sat, 08 Sep 2012)
Log Message
[EFL][WK2] Minibrowser crashes on right mouse click
https://bugs.webkit.org/show_bug.cgi?id=95955
Patch by Jinwoo Song <[email protected]> on 2012-09-08
Reviewed by Simon Hausmann.
Make early return if the PageClient does not create a ContextMenuProxy.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::internalShowContextMenu):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (127967 => 127968)
--- trunk/Source/WebKit2/ChangeLog 2012-09-08 10:50:37 UTC (rev 127967)
+++ trunk/Source/WebKit2/ChangeLog 2012-09-08 10:57:44 UTC (rev 127968)
@@ -1,3 +1,15 @@
+2012-09-08 Jinwoo Song <[email protected]>
+
+ [EFL][WK2] Minibrowser crashes on right mouse click
+ https://bugs.webkit.org/show_bug.cgi?id=95955
+
+ Reviewed by Simon Hausmann.
+
+ Make early return if the PageClient does not create a ContextMenuProxy.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::internalShowContextMenu):
+
2012-09-08 Simon Hausmann <[email protected]>
[Qt] Fix CoreIPC setup between ProcessLauncher and WebProcessMain on Windows
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (127967 => 127968)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2012-09-08 10:50:37 UTC (rev 127967)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2012-09-08 10:57:44 UTC (rev 127968)
@@ -2962,6 +2962,8 @@
}
m_activeContextMenu = m_pageClient->createContextMenuProxy(this);
+ if (!m_activeContextMenu)
+ return;
// Since showContextMenu() can spin a nested run loop we need to turn off the responsiveness timer.
m_process->responsivenessTimer()->stop();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
