Calculate paint invalidation rect for scrollbars

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

 /*
  * Copyright (c) 2013, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 117 matching lines @@
     ASSERT_FALSE(client.notifyFinishedCalled());
 
     // This part finishes. The image is created, callbacks are sent, and the data buffer is cleared.
     cachedImage->finish();
     ASSERT_FALSE(cachedImage->resourceBuffer());
     ASSERT_FALSE(cachedImage->errorOccurred());
     ASSERT_TRUE(cachedImage->hasImage());
     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());
 }
 
 TEST(ImageResourceTest, CancelOnDetach)
 {
     KURL testURL(ParsedURLString, "http://www.test.com/cancelTest.html");
     URLTestHelpers::registerMockedURLLoad(testURL, "cancelTest.html", "text/html");
 
     ResourceFetcher* fetcher = ResourceFetcher::create(nullptr);
 
@@ skipping 67 matching lines @@
     cachedImage->finish();
     ASSERT_FALSE(cachedImage->errorOccurred());
     ASSERT_TRUE(cachedImage->hasImage());
     ASSERT_FALSE(cachedImage->image()->isNull());
     ASSERT_EQ(client.imageChangedCount(), 2);
     ASSERT_TRUE(client.notifyFinishedCalled());
     ASSERT_TRUE(cachedImage->image()->isBitmapImage());
 }
 
 } // namespace blink