commit 13d14a9dbd2cf0a9654045cc967e92626690631a
author vandebo@chromium.org <vandebo@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue May 24 23:12:41 2011 +0000
committer vandebo@chromium.org <vandebo@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue May 24 23:12:41 2011 +0000
tree 131a07d3d525815d4f2aa39fdee5e74f0d818e3e
parent 61d267879bdf85c84b05f0519eb53b9322abbf0e

[PDF] Rename ContentEntryAccessor to ScopedContentEntry.

Review URL: http://codereview.appspot.com/4515134

git-svn-id: http://skia.googlecode.com/svn/trunk@1416 2bbb7eff-a529-9590-31e7-b0007b416f81

src/pdf/SkPDFDevice.cpp

diff --git a/src/pdf/SkPDFDevice.cpp b/src/pdf/SkPDFDevice.cpp
index 17ea5dd..1fe1734 100644
--- a/src/pdf/SkPDFDevice.cpp
+++ b/src/pdf/SkPDFDevice.cpp
@@ -413,25 +413,25 @@
 
 // A helper class to automatically finish a ContentEntry at the end of a
 // drawing method and maintain the state needed between set up and finish.
-class ContentEntryAccessor {
+class ScopedContentEntry {
 public:
-    ContentEntryAccessor(SkPDFDevice* device, const SkDraw& draw,
-                         const SkPaint& paint, bool hasText = false)
+    ScopedContentEntry(SkPDFDevice* device, const SkDraw& draw,
+                       const SkPaint& paint, bool hasText = false)
         : fDevice(device),
           fContentEntry(NULL),
           fXfermode(SkXfermode::kSrcOver_Mode) {
         init(draw.fClipStack, *draw.fClip, *draw.fMatrix, paint, hasText);
     }
-    ContentEntryAccessor(SkPDFDevice* device, const SkClipStack* clipStack,
-                         const SkRegion& clipRegion, const SkMatrix& matrix,
-                         const SkPaint& paint, bool hasText = false)
+    ScopedContentEntry(SkPDFDevice* device, const SkClipStack* clipStack,
+                       const SkRegion& clipRegion, const SkMatrix& matrix,
+                       const SkPaint& paint, bool hasText = false)
         : fDevice(device),
           fContentEntry(NULL),
           fXfermode(SkXfermode::kSrcOver_Mode) {
         init(clipStack, clipRegion, matrix, paint, hasText);
     }
 
-    ~ContentEntryAccessor() {
+    ~ScopedContentEntry() {
         if (fContentEntry) {
             fDevice->finishContentEntry(fXfermode, fDstFormXObject.get());
         }
@@ -555,15 +555,15 @@
     paint.setStyle(SkPaint::kFill_Style);
     SkMatrix identity;
     identity.reset();
-    ContentEntryAccessor content(this, &fExistingClipStack, fExistingClipRegion,
-                                 identity, paint);
+    ScopedContentEntry content(this, &fExistingClipStack, fExistingClipRegion,
+                               identity, paint);
     internalDrawPaint(paint, content.entry());
 }
 
 void SkPDFDevice::drawPaint(const SkDraw& d, const SkPaint& paint) {
     SkPaint newPaint = paint;
     newPaint.setStyle(SkPaint::kFill_Style);
-    ContentEntryAccessor content(this, d, newPaint);
+    ScopedContentEntry content(this, d, newPaint);
     internalDrawPaint(newPaint, content.entry());
 }
 
@@ -630,7 +630,7 @@
         }
     }
 
-    ContentEntryAccessor content(this, d, *paint);
+    ScopedContentEntry content(this, d, *paint);
     if (!content.entry()) {
         return;
     }
@@ -681,7 +681,7 @@
         return;
     }
 
-    ContentEntryAccessor content(this, d, paint);
+    ScopedContentEntry content(this, d, paint);
     if (!content.entry()) {
         return;
     }
@@ -733,7 +733,7 @@
         return;
     }
 
-    ContentEntryAccessor content(this, d, paint);
+    ScopedContentEntry content(this, d, paint);
     if (!content.entry()) {
         return;
     }
@@ -769,7 +769,7 @@
 void SkPDFDevice::drawText(const SkDraw& d, const void* text, size_t len,
                            SkScalar x, SkScalar y, const SkPaint& paint) {
     SkPaint textPaint = calculate_text_paint(paint);
-    ContentEntryAccessor content(this, d, textPaint, true);
+    ScopedContentEntry content(this, d, textPaint, true);
     if (!content.entry()) {
         return;
     }
@@ -843,7 +843,7 @@
                               int scalarsPerPos, const SkPaint& paint) {
     SkASSERT(1 == scalarsPerPos || 2 == scalarsPerPos);
     SkPaint textPaint = calculate_text_paint(paint);
-    ContentEntryAccessor content(this, d, textPaint, true);
+    ScopedContentEntry content(this, d, textPaint, true);
     if (!content.entry()) {
         return;
     }
@@ -926,7 +926,7 @@
 
     SkMatrix matrix;
     matrix.setTranslate(SkIntToScalar(x), SkIntToScalar(y));
-    ContentEntryAccessor content(this, d.fClipStack, *d.fClip, matrix, paint);
+    ScopedContentEntry content(this, d.fClipStack, *d.fClip, matrix, paint);
     if (!content.entry()) {
         return;
     }
@@ -1125,7 +1125,7 @@
     sMaskGS->unref();  // SkRefPtr and getSMaskGraphicState both took a ref.
 
     // Draw the xobject with the clip as a mask.
-    ContentEntryAccessor content(this, &fExistingClipStack, fExistingClipRegion,
+    ScopedContentEntry content(this, &fExistingClipStack, fExistingClipRegion,
                                  identity, stockPaint);
     if (!content.entry()) {
         return;
@@ -1262,9 +1262,9 @@
     SkMatrix identity;
     identity.reset();
     SkPaint stockPaint;
-    ContentEntryAccessor inClipContentEntry(this, &fExistingClipStack,
-                                            fExistingClipRegion, identity,
-                                            stockPaint);
+    ScopedContentEntry inClipContentEntry(this, &fExistingClipStack,
+                                          fExistingClipRegion, identity,
+                                          stockPaint);
     if (!inClipContentEntry.entry()) {
         return;
     }
@@ -1446,7 +1446,7 @@
     scaled.postScale(SkIntToScalar(subset.width()),
                      SkIntToScalar(subset.height()));
     scaled.postConcat(matrix);
-    ContentEntryAccessor content(this, clipStack, clipRegion, scaled, paint);
+    ScopedContentEntry content(this, clipStack, clipRegion, scaled, paint);
     if (!content.entry()) {
         return;
     }