Title: [214369] trunk
Revision
214369
Author
[email protected]
Date
2017-03-24 13:39:22 -0700 (Fri, 24 Mar 2017)

Log Message

Unreviewed, rolling out r214360.

This change caused 20+ LayoutTest failures.

Reverted changeset:

"Handle recursive calls to
ProcessingInstruction::checkStyleSheet"
https://bugs.webkit.org/show_bug.cgi?id=169982
http://trac.webkit.org/changeset/214360

Modified Paths

Removed Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (214368 => 214369)


--- trunk/LayoutTests/ChangeLog	2017-03-24 19:43:42 UTC (rev 214368)
+++ trunk/LayoutTests/ChangeLog	2017-03-24 20:39:22 UTC (rev 214369)
@@ -1,3 +1,16 @@
+2017-03-24  Ryan Haddad  <[email protected]>
+
+        Unreviewed, rolling out r214360.
+
+        This change caused 20+ LayoutTest failures.
+
+        Reverted changeset:
+
+        "Handle recursive calls to
+        ProcessingInstruction::checkStyleSheet"
+        https://bugs.webkit.org/show_bug.cgi?id=169982
+        http://trac.webkit.org/changeset/214360
+
 2017-03-24  Youenn Fablet  <[email protected]>
 
         Add support for qpSum in WebRTC stats

Deleted: trunk/LayoutTests/fast/dom/beforeload/image-removed-during-before-load-expected.txt (214368 => 214369)


--- trunk/LayoutTests/fast/dom/beforeload/image-removed-during-before-load-expected.txt	2017-03-24 19:43:42 UTC (rev 214368)
+++ trunk/LayoutTests/fast/dom/beforeload/image-removed-during-before-load-expected.txt	2017-03-24 20:39:22 UTC (rev 214369)
@@ -1,5 +0,0 @@
-This test confirms that image loading properly handles a 'beforeload' events that removes the image from the document. It passes if no debug assertions are fired.
-
-PASS: Hit the beforeload handler
-PASS
-PASS: No assertions hit.

Deleted: trunk/LayoutTests/fast/dom/beforeload/image-removed-during-before-load.html (214368 => 214369)


--- trunk/LayoutTests/fast/dom/beforeload/image-removed-during-before-load.html	2017-03-24 19:43:42 UTC (rev 214368)
+++ trunk/LayoutTests/fast/dom/beforeload/image-removed-during-before-load.html	2017-03-24 20:39:22 UTC (rev 214369)
@@ -1,42 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<script src=""
-<script>
-function test()
-{
-    if (window.testRunner) {
-        testRunner.dumpAsText();
-        testRunner.waitUntilDone();
-    }
-
-	image = document.createElement("img");
-    image.setAttribute("style", "display:none");
-	image.addEventListener("load", function() {
-        print('PASS', 'green');
-    }, { once: true });
-	image.addEventListener("beforeload", function() {
-        print('PASS: Hit the beforeload handler', 'green');
-        document.body.removeChild(image);
-        image = null;
-		setTimeout(step2, 0);
-	}, { once: true });
-	
-	document.body.appendChild(image);
-
-	image.setAttribute("src", "../../images/resources/test-load.jpg");
-}
-
-function step2()
-{
-    print("PASS: No assertions hit.", "green");
-
-    if (window.testRunner)
-        testRunner.notifyDone();
-}
-</script>
-</head>
-<body _onload_="test()">
-<p>This test confirms that image loading properly handles a 'beforeload' events that removes the image from the document. It passes if no debug assertions are fired.</p>
-<div id="console"></div>
-</body>
-</html>

Deleted: trunk/LayoutTests/fast/dom/beforeload/recursive-css-pi-before-load-expected.txt (214368 => 214369)


--- trunk/LayoutTests/fast/dom/beforeload/recursive-css-pi-before-load-expected.txt	2017-03-24 19:43:42 UTC (rev 214368)
+++ trunk/LayoutTests/fast/dom/beforeload/recursive-css-pi-before-load-expected.txt	2017-03-24 20:39:22 UTC (rev 214369)
@@ -1,4 +0,0 @@
-This test confirms that CSS stylesheets are properly handled if loaded during 'beforeload' events. It passes if no debug assertions are fired.
-
-PASS: No assertions hit.
-

