Title: [279963] trunk/Source
Revision
279963
Author
[email protected]
Date
2021-07-15 14:04:58 -0700 (Thu, 15 Jul 2021)

Log Message

Rename scrollRectIntoView to scrollContainingScrollViewsToRevealRect for clarity.
https://bugs.webkit.org/show_bug.cgi?id=227995

Reviewed by Tim Horton.

Source/WebCore:

No behavior change.

* loader/EmptyClients.h:
* page/Chrome.cpp:
(WebCore::Chrome::scrollContainingScrollViewsToRevealRect const):
(WebCore::Chrome::scrollRectIntoView const): Deleted.
* page/Chrome.h:
* page/ChromeClient.h:
(WebCore::ChromeClient::scrollContainingScrollViewsToRevealRect const):
(WebCore::ChromeClient::scrollRectIntoView const): Deleted.
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::scrollRectToVisible):

Source/WebKit:

* WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::scrollContainingScrollViewsToRevealRect const):
(WebKit::WebChromeClient::scrollRectIntoView const): Deleted.
* WebProcess/WebCoreSupport/WebChromeClient.h:

Source/WebKitLegacy/mac:

* WebCoreSupport/WebChromeClient.h:
* WebCoreSupport/WebChromeClient.mm:
(WebChromeClient::scrollContainingScrollViewsToRevealRect const):
(WebChromeClient::scrollRectIntoView const): Deleted.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (279962 => 279963)


--- trunk/Source/WebCore/ChangeLog	2021-07-15 20:44:57 UTC (rev 279962)
+++ trunk/Source/WebCore/ChangeLog	2021-07-15 21:04:58 UTC (rev 279963)
@@ -1,3 +1,23 @@
+2021-07-15  Megan Gardner  <[email protected]>
+
+        Rename scrollRectIntoView to scrollContainingScrollViewsToRevealRect for clarity.
+        https://bugs.webkit.org/show_bug.cgi?id=227995
+
+        Reviewed by Tim Horton.
+
+        No behavior change.
+
+        * loader/EmptyClients.h:
+        * page/Chrome.cpp:
+        (WebCore::Chrome::scrollContainingScrollViewsToRevealRect const):
+        (WebCore::Chrome::scrollRectIntoView const): Deleted.
+        * page/Chrome.h:
+        * page/ChromeClient.h:
+        (WebCore::ChromeClient::scrollContainingScrollViewsToRevealRect const):
+        (WebCore::ChromeClient::scrollRectIntoView const): Deleted.
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::scrollRectToVisible):
+
 2021-07-15  Brady Eidson  <[email protected]>
 
         Use WeakPtr with UniqueIDBDatabaseConnection

Modified: trunk/Source/WebCore/loader/EmptyClients.h (279962 => 279963)


--- trunk/Source/WebCore/loader/EmptyClients.h	2021-07-15 20:44:57 UTC (rev 279962)
+++ trunk/Source/WebCore/loader/EmptyClients.h	2021-07-15 21:04:58 UTC (rev 279963)
@@ -163,7 +163,7 @@
     void setCursor(const Cursor&) final { }
     void setCursorHiddenUntilMouseMoves(bool) final { }
 
-    void scrollRectIntoView(const IntRect&) const final { }
+    void scrollContainingScrollViewsToRevealRect(const IntRect&) const final { }
 
     void attachRootGraphicsLayer(Frame&, GraphicsLayer*) final { }
     void attachViewOverlayGraphicsLayer(GraphicsLayer*) final { }

Modified: trunk/Source/WebCore/page/Chrome.cpp (279962 => 279963)


--- trunk/Source/WebCore/page/Chrome.cpp	2021-07-15 20:44:57 UTC (rev 279962)
+++ trunk/Source/WebCore/page/Chrome.cpp	2021-07-15 21:04:58 UTC (rev 279963)
@@ -134,9 +134,9 @@
     m_client.contentsSizeChanged(frame, size);
 }
 
-void Chrome::scrollRectIntoView(const IntRect& rect) const
+void Chrome::scrollContainingScrollViewsToRevealRect(const IntRect& rect) const
 {
-    m_client.scrollRectIntoView(rect);
+    m_client.scrollContainingScrollViewsToRevealRect(rect);
 }
 
 void Chrome::setWindowRect(const FloatRect& rect) const

