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

[kbr at google.com]

The following commit has been merged in the debian/experimental branch:
commit fc98bc365fd22fd84a657305041ae864520206b2
Author: kbr at google.com <kbr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 28 01:00:21 2010 +0000

    2010-09-27  Kenneth Russell  <kbr at google.com>
    
            Unreviewed, Qt build fix. Stub out CanvasRenderingContext::checkOrigin(const HTMLVideoElement*)
            on platforms that don't support video after r68460.
    
            * html/canvas/CanvasRenderingContext.cpp:
            (WebCore::CanvasRenderingContext::checkOrigin):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68462 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 33df113..97203b2 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-27  Kenneth Russell  <kbr at google.com>
+
+        Unreviewed, Qt build fix. Stub out CanvasRenderingContext::checkOrigin(const HTMLVideoElement*)
+        on platforms that don't support video after r68460.
+
+        * html/canvas/CanvasRenderingContext.cpp:
+        (WebCore::CanvasRenderingContext::checkOrigin):
+
 2010-09-27  Chris Fleizach  <cfleizach at apple.com>
 
         Reviewed by Beth Dakin.
diff --git a/WebCore/html/canvas/CanvasRenderingContext.cpp b/WebCore/html/canvas/CanvasRenderingContext.cpp
index 9f9cd82..c814c66 100644
--- a/WebCore/html/canvas/CanvasRenderingContext.cpp
+++ b/WebCore/html/canvas/CanvasRenderingContext.cpp
@@ -77,9 +77,11 @@ void CanvasRenderingContext::checkOrigin(const HTMLImageElement* image)
 
 void CanvasRenderingContext::checkOrigin(const HTMLVideoElement* video)
 {
+#if ENABLE(VIDEO)
     checkOrigin(KURL(KURL(), video->currentSrc()));
     if (canvas()->originClean() && video && !video->hasSingleSecurityOrigin())
         canvas()->setOriginTainted();
+#endif
 }
 
 void CanvasRenderingContext::checkOrigin(const KURL& url)

-- 
WebKit Debian packaging