rolling back the experimental rollbacks in r2178-2179

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

6 files changed, 6 insertions, 8 deletions

diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index 65f34ccce8..3bb193bd13 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -528,7 +528,6 @@ SkDevice* SkCanvas::setDevice(SkDevice* device) {
         while ((rec = (MCRec*)iter.next()) != NULL) {
             (void)rec->fRegion->op(bounds, SkRegion::kIntersect_Op);
         }
-        fClipStack.clipDevRect(bounds, SkRegion::kIntersect_Op);
     }
     return device;
 }
@@ -1384,11 +1383,11 @@ private:
 
 void SkCanvas::DrawRect(const SkDraw& draw, const SkPaint& paint,
                         const SkRect& r, SkScalar textSize) {
-    if (paint.getStyle() == SkPaint::kFill_Style) {

+    if (paint.getStyle() == SkPaint::kFill_Style) {
         draw.fDevice->drawRect(draw, r, paint);
     } else {
         SkPaint p(paint);
-        p.setStrokeWidth(SkScalarMul(textSize, paint.getStrokeWidth()));

+        p.setStrokeWidth(SkScalarMul(textSize, paint.getStrokeWidth()));
         draw.fDevice->drawRect(draw, r, p);
     }
 }
diff --git a/src/pdf/SkPDFDevice.cpp b/src/pdf/SkPDFDevice.cpp
index e72a6b7603..8cf1eca3b8 100644
--- a/src/pdf/SkPDFDevice.cpp
+++ b/src/pdf/SkPDFDevice.cpp
@@ -517,7 +517,6 @@ SkPDFDevice::SkPDFDevice(const SkISize& pageSize, const SkISize& contentSize,
     fInitialTransform.preConcat(initialTransform);
 
     SkIRect existingClip = SkIRect::MakeWH(this->width(), this->height());
-    fExistingClipStack.clipDevRect(existingClip);
     fExistingClipRegion.setRect(existingClip);
 
     this->init();
diff --git a/src/pdf/SkPDFFont.cpp b/src/pdf/SkPDFFont.cpp
index 989b276d73..fe55c8d046 100644
--- a/src/pdf/SkPDFFont.cpp
+++ b/src/pdf/SkPDFFont.cpp
@@ -488,7 +488,7 @@ void append_cmap_sections(const SkTDArray<SkUnichar>& glyphToUnicode,
                             (i >> 8) == (currentRangeEntry.fStart >> 8) &&
                             glyphToUnicode[i] == (currentRangeEntry.fUnicode +
                                                   continuousEntries)) {
-                            currentRangeEntry.fEnd = i;
+                    currentRangeEntry.fEnd = i;
                     if (i == glyphToUnicode.count() - 1) {
                         // Last entry is in a range.
                         bfrangeEntries.push(currentRangeEntry);
diff --git a/src/ports/SkFontHost_linux.cpp b/src/ports/SkFontHost_linux.cpp
index 782b93fb25..b60db0764b 100644
--- a/src/ports/SkFontHost_linux.cpp
+++ b/src/ports/SkFontHost_linux.cpp
@@ -129,7 +129,7 @@ static SkTypeface* find_from_uniqueID(uint32_t uniqueID) {
         }
         curr = curr->fNext;
     }
-    return false;
+    return NULL;
 }
 
 static bool valid_uniqueID(uint32_t uniqueID) {
diff --git a/src/utils/SkParse.cpp b/src/utils/SkParse.cpp
index f93e2ef1b2..cb265c383f 100644
--- a/src/utils/SkParse.cpp
+++ b/src/utils/SkParse.cpp
@@ -130,7 +130,7 @@ const char* SkParse::FindHex(const char str[], uint32_t* value)
             *value = n;
         return str;
     }
-    return false;
+    return NULL;
 }
 
 const char* SkParse::FindS32(const char str[], int32_t* value)
diff --git a/src/views/SkView.cpp b/src/views/SkView.cpp
index 69dc6fc7f2..5b154392e8 100644
--- a/src/views/SkView.cpp
+++ b/src/views/SkView.cpp
@@ -363,7 +363,7 @@ void SkView::Click::copyType(const char type[])
 SkView::Click* SkView::findClickHandler(SkScalar x, SkScalar y)
 {
 	if (x < 0 || y < 0 || x >= fWidth || y >= fHeight) {
-		return false;
+		return NULL;
     }
 
     if (this->onSendClickToChildren(x, y)) {