Diff
Modified: trunk/LayoutTests/ChangeLog (121045 => 121046)
--- trunk/LayoutTests/ChangeLog 2012-06-22 18:40:18 UTC (rev 121045)
+++ trunk/LayoutTests/ChangeLog 2012-06-22 18:47:56 UTC (rev 121046)
@@ -1,3 +1,13 @@
+2012-06-22 Jan Keromnes <[email protected]>
+
+ Web Inspector: ExtensionPanel.onSearch listener doesn't work
+ https://bugs.webkit.org/show_bug.cgi?id=89517
+
+ Reviewed by Yury Semikhatsky.
+
+ * inspector/extensions/extensions-panel-expected.txt:
+ * inspector/extensions/extensions-panel.html:
+
2012-06-22 Silvia Pfeiffer <[email protected]>
[Chromium] Adjust the displayed elements of the new Chrome media controls.
Modified: trunk/LayoutTests/inspector/extensions/extensions-panel-expected.txt (121045 => 121046)
--- trunk/LayoutTests/inspector/extensions/extensions-panel-expected.txt 2012-06-22 18:40:18 UTC (rev 121045)
+++ trunk/LayoutTests/inspector/extensions/extensions-panel-expected.txt 2012-06-22 18:47:56 UTC (rev 121046)
@@ -23,6 +23,18 @@
}
Extension panel size correct
Panel shown
+RUNNING TEST: extension_testSearch
+Panel hidden
+Panel searched:
+{
+ 0 : "performSearch"
+ 1 : "hello"
+}
+Panel searched:
+{
+ 0 : "cancelSearch"
+ 1 : undefined
+}
RUNNING TEST: extension_testStatusBarButtons
Created a status bar button, dump follows:
{
@@ -32,7 +44,6 @@
}
update : <function>
}
-Panel hidden
button1 clicked
Status bar buttons state:
status bar item 0, icon: .../inspector/resources/button1.png, tooltip: 'Button One tooltip', disabled: false
Modified: trunk/LayoutTests/inspector/extensions/extensions-panel.html (121045 => 121046)
--- trunk/LayoutTests/inspector/extensions/extensions-panel.html 2012-06-22 18:40:18 UTC (rev 121045)
+++ trunk/LayoutTests/inspector/extensions/extensions-panel.html 2012-06-22 18:47:56 UTC (rev 121046)
@@ -70,8 +70,6 @@
function extension_testCreatePanel(nextTest)
{
- var callbackCount = 0;
-
function onPanelCreated(panel)
{
output("Panel created");
@@ -104,6 +102,27 @@
webInspector.panels.create("Test Panel", basePath + "extension-panel.png", basePath + "extension-panel.html", onPanelCreated);
}
+function extension_testSearch(nextTest)
+{
+ var callbackCount = 0;
+
+ function onPanelCreated(panel)
+ {
+ panel.onSearch.addListener(function(action, queryString) {
+ output("Panel searched:");
+ dumpObject(Array.prototype.slice.call(arguments));
+ callbackCount++;
+ if (callbackCount === 2)
+ nextTest();
+ });
+
+ extension_showPanel("extension");
+ }
+ evaluateOnFrontend("WebInspector.searchController._performSearch('hello', true, false, false); reply()");
+ var basePath = location.pathname.replace(/\/[^/]*$/, "/");
+ webInspector.panels.create("Test Panel", basePath + "extension-panel.png", basePath + "non-existent.html", onPanelCreated);
+}
+
function extension_testStatusBarButtons(nextTest)
{
var basePath = location.pathname.replace(/\/[^/]*$/, "/");
Modified: trunk/Source/WebCore/ChangeLog (121045 => 121046)
--- trunk/Source/WebCore/ChangeLog 2012-06-22 18:40:18 UTC (rev 121045)
+++ trunk/Source/WebCore/ChangeLog 2012-06-22 18:47:56 UTC (rev 121046)
@@ -1,3 +1,19 @@
+2012-06-22 Jan Keromnes <[email protected]>
+
+ Web Inspector: ExtensionPanel.onSearch listener doesn't work
+ https://bugs.webkit.org/show_bug.cgi?id=89517
+
+ Reviewed by Yury Semikhatsky.
+
+ Added a test to see if listener fires on search:
+ LayoutTests/inspector/extensions/extensions-panel.html
+
+ * inspector/front-end/ExtensionPanel.js:
+ (WebInspector.ExtensionPanel.prototype.searchCanceled):
+ (WebInspector.ExtensionPanel.prototype.performSearch):
+ (WebInspector.ExtensionPanel.prototype.jumpToNextSearchResult):
+ (WebInspector.ExtensionPanel.prototype.jumpToPreviousSearchResult):
+
2012-06-22 Brian Salomon <[email protected]>
Increase the GrContext texture cache count cap to 2K
Modified: trunk/Source/WebCore/inspector/front-end/ExtensionPanel.js (121045 => 121046)
--- trunk/Source/WebCore/inspector/front-end/ExtensionPanel.js 2012-06-22 18:40:18 UTC (rev 121045)
+++ trunk/Source/WebCore/inspector/front-end/ExtensionPanel.js 2012-06-22 18:47:56 UTC (rev 121046)
@@ -147,25 +147,25 @@
searchCanceled: function(startingNewSearch)
{
- WebInspector.extensionServer.notifySearchAction(this._id, WebInspector.extensionAPI.panels.SearchAction.CancelSearch);
+ WebInspector.extensionServer.notifySearchAction(this.name, WebInspector.extensionAPI.panels.SearchAction.CancelSearch);
WebInspector.Panel.prototype.searchCanceled.apply(this, arguments);
},
performSearch: function(query)
{
- WebInspector.extensionServer.notifySearchAction(this._id, WebInspector.extensionAPI.panels.SearchAction.PerformSearch, query);
+ WebInspector.extensionServer.notifySearchAction(this.name, WebInspector.extensionAPI.panels.SearchAction.PerformSearch, query);
WebInspector.Panel.prototype.performSearch.apply(this, arguments);
},
jumpToNextSearchResult: function()
{
- WebInspector.extensionServer.notifySearchAction(this._id, WebInspector.extensionAPI.panels.SearchAction.NextSearchResult);
+ WebInspector.extensionServer.notifySearchAction(this.name, WebInspector.extensionAPI.panels.SearchAction.NextSearchResult);
WebInspector.Panel.prototype.jumpToNextSearchResult.call(this);
},
jumpToPreviousSearchResult: function()
{
- WebInspector.extensionServer.notifySearchAction(this._id, WebInspector.extensionAPI.panels.SearchAction.PreviousSearchResult);
+ WebInspector.extensionServer.notifySearchAction(this.name, WebInspector.extensionAPI.panels.SearchAction.PreviousSearchResult);
WebInspector.Panel.prototype.jumpToPreviousSearchResult.call(this);
},
