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

[bfulgham at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit b29e76a0715fe16bba67d326212c91bff6c80e25
Author: bfulgham at webkit.org <bfulgham at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 30 01:41:07 2010 +0000

    Unreviewed build fix.
    
    * WebCore.vcproj/WebCoreCairo.vsprops: Provide missing WIN_CAIRO
      definition so that proper targets are build.
    * platform/graphics/win/cairo/FontPlatformData.h:
    (WebCore::FontPlatformData::orientation): Add missing implementation.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72855 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1883046..e7f2053 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-11-29  Brent Fulgham  <bfulgham at webkit.org>
+
+        Unreviewed build fix.
+
+        * WebCore.vcproj/WebCoreCairo.vsprops: Provide missing WIN_CAIRO
+          definition so that proper targets are build.
+        * platform/graphics/win/cairo/FontPlatformData.h:
+        (WebCore::FontPlatformData::orientation): Add missing implementation.
+
 2010-11-29  Chris Rogers  <crogers at google.com>
 
         Reviewed by Kenneth Russell.
diff --git a/WebCore/WebCore.vcproj/WebCoreCairo.vsprops b/WebCore/WebCore.vcproj/WebCoreCairo.vsprops
index adc4548..e9724f6 100644
--- a/WebCore/WebCore.vcproj/WebCoreCairo.vsprops
+++ b/WebCore/WebCore.vcproj/WebCoreCairo.vsprops
@@ -7,5 +7,6 @@
 	<Tool
 		Name="VCCLCompilerTool"
 		AdditionalIncludeDirectories="&quot;$(ProjectDir)..\platform\graphics\cairo&quot;;&quot;$(ProjectDir)..\platform\graphics\win\cairo&quot;;&quot;$(ProjectDir)..\svg\graphics\cairo&quot;;&quot;$(ProjectDir)..\platform\image-decoders&quot;;&quot;$(ProjectDir)..\platform\image-decoders\bmp&quot;;&quot;$(ProjectDir)..\platform\image-decoders\cairo&quot;;&quot;$(ProjectDir)..\platform\image-decoders\gif&quot;;&quot;$(ProjectDir)..\platform\image-decoders\ico&quot;;&quot;$(ProjectDir)..\platform\image-decoders\jpeg&quot;;&quot;$(ProjectDir)..\platform\image-decoders\png&quot;;&quot;$(ProjectDir)..\platform\image-decoders\webp&quot;;&quot;$(WebKitLibrariesDir)\include\cairo&quot;"
+		PreprocessorDefinitions="WIN_CAIRO"
 	/>
 </VisualStudioPropertySheet>
diff --git a/WebCore/platform/graphics/win/cairo/FontPlatformData.h b/WebCore/platform/graphics/win/cairo/FontPlatformData.h
index 05f9eab..d8f538a 100644
--- a/WebCore/platform/graphics/win/cairo/FontPlatformData.h
+++ b/WebCore/platform/graphics/win/cairo/FontPlatformData.h
@@ -3,6 +3,7 @@
  * Copyright (C) 2006 Michael Emmel mike.emmel at gmail.com
  * Copyright (C) 2007 Holger Hans Peter Freyther
  * Copyright (C) 2007 Pioneer Research Center USA, Inc.
+ * Copyright (C) 2010 Brent Fulgham <bfulgham at webkit.org>
  * All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -25,7 +26,7 @@
 #ifndef FontPlatformDataCairoWin_h
 #define FontPlatformDataCairoWin_h
 
-#include "FontDescription.h"
+#include "FontOrientation.h"
 #include "GlyphBuffer.h"
 #include "RefCountedGDIHandle.h"
 #include "StringImpl.h"
@@ -37,6 +38,8 @@ typedef struct HFONT__* HFONT;
 
 namespace WebCore {
 
+class FontDescription;
+
 class FontPlatformData {
 public:
     FontPlatformData(WTF::HashTableDeletedValueType)
@@ -73,6 +76,9 @@ public:
     void setSize(float size) { m_size = size; }
     bool syntheticBold() const { return m_syntheticBold; }
     bool syntheticOblique() const { return m_syntheticOblique; }
+
+    FontOrientation orientation() const { return Horizontal; } // FIXME: Implement.
+
     cairo_scaled_font_t* scaledFont() const { return m_scaledFont; }
 
     unsigned hash() const

-- 
WebKit Debian packaging