| Index: Source/WebKit/chromium/src/WebKit.cpp
|
| diff --git a/Source/WebKit/chromium/src/WebKit.cpp b/Source/WebKit/chromium/src/WebKit.cpp
|
| index 7590eaa9184a4596da5a44643fbe20fd53360039..a1becec3d63102b880d0be3f9d3113cbedf9de55 100644
|
| --- a/Source/WebKit/chromium/src/WebKit.cpp
|
| +++ b/Source/WebKit/chromium/src/WebKit.cpp
|
| @@ -93,9 +93,9 @@ public:
|
| virtual void willProcessTask()
|
| {
|
| // FIXME(oilpan): instead of managing this state in the willProcessTask we need
|
| - // to explicitly manage paused state in the event loop itself.
|
| - if (!m_nesting && WebCore::ThreadState::MainThreadState()->isPaused())
|
| - WebCore::ThreadState::MainThreadState()->resumed();
|
| + // to explicitly manage thread state in the event loop itself.
|
| + if (!m_nesting && WebCore::ThreadState::MainThreadState()->isInSafePoint())
|
| + WebCore::ThreadState::MainThreadState()->leaveSafePoint();
|
|
|
| m_nesting++;
|
| }
|
| @@ -108,7 +108,7 @@ public:
|
|
|
| if (!m_nesting) {
|
| WebCore::ThreadState* threadState = WebCore::ThreadState::MainThreadState();
|
| - threadState->paused(WebCore::ThreadState::NoHeapPointersOnStack);
|
| + threadState->enterSafePoint(WebCore::ThreadState::NoHeapPointersOnStack);
|
| }
|
| }
|
|
|
|
|