Merge up to 8597 to experimental/gc from the bleeding edge.

src/extensions/experimental/collator.cc

 // Copyright 2011 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
 //       with the distribution.
 //     * Neither the name of Google Inc. nor the names of its
 //       contributors may be used to endorse or promote products derived
 //       from this software without specific prior written permission.
 //
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "collator.h"
+#include "src/extensions/experimental/collator.h"
 
 #include "unicode/coll.h"
 #include "unicode/locid.h"
 #include "unicode/ucol.h"
 
 namespace v8 {
 namespace internal {
 
 v8::Persistent<v8::FunctionTemplate> Collator::collator_template_;
 
@@ skipping 107 matching lines @@
   // by a caller in JavaScript. Otherwise, we don't touch because
   // we don't want to change the locale-dependent default value.
   // The three options below are very likely to have the same default
   // across locales, but I haven't checked them all. Others we may add
   // in the future have certainly locale-dependent default (e.g.
   // caseFirst is upperFirst for Danish while is off for most other locales).
 
   bool ignore_case, ignore_accents, numeric;
 
   if (ExtractBooleanOption(options, "ignoreCase", &ignore_case)) {
+    // We need to explicitly set the level to secondary to get case ignored.
+    // The default L3 ignores UCOL_CASE_LEVEL == UCOL_OFF !
+    if (ignore_case) {
+      collator->setStrength(icu::Collator::SECONDARY);
+    }
     collator->setAttribute(UCOL_CASE_LEVEL, ignore_case ? UCOL_OFF : UCOL_ON,
                            status);
     if (U_FAILURE(status)) {
       delete collator;
       return ThrowExceptionForICUError("Failed to set ignoreCase.");
     }
   }
 
   // Accents are taken into account with strength secondary or higher.
   if (ExtractBooleanOption(options, "ignoreAccents", &ignore_accents)) {
@@ skipping 42 matching lines @@
   // Set collator as internal field of the resulting JS object.
   wrapper->SetPointerInInternalField(0, collator);
 
   // Make object handle weak so we can delete iterator once GC kicks in.
   wrapper.MakeWeak(NULL, DeleteCollator);
 
   return wrapper;
 }
 
 } }  // namespace v8::internal
-