diff options
author | blundell <blundell@chromium.org> | 2015-01-19 09:18:33 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-01-19 17:19:27 +0000 |
commit | 70fb54767b472a5edfb859e489beeeec7abdb0e4 (patch) | |
tree | 28e534ec774391a9f6571a1770e12a0d63ebf833 /mojo/public/python/src/common.h | |
parent | ba5f0233fa38f949e24f6274ba891fa652eab640 (diff) | |
download | chromium_src-70fb54767b472a5edfb859e489beeeec7abdb0e4.zip chromium_src-70fb54767b472a5edfb859e489beeeec7abdb0e4.tar.gz chromium_src-70fb54767b472a5edfb859e489beeeec7abdb0e4.tar.bz2 |
Move //mojo/{public, edk} underneath //third_party
This CL move //mojo/public and //mojo/edk to live in the following locations:
- //third_party/mojo/src/mojo/public
- //third_party/mojo/src/mojo/edk
It moves the related gypfiles from //mojo to //third_party/mojo and updates
them as necessary to account for the file moves. It also updates clients of the
mojo SDK and EDK targets in both GYP and GN. (Note that for GN, the mojo SDK
and EDK build systems are maintained in the Mojo repo and designed to be
flexible wrt the location of the SDK/EDK in a client repo, so no changes are
needed.
This CL does not update include paths to the code being moved to limit the
number of moving parts, instead relying on the include_dirs that the SDK and
EDK targets supply to their direct dependents to ensure that include paths
continue to resolve correctly.
NOPRESUBMIT=true
Review URL: https://codereview.chromium.org/814543006
Cr-Commit-Position: refs/heads/master@{#312129}
Diffstat (limited to 'mojo/public/python/src/common.h')
-rw-r--r-- | mojo/public/python/src/common.h | 103 |
1 files changed, 0 insertions, 103 deletions
diff --git a/mojo/public/python/src/common.h b/mojo/public/python/src/common.h deleted file mode 100644 index 03ed73b..0000000 --- a/mojo/public/python/src/common.h +++ /dev/null @@ -1,103 +0,0 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef MOJO_PUBLIC_PYTHON_SRC_COMMON_H_ -#define MOJO_PUBLIC_PYTHON_SRC_COMMON_H_ - -#include <Python.h> - -#include <map> - -#include "mojo/public/c/environment/async_waiter.h" -#include "mojo/public/cpp/bindings/callback.h" -#include "mojo/public/cpp/bindings/lib/shared_ptr.h" -#include "mojo/public/cpp/system/core.h" - -namespace mojo { -namespace python { - -class ScopedGIL { - public: - ScopedGIL(); - - ~ScopedGIL(); - - private: - PyGILState_STATE state_; - - MOJO_DISALLOW_COPY_AND_ASSIGN(ScopedGIL); -}; - -enum ScopedPyRefAcquire { - kAcquire, -}; - -class ScopedPyRef { - public: - explicit ScopedPyRef(PyObject* object); - ScopedPyRef(PyObject* object, ScopedPyRefAcquire); - - ~ScopedPyRef(); - - operator PyObject*() const; - - private: - PyObject* object_; - - MOJO_DISALLOW_COPY_AND_ASSIGN(ScopedPyRef); -}; - - -class PythonClosure : public mojo::Closure::Runnable { - public: - PythonClosure(PyObject* callable, const mojo::Closure& quit); - ~PythonClosure(); - - void Run() const override; - - private: - ScopedPyRef callable_; - const mojo::Closure quit_; - - MOJO_DISALLOW_COPY_AND_ASSIGN(PythonClosure); -}; - -// Create a mojo::Closure from a callable python object. -Closure::Runnable* NewRunnableFromCallable(PyObject* callable, - const Closure& quit_closure); - -// AsyncWaiter for python, used to execute a python closure after waiting. If an -// error occurs while executing the closure, the current message loop will be -// exited. See |AsyncWaiter| in mojo/public/c/environment/async_waiter.h for -// more details. -class PythonAsyncWaiter { - public: - explicit PythonAsyncWaiter(const mojo::Closure& quit_closure); - ~PythonAsyncWaiter(); - MojoAsyncWaitID AsyncWait(MojoHandle handle, - MojoHandleSignals signals, - MojoDeadline deadline, - PyObject* callable); - - void CancelWait(MojoAsyncWaitID wait_id); - - private: - class AsyncWaiterRunnable; - - typedef std::map<MojoAsyncWaitID, - internal::SharedPtr<mojo::Callback<void(MojoResult)> > > - CallbackMap; - - CallbackMap callbacks_; - const MojoAsyncWaiter* async_waiter_; - const mojo::Closure quit_; - - MOJO_DISALLOW_COPY_AND_ASSIGN(PythonAsyncWaiter); -}; - -} // namespace python -} // namespace mojo - -#endif // MOJO_PUBLIC_PYTHON_SRC_COMMON_H_ - |