Title: [138803] trunk/Source/WebKit2
- Revision
- 138803
- Author
- [email protected]
- Date
- 2013-01-04 09:14:20 -0800 (Fri, 04 Jan 2013)
Log Message
[WK2] [Gtk] crash when web inspector is attached, and window height is reduced.
https://bugs.webkit.org/show_bug.cgi?id=106052
Reviewed by Martin Robinson.
Do not allocate more size for the inspector view than its parent
size. Also make sure that the view size is always at least 1.
* UIProcess/API/gtk/WebKitWebViewBase.cpp:
(resizeWebKitWebViewBaseFromAllocation):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (138802 => 138803)
--- trunk/Source/WebKit2/ChangeLog 2013-01-04 16:58:06 UTC (rev 138802)
+++ trunk/Source/WebKit2/ChangeLog 2013-01-04 17:14:20 UTC (rev 138803)
@@ -1,5 +1,18 @@
2013-01-04 Carlos Garcia Campos <[email protected]>
+ [WK2] [Gtk] crash when web inspector is attached, and window height is reduced.
+ https://bugs.webkit.org/show_bug.cgi?id=106052
+
+ Reviewed by Martin Robinson.
+
+ Do not allocate more size for the inspector view than its parent
+ size. Also make sure that the view size is always at least 1.
+
+ * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+ (resizeWebKitWebViewBaseFromAllocation):
+
+2013-01-04 Carlos Garcia Campos <[email protected]>
+
[GTK][Qt] Make compositing messages async again
https://bugs.webkit.org/show_bug.cgi?id=106082
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (138802 => 138803)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2013-01-04 16:58:06 UTC (rev 138802)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2013-01-04 17:14:20 UTC (rev 138803)
@@ -459,12 +459,13 @@
IntRect viewRect(allocation->x, allocation->y, allocation->width, allocation->height);
WebKitWebViewBasePrivate* priv = webViewBase->priv;
if (priv->inspectorView) {
+ int inspectorViewHeight = std::min(static_cast<int>(priv->inspectorViewHeight), allocation->height);
GtkAllocation childAllocation = viewRect;
- childAllocation.y = allocation->height - priv->inspectorViewHeight;
- childAllocation.height = priv->inspectorViewHeight;
+ childAllocation.y = allocation->height - inspectorViewHeight;
+ childAllocation.height = inspectorViewHeight;
gtk_widget_size_allocate(priv->inspectorView, &childAllocation);
- viewRect.setHeight(allocation->height - priv->inspectorViewHeight);
+ viewRect.setHeight(std::max(allocation->height - inspectorViewHeight, 1));
}
// The authentication dialog is centered in the view rect, which means that it
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
