diff options
| author | mfomitchev@chromium.org <mfomitchev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-08 19:55:23 +0000 |
|---|---|---|
| committer | mfomitchev@chromium.org <mfomitchev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-08 19:55:23 +0000 |
| commit | 5a8c82862cc19452489b4f712c8d5f97632675f8 (patch) | |
| tree | a660e301daa1a322c79ee45ed0c3540ff8f2bfd3 | |
| parent | 3e565e7771b3ec141ff214843b7ff65986dca21c (diff) | |
| download | chromium_src-5a8c82862cc19452489b4f712c8d5f97632675f8.zip chromium_src-5a8c82862cc19452489b4f712c8d5f97632675f8.tar.gz chromium_src-5a8c82862cc19452489b4f712c8d5f97632675f8.tar.bz2 | |
Fixing an off by one error in screenshot manager code.
The screenshots were captured with (1, 1) offset. This also caused an MSan issue
for 1x1 screenshots - their content wasn't initialized at all.
BUG=347238, 358783
Review URL: https://codereview.chromium.org/226223003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262488 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/browser/frame_host/navigation_controller_impl_unittest.cc | 2 | ||||
| -rw-r--r-- | content/browser/frame_host/navigation_entry_screenshot_manager.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/content/browser/frame_host/navigation_controller_impl_unittest.cc b/content/browser/frame_host/navigation_controller_impl_unittest.cc index 70f447e..fdedfc2 100644 --- a/content/browser/frame_host/navigation_controller_impl_unittest.cc +++ b/content/browser/frame_host/navigation_controller_impl_unittest.cc @@ -81,7 +81,7 @@ class MockScreenshotManager : public content::NavigationEntryScreenshotManager { SkBitmap bitmap; bitmap.setConfig(SkBitmap::kARGB_8888_Config, 1, 1); bitmap.allocPixels(); - bitmap.eraseRGB(0, 0, 0); + bitmap.eraseARGB(0, 0, 0, 0); encoding_screenshot_in_progress_ = true; OnScreenshotTaken(entry->GetUniqueID(), true, bitmap); WaitUntilScreenshotIsReady(); diff --git a/content/browser/frame_host/navigation_entry_screenshot_manager.cc b/content/browser/frame_host/navigation_entry_screenshot_manager.cc index 1e06632..08791f9 100644 --- a/content/browser/frame_host/navigation_entry_screenshot_manager.cc +++ b/content/browser/frame_host/navigation_entry_screenshot_manager.cc @@ -64,7 +64,7 @@ class ScreenshotData : public base::RefCountedThreadSafe<ScreenshotData> { SkColorFilter* filter = SkLumaColorFilter::Create(); paint.setColorFilter(filter); filter->unref(); - canvas.drawBitmap(bitmap, SK_Scalar1, SK_Scalar1, &paint); + canvas.drawBitmap(bitmap, SkIntToScalar(0), SkIntToScalar(0), &paint); // Encode the a8Bitmap to grayscale PNG treating alpha as color intensity if (gfx::PNGCodec::EncodeA8SkBitmap(a8Bitmap, &data)) data_ = new base::RefCountedBytes(data); |