Title: [135194] trunk/Source/WebKit2
- Revision
- 135194
- Author
- [email protected]
- Date
- 2012-11-19 13:47:42 -0800 (Mon, 19 Nov 2012)
Log Message
[EFL][WK2] Web Inspector crashes if evas_gl is not available
https://bugs.webkit.org/show_bug.cgi?id=102531
Patch by Yael Aharon <[email protected]> on 2012-11-19
Reviewed by Kenneth Rohde Christiansen.
Teach Web Inspector to fallback gracefully to the software path when evas_gl engine is not available.
* UIProcess/efl/WebInspectorProxyEfl.cpp:
(WebKit::WebInspectorProxy::platformCreateInspectorPage):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (135193 => 135194)
--- trunk/Source/WebKit2/ChangeLog 2012-11-19 21:43:28 UTC (rev 135193)
+++ trunk/Source/WebKit2/ChangeLog 2012-11-19 21:47:42 UTC (rev 135194)
@@ -1,3 +1,15 @@
+2012-11-19 Yael Aharon <[email protected]>
+
+ [EFL][WK2] Web Inspector crashes if evas_gl is not available
+ https://bugs.webkit.org/show_bug.cgi?id=102531
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Teach Web Inspector to fallback gracefully to the software path when evas_gl engine is not available.
+
+ * UIProcess/efl/WebInspectorProxyEfl.cpp:
+ (WebKit::WebInspectorProxy::platformCreateInspectorPage):
+
2012-11-19 Brady Eidson <[email protected]>
Remove the source files for NetworkRequest from the repository.
Modified: trunk/Source/WebKit2/UIProcess/efl/WebInspectorProxyEfl.cpp (135193 => 135194)
--- trunk/Source/WebKit2/UIProcess/efl/WebInspectorProxyEfl.cpp 2012-11-19 21:43:28 UTC (rev 135193)
+++ trunk/Source/WebKit2/UIProcess/efl/WebInspectorProxyEfl.cpp 2012-11-19 21:47:42 UTC (rev 135194)
@@ -90,9 +90,11 @@
#if USE(ACCELERATED_COMPOSITING) && defined HAVE_ECORE_X
const char* engine = "opengl_x11";
m_inspectorWindow = ecore_evas_new(engine, 0, 0, initialWindowWidth, initialWindowHeight, 0);
-#else
- m_inspectorWindow = ecore_evas_new(0, 0, 0, initialWindowWidth, initialWindowHeight, 0);
+
+ // Gracefully fall back to software if evas_gl engine is not available.
+ if (!m_inspectorWindow)
#endif
+ m_inspectorWindow = ecore_evas_new(0, 0, 0, initialWindowWidth, initialWindowHeight, 0);
if (!m_inspectorWindow)
return 0;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
