revise unittest for annotations in preparation for skia change

third_party/WebKit/Source/core/page/PrintContextTest.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/page/PrintContext.h"
 
 #include "core/dom/Document.h"
 #include "core/frame/FrameView.h"
 #include "core/html/HTMLElement.h"
 #include "core/layout/LayoutTestHelper.h"
 #include "core/layout/LayoutView.h"
 #include "core/paint/PaintLayer.h"
 #include "core/paint/PaintLayerPainter.h"
 #include "core/testing/DummyPageHolder.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/paint/DrawingRecorder.h"
 #include "platform/graphics/paint/SkPictureBuilder.h"
 #include "platform/scroll/ScrollbarTheme.h"
 #include "platform/text/TextStream.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/skia/include/core/SkAnnotation.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 
 namespace blink {
 
 const int kPageWidth = 800;
 const int kPageHeight = 600;
 
 class MockPrintContext : public PrintContext {
 public:
     MockPrintContext(LocalFrame* frame) : PrintContext(frame) { }
@@ skipping 14 matching lines @@
     struct Operation {
         OperationType type;
         SkRect rect;
     };
 
     MockCanvas() : SkCanvas(kPageWidth, kPageHeight) { }
 
 #ifdef SK_SUPPORT_NEW_ANNOTATION_CANVAS_VIRTUAL
     void onDrawAnnotation(const SkRect& rect, const char key[], SkData* value) override
     {
-        if (rect.width() == 0 && rect.height()) {
-            ASSERT_EQ(1u, count);
+        if (rect.width() == 0 && rect.height() == 0) {
             SkPoint point = getTotalMatrix().mapXY(rect.x(), rect.y());
             Operation operation = {
                 DrawPoint, SkRect::MakeXYWH(point.x(), point.y(), 0, 0) };
-        m_recordedOperations.append(operation);
+            m_recordedOperations.append(operation);
         } else {
             Operation operation = { DrawRect, rect };
             getTotalMatrix().mapRect(&operation.rect);
             m_recordedOperations.append(operation);
         }
     }
 #else
     void onDrawRect(const SkRect& rect, const SkPaint& paint) override
     {
         if (!paint.getAnnotation())
@@ skipping 274 matching lines @@
     ASSERT_EQ(3u, operations.size());
     EXPECT_EQ(MockCanvas::DrawRect, operations[0].type);
     EXPECT_SKRECT_EQ(50, 60, 70, 80, operations[0].rect); // FIXME: the rect should be clipped.
     EXPECT_EQ(MockCanvas::DrawRect, operations[1].type);
     EXPECT_SKRECT_EQ(150, 160, 170, 180, operations[1].rect);
     EXPECT_EQ(MockCanvas::DrawRect, operations[2].type);
     EXPECT_SKRECT_EQ(250, 260, 270, 280, operations[2].rect);
 }
 
 } // namespace blink