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

Side by Side Diff: src/gpu/SkGpuDevice.cpp

Issue 47513017: More Windows 64b compilation warning fixes (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Remove common_variables.gypi from CL (ooops) Created 7 years, 1 month 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright 2011 Google Inc. 2 * Copyright 2011 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 #include "SkGpuDevice.h" 8 #include "SkGpuDevice.h"
9 9
10 #include "effects/GrTextureDomainEffect.h" 10 #include "effects/GrTextureDomainEffect.h"
(...skipping 576 matching lines...) Expand 10 before | Expand all | Expand 10 after
587 return; 587 return;
588 } 588 }
589 589
590 GrPaint grPaint; 590 GrPaint grPaint;
591 if (!skPaint2GrPaintShader(this, paint, true, &grPaint)) { 591 if (!skPaint2GrPaintShader(this, paint, true, &grPaint)) {
592 return; 592 return;
593 } 593 }
594 594
595 fContext->drawVertices(grPaint, 595 fContext->drawVertices(grPaint,
596 gPointMode2PrimtiveType[mode], 596 gPointMode2PrimtiveType[mode],
597 count, 597 static_cast<int>(count),
bsalomon 2013/10/29 14:40:36 SkCanvas:: and SkDevice::drawPoints should probabl
robertphillips 2013/11/18 20:22:41 Done. I would also like to change SkCanvas:: & Sk
598 (GrPoint*)pts, 598 (GrPoint*)pts,
599 NULL, 599 NULL,
600 NULL, 600 NULL,
601 NULL, 601 NULL,
602 0); 602 0);
603 } 603 }
604 604
605 /////////////////////////////////////////////////////////////////////////////// 605 ///////////////////////////////////////////////////////////////////////////////
606 606
607 void SkGpuDevice::drawRect(const SkDraw& draw, const SkRect& rect, 607 void SkGpuDevice::drawRect(const SkDraw& draw, const SkRect& rect,
(...skipping 1243 matching lines...) Expand 10 before | Expand all | Expand 10 after
1851 GrTexture* texture, 1851 GrTexture* texture,
1852 bool needClear) 1852 bool needClear)
1853 : SkBitmapDevice(make_bitmap(context, texture->asRenderTarget())) { 1853 : SkBitmapDevice(make_bitmap(context, texture->asRenderTarget())) {
1854 1854
1855 SkASSERT(texture && texture->asRenderTarget()); 1855 SkASSERT(texture && texture->asRenderTarget());
1856 // This constructor is called from onCreateCompatibleDevice. It has locked t he RT in the texture 1856 // This constructor is called from onCreateCompatibleDevice. It has locked t he RT in the texture
1857 // cache. We pass true for the third argument so that it will get unlocked. 1857 // cache. We pass true for the third argument so that it will get unlocked.
1858 this->initFromRenderTarget(context, texture->asRenderTarget(), true); 1858 this->initFromRenderTarget(context, texture->asRenderTarget(), true);
1859 fNeedClear = needClear; 1859 fNeedClear = needClear;
1860 } 1860 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698