diff --git a/editor/libeditor/tests/test_bug1026397.html b/editor/libeditor/tests/test_bug1026397.html index 46906ede345..487f3e87f8e 100644 --- a/editor/libeditor/tests/test_bug1026397.html +++ b/editor/libeditor/tests/test_bug1026397.html @@ -51,7 +51,7 @@ function runTests() { "string": aInsertString, "clauses": [ - { "length": aInsertString.length, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": aInsertString.length, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": aInsertString.length, "length": 0 } diff --git a/editor/libeditor/tests/test_bug1109465.html b/editor/libeditor/tests/test_bug1109465.html index 2b6635ae213..dc31e9bf037 100644 --- a/editor/libeditor/tests/test_bug1109465.html +++ b/editor/libeditor/tests/test_bug1109465.html @@ -47,7 +47,7 @@ SimpleTest.waitForFocus(function() { { "string": composingString, "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } diff --git a/editor/libeditor/tests/test_bug697842.html b/editor/libeditor/tests/test_bug697842.html index d7661ff4d2e..463ff76dc9d 100644 --- a/editor/libeditor/tests/test_bug697842.html +++ b/editor/libeditor/tests/test_bug697842.html @@ -64,7 +64,7 @@ function runTests() { "string": composingString, "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -77,7 +77,7 @@ function runTests() { "string": composingString, "clauses": [ - { "length": 2, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 2, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 2, "length": 0 } @@ -90,7 +90,7 @@ function runTests() "clauses": [ { "length": 2, - "attr": COMPOSITION_ATTR_SELECTEDCONVERTEDTEXT } + "attr": COMPOSITION_ATTR_SELECTED_CLAUSE } ] }, "caret": { "start": 2, "length": 0 } diff --git a/editor/libeditor/tests/test_bug795785.html b/editor/libeditor/tests/test_bug795785.html index b1689e03bdd..afedad2bfe1 100644 --- a/editor/libeditor/tests/test_bug795785.html +++ b/editor/libeditor/tests/test_bug795785.html @@ -126,7 +126,7 @@ function doCompositionTest(aElement, aElementDescription, aCallback) composition: { string: str, clauses: [ - { length: str.length, attr: COMPOSITION_ATTR_RAWINPUT } + { length: str.length, attr: COMPOSITION_ATTR_RAW_CLAUSE } ] }, caret: { start: str.length, length: 0 } diff --git a/editor/libeditor/tests/test_contenteditable_text_input_handling.html b/editor/libeditor/tests/test_contenteditable_text_input_handling.html index c3dae673ac6..cb5bd341e4f 100644 --- a/editor/libeditor/tests/test_contenteditable_text_input_handling.html +++ b/editor/libeditor/tests/test_contenteditable_text_input_handling.html @@ -225,7 +225,7 @@ function runTests() { "string": "\u3089", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } diff --git a/layout/base/tests/bug613807-1.html b/layout/base/tests/bug613807-1.html index 01d86c4925a..145ea5603ca 100644 --- a/layout/base/tests/bug613807-1.html +++ b/layout/base/tests/bug613807-1.html @@ -51,7 +51,7 @@ { composition: { string: "\u306D", clauses: [ - { length: 1, attr: domWindowUtils.COMPOSITION_ATTR_RAWINPUT } + { length: 1, attr: COMPOSITION_ATTR_RAW_CLAUSE } ] }, caret: { start: 1, length: 0 } @@ -60,7 +60,7 @@ { composition: { string: "\u306D\u3053", clauses: [ - { length: 2, attr: domWindowUtils.COMPOSITION_ATTR_RAWINPUT } + { length: 2, attr: COMPOSITION_ATTR_RAW_CLAUSE } ] }, caret: { start: 2, length: 0 } @@ -71,7 +71,7 @@ { composition: { string: "\u732B", clauses: [ - { length: 1, attr: domWindowUtils.COMPOSITION_ATTR_SELECTEDCONVERTEDTEXT } + { length: 1, attr: COMPOSITION_ATTR_SELECTED_CLAUSE } ] }, caret: { start: 1, length: 0 } diff --git a/testing/mochitest/tests/Harness_sanity/test_sanityEventUtils.html b/testing/mochitest/tests/Harness_sanity/test_sanityEventUtils.html index 763d3071c67..07efaaf4d09 100644 --- a/testing/mochitest/tests/Harness_sanity/test_sanityEventUtils.html +++ b/testing/mochitest/tests/Harness_sanity/test_sanityEventUtils.html @@ -133,7 +133,7 @@ function starttest() { { "string": "a", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } diff --git a/testing/mochitest/tests/SimpleTest/EventUtils.js b/testing/mochitest/tests/SimpleTest/EventUtils.js index 1da52ca5abb..dc3f0afd587 100644 --- a/testing/mochitest/tests/SimpleTest/EventUtils.js +++ b/testing/mochitest/tests/SimpleTest/EventUtils.js @@ -865,12 +865,14 @@ function _getDOMWindowUtils(aWindow) getInterface(_EU_Ci.nsIDOMWindowUtils); } -// Must be synchronized with nsITextInputProcessor. -// TODO: Rename constants with new names defined in nsITextInputProcessor. -const COMPOSITION_ATTR_RAWINPUT = 0x02; -const COMPOSITION_ATTR_SELECTEDRAWTEXT = 0x03; -const COMPOSITION_ATTR_CONVERTEDTEXT = 0x04; -const COMPOSITION_ATTR_SELECTEDCONVERTEDTEXT = 0x05; +const COMPOSITION_ATTR_RAW_CLAUSE = + _EU_Ci.nsITextInputProcessor.ATTR_RAW_CLAUSE; +const COMPOSITION_ATTR_SELECTED_RAW_CLAUSE = + _EU_Ci.nsITextInputProcessor.ATTR_SELECTED_RAW_CLAUSE; +const COMPOSITION_ATTR_CONVERTED_CLAUSE = + _EU_Ci.nsITextInputProcessor.ATTR_CONVERTED_CLAUSE; +const COMPOSITION_ATTR_SELECTED_CLAUSE = + _EU_Ci.nsITextInputProcessor.ATTR_SELECTED_CLAUSE; function _getTIP(aWindow) { diff --git a/toolkit/content/tests/chrome/file_autocomplete_with_composition.js b/toolkit/content/tests/chrome/file_autocomplete_with_composition.js index 993630d3612..fe1127017d4 100644 --- a/toolkit/content/tests/chrome/file_autocomplete_with_composition.js +++ b/toolkit/content/tests/chrome/file_autocomplete_with_composition.js @@ -92,7 +92,7 @@ nsDoTestsForAutoCompleteWithComposition.prototype = { { "string": "M", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -107,7 +107,7 @@ nsDoTestsForAutoCompleteWithComposition.prototype = { { "string": "Mo", "clauses": [ - { "length": 2, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 2, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 2, "length": 0 } @@ -132,7 +132,7 @@ nsDoTestsForAutoCompleteWithComposition.prototype = { { "string": "z", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -147,7 +147,7 @@ nsDoTestsForAutoCompleteWithComposition.prototype = { { "string": "zi", "clauses": [ - { "length": 2, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 2, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 2, "length": 0 } @@ -171,7 +171,7 @@ nsDoTestsForAutoCompleteWithComposition.prototype = { { "string": "l", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -186,7 +186,7 @@ nsDoTestsForAutoCompleteWithComposition.prototype = { { "string": "ll", "clauses": [ - { "length": 2, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 2, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 2, "length": 0 } @@ -228,7 +228,7 @@ nsDoTestsForAutoCompleteWithComposition.prototype = { { "string": "z", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -243,7 +243,7 @@ nsDoTestsForAutoCompleteWithComposition.prototype = { { "string": "zi", "clauses": [ - { "length": 2, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 2, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 2, "length": 0 } @@ -290,7 +290,7 @@ nsDoTestsForAutoCompleteWithComposition.prototype = { { "string": "M", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -305,7 +305,7 @@ nsDoTestsForAutoCompleteWithComposition.prototype = { { "string": "Mo", "clauses": [ - { "length": 2, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 2, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 2, "length": 0 } @@ -352,7 +352,7 @@ nsDoTestsForAutoCompleteWithComposition.prototype = { { "string": "M", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -367,7 +367,7 @@ nsDoTestsForAutoCompleteWithComposition.prototype = { { "string": "Mo", "clauses": [ - { "length": 2, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 2, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 2, "length": 0 } @@ -417,7 +417,7 @@ nsDoTestsForAutoCompleteWithComposition.prototype = { { "string": "z", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -432,7 +432,7 @@ nsDoTestsForAutoCompleteWithComposition.prototype = { { "string": "zi", "clauses": [ - { "length": 2, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 2, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 2, "length": 0 } @@ -479,7 +479,7 @@ nsDoTestsForAutoCompleteWithComposition.prototype = { { "string": "M", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -494,7 +494,7 @@ nsDoTestsForAutoCompleteWithComposition.prototype = { { "string": "Mo", "clauses": [ - { "length": 2, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 2, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 2, "length": 0 } diff --git a/toolkit/content/tests/chrome/findbar_window.xul b/toolkit/content/tests/chrome/findbar_window.xul index 369c608b00c..48938b7bde5 100644 --- a/toolkit/content/tests/chrome/findbar_window.xul +++ b/toolkit/content/tests/chrome/findbar_window.xul @@ -259,7 +259,7 @@ { "string": searchStr, "clauses": [ - { "length": searchStr.length, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": searchStr.length, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": searchStr.length, "length": 0 } diff --git a/widget/tests/test_assign_event_data.html b/widget/tests/test_assign_event_data.html index 4c3e206fbdb..0aab14cb50f 100644 --- a/widget/tests/test_assign_event_data.html +++ b/widget/tests/test_assign_event_data.html @@ -179,7 +179,7 @@ const kTests = [ { "string": "\u306D", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -201,7 +201,7 @@ const kTests = [ { "string": "\u306D", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -308,7 +308,7 @@ const kTests = [ { "string": "\u30E9\u30FC\u30E1\u30F3", "clauses": [ - { "length": 4, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 4, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 4, "length": 0 } diff --git a/widget/tests/test_imestate.html b/widget/tests/test_imestate.html index 9fdd4cfc08b..099ff194605 100644 --- a/widget/tests/test_imestate.html +++ b/widget/tests/test_imestate.html @@ -1242,7 +1242,7 @@ function runEditorFlagChangeTests() { "string": "\u3078\u3093\u3057\u3093", "clauses": [ - { "length": 4, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 4, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 4, "length": 0 } diff --git a/widget/tests/test_input_events_on_deactive_window.xul b/widget/tests/test_input_events_on_deactive_window.xul index 3e907e020d5..f821dede49f 100644 --- a/widget/tests/test_input_events_on_deactive_window.xul +++ b/widget/tests/test_input_events_on_deactive_window.xul @@ -160,7 +160,7 @@ function startTests() { "string": "\u3089", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } diff --git a/widget/tests/window_composition_text_querycontent.xul b/widget/tests/window_composition_text_querycontent.xul index 45fa16985b6..478e3e2bd0c 100644 --- a/widget/tests/window_composition_text_querycontent.xul +++ b/widget/tests/window_composition_text_querycontent.xul @@ -196,7 +196,7 @@ function runUndoRedoTest() { "string": "\u306D", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -207,7 +207,7 @@ function runUndoRedoTest() { "string": "\u306D\u3053", "clauses": [ - { "length": 2, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 2, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 2, "length": 0 } @@ -220,7 +220,7 @@ function runUndoRedoTest() "clauses": [ { "length": 1, - "attr": COMPOSITION_ATTR_SELECTEDCONVERTEDTEXT } + "attr": COMPOSITION_ATTR_SELECTED_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -235,7 +235,7 @@ function runUndoRedoTest() { "string": "\u307E", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -250,7 +250,7 @@ function runUndoRedoTest() { "string": "\u3080", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -261,7 +261,7 @@ function runUndoRedoTest() { "string": "\u3080\u3059", "clauses": [ - { "length": 2, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 2, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 2, "length": 0 } @@ -272,7 +272,7 @@ function runUndoRedoTest() { "string": "\u3080\u3059\u3081", "clauses": [ - { "length": 3, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 3, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 3, "length": 0 } @@ -285,7 +285,7 @@ function runUndoRedoTest() "clauses": [ { "length": 1, - "attr": COMPOSITION_ATTR_SELECTEDCONVERTEDTEXT } + "attr": COMPOSITION_ATTR_SELECTED_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -333,7 +333,7 @@ function runUndoRedoTest() { "string": "\u3088", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -344,7 +344,7 @@ function runUndoRedoTest() { "string": "\u3088\u3046", "clauses": [ - { "length": 2, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 2, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 2, "length": 0 } @@ -355,7 +355,7 @@ function runUndoRedoTest() { "string": "\u3088\u3046\u304b", "clauses": [ - { "length": 3, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 3, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 3, "length": 0 } @@ -366,7 +366,7 @@ function runUndoRedoTest() { "string": "\u3088\u3046\u304b\u3044", "clauses": [ - { "length": 4, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 4, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 4, "length": 0 } @@ -378,7 +378,7 @@ function runUndoRedoTest() { "string": "\u5996\u602a", "clauses": [ - { "length": 2, "attr": COMPOSITION_ATTR_SELECTEDCONVERTEDTEXT } + { "length": 2, "attr": COMPOSITION_ATTR_SELECTED_CLAUSE } ] }, "caret": { "start": 2, "length": 0 } @@ -581,7 +581,7 @@ function runCompositionCommitAsIsTest() { "string": "\u3042", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -604,7 +604,7 @@ function runCompositionCommitAsIsTest() { "string": "\u3042", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -638,7 +638,7 @@ function runCompositionCommitAsIsTest() { "string": "\u3042", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -698,7 +698,7 @@ function runCompositionCommitTest() { "string": "\u3042", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -721,7 +721,7 @@ function runCompositionCommitTest() { "string": "\u3042", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -755,7 +755,7 @@ function runCompositionCommitTest() { "string": "\u3042", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -789,7 +789,7 @@ function runCompositionCommitTest() { "string": "\u3042", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -824,7 +824,7 @@ function runCompositionCommitTest() { "string": "\u3042", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -847,7 +847,7 @@ function runCompositionCommitTest() { "string": "\u3042", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -900,7 +900,7 @@ function runCompositionTest() { "string": "\u3089", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -924,7 +924,7 @@ function runCompositionTest() { "string": "\u3089\u30FC", "clauses": [ - { "length": 2, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 2, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 2, "length": 0 } @@ -957,7 +957,7 @@ function runCompositionTest() { "string": "\u3089\u30FC\u3081", "clauses": [ - { "length": 3, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 3, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 3, "length": 0 } @@ -990,7 +990,7 @@ function runCompositionTest() { "string": "\u3089\u30FC\u3081", "clauses": [ - { "length": 3, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 3, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 2, "length": 0 } @@ -1024,7 +1024,7 @@ function runCompositionTest() { "string": "\u3089\u30FC\u3081", "clauses": [ - { "length": 3, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 3, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -1057,7 +1057,7 @@ function runCompositionTest() { "string": "\u3089\u30FC\u3081\u3093", "clauses": [ - { "length": 4, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 4, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 4, "length": 0 } @@ -1075,7 +1075,7 @@ function runCompositionTest() { "string": "\u3089\u30FC\u3081", "clauses": [ - { "length": 3, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 3, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 3, "length": 0 } @@ -1092,7 +1092,7 @@ function runCompositionTest() { "string": "\u3089\u30FC\u3081\u3093", "clauses": [ - { "length": 4, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 4, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 4, "length": 0 } @@ -1108,7 +1108,7 @@ function runCompositionTest() { "string": "\u3089\u30FC\u3081\u3093\u3055", "clauses": [ - { "length": 5, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 5, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 5, "length": 0 } @@ -1124,7 +1124,7 @@ function runCompositionTest() { "string": "\u3089\u30FC\u3081\u3093\u3055\u3044", "clauses": [ - { "length": 6, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 6, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 6, "length": 0 } @@ -1140,7 +1140,7 @@ function runCompositionTest() { "string": "\u3089\u30FC\u3081\u3093\u3055\u3044\u3053", "clauses": [ - { "length": 7, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 7, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 7, "length": 0 } @@ -1156,7 +1156,7 @@ function runCompositionTest() { "string": "\u3089\u30FC\u3081\u3093\u3055\u3044\u3053\u3046", "clauses": [ - { "length": 8, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 8, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 8, "length": 0 } @@ -1175,9 +1175,9 @@ function runCompositionTest() "clauses": [ { "length": 4, - "attr": COMPOSITION_ATTR_SELECTEDCONVERTEDTEXT }, + "attr": COMPOSITION_ATTR_SELECTED_CLAUSE }, { "length": 2, - "attr": COMPOSITION_ATTR_CONVERTEDTEXT } + "attr": COMPOSITION_ATTR_CONVERTED_CLAUSE } ] }, "caret": { "start": 4, "length": 0 } @@ -1196,9 +1196,9 @@ function runCompositionTest() "clauses": [ { "length": 4, - "attr": COMPOSITION_ATTR_CONVERTEDTEXT }, + "attr": COMPOSITION_ATTR_CONVERTED_CLAUSE }, { "length": 2, - "attr": COMPOSITION_ATTR_SELECTEDCONVERTEDTEXT } + "attr": COMPOSITION_ATTR_SELECTED_CLAUSE } ] }, "caret": { "start": 6, "length": 0 } @@ -1217,9 +1217,9 @@ function runCompositionTest() "clauses": [ { "length": 5, - "attr": COMPOSITION_ATTR_SELECTEDCONVERTEDTEXT }, + "attr": COMPOSITION_ATTR_SELECTED_CLAUSE }, { "length": 3, - "attr": COMPOSITION_ATTR_CONVERTEDTEXT } + "attr": COMPOSITION_ATTR_CONVERTED_CLAUSE } ] }, "caret": { "start": 5, "length": 0 } @@ -1269,7 +1269,7 @@ function runCompositionTest() { "string": "\u3057", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -1286,7 +1286,7 @@ function runCompositionTest() { "string": "\u3058", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -1303,7 +1303,7 @@ function runCompositionTest() { "string": "\u3058\u3087", "clauses": [ - { "length": 2, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 2, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 2, "length": 0 } @@ -1320,7 +1320,7 @@ function runCompositionTest() { "string": "\u3058\u3087\u3046", "clauses": [ - { "length": 3, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 3, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 3, "length": 0 } @@ -1355,7 +1355,7 @@ function runCompositionTest() { "string": "\u304A", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -1391,7 +1391,7 @@ function runCompositionTest() { "string": "\u3046", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -1523,7 +1523,7 @@ function runCompositionTest() { "string": "\u6700", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -1694,7 +1694,7 @@ function runCompositionEventTest() { "string": "\u3089", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -1745,7 +1745,7 @@ function runCompositionEventTest() { "string": "\u3089\u30FC", "clauses": [ - { "length": 2, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 2, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 2, "length": 0 } @@ -1828,7 +1828,7 @@ function runCompositionEventTest() { "string": "\u3089", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -1895,7 +1895,7 @@ function runCompositionEventTest() { "string": "\u306D", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -1964,7 +1964,7 @@ function runCompositionEventTest() { "string": "\u306E", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -2336,7 +2336,7 @@ function runForceCommitTest() { "string": "\u306E", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -2387,7 +2387,7 @@ function runForceCommitTest() { "string": "\u306E", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -2430,7 +2430,7 @@ function runForceCommitTest() { "string": "\u306E", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -2470,7 +2470,7 @@ function runForceCommitTest() { "string": "\u306E", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -2514,7 +2514,7 @@ function runForceCommitTest() { "string": "\u306E", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -2558,7 +2558,7 @@ function runForceCommitTest() { "string": "\u306E", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -2603,7 +2603,7 @@ function runForceCommitTest() { "string": "\u306E", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -2647,7 +2647,7 @@ function runForceCommitTest() { "string": "\u306E", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -2689,7 +2689,7 @@ function runForceCommitTest() { "string": "\u306E", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -2736,7 +2736,7 @@ function runForceCommitTest() { "string": "\u306E", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -2847,7 +2847,7 @@ function runIsComposingTest() { "string": "\u3042", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -2898,7 +2898,7 @@ function runRemoveContentTest(aCallback) { "string": "\u306E", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -2994,7 +2994,7 @@ function runTestOnAnotherContext(aPanelOrFrame, aFocusedEditor, aTestName) { "string": "\u3078\u3093\u3057\u3093", "clauses": [ - { "length": 4, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 4, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 4, "length": 0 } @@ -3012,7 +3012,7 @@ function runTestOnAnotherContext(aPanelOrFrame, aFocusedEditor, aTestName) "clauses": [ { "length": 2, - "attr": COMPOSITION_ATTR_SELECTEDCONVERTEDTEXT } + "attr": COMPOSITION_ATTR_SELECTED_CLAUSE } ] }, "caret": { "start": 2, "length": 0 } @@ -3030,7 +3030,7 @@ function runTestOnAnotherContext(aPanelOrFrame, aFocusedEditor, aTestName) "clauses": [ { "length": 2, - "attr": COMPOSITION_ATTR_SELECTEDCONVERTEDTEXT } + "attr": COMPOSITION_ATTR_SELECTED_CLAUSE } ] }, "caret": { "start": 2, "length": 0 } @@ -3132,7 +3132,7 @@ function runMaxLengthTest() { "string": "\u3089", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -3149,7 +3149,7 @@ function runMaxLengthTest() { "string": "\u3089\u30FC", "clauses": [ - { "length": 2, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 2, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 2, "length": 0 } @@ -3166,7 +3166,7 @@ function runMaxLengthTest() { "string": "\u3089\u30FC\u3081", "clauses": [ - { "length": 3, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 3, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 3, "length": 0 } @@ -3183,7 +3183,7 @@ function runMaxLengthTest() { "string": "\u3089\u30FC\u3081\u3093", "clauses": [ - { "length": 4, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 4, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 4, "length": 0 } @@ -3201,7 +3201,7 @@ function runMaxLengthTest() { "string": "\u3089\u30FC\u3081", "clauses": [ - { "length": 3, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 3, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 3, "length": 0 } @@ -3218,7 +3218,7 @@ function runMaxLengthTest() { "string": "\u3089\u30FC\u3081\u3093", "clauses": [ - { "length": 4, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 4, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 4, "length": 0 } @@ -3234,7 +3234,7 @@ function runMaxLengthTest() { "string": "\u3089\u30FC\u3081\u3093\u3055", "clauses": [ - { "length": 5, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 5, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 5, "length": 0 } @@ -3250,7 +3250,7 @@ function runMaxLengthTest() { "string": "\u3089\u30FC\u3081\u3093\u3055\u3044", "clauses": [ - { "length": 6, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 6, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 6, "length": 0 } @@ -3266,7 +3266,7 @@ function runMaxLengthTest() { "string": "\u3089\u30FC\u3081\u3093\u3055\u3044\u3053", "clauses": [ - { "length": 7, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 7, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 7, "length": 0 } @@ -3283,7 +3283,7 @@ function runMaxLengthTest() { "string": "\u3089\u30FC\u3081\u3093\u3055\u3044\u3053\u3046", "clauses": [ - { "length": 8, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 8, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 8, "length": 0 } @@ -3302,9 +3302,9 @@ function runMaxLengthTest() "clauses": [ { "length": 4, - "attr": COMPOSITION_ATTR_SELECTEDCONVERTEDTEXT }, + "attr": COMPOSITION_ATTR_SELECTED_CLAUSE }, { "length": 2, - "attr": COMPOSITION_ATTR_CONVERTEDTEXT } + "attr": COMPOSITION_ATTR_CONVERTED_CLAUSE } ] }, "caret": { "start": 4, "length": 0 } @@ -3328,7 +3328,7 @@ function runMaxLengthTest() { "string": "\u3057", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -3387,7 +3387,7 @@ function runMaxLengthTest() { "string": "\u9B54", "clauses": [ - { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 1, "length": 0 } @@ -3414,7 +3414,7 @@ function runMaxLengthTest() { "string": "\u9B54\u6CD5", "clauses": [ - { "length": 2, "attr": COMPOSITION_ATTR_RAWINPUT } + { "length": 2, "attr": COMPOSITION_ATTR_RAW_CLAUSE } ] }, "caret": { "start": 2, "length": 0 }