| Index: third_party/WebKit/Source/core/Init.h
|
| diff --git a/third_party/WebKit/Source/core/Init.h b/third_party/WebKit/Source/core/Init.h
|
| index e527a936d2cbb312b3b130f0d9d7ba0d78f62cf4..fd33dafc75402e8cf1c6a8d02e8cafd5a92922cb 100644
|
| --- a/third_party/WebKit/Source/core/Init.h
|
| +++ b/third_party/WebKit/Source/core/Init.h
|
| @@ -38,23 +38,22 @@ namespace blink {
|
|
|
| class CORE_EXPORT CoreInitializer {
|
| USING_FAST_MALLOC(CoreInitializer);
|
| + WTF_MAKE_NONCOPYABLE(CoreInitializer);
|
| public:
|
| - CoreInitializer() : m_isInited(false) { }
|
| + CoreInitializer() : m_isInitialized(false) { }
|
| + virtual ~CoreInitializer() { }
|
| +
|
| // Should be called by clients before trying to create Frames.
|
| virtual void init();
|
| -
|
| - static void terminateThreads();
|
| -
|
| - // FIXME: Why is this function static?
|
| - static void shutdown();
|
| + virtual void shutdown();
|
|
|
| protected:
|
| - bool isInitialized() const { return m_isInited; }
|
| + bool isInitialized() const { return m_isInitialized; }
|
|
|
| private:
|
| void registerEventFactory();
|
|
|
| - bool m_isInited;
|
| + bool m_isInitialized;
|
| };
|
|
|
| } // namespace blink
|
|
|