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

[benm at google.com]

The following commit has been merged in the debian/experimental branch:
commit c17f794df2b2d07ee73587cf29642d5d8e3935e5
Author: benm at google.com <benm at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 25 19:48:47 2010 +0000

    2010-10-25  Ben Murdoch  <benm at google.com>
    
            Reviewed by Steve Block.
    
            Build break with ENABLE(BLOB) and not ENABLE(3D_CANVAS)
            https://bugs.webkit.org/show_bug.cgi?id=48243
    
            Build fix only so no new tests.
    
            * bindings/generic/RuntimeEnabledFeatures.h: Guard appropriately.
            * bindings/v8/custom/V8ArrayBufferViewCustom.h: ditto.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70478 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1c85363..1d45203 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-25  Ben Murdoch  <benm at google.com>
+
+        Reviewed by Steve Block.
+
+        Build break with ENABLE(BLOB) and not ENABLE(3D_CANVAS)
+        https://bugs.webkit.org/show_bug.cgi?id=48243
+
+        Build fix only so no new tests.
+
+        * bindings/generic/RuntimeEnabledFeatures.h: Guard appropriately.
+        * bindings/v8/custom/V8ArrayBufferViewCustom.h: ditto.
+
 2010-10-25  Cris Neckar  <cdn at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebCore/bindings/generic/RuntimeEnabledFeatures.h b/WebCore/bindings/generic/RuntimeEnabledFeatures.h
index 1054f64..b572b2c 100644
--- a/WebCore/bindings/generic/RuntimeEnabledFeatures.h
+++ b/WebCore/bindings/generic/RuntimeEnabledFeatures.h
@@ -92,7 +92,7 @@ public:
     static bool openDatabaseSyncEnabled();
 #endif
 
-#if ENABLE(3D_CANVAS)
+#if ENABLE(3D_CANVAS) || ENABLE(BLOB)
     static void setWebGLEnabled(bool isEnabled) { isWebGLEnabled = isEnabled; }
     static bool arrayBufferEnabled() { return isWebGLEnabled; }
     static bool int8ArrayEnabled() { return isWebGLEnabled; }
diff --git a/WebCore/bindings/v8/custom/V8ArrayBufferViewCustom.h b/WebCore/bindings/v8/custom/V8ArrayBufferViewCustom.h
index afaf6bf..ffea07c 100644
--- a/WebCore/bindings/v8/custom/V8ArrayBufferViewCustom.h
+++ b/WebCore/bindings/v8/custom/V8ArrayBufferViewCustom.h
@@ -30,7 +30,7 @@
 
 #include "config.h"
 
-#if ENABLE(3D_CANVAS)
+#if ENABLE(3D_CANVAS) || ENABLE(BLOB)
 
 #include "ArrayBuffer.h"
 

-- 
WebKit Debian packaging