Attachment 8795623 Details for Bug 1282408

[patch] Add ignore-initialization-check annotation to mSpeakAs from CustomCounterStyle

add-ignore-initialization-check-flag-for-mSpeakAs-from-CustomCounterStyle (text/plain), 4.78 KB, created by Paul Bignier

(hide)

Description:

Filename:

MIME Type:

Creator: Paul Bignier

Size: 4.78 KB

patch

obsolete

># HG changeset patch
># User Paul Bignier <paul.bignier@gmail.com>
># Date 1475045418 -7200
>#      Wed Sep 28 08:50:18 2016 +0200
># Node ID 179bafd4f0de65dd2268854f61213d351b2c6e51
># Parent  66a77b9bfe5dcacd50eccf85de7c0e7e15ce0ffd
>Bug 1282408 - Add ignore-initialization-check annotation to mSpeakAs from CustomCounterStyle
>
>diff --git a/layout/style/CounterStyleManager.cpp b/layout/style/CounterStyleManager.cpp
>--- a/layout/style/CounterStyleManager.cpp
>+++ b/layout/style/CounterStyleManager.cpp
>@@ -215,17 +215,17 @@ DecimalToText(CounterValue aOrdinal, nsS
>   return true;
> }
> 
> // We know cjk-ideographic need 31 characters to display 99,999,999,999,999,999
> // georgian needs 6 at most
> // armenian needs 12 at most
> // hebrew may need more...
> 
>-#define NUM_BUF_SIZE 34 
>+#define NUM_BUF_SIZE 34
> 
> enum CJKIdeographicLang {
>   CHINESE, KOREAN, JAPANESE
> };
> struct CJKIdeographicData {
>   char16_t digit[10];
>   char16_t unit[3];
>   char16_t unit10K[2];
>@@ -391,17 +391,17 @@ CJKIdeographicToText(CounterValue aOrdin
>     aOrdinal /= 10;
>     pos++;
>   } while (aOrdinal > 0);
>   aResult.Assign(buf + idx, NUM_BUF_SIZE - idx);
>   return true;
> }
> 
> #define HEBREW_GERESH       0x05F3
>-static const char16_t gHebrewDigit[22] = 
>+static const char16_t gHebrewDigit[22] =
> {
>   //   1       2       3       4       5       6       7       8       9
>   0x05D0, 0x05D1, 0x05D2, 0x05D3, 0x05D4, 0x05D5, 0x05D6, 0x05D7, 0x05D8,
>   //  10      20      30      40      50      60      70      80      90
>   0x05D9, 0x05DB, 0x05DC, 0x05DE, 0x05E0, 0x05E1, 0x05E2, 0x05E4, 0x05E6,
>   // 100     200     300     400
>   0x05E7, 0x05E8, 0x05E9, 0x05EA
> };
>@@ -442,21 +442,21 @@ HebrewToText(CounterValue aOrdinal, nsSu
>         n2 = 9;
>         thousandsGroup.Append(gHebrewDigit[ n2 - 1]);
>       } else {
>         n2 = n3 - (n3 % 10);
>         thousandsGroup.Append(gHebrewDigit[(n2/10)-1+9]);
>       } // if
>       n3 -= n2;
>     } // if
>-  
>-    // Process digit for 1 - 9 
>+
>+    // Process digit for 1 - 9
>     if ( n3 > 0)
>       thousandsGroup.Append(gHebrewDigit[n3-1]);
>-    if (outputSep) 
>+    if (outputSep)
>       thousandsGroup.Append((char16_t)HEBREW_GERESH);
>     if (allText.IsEmpty())
>       allText = thousandsGroup;
>     else
>       allText = thousandsGroup + allText;
>     aOrdinal /= 1000;
>     outputSep = true;
>   } while (aOrdinal >= 1);
>@@ -635,17 +635,17 @@ BuiltinCounterStyle::GetPrefix(nsSubstri
> 
> /* virtual */ void
> BuiltinCounterStyle::GetSuffix(nsSubstring& aResult)
> {
>   switch (mStyle) {
>     case NS_STYLE_LIST_STYLE_NONE:
>       aResult.Truncate();
>       break;
>- 
>+
>     case NS_STYLE_LIST_STYLE_DISC:
>     case NS_STYLE_LIST_STYLE_CIRCLE:
>     case NS_STYLE_LIST_STYLE_SQUARE:
>     case NS_STYLE_LIST_STYLE_DISCLOSURE_CLOSED:
>     case NS_STYLE_LIST_STYLE_DISCLOSURE_OPEN:
>     case NS_STYLE_LIST_STYLE_ETHIOPIC_NUMERIC:
>       aResult = ' ';
>       break;
>@@ -942,36 +942,36 @@ BuiltinCounterStyle::GetInitialCounterTe
>       return CJKIdeographicToText(aOrdinal, aResult, gDataJapaneseFormal);
>     case NS_STYLE_LIST_STYLE_KOREAN_HANGUL_FORMAL:
>       return CJKIdeographicToText(aOrdinal, aResult, gDataKoreanHangulFormal);
>     case NS_STYLE_LIST_STYLE_KOREAN_HANJA_INFORMAL:
>       return CJKIdeographicToText(aOrdinal, aResult, gDataKoreanHanjaInformal);
>     case NS_STYLE_LIST_STYLE_KOREAN_HANJA_FORMAL:
>       return CJKIdeographicToText(aOrdinal, aResult, gDataKoreanHanjaFormal);
> 
>-    case NS_STYLE_LIST_STYLE_HEBREW: 
>+    case NS_STYLE_LIST_STYLE_HEBREW:
>       aIsRTL = true;
>       return HebrewToText(aOrdinal, aResult);
>- 
>+
>     case NS_STYLE_LIST_STYLE_ETHIOPIC_NUMERIC:
>       return EthiopicToText(aOrdinal, aResult);
> 
>     default:
>       NS_NOTREACHED("Unknown builtin counter style");
>       return false;
>   }
> }
> 
> class DependentBuiltinCounterStyle final : public BuiltinCounterStyle
> {
> private:
>   ~DependentBuiltinCounterStyle() {}
> public:
>   DependentBuiltinCounterStyle(int32_t aStyle, CounterStyleManager* aManager)
>-    : BuiltinCounterStyle(aStyle), 
>+    : BuiltinCounterStyle(aStyle),
>       mManager(aManager)
>   {
>     NS_ASSERTION(IsDependentStyle(), "Not a dependent builtin style");
>     MOZ_ASSERT(!IsCustomStyle(), "Not a builtin style");
>   }
> 
>   virtual CounterStyle* GetFallback() override;
> 
>@@ -1140,17 +1140,18 @@ private:
>   // is owned by nsPresContext, and will be released after all nodes and
>   // frames are released.
>   CounterStyleManager* mManager;
> 
>   RefPtr<nsCSSCounterStyleRule> mRule;
>   uint32_t mRuleGeneration;
> 
>   uint8_t mSystem;
>-  uint8_t mSpeakAs;
>+  // GetSpeakAs will ensure that private member mSpeakAs is initialized before used
>+  MOZ_INIT_OUTSIDE_CTOR uint8_t mSpeakAs;
> 
>   enum {
>     // loop detection
>     FLAG_EXTENDS_VISITED = 1 << 0,
>     FLAG_EXTENDS_LOOP    = 1 << 1,
>     FLAG_SPEAKAS_VISITED  = 1 << 2,
>     FLAG_SPEAKAS_LOOP     = 1 << 3,
>     // field status

Flags:

xidorn: review+

Actions: View | Diff | Review

Attachments on bug 1282408: 8765437 | 8765842 | 8765844 | 8765891 | 8765901 | 8766283 | 8766288 | 8774695 | 8774702 | 8774704 | 8774727 | 8774738 | 8775045 | 8775107 | 8775117 | 8775121 | 8775130 | 8775139 | 8775141 | 8775519 | 8775560 | 8775577 | 8775599 | 8783946 | 8783955 | 8783956 | 8783963 | 8786330 | 8786345 | 8787093 | 8790295 | 8790304 | 8790645 | 8790699 | 8790702 | 8790731 | 8791536 | 8791622 | 8791937 | 8792801 | 8794853 | 8794855 | 8795169 | 8795228 | 8795236 | 8795246 | 8795282 | 8795333 | 8795623 | 8795632 | 8795642 | 8795644 | 8795690 | 8796067 | 8796100