[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

yurys at chromium.org yurys at chromium.org
Mon Feb 21 00:25:45 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit d22c5083c3bf36e8e80a26c9d92f1a5387f68ab9
Author: yurys at chromium.org <yurys at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 31 11:10:30 2011 +0000

    2011-01-31  Yury Semikhatsky  <yurys at chromium.org>
    
            Unreviewed. Fix Chromium compilation on Linux.
    
            * platform/graphics/ShadowBlur.cpp: added PLATFORM(CHROMIUM) guard
            * platform/graphics/ShadowBlur.h: added missing ColorSpace.h header include
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77119 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index d315bc1..f6c6dbe 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,5 +1,12 @@
 2011-01-31  Yury Semikhatsky  <yurys at chromium.org>
 
+        Unreviewed. Fix Chromium compilation on Linux.
+
+        * platform/graphics/ShadowBlur.cpp: added PLATFORM(CHROMIUM) guard
+        * platform/graphics/ShadowBlur.h: added missing ColorSpace.h header include
+
+2011-01-31  Yury Semikhatsky  <yurys at chromium.org>
+
         Unreviewed. Fix Chromium compilation on Mac broken by r77101.
 
         * WebCore.gypi: add ShadowBlur.{h,cpp} to the gypi file.
diff --git a/Source/WebCore/platform/graphics/ShadowBlur.cpp b/Source/WebCore/platform/graphics/ShadowBlur.cpp
index ac9e775..e59dbf9 100644
--- a/Source/WebCore/platform/graphics/ShadowBlur.cpp
+++ b/Source/WebCore/platform/graphics/ShadowBlur.cpp
@@ -597,7 +597,7 @@ void ShadowBlur::drawRectShadowWithTiling(GraphicsContext* graphicsContext, cons
     ScratchBuffer::shared().scheduleScratchBufferPurge();
 }
 
-#if !PLATFORM(CG)
+#if !PLATFORM(CG) && !PLATFORM(CHROMIUM)
 IntRect ShadowBlur::clipBounds(GraphicsContext*)
 {
     // FIXME: add clipBounds() to GraphicsContext.
diff --git a/Source/WebCore/platform/graphics/ShadowBlur.h b/Source/WebCore/platform/graphics/ShadowBlur.h
index e96c992..7c83d52 100644
--- a/Source/WebCore/platform/graphics/ShadowBlur.h
+++ b/Source/WebCore/platform/graphics/ShadowBlur.h
@@ -30,6 +30,7 @@
 #define ShadowBlur_h
 
 #include "Color.h"
+#include "ColorSpace.h"
 #include "FloatRect.h"
 #include "RoundedIntRect.h"
 #include <wtf/Noncopyable.h>

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list