Remove "pagination line grid" SPI

https://bugs.webkit.org/show_bug.cgi?id=248759 rdar://102975657 Reviewed by Alan Baradlay. This SPI was implemented for Books (rdar://23041598) but never adopted (rdar://25075170). * Source/WebCore/page/Page.cpp: (WebCore::Page::setPaginationLineGridEnabled): Deleted. * Source/WebCore/page/Page.h: (WebCore::Page::paginationLineGridEnabled const): Deleted. * Source/WebCore/rendering/RenderBox.cpp: (WebCore::RenderBox::styleDidChange): * Source/WebCore/style/StyleResolveForDocument.cpp: (WebCore::Style::resolveForDocument): * Source/WebCore/testing/Internals.cpp: (WebCore::Internals::resetToConsistentState): (WebCore::Internals::setPaginationLineGridEnabled): Deleted. * Source/WebCore/testing/Internals.h: * Source/WebCore/testing/Internals.idl: * Source/WebKit/Shared/WebPageCreationParameters.cpp: (WebKit::WebPageCreationParameters::encode const): (WebKit::WebPageCreationParameters::decode): * Source/WebKit/Shared/WebPageCreationParameters.h: * Source/WebKit/UIProcess/API/C/WKPage.cpp: (WKPageSetPaginationLineGridEnabled): (WKPageGetPaginationLineGridEnabled): * Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextController.mm: (-[WKBrowsingContextController setPaginationLineGridEnabled:]): (-[WKBrowsingContextController paginationLineGridEnabled]): * Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm: (-[WKWebView _paginationLineGridEnabled]): (-[WKWebView _setPaginationLineGridEnabled:]): * Source/WebKit/UIProcess/WebPageProxy.cpp: (WebKit::WebPageProxy::creationParameters): (WebKit::WebPageProxy::setPaginationLineGridEnabled): Deleted. * Source/WebKit/UIProcess/WebPageProxy.h: * Source/WebKit/WebProcess/WebPage/WebPage.cpp: (WebKit::m_appHighlightsVisible): (WebKit::WebPage::setPaginationLineGridEnabled): Deleted. * Source/WebKit/WebProcess/WebPage/WebPage.h: * Source/WebKit/WebProcess/WebPage/WebPage.messages.in: * Source/WebKitLegacy/mac/WebView/WebView.mm: (-[WebView _setPaginationLineGridEnabled:]): (-[WebView _paginationLineGridEnabled]): Leave stubs in place as clients may still be calling these with NO value. Canonical link: https://commits.webkit.org/257372@main
WebKit · Dec 5, 2022 · ab11627 · ab11627
1 parent 4690d8d
commit ab11627
Show file tree

Hide file tree

Showing 18 changed files with 6 additions and 87 deletions.
diff --git a/Source/WebCore/page/Page.cpp b/Source/WebCore/page/Page.cpp
@@ -1548,16 +1548,6 @@ void Page::setPagination(const Pagination& pagination)
     setNeedsRecalcStyleInAllFrames();
 }
 