Deleted: trunk/LayoutTests/fast/dom/beforeload/recursive-css-pi-before-load.html (214368 => 214369)


--- trunk/LayoutTests/fast/dom/beforeload/recursive-css-pi-before-load.html	2017-03-24 19:43:42 UTC (rev 214368)
+++ trunk/LayoutTests/fast/dom/beforeload/recursive-css-pi-before-load.html	2017-03-24 20:39:22 UTC (rev 214369)
@@ -1,45 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<meta charset="utf-8"/>
-<meta http-equiv="pragma" content="no-cache"/>
-<meta http-equiv="expires" content="0"/>
-<script src=""
-<script>
-function test()
-{
-    if (window.testRunner) {
-        testRunner.dumpAsText();
-        testRunner.waitUntilDone();
-    }
-
-	frame = document.createElement("iframe");
-	frame.setAttribute("src", "resources/content.xhtml");
-	frame.addEventListener("load", function(){
-		setTimeout(step2, 0);
-	}, { once: true });
-	
-	document.body.appendChild(frame);
-	
-	function step2(){
-		ins = 'href="" type="text/css"';
-		pi = frame.contentDocument.createProcessingInstruction('xml-stylesheet', ins);
-		pi.addEventListener("beforeload", function(){ pi.data = ''; }, { once: true });
-		frame.contentDocument.insertBefore(pi, frame.contentDocument.firstChild);
-		
-		frame.contentDocument.removeChild(pi);
-		pi = null;
-
-        print("PASS: No assertions hit.", "green");
-
-        if (window.testRunner)
-            testRunner.notifyDone();
-	}
-}
-</script>
-</head>
-<body _onload_="test()">
-<p>This test confirms that CSS stylesheets are properly handled if loaded during 'beforeload' events. It passes if no debug assertions are fired.</p>
-<div id="console"></div>
-</body>
-</html>

Deleted: trunk/LayoutTests/fast/dom/beforeload/recursive-link-before-load-expected.txt (214368 => 214369)


--- trunk/LayoutTests/fast/dom/beforeload/recursive-link-before-load-expected.txt	2017-03-24 19:43:42 UTC (rev 214368)
+++ trunk/LayoutTests/fast/dom/beforeload/recursive-link-before-load-expected.txt	2017-03-24 20:39:22 UTC (rev 214369)
@@ -1,5 +0,0 @@
-This test confirms that link elements properly handled changes during 'beforeload' events. It passes if no debug assertions are fired.
-
-PASS: Beforeload handled.
-PASS: No assertions hit.
-

Deleted: trunk/LayoutTests/fast/dom/beforeload/recursive-link-before-load.html (214368 => 214369)


--- trunk/LayoutTests/fast/dom/beforeload/recursive-link-before-load.html	2017-03-24 19:43:42 UTC (rev 214368)
+++ trunk/LayoutTests/fast/dom/beforeload/recursive-link-before-load.html	2017-03-24 20:39:22 UTC (rev 214369)
@@ -1,61 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<meta charset="utf-8"/>
-<meta http-equiv="pragma" content="no-cache"/>
-<meta http-equiv="expires" content="0"/>
-<script src=""
-<script>
-function test()
-{
-    if (window.testRunner) {
-        testRunner.dumpAsText();
-        testRunner.waitUntilDone();
-    }
-
-	frame = document.createElement("iframe");
-	frame.setAttribute("src", "resources/content.xhtml");
-	frame.addEventListener("load", function(){
-		setTimeout(step2, 0);
-	}, { once: true });
-	
-	document.body.appendChild(frame);
-
-    var link;
-    var head;
-
-	function step2() {
-        head = frame.contentDocument.getElementsByTagName('head')[0];
-
-		link = frame.contentDocument.createElement('link');
-        link.type = 'text/css';
-        link.rel = 'stylesheet';
-    
-		link.addEventListener("beforeload", function() {
-            print("PASS: Beforeload handled.", "green");
-            link.href = '';
-            setTimeout(step3, 0);
-        }, { once: true });
-
-        link.href = '';
-
-        head.appendChild(link);
-	}
-
-    function step3() {		
-		head.removeChild(link);
-		link = null;
-
-        print("PASS: No assertions hit.", "green");
-
-        if (window.testRunner)
-            testRunner.notifyDone();
-    }
-}
-</script>
-</head>
-<body _onload_="test()">
-<p>This test confirms that link elements properly handled changes during 'beforeload' events. It passes if no debug assertions are fired.</p>
-<div id="console"></div>
-</body>
-</html>

