Diff
Modified: branches/safari-601-branch/LayoutTests/ChangeLog (198920 => 198921)
--- branches/safari-601-branch/LayoutTests/ChangeLog 2016-03-31 21:55:47 UTC (rev 198920)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2016-03-31 22:22:40 UTC (rev 198921)
@@ -1,3 +1,13 @@
+2016-03-31 Matthew Hanson <matthew_han...@apple.com>
+
+ Roll out r191180. rdar://problem/25448882
+
+ Landed on behalf of Chris Dumez.
+
+ * fast/preloader/frame-src-expected.txt: Removed.
+ * fast/preloader/frame-src.html: Removed.
+ * fast/preloader/resources/testFrame.html: Removed.
+
2016-03-30 Matthew Hanson <matthew_han...@apple.com>
Merge r198687. rdar://problem/25448871
Deleted: branches/safari-601-branch/LayoutTests/fast/preloader/frame-src-expected.txt (198920 => 198921)
--- branches/safari-601-branch/LayoutTests/fast/preloader/frame-src-expected.txt 2016-03-31 21:55:47 UTC (rev 198920)
+++ branches/safari-601-branch/LayoutTests/fast/preloader/frame-src-expected.txt 2016-03-31 22:22:40 UTC (rev 198921)
@@ -1,6 +0,0 @@
-js-test-pre.js has MIME type text/_javascript_
-testFrame.html has MIME type text/html
-PASS internals.isPreloaded("resources/testFrame.html"); is true
-Tests that iframes are preloaded.
-
-
Deleted: branches/safari-601-branch/LayoutTests/fast/preloader/frame-src.html (198920 => 198921)
--- branches/safari-601-branch/LayoutTests/fast/preloader/frame-src.html 2016-03-31 21:55:47 UTC (rev 198920)
+++ branches/safari-601-branch/LayoutTests/fast/preloader/frame-src.html 2016-03-31 22:22:40 UTC (rev 198921)
@@ -1,18 +0,0 @@
-<html>
-<head>
-<script>
-if (window.testRunner)
- testRunner.dumpResourceResponseMIMETypes();
-</script>
-<script src=""
-<script src=""
-<script>
- shouldBeTrue('internals.isPreloaded("resources/testFrame.html");');
-</script>
-</head>
-<body>
-<p>Tests that iframes are preloaded.</p>
-<iframe src=""
-</body>
-</html>
-
Deleted: branches/safari-601-branch/LayoutTests/fast/preloader/resources/testFrame.html (198920 => 198921)
--- branches/safari-601-branch/LayoutTests/fast/preloader/resources/testFrame.html 2016-03-31 21:55:47 UTC (rev 198920)
+++ branches/safari-601-branch/LayoutTests/fast/preloader/resources/testFrame.html 2016-03-31 22:22:40 UTC (rev 198921)
@@ -1,4 +0,0 @@
-<!DOCTYPE html>
-<body>
-<p>Test frame</p>
-</body>
Deleted: branches/safari-601-branch/LayoutTests/http/tests/loading/preload-no-store-frame-src-expected.txt (198920 => 198921)
--- branches/safari-601-branch/LayoutTests/http/tests/loading/preload-no-store-frame-src-expected.txt 2016-03-31 21:55:47 UTC (rev 198920)
+++ branches/safari-601-branch/LayoutTests/http/tests/loading/preload-no-store-frame-src-expected.txt 2016-03-31 22:22:40 UTC (rev 198921)
@@ -1,17 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-js-test-pre.js has MIME type application/x-_javascript_
-slow-script.pl has MIME type application/_javascript_
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-no-store-frame.php has MIME type text/html
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-main frame - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-main frame - didFinishLoadForFrame
-PASS internals.isPreloaded("/navigation/resources/no-store-frame.php"); is true
-Tests that 'no-store' iframes are preloaded.
-
-
Deleted: branches/safari-601-branch/LayoutTests/http/tests/loading/preload-no-store-frame-src.html (198920 => 198921)
--- branches/safari-601-branch/LayoutTests/http/tests/loading/preload-no-store-frame-src.html 2016-03-31 21:55:47 UTC (rev 198920)
+++ branches/safari-601-branch/LayoutTests/http/tests/loading/preload-no-store-frame-src.html 2016-03-31 22:22:40 UTC (rev 198921)
@@ -1,18 +0,0 @@
-<html>
-<head>
-<script>
-if (window.testRunner)
- testRunner.dumpResourceResponseMIMETypes();
-</script>
-<script src=""
-<script src=""
-<script>
- shouldBeTrue('internals.isPreloaded("/navigation/resources/no-store-frame.php");');
-</script>
-</head>
-<body>
-<p>Tests that 'no-store' iframes are preloaded.</p>
-<iframe src=""
-</body>
-</html>
-
Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (198920 => 198921)
--- branches/safari-601-branch/Source/WebCore/ChangeLog 2016-03-31 21:55:47 UTC (rev 198920)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2016-03-31 22:22:40 UTC (rev 198921)
@@ -1,3 +1,17 @@
+2016-03-31 Matthew Hanson <matthew_han...@apple.com>
+
+ Roll out r191180. rdar://problem/25448882
+
+ Landed on behalf of Chris Dumez.
+
+ * html/parser/HTMLPreloadScanner.cpp:
+ (WebCore::TokenPreloadScanner::StartTagScanner::shouldPreload):
+ (WebCore::TokenPreloadScanner::tagIdFor): Deleted.
+ (WebCore::TokenPreloadScanner::initiatorFor): Deleted.
+ (WebCore::TokenPreloadScanner::StartTagScanner::processAttribute): Deleted.
+ (WebCore::TokenPreloadScanner::StartTagScanner::resourceType): Deleted.
+ * html/parser/HTMLPreloadScanner.h:
+
2016-03-30 Matthew Hanson <matthew_han...@apple.com>
Merge r198687. rdar://problem/25448871
Modified: branches/safari-601-branch/Source/WebCore/html/parser/HTMLPreloadScanner.cpp (198920 => 198921)
--- branches/safari-601-branch/Source/WebCore/html/parser/HTMLPreloadScanner.cpp 2016-03-31 21:55:47 UTC (rev 198920)
+++ branches/safari-601-branch/Source/WebCore/html/parser/HTMLPreloadScanner.cpp 2016-03-31 22:22:40 UTC (rev 198921)
@@ -46,8 +46,6 @@
TokenPreloadScanner::TagId TokenPreloadScanner::tagIdFor(const HTMLToken::DataVector& data)
{
AtomicString tagName(data);
- if (tagName == iframeTag)
- return TagId::Iframe;
if (tagName == imgTag)
return TagId::Img;
if (tagName == inputTag)
@@ -74,8 +72,6 @@
String TokenPreloadScanner::initiatorFor(TagId tagId)
{
switch (tagId) {
- case TagId::Iframe:
- return "iframe";
case TagId::Source:
case TagId::Img:
return "img";
@@ -176,10 +172,6 @@
bool alreadyMatchedSource = inPicture && pictureState.last();
switch (m_tagId) {
- case TagId::Iframe:
- if (match(attributeName, srcAttr))
- setUrlToLoad(attributeValue);
- break;
case TagId::Img:
if (inPicture && alreadyMatchedSource)
break;
@@ -272,8 +264,6 @@
CachedResource::Type resourceType() const
{
switch (m_tagId) {
- case TagId::Iframe:
- return CachedResource::MainResource;
case TagId::Script:
return CachedResource::Script;
case TagId::Img:
@@ -301,7 +291,7 @@
if (m_urlToLoad.isEmpty())
return false;
- if (protocolIs(m_urlToLoad, "data") || protocolIs(m_urlToLoad, "about"))
+ if (protocolIs(m_urlToLoad, "data"))
return false;
if (m_tagId == TagId::Link && !m_linkIsStyleSheet)
Modified: branches/safari-601-branch/Source/WebCore/html/parser/HTMLPreloadScanner.h (198920 => 198921)
--- branches/safari-601-branch/Source/WebCore/html/parser/HTMLPreloadScanner.h 2016-03-31 21:55:47 UTC (rev 198920)
+++ branches/safari-601-branch/Source/WebCore/html/parser/HTMLPreloadScanner.h 2016-03-31 22:22:40 UTC (rev 198921)
@@ -47,7 +47,6 @@
private:
enum class TagId {
// These tags are scanned by the StartTagScanner.
- Iframe,
Img,
Input,
Link,
