| Index: Source/core/events/CompositionEvent.h
|
| diff --git a/Source/core/events/CompositionEvent.h b/Source/core/events/CompositionEvent.h
|
| index dfb89190ea5ff8a8bff65083e3434438c42fe996..aaa8aba4fdf151ff275d8372027d6a1af65696af 100644
|
| --- a/Source/core/events/CompositionEvent.h
|
| +++ b/Source/core/events/CompositionEvent.h
|
| @@ -27,7 +27,6 @@
|
| #ifndef CompositionEvent_h
|
| #define CompositionEvent_h
|
|
|
| -#include "core/editing/CompositionUnderline.h"
|
| #include "core/events/CompositionEventInit.h"
|
| #include "core/events/UIEvent.h"
|
|
|
| @@ -41,9 +40,9 @@ public:
|
| return adoptRefWillBeNoop(new CompositionEvent);
|
| }
|
|
|
| - static PassRefPtrWillBeRawPtr<CompositionEvent> create(const AtomicString& type, PassRefPtrWillBeRawPtr<AbstractView> view, const String& data, const Vector<CompositionUnderline>& underlines)
|
| + static PassRefPtrWillBeRawPtr<CompositionEvent> create(const AtomicString& type, PassRefPtrWillBeRawPtr<AbstractView> view, const String& data)
|
| {
|
| - return adoptRefWillBeNoop(new CompositionEvent(type, view, data, underlines));
|
| + return adoptRefWillBeNoop(new CompositionEvent(type, view, data));
|
| }
|
|
|
| static PassRefPtrWillBeRawPtr<CompositionEvent> create(const AtomicString& type, const CompositionEventInit& initializer)
|
| @@ -56,9 +55,6 @@ public:
|
| void initCompositionEvent(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtrWillBeRawPtr<AbstractView>, const String& data);
|
|
|
| String data() const { return m_data; }
|
| - int activeSegmentStart() const { return m_activeSegmentStart; }
|
| - int activeSegmentEnd() const { return m_activeSegmentEnd; }
|
| - const Vector<unsigned>& getSegments() const { return m_segments; }
|
|
|
| virtual const AtomicString& interfaceName() const override;
|
|
|
| @@ -66,14 +62,10 @@ public:
|
|
|
| private:
|
| CompositionEvent();
|
| - CompositionEvent(const AtomicString& type, PassRefPtrWillBeRawPtr<AbstractView>, const String&, const Vector<CompositionUnderline>& underlines);
|
| + CompositionEvent(const AtomicString& type, PassRefPtrWillBeRawPtr<AbstractView>, const String&);
|
| CompositionEvent(const AtomicString& type, const CompositionEventInit&);
|
| - void initializeSegments(const Vector<CompositionUnderline>* = 0);
|
|
|
| String m_data;
|
| - int m_activeSegmentStart;
|
| - int m_activeSegmentEnd;
|
| - Vector<unsigned> m_segments;
|
| };
|
|
|
| } // namespace blink
|
|
|