diff options
author | dmurph <dmurph@chromium.org> | 2015-10-02 10:11:00 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-10-02 17:11:36 +0000 |
commit | 08a17b907128a90d72f8d8031985b34a54aaf45d (patch) | |
tree | cb50c83b31f46ad63f501b6a8a77c917a4bd46e0 /third_party/WebKit/Source/platform/TimerTest.cpp | |
parent | ee55ed44da66cc54b3d5ab295485b7bbf3c0716a (diff) | |
download | chromium_src-08a17b907128a90d72f8d8031985b34a54aaf45d.zip chromium_src-08a17b907128a90d72f8d8031985b34a54aaf45d.tar.gz chromium_src-08a17b907128a90d72f8d8031985b34a54aaf45d.tar.bz2 |
Revert of Post loading tasks on the appropriate WebFrameScheduler's queue (patchset #17 id:310001 of https://codereview.chromium.org/1366883002/ )
Reason for revert:
BUG=538660
HTTP parsing use-after-free issues.
Original issue's description:
> Post loading tasks on the appropriate WebFrameScheduler's queue.
>
> Must be submitted after https://codereview.chromium.org/1340343003/
>
> BUG=510398
>
> Committed: https://crrev.com/bcc4ce71b07ea71a1056c3227c5bc381c52256fd
> Cr-Commit-Position: refs/heads/master@{#352036}
TBR=jochen@chromium.org,sandersd@chromium.org,skyostil@chromium.org,alexclarke@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=510398
Review URL: https://codereview.chromium.org/1379543003
Cr-Commit-Position: refs/heads/master@{#352062}
Diffstat (limited to 'third_party/WebKit/Source/platform/TimerTest.cpp')
-rw-r--r-- | third_party/WebKit/Source/platform/TimerTest.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/third_party/WebKit/Source/platform/TimerTest.cpp b/third_party/WebKit/Source/platform/TimerTest.cpp index 6db91cb..9a0900c 100644 --- a/third_party/WebKit/Source/platform/TimerTest.cpp +++ b/third_party/WebKit/Source/platform/TimerTest.cpp @@ -77,7 +77,7 @@ public: explicit MockWebTaskRunner(std::priority_queue<DelayedTask>* timerTasks) : m_timerTasks(timerTasks) { } ~MockWebTaskRunner() override { } - void postTask(const WebTraceLocation&, Task* task) override + virtual void postTask(const WebTraceLocation&, Task* task) { m_timerTasks->push(DelayedTask(task, 0)); } @@ -87,12 +87,6 @@ public: m_timerTasks->push(DelayedTask(task, delayMs * 0.001)); } - WebTaskRunner* clone() override - { - ASSERT_NOT_REACHED(); - return nullptr; - } - std::priority_queue<DelayedTask>* m_timerTasks; // NOT OWNED }; |