Title: [271019] trunk/Source/WebCore
Revision
271019
Author
[email protected]
Date
2020-12-20 20:07:31 -0800 (Sun, 20 Dec 2020)

Log Message

Rename FrameView::sendResizeEventIfNeeded() to scheduleResizeEventIfNeeded()
https://bugs.webkit.org/show_bug.cgi?id=220050

Reviewed by Ryosuke Niwa.

FrameView::sendResizeEventIfNeeded() only schedules events, it does not send them,
so rename accordingly.

Also fix some logging.

* dom/Document.cpp:
(WebCore::Document::runResizeSteps):
(WebCore::Document::runScrollSteps):
* page/FrameView.cpp:
(WebCore::FrameView::performPostLayoutTasks):
(WebCore::FrameView::scheduleResizeEventIfNeeded):
(WebCore::FrameView::setCustomSizeForResizeEvent):
(WebCore::FrameView::sendResizeEventIfNeeded): Deleted.
* page/FrameView.h:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (271018 => 271019)


--- trunk/Source/WebCore/ChangeLog	2020-12-21 02:23:22 UTC (rev 271018)
+++ trunk/Source/WebCore/ChangeLog	2020-12-21 04:07:31 UTC (rev 271019)
@@ -1,3 +1,25 @@
+2020-12-20  Simon Fraser  <[email protected]>
+
+        Rename FrameView::sendResizeEventIfNeeded() to scheduleResizeEventIfNeeded()
+        https://bugs.webkit.org/show_bug.cgi?id=220050
+
+        Reviewed by Ryosuke Niwa.
+
+        FrameView::sendResizeEventIfNeeded() only schedules events, it does not send them,
+        so rename accordingly.
+
+        Also fix some logging.
+
+        * dom/Document.cpp:
+        (WebCore::Document::runResizeSteps):
+        (WebCore::Document::runScrollSteps):
+        * page/FrameView.cpp:
+        (WebCore::FrameView::performPostLayoutTasks):
+        (WebCore::FrameView::scheduleResizeEventIfNeeded):
+        (WebCore::FrameView::setCustomSizeForResizeEvent):
+        (WebCore::FrameView::sendResizeEventIfNeeded): Deleted.
+        * page/FrameView.h:
+
 2020-12-20  Fujii Hironori  <[email protected]>
 
         [WinCairo] Unreviewed typo fix of r271015

Modified: trunk/Source/WebCore/dom/Document.cpp (271018 => 271019)


