Title: [122945] trunk/Source/WebKit2
- Revision
- 122945
- Author
- [email protected]
- Date
- 2012-07-18 04:30:31 -0700 (Wed, 18 Jul 2012)
Log Message
[GTK] Fix a crash due to an invalid assert
https://bugs.webkit.org/show_bug.cgi?id=91614
Reviewed by Xan Lopez.
In webkitWebViewBaseContainerAdd() there's
ASSERT(priv->inspectorView); that should be the opposite, since we
shoulnd't have an inspector view when the inspector view is added.
* UIProcess/API/gtk/WebKitWebViewBase.cpp:
(webkitWebViewBaseContainerAdd):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (122944 => 122945)
--- trunk/Source/WebKit2/ChangeLog 2012-07-18 11:25:54 UTC (rev 122944)
+++ trunk/Source/WebKit2/ChangeLog 2012-07-18 11:30:31 UTC (rev 122945)
@@ -1,3 +1,17 @@
+2012-07-18 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Fix a crash due to an invalid assert
+ https://bugs.webkit.org/show_bug.cgi?id=91614
+
+ Reviewed by Xan Lopez.
+
+ In webkitWebViewBaseContainerAdd() there's
+ ASSERT(priv->inspectorView); that should be the opposite, since we
+ shoulnd't have an inspector view when the inspector view is added.
+
+ * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+ (webkitWebViewBaseContainerAdd):
+
2012-07-18 Thiago Marcos P. Santos <[email protected]>
[CMake] Make gtest a shared library
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (122944 => 122945)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2012-07-18 11:25:54 UTC (rev 122944)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2012-07-18 11:30:31 UTC (rev 122945)
@@ -188,7 +188,7 @@
if (WEBKIT_IS_WEB_VIEW_BASE(widget)
&& WebInspectorProxy::isInspectorPage(WEBKIT_WEB_VIEW_BASE(widget)->priv->pageProxy.get())) {
- ASSERT(priv->inspectorView);
+ ASSERT(!priv->inspectorView);
priv->inspectorView = widget;
priv->inspectorViewHeight = gMinimumAttachedInspectorHeight;
} else {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
