[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[darin at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit 7272139ac4d6df580509e33687a02733606e1d07
Author: darin at chromium.org <darin at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 5 23:57:57 2009 +0000

    2009-09-30  Kenneth Russell  <kbr at google.com>
    
            Reviewed by Darin Fisher.
    
            Update platform-specific #ifdefs in GraphicsContext3D.h for the
            Chromium port.
            https://bugs.webkit.org/show_bug.cgi?id=29936
    
            * platform/graphics/GraphicsContext3D.h:
            Changed #if PLATFORM(SKIA) to #if PLATFORM(CHROMIUM).
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49132 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 31e6849..ad06140 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2009-09-30  Kenneth Russell  <kbr at google.com>
+
+        Reviewed by Darin Fisher.
+
+        Update platform-specific #ifdefs in GraphicsContext3D.h for the
+        Chromium port.
+        https://bugs.webkit.org/show_bug.cgi?id=29936
+
+        * platform/graphics/GraphicsContext3D.h:
+        Changed #if PLATFORM(SKIA) to #if PLATFORM(CHROMIUM).
+
 2009-10-05  Dan Bernstein  <mitz at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/platform/graphics/GraphicsContext3D.h b/WebCore/platform/graphics/GraphicsContext3D.h
index edda215..5223e05 100644
--- a/WebCore/platform/graphics/GraphicsContext3D.h
+++ b/WebCore/platform/graphics/GraphicsContext3D.h
@@ -63,7 +63,7 @@ namespace WebCore {
     class WebKitCSSMatrix;
     
     // FIXME: ideally this would be used on all platforms.
-#if PLATFORM(SKIA)
+#if PLATFORM(CHROMIUM)
     class GraphicsContext3DInternal;
 #endif
 
@@ -77,7 +77,7 @@ namespace WebCore {
 #if PLATFORM(MAC)
         PlatformGraphicsContext3D platformGraphicsContext3D() const { return m_contextObj; }
         Platform3DObject platformTexture() const { return m_texture; }
-#elif PLATFORM(SKIA)
+#elif PLATFORM(CHROMIUM)
         PlatformGraphicsContext3D platformGraphicsContext3D() const;
         Platform3DObject platformTexture() const;
 #else
@@ -323,7 +323,7 @@ namespace WebCore {
 #endif        
 
         // FIXME: ideally this would be used on all platforms.
-#if PLATFORM(SKIA)
+#if PLATFORM(CHROMIUM)
         friend class GraphicsContext3DInternal;
         OwnPtr<GraphicsContext3DInternal> m_internal;
 #endif

-- 
WebKit Debian packaging