OLD | NEW |
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 #include "SkBlurMaskFilter.h" | 9 #include "SkBlurMaskFilter.h" |
10 #include "SkBlurMask.h" | 10 #include "SkBlurMask.h" |
(...skipping 465 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
476 void SkBlurMaskFilterImpl::computeFastBounds(const SkRect& src, | 476 void SkBlurMaskFilterImpl::computeFastBounds(const SkRect& src, |
477 SkRect* dst) const { | 477 SkRect* dst) const { |
478 SkScalar pad = 3.0f * fSigma; | 478 SkScalar pad = 3.0f * fSigma; |
479 | 479 |
480 dst->set(src.fLeft - pad, src.fTop - pad, | 480 dst->set(src.fLeft - pad, src.fTop - pad, |
481 src.fRight + pad, src.fBottom + pad); | 481 src.fRight + pad, src.fBottom + pad); |
482 } | 482 } |
483 | 483 |
484 SkBlurMaskFilterImpl::SkBlurMaskFilterImpl(SkFlattenableReadBuffer& buffer) | 484 SkBlurMaskFilterImpl::SkBlurMaskFilterImpl(SkFlattenableReadBuffer& buffer) |
485 : SkMaskFilter(buffer) { | 485 : SkMaskFilter(buffer) { |
486 fSigma = buffer.readScalar(); | 486 #ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V16_AND_ALL_OTHER_INSTANCES_TO
O |
487 #ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V13_AND_ALL_OTHER_INSTANCES_TO
O | 487 // TODO: when the skps are recaptured at > v15 the SkScalarAbs can be remove
d |
488 // Fixing this must be done in two stages. When the skps are recaptured in V
13, | |
489 // remove the ConvertRadiusToSigma but retain the absolute value. | |
490 // At the same time, switch the code in flatten to write a positive value. | |
491 // When the skps are captured in V14 the absolute value can be removed. | |
492 if (fSigma > 0) { | |
493 fSigma = SkBlurMask::ConvertRadiusToSigma(fSigma); | |
494 } else { | |
495 fSigma = -fSigma; | |
496 } | |
497 #endif | 488 #endif |
| 489 fSigma = SkScalarAbs(buffer.readScalar()); |
498 fBlurStyle = (SkBlurMaskFilter::BlurStyle)buffer.readInt(); | 490 fBlurStyle = (SkBlurMaskFilter::BlurStyle)buffer.readInt(); |
499 fBlurFlags = buffer.readUInt() & SkBlurMaskFilter::kAll_BlurFlag; | 491 fBlurFlags = buffer.readUInt() & SkBlurMaskFilter::kAll_BlurFlag; |
500 SkASSERT(fSigma >= 0); | 492 SkASSERT(fSigma >= 0); |
501 SkASSERT((unsigned)fBlurStyle < SkBlurMaskFilter::kBlurStyleCount); | 493 SkASSERT((unsigned)fBlurStyle < SkBlurMaskFilter::kBlurStyleCount); |
502 } | 494 } |
503 | 495 |
504 void SkBlurMaskFilterImpl::flatten(SkFlattenableWriteBuffer& buffer) const { | 496 void SkBlurMaskFilterImpl::flatten(SkFlattenableWriteBuffer& buffer) const { |
505 this->INHERITED::flatten(buffer); | 497 this->INHERITED::flatten(buffer); |
506 buffer.writeScalar(-fSigma); | 498 buffer.writeScalar(fSigma); |
507 buffer.writeInt(fBlurStyle); | 499 buffer.writeInt(fBlurStyle); |
508 buffer.writeUInt(fBlurFlags); | 500 buffer.writeUInt(fBlurFlags); |
509 } | 501 } |
510 | 502 |
511 #if SK_SUPPORT_GPU | 503 #if SK_SUPPORT_GPU |
512 | 504 |
513 bool SkBlurMaskFilterImpl::canFilterMaskGPU(const SkRect& srcBounds, | 505 bool SkBlurMaskFilterImpl::canFilterMaskGPU(const SkRect& srcBounds, |
514 const SkIRect& clipBounds, | 506 const SkIRect& clipBounds, |
515 const SkMatrix& ctm, | 507 const SkMatrix& ctm, |
516 SkRect* maskRect) const { | 508 SkRect* maskRect) const { |
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
623 } else { | 615 } else { |
624 str->append("None"); | 616 str->append("None"); |
625 } | 617 } |
626 str->append("))"); | 618 str->append("))"); |
627 } | 619 } |
628 #endif | 620 #endif |
629 | 621 |
630 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkBlurMaskFilter) | 622 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkBlurMaskFilter) |
631 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBlurMaskFilterImpl) | 623 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBlurMaskFilterImpl) |
632 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END | 624 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END |
OLD | NEW |