Bug 527707: Add Direct2D and DirectWrite backend integration to thebes and widget. Preffed off by default r=jrmuizel r=jmathies r=jfkthame

Author: Bas-moz

gfx/thebes/public/Makefile.in

@@ -51,7 +51,9 @@ EXPORTS +=	gfxFT2Fonts.h \
 		gfxDDrawSurface.h \
 		$(NULL)
 else
-EXPORTS +=	gfxWindowsFonts.h 
+EXPORTS +=  gfxWindowsFonts.h
+EXPORTS +=  gfxDWriteFonts.h
+EXPORTS +=  gfxD2DSurface.h
 endif
 
 endif

gfx/thebes/public/gfxD2DSurface.h

@@ -0,0 +1,64 @@
+/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Bas Schouten <bschouten@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef GFX_D2DSURFACE_H
+#define GFX_D2DSURFACE_H
+
+#include "gfxASurface.h"
+#include "nsPoint.h"
+#include "nsRect.h"
+
+#include <windows.h>
+
+class THEBES_API gfxD2DSurface : public gfxASurface {
+public:
+
+    gfxD2DSurface(HWND wnd);
+
+    gfxD2DSurface(const gfxIntSize& size,
+                  gfxImageFormat imageFormat = ImageFormatRGB24);
+
+
+    gfxD2DSurface(cairo_surface_t *csurf);
+
+    virtual ~gfxD2DSurface();
+
+
+    void Present();
+    void Scroll(const nsIntPoint &aDelta, const nsIntRect &aClip);
+
+};
+
+#endif /* GFX_D2DSURFACE_H */

gfx/thebes/public/gfxDWriteFonts.h

@@ -0,0 +1,116 @@
+/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Foundation code.
+ *
+ * The Initial Developer of the Original Code is Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Bas Schouten <bschouten@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef GFX_WINDOWSDWRITEFONTS_H
+#define GFX_WINDOWSDWRITEFONTS_H
+
+#include <dwrite.h>
+
+#include "gfxFont.h"
+#include "gfxUserFontSet.h"
+#include "cairo-win32.h"
+
+/**
+ * \brief Class representing a font face for a font entry.
+ */
+class gfxDWriteFont : public gfxFont 
+{
+public:
+    gfxDWriteFont(gfxFontEntry *aFontEntry,
+                         const gfxFontStyle *aFontStyle);
+    ~gfxDWriteFont();
+
+    static already_AddRefed<gfxDWriteFont>
+        GetOrMakeFont(gfxFontEntry *aFontEntry, 
+                      const gfxFontStyle *aStyle,
+                      PRBool aNeedsBold = PR_FALSE);
+
+    virtual nsString GetUniqueName();
+
+    virtual const gfxFont::Metrics& GetMetrics();
+
+    virtual PRUint32 GetSpaceGlyph();
+
+    virtual PRBool SetupCairoFont(gfxContext *aContext);
+
+    virtual PRBool IsValid() { return mFontFace != NULL; }
+protected:
+    friend class gfxDWriteFontGroup;
+
+    void ComputeMetrics();
+
+    cairo_font_face_t *CairoFontFace();
+
+    cairo_scaled_font_t *CairoScaledFont();
+
+    nsRefPtr<IDWriteFontFace> mFontFace;
+    cairo_font_face_t *mCairoFontFace;
+    cairo_scaled_font_t *mCairoScaledFont;
+
+    gfxFont::Metrics *mMetrics;
+    PRBool mNeedsOblique;
+};
+
+/**
+ * \brief Class representing a DWrite windows font group.
+ */
+class gfxDWriteFontGroup : public gfxFontGroup 
+{
+public:
+    gfxDWriteFontGroup(const nsAString& aFamilies, 
+                              const gfxFontStyle *aStyle,
+                              gfxUserFontSet *aUserFontSet);
+    virtual ~gfxDWriteFontGroup();
+    
+    gfxFontGroup *Copy(const gfxFontStyle *aStyle);
+
+    /**
+     * Gets the font at a certain position in the font list, it will
+     * create this font if it hasn't actually been created yet.
+     *
+     * \param i Position in the font list
+     * \return Object representing the font
+     */
+    virtual gfxDWriteFont *GetFontAt(PRInt32 i);
+
+    virtual gfxTextRun *MakeTextRun(const PRUnichar *aString, PRUint32 aLength,
+                                    const Parameters *aParams, PRUint32 aFlags);
+    virtual gfxTextRun *MakeTextRun(const PRUint8 *aString, PRUint32 aLength,
+                                    const Parameters *aParams, PRUint32 aFlags);
+};
+
+#endif

gfx/thebes/public/gfxWindowsPlatform.h

@@ -43,12 +43,22 @@
 #define MOZ_FT2_FONTS 1
 #endif
 
+
+/**
+ * XXX to get CAIRO_HAS_DDRAW_SURFACE, CAIRO_HAS_D2D_SURFACE and
+ * CAIRO_HAS_DWRITE_FONT
+ */
+#include "cairo.h"
+
 #include "gfxFontUtils.h"
 #include "gfxWindowsSurface.h"
 #ifdef MOZ_FT2_FONTS
 #include "gfxFT2Fonts.h"
 #else
 #include "gfxWindowsFonts.h"