Deleted: trunk/LayoutTests/fast/dom/beforeload/recursive-xsl-pi-before-load-expected.txt (214368 => 214369)


--- trunk/LayoutTests/fast/dom/beforeload/recursive-xsl-pi-before-load-expected.txt	2017-03-24 19:43:42 UTC (rev 214368)
+++ trunk/LayoutTests/fast/dom/beforeload/recursive-xsl-pi-before-load-expected.txt	2017-03-24 20:39:22 UTC (rev 214369)
@@ -1,4 +0,0 @@
-This test confirms that XSL stylesheets are properly handled if loaded during 'beforeload' events. It passes if no debug assertions are fired.
-
-PASS: No assertions hit.
-

Deleted: trunk/LayoutTests/fast/dom/beforeload/recursive-xsl-pi-before-load.html (214368 => 214369)


--- trunk/LayoutTests/fast/dom/beforeload/recursive-xsl-pi-before-load.html	2017-03-24 19:43:42 UTC (rev 214368)
+++ trunk/LayoutTests/fast/dom/beforeload/recursive-xsl-pi-before-load.html	2017-03-24 20:39:22 UTC (rev 214369)
@@ -1,45 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<meta charset="utf-8"/>
-<meta http-equiv="pragma" content="no-cache"/>
-<meta http-equiv="expires" content="0"/>
-<script src=""
-<script>
-function test()
-{
-    if (window.testRunner) {
-        testRunner.dumpAsText();
-        testRunner.waitUntilDone();
-    }
-
-	frame = document.createElement("iframe");
-	frame.setAttribute("src", "resources/content.xhtml");
-	frame.addEventListener("load", function(){
-		setTimeout(step2, 0);
-	}, { once: true });
-	
-	document.body.appendChild(frame);
-	
-	function step2(){
-		ins = 'href="" type="text/xsl"';
-		pi = frame.contentDocument.createProcessingInstruction('xml-stylesheet', ins);
-		pi.addEventListener("beforeload", function(){ pi.data = ''; }, { once: true });
-		frame.contentDocument.insertBefore(pi, frame.contentDocument.firstChild);
-		
-		frame.contentDocument.removeChild(pi);
-		pi = null;
-
-        print("PASS: No assertions hit.", "green");
-
-        if (window.testRunner)
-            testRunner.notifyDone();
-	}
-}
-</script>
-</head>
-<body _onload_="test()">
-<p>This test confirms that XSL stylesheets are properly handled if loaded during 'beforeload' events. It passes if no debug assertions are fired.</p>
-<div id="console"></div>
-</body>
-</html>

Deleted: trunk/LayoutTests/fast/dom/beforeload/resources/content.xhtml (214368 => 214369)


--- trunk/LayoutTests/fast/dom/beforeload/resources/content.xhtml	2017-03-24 19:43:42 UTC (rev 214368)
+++ trunk/LayoutTests/fast/dom/beforeload/resources/content.xhtml	2017-03-24 20:39:22 UTC (rev 214369)
@@ -1,8 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-</head>
-<body>
-hi
-</body>
-</html>

Deleted: trunk/LayoutTests/fast/dom/beforeload/resources/pass.css (214368 => 214369)


--- trunk/LayoutTests/fast/dom/beforeload/resources/pass.css	2017-03-24 19:43:42 UTC (rev 214368)
+++ trunk/LayoutTests/fast/dom/beforeload/resources/pass.css	2017-03-24 20:39:22 UTC (rev 214369)
@@ -1,5 +0,0 @@
-.block {
-  width: 100px;
-  height: 100px;
-  background-color: green;
-}

Deleted: trunk/LayoutTests/fast/dom/beforeload/resources/test.xsl (214368 => 214369)


--- trunk/LayoutTests/fast/dom/beforeload/resources/test.xsl	2017-03-24 19:43:42 UTC (rev 214368)
+++ trunk/LayoutTests/fast/dom/beforeload/resources/test.xsl	2017-03-24 20:39:22 UTC (rev 214369)
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet version="1.0"
-	xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-	<xsl:output method="html"/>	
-	<xsl:template match="/">
-	<html>
-	<head>
-	</head>
-	<body>
-	    Test
-	</body>
-	</html>
-	</xsl:template>
-</xsl:stylesheet>

