Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(176)

Unified Diff: ppapi/cpp/ime_input_event.h

Issue 18671004: PPAPI: Move IMEInputEvent and TextInput to stable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressing comments Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ppapi/cpp/ime_input_event.h
diff --git a/ppapi/cpp/dev/ime_input_event_dev.h b/ppapi/cpp/ime_input_event.h
similarity index 86%
rename from ppapi/cpp/dev/ime_input_event_dev.h
rename to ppapi/cpp/ime_input_event.h
index f9126aa4a1ba6517aaa69eaabdb6ba4eb7ff441f..630a242cb8972e07a5232a1dad1ee1a441d088f0 100644
--- a/ppapi/cpp/dev/ime_input_event_dev.h
+++ b/ppapi/cpp/ime_input_event.h
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef PPAPI_CPP_DEV_IME_INPUT_EVENT_DEV_H_
-#define PPAPI_CPP_DEV_IME_INPUT_EVENT_DEV_H_
+#ifndef PPAPI_CPP_IME_INPUT_EVENT_H_
+#define PPAPI_CPP_IME_INPUT_EVENT_H_
#include <utility>
#include <vector>
-#include "ppapi/c/dev/ppb_ime_input_event_dev.h"
+#include "ppapi/c/ppb_ime_input_event.h"
#include "ppapi/cpp/input_event.h"
/// @file
@@ -18,17 +18,17 @@ namespace pp {
class Var;
-class IMEInputEvent_Dev : public InputEvent {
+class IMEInputEvent : public InputEvent {
public:
/// Constructs an is_null() IME input event object.
- IMEInputEvent_Dev();
+ IMEInputEvent();
/// Constructs an IME input event object from the provided generic input
/// event. If the given event is itself is_null() or is not an IME input
/// event, the object will be is_null().
///
/// @param[in] event A generic input event.
- explicit IMEInputEvent_Dev(const InputEvent& event);
+ explicit IMEInputEvent(const InputEvent& event);
/// This constructor manually constructs an IME event from the provided
/// parameters.
@@ -50,7 +50,7 @@ class IMEInputEvent_Dev : public InputEvent {
/// <code>GetTargetSegment</code>.
///
/// @param[in] selection The range returned by <code>GetSelection</code>.
- IMEInputEvent_Dev(const InstanceHandle& instance,
+ IMEInputEvent(const InstanceHandle& instance,
PP_InputEvent_Type type,
PP_TimeTicks time_stamp,
const Var& text,
@@ -68,15 +68,15 @@ class IMEInputEvent_Dev : public InputEvent {
///
/// @return The number of segments. For events other than COMPOSITION_UPDATE,
/// returns 0.
- uint32_t GetSegmentNumber() const;
+ uint32_t GetSegmentCount() const;
/// Returns the position of the index-th segmentation point in the composition
/// text. The position is given by a byte-offset (not a character-offset) of
/// the string returned by GetText(). It always satisfies
/// 0=GetSegmentOffset(0) < ... < GetSegmentOffset(i) < GetSegmentOffset(i+1)
- /// < ... < GetSegmentOffset(GetSegmentNumber())=(byte-length of GetText()).
+ /// < ... < GetSegmentOffset(GetSegmentCount())=(byte-length of GetText()).
/// Note that [GetSegmentOffset(i), GetSegmentOffset(i+1)) represents the
- /// range of the i-th segment, and hence GetSegmentNumber() can be a valid
+ /// range of the i-th segment, and hence GetSegmentCount() can be a valid
/// argument to this function instead of an off-by-1 error.
///
/// @param[in] ime_event A <code>PP_Resource</code> corresponding to an IME
@@ -103,4 +103,4 @@ class IMEInputEvent_Dev : public InputEvent {
} // namespace pp
-#endif // PPAPI_CPP_DEV_IME_INPUT_EVENT_DEV_H_
+#endif // PPAPI_CPP_IME_INPUT_EVENT_H_

Powered by Google App Engine
This is Rietveld 408576698