Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(492)

Side by Side Diff: include/gpu/GrDrawContext.h

Issue 2240623002: Move GrAtlasTextContext to GrDrawingManager, so we only have one. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Fix alignment Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | src/gpu/GrDrawContext.cpp » ('j') | src/gpu/GrDrawingManager.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2015 Google Inc. 2 * Copyright 2015 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #ifndef GrDrawContext_DEFINED 8 #ifndef GrDrawContext_DEFINED
9 #define GrDrawContext_DEFINED 9 #define GrDrawContext_DEFINED
10 10
11 #include "GrColor.h" 11 #include "GrColor.h"
12 #include "GrPaint.h" 12 #include "GrPaint.h"
13 #include "GrRenderTarget.h" 13 #include "GrRenderTarget.h"
14 #include "SkRefCnt.h" 14 #include "SkRefCnt.h"
15 #include "SkRegion.h" 15 #include "SkRegion.h"
16 #include "SkSurfaceProps.h" 16 #include "SkSurfaceProps.h"
17 #include "../private/GrInstancedPipelineInfo.h" 17 #include "../private/GrInstancedPipelineInfo.h"
18 #include "../private/GrSingleOwner.h" 18 #include "../private/GrSingleOwner.h"
19 19
20 class GrAtlasTextContext;
21 class GrAuditTrail; 20 class GrAuditTrail;
22 class GrClip; 21 class GrClip;
23 class GrContext; 22 class GrContext;
24 class GrDrawBatch; 23 class GrDrawBatch;
25 class GrDrawContextPriv; 24 class GrDrawContextPriv;
26 class GrDrawPathBatchBase; 25 class GrDrawPathBatchBase;
27 class GrDrawingManager; 26 class GrDrawingManager;
28 class GrDrawTarget; 27 class GrDrawTarget;
29 class GrPaint; 28 class GrPaint;
30 class GrPathProcessor; 29 class GrPathProcessor;
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after
360 void drawBatch(const GrPipelineBuilder& pipelineBuilder, const GrClip&, GrDr awBatch* batch); 359 void drawBatch(const GrPipelineBuilder& pipelineBuilder, const GrClip&, GrDr awBatch* batch);
361 360
362 GrDrawTarget* getDrawTarget(); 361 GrDrawTarget* getDrawTarget();
363 362
364 GrDrawingManager* fDrawingManager; 363 GrDrawingManager* fDrawingManager;
365 sk_sp<GrRenderTarget> fRenderTarget; 364 sk_sp<GrRenderTarget> fRenderTarget;
366 365
367 // In MDB-mode the drawTarget can be closed by some other drawContext that h as picked 366 // In MDB-mode the drawTarget can be closed by some other drawContext that h as picked
368 // it up. For this reason, the drawTarget should only ever be accessed via ' getDrawTarget'. 367 // it up. For this reason, the drawTarget should only ever be accessed via ' getDrawTarget'.
369 GrDrawTarget* fDrawTarget; 368 GrDrawTarget* fDrawTarget;
370 SkAutoTDelete<GrAtlasTextContext> fAtlasTextContext;
371 GrContext* fContext; 369 GrContext* fContext;
372 GrInstancedPipelineInfo fInstancedPipelineInfo; 370 GrInstancedPipelineInfo fInstancedPipelineInfo;
373 371
374 sk_sp<SkColorSpace> fColorSpace; 372 sk_sp<SkColorSpace> fColorSpace;
375 SkSurfaceProps fSurfaceProps; 373 SkSurfaceProps fSurfaceProps;
376 GrAuditTrail* fAuditTrail; 374 GrAuditTrail* fAuditTrail;
377 375
378 // In debug builds we guard against improper thread handling 376 // In debug builds we guard against improper thread handling
379 SkDEBUGCODE(mutable GrSingleOwner* fSingleOwner;) 377 SkDEBUGCODE(mutable GrSingleOwner* fSingleOwner;)
380 }; 378 };
381 379
382 #endif 380 #endif
OLDNEW
« no previous file with comments | « no previous file | src/gpu/GrDrawContext.cpp » ('j') | src/gpu/GrDrawingManager.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698