Modified: trunk/Source/WebCore/ChangeLog (214368 => 214369)


--- trunk/Source/WebCore/ChangeLog	2017-03-24 19:43:42 UTC (rev 214368)
+++ trunk/Source/WebCore/ChangeLog	2017-03-24 20:39:22 UTC (rev 214369)
@@ -1,3 +1,16 @@
+2017-03-24  Ryan Haddad  <[email protected]>
+
+        Unreviewed, rolling out r214360.
+
+        This change caused 20+ LayoutTest failures.
+
+        Reverted changeset:
+
+        "Handle recursive calls to
+        ProcessingInstruction::checkStyleSheet"
+        https://bugs.webkit.org/show_bug.cgi?id=169982
+        http://trac.webkit.org/changeset/214360
+
 2017-03-24  Youenn Fablet  <[email protected]>
 
         Add support for qpSum in WebRTC stats

Modified: trunk/Source/WebCore/dom/ProcessingInstruction.cpp (214368 => 214369)


--- trunk/Source/WebCore/dom/ProcessingInstruction.cpp	2017-03-24 19:43:42 UTC (rev 214368)
+++ trunk/Source/WebCore/dom/ProcessingInstruction.cpp	2017-03-24 20:39:22 UTC (rev 214369)
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2000 Peter Kelly ([email protected])
- * Copyright (C) 2006-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2006, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Samsung Electronics. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -35,7 +35,6 @@
 #include "StyleSheetContents.h"
 #include "XMLDocumentParser.h"
 #include "XSLStyleSheet.h"
