Merge Webkit at r58956: Initial merge by Git.

Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228

2 files changed, 5 insertions, 3 deletions

diff --git a/WebCore/platform/graphics/cg/FontPlatformData.h b/WebCore/platform/graphics/cg/FontPlatformData.h
index da2b7e3..1da8916 100644
--- a/WebCore/platform/graphics/cg/FontPlatformData.h
+++ b/WebCore/platform/graphics/cg/FontPlatformData.h
@@ -24,7 +24,7 @@
 #ifndef FontPlatformData_h
 #define FontPlatformData_h
 
-#include "RefCountedHFONT.h"
+#include "RefCountedGDIHandle.h"
 #include "StringImpl.h"
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
@@ -57,7 +57,7 @@ public:
     FontPlatformData(WTF::HashTableDeletedValueType) : m_font(WTF::HashTableDeletedValue) { }
     bool isHashTableDeletedValue() const { return m_font.isHashTableDeletedValue(); }
 
-    HFONT hfont() const { return m_font->hfont(); }
+    HFONT hfont() const { return m_font->handle(); }
     CGFontRef cgFont() const { return m_cgFont.get(); }
 
     float size() const { return m_size; }
@@ -88,7 +88,7 @@ public:
 private:
     void platformDataInit(HFONT, float size, HDC, WCHAR* faceName);
 
-    RefPtr<RefCountedHFONT> m_font;
+    RefPtr<RefCountedGDIHandle<HFONT> > m_font;
     RetainPtr<CGFontRef> m_cgFont;
 
     float m_size;
diff --git a/WebCore/platform/graphics/cg/ImageSourceCG.cpp b/WebCore/platform/graphics/cg/ImageSourceCG.cpp
index b4e1ca9..0b5f0b0 100644
--- a/WebCore/platform/graphics/cg/ImageSourceCG.cpp
+++ b/WebCore/platform/graphics/cg/ImageSourceCG.cpp
@@ -130,10 +130,12 @@ void ImageSource::setData(SharedBuffer* data, bool allDataReceived)
     if (!m_decoder) {
         m_decoder = CGImageSourceCreateIncremental(0);
     } else if (allDataReceived) {
+#if !PLATFORM(WIN)
         // 10.6 bug workaround: image sources with final=false fail to draw into PDF contexts, so re-create image source
         // when data is complete. <rdar://problem/7874035> (<http://openradar.appspot.com/7874035>)
         CFRelease(m_decoder);
         m_decoder = CGImageSourceCreateIncremental(0);
+#endif
     }
     // Create a CGDataProvider to wrap the SharedBuffer.
     data->ref();