<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[214203] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/214203">214203</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2017-03-20 19:04:55 -0700 (Mon, 20 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Optimize packing of Document and superclass data members
https://bugs.webkit.org/show_bug.cgi?id=169880
Reviewed by Antti Koivisto.
Move data members around to optimize packing in SecurityContext, SuspendableTimer and Document.
This saves as few hundred bytes on Document.
Padding detected via Tools/Scripts/dump-class-layout
* dom/Document.cpp:
(WebCore::Document::Document):
* dom/Document.h:
* dom/ScriptExecutionContext.h:
* dom/SecurityContext.cpp:
(WebCore::SecurityContext::SecurityContext):
* dom/SecurityContext.h:
* page/SuspendableTimer.cpp:
(WebCore::SuspendableTimer::SuspendableTimer):
* page/SuspendableTimer.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.h</a></li>
<li><a href="#trunkSourceWebCoredomScriptExecutionContexth">trunk/Source/WebCore/dom/ScriptExecutionContext.h</a></li>
<li><a href="#trunkSourceWebCoredomSecurityContextcpp">trunk/Source/WebCore/dom/SecurityContext.cpp</a></li>
<li><a href="#trunkSourceWebCoredomSecurityContexth">trunk/Source/WebCore/dom/SecurityContext.h</a></li>
<li><a href="#trunkSourceWebCorepageSuspendableTimercpp">trunk/Source/WebCore/page/SuspendableTimer.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSuspendableTimerh">trunk/Source/WebCore/page/SuspendableTimer.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214202 => 214203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-21 01:19:39 UTC (rev 214202)
+++ trunk/Source/WebCore/ChangeLog 2017-03-21 02:04:55 UTC (rev 214203)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2017-03-20 Simon Fraser <simon.fraser@apple.com>
+
+ Optimize packing of Document and superclass data members
+ https://bugs.webkit.org/show_bug.cgi?id=169880
+
+ Reviewed by Antti Koivisto.
+
+ Move data members around to optimize packing in SecurityContext, SuspendableTimer and Document.
+ This saves as few hundred bytes on Document.
+
+ Padding detected via Tools/Scripts/dump-class-layout
+
+ * dom/Document.cpp:
+ (WebCore::Document::Document):
+ * dom/Document.h:
+ * dom/ScriptExecutionContext.h:
+ * dom/SecurityContext.cpp:
+ (WebCore::SecurityContext::SecurityContext):
+ * dom/SecurityContext.h:
+ * page/SuspendableTimer.cpp:
+ (WebCore::SuspendableTimer::SuspendableTimer):
+ * page/SuspendableTimer.h:
+
</ins><span class="cx"> 2017-03-20 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Suspend media playback in background tabs
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (214202 => 214203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2017-03-21 01:19:39 UTC (rev 214202)
+++ trunk/Source/WebCore/dom/Document.cpp 2017-03-21 02:04:55 UTC (rev 214203)
</span><span class="lines">@@ -446,8 +446,8 @@
</span><span class="cx"> , m_styleScope(std::make_unique<Style::Scope>(*this))
</span><span class="cx"> , m_extensionStyleSheets(std::make_unique<ExtensionStyleSheets>(*this))
</span><span class="cx"> , m_visitedLinkState(std::make_unique<VisitedLinkState>(*this))
</span><ins>+ , m_markers(std::make_unique<DocumentMarkerController>(*this))
</ins><span class="cx"> , m_styleRecalcTimer(*this, &Document::updateStyleIfNeeded)
</span><del>- , m_markers(std::make_unique<DocumentMarkerController>(*this))
</del><span class="cx"> , m_updateFocusAppearanceTimer(*this, &Document::updateFocusAppearanceTimerFired)
</span><span class="cx"> , m_documentCreationTime(MonotonicTime::now())
</span><span class="cx"> , m_scriptRunner(std::make_unique<ScriptRunner>(*this))
</span><span class="lines">@@ -454,8 +454,6 @@
</span><span class="cx"> , m_moduleLoader(std::make_unique<ScriptModuleLoader>(*this))
</span><span class="cx"> , m_xmlVersion(ASCIILiteral("1.0"))
</span><span class="cx"> , m_documentClasses(documentClasses)
</span><del>- , m_isSynthesized(constructionFlags & Synthesized)
- , m_isNonRenderedPlaceholder(constructionFlags & NonRenderedPlaceholder)
</del><span class="cx"> , m_eventQueue(*this)
</span><span class="cx"> , m_weakFactory(this)
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><span class="lines">@@ -462,7 +460,6 @@
</span><span class="cx"> , m_fullScreenChangeDelayTimer(*this, &Document::fullScreenChangeDelayTimerFired)
</span><span class="cx"> #endif
</span><span class="cx"> , m_loadEventDelayTimer(*this, &Document::loadEventDelayTimerFired)
</span><del>- , m_referrerPolicy(ReferrerPolicy::Default)
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #if ENABLE(DEVICE_ORIENTATION)
</span><span class="cx"> , m_deviceMotionClient(std::make_unique<DeviceMotionClientIOS>())
</span><span class="lines">@@ -483,6 +480,8 @@
</span><span class="cx"> #if ENABLE(WEB_SOCKETS)
</span><span class="cx"> , m_socketProvider(page() ? &page()->socketProvider() : nullptr)
</span><span class="cx"> #endif
</span><ins>+ , m_isSynthesized(constructionFlags & Synthesized)
+ , m_isNonRenderedPlaceholder(constructionFlags & NonRenderedPlaceholder)
</ins><span class="cx"> {
</span><span class="cx"> allDocuments().add(this);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (214202 => 214203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2017-03-21 01:19:39 UTC (rev 214202)
+++ trunk/Source/WebCore/dom/Document.h 2017-03-21 02:04:55 UTC (rev 214203)
</span><span class="lines">@@ -1266,6 +1266,17 @@
</span><span class="cx"> bool hasHadActiveMediaStreamTrack() const { return m_hasHadActiveMediaStreamTrack; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+// FIXME: Find a better place for this functionality.
+#if ENABLE(TELEPHONE_NUMBER_DETECTION)
+ // These functions provide a two-level setting:
+ // - A user-settable wantsTelephoneNumberParsing (at the Page / WebView level)
+ // - A read-only telephoneNumberParsingAllowed which is set by the
+ // document if it has the appropriate meta tag.
+ // - isTelephoneNumberParsingEnabled() == isTelephoneNumberParsingAllowed() && page()->settings()->isTelephoneNumberParsingEnabled()
+ WEBCORE_EXPORT bool isTelephoneNumberParsingAllowed() const;
+ WEBCORE_EXPORT bool isTelephoneNumberParsingEnabled() const;
+#endif
+
</ins><span class="cx"> using ContainerNode::setAttributeEventListener;
</span><span class="cx"> void setAttributeEventListener(const AtomicString& eventType, const QualifiedName& attributeName, const AtomicString& value);
</span><span class="cx">
</span><span class="lines">@@ -1347,6 +1358,11 @@
</span><span class="cx"> void addDocumentToFullScreenChangeEventQueue(Document*);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(TELEPHONE_NUMBER_DETECTION)
+ friend void setParserFeature(const String& key, const String& value, Document*, void* userData);
+ void setIsTelephoneNumberParsingAllowed(bool);
+#endif
+
</ins><span class="cx"> void setVisualUpdatesAllowed(ReadyState);
</span><span class="cx"> void setVisualUpdatesAllowed(bool);
</span><span class="cx"> void visualUpdatesSuppressionTimerFired();
</span><span class="lines">@@ -1376,15 +1392,11 @@
</span><span class="cx">
</span><span class="cx"> bool shouldEnforceHTTP09Sandbox() const;
</span><span class="cx">
</span><del>- unsigned m_referencingNodeCount { 0 };
</del><ins>+ void platformSuspendOrStopActiveDOMObjects();
</ins><span class="cx">
</span><span class="cx"> const Ref<Settings> m_settings;
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<StyleResolver> m_userAgentShadowTreeStyleResolver;
</span><del>- bool m_hasNodesWithNonFinalStyle { false };
- // But sometimes you need to ignore pending stylesheet count to
- // force an immediate layout when requested by JS.
- bool m_ignorePendingStylesheets { false };
</del><span class="cx">
</span><span class="cx"> RefPtr<DOMWindow> m_domWindow;
</span><span class="cx"> WeakPtr<Document> m_contextDocument;
</span><span class="lines">@@ -1391,10 +1403,7 @@
</span><span class="cx">
</span><span class="cx"> Ref<CachedResourceLoader> m_cachedResourceLoader;
</span><span class="cx"> RefPtr<DocumentParser> m_parser;
</span><del>- unsigned m_activeParserCount { 0 };
</del><span class="cx">
</span><del>- bool m_wellFormed { false };
-
</del><span class="cx"> // Document URLs.
</span><span class="cx"> URL m_url; // Document.URL: The URL from which this document was retrieved.
</span><span class="cx"> URL m_baseURL; // Node.baseURI: The URL to use when resolving relative URLs.
</span><span class="lines">@@ -1419,17 +1428,6 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<DOMImplementation> m_implementation;
</span><span class="cx">
</span><del>- bool m_hasElementUsingStyleBasedEditability { false };
-
- bool m_printing { false };
- bool m_paginatedForScreen { false };
-
- DocumentCompatibilityMode m_compatibilityMode { DocumentCompatibilityMode::NoQuirksMode };
- bool m_compatibilityModeLocked { false }; // This is cheaper than making setCompatibilityMode virtual.
-
- Color m_textColor { Color::black };
-
- bool m_focusNavigationStartingNodeIsRemoved;
</del><span class="cx"> RefPtr<Node> m_focusNavigationStartingNode;
</span><span class="cx"> RefPtr<Element> m_focusedElement;
</span><span class="cx"> RefPtr<Element> m_hoveredElement;
</span><span class="lines">@@ -1443,10 +1441,6 @@
</span><span class="cx"> HashSet<NodeIterator*> m_nodeIterators;
</span><span class="cx"> HashSet<Range*> m_ranges;
</span><span class="cx">
</span><del>- unsigned m_listenerTypes { 0 };
-
- MutationObserverOptions m_mutationObserverTypes { 0 };
-
</del><span class="cx"> std::unique_ptr<Style::Scope> m_styleScope;
</span><span class="cx"> std::unique_ptr<ExtensionStyleSheets> m_extensionStyleSheets;
</span><span class="cx"> RefPtr<StyleSheetList> m_styleSheetList;
</span><span class="lines">@@ -1453,36 +1447,12 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<FormController> m_formController;
</span><span class="cx">
</span><ins>+ Color m_textColor { Color::black };
</ins><span class="cx"> Color m_linkColor;
</span><span class="cx"> Color m_visitedLinkColor;
</span><span class="cx"> Color m_activeLinkColor;
</span><span class="cx"> const std::unique_ptr<VisitedLinkState> m_visitedLinkState;
</span><span class="cx">
</span><del>- bool m_visuallyOrdered { false };
- ReadyState m_readyState { Complete };
- bool m_bParsing { false }; // FIXME: rename
-
- Timer m_styleRecalcTimer;
- bool m_pendingStyleRecalcShouldForce { false };
- bool m_inStyleRecalc { false };
- bool m_closeAfterStyleRecalc { false };
- bool m_inRenderTreeUpdate { false };
- unsigned m_lastStyleUpdateSizeForTesting { 0 };
-
- bool m_gotoAnchorNeededAfterStylesheetsLoad { false };
- bool m_isDNSPrefetchEnabled { false };
- bool m_haveExplicitlyDisabledDNSPrefetch { false };
- bool m_frameElementsShouldIgnoreScrolling { false };
- SelectionRestorationMode m_updateFocusAppearanceRestoresSelection { SelectionRestorationMode::SetDefault };
-
- // https://html.spec.whatwg.org/multipage/webappapis.html#ignore-destructive-writes-counter
- unsigned m_ignoreDestructiveWriteCount { 0 };
-
- // https://html.spec.whatwg.org/multipage/webappapis.html#ignore-opens-during-unload-counter
- unsigned m_ignoreOpensDuringUnloadCount { 0 };
-
- unsigned m_styleRecalcCount { 0 };
-
</del><span class="cx"> StringWithDirection m_title;
</span><span class="cx"> StringWithDirection m_rawTitle;
</span><span class="cx"> RefPtr<Element> m_titleElement;
</span><span class="lines">@@ -1490,17 +1460,11 @@
</span><span class="cx"> std::unique_ptr<AXObjectCache> m_axObjectCache;
</span><span class="cx"> const std::unique_ptr<DocumentMarkerController> m_markers;
</span><span class="cx">
</span><ins>+ Timer m_styleRecalcTimer;
</ins><span class="cx"> Timer m_updateFocusAppearanceTimer;
</span><span class="cx">
</span><span class="cx"> Element* m_cssTarget { nullptr };
</span><span class="cx">
</span><del>- // FIXME: Merge these 2 variables into an enum. Also, FrameLoader::m_didCallImplicitClose
- // is almost a duplication of this data, so that should probably get merged in too.
- // FIXME: Document::m_processingLoadEvent and DocumentLoader::m_wasOnloadDispatched are roughly the same
- // and should be merged.
- bool m_processingLoadEvent { false };
- bool m_loadEventFinished { false };
-
</del><span class="cx"> RefPtr<SerializedScriptValue> m_pendingStateObject;
</span><span class="cx"> MonotonicTime m_documentCreationTime;
</span><span class="cx"> bool m_overMinimumLayoutThreshold { false };
</span><span class="lines">@@ -1524,8 +1488,6 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<TextResourceDecoder> m_decoder;
</span><span class="cx">
</span><del>- InheritedBool m_designMode { inherit };
-
</del><span class="cx"> HashSet<LiveNodeList*> m_listsInvalidatedAtDocument;
</span><span class="cx"> HashSet<HTMLCollection*> m_collectionsInvalidatedAtDocument;
</span><span class="cx"> unsigned m_nodeListAndCollectionCounts[numNodeListInvalidationTypes];
</span><span class="lines">@@ -1542,9 +1504,6 @@
</span><span class="cx">
</span><span class="cx"> HashMap<String, RefPtr<HTMLCanvasElement>> m_cssCanvasElements;
</span><span class="cx">
</span><del>- bool m_createRenderers { true };
- PageCacheState m_pageCacheState { NotInPageCache };
-
</del><span class="cx"> HashSet<Element*> m_documentSuspensionCallbackElements;
</span><span class="cx"> HashSet<Element*> m_mediaVolumeCallbackElements;
</span><span class="cx"> HashSet<Element*> m_privateBrowsingStateChangedElements;
</span><span class="lines">@@ -1563,7 +1522,6 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> HashMap<StringImpl*, Element*, ASCIICaseInsensitiveHash> m_elementsByAccessKey;
</span><del>- bool m_accessKeyMapValid { false };
</del><span class="cx">
</span><span class="cx"> DocumentOrderedMap m_imagesByUsemap;
</span><span class="cx">
</span><span class="lines">@@ -1571,12 +1529,6 @@
</span><span class="cx">
</span><span class="cx"> DocumentClassFlags m_documentClasses;
</span><span class="cx">
</span><del>- bool m_isSynthesized { false };
- bool m_isNonRenderedPlaceholder { false };
-
- bool m_sawElementsInKnownNamespaces { false };
- bool m_isSrcdocDocument { false };
-
</del><span class="cx"> RenderPtr<RenderView> m_renderView;
</span><span class="cx"> mutable DocumentEventQueue m_eventQueue;
</span><span class="cx">
</span><span class="lines">@@ -1585,7 +1537,6 @@
</span><span class="cx"> HashSet<MediaCanStartListener*> m_mediaCanStartListeners;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><del>- bool m_areKeysEnabledInFullScreen { false };
</del><span class="cx"> RefPtr<Element> m_fullScreenElement;
</span><span class="cx"> Vector<RefPtr<Element>> m_fullScreenElementStack;
</span><span class="cx"> RenderFullScreen* m_fullScreenRenderer { nullptr };
</span><span class="lines">@@ -1592,27 +1543,24 @@
</span><span class="cx"> Timer m_fullScreenChangeDelayTimer;
</span><span class="cx"> Deque<RefPtr<Node>> m_fullScreenChangeEventTargetQueue;
</span><span class="cx"> Deque<RefPtr<Node>> m_fullScreenErrorEventTargetQueue;
</span><del>- bool m_isAnimatingFullScreen { false };
</del><span class="cx"> LayoutRect m_savedPlaceholderFrameRect;
</span><span class="cx"> std::unique_ptr<RenderStyle> m_savedPlaceholderRenderStyle;
</span><ins>+
+ bool m_areKeysEnabledInFullScreen { false };
+ bool m_isAnimatingFullScreen { false };
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> HashSet<HTMLPictureElement*> m_viewportDependentPictures;
</span><span class="cx">
</span><del>- int m_loadEventDelayCount { 0 };
</del><span class="cx"> Timer m_loadEventDelayTimer;
</span><span class="cx">
</span><span class="cx"> ViewportArguments m_viewportArguments;
</span><span class="cx">
</span><del>- ReferrerPolicy m_referrerPolicy;
-
</del><span class="cx"> #if ENABLE(WEB_TIMING)
</span><span class="cx"> DocumentTiming m_documentTiming;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> RefPtr<MediaQueryMatcher> m_mediaQueryMatcher;
</span><del>- bool m_writeRecursionIsTooDeep { false };
- unsigned m_writeRecursionDepth { 0 };
</del><span class="cx">
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx"> std::unique_ptr<EventTargetSet> m_touchEventTargets;
</span><span class="lines">@@ -1631,26 +1579,6 @@
</span><span class="cx"> std::unique_ptr<DeviceOrientationController> m_deviceOrientationController;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-// FIXME: Find a better place for this functionality.
-#if ENABLE(TELEPHONE_NUMBER_DETECTION)
-public:
-
- // These functions provide a two-level setting:
- // - A user-settable wantsTelephoneNumberParsing (at the Page / WebView level)
- // - A read-only telephoneNumberParsingAllowed which is set by the
- // document if it has the appropriate meta tag.
- // - isTelephoneNumberParsingEnabled() == isTelephoneNumberParsingAllowed() && page()->settings()->isTelephoneNumberParsingEnabled()
-
- WEBCORE_EXPORT bool isTelephoneNumberParsingAllowed() const;
- WEBCORE_EXPORT bool isTelephoneNumberParsingEnabled() const;
-
-private:
- friend void setParserFeature(const String& key, const String& value, Document*, void* userData);
- void setIsTelephoneNumberParsingAllowed(bool);
-
- bool m_isTelephoneNumberParsingAllowed { true };
-#endif
-
</del><span class="cx"> Timer m_pendingTasksTimer;
</span><span class="cx"> Vector<Task> m_pendingTasks;
</span><span class="cx">
</span><span class="lines">@@ -1665,11 +1593,6 @@
</span><span class="cx"> TextAutoSizingMap m_textAutoSizedNodes;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- void platformSuspendOrStopActiveDOMObjects();
-
- bool m_scheduledTasksAreSuspended { false };
-
- bool m_visualUpdatesAllowed { true };
</del><span class="cx"> Timer m_visualUpdatesSuppressionTimer;
</span><span class="cx">
</span><span class="cx"> RefPtr<NamedFlowCollection> m_namedFlows;
</span><span class="lines">@@ -1679,10 +1602,6 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<DocumentSharedObjectPool> m_sharedObjectPool;
</span><span class="cx">
</span><del>-#ifndef NDEBUG
- bool m_didDispatchViewportPropertiesChanged { false };
-#endif
-
</del><span class="cx"> typedef HashMap<AtomicString, std::unique_ptr<Locale>> LocaleIdentifierToLocaleMap;
</span><span class="cx"> LocaleIdentifierToLocaleMap m_localeCache;
</span><span class="cx">
</span><span class="lines">@@ -1695,12 +1614,107 @@
</span><span class="cx"> Ref<JSC::InputCursor> m_inputCursor;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ HashSet<MediaProducer*> m_audioProducers;
+
+ HashSet<ShadowRoot*> m_inDocumentShadowRoots;
+
+#if ENABLE(WIRELESS_PLAYBACK_TARGET)
+ typedef HashMap<uint64_t, WebCore::MediaPlaybackTargetClient*> TargetIdToClientMap;
+ TargetIdToClientMap m_idToClientMap;
+ typedef HashMap<WebCore::MediaPlaybackTargetClient*, uint64_t> TargetClientToIdMap;
+ TargetClientToIdMap m_clientToIDMap;
+#endif
+
+#if ENABLE(MEDIA_SESSION)
+ RefPtr<MediaSession> m_defaultMediaSession;
+#endif
+
+#if ENABLE(INDEXED_DATABASE)
+ RefPtr<IDBClient::IDBConnectionProxy> m_idbConnectionProxy;
+#endif
+
</ins><span class="cx"> Timer m_didAssociateFormControlsTimer;
</span><span class="cx"> Timer m_cookieCacheExpiryTimer;
</span><ins>+
+#if ENABLE(WEB_SOCKETS)
+ RefPtr<SocketProvider> m_socketProvider;
+#endif
+
</ins><span class="cx"> String m_cachedDOMCookies;
</span><ins>+
</ins><span class="cx"> HashSet<RefPtr<Element>> m_associatedFormControls;
</span><span class="cx"> unsigned m_disabledFieldsetElementsCount { 0 };
</span><span class="cx">
</span><ins>+ unsigned m_listenerTypes { 0 };
+ unsigned m_referencingNodeCount { 0 };
+ int m_loadEventDelayCount { 0 };
+ unsigned m_lastStyleUpdateSizeForTesting { 0 };
+
+ // https://html.spec.whatwg.org/multipage/webappapis.html#ignore-destructive-writes-counter
+ unsigned m_ignoreDestructiveWriteCount { 0 };
+
+ // https://html.spec.whatwg.org/multipage/webappapis.html#ignore-opens-during-unload-counter
+ unsigned m_ignoreOpensDuringUnloadCount { 0 };
+
+ unsigned m_activeParserCount { 0 };
+ unsigned m_styleRecalcCount { 0 };
+
+ unsigned m_writeRecursionDepth { 0 };
+
+ InheritedBool m_designMode { inherit };
+ MediaProducer::MediaStateFlags m_mediaState { MediaProducer::IsNotPlaying };
+ PageCacheState m_pageCacheState { NotInPageCache };
+ ReferrerPolicy m_referrerPolicy { ReferrerPolicy::Default };
+ ReadyState m_readyState { Complete };
+ SelectionRestorationMode m_updateFocusAppearanceRestoresSelection { SelectionRestorationMode::SetDefault };
+
+ MutationObserverOptions m_mutationObserverTypes { 0 };
+
+ bool m_writeRecursionIsTooDeep { false };
+ bool m_wellFormed { false };
+ bool m_createRenderers { true };
+
+ bool m_hasNodesWithNonFinalStyle { false };
+ // But sometimes you need to ignore pending stylesheet count to
+ // force an immediate layout when requested by JS.
+ bool m_ignorePendingStylesheets { false };
+
+ bool m_hasElementUsingStyleBasedEditability { false };
+ bool m_focusNavigationStartingNodeIsRemoved { false };
+
+ bool m_printing { false };
+ bool m_paginatedForScreen { false };
+
+ DocumentCompatibilityMode m_compatibilityMode { DocumentCompatibilityMode::NoQuirksMode };
+ bool m_compatibilityModeLocked { false }; // This is cheaper than making setCompatibilityMode virtual.
+
+ // FIXME: Merge these 2 variables into an enum. Also, FrameLoader::m_didCallImplicitClose
+ // is almost a duplication of this data, so that should probably get merged in too.
+ // FIXME: Document::m_processingLoadEvent and DocumentLoader::m_wasOnloadDispatched are roughly the same
+ // and should be merged.
+ bool m_processingLoadEvent { false };
+ bool m_loadEventFinished { false };
+
+ bool m_visuallyOrdered { false };
+ bool m_bParsing { false }; // FIXME: rename
+
+ bool m_pendingStyleRecalcShouldForce { false };
+ bool m_inStyleRecalc { false };
+ bool m_closeAfterStyleRecalc { false };
+ bool m_inRenderTreeUpdate { false };
+
+ bool m_gotoAnchorNeededAfterStylesheetsLoad { false };
+ bool m_isDNSPrefetchEnabled { false };
+ bool m_haveExplicitlyDisabledDNSPrefetch { false };
+ bool m_frameElementsShouldIgnoreScrolling { false };
+
+ bool m_accessKeyMapValid { false };
+ bool m_isSynthesized { false };
+ bool m_isNonRenderedPlaceholder { false };
+
+ bool m_sawElementsInKnownNamespaces { false };
+ bool m_isSrcdocDocument { false };
+
</ins><span class="cx"> bool m_hasInjectedPlugInsScript { false };
</span><span class="cx"> bool m_renderTreeBeingDestroyed { false };
</span><span class="cx"> bool m_hasPreparedForDestruction { false };
</span><span class="lines">@@ -1709,33 +1723,22 @@
</span><span class="cx"> bool m_isTimerThrottlingEnabled { false };
</span><span class="cx"> bool m_isSuspended { false };
</span><span class="cx">
</span><del>- HashSet<MediaProducer*> m_audioProducers;
- MediaProducer::MediaStateFlags m_mediaState { MediaProducer::IsNotPlaying };
</del><ins>+ bool m_scheduledTasksAreSuspended { false };
+ bool m_visualUpdatesAllowed { true };
</ins><span class="cx">
</span><del>- HashSet<ShadowRoot*> m_inDocumentShadowRoots;
</del><ins>+ bool m_areDeviceMotionAndOrientationUpdatesSuspended { false };
</ins><span class="cx">
</span><del>-#if ENABLE(WIRELESS_PLAYBACK_TARGET)
- typedef HashMap<uint64_t, WebCore::MediaPlaybackTargetClient*> TargetIdToClientMap;
- TargetIdToClientMap m_idToClientMap;
- typedef HashMap<WebCore::MediaPlaybackTargetClient*, uint64_t> TargetClientToIdMap;
- TargetClientToIdMap m_clientToIDMap;
</del><ins>+#if ENABLE(TELEPHONE_NUMBER_DETECTION)
+ bool m_isTelephoneNumberParsingAllowed { true };
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(MEDIA_SESSION)
- RefPtr<MediaSession> m_defaultMediaSession;
-#endif
- bool m_areDeviceMotionAndOrientationUpdatesSuspended { false };
-
</del><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><span class="cx"> bool m_hasHadActiveMediaStreamTrack { false };
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(INDEXED_DATABASE)
- RefPtr<IDBClient::IDBConnectionProxy> m_idbConnectionProxy;
</del><ins>+#ifndef NDEBUG
+ bool m_didDispatchViewportPropertiesChanged { false };
</ins><span class="cx"> #endif
</span><del>-#if ENABLE(WEB_SOCKETS)
- RefPtr<SocketProvider> m_socketProvider;
-#endif
</del><span class="cx">
</span><span class="cx"> static bool hasEverCreatedAnAXObjectCache;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptExecutionContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.h (214202 => 214203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptExecutionContext.h 2017-03-21 01:19:39 UTC (rev 214202)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.h 2017-03-21 02:04:55 UTC (rev 214203)
</span><span class="lines">@@ -240,24 +240,25 @@
</span><span class="cx"> HashSet<ContextDestructionObserver*> m_destructionObservers;
</span><span class="cx"> HashSet<ActiveDOMObject*> m_activeDOMObjects;
</span><span class="cx">
</span><del>- int m_circularSequentialID { 0 };
</del><span class="cx"> HashMap<int, RefPtr<DOMTimer>> m_timeouts;
</span><span class="cx">
</span><del>- bool m_inDispatchErrorEvent { false };
</del><span class="cx"> struct PendingException;
</span><span class="cx"> std::unique_ptr<Vector<std::unique_ptr<PendingException>>> m_pendingExceptions;
</span><span class="cx">
</span><del>- bool m_activeDOMObjectsAreSuspended { false };
</del><span class="cx"> ActiveDOMObject::ReasonForSuspension m_reasonForSuspendingActiveDOMObjects { static_cast<ActiveDOMObject::ReasonForSuspension>(-1) };
</span><del>- bool m_activeDOMObjectsAreStopped { false };
</del><span class="cx">
</span><span class="cx"> std::unique_ptr<PublicURLManager> m_publicURLManager;
</span><span class="cx">
</span><span class="cx"> RefPtr<DatabaseContext> m_databaseContext;
</span><span class="cx">
</span><ins>+ int m_circularSequentialID { 0 };
+ int m_timerNestingLevel { 0 };
+
+ bool m_activeDOMObjectsAreSuspended { false };
+ bool m_activeDOMObjectsAreStopped { false };
+ bool m_inDispatchErrorEvent { false };
</ins><span class="cx"> bool m_activeDOMObjectAdditionForbidden { false };
</span><span class="cx"> bool m_willProcessMessagePortMessagesSoon { false };
</span><del>- int m_timerNestingLevel { 0 };
</del><span class="cx">
</span><span class="cx"> #if !ASSERT_DISABLED
</span><span class="cx"> bool m_inScriptExecutionContextDestructor { false };
</span></span></pre></div>
<a id="trunkSourceWebCoredomSecurityContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/SecurityContext.cpp (214202 => 214203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/SecurityContext.cpp 2017-03-21 01:19:39 UTC (rev 214202)
+++ trunk/Source/WebCore/dom/SecurityContext.cpp 2017-03-21 02:04:55 UTC (rev 214203)
</span><span class="lines">@@ -37,8 +37,6 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> SecurityContext::SecurityContext()
</span><del>- : m_haveInitializedSecurityOrigin(false)
- , m_sandboxFlags(SandboxNone)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomSecurityContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/SecurityContext.h (214202 => 214203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/SecurityContext.h 2017-03-21 01:19:39 UTC (rev 214202)
+++ trunk/Source/WebCore/dom/SecurityContext.h 2017-03-21 02:04:55 UTC (rev 214203)
</span><span class="lines">@@ -39,17 +39,17 @@
</span><span class="cx">
</span><span class="cx"> enum SandboxFlag {
</span><span class="cx"> // See http://www.whatwg.org/specs/web-apps/current-work/#attr-iframe-sandbox for a list of the sandbox flags.
</span><del>- SandboxNone = 0,
- SandboxNavigation = 1,
- SandboxPlugins = 1 << 1,
- SandboxOrigin = 1 << 2,
- SandboxForms = 1 << 3,
- SandboxScripts = 1 << 4,
- SandboxTopNavigation = 1 << 5,
- SandboxPopups = 1 << 6, // See https://www.w3.org/Bugs/Public/show_bug.cgi?id=12393
- SandboxAutomaticFeatures = 1 << 7,
- SandboxPointerLock = 1 << 8,
- SandboxAll = -1 // Mask with all bits set to 1.
</del><ins>+ SandboxNone = 0,
+ SandboxNavigation = 1,
+ SandboxPlugins = 1 << 1,
+ SandboxOrigin = 1 << 2,
+ SandboxForms = 1 << 3,
+ SandboxScripts = 1 << 4,
+ SandboxTopNavigation = 1 << 5,
+ SandboxPopups = 1 << 6, // See https://www.w3.org/Bugs/Public/show_bug.cgi?id=12393
+ SandboxAutomaticFeatures = 1 << 7,
+ SandboxPointerLock = 1 << 8,
+ SandboxAll = -1 // Mask with all bits set to 1.
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef int SandboxFlags;
</span><span class="lines">@@ -94,10 +94,10 @@
</span><span class="cx"> bool haveInitializedSecurityOrigin() const { return m_haveInitializedSecurityOrigin; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- bool m_haveInitializedSecurityOrigin;
- SandboxFlags m_sandboxFlags;
</del><span class="cx"> RefPtr<SecurityOriginPolicy> m_securityOriginPolicy;
</span><span class="cx"> std::unique_ptr<ContentSecurityPolicy> m_contentSecurityPolicy;
</span><ins>+ SandboxFlags m_sandboxFlags { SandboxNone };
+ bool m_haveInitializedSecurityOrigin { false };
</ins><span class="cx"> bool m_foundMixedContent { false };
</span><span class="cx"> bool m_geolocationAccessed { false };
</span><span class="cx"> bool m_isStrictMixedContentMode { false };
</span></span></pre></div>
<a id="trunkSourceWebCorepageSuspendableTimercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/SuspendableTimer.cpp (214202 => 214203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/SuspendableTimer.cpp 2017-03-21 01:19:39 UTC (rev 214202)
+++ trunk/Source/WebCore/page/SuspendableTimer.cpp 2017-03-21 02:04:55 UTC (rev 214203)
</span><span class="lines">@@ -33,10 +33,6 @@
</span><span class="cx">
</span><span class="cx"> SuspendableTimer::SuspendableTimer(ScriptExecutionContext& context)
</span><span class="cx"> : ActiveDOMObject(&context)
</span><del>- , m_suspended(false)
- , m_savedNextFireInterval(0)
- , m_savedRepeatInterval(0)
- , m_savedIsActive(false)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageSuspendableTimerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/SuspendableTimer.h (214202 => 214203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/SuspendableTimer.h 2017-03-21 01:19:39 UTC (rev 214202)
+++ trunk/Source/WebCore/page/SuspendableTimer.h 2017-03-21 02:04:55 UTC (rev 214203)
</span><span class="lines">@@ -84,11 +84,11 @@
</span><span class="cx"> void suspend(ReasonForSuspension) final;
</span><span class="cx"> void resume() final;
</span><span class="cx">
</span><del>- bool m_suspended;
</del><ins>+ double m_savedNextFireInterval { 0 };
+ double m_savedRepeatInterval { 0 };
</ins><span class="cx">
</span><del>- double m_savedNextFireInterval;
- double m_savedRepeatInterval;
- bool m_savedIsActive;
</del><ins>+ bool m_suspended { false };
+ bool m_savedIsActive { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>