Modified: trunk/Source/WebCore/dom/Document.cpp (151465 => 151466)
--- trunk/Source/WebCore/dom/Document.cpp 2013-06-11 20:39:44 UTC (rev 151465)
+++ trunk/Source/WebCore/dom/Document.cpp 2013-06-11 20:40:32 UTC (rev 151466)
@@ -393,28 +393,47 @@
: ContainerNode(0, CreateDocument)
, TreeScope(this)
, m_styleResolverThrowawayTimer(this, &Document::styleResolverThrowawayTimerFired, timeBeforeThrowingAwayStyleResolverAfterLastUseInSeconds)
+ , m_didCalculateStyleResolver(false)
+ , m_hasNodesWithPlaceholderStyle(false)
+ , m_needsNotifyRemoveAllPendingStylesheet(false)
+ , m_ignorePendingStylesheets(false)
+ , m_pendingSheetLayout(NoLayoutWithPendingSheets)
+ , m_frame(frame)
, m_activeParserCount(0)
, m_contextFeatures(ContextFeatures::defaultSwitch())
+ , m_wellFormed(false)
+ , m_printing(false)
+ , m_paginatedForScreen(false)
+ , m_ignoreAutofocus(false)
, m_compatibilityMode(NoQuirksMode)
, m_compatibilityModeLocked(false)
+ , m_textColor(Color::black)
, m_domTreeVersion(++s_globalTreeVersion)
+ , m_listenerTypes(0)
, m_mutationObserverTypes(0)
, m_styleSheetCollection(DocumentStyleSheetCollection::create(this))
, m_visitedLinkState(VisitedLinkState::create(this))
+ , m_visuallyOrdered(false)
, m_readyState(Complete)
+ , m_bParsing(false)
, m_styleRecalcTimer(this, &Document::styleRecalcTimerFired)
, m_pendingStyleRecalcShouldForce(false)
+ , m_inStyleRecalc(false)
+ , m_closeAfterStyleRecalc(false)
+ , m_gotoAnchorNeededAfterStylesheetsLoad(false)
, m_frameElementsShouldIgnoreScrolling(false)
, m_containsValidityStyleRules(false)
, m_updateFocusAppearanceRestoresSelection(false)
, m_ignoreDestructiveWriteCount(0)
, m_titleSetExplicitly(false)
, m_updateFocusAppearanceTimer(this, &Document::updateFocusAppearanceTimerFired)
+ , m_cssTarget(0)
+ , m_processingLoadEvent(false)
, m_loadEventFinished(false)
, m_startTime(currentTime())
, m_overMinimumLayoutThreshold(false)
, m_scriptRunner(ScriptRunner::create(this))
- , m_xmlVersion("1.0")
+ , m_xmlVersion(ASCIILiteral("1.0"))
, m_xmlStandalone(StandaloneUnspecified)
, m_hasXMLDeclaration(0)
, m_savedRenderer(0)
@@ -466,12 +485,6 @@
, m_didAssociateFormControlsTimer(this, &Document::didAssociateFormControlsTimerFired)
, m_hasInjectedPlugInsScript(false)
{
- m_printing = false;
- m_paginatedForScreen = false;
-
- m_ignoreAutofocus = false;
-
- m_frame = frame;
if (m_frame)
provideContextFeaturesToDocumentFrom(this, m_frame->page());
@@ -494,37 +507,14 @@
#if ENABLE(TEXT_AUTOSIZING)
m_textAutosizer = TextAutosizer::create(this);
#endif
- m_visuallyOrdered = false;
- m_bParsing = false;
- m_wellFormed = false;
- m_textColor = Color::black;
- m_listenerTypes = 0;
- m_inStyleRecalc = false;
- m_closeAfterStyleRecalc = false;
-
- m_gotoAnchorNeededAfterStylesheetsLoad = false;
-
- m_didCalculateStyleResolver = false;
- m_ignorePendingStylesheets = false;
- m_needsNotifyRemoveAllPendingStylesheet = false;
- m_hasNodesWithPlaceholderStyle = false;
- m_pendingSheetLayout = NoLayoutWithPendingSheets;
-
- m_cssTarget = 0;
-
resetLinkColor();
resetVisitedLinkColor();
resetActiveLinkColor();
- m_processingLoadEvent = false;
-
initSecurityContext();
initDNSPrefetch();
- static int docID = 0;
- m_docID = docID++;
-
for (unsigned i = 0; i < WTF_ARRAY_LENGTH(m_nodeListCounts); i++)
m_nodeListCounts[i] = 0;
Modified: trunk/Source/WebCore/dom/Document.h (151465 => 151466)
--- trunk/Source/WebCore/dom/Document.h 2013-06-11 20:39:44 UTC (rev 151465)
+++ trunk/Source/WebCore/dom/Document.h 2013-06-11 20:40:32 UTC (rev 151466)
@@ -875,8 +875,6 @@
Document* parentDocument() const;
Document* topDocument() const;
-
- int docID() const { return m_docID; }
ScriptRunner* scriptRunner() { return m_scriptRunner.get(); }
@@ -1280,7 +1278,6 @@
OwnPtr<StyleResolver> m_styleResolver;
bool m_didCalculateStyleResolver;
- bool m_hasDirtyStyleResolver;
bool m_hasNodesWithPlaceholderStyle;
bool m_needsNotifyRemoveAllPendingStylesheet;
// But sometimes you need to ignore pending stylesheet count to
@@ -1362,7 +1359,6 @@
Color m_activeLinkColor;
OwnPtr<VisitedLinkState> m_visitedLinkState;
- bool m_loadingSheet;
bool m_visuallyOrdered;
ReadyState m_readyState;
bool m_bParsing;
@@ -1414,8 +1410,6 @@
RefPtr<Document> m_transformSourceDocument;
#endif
- int m_docID; // A unique document identifier used for things like document-specific mapped attributes.
-
String m_xmlEncoding;
String m_xmlVersion;
unsigned m_xmlStandalone : 2;
