Diff
Modified: branches/safari-604-branch/LayoutTests/ChangeLog (220736 => 220737)
--- branches/safari-604-branch/LayoutTests/ChangeLog 2017-08-15 06:45:40 UTC (rev 220736)
+++ branches/safari-604-branch/LayoutTests/ChangeLog 2017-08-15 06:45:44 UTC (rev 220737)
@@ -1,5 +1,9 @@
2017-08-14 Jason Marcell <[email protected]>
+ Revert r217197. rdar://problem/33890650
+
+2017-08-14 Jason Marcell <[email protected]>
+
Revert r220112. rdar://problem/33890661
2017-08-13 Jason Marcell <[email protected]>
Deleted: branches/safari-604-branch/LayoutTests/fast/media/matchMedia-print-expected.txt (220736 => 220737)
--- branches/safari-604-branch/LayoutTests/fast/media/matchMedia-print-expected.txt 2017-08-15 06:45:40 UTC (rev 220736)
+++ branches/safari-604-branch/LayoutTests/fast/media/matchMedia-print-expected.txt 2017-08-15 06:45:44 UTC (rev 220737)
@@ -1,2 +0,0 @@
-This document was
-printed
Deleted: branches/safari-604-branch/LayoutTests/fast/media/matchMedia-print.html (220736 => 220737)
--- branches/safari-604-branch/LayoutTests/fast/media/matchMedia-print.html 2017-08-15 06:45:40 UTC (rev 220736)
+++ branches/safari-604-branch/LayoutTests/fast/media/matchMedia-print.html 2017-08-15 06:45:44 UTC (rev 220737)
@@ -1,16 +0,0 @@
-<script>
-if (window.testRunner)
- testRunner.dumpAsText();
-</script>
-This document was
-<div id=test>not printed</div>
-<script>
-var mediaQueryList = window.matchMedia("print");
-mediaQueryList.addListener((e) => {
- if (e.matches)
- test.innerHTML = "printed";
-});
-
-if (window.internals)
- window.internals.setPrinting(500,500);
-</script>
Modified: branches/safari-604-branch/Source/WebCore/ChangeLog (220736 => 220737)
--- branches/safari-604-branch/Source/WebCore/ChangeLog 2017-08-15 06:45:40 UTC (rev 220736)
+++ branches/safari-604-branch/Source/WebCore/ChangeLog 2017-08-15 06:45:44 UTC (rev 220737)
@@ -1,5 +1,9 @@
2017-08-14 Jason Marcell <[email protected]>
+ Revert r217197. rdar://problem/33890650
+
+2017-08-14 Jason Marcell <[email protected]>
+
Revert r220112. rdar://problem/33890661
2017-08-13 Jason Marcell <[email protected]>
Modified: branches/safari-604-branch/Source/WebCore/page/FrameView.cpp (220736 => 220737)
--- branches/safari-604-branch/Source/WebCore/page/FrameView.cpp 2017-08-15 06:45:40 UTC (rev 220736)
+++ branches/safari-604-branch/Source/WebCore/page/FrameView.cpp 2017-08-15 06:45:44 UTC (rev 220737)
@@ -1369,9 +1369,8 @@
document.styleScope().didChangeStyleSheetEnvironment();
// FIXME: This instrumentation event is not strictly accurate since cached media query results do not persist across StyleResolver rebuilds.
InspectorInstrumentation::mediaQueryResultChanged(document);
- }
-
- document.evaluateMediaQueryList();
+ } else
+ document.evaluateMediaQueryList();
// If there is any pagination to apply, it will affect the RenderView's style, so we should
// take care of that now.
Modified: branches/safari-604-branch/Source/WebCore/testing/Internals.cpp (220736 => 220737)
--- branches/safari-604-branch/Source/WebCore/testing/Internals.cpp 2017-08-15 06:45:40 UTC (rev 220736)
+++ branches/safari-604-branch/Source/WebCore/testing/Internals.cpp 2017-08-15 06:45:44 UTC (rev 220737)
@@ -375,12 +375,6 @@
return true;
}
-static std::unique_ptr<PrintContext>& printContextForTesting()
-{
- static NeverDestroyed<std::unique_ptr<PrintContext>> context;
- return context;
-}
-
const char* Internals::internalsId = "internals";
Ref<Internals> Internals::create(Document& document)
@@ -464,8 +458,6 @@
PreviewLoader::setClientForTesting(nullptr);
#endif
- printContextForTesting() = nullptr;
-
#if USE(LIBWEBRTC)
WebCore::useRealRTCPeerConnectionFactory();
#endif
@@ -2611,12 +2603,6 @@
return { };
}
-void Internals::setPrinting(int width, int height)
-{
- printContextForTesting() = std::make_unique<PrintContext>(frame());
- printContextForTesting()->begin(width, height);
-}
-
void Internals::setHeaderHeight(float height)
{
Document* document = contextDocument();
Modified: branches/safari-604-branch/Source/WebCore/testing/Internals.h (220736 => 220737)
--- branches/safari-604-branch/Source/WebCore/testing/Internals.h 2017-08-15 06:45:40 UTC (rev 220736)
+++ branches/safari-604-branch/Source/WebCore/testing/Internals.h 2017-08-15 06:45:44 UTC (rev 220737)
@@ -350,7 +350,6 @@
ExceptionOr<void> setUseFixedLayout(bool);
ExceptionOr<void> setFixedLayoutSize(int width, int height);
ExceptionOr<void> setViewExposedRect(float left, float top, float width, float height);
- void setPrinting(int width, int height);
void setHeaderHeight(float);
void setFooterHeight(float);
Modified: branches/safari-604-branch/Source/WebCore/testing/Internals.idl (220736 => 220737)
--- branches/safari-604-branch/Source/WebCore/testing/Internals.idl 2017-08-15 06:45:40 UTC (rev 220736)
+++ branches/safari-604-branch/Source/WebCore/testing/Internals.idl 2017-08-15 06:45:44 UTC (rev 220737)
@@ -323,7 +323,6 @@
[MayThrowException] void setUseFixedLayout(boolean useFixedLayout);
[MayThrowException] void setFixedLayoutSize(long width, long height);
- void setPrinting(long width, long height);
[MayThrowException] void setViewExposedRect(unrestricted float x, unrestricted float y, unrestricted float width, unrestricted float height);
