Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(63)

Side by Side Diff: third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTest.cpp

Issue 1925583003: Replace AllowCrossThreadAccess() + non-GCed pointers with crossThreadUnretained() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@Kuroneko_4
Patch Set: Rebase. Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 EXPECT_EQ(1, image->height()); 239 EXPECT_EQ(1, image->height());
240 240
241 SkPictureRecorder recorder; 241 SkPictureRecorder recorder;
242 SkCanvas* tempCanvas = recorder.beginRecording(100, 100, 0, 0); 242 SkCanvas* tempCanvas = recorder.beginRecording(100, 100, 0, 0);
243 tempCanvas->drawImage(image.get(), 0, 0); 243 tempCanvas->drawImage(image.get(), 0, 0);
244 sk_sp<SkPicture> picture = recorder.finishRecordingAsPicture(); 244 sk_sp<SkPicture> picture = recorder.finishRecordingAsPicture();
245 EXPECT_EQ(0, m_decodeRequestCount); 245 EXPECT_EQ(0, m_decodeRequestCount);
246 246
247 // Create a thread to rasterize SkPicture. 247 // Create a thread to rasterize SkPicture.
248 std::unique_ptr<WebThread> thread = wrapUnique(Platform::current()->createTh read("RasterThread")); 248 std::unique_ptr<WebThread> thread = wrapUnique(Platform::current()->createTh read("RasterThread"));
249 thread->getWebTaskRunner()->postTask(BLINK_FROM_HERE, threadSafeBind(&raster izeMain, AllowCrossThreadAccess(m_surface->getCanvas()), AllowCrossThreadAccess( picture.get()))); 249 thread->getWebTaskRunner()->postTask(BLINK_FROM_HERE, threadSafeBind(&raster izeMain, crossThreadUnretained(m_surface->getCanvas()), crossThreadUnretained(pi cture.get())));
250 thread.reset(); 250 thread.reset();
251 EXPECT_EQ(0, m_decodeRequestCount); 251 EXPECT_EQ(0, m_decodeRequestCount);
252 252
253 SkBitmap canvasBitmap; 253 SkBitmap canvasBitmap;
254 canvasBitmap.allocN32Pixels(100, 100); 254 canvasBitmap.allocN32Pixels(100, 100);
255 ASSERT_TRUE(m_surface->getCanvas()->readPixels(&canvasBitmap, 0, 0)); 255 ASSERT_TRUE(m_surface->getCanvas()->readPixels(&canvasBitmap, 0, 0));
256 SkAutoLockPixels autoLock(canvasBitmap); 256 SkAutoLockPixels autoLock(canvasBitmap);
257 EXPECT_EQ(SkColorSetARGB(255, 255, 255, 255), canvasBitmap.getColor(0, 0)); 257 EXPECT_EQ(SkColorSetARGB(255, 255, 255, 255), canvasBitmap.getColor(0, 0));
258 } 258 }
259 259
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 m_lazyDecoder->createFrameAtIndex(0); 403 m_lazyDecoder->createFrameAtIndex(0);
404 m_lazyDecoder->createFrameAtIndex(1); 404 m_lazyDecoder->createFrameAtIndex(1);
405 m_lazyDecoder->setData(*m_data, true); 405 m_lazyDecoder->setData(*m_data, true);
406 // Clears only the first frame (0 bytes). If DeferredImageDecoder doesn't 406 // Clears only the first frame (0 bytes). If DeferredImageDecoder doesn't
407 // check with the actual decoder it reports 4 bytes instead. 407 // check with the actual decoder it reports 4 bytes instead.
408 size_t frameBytesCleared = m_lazyDecoder->clearCacheExceptFrame(1); 408 size_t frameBytesCleared = m_lazyDecoder->clearCacheExceptFrame(1);
409 EXPECT_EQ(static_cast<size_t>(0), frameBytesCleared); 409 EXPECT_EQ(static_cast<size_t>(0), frameBytesCleared);
410 } 410 }
411 411
412 } // namespace blink 412 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698