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

[ap at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 68e6d6c936d106c24cba77867323a135dfee7a4d
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 12 21:56:12 2010 +0000

            Reviewed by Simon Fraser.
    
            https://bugs.webkit.org/show_bug.cgi?id=49473
    
            No change in behavior, so no tests.
    
            * css/WebKitCSSMatrix.cpp:
            (WebCore::WebKitCSSMatrix::WebKitCSSMatrix): We don't inherit from StyleBase any more, so
            no need to initialize always-null parent.
            (WebCore::WebKitCSSMatrix::setMatrixValue): Since there was never a parent, useStrictParsing()
            just returned true.
    
            * css/WebKitCSSMatrix.h: Just inherit from RefCounted<WebKitCSSMatrix>. Removed unused default
            constructor and copy constructor.
    
            * html/canvas/WebGLRenderingContext.h: Removed an unnneded forward declaration.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71947 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index fecb207..37d0c25 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2010-11-12  Alexey Proskuryakov  <ap at apple.com>
+
+        Reviewed by Simon Fraser.
+
+        https://bugs.webkit.org/show_bug.cgi?id=49473
+
+        No change in behavior, so no tests.
+
+        * css/WebKitCSSMatrix.cpp:
+        (WebCore::WebKitCSSMatrix::WebKitCSSMatrix): We don't inherit from StyleBase any more, so
+        no need to initialize always-null parent.
+        (WebCore::WebKitCSSMatrix::setMatrixValue): Since there was never a parent, useStrictParsing()
+        just returned true.
+
+        * css/WebKitCSSMatrix.h: Just inherit from RefCounted<WebKitCSSMatrix>. Removed unused default
+        constructor and copy constructor.
+
+        * html/canvas/WebGLRenderingContext.h: Removed an unnneded forward declaration.
+
 2010-11-12  Helder Correia  <helder at sencha.com>
 
         Reviewed by Andreas Kling.
diff --git a/WebCore/css/WebKitCSSMatrix.cpp b/WebCore/css/WebKitCSSMatrix.cpp
index 3714760..33cc91e 100644
--- a/WebCore/css/WebKitCSSMatrix.cpp
+++ b/WebCore/css/WebKitCSSMatrix.cpp
@@ -36,25 +36,12 @@
 
 namespace WebCore {
 
-WebKitCSSMatrix::WebKitCSSMatrix()
-    : StyleBase(0)
-{
-}
-
-WebKitCSSMatrix::WebKitCSSMatrix(const WebKitCSSMatrix& m)
-    : StyleBase(0)
-    , m_matrix(m.m_matrix)
-{
-}
-
 WebKitCSSMatrix::WebKitCSSMatrix(const TransformationMatrix& m)
-    : StyleBase(0)
-    , m_matrix(m)
+    : m_matrix(m)
 {
 }
 
 WebKitCSSMatrix::WebKitCSSMatrix(const String& s, ExceptionCode& ec) 
-    : StyleBase(0)
 {
     setMatrixValue(s, ec);
 }
@@ -65,7 +52,7 @@ WebKitCSSMatrix::~WebKitCSSMatrix()
 
 void WebKitCSSMatrix::setMatrixValue(const String& string, ExceptionCode& ec)
 {
-    CSSParser p(useStrictParsing());
+    CSSParser p(true);
     RefPtr<CSSMutableStyleDeclaration> styleDeclaration = CSSMutableStyleDeclaration::create();
     if (p.parseValue(styleDeclaration.get(), CSSPropertyWebkitTransform, string, true)) {
         // Convert to TransformOperations. This can fail if a property 
diff --git a/WebCore/css/WebKitCSSMatrix.h b/WebCore/css/WebKitCSSMatrix.h
index 56bf76b..2357a69 100644
--- a/WebCore/css/WebKitCSSMatrix.h
+++ b/WebCore/css/WebKitCSSMatrix.h
@@ -28,23 +28,13 @@
 
 #include "ExceptionCode.h"
 #include "PlatformString.h"
-#include "StyleBase.h"
 #include "TransformationMatrix.h"
-#include <wtf/PassRefPtr.h>
 #include <wtf/RefPtr.h>
 
 namespace WebCore {
 
-class WebKitCSSMatrix : public StyleBase {
+class WebKitCSSMatrix : public RefCounted<WebKitCSSMatrix> {
 public:
-    static PassRefPtr<WebKitCSSMatrix> create()
-    {
-        return adoptRef(new WebKitCSSMatrix());
-    }
-    static PassRefPtr<WebKitCSSMatrix> create(const WebKitCSSMatrix& m)
-    {
-        return adoptRef(new WebKitCSSMatrix(m));
-    }
     static PassRefPtr<WebKitCSSMatrix> create(const TransformationMatrix& m)
     {
         return adoptRef(new WebKitCSSMatrix(m));
@@ -104,7 +94,7 @@ public:
     void setM43(double f) { m_matrix.setM43(f); }
     void setM44(double f) { m_matrix.setM44(f); }
  
-    void setMatrixValue(const String& string, ExceptionCode&);
+    void setMatrixValue(const String&, ExceptionCode&);
     
     // The following math function return a new matrix with the 
     // specified operation applied. The this value is not modified.
@@ -146,8 +136,6 @@ public:
     String toString() const;
     
 protected:
-    WebKitCSSMatrix();
-    WebKitCSSMatrix(const WebKitCSSMatrix&);
     WebKitCSSMatrix(const TransformationMatrix&);
     WebKitCSSMatrix(const String&, ExceptionCode&);
 
diff --git a/WebCore/html/canvas/WebGLRenderingContext.h b/WebCore/html/canvas/WebGLRenderingContext.h
index fc8d8fa..fbcb082 100644
--- a/WebCore/html/canvas/WebGLRenderingContext.h
+++ b/WebCore/html/canvas/WebGLRenderingContext.h
@@ -54,7 +54,6 @@ class HTMLVideoElement;
 class ImageBuffer;
 class ImageData;
 class IntSize;
-class WebKitCSSMatrix;
 
 class WebGLRenderingContext : public CanvasRenderingContext {
 public:

-- 
WebKit Debian packaging