Index: Source/oilpan-chromium.patch |
diff --git a/Source/oilpan-chromium.patch b/Source/oilpan-chromium.patch |
index ea6d5e15d3245a0c41ae4befa1e4b42615a7dd64..77bc7d628813e14f56dea0400962e01520a963f3 100644 |
--- a/Source/oilpan-chromium.patch |
+++ b/Source/oilpan-chromium.patch |
@@ -675,7 +675,7 @@ index bbc2429..da47e30 100644 |
+ CHECK(processing_ == false); |
+ processing_ = true; |
+ #endif |
-+ WebKit::Platform::markCurrentThreadResumed(); |
++ WebKit::Platform::leaveSafePoint(); |
+ } |
+ |
+ // This method is called after processing a task. |
@@ -683,7 +683,7 @@ index bbc2429..da47e30 100644 |
+ #ifndef NDEBUG |
+ processing_ = false; |
+ #endif |
-+ WebKit::Platform::markCurrentThreadPaused(); |
++ WebKit::Platform::enterSafePoint(); |
+ } |
+ |
+ private: |
@@ -699,7 +699,7 @@ index bbc2429..da47e30 100644 |
+ virtual void Run(MessageLoop* message_loop) OVERRIDE { |
+ intptr_t stackMark; |
+ WebKit::Platform::attachThread(&stackMark); |
-+ WebKit::Platform::markCurrentThreadPaused(); |
++ WebKit::Platform::enterSafePoint(); |
+ message_loop->AddTaskObserver(new ThreadManager); |
+ base::Thread::Run(message_loop); |
+ } |
@@ -749,7 +749,7 @@ index c615405..670df69 100644 |
void TestWebKitPlatformSupport::serveAsynchronousMockedRequests() { |
url_loader_factory_.ServeAsynchronousRequests(); |
-+ WebKit::Platform::markCurrentThreadResumed(); |
++ WebKit::Platform::leaveSafePoint(); |
} |
WebKit::WebString TestWebKitPlatformSupport::webKitRootDir() { |
@@ -816,11 +816,11 @@ index 03fb552..a5697d7 100644 |
+}; |
+ |
+void WebKitTestListener::OnTestStart(const testing::TestInfo& test_info) { |
-+ WebKit::Platform::markCurrentThreadResumed(); |
++ WebKit::Platform::leaveSafePoint(); |
+} |
+ |
+void WebKitTestListener::OnTestEnd(const testing::TestInfo& test_info) { |
-+ WebKit::Platform::markCurrentThreadPaused(); |
++ WebKit::Platform::enterSafePoint(); |
+} |
+ |
+} // namespace |