--- trunk/Source/WebCore/dom/Document.cpp	2020-12-21 02:23:22 UTC (rev 271018)
+++ trunk/Source/WebCore/dom/Document.cpp	2020-12-21 04:07:31 UTC (rev 271019)
@@ -4140,12 +4140,12 @@
 {
     // FIXME: The order of dispatching is not specified: https://github.com/WICG/visual-viewport/issues/65.
     if (m_needsDOMWindowResizeEvent) {
-        LOG_WITH_STREAM(Events, stream << "Document" << this << "sending resize events to window");
+        LOG_WITH_STREAM(Events, stream << "Document " << this << " sending resize events to window");
         m_needsDOMWindowResizeEvent = false;
         dispatchWindowEvent(Event::create(eventNames().resizeEvent, Event::CanBubble::No, Event::IsCancelable::No));
     }
     if (m_needsVisualViewportResizeEvent) {
-        LOG_WITH_STREAM(Events, stream << "Document" << this << "sending resize events to visualViewport");
+        LOG_WITH_STREAM(Events, stream << "Document " << this << " sending resize events to visualViewport");
         m_needsVisualViewportResizeEvent = false;
         if (auto* window = domWindow())
             window->visualViewport().dispatchEvent(Event::create(eventNames().resizeEvent, Event::CanBubble::No, Event::IsCancelable::No));
@@ -4179,7 +4179,7 @@
 {
     // FIXME: The order of dispatching is not specified: https://github.com/WICG/visual-viewport/issues/66.
     if (m_pendingScrollEventTargetList && !m_pendingScrollEventTargetList->targets.isEmpty()) {
-        LOG_WITH_STREAM(Events, stream << "Document" << this << "sending scroll events to pending scroll event targets");
+        LOG_WITH_STREAM(Events, stream << "Document " << this << " sending scroll events to pending scroll event targets");
         auto currentTargets = WTFMove(m_pendingScrollEventTargetList->targets);
         for (auto& target : currentTargets) {
             auto bubbles = target->isDocumentNode() ? Event::CanBubble::Yes : Event::CanBubble::No;
@@ -4187,7 +4187,7 @@
         }
     }
     if (m_needsVisualViewportScrollEvent) {
-        LOG_WITH_STREAM(Events, stream << "Document" << this << "sending scroll events to visualViewport");
+        LOG_WITH_STREAM(Events, stream << "Document " << this << " sending scroll events to visualViewport");
         m_needsVisualViewportScrollEvent = false;
         if (auto* window = domWindow())
             window->visualViewport().dispatchEvent(Event::create(eventNames().scrollEvent, Event::CanBubble::No, Event::IsCancelable::No));

Modified: trunk/Source/WebCore/page/FrameView.cpp (271018 => 271019)


--- trunk/Source/WebCore/page/FrameView.cpp	2020-12-21 02:23:22 UTC (rev 271018)
+++ trunk/Source/WebCore/page/FrameView.cpp	2020-12-21 04:07:31 UTC (rev 271019)
@@ -3352,7 +3352,7 @@
 
     scrollToAnchor();
 
-    sendResizeEventIfNeeded();
+    scheduleResizeEventIfNeeded();
     
     updateLayoutViewport();
     viewportContentsChanged();
@@ -3374,7 +3374,7 @@
     return visibleContentRectIncludingScrollbars().size();
 }
 
-void FrameView::sendResizeEventIfNeeded()
+void FrameView::scheduleResizeEventIfNeeded()
 {
     if (layoutContext().isInRenderTreeLayout() || needsLayout())
         return;
@@ -3411,11 +3411,11 @@
 
     auto* document = frame().document();
     if (document->quirks().shouldSilenceWindowResizeEvents()) {
-        FRAMEVIEW_RELEASE_LOG_IF_ALLOWED(Events, "sendResizeEventIfNeeded: Not firing resize events because they are temporarily disabled for this page");
+        FRAMEVIEW_RELEASE_LOG_IF_ALLOWED(Events, "scheduleResizeEventIfNeeded: Not firing resize events because they are temporarily disabled for this page");
         return;
     }
 
-    LOG_WITH_STREAM(Events, stream << "FrameView" << this << "sendResizeEventIfNeeded scheduling resize event for document" << document << ", size " << currentSize);
+    LOG_WITH_STREAM(Events, stream << "FrameView " << this << " scheduleResizeEventIfNeeded scheduling resize event for document" << document << ", size " << currentSize);
     document->setNeedsDOMWindowResizeEvent();
 
     bool isMainFrame = frame().isMainFrame();
@@ -5202,7 +5202,7 @@
 void FrameView::setCustomSizeForResizeEvent(IntSize customSize)
 {
     m_customSizeForResizeEvent = customSize;
-    sendResizeEventIfNeeded();
+    scheduleResizeEventIfNeeded();
 }
 
 void FrameView::setScrollVelocity(const VelocityData& velocityData)

Modified: trunk/Source/WebCore/page/FrameView.h (271018 => 271019)


--- trunk/Source/WebCore/page/FrameView.h	2020-12-21 02:23:22 UTC (rev 271018)
+++ trunk/Source/WebCore/page/FrameView.h	2020-12-21 04:07:31 UTC (rev 271019)
@@ -779,7 +779,7 @@
     void willRemoveScrollbar(Scrollbar*, ScrollbarOrientation) final;
 
     IntSize sizeForResizeEvent() const;
-    void sendResizeEventIfNeeded();
+    void scheduleResizeEventIfNeeded();
     
     RefPtr<Element> rootElementForCustomScrollbarPartStyle(PseudoId) const;
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to