Changeset 148082 in webkit

Timestamp:

Apr 10, 2013 12:38:02 AM (11 years ago)

Author:

zandobersek@gmail.com

Message:

[GTK][WK2] Implement WebInspectorProxy::platformInspectedWindowWidth
​https://bugs.webkit.org/show_bug.cgi?id=113498

Patch by Zan Dobersek <​zandobersek@gmail.com> on 2013-04-10
Reviewed by Martin Robinson.

The method was introduced in r147004.

• UIProcess/API/gtk/tests/TestInspector.cpp: Specify the gMinimumAttachedInspectorWidth variable, reflecting the value

of WebInspectorProxy::minimumAttachedWidth. Use it as the width to which the inspected view should be resized in
InspectorTest::resizeViewAndAttach.

• UIProcess/gtk/WebInspectorProxyGtk.cpp:

(WebKit::WebInspectorProxy::platformInspectedWindowHeight): Use the gtk_widget_get_allocated_height method to return the
widget height.
(WebKit::WebInspectorProxy::platformInspectedWindowWidth): Newly implemented, similarly uses the
gtk_widget_get_allocated_width method to return the widget width.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/gtk/tests/TestInspector.cpp (modified) (2 diffs)
• UIProcess/gtk/WebInspectorProxyGtk.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-04-10  Zan Dobersek  <zandobersek@gmail.com>
+
+        [GTK][WK2] Implement WebInspectorProxy::platformInspectedWindowWidth
+        https://bugs.webkit.org/show_bug.cgi?id=113498
+
+        Reviewed by Martin Robinson.
+
+        The method was introduced in r147004.
+
+        * UIProcess/API/gtk/tests/TestInspector.cpp: Specify the gMinimumAttachedInspectorWidth variable, reflecting the value
+        of WebInspectorProxy::minimumAttachedWidth. Use it as the width to which the inspected view should be resized in
+        InspectorTest::resizeViewAndAttach.
+        * UIProcess/gtk/WebInspectorProxyGtk.cpp:
+        (WebKit::WebInspectorProxy::platformInspectedWindowHeight): Use the gtk_widget_get_allocated_height method to return the
+        widget height.
+        (WebKit::WebInspectorProxy::platformInspectedWindowWidth): Newly implemented, similarly uses the
+        gtk_widget_get_allocated_width method to return the widget width.
+
 2013-04-09  Antoine Quint  <graouts@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestInspector.cpp

@@ -60 +60 @@
     }
 
+    static const unsigned gMinimumAttachedInspectorWidth = 750;
     static const unsigned gMinimumAttachedInspectorHeight = 250;
 
@@ -125 +126 @@
     {
         // Resize the view to make room for the inspector.
-        resizeView(300, (gMinimumAttachedInspectorHeight + 1) * 4 / 3);
+        resizeView(gMinimumAttachedInspectorWidth, (gMinimumAttachedInspectorHeight + 1) * 4 / 3);
         webkit_web_inspector_attach(m_inspector);
     }

trunk/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp

@@ -174 +174 @@
 unsigned WebInspectorProxy::platformInspectedWindowHeight()
 {
-    GtkAllocation allocation;
-    gtk_widget_get_allocation(m_page->viewWidget(), &allocation);
-    return allocation.height;
+    return gtk_widget_get_allocated_height(m_page->viewWidget());
 }
 
 unsigned WebInspectorProxy::platformInspectedWindowWidth()
 {
-    notImplemented();
-    return 0;
+    return gtk_widget_get_allocated_width(m_page->viewWidget());
 }