Bug 719627 - Merge the functionality of ScaledFontCairo into ScaledFontBase, as is its purpose. r=jrmuizel

--HG--
extra : rebase_source : df21f1a6e702de1e0a7f52a8a75203078c8be423

gfx/2d/2D.h

@@ -50,6 +50,9 @@
 struct _cairo_surface;
 typedef _cairo_surface cairo_surface_t;
 
+struct _cairo_scaled_font;
+typedef _cairo_scaled_font cairo_scaled_font_t;
+
 struct ID3D10Device1;
 struct ID3D10Texture2D;
 
@@ -772,6 +775,14 @@ public:
   static TemporaryRef<ScaledFont>
     CreateScaledFontForNativeFont(const NativeFont &aNativeFont, Float aSize);
 
+  /*
+   * This creates a scaled font with an associated cairo_scaled_font_t, and
+   * must be used when using the Cairo backend. The NativeFont and
+   * cairo_scaled_font_t* parameters must correspond to the same font.
+   */
+  static TemporaryRef<ScaledFont>
+    CreateScaledFontWithCairo(const NativeFont &aNativeFont, Float aSize, cairo_scaled_font_t* aScaledFont);
+
   /*
    * This creates a simple data source surface for a certain size. It allocates
    * new memory for the surface. This memory is freed when the surface is

gfx/2d/DrawTargetCairo.cpp

@@ -39,7 +39,7 @@
 #include "SourceSurfaceCairo.h"
 #include "PathCairo.h"
 #include "HelpersCairo.h"
-#include "ScaledFontCairo.h"
+#include "ScaledFontBase.h"
 
 #include "cairo.h"
 
@@ -591,10 +591,7 @@ DrawTargetCairo::FillGlyphs(ScaledFont *aFont,
 {
   AutoPrepareForDrawing prep(this, mContext);
 
-  if (aFont->GetType() != FONT_CAIRO)
-    return;
-
-  ScaledFontCairo* scaledFont = static_cast<ScaledFontCairo*>(aFont);
+  ScaledFontBase* scaledFont = static_cast<ScaledFontBase*>(aFont);
   cairo_set_scaled_font(mContext, scaledFont->GetCairoScaledFont());
 
   cairo_pattern_t* pat = GfxPatternToCairoPattern(aPattern, aOptions.mAlpha);

gfx/2d/Factory.cpp

@@ -39,7 +39,7 @@
 
 #ifdef USE_CAIRO
 #include "DrawTargetCairo.h"
-#include "ScaledFontCairo.h"
+#include "ScaledFontBase.h"
 #endif
 
 #ifdef USE_SKIA
@@ -159,16 +159,34 @@ Factory::CreateScaledFontForNativeFont(const NativeFont &aNativeFont, Float aSiz
       return new ScaledFontBase(static_cast<gfxFont*>(aNativeFont.mFont), aSize);
     }
 #endif
+#ifdef USE_CAIRO
   case NATIVE_FONT_CAIRO_FONT_FACE:
     {
-      return new ScaledFontCairo(static_cast<gfxFont*>(aNativeFont.mFont));
+      return new ScaledFontBase(aSize);
     }
+#endif
   default:
     gfxWarning() << "Invalid native font type specified.";
     return NULL;
   }
 }
 
+TemporaryRef<ScaledFont>
+Factory::CreateScaledFontWithCairo(const NativeFont& aNativeFont, Float aSize, cairo_scaled_font_t* aScaledFont)
+{
+#ifdef USE_CAIRO
+  // In theory, we could pull the NativeFont out of the cairo_scaled_font_t*,
+  // but that would require a lot of code that would be otherwise repeated in
+  // various backends.
+  // Therefore, we just reuse CreateScaledFontForNativeFont's implementation.
+  RefPtr<ScaledFont> font = CreateScaledFontForNativeFont(aNativeFont, aSize);
+  static_cast<ScaledFontBase*>(font.get())->SetCairoScaledFont(aScaledFont);
+  return font;
+#else
+  return NULL;
+#endif
+}
+
 #ifdef WIN32
 TemporaryRef<DrawTarget>
 Factory::CreateDrawTargetForD3D10Texture(ID3D10Texture2D *aTexture, SurfaceFormat aFormat)

gfx/2d/Makefile.in

@@ -69,7 +69,6 @@ CPPSRCS	= \
 	Factory.cpp \
         Matrix.cpp \
         DrawTargetCairo.cpp \
-        ScaledFontCairo.cpp \
         SourceSurfaceCairo.cpp \
         PathCairo.cpp \
         Blur.cpp \

gfx/2d/ScaledFontBase.cpp

@@ -36,20 +36,30 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "ScaledFontBase.h"
+
+#include "gfxFont.h"
+
 #ifdef USE_SKIA
 #include "PathSkia.h"
 #include "skia/SkPaint.h"
 #include "skia/SkPath.h"
 #endif
+
+#ifdef USE_CAIRO
+#include "PathCairo.h"
+#endif
+
 #include <vector>
 #include <cmath>
+
 using namespace std;
-#include "gfxFont.h"
 
 namespace mozilla {
 namespace gfx {
+
 #ifdef USE_SKIA
-static SkTypeface::Style gfxFontStyleToSkia(const gfxFontStyle* aStyle)
+static SkTypeface::Style
+gfxFontStyleToSkia(const gfxFontStyle* aStyle)
 {
   if (aStyle->style == NS_FONT_STYLE_ITALIC) {
     if (aStyle->weight == NS_FONT_WEIGHT_BOLD) {
@@ -62,7 +72,9 @@ static SkTypeface::Style gfxFontStyleToSkia(const gfxFontStyle* aStyle)
   }
   return SkTypeface::kNormal;
 }
+#endif
 
+#ifdef USE_SKIA
 ScaledFontBase::ScaledFontBase(gfxFont* aFont, Float aSize)
   : mSize(aSize)
 {
@@ -76,6 +88,9 @@ ScaledFontBase::~ScaledFontBase()
 #ifdef USE_SKIA
   SkSafeUnref(mTypeface);
 #endif
+#ifdef USE_CAIRO
+  cairo_scaled_font_destroy(mScaledFont);
+#endif
 }
 
 ScaledFontBase::ScaledFontBase(Float aSize)
@@ -84,9 +99,11 @@ ScaledFontBase::ScaledFontBase(Float aSize)
 #ifdef USE_SKIA
   mTypeface = NULL;
 #endif
+#ifdef USE_CAIRO
+  mScaledFont = NULL;
+#endif
 }
 
-
 TemporaryRef<Path>
 ScaledFontBase::GetPathForGlyphs(const GlyphBuffer &aBuffer, const DrawTarget *aTarget)
 {
@@ -112,9 +129,45 @@ ScaledFontBase::GetPathForGlyphs(const GlyphBuffer &aBuffer, const DrawTarget *a
     paint.getPosTextPath(&indices.front(), aBuffer.mNumGlyphs*2, &offsets.front(), &path);
     return new PathSkia(path, FILL_WINDING);
   }
+#endif
+#ifdef USE_CAIRO
+  if (aTarget->GetType() == BACKEND_CAIRO) {
+    MOZ_ASSERT(mScaledFont);
+
+    RefPtr<PathBuilder> builder_iface = aTarget->CreatePathBuilder();
+    PathBuilderCairo* builder = static_cast<PathBuilderCairo*>(builder_iface.get());
+
+    // Manually build the path for the PathBuilder.
+    RefPtr<CairoPathContext> context = builder->GetPathContext();
+
+    cairo_set_scaled_font(*context, mScaledFont);
+
+    // Convert our GlyphBuffer into an array of Cairo glyphs.
+    std::vector<cairo_glyph_t> glyphs(aBuffer.mNumGlyphs);
+    for (uint32_t i = 0; i < aBuffer.mNumGlyphs; ++i) {
+      glyphs[i].index = aBuffer.mGlyphs[i].mIndex;
+      glyphs[i].x = aBuffer.mGlyphs[i].mPosition.x;
+      glyphs[i].y = aBuffer.mGlyphs[i].mPosition.y;
+    }
+
+    cairo_glyph_path(*context, &glyphs[0], aBuffer.mNumGlyphs);
+
+    return builder->Finish();
+  }
 #endif
   return NULL;
 }
 
+#ifdef USE_CAIRO
+void
+ScaledFontBase::SetCairoScaledFont(cairo_scaled_font_t* font)
+{
+  MOZ_ASSERT(!mScaledFont);
+
+  mScaledFont = font;
+  cairo_scaled_font_reference(mScaledFont);
+}
+#endif
+
 }
 }

gfx/2d/ScaledFontBase.h

@@ -39,9 +39,13 @@
 #define MOZILLA_GFX_SCALEDFONTBASE_H_
 
 #include "2D.h"
+
 #ifdef USE_SKIA
 #include "skia/SkTypeface.h"
 #endif
+#ifdef USE_CAIRO
+#include "cairo.h"
+#endif
 
 class gfxFont;
 
@@ -58,13 +62,23 @@ public:
 #ifdef USE_SKIA
   ScaledFontBase(gfxFont* aFont, Float aSize);
   virtual SkTypeface* GetSkTypeface() { return mTypeface; }
+#endif
+
+  // Not true, but required to instantiate a ScaledFontBase.
   virtual FontType GetType() const { return FONT_SKIA; }
+
+#ifdef USE_CAIRO
+  cairo_scaled_font_t* GetCairoScaledFont() { return mScaledFont; }
+  void SetCairoScaledFont(cairo_scaled_font_t* font);
 #endif
 
 protected:
   friend class DrawTargetSkia;
 #ifdef USE_SKIA
   SkTypeface* mTypeface;
+#endif
+#ifdef USE_CAIRO
+  cairo_scaled_font_t* mScaledFont;
 #endif
   Float mSize;
 };

gfx/2d/ScaledFontCairo.cpp

@@ -1,97 +0,0 @@
-/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * ***** 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 Corporation code.
- *
- * The Initial Developer of the Original Code is Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2011
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 "ScaledFontCairo.h"
-
-#include "cairo.h"
-
-#include "PathCairo.h"
-#include "gfxFont.h"
-
-#include <vector>
-
-using namespace std;
-
-namespace mozilla {
-namespace gfx {
-
-ScaledFontCairo::ScaledFontCairo(gfxFont* aFont)
-{
-  mScaledFont = aFont->GetCairoScaledFont();
-  cairo_scaled_font_reference(mScaledFont);
-}
-
-ScaledFontCairo::~ScaledFontCairo()
-{
-  cairo_scaled_font_destroy(mScaledFont);
-}
-
-TemporaryRef<Path>
-ScaledFontCairo::GetPathForGlyphs(const GlyphBuffer &aBuffer, const DrawTarget *aTarget)
-{
-  if (aTarget->GetType() != BACKEND_CAIRO) {
-    return NULL;
-  }
-
-  RefPtr<PathBuilder> builder_iface = aTarget->CreatePathBuilder();
-  PathBuilderCairo* builder = static_cast<PathBuilderCairo*>(builder_iface.get());
-
-  // Manually build the path for the PathBuilder.
-  RefPtr<CairoPathContext> context = builder->GetPathContext();
-
-  cairo_set_scaled_font(*context, mScaledFont);
-
-  // Convert our GlyphBuffer into an array of Cairo glyphs.
-  std::vector<cairo_glyph_t> glyphs(aBuffer.mNumGlyphs);
-  for (uint32_t i = 0; i < aBuffer.mNumGlyphs; ++i) {
-    glyphs[i].index = aBuffer.mGlyphs[i].mIndex;
-    glyphs[i].x = aBuffer.mGlyphs[i].mPosition.x;
-    glyphs[i].y = aBuffer.mGlyphs[i].mPosition.y;
-  }
-
-  cairo_glyph_path(*context, &glyphs[0], aBuffer.mNumGlyphs);
-
-  return builder->Finish();
-}
-
-cairo_scaled_font_t*
-ScaledFontCairo::GetCairoScaledFont()
-{
-  return mScaledFont;
-}
-
-}
-}

gfx/2d/ScaledFontCairo.h

@@ -1,67 +0,0 @@
-/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * ***** 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 Corporation code.
- *
- * The Initial Developer of the Original Code is Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2011
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 MOZILLA_GFX_SCALEDFONTCAIRO_H_
-#define MOZILLA_GFX_SCALEDFONTCAIRO_H_
-
-#include "2D.h"
-
-class gfxFont;
-typedef struct _cairo_scaled_font cairo_scaled_font_t;
-
-namespace mozilla {
-namespace gfx {
-
-class ScaledFontCairo : public ScaledFont
-{
-public:
-  ScaledFontCairo(gfxFont* aFont);
-  virtual ~ScaledFontCairo();
-
-  virtual FontType GetType() const { return FONT_CAIRO; }
-
-  virtual TemporaryRef<Path> GetPathForGlyphs(const GlyphBuffer &aBuffer, const DrawTarget *aTarget);
-
-  cairo_scaled_font_t* GetCairoScaledFont();
-
-private:
-  cairo_scaled_font_t* mScaledFont;
-};
-
-}
-}
-
-#endif /* MOZILLA_GFX_SCALEDFONTCAIRO_H_ */

gfx/thebes/gfxMacFont.cpp

@@ -504,8 +504,7 @@ gfxMacFont::GetScaledFont()
     NativeFont nativeFont;
     nativeFont.mType = NATIVE_FONT_MAC_FONT_FACE;
     nativeFont.mFont = GetCGFontRef();
-    mAzureFont =
-      mozilla::gfx::Factory::CreateScaledFontForNativeFont(nativeFont, GetAdjustedSize());
+    mAzureFont = mozilla::gfx::Factory::CreateScaledFontWithCairo(nativeFont, GetAdjustedSize(), mScaledFont);
   }
 
   return mAzureFont;