[webkit-changes] [WebKit/WebKit] 5cf1f0: Fix !ENABLE(ACCESSIBILITY) build following 259169 at ...

Ross Kirsling noreply at github.com
Tue Jan 24 02:23:19 PST 2023


  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 5cf1f09b2ac867fbb8b01ebb3557bc3036c1cbdd
      https://github.com/WebKit/WebKit/commit/5cf1f09b2ac867fbb8b01ebb3557bc3036c1cbdd
  Author: Ross Kirsling <rkirsling at gmail.com>
  Date:   2023-01-24 (Tue, 24 Jan 2023)

  Changed paths:
    M Source/WebCore/Headers.cmake
    M Source/WebCore/WebCore.xcodeproj/project.pbxproj
    M Source/WebCore/accessibility/AXObjectCache.h
    M Source/WebCore/accessibility/AXTextMarker.cpp
    M Source/WebCore/accessibility/AXTextMarker.h

  Log Message:
  -----------
  Fix !ENABLE(ACCESSIBILITY) build following 259169 at main.
https://bugs.webkit.org/show_bug.cgi?id=251070

Unreviewed PlayStation build fix.

This was a tricky one because the new feature was not designed in a way to allow for an ENABLE to work.
Usually the solution is just to add stub functions; here, the functions depended on a forward-declared type, TextMarkerData, which would cause a circular dependency when replaced with an include. This is resolved by removing the opposite-direction include and transplanting TextMarkerData's method definitions from the header to the impl file.

* Source/WebCore/Headers.cmake:
* Source/WebCore/WebCore.xcodeproj/project.pbxproj:
* Source/WebCore/accessibility/AXObjectCache.h:
(WebCore::AXObjectCache::textMarkerDataForVisiblePosition):
(WebCore::AXObjectCache::textMarkerDataForCharacterOffset):
(WebCore::AXObjectCache::visiblePositionForTextMarkerData):
(WebCore::AXObjectCache::visiblePositionFromCharacterOffset):
* Source/WebCore/accessibility/AXTextMarker.cpp:
(WebCore::TextMarkerData::TextMarkerData):
(WebCore::TextMarkerData::initializeAXIDs):
* Source/WebCore/accessibility/AXTextMarker.h:

Canonical link: https://commits.webkit.org/259268@main




More information about the webkit-changes mailing list