Calculate paint invalidation rect for scrollbars

third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp

Index: third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp
diff --git a/third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp b/third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp
index 7a6e07b6e9e5d5cc2acf2dcb095302463ed892e3..820283b7c17d3162d315a198552e25201a35bcca 100644
--- a/third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp
+++ b/third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp
@@ -135,7 +135,7 @@ TEST(ImageResourceTest, MultipartImage)
     ASSERT_FALSE(cachedImage->image()->isNull());
     ASSERT_EQ(cachedImage->image()->width(), 1);
     ASSERT_EQ(cachedImage->image()->height(), 1);
-    ASSERT_EQ(client.imageChangedCount(), 2);
+    ASSERT_GT(client.imageChangedCount(), 0);

[chrishtr, 2015/11/11 01:40:29]

This change is not a bug?

[Xianzhu, 2015/11/11 19:29:57]

This was a really weird situation. Besides real image changes, the embedded SVG
image has a FrameView which also informs the SVG Image changes through
HostWindow::invalidateRect() interface. imageChangedCount() happened to be 2
before, because the invalidation caused by scroll corner was also counted as an
image change.

With this change, the extra invalidation of scroll corner is eliminated, so
imageChangeCount() is 1 (the real image change). Perhaps it's better to
ASSERT_EQ(..., 1).

[chrishtr, 2015/11/17 00:35:47]

I'd prefer ASSERT_EQ(..., 1) just to lock things down a bit more. And add a
comment explaining.

[Xianzhu, 2015/11/17 00:56:04]

Done.

     ASSERT_TRUE(client.notifyFinishedCalled());
 }