Title: [256911] trunk/Source/WebCore
- Revision
- 256911
- Author
- za...@apple.com
- Date
- 2020-02-18 21:42:37 -0800 (Tue, 18 Feb 2020)
Log Message
Rename ScrollView::styleDidChange to styleAndRenderTreeDidChange
https://bugs.webkit.org/show_bug.cgi?id=207921
Reviewed by Simon Fraser.
When ScrollView::styleDidChange is called we actually finished updating the render tree as well.
* dom/Document.cpp:
(WebCore::Document::resolveStyle):
* page/FrameView.cpp:
(WebCore::FrameView::styleAndRenderTreeDidChange):
(WebCore::FrameView::styleDidChange): Deleted.
* page/FrameView.h:
* platform/ScrollView.cpp:
(WebCore::ScrollView::styleAndRenderTreeDidChange):
(WebCore::ScrollView::styleDidChange): Deleted.
* platform/ScrollView.h:
* rendering/RenderView.cpp: FrameView::styleDidChange gets called by the Document.
(WebCore::RenderView::styleDidChange): Deleted.
* rendering/RenderView.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (256910 => 256911)
--- trunk/Source/WebCore/ChangeLog 2020-02-19 05:37:45 UTC (rev 256910)
+++ trunk/Source/WebCore/ChangeLog 2020-02-19 05:42:37 UTC (rev 256911)
@@ -1,3 +1,26 @@
+2020-02-18 Zalan Bujtas <za...@apple.com>
+
+ Rename ScrollView::styleDidChange to styleAndRenderTreeDidChange
+ https://bugs.webkit.org/show_bug.cgi?id=207921
+
+ Reviewed by Simon Fraser.
+
+ When ScrollView::styleDidChange is called we actually finished updating the render tree as well.
+
+ * dom/Document.cpp:
+ (WebCore::Document::resolveStyle):
+ * page/FrameView.cpp:
+ (WebCore::FrameView::styleAndRenderTreeDidChange):
+ (WebCore::FrameView::styleDidChange): Deleted.
+ * page/FrameView.h:
+ * platform/ScrollView.cpp:
+ (WebCore::ScrollView::styleAndRenderTreeDidChange):
+ (WebCore::ScrollView::styleDidChange): Deleted.
+ * platform/ScrollView.h:
+ * rendering/RenderView.cpp: FrameView::styleDidChange gets called by the Document.
+ (WebCore::RenderView::styleDidChange): Deleted.
+ * rendering/RenderView.h:
+
2020-02-18 Jack Lee <shihchieh_...@apple.com>
ASSERTION FAILED: !m_embeddedObjectsToUpdate->contains(nullptr) in WebCore::FrameView::updateEmbeddedObjects
Modified: trunk/Source/WebCore/dom/Document.cpp (256910 => 256911)
--- trunk/Source/WebCore/dom/Document.cpp 2020-02-19 05:37:45 UTC (rev 256910)
+++ trunk/Source/WebCore/dom/Document.cpp 2020-02-19 05:42:37 UTC (rev 256911)
@@ -1995,7 +1995,7 @@
RenderTreeUpdater updater(*this);
updater.commit(WTFMove(styleUpdate));
- frameView.styleDidChange();
+ frameView.styleAndRenderTreeDidChange();
}
updatedCompositingLayers = frameView.updateCompositingLayersAfterStyleChange();
Modified: trunk/Source/WebCore/page/FrameView.cpp (256910 => 256911)
--- trunk/Source/WebCore/page/FrameView.cpp 2020-02-19 05:37:45 UTC (rev 256910)
+++ trunk/Source/WebCore/page/FrameView.cpp 2020-02-19 05:42:37 UTC (rev 256911)
@@ -799,14 +799,14 @@
renderView->compositor().willRecalcStyle();
}
-void FrameView::styleDidChange()
+void FrameView::styleAndRenderTreeDidChange()
{
- ScrollView::styleDidChange();
- RenderView* renderView = this->renderView();
+ ScrollView::styleAndRenderTreeDidChange();
+ auto* renderView = this->renderView();
if (!renderView)
return;
- RenderLayer* layerTreeMutationRoot = renderView->takeStyleChangeLayerTreeMutationRoot();
+ auto* layerTreeMutationRoot = renderView->takeStyleChangeLayerTreeMutationRoot();
if (layerTreeMutationRoot && !needsLayout())
layerTreeMutationRoot->updateLayerPositionsAfterStyleChange();
}
Modified: trunk/Source/WebCore/page/FrameView.h (256910 => 256911)
--- trunk/Source/WebCore/page/FrameView.h 2020-02-19 05:37:45 UTC (rev 256910)
+++ trunk/Source/WebCore/page/FrameView.h 2020-02-19 05:42:37 UTC (rev 256911)
@@ -138,7 +138,7 @@
#endif
void willRecalcStyle();
- void styleDidChange() override;
+ void styleAndRenderTreeDidChange() override;
bool updateCompositingLayersAfterStyleChange();
void updateCompositingLayersAfterLayout();
Modified: trunk/Source/WebCore/platform/ScrollView.cpp (256910 => 256911)
--- trunk/Source/WebCore/platform/ScrollView.cpp 2020-02-19 05:37:45 UTC (rev 256910)
+++ trunk/Source/WebCore/platform/ScrollView.cpp 2020-02-19 05:42:37 UTC (rev 256911)
@@ -1515,7 +1515,7 @@
updateScrollbars(scrollPosition());
}
-void ScrollView::styleDidChange()
+void ScrollView::styleAndRenderTreeDidChange()
{
if (m_horizontalScrollbar)
m_horizontalScrollbar->styleChanged();
Modified: trunk/Source/WebCore/platform/ScrollView.h (256910 => 256911)
--- trunk/Source/WebCore/platform/ScrollView.h 2020-02-19 05:37:45 UTC (rev 256910)
+++ trunk/Source/WebCore/platform/ScrollView.h 2020-02-19 05:42:37 UTC (rev 256911)
@@ -139,7 +139,7 @@
// Overridden by FrameView to create custom CSS scrollbars if applicable.
virtual Ref<Scrollbar> createScrollbar(ScrollbarOrientation);
- virtual void styleDidChange();
+ virtual void styleAndRenderTreeDidChange();
// If the prohibits scrolling flag is set, then all scrolling in the view (even programmatic scrolling) is turned off.
void setProhibitsScrolling(bool b) { m_prohibitsScrolling = b; }
Modified: trunk/Source/WebCore/rendering/RenderView.cpp (256910 => 256911)
--- trunk/Source/WebCore/rendering/RenderView.cpp 2020-02-19 05:37:45 UTC (rev 256910)
+++ trunk/Source/WebCore/rendering/RenderView.cpp 2020-02-19 05:42:37 UTC (rev 256911)
@@ -727,13 +727,6 @@
m_compositor->setIsInWindow(isInWindow);
}
-void RenderView::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
-{
- RenderBlockFlow::styleDidChange(diff, oldStyle);
-
- frameView().styleDidChange();
-}
-
ImageQualityController& RenderView::imageQualityController()
{
if (!m_imageQualityController)
Modified: trunk/Source/WebCore/rendering/RenderView.h (256910 => 256911)
--- trunk/Source/WebCore/rendering/RenderView.h 2020-02-19 05:37:45 UTC (rev 256910)
+++ trunk/Source/WebCore/rendering/RenderView.h 2020-02-19 05:42:37 UTC (rev 256911)
@@ -135,8 +135,6 @@
// Renderer that paints the root background has background-images which all have background-attachment: fixed.
bool rootBackgroundIsEntirelyFixed() const;
- void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
-
IntSize viewportSizeForCSSViewportUnits() const;
bool hasQuotesNeedingUpdate() const { return m_hasQuotesNeedingUpdate; }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
