[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[apavlov at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 5a5547e0744f81a163b369bd1ff8c2ebc3d2fffe
Author: apavlov at chromium.org <apavlov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 1 14:14:19 2010 +0000

    2010-12-01  Alexander Pavlov  <apavlov at chromium.org>
    
            Reviewed by Yury Semikhatsky.
    
            Web Inspector: name-only property appears in style declaration but not in the Styles pane
            https://bugs.webkit.org/show_bug.cgi?id=49663
    
            Check that at least one property has been parsed from the user input.
    
            WebCore:
            * inspector/InspectorStyleSheet.cpp:
            (WebCore::InspectorStyle::setPropertyText):
    
            LayoutTests:
            * inspector/styles-new-API.html:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73018 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 653a2e9..32d5143 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-01  Alexander Pavlov  <apavlov at chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: name-only property appears in style declaration but not in the Styles pane
+        https://bugs.webkit.org/show_bug.cgi?id=49663
+
+        * inspector/styles-new-API.html:
+
 2010-12-01  Anton D'Auria  <adauria at apple.com>
 
         Reviewed by Kevin Decker.
diff --git a/LayoutTests/inspector/styles-new-API.html b/LayoutTests/inspector/styles-new-API.html
index bf5d0b3..fda16a8 100644
--- a/LayoutTests/inspector/styles-new-API.html
+++ b/LayoutTests/inspector/styles-new-API.html
@@ -129,6 +129,9 @@ function frontend_setStyleText(testController, styleSheet)
 
     InspectorBackend.setPropertyText2(styleSheet.rules[0].style.styleId, 0, "", true);
     InspectorBackend.setPropertyText2(styleSheet.rules[0].style.styleId, 0, "", true);
+
+    // This operation should not update the style as the new property text is not parsable.
+    InspectorBackend.setPropertyText2(styleSheet.rules[0].style.styleId, 0, "zzz;", false);
     InspectorBackend.setPropertyText2(styleSheet.rules[0].style.styleId, 0, "color: white; background: black;", false, didSetStyleText.bind(null, testController));
 }
 
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6c004c4..fca8907 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-01  Alexander Pavlov  <apavlov at chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: name-only property appears in style declaration but not in the Styles pane
+        https://bugs.webkit.org/show_bug.cgi?id=49663
+
+        Check that at least one property has been parsed from the user input.
+
+        * inspector/InspectorStyleSheet.cpp:
+        (WebCore::InspectorStyle::setPropertyText):
+
 2010-12-01  Andrey Kosyakov  <caseq at chromium.org>
 
         Reviewed by Pavel Feldman.
diff --git a/WebCore/inspector/InspectorStyleSheet.cpp b/WebCore/inspector/InspectorStyleSheet.cpp
index 5b67a26..eb1538f 100644
--- a/WebCore/inspector/InspectorStyleSheet.cpp
+++ b/WebCore/inspector/InspectorStyleSheet.cpp
@@ -178,7 +178,9 @@ bool InspectorStyle::setPropertyText(unsigned index, const String& propertyText,
         p.parseDeclaration(tempMutableStyle.get(), propertyText + " -webkit-boguz-propertee: none", &sourceData);
         Vector<CSSPropertySourceData>& propertyData = sourceData->propertyData;
         unsigned propertyCount = propertyData.size();
-        if (!propertyCount)
+
+        // At least one property + the bogus property added just above should be present.
+        if (propertyCount < 2)
             return false;
 
         // Check for a proper propertyText termination (the parser could at least restore to the PROPERTY_NAME state).

-- 
WebKit Debian packaging