-#include <wtf/SetForScope.h>
 
 namespace WebCore {
 
@@ -81,10 +80,6 @@
 
 void ProcessingInstruction::checkStyleSheet()
 {
-    // Prevent recursive loading of stylesheet.
-    if (m_isHandlingBeforeLoad)
-        return;
-
     if (m_target == "xml-stylesheet" && document().frame() && parentNode() == &document()) {
         // see http://www.w3.org/TR/xml-stylesheet/
         // ### support stylesheet included in a fragment of this (or another) document
@@ -139,25 +134,13 @@
                 document().styleScope().removePendingSheet(*this);
             }
 
-            Ref<Document> originalDocument = document();
-
             String url = ""
-
-            {
-            SetForScope<bool> change(m_isHandlingBeforeLoad, true);
             if (!dispatchBeforeLoadEvent(url))
                 return;
-            }
 
-            bool didEventListenerDisconnectThisElement = !isConnected() || &document() != originalDocument.ptr();
-            if (didEventListenerDisconnectThisElement)
-                return;
-            
             m_loading = true;
             document().styleScope().addPendingSheet(*this);
 
-            ASSERT_WITH_SECURITY_IMPLICATION(!m_cachedSheet);
-
 #if ENABLE(XSLT)
             if (m_isXSL) {
                 auto options = CachedResourceLoader::defaultCachedResourceOptions();
@@ -198,8 +181,7 @@
 bool ProcessingInstruction::sheetLoaded()
 {
     if (!isLoading()) {
-        if (document().styleScope().hasPendingSheet(*this))
-            document().styleScope().removePendingSheet(*this);
+        document().styleScope().removePendingSheet(*this);
 #if ENABLE(XSLT)
         if (m_isXSL)
             document().styleScope().flushPendingUpdate();
@@ -229,7 +211,6 @@
     // We don't need the cross-origin security check here because we are
     // getting the sheet text in "strict" mode. This enforces a valid CSS MIME
     // type.
-    Ref<Document> protect(document());
     parseStyleSheet(sheet->sheetText());
 }
 

Modified: trunk/Source/WebCore/dom/ProcessingInstruction.h (214368 => 214369)


--- trunk/Source/WebCore/dom/ProcessingInstruction.h	2017-03-24 19:43:42 UTC (rev 214368)
+++ trunk/Source/WebCore/dom/ProcessingInstruction.h	2017-03-24 20:39:22 UTC (rev 214369)
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2000 Peter Kelly ([email protected])
- * Copyright (C) 2006-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2006 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Samsung Electronics. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -74,8 +74,6 @@
 
     void parseStyleSheet(const String& sheet);
 
-    void clearExistingCachedSheet();
-
     String m_target;
     String m_localHref;
     String m_title;
@@ -89,7 +87,6 @@
 #if ENABLE(XSLT)
     bool m_isXSL { false };
 #endif
-    bool m_isHandlingBeforeLoad { false };
 };
 
 } // namespace WebCore

Modified: trunk/Source/WebCore/html/HTMLLinkElement.cpp (214368 => 214369)


--- trunk/Source/WebCore/html/HTMLLinkElement.cpp	2017-03-24 19:43:42 UTC (rev 214368)
+++ trunk/Source/WebCore/html/HTMLLinkElement.cpp	2017-03-24 20:39:22 UTC (rev 214369)
@@ -2,7 +2,7 @@
  * Copyright (C) 1999 Lars Knoll ([email protected])
  *           (C) 1999 Antti Koivisto ([email protected])
  *           (C) 2001 Dirk Mueller ([email protected])
- * Copyright (C) 2003-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2003, 2006, 2007, 2008, 2009, 2010, 2014 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Rob Buis ([email protected])
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
@@ -55,7 +55,6 @@
 #include "StyleScope.h"
 #include "StyleSheetContents.h"
 #include <wtf/Ref.h>
-#include <wtf/SetForScope.h>
 #include <wtf/StdLibExtras.h>
 
 namespace WebCore {
@@ -225,10 +224,6 @@
         return;
     }
 
-    // Prevent recursive loading of link.
-    if (m_isHandlingBeforeLoad)
-        return;
-
     URL url = ""
 
     if (!m_linkLoader.loadLink(m_relAttribute, url, attributeWithoutSynchronization(asAttr), attributeWithoutSynchronization(crossoriginAttr), document()))
@@ -248,11 +243,8 @@
             m_cachedSheet = nullptr;
         }
 
-        {
-        SetForScope<bool> change(m_isHandlingBeforeLoad, true);
         if (!shouldLoadLink())
             return;
-        }
 
         m_loading = true;
 
@@ -285,7 +277,6 @@
 
         request.setAsPotentiallyCrossOrigin(crossOrigin(), document());
 
-        ASSERT_WITH_SECURITY_IMPLICATION(!m_cachedSheet);
         m_cachedSheet = document().cachedResourceLoader().requestCSSStyleSheet(WTFMove(request));
 
         if (m_cachedSheet)

Modified: trunk/Source/WebCore/html/HTMLLinkElement.h (214368 => 214369)


--- trunk/Source/WebCore/html/HTMLLinkElement.h	2017-03-24 19:43:42 UTC (rev 214368)
+++ trunk/Source/WebCore/html/HTMLLinkElement.h	2017-03-24 20:39:22 UTC (rev 214369)
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 1999 Lars Knoll ([email protected])
  *           (C) 1999 Antti Koivisto ([email protected])
- * Copyright (C) 2003-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2003, 2008, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -132,7 +132,6 @@
     bool m_createdByParser;
     bool m_firedLoad;
     bool m_loadedResource;
-    bool m_isHandlingBeforeLoad { false };
 
     PendingSheetType m_pendingSheetType;
 

Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (214368 => 214369)


--- trunk/Source/WebCore/html/HTMLMediaElement.cpp	2017-03-24 19:43:42 UTC (rev 214368)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp	2017-03-24 20:39:22 UTC (rev 214369)
@@ -1325,8 +1325,6 @@
 
         enum Mode { None, Object, Attribute, Children };
         Mode mode = None;
-        Ref<Document> originalDocument = document();
-        bool didEventListenerDisconnectThisElement = false;
 
         if (m_mediaProvider) {
             // 6. If the media element has an assigned media provider object, then let mode be object.
@@ -1410,13 +1408,6 @@
                 return;
             }
 
-            didEventListenerDisconnectThisElement = !isConnected() || &document() != originalDocument.ptr();
-            if (didEventListenerDisconnectThisElement) {
-                mediaLoadingFailed(MediaPlayer::FormatError);
-                LOG(Media, "HTMLMediaElement::selectMediaResource(%p) -  document changed during load.", this);
-                return;
-            }
-
             // 3. If absolute URL was obtained successfully, set the currentSrc attribute to absolute URL.
             m_currentSrc = absoluteURL;
 
@@ -4224,12 +4215,10 @@
 
     URL mediaURL;
     HTMLSourceElement* source = nullptr;
-    Ref<Document> originalDocument = document();
     String type;
     bool lookingForStartNode = m_nextChildNodeToConsider;
     bool canUseSourceElement = false;
-    bool okToLoadSourceURL = false;
-    bool didEventListenerDisconnectThisElement = false;
+    bool okToLoadSourceURL;
 
     NodeVector potentialSourceNodes;
     getChildNodes(*this, potentialSourceNodes);
@@ -4302,13 +4291,6 @@
             goto CheckAgain;
         }
 
