remove SkDeviceProperties

src/gpu/GrContext.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrContext.h"
 
@@ skipping 25 matching lines @@
 #include "GrTextBlobCache.h"
 #include "GrTexturePriv.h"
 #include "GrTraceMarker.h"
 #include "GrTracing.h"
 #include "GrVertices.h"
 #include "SkDashPathPriv.h"
 #include "SkConfig8888.h"
 #include "SkGr.h"
 #include "SkRRect.h"
 #include "SkStrokeRec.h"
+#include "SkSurfacePriv.h"
 #include "SkTLazy.h"
 #include "SkTLS.h"
 #include "SkTraceEvent.h"
 
 #include "effects/GrConfigConversionEffect.h"
 #include "effects/GrDashingEffect.h"
 #include "effects/GrSingleTextureEffect.h"
 
 #define ASSERT_OWNED_RESOURCE(R) SkASSERT(!(R) || (R)->getContext() == this)
 #define RETURN_IF_ABANDONED if (fDrawingMgr.abandoned()) { return; }
@@ skipping 48 matching lines @@
         fDrawTarget->reset();
     }
 }
 
 void GrContext::DrawingMgr::flush() {
     if (fDrawTarget) {
         fDrawTarget->flush();
     }
 }
 
-GrDrawContext* GrContext::DrawingMgr::drawContext(const SkDeviceProperties* devProps) { 
+GrDrawContext* GrContext::DrawingMgr::drawContext(const SkSurfaceProps* surfaceProps) { 
     if (this->abandoned()) {
         return NULL;
     }
 
-    const SkDeviceProperties defProps;
-    if (!devProps) {
-        devProps = &defProps;
+    const SkSurfaceProps props(SkSurfacePropsCopyOrDefault(surfaceProps));
+
+    SkASSERT(props.pixelGeometry() < kNumPixelGeometries);
+    if (!fDrawContext[props.pixelGeometry()][props.isUseDistanceFieldFonts()]) {
+        fDrawContext[props.pixelGeometry()][props.isUseDistanceFieldFonts()] =
+                SkNEW_ARGS(GrDrawContext, (fContext, fDrawTarget, props));
     }
 
-    SkASSERT(devProps->pixelGeometry() < kNumPixelGeometries);
-    if (!fDrawContext[devProps->pixelGeometry()][devProps->useDFT()]) {
-        fDrawContext[devProps->pixelGeometry()][devProps->useDFT()] =
-                SkNEW_ARGS(GrDrawContext, (fContext, fDrawTarget, *devProps));
-    }
-
-    return fDrawContext[devProps->pixelGeometry()][devProps->useDFT()]; 
+    return fDrawContext[props.pixelGeometry()][props.isUseDistanceFieldFonts()]; 
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 
 GrContext* GrContext::Create(GrBackend backend, GrBackendContext backendContext) {
     GrContextOptions defaultOptions;
     return Create(backend, backendContext, defaultOptions);
 }
 
@@ skipping 616 matching lines @@
 //////////////////////////////////////////////////////////////////////////////
 
 void GrContext::addGpuTraceMarker(const GrGpuTraceMarker* marker) {
     fGpu->addGpuTraceMarker(marker);
 }
 
 void GrContext::removeGpuTraceMarker(const GrGpuTraceMarker* marker) {
     fGpu->removeGpuTraceMarker(marker);
 }