Bug 1296990 - Make AppearanceString() return nsAutoString directly. r?mtseng draft
authorTing-Yu Lin <tlin@mozilla.com>
Sun, 21 Aug 2016 21:41:32 +0800
changeset 403734 74aa3f0f20cb80496b6499bb189adc7c76ab1575
parent 403581 f97a056ae6235de7855fd8aaa04fb1c8d183bd06
child 528985 95c17740ad90a7e1a0c010814fbed752adda85dd
push id26996
push userbmo:tlin@mozilla.com
push dateMon, 22 Aug 2016 02:46:50 +0000
reviewersmtseng
bugs1296990
milestone51.0a1
Bug 1296990 - Make AppearanceString() return nsAutoString directly. r?mtseng MozReview-Commit-ID: IQ3KrFnCswx
layout/base/AccessibleCaret.cpp
layout/base/AccessibleCaret.h
--- a/layout/base/AccessibleCaret.cpp
+++ b/layout/base/AccessibleCaret.cpp
@@ -137,17 +137,17 @@ AccessibleCaret::SetSelectionBarEnabled(
   ErrorResult rv;
   CaretElement()->ClassList()->Toggle(NS_LITERAL_STRING("no-bar"),
                                       Optional<bool>(!aEnabled), rv);
   MOZ_ASSERT(!rv.Failed());
 
   mSelectionBarEnabled = aEnabled;
 }
 
-/* static */ nsString
+/* static */ nsAutoString
 AccessibleCaret::AppearanceString(Appearance aAppearance)
 {
   nsAutoString string;
   switch (aAppearance) {
   case Appearance::None:
   case Appearance::NormalNotShown:
     string = NS_LITERAL_STRING("none");
     break;
--- a/layout/base/AccessibleCaret.h
+++ b/layout/base/AccessibleCaret.h
@@ -176,18 +176,18 @@ protected:
 
   nsIFrame* RootFrame() const
   {
     return mPresShell->GetRootFrame();
   }
 
   nsIFrame* CustomContentContainerFrame() const;
 
-  // Transform Appearance to CSS class name in ua.css.
-  static nsString AppearanceString(Appearance aAppearance);
+  // Transform Appearance to CSS id used in ua.css.
+  static nsAutoString AppearanceString(Appearance aAppearance);
 
   already_AddRefed<dom::Element> CreateCaretElement(nsIDocument* aDocument) const;
 
   // Inject caret element into custom content container.
   void InjectCaretElement(nsIDocument* aDocument);
 
   // Remove caret element from custom content container.
   void RemoveCaretElement(nsIDocument* aDocument);