-void Page::setPaginationLineGridEnabled(bool enabled)
-{
-    if (m_paginationLineGridEnabled == enabled)
-        return;
-
-    m_paginationLineGridEnabled = enabled;
-
-    setNeedsRecalcStyleInAllFrames();
-}
-
 unsigned Page::pageCount() const
 {
     if (m_pagination.mode == Pagination::Unpaginated)

diff --git a/Source/WebCore/page/Page.h b/Source/WebCore/page/Page.h
@@ -545,8 +545,6 @@ class Page : public Supplementable<Page>, public CanMakeWeakPtr<Page> {
     // FrameView.
     const Pagination& pagination() const { return m_pagination; }
     WEBCORE_EXPORT void setPagination(const Pagination&);
-    bool paginationLineGridEnabled() const { return m_paginationLineGridEnabled; }
-    WEBCORE_EXPORT void setPaginationLineGridEnabled(bool flag);
 
     WEBCORE_EXPORT unsigned pageCount() const;
 
@@ -1141,7 +1139,6 @@ class Page : public Supplementable<Page>, public CanMakeWeakPtr<Page> {
     ScrollElasticity m_horizontalScrollElasticity { ScrollElasticity::Allowed };
 
     Pagination m_pagination;
-    bool m_paginationLineGridEnabled { false };
 
     String m_userStyleSheetPath;
     mutable String m_userStyleSheet;

diff --git a/Source/WebCore/rendering/RenderBox.cpp b/Source/WebCore/rendering/RenderBox.cpp
@@ -364,16 +364,6 @@ void RenderBox::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle
 
         view().frameView().recalculateScrollbarOverlayStyle();
 
-        const Pagination& pagination = view().frameView().pagination();
-        if (isBodyRenderer && pagination.mode != Pagination::Unpaginated && page().paginationLineGridEnabled()) {
-            // Propagate the body font back up to the RenderView and use it as
-            // the basis of the grid.
-            if (newStyle.fontDescription() != view().style().fontDescription()) {
-                view().mutableStyle().setFontDescription(FontCascadeDescription { newStyle.fontDescription() });
-                view().mutableStyle().fontCascade().update(&document().fontSelector());
-            }
-        }
-
         if (diff != StyleDifference::Equal)
             view().compositor().rootOrBodyStyleChanged(*this, oldStyle);
     }

diff --git a/Source/WebCore/style/StyleResolveForDocument.cpp b/Source/WebCore/style/StyleResolveForDocument.cpp
@@ -78,10 +78,6 @@ RenderStyle resolveForDocument(const Document& document)
         documentStyle.setColumnGap(GapLength(Length((int) pagination.gap, LengthType::Fixed)));
         if (renderView.multiColumnFlow())
             renderView.updateColumnProgressionFromStyle(documentStyle);
-        if (renderView.page().paginationLineGridEnabled()) {
-            documentStyle.setLineGrid("-webkit-default-pagination-grid"_s);
-            documentStyle.setLineSnap(LineSnap::Contain);
-        }
     }
 
     const Settings& settings = renderView.frame().settings();

diff --git a/Source/WebCore/testing/Internals.cpp b/Source/WebCore/testing/Internals.cpp
@@ -544,7 +544,6 @@ void Internals::resetToConsistentState(Page& page)
 {
     page.setPageScaleFactor(1, IntPoint(0, 0));
     page.setPagination(Pagination());
-    page.setPaginationLineGridEnabled(false);
 
     page.setDefersLoading(false);
 
@@ -2093,15 +2092,6 @@ ExceptionOr<void> Internals::setPagination(const String& mode, int gap, int page
     return { };
 }
 
-ExceptionOr<void> Internals::setPaginationLineGridEnabled(bool enabled)
-{
-    Document* document = contextDocument();
-    if (!document || !document->page())
-        return Exception { InvalidAccessError };
-    document->page()->setPaginationLineGridEnabled(enabled);
-    return { };
-}
-
 ExceptionOr<uint64_t> Internals::lineIndexAfterPageBreak(Element& element)
 {
     Document* document = contextDocument();

diff --git a/Source/WebCore/testing/Internals.h b/Source/WebCore/testing/Internals.h
@@ -343,7 +343,6 @@ class Internals final : public RefCounted<Internals>, private ContextDestruction
     ExceptionOr<void> setViewBaseBackgroundColor(const String& colorValue);
 
     ExceptionOr<void> setPagination(const String& mode, int gap, int pageLength);
-    ExceptionOr<void> setPaginationLineGridEnabled(bool);
     ExceptionOr<uint64_t> lineIndexAfterPageBreak(Element&);
     ExceptionOr<String> configurationForViewport(float devicePixelRatio, int deviceWidth, int deviceHeight, int availableWidth, int availableHeight);
 

diff --git a/Source/WebCore/testing/Internals.idl b/Source/WebCore/testing/Internals.idl
@@ -457,7 +457,6 @@ typedef (FetchRequest or FetchResponse) FetchObject;
     undefined setViewBaseBackgroundColor(DOMString colorValue);
 
     undefined setPagination(DOMString mode, long gap, optional long pageLength = 0);
-    undefined setPaginationLineGridEnabled(boolean enabled);
     unsigned long long lineIndexAfterPageBreak(Element element);
 
     DOMString configurationForViewport(unrestricted float devicePixelRatio, long deviceWidth, long deviceHeight, long availableWidth, long availableHeight);

diff --git a/Source/WebKit/Shared/WebPageCreationParameters.cpp b/Source/WebKit/Shared/WebPageCreationParameters.cpp
@@ -54,7 +54,6 @@ void WebPageCreationParameters::encode(IPC::Encoder& encoder) const
     encoder << paginationBehavesLikeColumns;
     encoder << pageLength;
     encoder << gapBetweenPages;
-    encoder << paginationLineGridEnabled;
     encoder << userAgent;
     encoder << itemStatesWereRestoredByAPIRequest;
     encoder << itemStates;
@@ -256,8 +255,6 @@ std::optional<WebPageCreationParameters> WebPageCreationParameters::decode(IPC::
         return std::nullopt;
     if (!decoder.decode(parameters.gapBetweenPages))
         return std::nullopt;
-    if (!decoder.decode(parameters.paginationLineGridEnabled))
-        return std::nullopt;
 
     std::optional<String> userAgent;
     decoder >> userAgent;

diff --git a/Source/WebKit/Shared/WebPageCreationParameters.h b/Source/WebKit/Shared/WebPageCreationParameters.h
@@ -104,7 +104,6 @@ struct WebPageCreationParameters {
     bool paginationBehavesLikeColumns;
     double pageLength;
     double gapBetweenPages;
-    bool paginationLineGridEnabled;
 
     String userAgent;
 

diff --git a/Source/WebKit/UIProcess/API/C/WKPage.cpp b/Source/WebKit/UIProcess/API/C/WKPage.cpp
@@ -878,15 +878,13 @@ double WKPageGetGapBetweenPages(WKPageRef pageRef)
     return toImpl(pageRef)->gapBetweenPages();
 }
 
-void WKPageSetPaginationLineGridEnabled(WKPageRef pageRef, bool lineGridEnabled)
+void WKPageSetPaginationLineGridEnabled(WKPageRef, bool)
 {
-    CRASH_IF_SUSPENDED;
-    toImpl(pageRef)->setPaginationLineGridEnabled(lineGridEnabled);
 }
 
-bool WKPageGetPaginationLineGridEnabled(WKPageRef pageRef)
+bool WKPageGetPaginationLineGridEnabled(WKPageRef)
 {
-    return toImpl(pageRef)->paginationLineGridEnabled();
+    return false;
 }
 
 unsigned WKPageGetPageCount(WKPageRef pageRef)

diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextController.mm b/Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextController.mm
@@ -722,12 +722,11 @@ - (CGFloat)gapBetweenPages
 
 - (void)setPaginationLineGridEnabled:(BOOL)lineGridEnabled
 {
-    _page->setPaginationLineGridEnabled(lineGridEnabled);
 }
 
 - (BOOL)paginationLineGridEnabled
 {
-    return _page->paginationLineGridEnabled();
+    return NO;
 }
 
 - (NSUInteger)pageCount

diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm b/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
@@ -3308,13 +3308,11 @@ - (void)_setGapBetweenPages:(CGFloat)gapBetweenPages
 
 - (BOOL)_paginationLineGridEnabled
 {
-    return _page->paginationLineGridEnabled();
+    return NO;
 }
 
 - (void)_setPaginationLineGridEnabled:(BOOL)lineGridEnabled
 {
-    THROW_IF_SUSPENDED;
-    _page->setPaginationLineGridEnabled(lineGridEnabled);
 }
 
 - (NSUInteger)_pageCount

diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp
@@ -4441,18 +4441,6 @@ void WebPageProxy::setGapBetweenPages(double gap)
     send(Messages::WebPage::SetGapBetweenPages(gap));
 }
 
-void WebPageProxy::setPaginationLineGridEnabled(bool lineGridEnabled)
-{
-    if (lineGridEnabled == m_paginationLineGridEnabled)
-        return;
-
-    m_paginationLineGridEnabled = lineGridEnabled;
-
-    if (!hasRunningProcess())
-        return;
-    send(Messages::WebPage::SetPaginationLineGridEnabled(lineGridEnabled));
-}
-
 void WebPageProxy::pageScaleFactorDidChange(double scaleFactor)
 {
     m_pageScaleFactor = scaleFactor;
@@ -8617,7 +8605,6 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc
     parameters.paginationBehavesLikeColumns = m_paginationBehavesLikeColumns;
     parameters.pageLength = m_pageLength;
     parameters.gapBetweenPages = m_gapBetweenPages;
-    parameters.paginationLineGridEnabled = m_paginationLineGridEnabled;
     parameters.userAgent = userAgent();
     parameters.itemStatesWereRestoredByAPIRequest = m_sessionStateWasRestoredByAPIRequest;
     parameters.itemStates = m_backForwardList->itemStates();

diff --git a/Source/WebKit/UIProcess/WebPageProxy.h b/Source/WebKit/UIProcess/WebPageProxy.h
@@ -1199,8 +1199,6 @@ class WebPageProxy final : public API::ObjectImpl<API::Object::Type::Page>
     double pageLength() const { return m_pageLength; }
     void setGapBetweenPages(double);
     double gapBetweenPages() const { return m_gapBetweenPages; }
-    void setPaginationLineGridEnabled(bool);
-    bool paginationLineGridEnabled() const { return m_paginationLineGridEnabled; }
     unsigned pageCount() const { return m_pageCount; }
 
     void isJITEnabled(CompletionHandler<void(bool)>&&);
@@ -2961,7 +2959,6 @@ class WebPageProxy final : public API::ObjectImpl<API::Object::Type::Page>
     bool m_paginationBehavesLikeColumns { false };
     double m_pageLength { 0 };
     double m_gapBetweenPages { 0 };
-    bool m_paginationLineGridEnabled { false };
 
     // If the process backing the web page is alive and kicking.
     bool m_hasRunningProcess { false };

diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.cpp b/Source/WebKit/WebProcess/WebPage/WebPage.cpp
@@ -800,7 +800,6 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters)
     setPaginationBehavesLikeColumns(parameters.paginationBehavesLikeColumns);
     setPageLength(parameters.pageLength);
     setGapBetweenPages(parameters.gapBetweenPages);
-    setPaginationLineGridEnabled(parameters.paginationLineGridEnabled);
 
     effectiveAppearanceDidChange(parameters.useDarkAppearance, parameters.useElevatedUserInterfaceLevel);
 
@@ -2584,11 +2583,6 @@ void WebPage::setGapBetweenPages(double gap)
     m_page->setPagination(pagination);
 }
 
-void WebPage::setPaginationLineGridEnabled(bool lineGridEnabled)
-{
-    m_page->setPaginationLineGridEnabled(lineGridEnabled);
-}
-
 void WebPage::postInjectedBundleMessage(const String& messageName, const UserData& userData)
 {
     auto& webProcess = WebProcess::singleton();

diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.h b/Source/WebKit/WebProcess/WebPage/WebPage.h
@@ -643,7 +643,6 @@ class WebPage : public API::ObjectImpl<API::Object::Type::BundlePage>, public IP
     void setPaginationBehavesLikeColumns(bool);
     void setPageLength(double);
     void setGapBetweenPages(double);
-    void setPaginationLineGridEnabled(bool);
 
     void postInjectedBundleMessage(const String& messageName, const UserData&);
 

diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in
@@ -316,7 +316,6 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType
     SetPaginationBehavesLikeColumns(bool behavesLikeColumns)
     SetPageLength(double pageLength)
     SetGapBetweenPages(double gap)
-    SetPaginationLineGridEnabled(bool lineGridEnabled)
 
     PostInjectedBundleMessage(String messageName, WebKit::UserData messageBody)
 

diff --git a/Source/WebKitLegacy/mac/WebView/WebView.mm b/Source/WebKitLegacy/mac/WebView/WebView.mm
@@ -4695,20 +4695,11 @@ - (CGFloat)_gapBetweenPages
 
 - (void)_setPaginationLineGridEnabled:(BOOL)lineGridEnabled
 {
-    auto* page = core(self);
-    if (!page)
-        return;
-
-    page->setPaginationLineGridEnabled(lineGridEnabled);
 }
 
 - (BOOL)_paginationLineGridEnabled
 {
-    auto* page = core(self);
-    if (!page)
-        return NO;
-
-    return page->paginationLineGridEnabled();
+    return NO;
 }
 
 - (NSUInteger)_pageCount