Attachment #805630: patch for bug #916871

View | Details | Raw Unified | Return to bug 916871
Collapse All | Expand All

(-)a/dom/base/nsDOMClassInfo.cpp (-6 lines)
Line     Link Here 
 Lines 349-366   static nsDOMClassInfoData sClassInfoData Link Here 
349 
  NS_DEFINE_CLASSINFO_DATA(CSSImportRule, nsDOMGenericSH,
 349 
  NS_DEFINE_CLASSINFO_DATA(CSSImportRule, nsDOMGenericSH,
350 
                           DOM_DEFAULT_SCRIPTABLE_FLAGS)
 350 
                           DOM_DEFAULT_SCRIPTABLE_FLAGS)
351 
  NS_DEFINE_CLASSINFO_DATA(CSSMediaRule, nsDOMGenericSH,
 351 
  NS_DEFINE_CLASSINFO_DATA(CSSMediaRule, nsDOMGenericSH,
352 
                           DOM_DEFAULT_SCRIPTABLE_FLAGS)
 352 
                           DOM_DEFAULT_SCRIPTABLE_FLAGS)
353 
  NS_DEFINE_CLASSINFO_DATA(CSSNameSpaceRule, nsDOMGenericSH,
 353 
  NS_DEFINE_CLASSINFO_DATA(CSSNameSpaceRule, nsDOMGenericSH,
354 
                           DOM_DEFAULT_SCRIPTABLE_FLAGS)
 354 
                           DOM_DEFAULT_SCRIPTABLE_FLAGS)
355 
  NS_DEFINE_CLASSINFO_DATA(CSSRuleList, nsCSSRuleListSH,
 355 
  NS_DEFINE_CLASSINFO_DATA(CSSRuleList, nsCSSRuleListSH,
356 
                           ARRAY_SCRIPTABLE_FLAGS)
 356 
                           ARRAY_SCRIPTABLE_FLAGS)
357 
  NS_DEFINE_CLASSINFO_DATA(CSSGroupRuleRuleList, nsCSSRuleListSH,
358 
                           ARRAY_SCRIPTABLE_FLAGS)
359 
  NS_DEFINE_CLASSINFO_DATA(MediaList, nsMediaListSH,
 357 
  NS_DEFINE_CLASSINFO_DATA(MediaList, nsMediaListSH,
360 
                           ARRAY_SCRIPTABLE_FLAGS)
 358 
                           ARRAY_SCRIPTABLE_FLAGS)
361 
  NS_DEFINE_CLASSINFO_DATA(StyleSheetList, nsStyleSheetListSH,
 359 
  NS_DEFINE_CLASSINFO_DATA(StyleSheetList, nsStyleSheetListSH,
362 
                           ARRAY_SCRIPTABLE_FLAGS)
 360 
                           ARRAY_SCRIPTABLE_FLAGS)
363 
  NS_DEFINE_CLASSINFO_DATA(CSSStyleSheet, nsDOMGenericSH,
 361 
  NS_DEFINE_CLASSINFO_DATA(CSSStyleSheet, nsDOMGenericSH,
364 
                           DOM_DEFAULT_SCRIPTABLE_FLAGS)
 362 
                           DOM_DEFAULT_SCRIPTABLE_FLAGS)
