| OLD | NEW |
| 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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 void didFinalizeFrame() override | 42 void didFinalizeFrame() override |
| 43 { | 43 { |
| 44 if (m_isDirty) { | 44 if (m_isDirty) { |
| 45 Platform::current()->currentThread()->removeTaskObserver(this); | 45 Platform::current()->currentThread()->removeTaskObserver(this); |
| 46 m_isDirty = false; | 46 m_isDirty = false; |
| 47 } | 47 } |
| 48 ++m_frameCount; | 48 ++m_frameCount; |
| 49 } | 49 } |
| 50 | 50 |
| 51 // TaskObserver implementation | 51 // TaskObserver implementation |
| 52 void willProcessTask() override { ASSERT_NOT_REACHED(); } | 52 void willProcessTask() override { NOTREACHED(); } |
| 53 void didProcessTask() override | 53 void didProcessTask() override |
| 54 { | 54 { |
| 55 ASSERT_TRUE(m_isDirty); | 55 ASSERT_TRUE(m_isDirty); |
| 56 FloatRect dirtyRect(0, 0, 1, 1); | 56 FloatRect dirtyRect(0, 0, 1, 1); |
| 57 m_imageBuffer->finalizeFrame(dirtyRect); | 57 m_imageBuffer->finalizeFrame(dirtyRect); |
| 58 ASSERT_FALSE(m_isDirty); | 58 ASSERT_FALSE(m_isDirty); |
| 59 } | 59 } |
| 60 void restoreCanvasMatrixClipStack(SkCanvas*) const override { } | 60 void restoreCanvasMatrixClipStack(SkCanvas*) const override { } |
| 61 | 61 |
| 62 void fakeDraw() | 62 void fakeDraw() |
| (...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 249 public: | 249 public: |
| 250 MockWebTaskRunner() : m_task(0) { } | 250 MockWebTaskRunner() : m_task(0) { } |
| 251 ~MockWebTaskRunner() override { } | 251 ~MockWebTaskRunner() override { } |
| 252 | 252 |
| 253 void postTask(const WebTraceLocation&, Task* task) override | 253 void postTask(const WebTraceLocation&, Task* task) override |
| 254 { | 254 { |
| 255 EXPECT_EQ((Task*)0, m_task); | 255 EXPECT_EQ((Task*)0, m_task); |
| 256 m_task = task; | 256 m_task = task; |
| 257 } | 257 } |
| 258 | 258 |
| 259 void postDelayedTask(const WebTraceLocation&, Task*, double delayMs) ove
rride { ASSERT_NOT_REACHED(); }; | 259 void postDelayedTask(const WebTraceLocation&, Task*, double delayMs) ove
rride { NOTREACHED(); }; |
| 260 |
| 261 bool runsTasksOnCurrentThread() override |
| 262 { |
| 263 NOTREACHED(); |
| 264 return true; |
| 265 } |
| 260 | 266 |
| 261 WebTaskRunner* clone() override | 267 WebTaskRunner* clone() override |
| 262 { | 268 { |
| 263 ASSERT_NOT_REACHED(); | 269 NOTREACHED(); |
| 264 return nullptr; | 270 return nullptr; |
| 265 } | 271 } |
| 266 | 272 |
| 267 double virtualTimeSeconds() const override | 273 double virtualTimeSeconds() const override |
| 268 { | 274 { |
| 269 ASSERT_NOT_REACHED(); | 275 NOTREACHED(); |
| 270 return 0.0; | 276 return 0.0; |
| 271 } | 277 } |
| 272 | 278 |
| 273 double monotonicallyIncreasingVirtualTimeSeconds() const override | 279 double monotonicallyIncreasingVirtualTimeSeconds() const override |
| 274 { | 280 { |
| 275 ASSERT_NOT_REACHED(); | 281 NOTREACHED(); |
| 276 return 0.0; | 282 return 0.0; |
| 277 } | 283 } |
| 278 | 284 |
| 279 Task* m_task; | 285 Task* m_task; |
| 280 }; | 286 }; |
| 281 | 287 |
| 282 class CurrentThreadMock : public WebThread { | 288 class CurrentThreadMock : public WebThread { |
| 283 public: | 289 public: |
| 284 CurrentThreadMock() : m_taskObserver(0) { } | 290 CurrentThreadMock() : m_taskObserver(0) { } |
| 285 | 291 |
| 286 ~CurrentThreadMock() override | 292 ~CurrentThreadMock() override |
| 287 { | 293 { |
| 288 EXPECT_EQ((WebTaskRunner::Task*)0, m_taskRunner.m_task); | 294 EXPECT_EQ((WebTaskRunner::Task*)0, m_taskRunner.m_task); |
| 289 } | 295 } |
| 290 | 296 |
| 291 WebTaskRunner* getWebTaskRunner() override | 297 WebTaskRunner* getWebTaskRunner() override |
| 292 { | 298 { |
| 293 return &m_taskRunner; | 299 return &m_taskRunner; |
| 294 } | 300 } |
| 295 | 301 |
| 296 bool isCurrentThread() const override { return true; } | 302 bool isCurrentThread() const override { return true; } |
| 297 | 303 |
| 298 PlatformThreadId threadId() const override | 304 PlatformThreadId threadId() const override |
| 299 { | 305 { |
| 300 ASSERT_NOT_REACHED(); | 306 NOTREACHED(); |
| 301 return 0; | 307 return 0; |
| 302 } | 308 } |
| 303 | 309 |
| 304 void addTaskObserver(TaskObserver* taskObserver) override | 310 void addTaskObserver(TaskObserver* taskObserver) override |
| 305 { | 311 { |
| 306 EXPECT_EQ(nullptr, m_taskObserver); | 312 EXPECT_EQ(nullptr, m_taskObserver); |
| 307 m_taskObserver = taskObserver; | 313 m_taskObserver = taskObserver; |
| 308 } | 314 } |
| 309 | 315 |
| 310 void removeTaskObserver(TaskObserver* taskObserver) override | 316 void removeTaskObserver(TaskObserver* taskObserver) override |
| 311 { | 317 { |
| 312 EXPECT_EQ(m_taskObserver, taskObserver); | 318 EXPECT_EQ(m_taskObserver, taskObserver); |
| 313 m_taskObserver = 0; | 319 m_taskObserver = 0; |
| 314 } | 320 } |
| 315 | 321 |
| 316 WebScheduler* scheduler() const override | 322 WebScheduler* scheduler() const override |
| 317 { | 323 { |
| 318 ASSERT_NOT_REACHED(); | 324 NOTREACHED(); |
| 319 return nullptr; | 325 return nullptr; |
| 320 } | 326 } |
| 321 | 327 |
| 322 void enterRunLoop() | 328 void enterRunLoop() |
| 323 { | 329 { |
| 324 if (m_taskObserver) | 330 if (m_taskObserver) |
| 325 m_taskObserver->willProcessTask(); | 331 m_taskObserver->willProcessTask(); |
| 326 if (m_taskRunner.m_task) { | 332 if (m_taskRunner.m_task) { |
| 327 m_taskRunner.m_task->run(); | 333 m_taskRunner.m_task->run(); |
| 328 delete m_taskRunner.m_task; | 334 delete m_taskRunner.m_task; |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 385 expectDisplayListEnabled(true); | 391 expectDisplayListEnabled(true); |
| 386 } | 392 } |
| 387 | 393 |
| 388 TEST_F(RecordingImageBufferSurfaceTest, testClearRect) | 394 TEST_F(RecordingImageBufferSurfaceTest, testClearRect) |
| 389 { | 395 { |
| 390 CALL_TEST_TASK_WRAPPER(testClearRect); | 396 CALL_TEST_TASK_WRAPPER(testClearRect); |
| 391 expectDisplayListEnabled(true); | 397 expectDisplayListEnabled(true); |
| 392 } | 398 } |
| 393 | 399 |
| 394 } // namespace blink | 400 } // namespace blink |
| OLD | NEW |