| Index: Source/core/editing/EditingStyle.cpp
|
| diff --git a/Source/core/editing/EditingStyle.cpp b/Source/core/editing/EditingStyle.cpp
|
| index bb9144e4a31563826ab907dfe528a481e3ff6afe..35be0bd0cd825c6912b3c11ef1ca0b06d00ff045 100644
|
| --- a/Source/core/editing/EditingStyle.cpp
|
| +++ b/Source/core/editing/EditingStyle.cpp
|
| @@ -1133,7 +1133,7 @@ void EditingStyle::mergeStyle(const StylePropertySet* style, CSSPropertyOverride
|
| static PassRefPtr<MutableStylePropertySet> styleFromMatchedRulesForElement(Element* element, unsigned rulesToInclude)
|
| {
|
| RefPtr<MutableStylePropertySet> style = MutableStylePropertySet::create();
|
| - RefPtr<CSSRuleList> matchedRules = element->document()->styleResolver()->styleRulesForElement(element, rulesToInclude);
|
| + RefPtr<CSSRuleList> matchedRules = element->document().styleResolver()->styleRulesForElement(element, rulesToInclude);
|
| if (matchedRules) {
|
| for (unsigned i = 0; i < matchedRules->length(); i++) {
|
| if (matchedRules->item(i)->type() == CSSRule::STYLE_RULE)
|
| @@ -1270,7 +1270,7 @@ PassRefPtr<EditingStyle> EditingStyle::styleAtSelectionStart(const VisibleSelect
|
| return 0;
|
|
|
| RefPtr<EditingStyle> style = EditingStyle::create(element, EditingStyle::AllProperties);
|
| - style->mergeTypingStyle(element->document());
|
| + style->mergeTypingStyle(&element->document());
|
|
|
| // If background color is transparent, traverse parent nodes until we hit a different value or document root
|
| // Also, if the selection is a range, ignore the background color at the start of selection,
|
| @@ -1394,7 +1394,7 @@ StyleChange::StyleChange(EditingStyle* style, const Position& position)
|
| , m_applySubscript(false)
|
| , m_applySuperscript(false)
|
| {
|
| - Document* document = position.anchorNode() ? position.anchorNode()->document() : 0;
|
| + Document* document = position.anchorNode() ? &position.anchorNode()->document() : 0;
|
| if (!style || !style->style() || !document || !document->frame())
|
| return;
|
|
|
|
|