365 

          363
          

        

        

          366
          
  NS_DEFINE_CLASSINFO_DATA(Selection, nsDOMGenericSH,

          364
          
  NS_DEFINE_CLASSINFO_DATA(Selection, nsDOMGenericSH,

        

  

    

    

       Lines 1120-1139
      nsDOMClassInfo::Init()
    
  Link Here 
    

  

        

          1120
          
  DOM_CLASSINFO_MAP_BEGIN_NO_CLASS_IF(CSSNameSpaceRule, nsIDOMCSSRule)

          1118
          
  DOM_CLASSINFO_MAP_BEGIN_NO_CLASS_IF(CSSNameSpaceRule, nsIDOMCSSRule)

        

        

          1121
          
    DOM_CLASSINFO_MAP_ENTRY(nsIDOMCSSRule)

          1119
          
    DOM_CLASSINFO_MAP_ENTRY(nsIDOMCSSRule)

        

        

          1122
          
  DOM_CLASSINFO_MAP_END

          1120
          
  DOM_CLASSINFO_MAP_END

        

        

          1123
          

          1121
          

        

        

          1124
          
  DOM_CLASSINFO_MAP_BEGIN(CSSRuleList, nsIDOMCSSRuleList)

          1122
          
  DOM_CLASSINFO_MAP_BEGIN(CSSRuleList, nsIDOMCSSRuleList)

        

        

          1125
          
    DOM_CLASSINFO_MAP_ENTRY(nsIDOMCSSRuleList)

          1123
          
    DOM_CLASSINFO_MAP_ENTRY(nsIDOMCSSRuleList)

        

        

          1126
          
  DOM_CLASSINFO_MAP_END

          1124
          
  DOM_CLASSINFO_MAP_END

        

        

          1127
          

          1125
          

        

            

              1128
              
  DOM_CLASSINFO_MAP_BEGIN_NO_CLASS_IF(CSSGroupRuleRuleList, nsIDOMCSSRuleList)

              
              
            

            

              1129
              
    DOM_CLASSINFO_MAP_ENTRY(nsIDOMCSSRuleList)

            

            

              1130
              
  DOM_CLASSINFO_MAP_END

            

            

              1131
              

            

        

          1132
          
  DOM_CLASSINFO_MAP_BEGIN(MediaList, nsIDOMMediaList)

          1126
          
  DOM_CLASSINFO_MAP_BEGIN(MediaList, nsIDOMMediaList)

        

        

          1133
          
    DOM_CLASSINFO_MAP_ENTRY(nsIDOMMediaList)

          1127
          
    DOM_CLASSINFO_MAP_ENTRY(nsIDOMMediaList)

        

        

          1134
          
  DOM_CLASSINFO_MAP_END

          1128
          
  DOM_CLASSINFO_MAP_END

        

        

          1135
          

          1129
          

        

        

          1136
          
  DOM_CLASSINFO_MAP_BEGIN(StyleSheetList, nsIDOMStyleSheetList)

          1130
          
  DOM_CLASSINFO_MAP_BEGIN(StyleSheetList, nsIDOMStyleSheetList)

        

        

          1137
          
    DOM_CLASSINFO_MAP_ENTRY(nsIDOMStyleSheetList)

          1131
          
    DOM_CLASSINFO_MAP_ENTRY(nsIDOMStyleSheetList)

        

        

          1138
          
  DOM_CLASSINFO_MAP_END

          1132
          
  DOM_CLASSINFO_MAP_END

        

        

          1139
          

          1133
          

        



(-)a/dom/base/nsDOMClassInfoClasses.h
      (-1 lines)




  

    

    

      Line 
      
    
  Link Here 
    

  

  

    

    

       Lines 14-30
      DOMCI_CLASS(DeviceRotationRate)
    
  Link Here 
    

  

        

          14
          

          14
          

        

        

          15
          
// CSS classes

          15
          
// CSS classes

        

        

          16
          
DOMCI_CLASS(CSSStyleRule)

          16
          
DOMCI_CLASS(CSSStyleRule)

        

        

          17
          
DOMCI_CLASS(CSSCharsetRule)

          17
          
DOMCI_CLASS(CSSCharsetRule)

        

        

          18
          
DOMCI_CLASS(CSSImportRule)

          18
          
DOMCI_CLASS(CSSImportRule)

        

        

          19
          
DOMCI_CLASS(CSSMediaRule)

          19
          
DOMCI_CLASS(CSSMediaRule)

        

        

          20
          
DOMCI_CLASS(CSSNameSpaceRule)

          20
          
DOMCI_CLASS(CSSNameSpaceRule)

        

        

          21
          
DOMCI_CLASS(CSSRuleList)

          21
          
DOMCI_CLASS(CSSRuleList)

        

            

              22
              
DOMCI_CLASS(CSSGroupRuleRuleList)

              
              
            

        

          23
          
DOMCI_CLASS(MediaList)

          22
          
DOMCI_CLASS(MediaList)

        

        

          24
          
DOMCI_CLASS(StyleSheetList)

          23
          
DOMCI_CLASS(StyleSheetList)

        

        

          25
          
DOMCI_CLASS(CSSStyleSheet)

          24
          
DOMCI_CLASS(CSSStyleSheet)

        

        

          26
          

          25
          

        

        

          27
          
// Range classes

          26
          
// Range classes

        

        

          28
          
DOMCI_CLASS(Selection)

          27
          
DOMCI_CLASS(Selection)

        

        

          29
          

          28
          

        

        

          30
          
// XUL classes

          29
          
// XUL classes

        



(-)a/dom/tests/mochitest/general/test_interfaces.html
      (-1 lines)




  

    

    

      Line 
      
    
  Link Here 
    

  

  

    

    

       Lines 129-145
      var interfaceNamesInGlobalScope =
    
  Link Here 
    

  

        

          129
          
    "Crypto",

          129
          
    "Crypto",

        

        

          130
          
    "CSS",

          130
          
    "CSS",

        

        

          131
          
    "CSS2Properties",

          131
          
    "CSS2Properties",

        

        

          132
          
    "CSSCharsetRule",

          132
          
    "CSSCharsetRule",

        

        

          133
          
    "CSSConditionRule",

          133
          
    "CSSConditionRule",

        

        

          134
          
    "CSSFontFaceRule",

          134
          
    "CSSFontFaceRule",

        

        

          135
          
    {name: "CSSFontFeatureValuesRule", release: false},

          135
          
    {name: "CSSFontFeatureValuesRule", release: false},

        

        

          136
          
    "CSSGroupingRule",

          136
          
    "CSSGroupingRule",

        

            

              137
              
    "CSSGroupRuleRuleList",

              
              
            

        

          138
          
    "CSSImportRule",

          137
          
    "CSSImportRule",

        

        

          139
          
    "CSSMediaRule",

          138
          
    "CSSMediaRule",

        

        

          140
          
    "CSSMozDocumentRule",

          139
          
    "CSSMozDocumentRule",

        

        

          141
          
    "CSSNameSpaceRule",

          140
          
    "CSSNameSpaceRule",

        

        

          142
          
    "CSSPageRule",

          141
          
    "CSSPageRule",

        

        

          143
          
    "CSSPrimitiveValue",

          142
          
    "CSSPrimitiveValue",

        

        

          144
          
    "CSSRule",

          143
          
    "CSSRule",

        

        

          145
          
    "CSSRuleList",

          144
          
    "CSSRuleList",

        



(-)a/layout/style/nsCSSRules.cpp
      (-5 / +2 lines)




  

    

    

      Line 
      
    
  Link Here 
    

  

  

    

    

       Lines 156-177
      GroupRuleRuleList::GroupRuleRuleList(Gro
    
  Link Here 
    

  

        

          156
          
  // The rule will tell us when its going away.

          156
          
  // The rule will tell us when its going away.

        

        

          157
          
  mGroupRule = aGroupRule;

          157
          
  mGroupRule = aGroupRule;

        

        

          158
          
}

          158
          
}

        

        

          159
          

          159
          

        

        

          160
          
GroupRuleRuleList::~GroupRuleRuleList()

          160
          
GroupRuleRuleList::~GroupRuleRuleList()

        

        

          161
          
{

          161
          
{

        

        

          162
          
}

          162
          
}

        

        

          163
          

          163
          

        

          
            

              164
              
// QueryInterface implementation for CSSGroupRuleRuleList


              164
              
// QueryInterface implementation for GroupRuleRuleList

            

        

          165
          
NS_INTERFACE_MAP_BEGIN(GroupRuleRuleList)

          165
          
NS_INTERFACE_MAP_BEGIN(GroupRuleRuleList)

        

        

          166
          
  NS_INTERFACE_MAP_ENTRY(nsICSSRuleList)

          166
          
  NS_INTERFACE_MAP_ENTRY(nsICSSRuleList)

        

        

          167
          
  NS_INTERFACE_MAP_ENTRY(nsIDOMCSSRuleList)

          167
          
  NS_INTERFACE_MAP_ENTRY(nsIDOMCSSRuleList)

        

        

          168
          
  NS_INTERFACE_MAP_ENTRY(nsISupports)

          168
          
  NS_INTERFACE_MAP_ENTRY(nsISupports)

        

          
            

              169
              
  NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CSSGroupRuleRuleList)


              169
              
  NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CSSRuleList)

            

        

          170
          
