Clean Up: Remove mozc.candidate attachment field handling. (issue 11358033)

no...@chromium.org

unread,

Nov 2, 2012, 5:06:27 AM11/2/12

to sat...@chromium.org, chromium...@chromium.org, stevenj...@chromium.org, oshima...@chromium.org, hsu...@chromium.org

Reviewers: satorux1,

Description:
Clean Up: Remove mozc.candidate attachment field handling.

With new Mozc candidates structure, mozc.candidate attachment field is no
longer
necessary.
show_window_at_composition should be handled instead.

BUG=129403
TEST=ran chromeos_unittests.

Please review this at http://codereview.chromium.org/11358033/

SVN Base: svn://svn.chromium.org/chrome/trunk/src

Affected files:
M chromeos/dbus/ibus/ibus_lookup_table.h
M chromeos/dbus/ibus/ibus_lookup_table.cc
M chromeos/dbus/ibus/ibus_lookup_table_unittest.cc

Index: chromeos/dbus/ibus/ibus_lookup_table.cc
diff --git a/chromeos/dbus/ibus/ibus_lookup_table.cc
b/chromeos/dbus/ibus/ibus_lookup_table.cc
index
0c732451d920d39cb818e77b8ed6cd1b9b3e90cc..21b894a4bcdf9b3b78a3b669a9ea3a4ce56b4618
100644
--- a/chromeos/dbus/ibus/ibus_lookup_table.cc
+++ b/chromeos/dbus/ibus/ibus_lookup_table.cc
@@ -78,7 +78,7 @@ bool PopIBusLookupTable(dbus::MessageReader* reader,
IBusLookupTable* table) {
<< "The 1st dictionary entry should be string.";
return false;
}
- if (key != "mozc.candidates")
+ if (key != "show_window_at_composition")
continue;

dbus::MessageReader variant_reader(NULL);
@@ -95,16 +95,11 @@ bool PopIBusLookupTable(dbus::MessageReader* reader,
IBusLookupTable* table) {
return false;
}

- uint8* bytes = NULL;
- size_t length = 0;
- if (!sub_variant_reader.PopArrayOfBytes(&bytes, &length)) {
- LOG(ERROR) << "Invalid mozc.candidates structure: "
- << "The mozc.candidates contains array of bytes.";
- return false;
- }
+ bool show_window_at_composition = false;
+ if (!sub_variant_reader.PopBool(&show_window_at_composition))
+ continue; // Ignores other field.

- table->set_serialized_mozc_candidates_data(
- std::string(reinterpret_cast<char*>(bytes), length));
+ table->set_show_window_at_composition(show_window_at_composition);
}

uint32 page_size = 0;
Index: chromeos/dbus/ibus/ibus_lookup_table.h
diff --git a/chromeos/dbus/ibus/ibus_lookup_table.h
b/chromeos/dbus/ibus/ibus_lookup_table.h
index
c9a57e1e1712115305565f3c977369d5f4526cf4..d8abfd9e3abbd0af4150ad7d632a7f795e304c81
100644
--- a/chromeos/dbus/ibus/ibus_lookup_table.h
+++ b/chromeos/dbus/ibus/ibus_lookup_table.h
@@ -29,9 +29,8 @@ namespace ibus {
// string "IBusLookupTable"
// array [
// dict_entry (
-// string "mozc.candidates"
-// variant variant array of bytes [
-// 08 01 10 16 ...
+// string "window_show_at_composition"
+// variant variant boolean false
// ]
// )
// ]
@@ -123,12 +122,9 @@ class CHROMEOS_EXPORT IBusLookupTable {
const std::vector<Entry>& candidates() const { return candidates_; }
std::vector<Entry>* mutable_candidates() { return &candidates_; }

- const std::string& serialized_mozc_candidates_data() {
- return serialized_mozc_candidates_data_;
- }
- void set_serialized_mozc_candidates_data(
- const std::string& serialized_mozc_candidates_data) {
- serialized_mozc_candidates_data_ = serialized_mozc_candidates_data;
+ bool show_window_at_composition() { return show_window_at_composition_; }
+ void set_show_window_at_composition(bool show_window_at_composition) {
+ show_window_at_composition_ = show_window_at_composition;
}

private:
@@ -137,9 +133,7 @@ class CHROMEOS_EXPORT IBusLookupTable {
bool is_cursor_visible_;
Orientation orientation_;
std::vector<Entry> candidates_;
-
- // TODO(nona): Refine data structure(crbug.com/129403).
- std::string serialized_mozc_candidates_data_;
+ bool show_window_at_composition_;

DISALLOW_COPY_AND_ASSIGN(IBusLookupTable);
};
Index: chromeos/dbus/ibus/ibus_lookup_table_unittest.cc
diff --git a/chromeos/dbus/ibus/ibus_lookup_table_unittest.cc
b/chromeos/dbus/ibus/ibus_lookup_table_unittest.cc
index
420cac099380209b2151e76d68ba5e50bbae44a6..78bde2a74f3bd1e33fbbbd524ebc01a87b9afab5
100644
--- a/chromeos/dbus/ibus/ibus_lookup_table_unittest.cc
+++ b/chromeos/dbus/ibus/ibus_lookup_table_unittest.cc
@@ -130,8 +130,7 @@ TEST(IBusLookupTable, ReadMozcCandidateTest) {
const bool kIsCursorVisible = true;
const IBusLookupTable::Orientation kOrientation =
IBusLookupTable::IBUS_LOOKUP_TABLE_ORIENTATION_VERTICAL;
- const uint8 kSampleBuffer[] = {0x00, 0x11, 0x22, 0x33, 0x44, 0x55};
- const size_t kSampleBufferLength = 6UL;
+ const bool kShowWindowAtComposition = false;

// Create IBusLookupTable.
scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
@@ -147,12 +146,12 @@ TEST(IBusLookupTable, ReadMozcCandidateTest) {
contents_writer.OpenArray("{sv}", &attachment_array_writer);
dbus::MessageWriter entry_writer(NULL);
attachment_array_writer.OpenDictEntry(&entry_writer);
- entry_writer.AppendString("mozc.candidates");
+ entry_writer.AppendString("show_window_at_composition");
dbus::MessageWriter variant_writer(NULL);
entry_writer.OpenVariant("v", &variant_writer);
dbus::MessageWriter sub_variant_writer(NULL);
- variant_writer.OpenVariant("ay", &sub_variant_writer);
- sub_variant_writer.AppendArrayOfBytes(kSampleBuffer,
kSampleBufferLength);
+ variant_writer.OpenVariant("b", &sub_variant_writer);
+ sub_variant_writer.AppendBool(kShowWindowAtComposition);

// Close attachment field container.
variant_writer.CloseContainer(&sub_variant_writer);
@@ -198,10 +197,8 @@ TEST(IBusLookupTable, ReadMozcCandidateTest) {
EXPECT_EQ(kSampleText2, target_lookup_table.candidates().at(1).value);
EXPECT_EQ(kSampleLabel1, target_lookup_table.candidates().at(0).label);
EXPECT_EQ(kSampleLabel2, target_lookup_table.candidates().at(1).label);
- const std::string expected_binary(
- reinterpret_cast<const char*>(kSampleBuffer), kSampleBufferLength);
- EXPECT_EQ(expected_binary,
- target_lookup_table.serialized_mozc_candidates_data());
+ EXPECT_EQ(kShowWindowAtComposition,
+ target_lookup_table.show_window_at_composition());
}

} // namespace ibus