+#ifdef CAIRO_HAS_DWRITE_FONT
+#include "gfxDWriteFonts.h"
+#endif
 #endif
 #include "gfxPlatform.h"
 
@@ -93,6 +103,9 @@ class THEBES_API gfxWindowsPlatform : public gfxPlatform {
         /* Use DirectDraw with OpenGL on Windows CE */
         RENDER_DDRAW_GL,
 
+        /* Use Direct2D rendering */
+        RENDER_DIRECT2D,
+
         /* max */
         RENDER_MODE_MAX
     };
@@ -147,6 +160,10 @@ class THEBES_API gfxWindowsPlatform : public gfxPlatform {
 
     void ClearPrefFonts() { mPrefFonts.Clear(); }
 
+#ifdef CAIRO_HAS_DWRITE_FONT
+    IDWriteFactory *GetDWriteFactory() { return mDWriteFactory; }
+#endif
+
 #ifdef MOZ_FT2_FONTS
     FT_Library GetFTLibrary();
 #endif
@@ -159,6 +176,10 @@ class THEBES_API gfxWindowsPlatform : public gfxPlatform {
 private:
     void Init();
 
+#ifdef CAIRO_HAS_DWRITE_FONT
+    nsRefPtr<IDWriteFactory> mDWriteFactory;
+#endif
+
     virtual qcms_profile* GetPlatformCMSOutputProfile();
 
     // TODO: unify this with mPrefFonts (NB: holds families, not fonts) in gfxPlatformFontList

gfx/thebes/src/Makefile.in

@@ -48,7 +48,6 @@ EXTRA_DSO_LDOPTS += \
 	$(QCMS_LIBS) \
 	$(NULL)
 
-
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 CPPSRCS	+= 	gfxWindowsPlatform.cpp \
 		gfxWindowsSurface.cpp \
@@ -66,7 +65,12 @@ CPPSRCS	+= gfxFT2Fonts.cpp \
 EXTRA_DSO_LDOPTS += ddraw.lib
 else
 CPPSRCS	+= gfxWindowsFonts.cpp \
+	   gfxDWriteFonts.cpp \
+	   gfxDWriteTextAnalysis.cpp \
+	   gfxDWriteCommon.cpp \
+	   gfxD2DSurface.cpp \
 	   gfxGDIFontList.cpp \
+	   gfxDWriteFontList.cpp \
 	   $(NULL)
 endif
 
@@ -202,4 +206,3 @@ endif
 ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
 CXXFLAGS += $(CAIRO_FT_CFLAGS)
 endif
-

gfx/thebes/src/gfxASurface.cpp

@@ -45,6 +45,9 @@
 #ifdef CAIRO_HAS_WIN32_SURFACE
 #include "gfxWindowsSurface.h"
 #endif
+#ifdef CAIRO_HAS_D2D_SURFACE
+#include "gfxD2DSurface.h"
+#endif
 
 #ifdef MOZ_X11
 #include "gfxXlibSurface.h"
@@ -162,6 +165,11 @@ gfxASurface::Wrap (cairo_surface_t *csurf)
         result = new gfxWindowsSurface(csurf);
     }
 #endif
+#ifdef CAIRO_HAS_D2D_SURFACE
+    else if (stype == CAIRO_SURFACE_TYPE_D2D) {
+        result = new gfxD2DSurface(csurf);
+    }
+#endif
 #ifdef MOZ_X11
     else if (stype == CAIRO_SURFACE_TYPE_XLIB) {
         result = new gfxXlibSurface(csurf);

gfx/thebes/src/gfxD2DSurface.cpp

@@ -0,0 +1,75 @@
+/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Bas Schouten <bschouten@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "gfxD2DSurface.h"
+#include "cairo.h"
+#include "cairo-win32.h"
+
+gfxD2DSurface::gfxD2DSurface(HWND aWnd)
+{
+    Init(cairo_d2d_surface_create_for_hwnd(aWnd));
+}
+
+gfxD2DSurface::gfxD2DSurface(cairo_surface_t *csurf)
+{
+    Init(csurf, PR_TRUE);
+}
+
+gfxD2DSurface::gfxD2DSurface(const gfxIntSize& size,
+                             gfxImageFormat imageFormat)
+{
+    Init(cairo_d2d_surface_create((cairo_format_t)imageFormat, size.width, size.height));
+}
+
+gfxD2DSurface::~gfxD2DSurface()
+{
+}
+
+void
+gfxD2DSurface::Present()
+{
+    cairo_d2d_present_backbuffer(CairoSurface());
+}
+
+void
+gfxD2DSurface::Scroll(const nsIntPoint &aDelta, const nsIntRect &aClip)
+{
+    cairo_rectangle_t rect;
+    rect.x = aClip.x;
+    rect.y = aClip.y;
+    rect.width = aClip.width;
+    rect.height = aClip.height;
+    cairo_d2d_scroll(CairoSurface(), aDelta.x, aDelta.y, &rect);
+}