[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
apavlov at chromium.org
apavlov at chromium.org
Wed Dec 22 18:36:09 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit e7491fe9ed2c9603efa5a4b606604f3295e6e244
Author: apavlov at chromium.org <apavlov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Dec 14 14:46:25 2010 +0000
2010-12-14 Alexander Pavlov <apavlov at chromium.org>
Reviewed by Yury Semikhatsky.
Web Inspector: Reverted stylesheet breaks style data
https://bugs.webkit.org/show_bug.cgi?id=51030
WebCore:
* inspector/InspectorStyleSheet.cpp:
(WebCore::InspectorStyleSheet::reparseStyleSheet):
LayoutTests:
* inspector/styles-new-API-expected.txt:
* inspector/styles-new-API.html:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74020 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 480668e..f84509b 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-14 Alexander Pavlov <apavlov at chromium.org>
+
+ Reviewed by Yury Semikhatsky.
+
+ Web Inspector: Reverted stylesheet breaks style data
+ https://bugs.webkit.org/show_bug.cgi?id=51030
+
+ * inspector/styles-new-API-expected.txt:
+ * inspector/styles-new-API.html:
+
2010-12-14 Mads Ager <ager at chromium.org>
Reviewed by Pavel Feldman.
diff --git a/LayoutTests/inspector/styles-new-API-expected.txt b/LayoutTests/inspector/styles-new-API-expected.txt
index 7ec36e3..ea6ca7c 100644
--- a/LayoutTests/inspector/styles-new-API-expected.txt
+++ b/LayoutTests/inspector/styles-new-API-expected.txt
@@ -55,6 +55,11 @@ body.mainpage: []
['text-decoration':'none'] @[5-27] active
['badproperty':'1badvalue1' non-parsed] @[107-131] active
+rule
+body.mainpage: []
+['prop1':'val1' non-parsed] @[5-17] active
+['prop2':'val2' non-parsed] @[22-34] active
+
=== Pseudo rules for body ===
PseudoId=4
@@ -188,6 +193,11 @@ body.mainpage {
badproperty: 1badvalue1;
}
+body.mainpage {
+ prop1: val1;
+ prop2: val2;
+}
+
'
rule
@@ -195,6 +205,11 @@ body.mainpage: []
['text-decoration':'none'] @[5-27] active
['badproperty':'1badvalue1' non-parsed] @[107-131] active
+rule
+body.mainpage: []
+['prop1':'val1' non-parsed] @[5-17] active
+['prop2':'val2' non-parsed] @[22-34] active
+
=== Last stylesheet patched ===
StyleSheet: 'body.mainpage { text-decoration: strikethrough; badproperty: 2badvalue2;}body { text-align: justify;}'
diff --git a/LayoutTests/inspector/styles-new-API.html b/LayoutTests/inspector/styles-new-API.html
index fda16a8..3250d95 100644
--- a/LayoutTests/inspector/styles-new-API.html
+++ b/LayoutTests/inspector/styles-new-API.html
@@ -284,6 +284,11 @@ body.mainpage {
badproperty: 1badvalue1;
}
+body.mainpage {
+ prop1: val1;
+ prop2: val2;
+}
+
</style>
</head>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7b92fde..8a2c688 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-14 Alexander Pavlov <apavlov at chromium.org>
+
+ Reviewed by Yury Semikhatsky.
+
+ Web Inspector: Reverted stylesheet breaks style data
+ https://bugs.webkit.org/show_bug.cgi?id=51030
+
+ * inspector/InspectorStyleSheet.cpp:
+ (WebCore::InspectorStyleSheet::reparseStyleSheet):
+
2010-12-14 Mads Ager <ager at chromium.org>
Reviewed by Pavel Feldman.
diff --git a/WebCore/inspector/InspectorStyleSheet.cpp b/WebCore/inspector/InspectorStyleSheet.cpp
index eb1538f..6e3ebe8 100644
--- a/WebCore/inspector/InspectorStyleSheet.cpp
+++ b/WebCore/inspector/InspectorStyleSheet.cpp
@@ -588,7 +588,7 @@ String InspectorStyleSheet::finalURL() const
void InspectorStyleSheet::reparseStyleSheet(const String& text)
{
for (unsigned i = 0, size = m_pageStyleSheet->length(); i < size; ++i)
- m_pageStyleSheet->remove(i);
+ m_pageStyleSheet->remove(0);
m_pageStyleSheet->parseString(text, m_pageStyleSheet->useStrictParsing());
m_pageStyleSheet->styleSheetChanged();
m_inspectorStyles.clear();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list