[oilpan] Rename PauseScope to SafePointScope

Source/oilpan-chromium.patch

 diff --git a/base/threading/platform_thread.h b/base/threading/platform_thread.h
 index 576695a..24c400e 100644
 --- a/base/threading/platform_thread.h
 +++ b/base/threading/platform_thread.h
 @@ -76,6 +76,15 @@ class BASE_EXPORT PlatformThread {
    // Gets the thread name, if previously set by SetName.
    static const char* GetName();
  
 +  // Sets the thread stack start address for this thread. This is used
 +  // to pass the thread stack start to webkit for conservative stack
@@ skipping 657 matching lines @@
 +    ThreadManager() : processing_(false) { }
 +    ~ThreadManager() { CHECK(processing_ == false); }
 + #endif
 +
 +    // This method is called before processing a task.
 +    virtual void WillProcessTask(const base::PendingTask& pending_task) {
 + #ifndef NDEBUG
 +      CHECK(processing_ == false);
 +      processing_ = true;
 + #endif
-+      WebKit::Platform::markCurrentThreadResumed();
++      WebKit::Platform::leaveSafePoint();
 +    }
 +
 +    // This method is called after processing a task.
 +    virtual void DidProcessTask(const base::PendingTask& pending_task) {
 + #ifndef NDEBUG
 +      processing_ = false;
 + #endif
-+      WebKit::Platform::markCurrentThreadPaused();
++      WebKit::Platform::enterSafePoint();
 +    }
 +
 +   private:
 + #ifndef NDEBUG
 +    bool processing_;
 + #endif
 +  };
 +
 +  virtual void CleanUp() OVERRIDE {
 +    WebKit::Platform::detachThread();
 +  }
 +
 +  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);
 +  }
 +};
 +
 +
 +WebThreadImpl::WebThreadImpl(const char* name, bool usesBlink)
 +               : thread_(usesBlink ? new BlinkThread(name) : new base::Thread(name)) {
    thread_->Start();
  }
@@ skipping 29 matching lines @@
  
 -  WebKit::initialize(this);
 +  WebKit::initialize(this, start_of_stack);
    WebKit::setLayoutTestMode(true);
    WebKit::WebSecurityPolicy::registerURLSchemeAsLocal(
        WebKit::WebString::fromUTF8("test-shell-resource"));
 @@ -517,13 +518,13 @@ void TestWebKitPlatformSupport::unregisterAllMockedURLs() {
  
  void TestWebKitPlatformSupport::serveAsynchronousMockedRequests() {
    url_loader_factory_.ServeAsynchronousRequests();
-+  WebKit::Platform::markCurrentThreadResumed();
++  WebKit::Platform::leaveSafePoint();
  }
  
  WebKit::WebString TestWebKitPlatformSupport::webKitRootDir() {
    return webkit_support::GetWebKitRootDir();
  }
  
 -
  WebKit::WebLayerTreeView*
      TestWebKitPlatformSupport::createLayerTreeViewForTesting() {
    scoped_ptr<WebLayerTreeViewImplForTesting> view(
@@ skipping 46 matching lines @@
  
 +namespace {
 +
 +class WebKitTestListener : public testing::EmptyTestEventListener {
 + public:
 +  virtual void OnTestStart(const testing::TestInfo& test_info);
 +  virtual void OnTestEnd(const testing::TestInfo& test_info);
 +};
 +
 +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
 +
 +
  void SetUpTestEnvironmentImpl(bool unit_test_mode,
 -                              WebKit::Platform* shadow_platform_delegate) {
 +                              WebKit::Platform* shadow_platform_delegate,
 +                              intptr_t* start_of_stack) {
    base::debug::EnableInProcessStackDumping();
@@ skipping 105 matching lines @@
 +++ b/webkit/tools/test_shell/test_shell_webkit_init.h
 @@ -30,7 +30,7 @@
  
  class TestShellWebKitInit : public webkit_glue::WebKitPlatformSupportImpl {
   public:
 -  explicit TestShellWebKitInit(bool layout_test_mode);
 +  TestShellWebKitInit(bool layout_test_mode, intptr_t* stack_start);
    virtual ~TestShellWebKitInit();
  
    virtual WebKit::WebMimeRegistry* mimeRegistry() OVERRIDE;