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

yutak at chromium.org yutak at chromium.org
Wed Dec 22 17:56:53 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 90326072c9dbe63cd64c25eed7c7e4ffbafb0427
Author: yutak at chromium.org <yutak at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 3 03:41:25 2010 +0000

    2010-12-02  Yuta Kitamura  <yutak at chromium.org>
    
            Reviewed by Alexey Proskuryakov.
    
            An attempt to fix Chromium's clang build.
    
            Implement (non-EventListener) marquee IDL attributes from HTML5.
            https://bugs.webkit.org/show_bug.cgi?id=49786
    
            * rendering/style/RenderStyle.h:
            (WebCore::InheritedFlags::initialMarqueeSpeed):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73230 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 68f9ce0..8ec5437 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-02  Yuta Kitamura  <yutak at chromium.org>
+
+        Reviewed by Alexey Proskuryakov.
+
+        An attempt to fix Chromium's clang build.
+
+        Implement (non-EventListener) marquee IDL attributes from HTML5.
+        https://bugs.webkit.org/show_bug.cgi?id=49786
+
+        * rendering/style/RenderStyle.h:
+        (WebCore::InheritedFlags::initialMarqueeSpeed):
+
 2010-12-02  Mikhail Naganov  <mnaganov at chromium.org>
 
         Reviewed by Pavel Feldman.
diff --git a/WebCore/rendering/style/RenderStyle.h b/WebCore/rendering/style/RenderStyle.h
index e606056..e907cc0 100644
--- a/WebCore/rendering/style/RenderStyle.h
+++ b/WebCore/rendering/style/RenderStyle.h
@@ -1248,7 +1248,7 @@ public:
     static EBoxSizing initialBoxSizing() { return CONTENT_BOX; }
     static StyleReflection* initialBoxReflect() { return 0; }
     static int initialMarqueeLoopCount() { return -1; }
-    static unsigned initialMarqueeSpeed() { return 85; }
+    static int initialMarqueeSpeed() { return 85; }
     static Length initialMarqueeIncrement() { return Length(6, Fixed); }
     static EMarqueeBehavior initialMarqueeBehavior() { return MSCROLL; }
     static EMarqueeDirection initialMarqueeDirection() { return MAUTO; }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list