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

Side by Side Diff: src/core/SkBlitter.cpp

Issue 25430005: Fix for potential typedef issue Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « src/core/SkBitmapProcShader.h ('k') | src/core/SkFilterShader.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 1
2 /* 2 /*
3 * Copyright 2006 The Android Open Source Project 3 * Copyright 2006 The Android Open Source Project
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 9
10 #include "SkBlitter.h" 10 #include "SkBlitter.h"
(...skipping 546 matching lines...) Expand 10 before | Expand all | Expand 10 after
557 } 557 }
558 return blitter; 558 return blitter;
559 } 559 }
560 560
561 /////////////////////////////////////////////////////////////////////////////// 561 ///////////////////////////////////////////////////////////////////////////////
562 562
563 #include "SkColorShader.h" 563 #include "SkColorShader.h"
564 #include "SkColorPriv.h" 564 #include "SkColorPriv.h"
565 565
566 class Sk3DShader : public SkShader { 566 class Sk3DShader : public SkShader {
567 typedef SkShader INHERITED;
568
567 public: 569 public:
568 Sk3DShader(SkShader* proxy) : fProxy(proxy) { 570 Sk3DShader(SkShader* proxy) : fProxy(proxy) {
569 SkSafeRef(proxy); 571 SkSafeRef(proxy);
570 fMask = NULL; 572 fMask = NULL;
571 } 573 }
572 574
573 virtual ~Sk3DShader() { 575 virtual ~Sk3DShader() {
574 SkSafeUnref(fProxy); 576 SkSafeUnref(fProxy);
575 } 577 }
576 578
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
691 virtual void flatten(SkFlattenableWriteBuffer& buffer) const SK_OVERRIDE { 693 virtual void flatten(SkFlattenableWriteBuffer& buffer) const SK_OVERRIDE {
692 this->INHERITED::flatten(buffer); 694 this->INHERITED::flatten(buffer);
693 buffer.writeFlattenable(fProxy); 695 buffer.writeFlattenable(fProxy);
694 buffer.writeColor(fPMColor); 696 buffer.writeColor(fPMColor);
695 } 697 }
696 698
697 private: 699 private:
698 SkShader* fProxy; 700 SkShader* fProxy;
699 SkPMColor fPMColor; 701 SkPMColor fPMColor;
700 const SkMask* fMask; 702 const SkMask* fMask;
701
702 typedef SkShader INHERITED;
703 }; 703 };
704 704
705 class Sk3DBlitter : public SkBlitter { 705 class Sk3DBlitter : public SkBlitter {
706 public: 706 public:
707 Sk3DBlitter(SkBlitter* proxy, Sk3DShader* shader, void (*killProc)(void*)) 707 Sk3DBlitter(SkBlitter* proxy, Sk3DShader* shader, void (*killProc)(void*))
708 : fProxy(proxy), f3DShader(shader), fKillProc(killProc) { 708 : fProxy(proxy), f3DShader(shader), fKillProc(killProc) {
709 shader->ref(); 709 shader->ref();
710 } 710 }
711 711
712 virtual ~Sk3DBlitter() { 712 virtual ~Sk3DBlitter() {
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after
1007 1007
1008 fShader->ref(); 1008 fShader->ref();
1009 fShaderFlags = fShader->getFlags(); 1009 fShaderFlags = fShader->getFlags();
1010 } 1010 }
1011 1011
1012 SkShaderBlitter::~SkShaderBlitter() { 1012 SkShaderBlitter::~SkShaderBlitter() {
1013 SkASSERT(fShader->setContextHasBeenCalled()); 1013 SkASSERT(fShader->setContextHasBeenCalled());
1014 fShader->endContext(); 1014 fShader->endContext();
1015 fShader->unref(); 1015 fShader->unref();
1016 } 1016 }
OLDNEW
« no previous file with comments | « src/core/SkBitmapProcShader.h ('k') | src/core/SkFilterShader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698