Title: [131895] trunk
- Revision
- 131895
- Author
- [email protected]
- Date
- 2012-10-19 06:44:54 -0700 (Fri, 19 Oct 2012)
Log Message
Web Inspector: inspector/styles/styles-history.html is failing Text on Windows and Linux
https://bugs.webkit.org/show_bug.cgi?id=99519
Reviewed by Alexander Pavlov.
Source/WebCore:
Extracted _styleContentSet callback in a class method to make it sniffable by tests.
* inspector/front-end/StylesSourceMapping.js:
(WebInspector.StyleFile.prototype._commitIncrementalEdit):
(WebInspector.StyleFile.prototype._styleContentSet):
LayoutTests:
* inspector/styles/styles-history.html:
* platform/chromium/TestExpectations:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (131894 => 131895)
--- trunk/LayoutTests/ChangeLog 2012-10-19 13:42:55 UTC (rev 131894)
+++ trunk/LayoutTests/ChangeLog 2012-10-19 13:44:54 UTC (rev 131895)
@@ -1,3 +1,13 @@
+2012-10-19 Vsevolod Vlasov <[email protected]>
+
+ Web Inspector: inspector/styles/styles-history.html is failing Text on Windows and Linux
+ https://bugs.webkit.org/show_bug.cgi?id=99519
+
+ Reviewed by Alexander Pavlov.
+
+ * inspector/styles/styles-history.html:
+ * platform/chromium/TestExpectations:
+
2012-10-19 Balazs Kelemen <[email protected]>
[Qt] Pixel tests need rebaseline
Modified: trunk/LayoutTests/inspector/styles/styles-history.html (131894 => 131895)
--- trunk/LayoutTests/inspector/styles/styles-history.html 2012-10-19 13:42:55 UTC (rev 131894)
+++ trunk/LayoutTests/inspector/styles/styles-history.html 2012-10-19 13:44:54 UTC (rev 131895)
@@ -31,14 +31,30 @@
function testSetResourceContentMinor(next)
{
+ InspectorTest.addSniffer(WebInspector.StyleFile.prototype, "_styleContentSet", styleUpdatedMinor);
uiSourceCode.setWorkingCopy("body {\n margin: 15px;\n padding: 10px;\n}");
- dumpHistory(next)();
+
+ function styleUpdatedMinor()
+ {
+ dumpHistory(next)();
+ }
},
function testSetResourceContentMajor(next)
{
+ InspectorTest.addSniffer(WebInspector.StyleFile.prototype, "_styleContentSet", styleUpdatedMinor);
uiSourceCode.setWorkingCopy("body {\n margin: 20px;\n padding: 10px;\n}");
- uiSourceCode.commitWorkingCopy(dumpHistory(next));
+
+ function styleUpdatedMinor()
+ {
+ InspectorTest.addSniffer(WebInspector.StyleFile.prototype, "_styleContentSet", styleUpdatedMajor);
+ uiSourceCode.commitWorkingCopy(function() { });
+
+ function styleUpdatedMajor()
+ {
+ dumpHistory(next)();
+ }
+ }
},
function testSetContentViaModelMinor(next)
Modified: trunk/LayoutTests/platform/chromium/TestExpectations (131894 => 131895)
--- trunk/LayoutTests/platform/chromium/TestExpectations 2012-10-19 13:42:55 UTC (rev 131894)
+++ trunk/LayoutTests/platform/chromium/TestExpectations 2012-10-19 13:44:54 UTC (rev 131895)
@@ -2837,11 +2837,6 @@
webkit.org/b/92131 inspector/styles/region-style-crash.html
-# New failure with a large regression range.
-webkit.org/b/99519 [ Win ] inspector/styles/styles-history.html [ Text ]
-# Flaky on Linux.
-webkit.org/b/99519 [ Linux ] inspector/styles/styles-history.html [ Pass Text ]
-
crbug.com/85755 fast/js/exception-properties.html [ Failure ]
webkit.org/b/62580 fast/loader/inherit-charset-to-empty-frame.html [ Failure Pass ]
Modified: trunk/Source/WebCore/ChangeLog (131894 => 131895)
--- trunk/Source/WebCore/ChangeLog 2012-10-19 13:42:55 UTC (rev 131894)
+++ trunk/Source/WebCore/ChangeLog 2012-10-19 13:44:54 UTC (rev 131895)
@@ -1,3 +1,16 @@
+2012-10-19 Vsevolod Vlasov <[email protected]>
+
+ Web Inspector: inspector/styles/styles-history.html is failing Text on Windows and Linux
+ https://bugs.webkit.org/show_bug.cgi?id=99519
+
+ Reviewed by Alexander Pavlov.
+
+ Extracted _styleContentSet callback in a class method to make it sniffable by tests.
+
+ * inspector/front-end/StylesSourceMapping.js:
+ (WebInspector.StyleFile.prototype._commitIncrementalEdit):
+ (WebInspector.StyleFile.prototype._styleContentSet):
+
2012-10-19 Pavel Feldman <[email protected]>
Web Inspector: add object-src 'none' to the inspector.html
Modified: trunk/Source/WebCore/inspector/front-end/StylesSourceMapping.js (131894 => 131895)
--- trunk/Source/WebCore/inspector/front-end/StylesSourceMapping.js 2012-10-19 13:42:55 UTC (rev 131894)
+++ trunk/Source/WebCore/inspector/front-end/StylesSourceMapping.js 2012-10-19 13:44:54 UTC (rev 131895)
@@ -136,19 +136,19 @@
*/
_commitIncrementalEdit: function(majorChange)
{
- /**
- * @param {?string} error
- */
- function callback(error)
- {
- if (error)
- WebInspector.showErrorMessage(error);
- }
-
this._clearIncrementalUpdateTimer();
- WebInspector.styleContentBinding.setStyleContent(this._uiSourceCode, this._uiSourceCode.workingCopy(), majorChange, callback);
+ WebInspector.styleContentBinding.setStyleContent(this._uiSourceCode, this._uiSourceCode.workingCopy(), majorChange, this._styleContentSet.bind(this));
},
+ /**
+ * @param {?string} error
+ */
+ _styleContentSet: function(error)
+ {
+ if (error)
+ WebInspector.showErrorMessage(error);
+ },
+
_clearIncrementalUpdateTimer: function()
{
if (!this._incrementalUpdateTimer)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
