| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright 2014 Google Inc. | 2  * Copyright 2014 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 "SkLocalMatrixShader.h" | 8 #include "SkLocalMatrixShader.h" | 
| 9 | 9 | 
| 10 #ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING | 10 #ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING | 
| 11 SkLocalMatrixShader::SkLocalMatrixShader(SkReadBuffer& buffer) : INHERITED(buffe
    r) { | 11 SkLocalMatrixShader::SkLocalMatrixShader(SkReadBuffer& buffer) : INHERITED(buffe
    r) { | 
| 12     if (buffer.isVersionLT(SkReadBuffer::kSimplifyLocalMatrix_Version)) { |  | 
| 13         buffer.readMatrix(&(INHERITED::fLocalMatrix)); |  | 
| 14     } |  | 
| 15     fProxyShader.reset(buffer.readShader()); | 12     fProxyShader.reset(buffer.readShader()); | 
| 16     if (NULL == fProxyShader.get()) { | 13     if (NULL == fProxyShader.get()) { | 
| 17         sk_throw(); | 14         sk_throw(); | 
| 18     } | 15     } | 
| 19 } | 16 } | 
| 20 #endif | 17 #endif | 
| 21 | 18 | 
| 22 SkFlattenable* SkLocalMatrixShader::CreateProc(SkReadBuffer& buffer) { | 19 SkFlattenable* SkLocalMatrixShader::CreateProc(SkReadBuffer& buffer) { | 
| 23     SkMatrix lm; | 20     SkMatrix lm; | 
| 24     buffer.readMatrix(&lm); | 21     buffer.readMatrix(&lm); | 
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 73     SkMatrix otherLocalMatrix; | 70     SkMatrix otherLocalMatrix; | 
| 74     SkAutoTUnref<SkShader> otherProxy(proxy->refAsALocalMatrixShader(&otherLocal
    Matrix)); | 71     SkAutoTUnref<SkShader> otherProxy(proxy->refAsALocalMatrixShader(&otherLocal
    Matrix)); | 
| 75     if (otherProxy.get()) { | 72     if (otherProxy.get()) { | 
| 76         otherLocalMatrix.preConcat(localMatrix); | 73         otherLocalMatrix.preConcat(localMatrix); | 
| 77         lm = &otherLocalMatrix; | 74         lm = &otherLocalMatrix; | 
| 78         proxy = otherProxy.get(); | 75         proxy = otherProxy.get(); | 
| 79     } | 76     } | 
| 80 | 77 | 
| 81     return SkNEW_ARGS(SkLocalMatrixShader, (proxy, *lm)); | 78     return SkNEW_ARGS(SkLocalMatrixShader, (proxy, *lm)); | 
| 82 } | 79 } | 
| OLD | NEW | 
|---|