Modified: trunk/Source/WebCore/page/Chrome.h (279962 => 279963)


--- trunk/Source/WebCore/page/Chrome.h	2021-07-15 20:44:57 UTC (rev 279962)
+++ trunk/Source/WebCore/page/Chrome.h	2021-07-15 21:04:58 UTC (rev 279963)
@@ -98,7 +98,7 @@
     FloatSize availableScreenSize() const override;
     FloatSize overrideScreenSize() const override;
 
-    void scrollRectIntoView(const IntRect&) const;
+    void scrollContainingScrollViewsToRevealRect(const IntRect&) const;
 
     void contentsSizeChanged(Frame&, const IntSize&) const;
 

Modified: trunk/Source/WebCore/page/ChromeClient.h (279962 => 279963)


--- trunk/Source/WebCore/page/ChromeClient.h	2021-07-15 20:44:57 UTC (rev 279962)
+++ trunk/Source/WebCore/page/ChromeClient.h	2021-07-15 21:04:58 UTC (rev 279963)
@@ -228,7 +228,7 @@
 
     virtual void contentsSizeChanged(Frame&, const IntSize&) const = 0;
     virtual void intrinsicContentsSizeChanged(const IntSize&) const = 0;
-    virtual void scrollRectIntoView(const IntRect&) const { }; // Currently only Mac has a non empty implementation.
+    virtual void scrollContainingScrollViewsToRevealRect(const IntRect&) const { }; // Currently only Mac has a non empty implementation.
 
     virtual bool shouldUnavailablePluginMessageBeButton(RenderEmbeddedObject::PluginUnavailabilityReason) const { return false; }
     virtual void unavailablePluginButtonClicked(Element&, RenderEmbeddedObject::PluginUnavailabilityReason) const { }

Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (279962 => 279963)


--- trunk/Source/WebCore/rendering/RenderLayer.cpp	2021-07-15 20:44:57 UTC (rev 279962)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp	2021-07-15 21:04:58 UTC (rev 279963)
@@ -2516,7 +2516,7 @@
             // This only has an effect on the Mac platform in applications
             // that put web views into scrolling containers, such as Mac OS X Mail.
             // The canAutoscroll function in EventHandler also knows about this.
-            page().chrome().scrollRectIntoView(snappedIntRect(absoluteRect));
+            page().chrome().scrollContainingScrollViewsToRevealRect(snappedIntRect(absoluteRect));
         }
     }
     

Modified: trunk/Source/WebKit/ChangeLog (279962 => 279963)


--- trunk/Source/WebKit/ChangeLog	2021-07-15 20:44:57 UTC (rev 279962)
+++ trunk/Source/WebKit/ChangeLog	2021-07-15 21:04:58 UTC (rev 279963)
@@ -1,3 +1,15 @@
+2021-07-15  Megan Gardner  <[email protected]>
+
+        Rename scrollRectIntoView to scrollContainingScrollViewsToRevealRect for clarity.
+        https://bugs.webkit.org/show_bug.cgi?id=227995
+
+        Reviewed by Tim Horton.
+
+        * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+        (WebKit::WebChromeClient::scrollContainingScrollViewsToRevealRect const):
+        (WebKit::WebChromeClient::scrollRectIntoView const): Deleted.
+        * WebProcess/WebCoreSupport/WebChromeClient.h:
+
 2021-07-15  Brent Fulgham  <[email protected]>
 
         [macOS] Expand GPU sandbox to support multi-target AirPlay

Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp (279962 => 279963)


--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp	2021-07-15 20:44:57 UTC (rev 279962)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp	2021-07-15 21:04:58 UTC (rev 279963)
@@ -655,7 +655,7 @@
     }
 }
 
-void WebChromeClient::scrollRectIntoView(const IntRect&) const
+void WebChromeClient::scrollContainingScrollViewsToRevealRect(const IntRect&) const
 {
     notImplemented();
 }

Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h (279962 => 279963)


