Title: [282563] trunk/Source/WebCore
Revision
282563
Author
[email protected]
Date
2021-09-16 11:12:14 -0700 (Thu, 16 Sep 2021)

Log Message

Fix some WEBCORE_EXPORTS on FrameView
https://bugs.webkit.org/show_bug.cgi?id=230330

Reviewed by Wenson Hsieh.

scrollToPositionWithAnimation() and effectiveFrameFlattening() do not need to be exported.

Instead of exporting traverseForPaintInvalidation() which is never referenced outside of
WebCore, make the two functions that wrap it non-inline, and export the one used by
Internals. traverseForPaintInvalidation() can be private.

* page/FrameView.cpp:
(WebCore::FrameView::scrollToPositionWithAnimation):
(WebCore::FrameView::invalidateControlTints):
(WebCore::FrameView::invalidateImagesWithAsyncDecodes):
* page/FrameView.h:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (282562 => 282563)


--- trunk/Source/WebCore/ChangeLog	2021-09-16 18:08:14 UTC (rev 282562)
+++ trunk/Source/WebCore/ChangeLog	2021-09-16 18:12:14 UTC (rev 282563)
@@ -1,3 +1,22 @@
+2021-09-16  Simon Fraser  <[email protected]>
+
+        Fix some WEBCORE_EXPORTS on FrameView
+        https://bugs.webkit.org/show_bug.cgi?id=230330
+
+        Reviewed by Wenson Hsieh.
+
+        scrollToPositionWithAnimation() and effectiveFrameFlattening() do not need to be exported.
+
+        Instead of exporting traverseForPaintInvalidation() which is never referenced outside of
+        WebCore, make the two functions that wrap it non-inline, and export the one used by
+        Internals. traverseForPaintInvalidation() can be private.
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::scrollToPositionWithAnimation):
+        (WebCore::FrameView::invalidateControlTints):
+        (WebCore::FrameView::invalidateImagesWithAsyncDecodes):
+        * page/FrameView.h:
+
 2021-09-16  Tyler Wilcock <[email protected]> and Myles C. Maxfield  <[email protected]>
 
         font-weight should always serialize as a number

Modified: trunk/Source/WebCore/page/FrameView.cpp (282562 => 282563)


--- trunk/Source/WebCore/page/FrameView.cpp	2021-09-16 18:08:14 UTC (rev 282562)
+++ trunk/Source/WebCore/page/FrameView.cpp	2021-09-16 18:12:14 UTC (rev 282563)
@@ -3764,6 +3764,7 @@
 
 void FrameView::scrollToPositionWithAnimation(const ScrollPosition& position, ScrollType scrollType, ScrollClamping)
 {
+    // FIXME: Why isn't all this in ScrollableArea?
     auto previousScrollType = currentScrollType();
     setCurrentScrollType(scrollType);
 
@@ -4185,6 +4186,16 @@
         page->setIsCountingRelevantRepaintedObjects(isCurrentlyCountingRelevantRepaintedObject);
 }
 
+void FrameView::invalidateControlTints()
+{
+    traverseForPaintInvalidation(NullGraphicsContext::PaintInvalidationReasons::InvalidatingControlTints);
+}
+
+void FrameView::invalidateImagesWithAsyncDecodes()
+{
+    traverseForPaintInvalidation(NullGraphicsContext::PaintInvalidationReasons::InvalidatingImagesWithAsyncDecodes);
+}
+
 void FrameView::traverseForPaintInvalidation(NullGraphicsContext::PaintInvalidationReasons paintInvalidationReasons)
 {
     if (needsLayout())

Modified: trunk/Source/WebCore/page/FrameView.h (282562 => 282563)


--- trunk/Source/WebCore/page/FrameView.h	2021-09-16 18:08:14 UTC (rev 282562)
+++ trunk/Source/WebCore/page/FrameView.h	2021-09-16 18:12:14 UTC (rev 282563)
@@ -663,11 +663,10 @@
 
     void setSpeculativeTilingDelayDisabledForTesting(bool disabled) { m_speculativeTilingDelayDisabledForTesting = disabled; }
 
-    WEBCORE_EXPORT FrameFlattening effectiveFrameFlattening() const;
+    FrameFlattening effectiveFrameFlattening() const;
 
-    WEBCORE_EXPORT void traverseForPaintInvalidation(NullGraphicsContext::PaintInvalidationReasons);
-    void invalidateControlTints() { traverseForPaintInvalidation(NullGraphicsContext::PaintInvalidationReasons::InvalidatingControlTints); }
-    void invalidateImagesWithAsyncDecodes() { traverseForPaintInvalidation(NullGraphicsContext::PaintInvalidationReasons::InvalidatingImagesWithAsyncDecodes); }
+    WEBCORE_EXPORT void invalidateControlTints();
+    void invalidateImagesWithAsyncDecodes();
 
     void invalidateScrollbarsForAllScrollableAreas();
 
@@ -676,7 +675,7 @@
 
     void renderLayerDidScroll(const RenderLayer&);
 
-    WEBCORE_EXPORT void scrollToPositionWithAnimation(const ScrollPosition&, ScrollType = ScrollType::Programmatic, ScrollClamping = ScrollClamping::Clamped);
+    void scrollToPositionWithAnimation(const ScrollPosition&, ScrollType = ScrollType::Programmatic, ScrollClamping = ScrollClamping::Clamped);
 
     bool inUpdateEmbeddedObjects() const { return m_inUpdateEmbeddedObjects; }
 
@@ -690,7 +689,8 @@
 
     bool scrollContentsFastPath(const IntSize& scrollDelta, const IntRect& rectToScroll, const IntRect& clipRect) final;
     void scrollContentsSlowPath(const IntRect& updateRect) final;
-    
+
+    void traverseForPaintInvalidation(NullGraphicsContext::PaintInvalidationReasons);
     void repaintSlowRepaintObjects();
 
     bool isVerticalDocument() const final;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to