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

[bfulgham at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 7081cd1b2803112a4fc21d48287fc7beb7dded65
Author: bfulgham at webkit.org <bfulgham at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 25 21:58:55 2010 +0000

    Build corrections, no review.
    
    * platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h:
      Add include for new (missing) "CairoPath.h" class.
    * platform/graphics/cairo/PlatformRefPtrCairo.h: Correct
      include and compilation guards to match coding conventions.
    * platform/graphics/win/FontCustomPlatformDataCairo.cpp:
      Change implementation to match CG version, using the
      FontCustomPlatformData name, rather than the original
      FontCustomPlatformDataCairo.
    * platform/graphics/win/FontCustomPlatformDataCairo.h:
      Same as for the .cpp file.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66047 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e9ef02d..06dc40e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-08-25  Brent Fulgham  <bfulgham at webkit.org>
+
+        Build corrections, no review.
+
+        * platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h:
+          Add include for new (missing) "CairoPath.h" class.
+        * platform/graphics/cairo/PlatformRefPtrCairo.h: Correct
+          include and compilation guards to match coding conventions.
+        * platform/graphics/win/FontCustomPlatformDataCairo.cpp:
+          Change implementation to match CG version, using the
+          FontCustomPlatformData name, rather than the original
+          FontCustomPlatformDataCairo.
+        * platform/graphics/win/FontCustomPlatformDataCairo.h:
+          Same as for the .cpp file.
+
 2010-08-25  Krzysztof Czech  <k.czech at samsung.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebCore/platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h b/WebCore/platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h
index 97e7e07..81987ef 100644
--- a/WebCore/platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h
+++ b/WebCore/platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h
@@ -27,6 +27,7 @@
 
 #include "GraphicsContext.h"
 
+#include "CairoPath.h"
 #include <cairo.h>
 #include <math.h>
 #include <stdio.h>
diff --git a/WebCore/platform/graphics/cairo/PlatformRefPtrCairo.h b/WebCore/platform/graphics/cairo/PlatformRefPtrCairo.h
index b064e58..51d8fa9 100644
--- a/WebCore/platform/graphics/cairo/PlatformRefPtrCairo.h
+++ b/WebCore/platform/graphics/cairo/PlatformRefPtrCairo.h
@@ -17,10 +17,10 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#ifndef GRefPtrCairo_h
-#define GRefPtrCairo_h
+#ifndef PlatformRefPtrCairo_h
+#define PlatformRefPtrCairo_h
 
-#include "GRefPtr.h"
+#include "PlatformRefPtr.h"
 
 typedef struct _cairo cairo_t;
 typedef struct _cairo_surface cairo_surface_t;
diff --git a/WebCore/platform/graphics/win/FontCustomPlatformDataCairo.cpp b/WebCore/platform/graphics/win/FontCustomPlatformDataCairo.cpp
index 35839f5..02c5b99 100644
--- a/WebCore/platform/graphics/win/FontCustomPlatformDataCairo.cpp
+++ b/WebCore/platform/graphics/win/FontCustomPlatformDataCairo.cpp
@@ -27,12 +27,12 @@
 
 namespace WebCore {
 
-FontCustomPlatformDataCairo::~FontCustomPlatformDataCairo()
+FontCustomPlatformData::~FontCustomPlatformData()
 {
    cairo_font_face_destroy(m_fontFace);
 }
 
-FontPlatformData FontCustomPlatformDataCairo::fontPlatformData(int size, bool bold, bool italic)
+FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, bool italic)
 {
     return FontPlatformData(m_fontFace, size, bold, italic);
 }
@@ -42,7 +42,7 @@ static void releaseData(void* data)
     static_cast<SharedBuffer*>(data)->deref();
 }
 
-FontCustomPlatformDataCairo* createFontCustomPlatformData(SharedBuffer* buffer)
+FontCustomPlatformData* createFontCustomPlatformData(SharedBuffer* buffer)
 {
     ASSERT_ARG(buffer, buffer);
 
@@ -55,7 +55,7 @@ FontCustomPlatformDataCairo* createFontCustomPlatformData(SharedBuffer* buffer)
     static cairo_user_data_key_t bufferKey;
     cairo_font_face_set_user_data(fontFace, &bufferKey, buffer, releaseData);
 
-    return new FontCustomPlatformDataCairo(fontFace);
+    return new FontCustomPlatformData(fontFace);
 }
 
 bool FontCustomPlatformData::supportsFormat(const String& format)
diff --git a/WebCore/platform/graphics/win/FontCustomPlatformDataCairo.h b/WebCore/platform/graphics/win/FontCustomPlatformDataCairo.h
index 2dbea51..525957f 100644
--- a/WebCore/platform/graphics/win/FontCustomPlatformDataCairo.h
+++ b/WebCore/platform/graphics/win/FontCustomPlatformDataCairo.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2007 Apple Computer, Inc.
+ * Copyright (C) 2010 Brent Fulgham <bfulgham at webkit.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -31,12 +32,12 @@ namespace WebCore {
 class FontPlatformData;
 class SharedBuffer;
 
-struct FontCustomPlatformDataCairo : Noncopyable {
-    FontCustomPlatformDataCairo(cairo_font_face_t* fontFace)
+struct FontCustomPlatformData : Noncopyable {
+    FontCustomPlatformData(cairo_font_face_t* fontFace)
         : m_fontFace(fontFace)
     {
     }
-    ~FontCustomPlatformDataCairo();
+    ~FontCustomPlatformData();
 
     FontPlatformData fontPlatformData(int size, bool bold, bool italic);
 
@@ -45,7 +46,7 @@ struct FontCustomPlatformDataCairo : Noncopyable {
     cairo_font_face_t* m_fontFace;
 };
 
-FontCustomPlatformDataCairo* createFontCustomPlatformData(SharedBuffer*);
+FontCustomPlatformData* createFontCustomPlatformData(SharedBuffer*);
 
 }
 

-- 
WebKit Debian packaging