Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-23 10:15:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1360508: Allow fixups on text styles to be reflected. rpending=heycam a=orange

Browse Source 
MozReview-Commit-ID: Eh6shYiv4RC
Signed-off-by: Emilio Cobos Álvarez <emilio@crisal.io>
This commit is contained in:
Emilio Cobos Álvarez 2017-04-28 15:03:05 +02:00
parent 68de453c9b
commit 90236f99ab
1 changed files with 15 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
layout/style/nsStyleContext.h
View File

@ -631,49 +631,31 @@ private:
return newData; \
} \
/** \
* Always forward to the parent to grab the inherited style struct\
* we're a text node. \
* Also (conservatively) set the owning bit in the parent style \
* context if we're a text node. \
* \
* This causes the parent element's style context to cache any \
* inherited structs we request for a text node, which means we \
* don't have to compute change hints for the text node, as \
* handling the change on the parent element is sufficient. \
* \
* Note that adding the inherit bit is ok, because the struct \
* pointer returned by the parent and the child is owned by \
* Servo. This is fine if the pointers are the same (as it \
* should, read below), because both style context sources will \
* hold it. \
* Note, however, that we still need to request the style struct \
* of the text node itself, since we may run some fixups on it, \
* like for text-combine. \
* \
* In the case of a mishandled frame, we could end up with the \
* pointer to and old parent style, but that's fine too, since \
* the parent style context will remain alive until we reframe, \
* in which case we'll discard both style contexts. Also, we \
* hold a strong reference to the parent style context, which \
* makes it a non-issue. \
* This model is sound because for the fixed-up values to change, \
* other properties on the parent need to change too, and we'll \
* handle those change hints correctly. \
* \
* Also, note that the assertion below should be true, except \
* for those frames we still don't handle correctly, like \
* anonymous table wrappers, in which case the pointers will \
* differ. \
* \
* That means we're not going to restyle correctly text frames \
* of anonymous table wrappers, for example. It's kind of \
* embarrassing, but I think it's not worth it to add more \
* logic here unconditionally, given that's going to be fixed. \
* \
* TODO(emilio): Convert to a strong assertion once we support \
* all kinds of random frames. In fact, this can be a great \
* assertion to debug them. \
* TODO(emilio): Perhaps we should remove those fixups and handle \
* those in layout instead. Those fixups are kind of expensive \
* for style sharing, and computed style of text nodes is not \
* observable. If we do that, we could assert here that the \
* inherited structs of both are the same. \
*/ \
if (mPseudoTag == nsCSSAnonBoxes::mozText) { \
if (mPseudoTag == nsCSSAnonBoxes::mozText && aComputeData) { \
MOZ_ASSERT(mParent); \
const nsStyle##name_* data = \
mParent->DoGetStyle##name_<aComputeData>(); \
NS_WARNING_ASSERTION(!data || \
data == Servo_GetStyle##name_(mSource.AsServoComputedValues()), \
"bad data"); \
return data; \
mParent->AddStyleBit(NS_STYLE_INHERIT_BIT(name_)); \
} \
\
const bool needToCompute = !(mBits & NS_STYLE_INHERIT_BIT(name_));\