--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h	2021-07-15 20:44:57 UTC (rev 279962)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h	2021-07-15 21:04:58 UTC (rev 279963)
@@ -133,7 +133,7 @@
     PlatformPageClient platformPageClient() const final;
     void contentsSizeChanged(WebCore::Frame&, const WebCore::IntSize&) const final;
     void intrinsicContentsSizeChanged(const WebCore::IntSize&) const final;
-    void scrollRectIntoView(const WebCore::IntRect&) const final; // Currently only Mac has a non empty implementation.
+    void scrollContainingScrollViewsToRevealRect(const WebCore::IntRect&) const final; // Currently only Mac has a non empty implementation.
 
     bool shouldUnavailablePluginMessageBeButton(WebCore::RenderEmbeddedObject::PluginUnavailabilityReason) const final;
     void unavailablePluginButtonClicked(WebCore::Element&, WebCore::RenderEmbeddedObject::PluginUnavailabilityReason) const final;

Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (279962 => 279963)


--- trunk/Source/WebKitLegacy/mac/ChangeLog	2021-07-15 20:44:57 UTC (rev 279962)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog	2021-07-15 21:04:58 UTC (rev 279963)
@@ -1,3 +1,15 @@
+2021-07-15  Megan Gardner  <[email protected]>
+
+        Rename scrollRectIntoView to scrollContainingScrollViewsToRevealRect for clarity.
+        https://bugs.webkit.org/show_bug.cgi?id=227995
+
+        Reviewed by Tim Horton.
+
+        * WebCoreSupport/WebChromeClient.h:
+        * WebCoreSupport/WebChromeClient.mm:
+        (WebChromeClient::scrollContainingScrollViewsToRevealRect const):
+        (WebChromeClient::scrollRectIntoView const): Deleted.
+
 2021-07-14  Rob Buis  <[email protected]>
 
         Rename hasOverflowClip() to prepare for the real overflow:clip

Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebChromeClient.h (279962 => 279963)


--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebChromeClient.h	2021-07-15 20:44:57 UTC (rev 279962)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebChromeClient.h	2021-07-15 21:04:58 UTC (rev 279963)
@@ -112,7 +112,7 @@
     PlatformPageClient platformPageClient() const final;
     void contentsSizeChanged(WebCore::Frame&, const WebCore::IntSize&) const final;
     void intrinsicContentsSizeChanged(const WebCore::IntSize&) const final { }
-    void scrollRectIntoView(const WebCore::IntRect&) const final;
+    void scrollContainingScrollViewsToRevealRect(const WebCore::IntRect&) const final;
 
     void setStatusbarText(const String&) override;
 

Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebChromeClient.mm (279962 => 279963)


--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebChromeClient.mm	2021-07-15 20:44:57 UTC (rev 279962)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebChromeClient.mm	2021-07-15 21:04:58 UTC (rev 279963)
@@ -606,7 +606,7 @@
 {
 }
 
-void WebChromeClient::scrollRectIntoView(const IntRect& r) const
+void WebChromeClient::scrollContainingScrollViewsToRevealRect(const IntRect& r) const
 {
     // FIXME: This scrolling behavior should be under the control of the embedding client,
     // perhaps in a delegate method, rather than something WebKit does unconditionally.

Modified: trunk/Source/WebKitLegacy/win/WebCoreSupport/WebChromeClient.h (279962 => 279963)


--- trunk/Source/WebKitLegacy/win/WebCoreSupport/WebChromeClient.h	2021-07-15 20:44:57 UTC (rev 279962)
+++ trunk/Source/WebKitLegacy/win/WebCoreSupport/WebChromeClient.h	2021-07-15 21:04:58 UTC (rev 279963)
@@ -144,7 +144,7 @@
     WebCore::GraphicsDeviceAdapter* graphicsDeviceAdapter() const final;
 #endif
 
-    void scrollRectIntoView(const WebCore::IntRect&) const final { }
+    void scrollContainingScrollViewsToRevealRect(const WebCore::IntRect&) const final { }
 
 #if ENABLE(VIDEO)
     bool supportsVideoFullscreen(WebCore::HTMLMediaElementEnums::VideoFullscreenMode) final;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to