Title: [98541] trunk
- Revision
- 98541
- Author
- ca...@chromium.org
- Date
- 2011-10-27 02:37:00 -0700 (Thu, 27 Oct 2011)
Log Message
Web Inspector: [Extensions API] add ignoreCache flag to options of inspectedWindow.reload()
https://bugs.webkit.org/show_bug.cgi?id=70926
Reviewed by Pavel Feldman.
Source/WebCore:
Test: http/tests/inspector/extensions-ignore-cache.html
* inspector/front-end/ExtensionServer.js:
(WebInspector.ExtensionServer.prototype._onReload):
* inspector/front-end/externs.js:
():
LayoutTests:
* http/tests/inspector/extensions-ignore-cache-expected.txt: Added.
* http/tests/inspector/extensions-ignore-cache.html: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (98540 => 98541)
--- trunk/LayoutTests/ChangeLog 2011-10-27 09:33:59 UTC (rev 98540)
+++ trunk/LayoutTests/ChangeLog 2011-10-27 09:37:00 UTC (rev 98541)
@@ -1,3 +1,13 @@
+2011-10-27 Andrey Kosyakov <ca...@chromium.org>
+
+ Web Inspector: [Extensions API] add ignoreCache flag to options of inspectedWindow.reload()
+ https://bugs.webkit.org/show_bug.cgi?id=70926
+
+ Reviewed by Pavel Feldman.
+
+ * http/tests/inspector/extensions-ignore-cache-expected.txt: Added.
+ * http/tests/inspector/extensions-ignore-cache.html: Added.
+
2011-10-27 Gabor Rapcsanyi <rga...@webkit.org>
Unreviewed, fix typo in skiplist.
Added: trunk/LayoutTests/http/tests/inspector/extensions-ignore-cache-expected.txt (0 => 98541)
--- trunk/LayoutTests/http/tests/inspector/extensions-ignore-cache-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/inspector/extensions-ignore-cache-expected.txt 2011-10-27 09:37:00 UTC (rev 98541)
@@ -0,0 +1,14 @@
+CONSOLE MESSAGE: line 1: Done.
+CONSOLE MESSAGE: line 1: Done.
+CONSOLE MESSAGE: line 1: Done.
+Tests ignoreCache flag of WebInspector.inspectedPage.reload()
+
+Started extension.
+Running tests...
+RUNNING TEST: extension_testIgnoreCache
+Page reloaded.
+Page reloaded.
+afterNormalReload === beforeReload
+afterNormalReload !== afterReloadWithIgnoreCache
+All tests done.
+
Property changes on: trunk/LayoutTests/http/tests/inspector/extensions-ignore-cache-expected.txt
___________________________________________________________________
Added: svn:eol-style
Added: trunk/LayoutTests/http/tests/inspector/extensions-ignore-cache.html (0 => 98541)
--- trunk/LayoutTests/http/tests/inspector/extensions-ignore-cache.html (rev 0)
+++ trunk/LayoutTests/http/tests/inspector/extensions-ignore-cache.html 2011-10-27 09:37:00 UTC (rev 98541)
@@ -0,0 +1,46 @@
+<html>
+<head>
+<script src=""
+<script src=""
+<script src=""
+
+<script type="text/_javascript_">
+
+function extension_testIgnoreCache(nextTest)
+{
+ var beforeReload;
+ var afterReloadWithIgnoreCache;
+ var afterNormalReload;
+
+ function onNormalReload()
+ {
+ webInspector.inspectedWindow.eval("randomValue", function(value) {
+ afterNormalReload = value;
+ evaluateOnFrontend("InspectorTest.runWhenPageLoads(reply)", onReloadWithIgnoreCache);
+ webInspector.inspectedWindow.reload({ ignoreCache: true });
+ });
+ };
+
+ function onReloadWithIgnoreCache()
+ {
+ webInspector.inspectedWindow.eval("randomValue", function(value) {
+ afterReloadWithIgnoreCache = value;
+ output("afterNormalReload " + (afterNormalReload === beforeReload ? "===" : "!==" ) + " beforeReload");
+ output("afterNormalReload " + (afterNormalReload === afterReloadWithIgnoreCache ? "===" : "!==" ) + " afterReloadWithIgnoreCache");
+ nextTest();
+ });
+ }
+
+ webInspector.inspectedWindow.eval("randomValue", function(value) {
+ beforeReload = value;
+ evaluateOnFrontend("InspectorTest.runWhenPageLoads(reply)", onNormalReload);
+ webInspector.inspectedWindow.reload();
+ });
+}
+
+</script>
+</head>
+<body _onload_="runTest()">
+<p>Tests ignoreCache flag of WebInspector.inspectedPage.reload()</p>
+</body>
+</html>
Property changes on: trunk/LayoutTests/http/tests/inspector/extensions-ignore-cache.html
___________________________________________________________________
Added: svn:executable
Added: svn:eol-style
Modified: trunk/Source/WebCore/ChangeLog (98540 => 98541)
--- trunk/Source/WebCore/ChangeLog 2011-10-27 09:33:59 UTC (rev 98540)
+++ trunk/Source/WebCore/ChangeLog 2011-10-27 09:37:00 UTC (rev 98541)
@@ -1,3 +1,17 @@
+2011-10-27 Andrey Kosyakov <ca...@chromium.org>
+
+ Web Inspector: [Extensions API] add ignoreCache flag to options of inspectedWindow.reload()
+ https://bugs.webkit.org/show_bug.cgi?id=70926
+
+ Reviewed by Pavel Feldman.
+
+ Test: http/tests/inspector/extensions-ignore-cache.html
+
+ * inspector/front-end/ExtensionServer.js:
+ (WebInspector.ExtensionServer.prototype._onReload):
+ * inspector/front-end/externs.js:
+ ():
+
2011-10-26 Steve Falkenburg <sfal...@apple.com>
ResourceError doesn't support custom domains on Windows
Modified: trunk/Source/WebCore/inspector/front-end/ExtensionServer.js (98540 => 98541)
--- trunk/Source/WebCore/inspector/front-end/ExtensionServer.js 2011-10-27 09:33:59 UTC (rev 98540)
+++ trunk/Source/WebCore/inspector/front-end/ExtensionServer.js 2011-10-27 09:37:00 UTC (rev 98541)
@@ -282,7 +282,7 @@
_onReload: function(message)
{
- var options = message.options || {};
+ var options = /** @type ExtensionReloadOptions */ (message.options || {});
NetworkAgent.setUserAgentOverride(typeof options.userAgent === "string" ? options.userAgent : "");
var injectedScript;
if (options.injectedScript) {
@@ -290,7 +290,7 @@
// returns empty object for compatibility with InjectedScriptManager on the backend.
injectedScript = "((function(){" + options.injectedScript + "})(),function(){return {}})";
}
- PageAgent.reload(false, injectedScript);
+ PageAgent.reload(!!options.ignoreCache, injectedScript);
return this._status.OK();
},
Modified: trunk/Source/WebCore/inspector/front-end/externs.js (98540 => 98541)
--- trunk/Source/WebCore/inspector/front-end/externs.js 2011-10-27 09:33:59 UTC (rev 98540)
+++ trunk/Source/WebCore/inspector/front-end/externs.js 2011-10-27 09:37:00 UTC (rev 98541)
@@ -276,6 +276,15 @@
}
/**
+ * @constructor
+ */
+function ExtensionReloadOptions() {
+ this.ignoreCache = false;
+ this.injectedScript = "";
+ this.userAgent = "";
+}
+
+/**
* @type {WebInspector.HandlerRegistry}
*/
WebInspector.openAnchorLocationRegistry = null;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
