| Index: Source/core/html/ime/InputMethodContext.h
|
| diff --git a/Source/core/html/ime/InputMethodContext.h b/Source/core/html/ime/InputMethodContext.h
|
| index 7440115a00888b75a87118f00af86c3d6665b660..d2b7978bc40ba802c960c3523f3191f621ea820d 100644
|
| --- a/Source/core/html/ime/InputMethodContext.h
|
| +++ b/Source/core/html/ime/InputMethodContext.h
|
| @@ -52,10 +52,7 @@ public:
|
| static PassOwnPtrWillBeRawPtr<InputMethodContext> create(HTMLElement*);
|
| virtual ~InputMethodContext();
|
|
|
| -#if ENABLE(OILPAN)
|
| - using RefCountedGarbageCollected<InputMethodContext>::ref;
|
| - using RefCountedGarbageCollected<InputMethodContext>::deref;
|
| -#else
|
| +#if !ENABLE(OILPAN)
|
| void ref() { m_element->ref(); }
|
| void deref() { m_element->deref(); }
|
| #endif
|
| @@ -90,8 +87,10 @@ private:
|
| CompositionUnderline selectedSegment() const;
|
| InputMethodController& inputMethodController() const;
|
|
|
| +#if !ENABLE(OILPAN)
|
| virtual void refEventTarget() OVERRIDE { ref(); }
|
| virtual void derefEventTarget() OVERRIDE { deref(); }
|
| +#endif
|
|
|
| RawPtrWillBeMember<HTMLElement> m_element;
|
| Vector<unsigned> m_segments;
|
|
|