Index: Source/core/html/ime/InputMethodContext.h |
diff --git a/Source/core/html/ime/InputMethodContext.h b/Source/core/html/ime/InputMethodContext.h |
index 2aeea390d384b6e5b73268c6b33d903fbe36aab4..7440115a00888b75a87118f00af86c3d6665b660 100644 |
--- a/Source/core/html/ime/InputMethodContext.h |
+++ b/Source/core/html/ime/InputMethodContext.h |
@@ -46,13 +46,19 @@ class ExecutionContext; |
class InputMethodController; |
class Node; |
-class InputMethodContext FINAL : public ScriptWrappable, public EventTargetWithInlineData { |
+class InputMethodContext FINAL : public NoBaseWillBeRefCountedGarbageCollected<InputMethodContext>, public ScriptWrappable, public EventTargetWithInlineData { |
+ WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(InputMethodContext); |
public: |
- static PassOwnPtr<InputMethodContext> create(HTMLElement*); |
+ static PassOwnPtrWillBeRawPtr<InputMethodContext> create(HTMLElement*); |
virtual ~InputMethodContext(); |
+#if ENABLE(OILPAN) |
+ using RefCountedGarbageCollected<InputMethodContext>::ref; |
+ using RefCountedGarbageCollected<InputMethodContext>::deref; |
+#else |
void ref() { m_element->ref(); } |
void deref() { m_element->deref(); } |
+#endif |
haraken
2014/05/27 01:39:19
Can you avoid writing this by using REFCOUNTED_EVE
zerny-chromium
2014/05/27 07:34:33
Not without some #if hacking since InputMethodCont
|
String locale() const; |
HTMLElement* target() const; |
@@ -76,6 +82,8 @@ public: |
void dispatchCandidateWindowUpdateEvent(); |
void dispatchCandidateWindowHideEvent(); |
+ virtual void trace(Visitor*) OVERRIDE; |
+ |
private: |
InputMethodContext(HTMLElement*); |
bool hasFocus() const; |
@@ -85,7 +93,7 @@ private: |
virtual void refEventTarget() OVERRIDE { ref(); } |
virtual void derefEventTarget() OVERRIDE { deref(); } |
- HTMLElement* m_element; |
+ RawPtrWillBeMember<HTMLElement> m_element; |
Vector<unsigned> m_segments; |
}; |