зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1386865 part 1 - Have GetServoStyleSet return non-const ServoStyleSet. r=TYLin
MozReview-Commit-ID: IOlcThK3PAr --HG-- extra : rebase_source : 6664f5f988ec0c2cdb5b21d61585da84131dc618
This commit is contained in:
Родитель
9a3658cf7f
Коммит
96a6c473b5
|
@ -869,7 +869,7 @@ nsXBLBinding::WalkRules(nsIStyleRuleProcessor::EnumFunc aFunc, void* aData)
|
||||||
(*aFunc)(rules, aData);
|
(*aFunc)(rules, aData);
|
||||||
}
|
}
|
||||||
|
|
||||||
const ServoStyleSet*
|
ServoStyleSet*
|
||||||
nsXBLBinding::GetServoStyleSet() const
|
nsXBLBinding::GetServoStyleSet() const
|
||||||
{
|
{
|
||||||
return mPrototypeBinding->GetServoStyleSet();
|
return mPrototypeBinding->GetServoStyleSet();
|
||||||
|
|
|
@ -130,7 +130,7 @@ public:
|
||||||
|
|
||||||
void WalkRules(nsIStyleRuleProcessor::EnumFunc aFunc, void* aData);
|
void WalkRules(nsIStyleRuleProcessor::EnumFunc aFunc, void* aData);
|
||||||
|
|
||||||
const mozilla::ServoStyleSet* GetServoStyleSet() const;
|
mozilla::ServoStyleSet* GetServoStyleSet() const;
|
||||||
|
|
||||||
static nsresult DoInitJSClass(JSContext *cx, JS::Handle<JSObject*> obj,
|
static nsresult DoInitJSClass(JSContext *cx, JS::Handle<JSObject*> obj,
|
||||||
const nsString& aClassName,
|
const nsString& aClassName,
|
||||||
|
|
|
@ -569,7 +569,7 @@ nsXBLPrototypeBinding::GetRuleProcessor()
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
const ServoStyleSet*
|
ServoStyleSet*
|
||||||
nsXBLPrototypeBinding::GetServoStyleSet() const
|
nsXBLPrototypeBinding::GetServoStyleSet() const
|
||||||
{
|
{
|
||||||
return mResources ? mResources->GetServoStyleSet() : nullptr;
|
return mResources ? mResources->GetServoStyleSet() : nullptr;
|
||||||
|
|
|
@ -131,7 +131,7 @@ public:
|
||||||
void AppendStyleSheetsTo(nsTArray<mozilla::StyleSheet*>& aResult) const;
|
void AppendStyleSheetsTo(nsTArray<mozilla::StyleSheet*>& aResult) const;
|
||||||
|
|
||||||
nsIStyleRuleProcessor* GetRuleProcessor();
|
nsIStyleRuleProcessor* GetRuleProcessor();
|
||||||
const mozilla::ServoStyleSet* GetServoStyleSet() const;
|
mozilla::ServoStyleSet* GetServoStyleSet() const;
|
||||||
|
|
||||||
nsresult FlushSkinSheets();
|
nsresult FlushSkinSheets();
|
||||||
|
|
||||||
|
|
|
@ -64,7 +64,7 @@ public:
|
||||||
// the Servo style backend.
|
// the Servo style backend.
|
||||||
void ComputeServoStyleSet(nsPresContext* aPresContext);
|
void ComputeServoStyleSet(nsPresContext* aPresContext);
|
||||||
|
|
||||||
const mozilla::ServoStyleSet* GetServoStyleSet() const { return mServoStyleSet.get(); }
|
mozilla::ServoStyleSet* GetServoStyleSet() const { return mServoStyleSet.get(); }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
// A loader object. Exists only long enough to load resources, and then it dies.
|
// A loader object. Exists only long enough to load resources, and then it dies.
|
||||||
|
|
Загрузка…
Ссылка в новой задаче