Bug 738189 - Followup: Properly move functions into #ifdef. r=bustage
authorBas Schouten <bschouten@mozilla.com>
Thu, 21 Jun 2012 00:32:52 +0200
changeset 97189 c4083302aa3f57ba3fdad929cb3f9d57d8c42364
parent 97188 654dc5653f1ae2b6d2ebe9af09435a2bfdfb1f3b
child 97190 5ba4c3a2338c3f40197d0f305ff9cc5ab4e0bc75
push id10924
push userbschouten@mozilla.com
push dateWed, 20 Jun 2012 22:33:14 +0000
treeherdermozilla-inbound@c4083302aa3f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage
bugs738189
milestone16.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 738189 - Followup: Properly move functions into #ifdef. r=bustage
gfx/2d/Factory.cpp
--- a/gfx/2d/Factory.cpp
+++ b/gfx/2d/Factory.cpp
@@ -347,16 +347,28 @@ TemporaryRef<GlyphRenderingOptions>
 Factory::CreateDWriteGlyphRenderingOptions(IDWriteRenderingParams *aParams)
 {
   RefPtr<GlyphRenderingOptions> options =
     new GlyphRenderingOptionsDWrite(aParams);
 
   return options;
 }
 
+uint64_t
+Factory::GetD2DVRAMUsageDrawTarget()
+{
+  return DrawTargetD2D::mVRAMUsageDT;
+}
+
+uint64_t
+Factory::GetD2DVRAMUsageSourceSurface()
+{
+  return DrawTargetD2D::mVRAMUsageSS;
+}
+
 #endif // XP_WIN
 
 TemporaryRef<DrawTarget>
 Factory::CreateDrawTargetForCairoSurface(cairo_surface_t* aSurface)
 {
 #ifdef USE_CAIRO
   RefPtr<DrawTargetCairo> newTarget = new DrawTargetCairo();
   if (newTarget->Init(aSurface)) {
@@ -376,22 +388,10 @@ Factory::CreateWrappingDataSourceSurface
 
   if (newSurf->InitWrappingData(aData, aSize, aStride, aFormat, false)) {
     return newSurf;
   }
 
   return NULL;
 }
 
-uint64_t
-Factory::GetD2DVRAMUsageDrawTarget()
-{
-  return DrawTargetD2D::mVRAMUsageDT;
-}
-
-uint64_t
-Factory::GetD2DVRAMUsageSourceSurface()
-{
-  return DrawTargetD2D::mVRAMUsageSS;
-}
-
 }
 }