Imported WebKit commit 0dc6cd75e1d4836eaffbb520be96fac4847cc9d2 (http://svn.webkit.org/repository/webkit/trunk@131300)

WebKit update which introduces the QtWebKitWidgets module that contains the WK1
widgets based API. (In fact it renames QtWebKit to QtWebKitWidgets while we're
working on completing the entire split as part of
https://bugs.webkit.org/show_bug.cgi?id=99314

7 files changed, 253 insertions, 189 deletions

diff --git a/Source/WebCore/testing/InternalSettings.cpp b/Source/WebCore/testing/InternalSettings.cpp
index bb9eed6b1..8d8f0cb40 100755
--- a/Source/WebCore/testing/InternalSettings.cpp
+++ b/Source/WebCore/testing/InternalSettings.cpp
@@ -79,6 +79,9 @@ InternalSettings::Backup::Backup(Page* page, Settings* settings)
     , m_originalShadowDOMEnabled(RuntimeEnabledFeatures::shadowDOMEnabled())
     , m_originalAuthorShadowDOMForAnyElementEnabled(RuntimeEnabledFeatures::authorShadowDOMForAnyElementEnabled())
 #endif
+#if ENABLE(STYLE_SCOPED)
+    , m_originalStyleScoped(RuntimeEnabledFeatures::styleScopedEnabled())
+#endif
     , m_originalEditingBehavior(settings->editingBehaviorType())
     , m_originalUnifiedSpellCheckerEnabled(settings->unifiedTextCheckerEnabled())
     , m_originalFixedPositionCreatesStackingContext(settings->fixedPositionCreatesStackingContext())
@@ -114,6 +117,9 @@ void InternalSettings::Backup::restoreTo(Page* page, Settings* settings)
     RuntimeEnabledFeatures::setShadowDOMEnabled(m_originalShadowDOMEnabled);
     RuntimeEnabledFeatures::setAuthorShadowDOMForAnyElementEnabled(m_originalAuthorShadowDOMForAnyElementEnabled);
 #endif
+#if ENABLE(STYLE_SCOPED)
+    RuntimeEnabledFeatures::setStyleScopedEnabled(m_originalStyleScoped);
+#endif
     settings->setEditingBehaviorType(m_originalEditingBehavior);
     settings->setUnifiedTextCheckerEnabled(m_originalUnifiedSpellCheckerEnabled);
     settings->setFixedPositionCreatesStackingContext(m_originalFixedPositionCreatesStackingContext);
@@ -302,6 +308,15 @@ void InternalSettings::setAuthorShadowDOMForAnyElementEnabled(bool isEnabled)
 #endif
 }
 
+void InternalSettings::setStyleScopedEnabled(bool enabled)
+{
+#if ENABLE(STYLE_SCOPED)
+    RuntimeEnabledFeatures::setStyleScopedEnabled(enabled);
+#else
+    UNUSED_PARAM(enabled);
+#endif
+}
+
 void InternalSettings::setTouchEventEmulationEnabled(bool enabled, ExceptionCode& ec)
 {
 #if ENABLE(TOUCH_EVENTS)
diff --git a/Source/WebCore/testing/InternalSettings.h b/Source/WebCore/testing/InternalSettings.h
index be8810de6..78f36e017 100755
--- a/Source/WebCore/testing/InternalSettings.h
+++ b/Source/WebCore/testing/InternalSettings.h
@@ -61,6 +61,9 @@ public:
         bool m_originalShadowDOMEnabled;
         bool m_originalAuthorShadowDOMForAnyElementEnabled;
 #endif
+#if ENABLE(STYLE_SCOPED)
+        bool m_originalStyleScoped;
+#endif
         EditingBehaviorType m_originalEditingBehavior;
         bool m_originalUnifiedSpellCheckerEnabled;
         bool m_originalFixedPositionCreatesStackingContext;
@@ -113,6 +116,7 @@ public:
     void setDeviceSupportsMouse(bool enabled, ExceptionCode&);
     void setShadowDOMEnabled(bool enabled, ExceptionCode&);
     void setAuthorShadowDOMForAnyElementEnabled(bool);
+    void setStyleScopedEnabled(bool);
     void setStandardFontFamily(const String& family, const String& script, ExceptionCode&);
     void setSerifFontFamily(const String& family, const String& script, ExceptionCode&);
     void setSansSerifFontFamily(const String& family, const String& script, ExceptionCode&);
diff --git a/Source/WebCore/testing/InternalSettings.idl b/Source/WebCore/testing/InternalSettings.idl
index d8a8aaf8b..f3464be9a 100755
--- a/Source/WebCore/testing/InternalSettings.idl
+++ b/Source/WebCore/testing/InternalSettings.idl
@@ -23,66 +23,64 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-module window {
-    interface [
-        OmitConstructor
-    ] InternalSettings {
-        void setInspectorResourcesDataSizeLimits(in long maximumResourcesContentSize, in long maximumSingleResourceContentSize) raises(DOMException);
-        void setForceCompositingMode(in boolean enabled) raises(DOMException);
-        void setEnableCompositingForFixedPosition(in boolean enabled) raises(DOMException);
-        void setEnableCompositingForScrollableFrames(in boolean enabled) raises(DOMException);
-        void setAcceleratedDrawingEnabled(in boolean enabled) raises(DOMException);
-        void setAcceleratedFiltersEnabled(in boolean enabled) raises(DOMException);
-        void setMockScrollbarsEnabled(in boolean enabled) raises(DOMException);
-        void setUsesOverlayScrollbars(in boolean flag);
-        void setPasswordEchoEnabled(in boolean enabled) raises(DOMException);
-        void setPasswordEchoDurationInSeconds(in double durationInSeconds) raises(DOMException);
-        void setFixedElementsLayoutRelativeToFrame(in boolean enabled) raises(DOMException);
-        void setUnifiedTextCheckingEnabled(in boolean enabled) raises (DOMException);
-        boolean unifiedTextCheckingEnabled() raises (DOMException);
-        void setPageScaleFactor(in float scaleFactor, in long x, in long y) raises(DOMException);
-        void setTouchEventEmulationEnabled(in boolean enabled) raises(DOMException);
-        void setDeviceSupportsTouch(in boolean enabled) raises(DOMException);
-        void setDeviceSupportsMouse(in boolean enabled) raises(DOMException);
-        void setShadowDOMEnabled(in boolean enabled) raises(DOMException);
-        void setAuthorShadowDOMForAnyElementEnabled(in boolean isEnabled);
-        void setStandardFontFamily(in DOMString family, in DOMString script) raises(DOMException);
-        void setSerifFontFamily(in DOMString family, in DOMString script) raises(DOMException);
-        void setSansSerifFontFamily(in DOMString family, in DOMString script) raises(DOMException);
-        void setFixedFontFamily(in DOMString family, in DOMString script) raises(DOMException);
-        void setCursiveFontFamily(in DOMString family, in DOMString script) raises(DOMException);
-        void setFantasyFontFamily(in DOMString family, in DOMString script) raises(DOMException);
-        void setPictographFontFamily(in DOMString family, in DOMString script) raises(DOMException);
-        void setTextAutosizingEnabled(in boolean enabled) raises(DOMException);
-        void setTextAutosizingWindowSizeOverride(in long width, in long height) raises(DOMException);
-        void setTextAutosizingFontScaleFactor(in float fontScaleFactor) raises(DOMException);
-        void setEnableScrollAnimator(in boolean enabled) raises(DOMException);
-        boolean scrollAnimatorEnabled() raises(DOMException);
-        void setCSSExclusionsEnabled(in boolean enabled) raises(DOMException);
-        void setCSSVariablesEnabled(in boolean enabled) raises(DOMException);
-        boolean cssVariablesEnabled() raises(DOMException);
-        void setCanStartMedia(in boolean enabled) raises(DOMException);
-        void setMediaPlaybackRequiresUserGesture(in boolean enabled) raises(DOMException);
-        void setEditingBehavior(in DOMString behavior) raises(DOMException);
-        void setFixedPositionCreatesStackingContext(in boolean creates) raises(DOMException);
-        void setSyncXHRInDocumentsEnabled(in boolean enabled) raises(DOMException);
-        void setJavaScriptProfilingEnabled(in boolean creates) raises(DOMException);
-        void setWindowFocusRestricted(in boolean restricted) raises(DOMException);
-        void setDialogElementEnabled(in boolean enabled) raises(DOMException);
-        void setLangAttributeAwareFormControlUIEnabled(in boolean enabled);
+[
+    OmitConstructor
+] interface InternalSettings {
+    void setInspectorResourcesDataSizeLimits(in long maximumResourcesContentSize, in long maximumSingleResourceContentSize) raises(DOMException);
+    void setForceCompositingMode(in boolean enabled) raises(DOMException);
+    void setEnableCompositingForFixedPosition(in boolean enabled) raises(DOMException);
+    void setEnableCompositingForScrollableFrames(in boolean enabled) raises(DOMException);
+    void setAcceleratedDrawingEnabled(in boolean enabled) raises(DOMException);
+    void setAcceleratedFiltersEnabled(in boolean enabled) raises(DOMException);
+    void setMockScrollbarsEnabled(in boolean enabled) raises(DOMException);
+    void setUsesOverlayScrollbars(in boolean flag);
+    void setPasswordEchoEnabled(in boolean enabled) raises(DOMException);
+    void setPasswordEchoDurationInSeconds(in double durationInSeconds) raises(DOMException);
+    void setFixedElementsLayoutRelativeToFrame(in boolean enabled) raises(DOMException);
+    void setUnifiedTextCheckingEnabled(in boolean enabled) raises (DOMException);
+    boolean unifiedTextCheckingEnabled() raises (DOMException);
+    void setPageScaleFactor(in float scaleFactor, in long x, in long y) raises(DOMException);
+    void setTouchEventEmulationEnabled(in boolean enabled) raises(DOMException);
+    void setDeviceSupportsTouch(in boolean enabled) raises(DOMException);
+    void setDeviceSupportsMouse(in boolean enabled) raises(DOMException);
+    void setShadowDOMEnabled(in boolean enabled) raises(DOMException);
+    void setAuthorShadowDOMForAnyElementEnabled(in boolean isEnabled);
+    void setStyleScopedEnabled(in boolean isEnabled);
+    void setStandardFontFamily(in DOMString family, in DOMString script) raises(DOMException);
+    void setSerifFontFamily(in DOMString family, in DOMString script) raises(DOMException);
+    void setSansSerifFontFamily(in DOMString family, in DOMString script) raises(DOMException);
+    void setFixedFontFamily(in DOMString family, in DOMString script) raises(DOMException);
+    void setCursiveFontFamily(in DOMString family, in DOMString script) raises(DOMException);
+    void setFantasyFontFamily(in DOMString family, in DOMString script) raises(DOMException);
+    void setPictographFontFamily(in DOMString family, in DOMString script) raises(DOMException);
+    void setTextAutosizingEnabled(in boolean enabled) raises(DOMException);
+    void setTextAutosizingWindowSizeOverride(in long width, in long height) raises(DOMException);
+    void setTextAutosizingFontScaleFactor(in float fontScaleFactor) raises(DOMException);
+    void setEnableScrollAnimator(in boolean enabled) raises(DOMException);
+    boolean scrollAnimatorEnabled() raises(DOMException);
+    void setCSSExclusionsEnabled(in boolean enabled) raises(DOMException);
+    void setCSSVariablesEnabled(in boolean enabled) raises(DOMException);
+    boolean cssVariablesEnabled() raises(DOMException);
+    void setCanStartMedia(in boolean enabled) raises(DOMException);
+    void setMediaPlaybackRequiresUserGesture(in boolean enabled) raises(DOMException);
+    void setEditingBehavior(in DOMString behavior) raises(DOMException);
+    void setFixedPositionCreatesStackingContext(in boolean creates) raises(DOMException);
+    void setSyncXHRInDocumentsEnabled(in boolean enabled) raises(DOMException);
+    void setJavaScriptProfilingEnabled(in boolean creates) raises(DOMException);
+    void setWindowFocusRestricted(in boolean restricted) raises(DOMException);
+    void setDialogElementEnabled(in boolean enabled) raises(DOMException);
+    void setLangAttributeAwareFormControlUIEnabled(in boolean enabled);
 
-        void setPagination(in DOMString mode, in long gap, in [Optional] long pageLength) raises(DOMException);
-        sequence<String> userPreferredLanguages();
-        void setUserPreferredLanguages(in sequence<String> languages);
-        void allowRoundingHacks();
-        void setEnableMockPagePopup(in boolean enabled) raises(DOMException);
+    void setPagination(in DOMString mode, in long gap, in [Optional] long pageLength) raises(DOMException);
+    sequence<String> userPreferredLanguages();
+    void setUserPreferredLanguages(in sequence<String> languages);
+    void allowRoundingHacks();
+    void setEnableMockPagePopup(in boolean enabled) raises(DOMException);
 #if defined(ENABLE_VIDEO_TRACK) && ENABLE_VIDEO_TRACK
-        void setShouldDisplayTrackKind(in DOMString kind, in boolean enabled) raises (DOMException);
-        boolean shouldDisplayTrackKind(in DOMString trackKind) raises (DOMException);
+    void setShouldDisplayTrackKind(in DOMString kind, in boolean enabled) raises (DOMException);
+    boolean shouldDisplayTrackKind(in DOMString trackKind) raises (DOMException);
 #endif
-        void setMemoryInfoEnabled(in boolean enabled) raises(DOMException);
-        void setStorageBlockingPolicy(in DOMString policy) raises(DOMException);
-        void setImagesEnabled(in boolean enabled) raises(DOMException);
-    };
-}
-
+    void setMemoryInfoEnabled(in boolean enabled) raises(DOMException);
+    void setStorageBlockingPolicy(in DOMString policy) raises(DOMException);
+    void setImagesEnabled(in boolean enabled) raises(DOMException);
+};
diff --git a/Source/WebCore/testing/Internals.cpp b/Source/WebCore/testing/Internals.cpp
index a213f2faf..a430fc5a3 100644
--- a/Source/WebCore/testing/Internals.cpp
+++ b/Source/WebCore/testing/Internals.cpp
@@ -297,6 +297,25 @@ Node* Internals::parentTreeScope(Node* node, ExceptionCode& ec)
     return parentTreeScope ? parentTreeScope->rootNode() : 0;
 }
 
+PassRefPtr<NodeList> Internals::distributedNodes(Element* insertionPoint, ExceptionCode& ec)
+{
+    if (!insertionPoint || !isInsertionPoint(insertionPoint)) {
+        ec = INVALID_ACCESS_ERR;
+        return 0;
+    }
+
+    return toInsertionPoint(insertionPoint)->distributedNodes();
+}
+
+bool Internals::hasShadowInsertionPoint(const Node* root, ExceptionCode& ec) const
+{
+    if (root && root->isShadowRoot())
+        return toShadowRoot(root)->hasShadowInsertionPoint();
+
+    ec = INVALID_ACCESS_ERR;
+    return 0;
+}
+
 bool Internals::attached(Node* node, ExceptionCode& ec)
 {
     if (!node) {
@@ -1213,6 +1232,25 @@ void Internals::resumeAnimations(Document* document, ExceptionCode& ec) const
     controller->resumeAnimations();
 }
 
+String Internals::layerTreeAsText(Document* document, ExceptionCode& ec) const
+{
+    return layerTreeAsText(document, 0, ec);
+}
+
+String Internals::layerTreeAsText(Document* document, unsigned flags, ExceptionCode& ec) const
+{
+    if (!document || !document->frame()) {
+        ec = INVALID_ACCESS_ERR;
+        return String();
+    }
+
+    LayerTreeFlags layerTreeFlags = 0;
+    if (flags & LAYER_TREE_INCLUDES_VISIBLE_RECTS)
+        layerTreeFlags |= LayerTreeFlagsIncludeVisibleRects;
+
+    return document->frame()->layerTreeAsText(layerTreeFlags);
+}
+
 void Internals::garbageCollectDocumentResources(Document* document, ExceptionCode& ec) const
 {
     if (!document) {
diff --git a/Source/WebCore/testing/Internals.h b/Source/WebCore/testing/Internals.h
index c3c4cb44b..e4ab96d66 100644
--- a/Source/WebCore/testing/Internals.h
+++ b/Source/WebCore/testing/Internals.h
@@ -80,6 +80,7 @@ public:
     ShadowRootIfShadowDOMEnabledOrNode* oldestShadowRoot(Element* host, ExceptionCode&);
     ShadowRootIfShadowDOMEnabledOrNode* youngerShadowRoot(Node* shadow, ExceptionCode&);
     ShadowRootIfShadowDOMEnabledOrNode* olderShadowRoot(Node* shadow, ExceptionCode&);
+    bool hasShadowInsertionPoint(const Node*, ExceptionCode&) const;
     Element* includerFor(Node*, ExceptionCode&);
     String shadowPseudoId(Element*, ExceptionCode&);
     void setShadowPseudoId(Element*, const String&, ExceptionCode&);
@@ -89,6 +90,7 @@ public:
     bool isValidContentSelect(Element* insertionPoint, ExceptionCode&);
     Node* treeScopeRootNode(Node*, ExceptionCode&);
     Node* parentTreeScope(Node*, ExceptionCode&);
+    PassRefPtr<NodeList> distributedNodes(Element* insertionPoint, ExceptionCode&);
 
     bool attached(Node*, ExceptionCode&);
 
@@ -186,6 +188,12 @@ public:
     void suspendAnimations(Document*, ExceptionCode&) const;
     void resumeAnimations(Document*, ExceptionCode&) const;
 
+    enum {
+        LAYER_TREE_INCLUDES_VISIBLE_RECTS = 1 // Values need to kept in sync with Internals.idl.
+    };
+    String layerTreeAsText(Document*, unsigned flags, ExceptionCode&) const;
+    String layerTreeAsText(Document*, ExceptionCode&) const;
+
     void garbageCollectDocumentResources(Document*, ExceptionCode&) const;
 
     void allowRoundingHacks() const;
diff --git a/Source/WebCore/testing/Internals.idl b/Source/WebCore/testing/Internals.idl
index f7d0bce70..3e2d47468 100644
--- a/Source/WebCore/testing/Internals.idl
+++ b/Source/WebCore/testing/Internals.idl
@@ -23,178 +23,181 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-module window {
-    interface [
-        OmitConstructor
-    ] Internals {
-        DOMString address(in Node node);
+[
+    OmitConstructor
+] interface Internals {
+    DOMString address(in Node node);
 
-        DOMString elementRenderTreeAsText(in Element element) raises(DOMException);
-        boolean isPreloaded(in Document document, in DOMString url);
+    DOMString elementRenderTreeAsText(in Element element) raises(DOMException);
+    boolean isPreloaded(in Document document, in DOMString url);
 
-        unsigned long numberOfScopedHTMLStyleChildren(in Node scope) raises(DOMException);
+    unsigned long numberOfScopedHTMLStyleChildren(in Node scope) raises(DOMException);
 
 #if defined(ENABLE_SHADOW_DOM) && ENABLE_SHADOW_DOM
-        ShadowRoot ensureShadowRoot(in Element host) raises (DOMException);
-        ShadowRoot shadowRoot(in Element host) raises (DOMException);
-        ShadowRoot youngestShadowRoot(in Element host) raises (DOMException);
-        ShadowRoot oldestShadowRoot(in Element host) raises (DOMException);
-        ShadowRoot youngerShadowRoot(in Node root) raises (DOMException);
-        ShadowRoot olderShadowRoot(in Node root) raises (DOMException);
+    ShadowRoot ensureShadowRoot(in Element host) raises (DOMException);
+    ShadowRoot shadowRoot(in Element host) raises (DOMException);
+    ShadowRoot youngestShadowRoot(in Element host) raises (DOMException);
+    ShadowRoot oldestShadowRoot(in Element host) raises (DOMException);
+    ShadowRoot youngerShadowRoot(in Node root) raises (DOMException);
+    ShadowRoot olderShadowRoot(in Node root) raises (DOMException);
 #else
-        Node ensureShadowRoot(in Element host) raises (DOMException);
-        Node shadowRoot(in Element host) raises (DOMException);
-        Node youngestShadowRoot(in Element host) raises (DOMException);
-        Node oldestShadowRoot(in Element host) raises (DOMException);
-        Node youngerShadowRoot(in Node root) raises (DOMException);
+    Node ensureShadowRoot(in Element host) raises (DOMException);
+    Node shadowRoot(in Element host) raises (DOMException);
+    Node youngestShadowRoot(in Element host) raises (DOMException);
+    Node oldestShadowRoot(in Element host) raises (DOMException);
+    Node youngerShadowRoot(in Node root) raises (DOMException);
 #endif
-        Element includerFor(in Node node) raises (DOMException);
-        DOMString shadowPseudoId(in Element element) raises (DOMException);
-        void setShadowPseudoId(in Element element, in DOMString id) raises (DOMException);
-        Element createContentElement(in Document document) raises(DOMException);
-        Element getElementByIdInShadowRoot(in Node shadowRoot, in DOMString id) raises(DOMException);
-        boolean isValidContentSelect(in Element contentElement) raises(DOMException);
-        Node treeScopeRootNode(in Node node) raises (DOMException);
-        Node parentTreeScope(in Node node) raises (DOMException);
-
-        Node nextSiblingByWalker(in Node node) raises(DOMException);
-        Node firstChildByWalker(in Node node) raises(DOMException);
-        Node lastChildByWalker(in Node node) raises(DOMException);
-        Node nextNodeByWalker(in Node node) raises(DOMException);
-        Node previousNodeByWalker(in Node node) raises(DOMException);
-
-        boolean attached(in Node node) raises(DOMException);
-
-        DOMString visiblePlaceholder(in Element element);
+    boolean hasShadowInsertionPoint(in Node root) raises (DOMException);
+    Element includerFor(in Node node) raises (DOMException);
+    DOMString shadowPseudoId(in Element element) raises (DOMException);
+    void setShadowPseudoId(in Element element, in DOMString id) raises (DOMException);
+    Element createContentElement(in Document document) raises(DOMException);
+    Element getElementByIdInShadowRoot(in Node shadowRoot, in DOMString id) raises(DOMException);
+    boolean isValidContentSelect(in Element contentElement) raises(DOMException);
+    Node treeScopeRootNode(in Node node) raises (DOMException);
+    Node parentTreeScope(in Node node) raises (DOMException);
+    NodeList distributedNodes(in Element insertionPoint) raises(DOMException);
+
+    Node nextSiblingByWalker(in Node node) raises(DOMException);
+    Node firstChildByWalker(in Node node) raises(DOMException);
+    Node lastChildByWalker(in Node node) raises(DOMException);
+    Node nextNodeByWalker(in Node node) raises(DOMException);
+    Node previousNodeByWalker(in Node node) raises(DOMException);
+
+    boolean attached(in Node node) raises(DOMException);
+
+    DOMString visiblePlaceholder(in Element element);
 #if defined(ENABLE_INPUT_TYPE_COLOR) && ENABLE_INPUT_TYPE_COLOR
-        void selectColorInColorChooser(in Element element, in DOMString colorValue);
+    void selectColorInColorChooser(in Element element, in DOMString colorValue);
 #endif
-        DOMString[] formControlStateOfPreviousHistoryItem() raises(DOMException);
-        void setFormControlStateOfPreviousHistoryItem(in DOMString[] values) raises(DOMException);
+    DOMString[] formControlStateOfPreviousHistoryItem() raises(DOMException);
+    void setFormControlStateOfPreviousHistoryItem(in DOMString[] values) raises(DOMException);
 #if defined(ENABLE_PAGE_POPUP) && ENABLE_PAGE_POPUP
-        readonly attribute PagePopupController pagePopupController;
+    readonly attribute PagePopupController pagePopupController;
 #endif
 
-        ClientRect absoluteCaretBounds(in Document document) raises(DOMException);
+    ClientRect absoluteCaretBounds(in Document document) raises(DOMException);
 
-        ClientRect boundingBox(in Element element) raises(DOMException);
+    ClientRect boundingBox(in Element element) raises(DOMException);
 
-        ClientRectList inspectorHighlightRects(in Document document) raises (DOMException);
+    ClientRectList inspectorHighlightRects(in Document document) raises (DOMException);
 
-        void setBackgroundBlurOnNode(in Node node, in long blurLength) raises(DOMException);
+    void setBackgroundBlurOnNode(in Node node, in long blurLength) raises(DOMException);
 
-        unsigned long markerCountForNode(in Node node, in DOMString markerType) raises(DOMException);
-        Range markerRangeForNode(in Node node, in DOMString markerType, in unsigned long index) raises(DOMException);
-        DOMString markerDescriptionForNode(in Node node, in DOMString markerType, in unsigned long index) raises(DOMException);
-        void addTextMatchMarker(in Range range, in boolean isActive);
+    unsigned long markerCountForNode(in Node node, in DOMString markerType) raises(DOMException);
+    Range markerRangeForNode(in Node node, in DOMString markerType, in unsigned long index) raises(DOMException);
+    DOMString markerDescriptionForNode(in Node node, in DOMString markerType, in unsigned long index) raises(DOMException);
+    void addTextMatchMarker(in Range range, in boolean isActive);
 
-        void setScrollViewPosition(in Document document, in long x, in long y) raises(DOMException);
+    void setScrollViewPosition(in Document document, in long x, in long y) raises(DOMException);
 
-        void setPagination(in Document document, in DOMString mode, in long gap, in [Optional] long pageLength) raises(DOMException);
+    void setPagination(in Document document, in DOMString mode, in long gap, in [Optional] long pageLength) raises(DOMException);
 
-        DOMString configurationForViewport(in Document document,
-                                           in float devicePixelRatio,
-                                           in long deviceWidth,
-                                           in long deviceHeight,
-                                           in long availableWidth,
-                                           in long availableHeight) raises(DOMException);
+    DOMString configurationForViewport(in Document document,
+                                       in float devicePixelRatio,
+                                       in long deviceWidth,
+                                       in long deviceHeight,
+                                       in long availableWidth,
+                                       in long availableHeight) raises(DOMException);
 
-        boolean wasLastChangeUserEdit(in Element textField) raises (DOMException);
-        DOMString suggestedValue(in Element inputElement) raises (DOMException);
-        void setSuggestedValue(in Element inputElement, in DOMString value) raises (DOMException);
-        void setEditingValue(in Element inputElement, in DOMString value) raises (DOMException);
+    boolean wasLastChangeUserEdit(in Element textField) raises (DOMException);
+    DOMString suggestedValue(in Element inputElement) raises (DOMException);
+    void setSuggestedValue(in Element inputElement, in DOMString value) raises (DOMException);
+    void setEditingValue(in Element inputElement, in DOMString value) raises (DOMException);
 
-        void paintControlTints(in Document document) raises (DOMException);
+    void paintControlTints(in Document document) raises (DOMException);
 
-        void scrollElementToRect(in Element element, in long x, in long y, in long w, in long h) raises (DOMException);
+    void scrollElementToRect(in Element element, in long x, in long y, in long w, in long h) raises (DOMException);
 
-        Range rangeFromLocationAndLength(in Element scope, in long rangeLocation, in long rangeLength) raises (DOMException);
-        unsigned long locationFromRange(in Element scope, in Range range) raises (DOMException);
-        unsigned long lengthFromRange(in Element scope, in Range range) raises (DOMException);
-        DOMString rangeAsText(in Range range) raises (DOMException);
+    Range rangeFromLocationAndLength(in Element scope, in long rangeLocation, in long rangeLength) raises (DOMException);
+    unsigned long locationFromRange(in Element scope, in Range range) raises (DOMException);
+    unsigned long lengthFromRange(in Element scope, in Range range) raises (DOMException);
+    DOMString rangeAsText(in Range range) raises (DOMException);
 
-        void setDelegatesScrolling(in boolean enabled, in Document document) raises (DOMException);
+    void setDelegatesScrolling(in boolean enabled, in Document document) raises (DOMException);
 #if defined(ENABLE_TOUCH_ADJUSTMENT) && ENABLE_TOUCH_ADJUSTMENT
-        WebKitPoint touchPositionAdjustedToBestClickableNode(in long x, in long y, in long width, in long height, in Document document) raises (DOMException);
-        Node touchNodeAdjustedToBestClickableNode(in long x, in long y, in long width, in long height, in Document document) raises (DOMException);
-        WebKitPoint touchPositionAdjustedToBestContextMenuNode(in long x, in long y, in long width, in long height, in Document document) raises (DOMException);
-        Node touchNodeAdjustedToBestContextMenuNode(in long x, in long y, in long width, in long height, in Document document) raises (DOMException);
-        ClientRect bestZoomableAreaForTouchPoint(in long x, in long y, in long width, in long height, in Document document) raises (DOMException);
+    WebKitPoint touchPositionAdjustedToBestClickableNode(in long x, in long y, in long width, in long height, in Document document) raises (DOMException);
+    Node touchNodeAdjustedToBestClickableNode(in long x, in long y, in long width, in long height, in Document document) raises (DOMException);
+    WebKitPoint touchPositionAdjustedToBestContextMenuNode(in long x, in long y, in long width, in long height, in Document document) raises (DOMException);
+    Node touchNodeAdjustedToBestContextMenuNode(in long x, in long y, in long width, in long height, in Document document) raises (DOMException);
+    ClientRect bestZoomableAreaForTouchPoint(in long x, in long y, in long width, in long height, in Document document) raises (DOMException);
 #endif
 
-        long lastSpellCheckRequestSequence(in Document document) raises (DOMException);
-        long lastSpellCheckProcessedSequence(in Document document) raises (DOMException);
+    long lastSpellCheckRequestSequence(in Document document) raises (DOMException);
+    long lastSpellCheckProcessedSequence(in Document document) raises (DOMException);
 
 #if defined(ENABLE_VIDEO_TRACK) && ENABLE_VIDEO_TRACK
-        void setShouldDisplayTrackKind(in Document document, in DOMString kind, in boolean enabled) raises (DOMException);
-        boolean shouldDisplayTrackKind(in Document document, in DOMString trackKind) raises (DOMException);
+    void setShouldDisplayTrackKind(in Document document, in DOMString kind, in boolean enabled) raises (DOMException);
+    boolean shouldDisplayTrackKind(in Document document, in DOMString trackKind) raises (DOMException);
 #endif
 
-        sequence<String> userPreferredLanguages();
-        void setUserPreferredLanguages(in sequence<String> languages);
+    sequence<String> userPreferredLanguages();
+    void setUserPreferredLanguages(in sequence<String> languages);
 
-        unsigned long wheelEventHandlerCount(in Document document) raises (DOMException);
-        unsigned long touchEventHandlerCount(in Document document) raises (DOMException);
+    unsigned long wheelEventHandlerCount(in Document document) raises (DOMException);
+    unsigned long touchEventHandlerCount(in Document document) raises (DOMException);
 
-        NodeList nodesFromRect(in Document document, in long x, in long y,
-            in unsigned long topPadding, in unsigned long rightPadding, in unsigned long bottomPadding, in unsigned long leftPadding,
-            in boolean ignoreClipping, in boolean allowShadowContent) raises (DOMException);
+    NodeList nodesFromRect(in Document document, in long x, in long y,
+        in unsigned long topPadding, in unsigned long rightPadding, in unsigned long bottomPadding, in unsigned long leftPadding,
+        in boolean ignoreClipping, in boolean allowShadowContent) raises (DOMException);
 
-        void emitInspectorDidBeginFrame();
-        void emitInspectorDidCancelFrame();
+    void emitInspectorDidBeginFrame();
+    void emitInspectorDidCancelFrame();
 
-        boolean hasSpellingMarker(in Document document, in long from, in long length) raises (DOMException);
-        boolean hasGrammarMarker(in Document document, in long from, in long length) raises (DOMException);
-        boolean hasAutocorrectedMarker(in Document document, in long from, in long length) raises (DOMException);
+    boolean hasSpellingMarker(in Document document, in long from, in long length) raises (DOMException);
+    boolean hasGrammarMarker(in Document document, in long from, in long length) raises (DOMException);
+    boolean hasAutocorrectedMarker(in Document document, in long from, in long length) raises (DOMException);
 
-        unsigned long numberOfScrollableAreas(in Document document) raises (DOMException);
+    unsigned long numberOfScrollableAreas(in Document document) raises (DOMException);
 
-        boolean isPageBoxVisible(in Document document, in long pageNumber) raises (DOMException);
+    boolean isPageBoxVisible(in Document document, in long pageNumber) raises (DOMException);
 
-        readonly attribute InternalSettings settings;
+    readonly attribute InternalSettings settings;
 
-        void suspendAnimations(in Document document) raises (DOMException);
-        void resumeAnimations(in Document document) raises (DOMException);
+    void suspendAnimations(in Document document) raises (DOMException);
+    void resumeAnimations(in Document document) raises (DOMException);
 
-        void garbageCollectDocumentResources(in Document document) raises (DOMException);
+    // Flags for layerTreeAsText.
+    const unsigned short LAYER_TREE_INCLUDES_VISIBLE_RECTS = 1;
+    DOMString layerTreeAsText(in Document document, in [Optional] unsigned short flags) raises (DOMException);
 
-        void allowRoundingHacks();
+    void garbageCollectDocumentResources(in Document document) raises (DOMException);
+
+    void allowRoundingHacks();
 
 #if defined(ENABLE_BATTERY_STATUS) && ENABLE_BATTERY_STATUS
-        void setBatteryStatus(in Document document, in DOMString eventType, in boolean charging, in double chargingTime, in double dischargingTime, in double level) raises (DOMException);
+    void setBatteryStatus(in Document document, in DOMString eventType, in boolean charging, in double chargingTime, in double dischargingTime, in double level) raises (DOMException);
 #endif
 
 #if defined(ENABLE_NETWORK_INFO) && ENABLE_NETWORK_INFO
-        void setNetworkInformation(in Document document, in DOMString eventType, in double bandwidth, in boolean metered) raises (DOMException);
+    void setNetworkInformation(in Document document, in DOMString eventType, in double bandwidth, in boolean metered) raises (DOMException);
 #endif
 
-        [Conditional=INSPECTOR] unsigned long numberOfLiveNodes();
-        [Conditional=INSPECTOR] unsigned long numberOfLiveDocuments();
-        [Conditional=INSPECTOR] sequence<String> consoleMessageArgumentCounts(in Document document);
-        [Conditional=INSPECTOR] DOMWindow openDummyInspectorFrontend(in DOMString url);
-        [Conditional=INSPECTOR] void closeDummyInspectorFrontend();
+    [Conditional=INSPECTOR] unsigned long numberOfLiveNodes();
+    [Conditional=INSPECTOR] unsigned long numberOfLiveDocuments();
+    [Conditional=INSPECTOR] sequence<String> consoleMessageArgumentCounts(in Document document);
+    [Conditional=INSPECTOR] DOMWindow openDummyInspectorFrontend(in DOMString url);
+    [Conditional=INSPECTOR] void closeDummyInspectorFrontend();
 
-        DOMString counterValue(in Element element);
-        long pageNumber(in Element element, in [Optional] float pageWidth, in [Optional] float pageHeight);
-        DOMString[] iconURLs(in Document document);
-        long numberOfPages(in [Optional] double pageWidthInPixels, in [Optional] double pageHeightInPixels);
-        DOMString pageProperty(in DOMString propertyName, in long pageNumber) raises (DOMException);
-        DOMString pageSizeAndMarginsInPixels(in long pageIndex, in long width, in long height, in long marginTop, in long marginRight, in long marginBottom, in long marginLeft) raises (DOMException);
+    DOMString counterValue(in Element element);
+    long pageNumber(in Element element, in [Optional] float pageWidth, in [Optional] float pageHeight);
+    DOMString[] iconURLs(in Document document);
+    long numberOfPages(in [Optional] double pageWidthInPixels, in [Optional] double pageHeightInPixels);
+    DOMString pageProperty(in DOMString propertyName, in long pageNumber) raises (DOMException);
+    DOMString pageSizeAndMarginsInPixels(in long pageIndex, in long width, in long height, in long marginTop, in long marginRight, in long marginBottom, in long marginLeft) raises (DOMException);
 
 
 #if defined(ENABLE_FULLSCREEN_API) && ENABLE_FULLSCREEN_API
-        void webkitWillEnterFullScreenForElement(in Document document, in Element element);
-        void webkitDidEnterFullScreenForElement(in Document document, in Element element);
-        void webkitWillExitFullScreenForElement(in Document document, in Element element);
-        void webkitDidExitFullScreenForElement(in Document document, in Element element);
+    void webkitWillEnterFullScreenForElement(in Document document, in Element element);
+    void webkitDidEnterFullScreenForElement(in Document document, in Element element);
+    void webkitWillExitFullScreenForElement(in Document document, in Element element);
+    void webkitDidExitFullScreenForElement(in Document document, in Element element);
 #endif
 
-        void registerURLSchemeAsBypassingContentSecurityPolicy(in DOMString scheme);
-        void removeURLSchemeRegisteredAsBypassingContentSecurityPolicy(in DOMString scheme);
-
-        MallocStatistics mallocStatistics();
+    void registerURLSchemeAsBypassingContentSecurityPolicy(in DOMString scheme);
+    void removeURLSchemeRegisteredAsBypassingContentSecurityPolicy(in DOMString scheme);
 
-        DOMString[] getReferencedFilePaths();
-    };
-}
+    MallocStatistics mallocStatistics();
 
+    DOMString[] getReferencedFilePaths();
+};
diff --git a/Source/WebCore/testing/MallocStatistics.idl b/Source/WebCore/testing/MallocStatistics.idl
index bbaff9dbd..bea974147 100644
--- a/Source/WebCore/testing/MallocStatistics.idl
+++ b/Source/WebCore/testing/MallocStatistics.idl
@@ -23,12 +23,10 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-module window {
-    interface [
-        OmitConstructor
-    ] MallocStatistics {
-        readonly attribute unsigned long reservedVMBytes;
-        readonly attribute unsigned long committedVMBytes;
-        readonly attribute unsigned long freeListBytes;
-    };
-}
+[
+    OmitConstructor
+] interface MallocStatistics {
+    readonly attribute unsigned long reservedVMBytes;
+    readonly attribute unsigned long committedVMBytes;
+    readonly attribute unsigned long freeListBytes;
+};