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

Side by Side Diff: src/gpu/text/GrAtlasTextBlob.cpp

Issue 1986253002: Rename SkDescriptor::equals to SkDescriptor::operator== (Closed) Base URL: https://chromium.googlesource.com/skia.git@master
Patch Set: Created 4 years, 7 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
« no previous file with comments | « src/gpu/GrPathRendering.cpp ('k') | src/gpu/text/GrAtlasTextBlob_regenInBatch.cpp » ('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 * Copyright 2015 Google Inc. 2 * Copyright 2015 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 "GrAtlasTextBlob.h" 8 #include "GrAtlasTextBlob.h"
9 9
10 #include "GrBlurUtils.h" 10 #include "GrBlurUtils.h"
(...skipping 493 matching lines...) Expand 10 before | Expand all | Expand 10 after
504 if (lRun.fTypeface.get()) { 504 if (lRun.fTypeface.get()) {
505 SkASSERT_RELEASE(rRun.fTypeface.get()); 505 SkASSERT_RELEASE(rRun.fTypeface.get());
506 SkASSERT_RELEASE(SkTypeface::Equal(lRun.fTypeface, rRun.fTypeface)); 506 SkASSERT_RELEASE(SkTypeface::Equal(lRun.fTypeface, rRun.fTypeface));
507 } else { 507 } else {
508 SkASSERT_RELEASE(!rRun.fTypeface.get()); 508 SkASSERT_RELEASE(!rRun.fTypeface.get());
509 } 509 }
510 510
511 511
512 SkASSERT_RELEASE(lRun.fDescriptor.getDesc()); 512 SkASSERT_RELEASE(lRun.fDescriptor.getDesc());
513 SkASSERT_RELEASE(rRun.fDescriptor.getDesc()); 513 SkASSERT_RELEASE(rRun.fDescriptor.getDesc());
514 SkASSERT_RELEASE(lRun.fDescriptor.getDesc()->equals(*rRun.fDescriptor.ge tDesc())); 514 SkASSERT_RELEASE(*lRun.fDescriptor.getDesc() == *rRun.fDescriptor.getDes c());
515 515
516 if (lRun.fOverrideDescriptor.get()) { 516 if (lRun.fOverrideDescriptor.get()) {
517 SkASSERT_RELEASE(lRun.fOverrideDescriptor->getDesc()); 517 SkASSERT_RELEASE(lRun.fOverrideDescriptor->getDesc());
518 SkASSERT_RELEASE(rRun.fOverrideDescriptor.get() && rRun.fOverrideDes criptor->getDesc()); 518 SkASSERT_RELEASE(rRun.fOverrideDescriptor.get() && rRun.fOverrideDes criptor->getDesc());
519 SkASSERT_RELEASE(lRun.fOverrideDescriptor->getDesc()->equals( 519 SkASSERT_RELEASE(*lRun.fOverrideDescriptor->getDesc() ==
520 *rRun.fOverrideDescriptor->getDesc())); 520 *rRun.fOverrideDescriptor->getDesc());
521 } else { 521 } else {
522 SkASSERT_RELEASE(!rRun.fOverrideDescriptor.get()); 522 SkASSERT_RELEASE(!rRun.fOverrideDescriptor.get());
523 } 523 }
524 524
525 // color can be changed 525 // color can be changed
526 //SkASSERT(lRun.fColor == rRun.fColor); 526 //SkASSERT(lRun.fColor == rRun.fColor);
527 SkASSERT_RELEASE(lRun.fInitialized == rRun.fInitialized); 527 SkASSERT_RELEASE(lRun.fInitialized == rRun.fInitialized);
528 SkASSERT_RELEASE(lRun.fDrawAsPaths == rRun.fDrawAsPaths); 528 SkASSERT_RELEASE(lRun.fDrawAsPaths == rRun.fDrawAsPaths);
529 529
530 SkASSERT_RELEASE(lRun.fSubRunInfo.count() == rRun.fSubRunInfo.count()); 530 SkASSERT_RELEASE(lRun.fSubRunInfo.count() == rRun.fSubRunInfo.count());
(...skipping 26 matching lines...) Expand all
557 557
558 void GrAtlasTextBlob::Run::SubRunInfo::computeTranslation(const SkMatrix& viewMa trix, 558 void GrAtlasTextBlob::Run::SubRunInfo::computeTranslation(const SkMatrix& viewMa trix,
559 SkScalar x, SkScalar y , SkScalar* transX, 559 SkScalar x, SkScalar y , SkScalar* transX,
560 SkScalar* transY) { 560 SkScalar* transY) {
561 calculate_translation(!this->drawAsDistanceFields(), viewMatrix, x, y, 561 calculate_translation(!this->drawAsDistanceFields(), viewMatrix, x, y,
562 fCurrentViewMatrix, fX, fY, transX, transY); 562 fCurrentViewMatrix, fX, fY, transX, transY);
563 fCurrentViewMatrix = viewMatrix; 563 fCurrentViewMatrix = viewMatrix;
564 fX = x; 564 fX = x;
565 fY = y; 565 fY = y;
566 } 566 }
OLDNEW
« no previous file with comments | « src/gpu/GrPathRendering.cpp ('k') | src/gpu/text/GrAtlasTextBlob_regenInBatch.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698