[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
eric at webkit.org
eric at webkit.org
Wed Apr 7 23:49:23 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 7cbc29aa90b39877bf7e9348a7d5807e98995f5a
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Nov 19 17:42:38 2009 +0000
2009-11-19 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Gustavo Noronha Silva.
Web Inspector: Implement "show inspector" in WebKit GTK
API and enable console tests.
https://bugs.webkit.org/show_bug.cgi?id=31669
* platform/gtk/Skipped:
2009-11-19 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Gustavo Noronha Silva.
Web Inspector: Implement "show inspector" in WebKit GTK
API and enable console tests.
https://bugs.webkit.org/show_bug.cgi?id=31669
* webkit/webkitwebinspector.cpp:
(webkit_web_inspector_show):
* webkit/webkitwebinspector.h:
2009-11-19 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Gustavo Noronha Silva.
Web Inspector: Implement "show inspector" in WebKit GTK
API and enable console tests.
https://bugs.webkit.org/show_bug.cgi?id=31669
* DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
(LayoutTestController::showWebInspector):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51188 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f018abb..4933b85 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2009-11-19 Pavel Feldman <pfeldman at chromium.org>
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Web Inspector: Implement "show inspector" in WebKit GTK
+ API and enable console tests.
+
+ https://bugs.webkit.org/show_bug.cgi?id=31669
+
+ * platform/gtk/Skipped:
+
2009-11-19 Shinichiro Hamaji <hamaji at chromium.org>
Reviewed by Eric Seidel.
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index d3bf303..e5d238b 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -5679,9 +5679,3 @@ http/tests/security/isolatedWorld/didClearWindowObject.html
# Need to add functionality to DumpRenderTree to handle error pages
fast/history/back-forward-reset-after-error-handling.html
-# See https://bugs.webkit.org/show_bug.cgi?id=31472
-inspector/console-dir.html
-inspector/console-dirxml.html
-inspector/console-format-collections.html
-inspector/console-format.html
-inspector/console-tests.html
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index e879190..fe33df1 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,16 @@
+2009-11-19 Pavel Feldman <pfeldman at chromium.org>
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Web Inspector: Implement "show inspector" in WebKit GTK
+ API and enable console tests.
+
+ https://bugs.webkit.org/show_bug.cgi?id=31669
+
+ * webkit/webkitwebinspector.cpp:
+ (webkit_web_inspector_show):
+ * webkit/webkitwebinspector.h:
+
2009-11-18 Martin Robinson <martin.james.robinson at gmail.com>
Reviewed by Gustavo Noronha.
diff --git a/WebKit/gtk/webkit/webkitwebinspector.cpp b/WebKit/gtk/webkit/webkitwebinspector.cpp
index e497541..68b03b2 100644
--- a/WebKit/gtk/webkit/webkitwebinspector.cpp
+++ b/WebKit/gtk/webkit/webkitwebinspector.cpp
@@ -466,6 +466,29 @@ webkit_web_inspector_set_inspector_client(WebKitWebInspector* web_inspector, Web
}
/**
+ * webkit_web_inspector_show:
+ * @web_inspector: the #WebKitWebInspector that will be shown
+ *
+ * Causes the Web Inspector to be shown.
+ *
+ * Since: 1.1.17
+ */
+void webkit_web_inspector_show(WebKitWebInspector* webInspector)
+{
+ g_return_if_fail(WEBKIT_IS_WEB_INSPECTOR(webInspector));
+
+ WebKitWebInspectorPrivate* priv = webInspector->priv;
+
+ Frame* frame = priv->page->focusController()->focusedOrMainFrame();
+ FrameView* view = frame->view();
+
+ if (!view)
+ return;
+
+ priv->page->inspectorController()->show();
+}
+
+/**
* webkit_web_inspector_inspect_coordinates:
* @web_inspector: the #WebKitWebInspector that will do the inspection
* @x: the X coordinate of the node to be inspected
diff --git a/WebKit/gtk/webkit/webkitwebinspector.h b/WebKit/gtk/webkit/webkitwebinspector.h
index 94fd806..bde4854 100644
--- a/WebKit/gtk/webkit/webkitwebinspector.h
+++ b/WebKit/gtk/webkit/webkitwebinspector.h
@@ -64,8 +64,10 @@ WEBKIT_API void
webkit_web_inspector_inspect_coordinates(WebKitWebInspector* web_inspector, gdouble x, gdouble y);
WEBKIT_API void
-webkit_web_inspector_close(WebKitWebInspector* webInspector);
+webkit_web_inspector_show(WebKitWebInspector* webInspector);
+WEBKIT_API void
+webkit_web_inspector_close(WebKitWebInspector* webInspector);
G_END_DECLS
#endif /* webkitwebinspector_h */
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 10db73b..c245a19 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2009-11-19 Pavel Feldman <pfeldman at chromium.org>
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Web Inspector: Implement "show inspector" in WebKit GTK
+ API and enable console tests.
+
+ https://bugs.webkit.org/show_bug.cgi?id=31669
+
+ * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
+ (LayoutTestController::showWebInspector):
+
2009-11-19 Kenneth Rohde Christiansen <kenneth at webkit.org>
Reviewed by Simon Hausmann.
diff --git a/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp b/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
index 964d7ba..db55fbd 100644
--- a/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
@@ -504,7 +504,7 @@ void LayoutTestController::showWebInspector()
WebKitWebInspector* inspector = webkit_web_view_get_inspector(webView);
g_object_set(webSettings, "enable-developer-extras", TRUE, NULL);
- webkit_web_inspector_inspect_coordinates(inspector, 0, 0);
+ webkit_web_inspector_show(inspector);
}
void LayoutTestController::closeWebInspector()
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list