NS_INTERFACE_MAP_END

          170
          
NS_INTERFACE_MAP_END

        

        

          171
          

          171
          

        

        

          172
          

          172
          

        

        

          173
          
NS_IMPL_ADDREF(GroupRuleRuleList)

          173
          
NS_IMPL_ADDREF(GroupRuleRuleList)

        

        

          174
          
NS_IMPL_RELEASE(GroupRuleRuleList)

          174
          
NS_IMPL_RELEASE(GroupRuleRuleList)

        

        

          175
          

          175
          

        

        

          176
          
uint32_t

          176
          
uint32_t

        

        

          177
          
GroupRuleRuleList::Length()

          177
          
GroupRuleRuleList::Length()

        

  

    

    

       Lines 197-215
      GroupRuleRuleList::IndexedGetter(uint32_
    
  Link Here 
    

  

        

          197
          
  }

          197
          
  }

        

        

          198
          

          198
          

        

        

          199
          
  return nullptr;

          199
          
  return nullptr;

        

        

          200
          
}

          200
          
}

        

        

          201
          

          201
          

        

        

          202
          
} // namespace css

          202
          
} // namespace css

        

        

          203
          
} // namespace mozilla

          203
          
} // namespace mozilla

        

        

          204
          

          204
          

        

            

              205
              
// Must be outside the namespace

              
              
            

            

              206
              
DOMCI_DATA(CSSGroupRuleRuleList, css::GroupRuleRuleList)

            

            

              207
              

            

        

          208
          
// -------------------------------------------

          205
          
// -------------------------------------------

        

        

          209
          
// CharsetRule

          206
          
// CharsetRule

        

        

          210
          
//

          207
          
//

        

        

          211
          

          208
          

        

        

          212
          
// Must be outside namespace

          209
          
// Must be outside namespace

        

        

          213
          
DOMCI_DATA(CSSCharsetRule, css::CharsetRule)

          210
          
DOMCI_DATA(CSSCharsetRule, css::CharsetRule)

        

        

          214
          

          211
          

        

        

          215
          
namespace mozilla {

          212
          
namespace mozilla {

        







  


  Return to bug 916871