Attempt at getting GDI text to render when drawn using canvas. I added...

third_party/WebKit/WebCore/platform/graphics/skia/PlatformContextSkia.h

 /*
  * Copyright (c) 2008, Google Inc. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  * 
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 55 matching lines @@
 public:
     // For printing, there shouldn't be any canvas. canvas can be NULL. If you
     // supply a NULL canvas, you can also call setCanvas later.
     PlatformContextSkia(skia::PlatformCanvas*);
     ~PlatformContextSkia();
 
     // Sets the canvas associated with this context. Use when supplying NULL
     // to the constructor.
     void setCanvas(skia::PlatformCanvas*);
 
+#if PLATFORM(WIN_OS)
+    // If false we're rendering to a GraphicsContext for a web page, if false
+    // we're not (as is the case when rendering to a canvas object).
+    // If this is true the contents have not been marked up with the magic
+    // color and all text drawing needs to go to a layer so that the alpha is
+    // correctly updated.
+    void setDrawingToImageBuffer(bool value);
+    bool isDrawingToImageBuffer() const;
+#endif
+
     void save();
     void restore();
 
+    // Begins a layer that is clipped to the image |imageBuffer| at the location
+    // |rect|. This layer is implicitly restored when the next restore is
+    // invoked.
+    // NOTE: |imageBuffer| may be deleted before the |restore| is invoked.
+#if defined(__linux__) || PLATFORM(WIN_OS)
+    void beginLayerClippedToImage(const WebCore::FloatRect& rect,
+                                  const WebCore::ImageBuffer* imageBuffer);
+#endif
+
     // Sets up the common flags on a paint for antialiasing, effects, etc.
     // This is implicitly called by setupPaintFill and setupPaintStroke, but
     // you may wish to call it directly sometimes if you don't want that other
     // behavior.
     void setupPaintCommon(SkPaint*) const;
 
     // Sets up the paint for the current fill style.
     void setupPaintForFilling(SkPaint*) const;
 
     // Sets up the paint for stroking. Returns an int representing the width of
@@ skipping 53 matching lines @@
     // context. Bitmap shouldn't be resampled when printing to keep the best
     // possible quality.
     bool isPrinting();
 
 #if defined(__linux__)
     // FIXME: should be camelCase.
     GdkSkia* gdk_skia() const { return m_gdkskia; }
 #endif
 
 private:
+#if defined(__linux__) || PLATFORM(WIN_OS)
+    // Used when restoring and the state has an image clip. Only shows the pixels in
+    // m_canvas that are also in imageBuffer.
+    void applyClipFromImage(const WebCore::FloatRect& rect, const SkBitmap& imageBuffer);
+#endif
+
     // Defines drawing style.
     struct State;
 
     // NULL indicates painting is disabled. Never delete this object.
     skia::PlatformCanvas* m_canvas;
 
     // States stack. Enables local drawing state change with save()/restore()
     // calls.
     WTF::Vector<State> m_stateStack;
     // Pointer to the current drawing state. This is a cached value of
     // mStateStack.back().
     State* m_state;
 
     // Current path in global coordinates.
     SkPath m_path;
 
 #if defined(__linux__)
     // A pointer to a GDK Drawable wrapping of this Skia canvas
     GdkSkia* m_gdkskia;
 #endif
+
+#if PLATFORM(WIN_OS)
+    bool m_drawingToImageBuffer;
+#endif
 };
 
 #endif  // PlatformContextSkia_h