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

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

Issue 2123783002: Expose RunsTasksOnCurrentThread through WebTaskRunner (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@00_fix_thread_affinity
Patch Set: 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 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "platform/graphics/RecordingImageBufferSurface.h" 5 #include "platform/graphics/RecordingImageBufferSurface.h"
6 6
7 #include "platform/graphics/GraphicsContext.h" 7 #include "platform/graphics/GraphicsContext.h"
8 #include "platform/graphics/ImageBuffer.h" 8 #include "platform/graphics/ImageBuffer.h"
9 #include "platform/graphics/ImageBufferClient.h" 9 #include "platform/graphics/ImageBufferClient.h"
10 #include "platform/graphics/UnacceleratedImageBufferSurface.h" 10 #include "platform/graphics/UnacceleratedImageBufferSurface.h"
(...skipping 30 matching lines...) Expand all
41 void didFinalizeFrame() override 41 void didFinalizeFrame() override
42 { 42 {
43 if (m_isDirty) { 43 if (m_isDirty) {
44 Platform::current()->currentThread()->removeTaskObserver(this); 44 Platform::current()->currentThread()->removeTaskObserver(this);
45 m_isDirty = false; 45 m_isDirty = false;
46 } 46 }
47 ++m_frameCount; 47 ++m_frameCount;
48 } 48 }
49 49
50 // TaskObserver implementation 50 // TaskObserver implementation
51 void willProcessTask() override { ASSERT_NOT_REACHED(); } 51 void willProcessTask() override { NOTREACHED(); }
52 void didProcessTask() override 52 void didProcessTask() override
53 { 53 {
54 ASSERT_TRUE(m_isDirty); 54 ASSERT_TRUE(m_isDirty);
55 FloatRect dirtyRect(0, 0, 1, 1); 55 FloatRect dirtyRect(0, 0, 1, 1);
56 m_imageBuffer->finalizeFrame(dirtyRect); 56 m_imageBuffer->finalizeFrame(dirtyRect);
57 ASSERT_FALSE(m_isDirty); 57 ASSERT_FALSE(m_isDirty);
58 } 58 }
59 void restoreCanvasMatrixClipStack(SkCanvas*) const override { } 59 void restoreCanvasMatrixClipStack(SkCanvas*) const override { }
60 60
61 void fakeDraw() 61 void fakeDraw()
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 public: 248 public:
249 MockWebTaskRunner() : m_task(0) { } 249 MockWebTaskRunner() : m_task(0) { }
250 ~MockWebTaskRunner() override { } 250 ~MockWebTaskRunner() override { }
251 251
252 void postTask(const WebTraceLocation&, Task* task) override 252 void postTask(const WebTraceLocation&, Task* task) override
253 { 253 {
254 EXPECT_EQ((Task*)0, m_task); 254 EXPECT_EQ((Task*)0, m_task);
255 m_task = task; 255 m_task = task;
256 } 256 }
257 257
258 void postDelayedTask(const WebTraceLocation&, Task*, double delayMs) ove rride { ASSERT_NOT_REACHED(); }; 258 void postDelayedTask(const WebTraceLocation&, Task*, double delayMs) ove rride { NOTREACHED(); };
259
260 bool runsTasksOnCurrentThread() override
261 {
262 NOTREACHED();
263 return false;
264 }
259 265
260 WebTaskRunner* clone() override 266 WebTaskRunner* clone() override
261 { 267 {
262 ASSERT_NOT_REACHED(); 268 NOTREACHED();
263 return nullptr; 269 return nullptr;
264 } 270 }
265 271
266 double virtualTimeSeconds() const override 272 double virtualTimeSeconds() const override
267 { 273 {
268 ASSERT_NOT_REACHED(); 274 NOTREACHED();
269 return 0.0; 275 return 0.0;
270 } 276 }
271 277
272 double monotonicallyIncreasingVirtualTimeSeconds() const override 278 double monotonicallyIncreasingVirtualTimeSeconds() const override
273 { 279 {
274 ASSERT_NOT_REACHED(); 280 NOTREACHED();
275 return 0.0; 281 return 0.0;
276 } 282 }
277 283
278 Task* m_task; 284 Task* m_task;
279 }; 285 };
280 286
281 class CurrentThreadMock : public WebThread { 287 class CurrentThreadMock : public WebThread {
282 public: 288 public:
283 CurrentThreadMock() : m_taskObserver(0) { } 289 CurrentThreadMock() : m_taskObserver(0) { }
284 290
285 ~CurrentThreadMock() override 291 ~CurrentThreadMock() override
286 { 292 {
287 EXPECT_EQ((WebTaskRunner::Task*)0, m_taskRunner.m_task); 293 EXPECT_EQ((WebTaskRunner::Task*)0, m_taskRunner.m_task);
288 } 294 }
289 295
290 WebTaskRunner* getWebTaskRunner() override 296 WebTaskRunner* getWebTaskRunner() override
291 { 297 {
292 return &m_taskRunner; 298 return &m_taskRunner;
293 } 299 }
294 300
295 bool isCurrentThread() const override { return true; } 301 bool isCurrentThread() const override { return true; }
296 302
297 PlatformThreadId threadId() const override 303 PlatformThreadId threadId() const override
298 { 304 {
299 ASSERT_NOT_REACHED(); 305 NOTREACHED();
300 return 0; 306 return 0;
301 } 307 }
302 308
303 void addTaskObserver(TaskObserver* taskObserver) override 309 void addTaskObserver(TaskObserver* taskObserver) override
304 { 310 {
305 EXPECT_EQ(nullptr, m_taskObserver); 311 EXPECT_EQ(nullptr, m_taskObserver);
306 m_taskObserver = taskObserver; 312 m_taskObserver = taskObserver;
307 } 313 }
308 314
309 void removeTaskObserver(TaskObserver* taskObserver) override 315 void removeTaskObserver(TaskObserver* taskObserver) override
310 { 316 {
311 EXPECT_EQ(m_taskObserver, taskObserver); 317 EXPECT_EQ(m_taskObserver, taskObserver);
312 m_taskObserver = 0; 318 m_taskObserver = 0;
313 } 319 }
314 320
315 WebScheduler* scheduler() const override 321 WebScheduler* scheduler() const override
316 { 322 {
317 ASSERT_NOT_REACHED(); 323 NOTREACHED();
318 return nullptr; 324 return nullptr;
319 } 325 }
320 326
321 void enterRunLoop() 327 void enterRunLoop()
322 { 328 {
323 if (m_taskObserver) 329 if (m_taskObserver)
324 m_taskObserver->willProcessTask(); 330 m_taskObserver->willProcessTask();
325 if (m_taskRunner.m_task) { 331 if (m_taskRunner.m_task) {
326 m_taskRunner.m_task->run(); 332 m_taskRunner.m_task->run();
327 delete m_taskRunner.m_task; 333 delete m_taskRunner.m_task;
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 expectDisplayListEnabled(true); 390 expectDisplayListEnabled(true);
385 } 391 }
386 392
387 TEST_F(RecordingImageBufferSurfaceTest, testClearRect) 393 TEST_F(RecordingImageBufferSurfaceTest, testClearRect)
388 { 394 {
389 CALL_TEST_TASK_WRAPPER(testClearRect); 395 CALL_TEST_TASK_WRAPPER(testClearRect);
390 expectDisplayListEnabled(true); 396 expectDisplayListEnabled(true);
391 } 397 }
392 398
393 } // namespace blink 399 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698