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

Side by Side Diff: src/effects/SkColorFilters.cpp

Issue 106943002: Fixed a few places where uninitialized memory could have been read (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Removed bad scalar checks in SkColorMatrixFilter.cpp Created 7 years 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 /* 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 "SkBlitRow.h" 10 #include "SkBlitRow.h"
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 protected: 94 protected:
95 virtual void flatten(SkFlattenableWriteBuffer& buffer) const SK_OVERRIDE { 95 virtual void flatten(SkFlattenableWriteBuffer& buffer) const SK_OVERRIDE {
96 this->INHERITED::flatten(buffer); 96 this->INHERITED::flatten(buffer);
97 buffer.writeColor(fColor); 97 buffer.writeColor(fColor);
98 buffer.writeUInt(fMode); 98 buffer.writeUInt(fMode);
99 } 99 }
100 100
101 SkModeColorFilter(SkFlattenableReadBuffer& buffer) { 101 SkModeColorFilter(SkFlattenableReadBuffer& buffer) {
102 fColor = buffer.readColor(); 102 fColor = buffer.readColor();
103 fMode = (SkXfermode::Mode)buffer.readUInt(); 103 fMode = (SkXfermode::Mode)buffer.readUInt();
104 this->updateCache(); 104 if (buffer.isValid()) {
105 buffer.validate(SkIsValidMode(fMode)); 105 this->updateCache();
106 buffer.validate(SkIsValidMode(fMode));
107 }
106 } 108 }
107 109
108 private: 110 private:
109 SkColor fColor; 111 SkColor fColor;
110 SkXfermode::Mode fMode; 112 SkXfermode::Mode fMode;
111 // cache 113 // cache
112 SkPMColor fPMColor; 114 SkPMColor fPMColor;
113 SkXfermodeProc fProc; 115 SkXfermodeProc fProc;
114 SkXfermodeProc16 fProc16; 116 SkXfermodeProc16 fProc16;
115 117
(...skipping 723 matching lines...) Expand 10 before | Expand all | Expand 10 after
839 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkModeColorFilter) 841 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkModeColorFilter)
840 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(Src_SkModeColorFilter) 842 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(Src_SkModeColorFilter)
841 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SrcOver_SkModeColorFilter) 843 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SrcOver_SkModeColorFilter)
842 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLightingColorFilter) 844 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLightingColorFilter)
843 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLightingColorFilter_JustAdd) 845 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLightingColorFilter_JustAdd)
844 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLightingColorFilter_JustMul) 846 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLightingColorFilter_JustMul)
845 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLightingColorFilter_SingleMul) 847 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLightingColorFilter_SingleMul)
846 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLightingColorFilter_NoPin) 848 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLightingColorFilter_NoPin)
847 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkSimpleColorFilter) 849 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkSimpleColorFilter)
848 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END 850 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698