Title: [234453] branches/safari-606-branch/Source/WebCore
Revision
234453
Author
[email protected]
Date
2018-07-31 23:47:16 -0700 (Tue, 31 Jul 2018)

Log Message

Cherry-pick r234432. rdar://problem/42802123

    Don't call RenderTheme::platformColorsDidChange() during printing.
    https://bugs.webkit.org/show_bug.cgi?id=188181
    rdar://problem/42360070

    Reviewed by Tim Horton.

    * inspector/agents/InspectorPageAgent.cpp:
    (WebCore::InspectorPageAgent::setEmulatedMedia): Call m_page.updateStyleAfterChangeInEnvironment()
    instead of going to styleStope() and remove call to RenderTheme::platformColorsDidChange().
    * page/FrameView.cpp:
    (WebCore::FrameView::adjustMediaTypeForPrinting): Remove call RenderTheme::platformColorsDidChange().

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@234432 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: branches/safari-606-branch/Source/WebCore/ChangeLog (234452 => 234453)


--- branches/safari-606-branch/Source/WebCore/ChangeLog	2018-08-01 06:47:12 UTC (rev 234452)
+++ branches/safari-606-branch/Source/WebCore/ChangeLog	2018-08-01 06:47:16 UTC (rev 234453)
@@ -1,3 +1,36 @@
+2018-07-31  Babak Shafiei  <[email protected]>
+
+        Cherry-pick r234432. rdar://problem/42802123
+
+    Don't call RenderTheme::platformColorsDidChange() during printing.
+    https://bugs.webkit.org/show_bug.cgi?id=188181
+    rdar://problem/42360070
+    
+    Reviewed by Tim Horton.
+    
+    * inspector/agents/InspectorPageAgent.cpp:
+    (WebCore::InspectorPageAgent::setEmulatedMedia): Call m_page.updateStyleAfterChangeInEnvironment()
+    instead of going to styleStope() and remove call to RenderTheme::platformColorsDidChange().
+    * page/FrameView.cpp:
+    (WebCore::FrameView::adjustMediaTypeForPrinting): Remove call RenderTheme::platformColorsDidChange().
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@234432 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2018-07-31  Timothy Hatcher  <[email protected]>
+
+            Don't call RenderTheme::platformColorsDidChange() during printing.
+            https://bugs.webkit.org/show_bug.cgi?id=188181
+            rdar://problem/42360070
+
+            Reviewed by Tim Horton.
+
+            * inspector/agents/InspectorPageAgent.cpp:
+            (WebCore::InspectorPageAgent::setEmulatedMedia): Call m_page.updateStyleAfterChangeInEnvironment()
+            instead of going to styleStope() and remove call to RenderTheme::platformColorsDidChange().
+            * page/FrameView.cpp:
+            (WebCore::FrameView::adjustMediaTypeForPrinting): Remove call RenderTheme::platformColorsDidChange().
+
 2018-07-31  Ryosuke Niwa  <[email protected]>
 
         <rdar://problem/40844658> Crash in WebCore::EventTarget::dispatchEvent

Modified: branches/safari-606-branch/Source/WebCore/inspector/agents/InspectorPageAgent.cpp (234452 => 234453)


--- branches/safari-606-branch/Source/WebCore/inspector/agents/InspectorPageAgent.cpp	2018-08-01 06:47:12 UTC (rev 234452)
+++ branches/safari-606-branch/Source/WebCore/inspector/agents/InspectorPageAgent.cpp	2018-08-01 06:47:16 UTC (rev 234453)
@@ -802,12 +802,10 @@
 
     m_emulatedMedia = media;
 
-    RenderTheme::singleton().platformColorsDidChange();
+    m_page.updateStyleAfterChangeInEnvironment();
 
-    if (auto document = m_page.mainFrame().document()) {
-        document->styleScope().didChangeStyleSheetEnvironment();
+    if (auto* document = m_page.mainFrame().document())
         document->updateLayout();
-    }
 }
 
 void InspectorPageAgent::applyEmulatedMedia(String& media)

Modified: branches/safari-606-branch/Source/WebCore/page/FrameView.cpp (234452 => 234453)


--- branches/safari-606-branch/Source/WebCore/page/FrameView.cpp	2018-08-01 06:47:12 UTC (rev 234452)
+++ branches/safari-606-branch/Source/WebCore/page/FrameView.cpp	2018-08-01 06:47:16 UTC (rev 234453)
@@ -1388,8 +1388,6 @@
             setMediaType(m_mediaTypeWhenNotPrinting);
         m_mediaTypeWhenNotPrinting = String();
     }
-
-    RenderTheme::singleton().platformColorsDidChange();
 }
 
 bool FrameView::useSlowRepaints(bool considerOverlap) const
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to