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

Unified Diff: Source/core/animation/CompositorAnimationsTestHelper.h

Issue 1134523002: Implement timers by posting delayed tasks (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Gyp tweak. Created 5 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: Source/core/animation/CompositorAnimationsTestHelper.h
diff --git a/Source/core/animation/CompositorAnimationsTestHelper.h b/Source/core/animation/CompositorAnimationsTestHelper.h
index 31c0f09ab9561789275e1dfd63b48e9da0ed98b2..c6cff56be8a81fa94578e336b9719a1647815c4b 100644
--- a/Source/core/animation/CompositorAnimationsTestHelper.h
+++ b/Source/core/animation/CompositorAnimationsTestHelper.h
@@ -142,7 +142,7 @@ public:
private:
class PlatformProxy : public Platform {
public:
- PlatformProxy(WebCompositorSupportMock** compositor) : m_compositor(compositor) { }
+ PlatformProxy(WebCompositorSupportMock** compositor) : m_oldPlatform(blink::Platform::current()), m_compositor(compositor) { }
virtual void cryptographicallyRandomValues(unsigned char* buffer, size_t length) { ASSERT_NOT_REACHED(); }
const unsigned char* getTraceCategoryEnabledFlag(const char* categoryName) override
@@ -151,7 +151,13 @@ private:
return &tracingIsDisabled;
}
+ WebThread* currentThread() override
+ {
+ return m_oldPlatform->currentThread();
+ }
+
private:
+ blink::Platform* m_oldPlatform; // Not owned.
WebCompositorSupportMock** m_compositor;
virtual WebCompositorSupport* compositorSupport() override { return *m_compositor; }
};

Powered by Google App Engine
This is Rietveld 408576698