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

tony at chromium.org tony at chromium.org
Wed Dec 22 13:24:39 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit fa425eae278db6b63c738493a63cf0e55060d62d
Author: tony at chromium.org <tony at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 14 17:27:51 2010 +0000

    2010-09-14  Tony Chang  <tony at chromium.org>
    
            Unreviewed, fix chromium compile.
    
            * platform/graphics/chromium/ImageLayerChromium.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67478 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 74a9260..d7901b3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-14  Tony Chang  <tony at chromium.org>
+
+        Unreviewed, fix chromium compile.
+
+        * platform/graphics/chromium/ImageLayerChromium.h:
+
 2010-09-14  Nico Weber  <thakis at chromium.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebCore/platform/graphics/chromium/ImageLayerChromium.h b/WebCore/platform/graphics/chromium/ImageLayerChromium.h
index a497b5c..eed116c 100644
--- a/WebCore/platform/graphics/chromium/ImageLayerChromium.h
+++ b/WebCore/platform/graphics/chromium/ImageLayerChromium.h
@@ -57,7 +57,7 @@ private:
 
 #if PLATFORM(CG)
     RetainPtr<CGImageRef> m_contents;
-#elif 
+#else
     // FIXME: This needs to be an owning type.
     NativeImagePtr m_contents;
 #endif

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list