Change clear() to respect the clip

tests/RecordDrawTest.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Test.h"
 #include "RecordTestUtils.h"
 
@@ skipping 173 matching lines @@
     SkPaint p;
 
     SkRecord record;
     SkRecorder recorder(&record, kWidth, kHeight);
     recorder.drawRect(r1, p);
     recorder.drawRect(r2, p);
     recorder.drawRect(r3, p);
 
     SkRecord rerecord;
     SkRecorder canvas(&rerecord, kWidth, kHeight);
-    SkRecordPartialDraw(record, &canvas, NULL, 0, r1, 1, 2, SkMatrix::I()); // replay just drawRect of r2
+    SkRecordPartialDraw(record, &canvas, NULL, 0, 1, 2, SkMatrix::I()); // replay just drawRect of r2
 
     REPORTER_ASSERT(r, 3 == rerecord.count());
     assert_type<SkRecords::Save>     (r, rerecord, 0);
     assert_type<SkRecords::DrawRect> (r, rerecord, 1);
     assert_type<SkRecords::Restore>  (r, rerecord, 2);
 
     const SkRecords::DrawRect* drawRect = assert_type<SkRecords::DrawRect>(r, rerecord, 1);
     REPORTER_ASSERT(r, drawRect->rect == r2);
 }
 
-// Check that clears are converted to drawRects
-DEF_TEST(RecordDraw_PartialClear, r) {
-    static const int kWidth = 10, kHeight = 10;
-
-    SkRect rect = { 0, 0, kWidth, kHeight };
-
-    SkRecord record;
-    SkRecorder recorder(&record, kWidth, kHeight);
-    recorder.clear(SK_ColorRED);
-
-    SkRecord rerecord;
-    SkRecorder canvas(&rerecord, kWidth, kHeight);
-    SkRecordPartialDraw(record, &canvas, NULL, 0, rect, 0, 1, SkMatrix::I()); // replay just the clear
-
-    REPORTER_ASSERT(r, 3 == rerecord.count());
-    assert_type<SkRecords::Save>    (r, rerecord, 0);
-    assert_type<SkRecords::DrawRect>(r, rerecord, 1);
-    assert_type<SkRecords::Restore> (r, rerecord, 2);
-
-    const SkRecords::DrawRect* drawRect = assert_type<SkRecords::DrawRect>(r, rerecord, 1);
-    REPORTER_ASSERT(r, drawRect->rect == rect);
-    REPORTER_ASSERT(r, drawRect->paint.getColor() == SK_ColorRED);
-}
-
 // A regression test for crbug.com/415468 and skbug.com/2957.
 //
 // This also now serves as a regression test for crbug.com/418417.  We used to adjust the
 // bounds for the saveLayer, clip, and restore to be greater than the bounds of the picture.
 // (We were applying the saveLayer paint to the bounds after restore, which makes no sense.)
 DEF_TEST(RecordDraw_SaveLayerAffectsClipBounds, r) {
     SkRecord record;
     SkRecorder recorder(&record, 50, 50);
 
     // We draw a rectangle with a long drop shadow.  We used to not update the clip
@@ skipping 88 matching lines @@
 
     {
         SkRecord record;
         SkRecorder recorder(&record, 10, 10);
         recorder.drawImageRect(image, 0, SkRect::MakeWH(10, 10));
         SkRecordDraw(record, &canvas, NULL, NULL, 0, NULL, 0);
     }
     REPORTER_ASSERT(r, canvas.fDrawImageRectCalled);
 
 }