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

ap at apple.com ap at apple.com
Wed Dec 22 15:52:53 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit e9bdaf4ae8bb5ed2a49a7693f39ad31af8dfc477
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 16 01:05:13 2010 +0000

            Reviewed by Darin Adler.
    
            A minor style fix in StyledElement.cpp.
    
            * dom/StyledElement.cpp:
            (WebCore::StyledElement::addCSSProperty):
            (WebCore::StyledElement::addCSSImageProperty):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72047 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7035b27..beeb63c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,16 @@
 
         Reviewed by Darin Adler.
 
+        A minor style fix in StyledElement.cpp.
+
+        * dom/StyledElement.cpp:
+        (WebCore::StyledElement::addCSSProperty):
+        (WebCore::StyledElement::addCSSImageProperty):
+
+2010-11-15  Alexey Proskuryakov  <ap at apple.com>
+
+        Reviewed by Darin Adler.
+
         https://bugs.webkit.org/show_bug.cgi?id=49565
         Remove Attr.style accessor
 
diff --git a/WebCore/dom/StyledElement.cpp b/WebCore/dom/StyledElement.cpp
index 7384c0b..9a7c9c8 100644
--- a/WebCore/dom/StyledElement.cpp
+++ b/WebCore/dom/StyledElement.cpp
@@ -267,22 +267,25 @@ CSSStyleDeclaration* StyledElement::style()
     return getInlineStyleDecl();
 }
 
-void StyledElement::addCSSProperty(Attribute* attr, int id, const String &value)
+void StyledElement::addCSSProperty(Attribute* attribute, int id, const String &value)
 {
-    if (!attr->decl()) createMappedDecl(attr);
-    attr->decl()->setProperty(id, value, false);
+    if (!attribute->decl())
+        createMappedDecl(attribute);
+    attribute->decl()->setProperty(id, value, false);
 }
 
-void StyledElement::addCSSProperty(Attribute* attr, int id, int value)
+void StyledElement::addCSSProperty(Attribute* attribute, int id, int value)
 {
-    if (!attr->decl()) createMappedDecl(attr);
-    attr->decl()->setProperty(id, value, false);
+    if (!attribute->decl())
+        createMappedDecl(attribute);
+    attribute->decl()->setProperty(id, value, false);
 }
 
-void StyledElement::addCSSImageProperty(Attribute* attr, int id, const String& url)
+void StyledElement::addCSSImageProperty(Attribute* attribute, int id, const String& url)
 {
-    if (!attr->decl()) createMappedDecl(attr);
-    attr->decl()->setImageProperty(id, url, false);
+    if (!attribute->decl())
+        createMappedDecl(attribute);
+    attribute->decl()->setImageProperty(id, url, false);
 }
 
 void StyledElement::addCSSLength(Attribute* attr, int id, const String &value)

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list