ChangeLog

2021-07-01  Megan Gardner  <megan_gardner@apple.com>

        Add logging for legacy AppHighlight decoding to aid in future debugging.

        https://bugs.webkit.org/show_bug.cgi?id=227591

        Reviewed by NOBODY (OOPS!).

        * Modules/highlight/AppHighlightRangeData.cpp:

        (WebCore::AppHighlightRangeData::decode):

        * platform/Logging.h:

2021-07-01  Amir Mark Jr  <amir_mark@apple.com>

        Unreviewed, reverting r279452.

Source/WebCore/Modules/highlight/AppHighlightRangeData.cpp

#include "Document.h"

#include "DocumentMarkerController.h"

#include "HTMLBodyElement.h"

34#include "Logging.h"

#include "Node.h"

#include "RenderedDocumentMarker.h"

#include "SharedBuffer.h"

@@template<class Decoder> std::optional<AppHighlightRangeData> AppHighlightRangeDa

        if (!decoder.rewind(sizeof(highlightFileSignature)))

            return std::nullopt;

        version = 0;

124 RELEASE_LOG(AppHighlights, "Decoded legacy (v0) highlight.");

    }

    std::optional<String> identifier;

Source/WebCore/Modules/highlight/AppHighlightStorage.cpp

@@static std::optional<SimpleRange> findRangeByIdentifyingStartAndEndPositions(con

static std::optional<SimpleRange> findRangeBySearchingText(const AppHighlightRangeData& range, Document& document)

{

136 RELEASE_LOG(AppHighlights, "Attempting fallback text search for AppHighlightRangeData.");

    HashSet<String> identifiersInStartPath;

    for (auto& component : range.startContainer()) {

        if (!component.identifier.isEmpty())

@@void AppHighlightStorage::storeAppHighlight(Ref<StaticRange>&& range)

void AppHighlightStorage::restoreAndScrollToAppHighlight(Ref<SharedBuffer>&& buffer, ScrollToHighlight scroll)

{

    auto appHighlightRangeData = AppHighlightRangeData::create(buffer);

242 if (!appHighlightRangeData)

243 if (!appHighlightRangeData) {

244 RELEASE_LOG(AppHighlights, "AppHighlightRangeData failed to decode.");

243245 return;

246 }

    
    if (!attemptToRestoreHighlightAndScroll(appHighlightRangeData.value(), scroll)) {

        if (scroll == ScrollToHighlight::Yes)

@@bool AppHighlightStorage::attemptToRestoreHighlightAndScroll(AppHighlightRangeDa

    
    auto range = findRange(highlight, *strongDocument);

264 if (!range)

267 if (!range) {

268 RELEASE_LOG(AppHighlights, "Failed to find range for AppHighlightRangeData.");

265269 return false;

270 }

    
    strongDocument->appHighlightRegister().addAppHighlight(StaticRange::create(*range));

Source/WebCore/platform/Logging.h

@@namespace WebCore {

#define WEBCORE_LOG_CHANNELS(M) \

    M(Accessibility) \

    M(Animations) \

42 M(AppHighlights) \

    M(ApplePay) \

    M(Archives) \

    M(BackForwardCache) \