[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9
hyatt at apple.com
hyatt at apple.com
Thu Feb 4 21:31:13 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit bbae71f9519b4a99de58a2c1ab6c1f84a62333d1
Author: hyatt at apple.com <hyatt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jan 28 17:47:30 2010 +0000
Fix for user stylesheet bugs where they get parsed using the wrong compatibility mode. This was a regression
caused from Safari 3 -> 4 by the Acid3 fixes to create a real DOCTYPE in the DOM.
Reviewed by Darin Adler.
This patch makes style selector creation lazy, so that the selector isn't built unless someone asks for it.
In order to avoid creating the style selector before the compatibility mode has been determined, document
style is now created without having a dependence on an instantiated style selector. The creation of the style
is now done as a static method on CSSStyleSelector called styleForDocument, and a couple of font-related
functions have been made static as well so that they can be used by this method.
m_styleSelector on Document is now an OwnPtr.
Added userscripts/mixed-case-stylesheet.html
* css/CSSStyleSelector.cpp:
(WebCore::CSSStyleSelector::styleForDocument):
(WebCore::CSSStyleSelector::applyProperty):
(WebCore::CSSStyleSelector::checkForGenericFamilyChange):
(WebCore::CSSStyleSelector::setFontSize):
(WebCore::CSSStyleSelector::getComputedSizeFromSpecifiedSize):
(WebCore::CSSStyleSelector::fontSizeForKeyword):
* css/CSSStyleSelector.h:
* dom/Document.cpp:
(WebCore::Document::Document):
(WebCore::Document::~Document):
(WebCore::Document::recalcStyle):
(WebCore::Document::createStyleSelector):
(WebCore::Document::attach):
(WebCore::Document::setVisuallyOrdered):
(WebCore::Document::recalcStyleSelector):
* dom/Document.h:
(WebCore::Document::styleSelector):
(WebCore::Document::visuallyOrdered):
* html/HTMLDocument.cpp:
(WebCore::HTMLDocument::determineParseMode):
* loader/PlaceholderDocument.cpp:
(WebCore::PlaceholderDocument::attach):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54005 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/userscripts/mixed-case-stylesheet-expected.txt b/LayoutTests/userscripts/mixed-case-stylesheet-expected.txt
new file mode 100644
index 0000000..9a603f2
--- /dev/null
+++ b/LayoutTests/userscripts/mixed-case-stylesheet-expected.txt
@@ -0,0 +1 @@
+If the word fail appears below, then test has failed.
diff --git a/LayoutTests/userscripts/mixed-case-stylesheet.html b/LayoutTests/userscripts/mixed-case-stylesheet.html
new file mode 100644
index 0000000..7937d6f
--- /dev/null
+++ b/LayoutTests/userscripts/mixed-case-stylesheet.html
@@ -0,0 +1,19 @@
+<html>
+<head>
+<script>
+if (window.layoutTestController) {
+ window.layoutTestController.dumpAsText();
+ window.layoutTestController.addUserStyleSheet("#mixedCase { display: none }");
+}
+</script>
+</head>
+<body>
+<script>
+document.appendChild(document.implementation.createDocumentType("html", 0, 0));
+</script>
+<div>If the word fail appears below, then test has failed.</div>
+<div id="mixedCase">FAIL</div>
+</body>
+</html>
+
+
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6273adf..cf2dbbd 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,45 @@
+2010-01-27 Dave Hyatt <hyatt at apple.com>
+
+ Reviewed by Darin Adler.
+
+ Fix for user stylesheet bugs where they get parsed using the wrong compatibility mode. This was a regression
+ caused from Safari 3 -> 4 by the Acid3 fixes to create a real DOCTYPE in the DOM.
+
+ This patch makes style selector creation lazy, so that the selector isn't built unless someone asks for it.
+
+ In order to avoid creating the style selector before the compatibility mode has been determined, document
+ style is now created without having a dependence on an instantiated style selector. The creation of the style
+ is now done as a static method on CSSStyleSelector called styleForDocument, and a couple of font-related
+ functions have been made static as well so that they can be used by this method.
+
+ m_styleSelector on Document is now an OwnPtr.
+
+ Added userscripts/mixed-case-stylesheet.html
+
+ * css/CSSStyleSelector.cpp:
+ (WebCore::CSSStyleSelector::styleForDocument):
+ (WebCore::CSSStyleSelector::applyProperty):
+ (WebCore::CSSStyleSelector::checkForGenericFamilyChange):
+ (WebCore::CSSStyleSelector::setFontSize):
+ (WebCore::CSSStyleSelector::getComputedSizeFromSpecifiedSize):
+ (WebCore::CSSStyleSelector::fontSizeForKeyword):
+ * css/CSSStyleSelector.h:
+ * dom/Document.cpp:
+ (WebCore::Document::Document):
+ (WebCore::Document::~Document):
+ (WebCore::Document::recalcStyle):
+ (WebCore::Document::createStyleSelector):
+ (WebCore::Document::attach):
+ (WebCore::Document::setVisuallyOrdered):
+ (WebCore::Document::recalcStyleSelector):
+ * dom/Document.h:
+ (WebCore::Document::styleSelector):
+ (WebCore::Document::visuallyOrdered):
+ * html/HTMLDocument.cpp:
+ (WebCore::HTMLDocument::determineParseMode):
+ * loader/PlaceholderDocument.cpp:
+ (WebCore::PlaceholderDocument::attach):
+
2010-01-28 Kent Tamura <tkent at chromium.org>
Reviewed by Darin Adler.
diff --git a/WebCore/css/CSSStyleSelector.cpp b/WebCore/css/CSSStyleSelector.cpp
index 841ad52..aeed8ad 100644
--- a/WebCore/css/CSSStyleSelector.cpp
+++ b/WebCore/css/CSSStyleSelector.cpp
@@ -414,7 +414,7 @@ CSSStyleSelector::CSSStyleSelector(Document* doc, StyleSheetList* styleSheets, C
, m_fontSelector(CSSFontSelector::create(doc))
{
init();
-
+
m_matchAuthorAndUserStyles = matchAuthorAndUserStyles;
Element* root = doc->documentElement();
@@ -473,6 +473,9 @@ CSSStyleSelector::CSSStyleSelector(Document* doc, StyleSheetList* styleSheets, C
if (sheet->isCSSStyleSheet() && !sheet->disabled())
m_authorStyle->addRulesFromSheet(static_cast<CSSStyleSheet*>(sheet), *m_medium, this);
}
+
+ if (doc->renderer() && doc->renderer()->style())
+ doc->renderer()->style()->font().update(fontSelector());
}
// This is a simplified style setting function for keyframe styles
@@ -1095,6 +1098,38 @@ void CSSStyleSelector::matchUARules(int& firstUARule, int& lastUARule)
}
}
+PassRefPtr<RenderStyle> CSSStyleSelector::styleForDocument(Document* document)
+{
+ RefPtr<RenderStyle> documentStyle = RenderStyle::create();
+ documentStyle->setDisplay(BLOCK);
+ documentStyle->setVisuallyOrdered(document->visuallyOrdered());
+ documentStyle->setZoom(document->frame()->pageZoomFactor());
+
+ FontDescription fontDescription;
+ fontDescription.setUsePrinterFont(document->printing());
+ if (Settings* settings = document->settings()) {
+ fontDescription.setRenderingMode(settings->fontRenderingMode());
+ if (document->printing() && !settings->shouldPrintBackgrounds())
+ documentStyle->setForceBackgroundsToWhite(true);
+ const AtomicString& stdfont = settings->standardFontFamily();
+ if (!stdfont.isEmpty()) {
+ fontDescription.firstFamily().setFamily(stdfont);
+ fontDescription.firstFamily().appendFamily(0);
+ }
+ fontDescription.setKeywordSize(CSSValueMedium - CSSValueXxSmall + 1);
+ int size = CSSStyleSelector::fontSizeForKeyword(document, CSSValueMedium, false);
+ fontDescription.setSpecifiedSize(size);
+ fontDescription.setComputedSize(CSSStyleSelector::getComputedSizeFromSpecifiedSize(document, fontDescription.isAbsoluteSize(), size, documentStyle->effectiveZoom()));
+ }
+
+ documentStyle->setFontDescription(fontDescription);
+ documentStyle->font().update(0);
+ if (document->inCompatMode())
+ documentStyle->setHtmlHacks(true); // enable html specific rendering tricks
+
+ return documentStyle.release();
+}
+
// If resolveForRootDefault is true, style based on user agent style sheet only. This is used in media queries, where
// relative units are interpreted according to document root element style, styled only with UA stylesheet
@@ -3899,7 +3934,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
if (m_parentNode)
fontDescription.setKeywordSize(m_parentStyle->fontDescription().keywordSize());
} else if (isInitial) {
- size = fontSizeForKeyword(CSSValueMedium, m_style->htmlHacks(), fontDescription.useFixedDefaultSize());
+ size = fontSizeForKeyword(m_checker.m_document, CSSValueMedium, fontDescription.useFixedDefaultSize());
fontDescription.setKeywordSize(CSSValueMedium - CSSValueXxSmall + 1);
} else if (primitiveValue->getIdent()) {
// Keywords are being used.
@@ -3912,7 +3947,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
case CSSValueXLarge:
case CSSValueXxLarge:
case CSSValueWebkitXxxLarge:
- size = fontSizeForKeyword(primitiveValue->getIdent(), m_style->htmlHacks(), fontDescription.useFixedDefaultSize());
+ size = fontSizeForKeyword(m_checker.m_document, primitiveValue->getIdent(), fontDescription.useFixedDefaultSize());
fontDescription.setKeywordSize(primitiveValue->getIdent() - CSSValueXxSmall + 1);
break;
case CSSValueLarger:
@@ -4161,7 +4196,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
// We need to adjust the size to account for the generic family change from monospace
// to non-monospace.
if (fontDescription.keywordSize() && fontDescription.useFixedDefaultSize())
- setFontSize(fontDescription, fontSizeForKeyword(CSSValueXxSmall + fontDescription.keywordSize() - 1, m_style->htmlHacks(), false));
+ setFontSize(fontDescription, fontSizeForKeyword(m_checker.m_document, CSSValueXxSmall + fontDescription.keywordSize() - 1, false));
fontDescription.setGenericFamily(initialDesc.genericFamily());
if (!initialDesc.firstFamily().familyIsEmpty())
fontDescription.setFamily(initialDesc.firstFamily());
@@ -4238,7 +4273,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
// If currFamily is non-zero then we set at least one family on this description.
if (currFamily) {
if (fontDescription.keywordSize() && fontDescription.useFixedDefaultSize() != oldFamilyUsedFixedDefaultSize)
- setFontSize(fontDescription, fontSizeForKeyword(CSSValueXxSmall + fontDescription.keywordSize() - 1, m_style->htmlHacks(), !oldFamilyUsedFixedDefaultSize));
+ setFontSize(fontDescription, fontSizeForKeyword(m_checker.m_document, CSSValueXxSmall + fontDescription.keywordSize() - 1, !oldFamilyUsedFixedDefaultSize));
if (m_style->setFontDescription(fontDescription))
m_fontDirty = true;
@@ -4458,7 +4493,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
fontDescription.firstFamily().appendFamily(0);
}
fontDescription.setKeywordSize(CSSValueMedium - CSSValueXxSmall + 1);
- setFontSize(fontDescription, fontSizeForKeyword(CSSValueMedium, m_style->htmlHacks(), false));
+ setFontSize(fontDescription, fontSizeForKeyword(m_checker.m_document, CSSValueMedium, false));
m_style->setLineHeight(RenderStyle::initialLineHeight());
m_lineHeightValue = 0;
if (m_style->setFontDescription(fontDescription))
@@ -4481,7 +4516,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
fontDescription.setUsePrinterFont(m_checker.m_document->printing());
// Handle the zoom factor.
- fontDescription.setComputedSize(getComputedSizeFromSpecifiedSize(fontDescription.isAbsoluteSize(), fontDescription.specifiedSize()));
+ fontDescription.setComputedSize(getComputedSizeFromSpecifiedSize(m_checker.m_document, fontDescription.isAbsoluteSize(), fontDescription.specifiedSize(), m_style->effectiveZoom()));
if (m_style->setFontDescription(fontDescription))
m_fontDirty = true;
}
@@ -5803,7 +5838,7 @@ void CSSStyleSelector::checkForGenericFamilyChange(RenderStyle* style, RenderSty
// multiplying by our scale factor.
float size;
if (childFont.keywordSize())
- size = fontSizeForKeyword(CSSValueXxSmall + childFont.keywordSize() - 1, style->htmlHacks(), childFont.useFixedDefaultSize());
+ size = fontSizeForKeyword(m_checker.m_document, CSSValueXxSmall + childFont.keywordSize() - 1, childFont.useFixedDefaultSize());
else {
Settings* settings = m_checker.m_document->settings();
float fixedScaleFactor = settings
@@ -5822,10 +5857,10 @@ void CSSStyleSelector::checkForGenericFamilyChange(RenderStyle* style, RenderSty
void CSSStyleSelector::setFontSize(FontDescription& fontDescription, float size)
{
fontDescription.setSpecifiedSize(size);
- fontDescription.setComputedSize(getComputedSizeFromSpecifiedSize(fontDescription.isAbsoluteSize(), size));
+ fontDescription.setComputedSize(getComputedSizeFromSpecifiedSize(m_checker.m_document, fontDescription.isAbsoluteSize(), size, m_style->effectiveZoom()));
}
-float CSSStyleSelector::getComputedSizeFromSpecifiedSize(bool isAbsoluteSize, float specifiedSize)
+float CSSStyleSelector::getComputedSizeFromSpecifiedSize(Document* document, bool isAbsoluteSize, float specifiedSize, float zoomFactor)
{
// We support two types of minimum font size. The first is a hard override that applies to
// all fonts. This is "minSize." The second type of minimum font size is a "smart minimum"
@@ -5837,16 +5872,15 @@ float CSSStyleSelector::getComputedSizeFromSpecifiedSize(bool isAbsoluteSize, fl
// However we always allow the page to set an explicit pixel size that is smaller,
// since sites will mis-render otherwise (e.g., http://www.gamespot.com with a 9px minimum).
- Settings* settings = m_checker.m_document->settings();
+ Settings* settings = document->settings();
if (!settings)
return 1.0f;
int minSize = settings->minimumFontSize();
int minLogicalSize = settings->minimumLogicalFontSize();
- float zoomFactor = m_style->effectiveZoom();
- if (m_checker.m_document->frame() && m_checker.m_document->frame()->shouldApplyTextZoom())
- zoomFactor *= m_checker.m_document->frame()->textZoomFactor();
+ if (document->frame() && document->frame()->shouldApplyTextZoom())
+ zoomFactor *= document->frame()->textZoomFactor();
float zoomedSize = specifiedSize * zoomFactor;
@@ -5908,12 +5942,13 @@ static const int strictFontSizeTable[fontSizeTableMax - fontSizeTableMin + 1][to
// factors for each keyword value.
static const float fontSizeFactors[totalKeywords] = { 0.60f, 0.75f, 0.89f, 1.0f, 1.2f, 1.5f, 2.0f, 3.0f };
-float CSSStyleSelector::fontSizeForKeyword(int keyword, bool quirksMode, bool fixed) const
+float CSSStyleSelector::fontSizeForKeyword(Document* document, int keyword, bool fixed)
{
- Settings* settings = m_checker.m_document->settings();
+ Settings* settings = document->settings();
if (!settings)
return 1.0f;
+ bool quirksMode = document->inCompatMode();
int mediumSize = fixed ? settings->defaultFixedFontSize() : settings->defaultFontSize();
if (mediumSize >= fontSizeTableMin && mediumSize <= fontSizeTableMax) {
// Look up the entry in the table.
diff --git a/WebCore/css/CSSStyleSelector.h b/WebCore/css/CSSStyleSelector.h
index fab5006..aac1bae 100644
--- a/WebCore/css/CSSStyleSelector.h
+++ b/WebCore/css/CSSStyleSelector.h
@@ -92,6 +92,8 @@ public:
PassRefPtr<RenderStyle> pseudoStyleForElement(PseudoId, Element*, RenderStyle* parentStyle = 0);
+ static PassRefPtr<RenderStyle> styleForDocument(Document*);
+
#if ENABLE(DATAGRID)
// Datagrid style computation (uses unique pseudo elements and structures)
PassRefPtr<RenderStyle> pseudoStyleForDataGridColumn(DataGridColumn*, RenderStyle* parentStyle);
@@ -112,8 +114,8 @@ public:
// Given a CSS keyword in the range (xx-small to -webkit-xxx-large), this function will return
// the correct font size scaled relative to the user's default (medium).
- float fontSizeForKeyword(int keyword, bool quirksMode, bool monospace) const;
-
+ static float fontSizeForKeyword(Document*, int keyword, bool monospace);
+
private:
// When the CSS keyword "larger" is used, this function will attempt to match within the keyword
// table, and failing that, will simply multiply by 1.2.
@@ -129,7 +131,7 @@ public:
void applyPropertyToStyle(int id, CSSValue*, RenderStyle*);
private:
- float getComputedSizeFromSpecifiedSize(bool isAbsoluteSize, float specifiedSize);
+ static float getComputedSizeFromSpecifiedSize(Document*, bool isAbsoluteSize, float specifiedSize, float zoomFactor = 1.0f);
public:
Color getColorFromPrimitiveValue(CSSPrimitiveValue*);
diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp
index 01c465c..c22055f 100644
--- a/WebCore/dom/Document.cpp
+++ b/WebCore/dom/Document.cpp
@@ -410,7 +410,7 @@ Document::Document(Frame* frame, bool isXHTML, bool isHTML)
m_docLoader = new DocLoader(this);
- visuallyOrdered = false;
+ m_visuallyOrdered = false;
m_bParsing = false;
m_wellFormed = false;
@@ -431,7 +431,6 @@ Document::Document(Frame* frame, bool isXHTML, bool isHTML)
m_gotoAnchorNeededAfterStylesheetsLoad = false;
- m_styleSelector = 0;
m_didCalculateStyleSelector = false;
m_pendingStylesheets = 0;
m_ignorePendingStylesheets = false;
@@ -519,7 +518,6 @@ Document::~Document()
m_tokenizer.clear();
m_document = 0;
- delete m_styleSelector;
m_docLoader.clear();
m_renderArena.clear();
@@ -1347,32 +1345,7 @@ void Document::recalcStyle(StyleChange change)
// style selector may set this again during recalc
m_hasNodesWithPlaceholderStyle = false;
- RefPtr<RenderStyle> documentStyle = RenderStyle::create();
- documentStyle->setDisplay(BLOCK);
- documentStyle->setVisuallyOrdered(visuallyOrdered);
- documentStyle->setZoom(frame()->pageZoomFactor());
- m_styleSelector->setStyle(documentStyle);
-
- FontDescription fontDescription;
- fontDescription.setUsePrinterFont(printing());
- if (Settings* settings = this->settings()) {
- fontDescription.setRenderingMode(settings->fontRenderingMode());
- if (printing() && !settings->shouldPrintBackgrounds())
- documentStyle->setForceBackgroundsToWhite(true);
- const AtomicString& stdfont = settings->standardFontFamily();
- if (!stdfont.isEmpty()) {
- fontDescription.firstFamily().setFamily(stdfont);
- fontDescription.firstFamily().appendFamily(0);
- }
- fontDescription.setKeywordSize(CSSValueMedium - CSSValueXxSmall + 1);
- m_styleSelector->setFontSize(fontDescription, m_styleSelector->fontSizeForKeyword(CSSValueMedium, inCompatMode(), false));
- }
-
- documentStyle->setFontDescription(fontDescription);
- documentStyle->font().update(m_styleSelector->fontSelector());
- if (inCompatMode())
- documentStyle->setHtmlHacks(true); // enable html specific rendering tricks
-
+ RefPtr<RenderStyle> documentStyle = CSSStyleSelector::styleForDocument(this);
StyleChange ch = diff(documentStyle.get(), renderer()->style());
if (renderer() && ch != NoChange)
renderer()->setStyle(documentStyle.release());
@@ -1489,6 +1462,15 @@ void Document::updateLayoutIgnorePendingStylesheets()
m_ignorePendingStylesheets = oldIgnore;
}
+void Document::createStyleSelector()
+{
+ bool matchAuthorAndUserStyles = true;
+ if (Settings* docSettings = settings())
+ matchAuthorAndUserStyles = docSettings->authorAndUserStylesEnabled();
+ m_styleSelector.set(new CSSStyleSelector(this, m_styleSheets.get(), m_mappedElementSheet.get(), pageUserSheet(), pageGroupUserSheets(),
+ !inCompatMode(), matchAuthorAndUserStyles));
+}
+
void Document::attach()
{
ASSERT(!attached());
@@ -1504,14 +1486,6 @@ void Document::attach()
renderView()->didMoveOnscreen();
#endif
- if (!m_styleSelector) {
- bool matchAuthorAndUserStyles = true;
- if (Settings* docSettings = settings())
- matchAuthorAndUserStyles = docSettings->authorAndUserStylesEnabled();
- m_styleSelector = new CSSStyleSelector(this, m_styleSheets.get(), m_mappedElementSheet.get(), pageUserSheet(), pageGroupUserSheets(),
- !inCompatMode(), matchAuthorAndUserStyles);
- }
-
recalcStyle(Force);
RenderObject* render = renderer();
@@ -1638,7 +1612,7 @@ AXObjectCache* Document::axObjectCache() const
void Document::setVisuallyOrdered()
{
- visuallyOrdered = true;
+ m_visuallyOrdered = true;
if (renderer())
renderer()->style()->setVisuallyOrdered(true);
}
@@ -2655,10 +2629,7 @@ void Document::recalcStyleSelector()
m_styleSheets->swap(sheets);
- // Create a new style selector
- delete m_styleSelector;
- m_styleSelector = new CSSStyleSelector(this, m_styleSheets.get(), m_mappedElementSheet.get(),
- pageUserSheet(), pageGroupUserSheets(), !inCompatMode(), matchAuthorAndUserStyles);
+ m_styleSelector.clear();
m_didCalculateStyleSelector = true;
}
diff --git a/WebCore/dom/Document.h b/WebCore/dom/Document.h
index ad560f3..4798e05 100644
--- a/WebCore/dom/Document.h
+++ b/WebCore/dom/Document.h
@@ -375,7 +375,12 @@ public:
#endif
virtual bool isFrameSet() const { return false; }
- CSSStyleSelector* styleSelector() const { return m_styleSelector; }
+ CSSStyleSelector* styleSelector()
+ {
+ if (!m_styleSelector)
+ createStyleSelector();
+ return m_styleSelector.get();
+ }
Element* getElementByAccessKey(const String& key) const;
@@ -479,6 +484,7 @@ public:
// to get visually ordered hebrew and arabic pages right
void setVisuallyOrdered();
+ bool visuallyOrdered() const { return m_visuallyOrdered; }
void open(Document* ownerDocument = 0);
void implicitOpen();
@@ -937,8 +943,6 @@ public:
protected:
Document(Frame*, bool isXHTML, bool isHTML);
- void setStyleSelector(CSSStyleSelector* styleSelector) { m_styleSelector = styleSelector; }
-
void clearXMLVersion() { m_xmlVersion = String(); }
private:
@@ -972,7 +976,9 @@ private:
void cacheDocumentElement() const;
- CSSStyleSelector* m_styleSelector;
+ void createStyleSelector();
+
+ OwnPtr<CSSStyleSelector> m_styleSelector;
bool m_didCalculateStyleSelector;
Frame* m_frame;
@@ -1057,7 +1063,7 @@ private:
String m_selectedStylesheetSet;
bool m_loadingSheet;
- bool visuallyOrdered;
+ bool m_visuallyOrdered;
bool m_bParsing;
Timer<Document> m_styleRecalcTimer;
bool m_inStyleRecalc;
diff --git a/WebCore/html/HTMLDocument.cpp b/WebCore/html/HTMLDocument.cpp
index 5d1db31..9f3ddf8 100644
--- a/WebCore/html/HTMLDocument.cpp
+++ b/WebCore/html/HTMLDocument.cpp
@@ -398,8 +398,11 @@ void HTMLDocument::determineParseMode()
}
}
- if (inCompatMode() != wasInCompatMode)
+ if (inCompatMode() != wasInCompatMode) {
+ clearPageUserSheet();
+ clearPageGroupUserSheets();
updateStyleSelector();
+ }
}
void HTMLDocument::clear()
diff --git a/WebCore/loader/PlaceholderDocument.cpp b/WebCore/loader/PlaceholderDocument.cpp
index af14c72..81222b3 100644
--- a/WebCore/loader/PlaceholderDocument.cpp
+++ b/WebCore/loader/PlaceholderDocument.cpp
@@ -35,11 +35,6 @@ void PlaceholderDocument::attach()
{
ASSERT(!attached());
- if (!styleSelector()) {
- RefPtr<StyleSheetList> styleSheetList = StyleSheetList::create(this);
- setStyleSelector(new CSSStyleSelector(this, styleSheetList.get(), 0, pageUserSheet(), pageGroupUserSheets(), true, false));
- }
-
// Skipping Document::attach().
ContainerNode::attach();
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list