-        didEventListenerDisconnectThisElement = !isConnected() || &document() != originalDocument.ptr();
-        if (didEventListenerDisconnectThisElement) {
-            LOG(Media, "HTMLMediaElement::selectNextSourceChild(%p) - 'beforeload' changed document during load.", this);
-            source = nullptr;
-            goto CheckAgain;
-        }
-
         if (!okToLoadSourceURL)
             goto CheckAgain;
 

Modified: trunk/Source/WebCore/loader/ImageLoader.cpp (214368 => 214369)


--- trunk/Source/WebCore/loader/ImageLoader.cpp	2017-03-24 19:43:42 UTC (rev 214368)
+++ trunk/Source/WebCore/loader/ImageLoader.cpp	2017-03-24 20:39:22 UTC (rev 214369)
@@ -394,12 +394,7 @@
     if (!element().document().hasLivingRenderTree())
         return;
     m_hasPendingBeforeLoadEvent = false;
-    Ref<Document> originalDocument = element().document();
     if (element().dispatchBeforeLoadEvent(m_image->url())) {
-        bool didEventListenerDisconnectThisElement = !element().isConnected() || &element().document() != originalDocument.ptr();
-        if (didEventListenerDisconnectThisElement)
-            return;
-        
         updateRenderer();
         return;
     }

Modified: trunk/Source/WebCore/style/StyleScope.cpp (214368 => 214369)


--- trunk/Source/WebCore/style/StyleScope.cpp	2017-03-24 19:43:42 UTC (rev 214368)
+++ trunk/Source/WebCore/style/StyleScope.cpp	2017-03-24 20:39:22 UTC (rev 214369)
@@ -3,7 +3,7 @@
  *           (C) 1999 Antti Koivisto ([email protected])
  *           (C) 2001 Dirk Mueller ([email protected])
  *           (C) 2006 Alexey Proskuryakov ([email protected])
- * Copyright (C) 2004-2009, 2011-2012, 2015-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2004-2009, 2011-2012, 2015-2016 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
@@ -233,11 +233,6 @@
     return m_elementsInBodyWithPendingSheets.contains(&element);
 }
 
-bool Scope::hasPendingSheet(const ProcessingInstruction& processingInstruction) const
-{
-    return m_processingInstructionsWithPendingSheets.contains(&processingInstruction);
-}
-
 void Scope::addStyleSheetCandidateNode(Node& node, bool createdByParser)
 {
     if (!node.isConnected())

Modified: trunk/Source/WebCore/style/StyleScope.h (214368 => 214369)


--- trunk/Source/WebCore/style/StyleScope.h	2017-03-24 19:43:42 UTC (rev 214368)
+++ trunk/Source/WebCore/style/StyleScope.h	2017-03-24 20:39:22 UTC (rev 214369)
@@ -3,7 +3,7 @@
  *           (C) 1999 Antti Koivisto ([email protected])
  *           (C) 2001 Dirk Mueller ([email protected])
  *           (C) 2006 Alexey Proskuryakov ([email protected])
- * Copyright (C) 2004-2010, 2012-2013, 2015-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2004-2010, 2012-2013, 2015-2016 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2011 Google Inc. All rights reserved.
@@ -92,7 +92,6 @@
     bool hasPendingSheetsInBody() const;
     bool hasPendingSheet(const Element&) const;
     bool hasPendingSheetInBody(const Element&) const;
-    bool hasPendingSheet(const ProcessingInstruction&) const;
 
     bool usesStyleBasedEditability() { return m_usesStyleBasedEditability; }
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to