[webkit-changes] [WebKit/WebKit] 4c6b79: Cherry-pick c6eb5dfa73e1. rdar://122947207

Russell Epstein noreply at github.com
Tue May 14 14:28:32 PDT 2024


  Branch: refs/heads/safari-7619.1.4-branch
  Home:   https://github.com/WebKit/WebKit
  Commit: 4c6b79135b26767f0680b1218d57889d6f558bad
      https://github.com/WebKit/WebKit/commit/4c6b79135b26767f0680b1218d57889d6f558bad
  Author: Wenson Hsieh <wenson_hsieh at apple.com>
  Date:   2024-02-14 (Wed, 14 Feb 2024)

  Changed paths:
    M Source/WebKit/Configurations/WebKitSwift.xcconfig
    M Source/WebKit/DerivedSources.make

  Log Message:
  -----------
  Cherry-pick c6eb5dfa73e1. rdar://122947207

    Unreviewed, fix internal builds that use `WKWebView+TextExtraction.swift.in`
    rdar://122947207

    Partially revert support for text extraction, until we're able to reliably block the WebKitSwift
    installhdrs phase on the WebKitAdditions build being finished.

    * Source/WebKit/Configurations/WebKitSwift.xcconfig:
    * Source/WebKit/DerivedSources.make:

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

Canonical link: https://commits.webkit.org/274594.1@safari-7619.1.4-branch


  Commit: 6fafb521a4043066c44ae1db0cab3736c8a75f53
      https://github.com/WebKit/WebKit/commit/6fafb521a4043066c44ae1db0cab3736c8a75f53
  Author: Chris Dumez <cdumez at apple.com>
  Date:   2024-02-14 (Wed, 14 Feb 2024)

  Changed paths:
    M Source/WebCore/platform/PODInterval.h

  Log Message:
  -----------
  Cherry-pick fd9c1365ede0. rdar://122959342

    Regression(274445 at main): Crash under HTMLMediaElement::updateActiveTextTrackCues() on Hulu.com
    https://bugs.webkit.org/show_bug.cgi?id=269394
    rdar://122959342

    Reviewed by Jer Noble.

    In 274445 at main, I updated CueInterval to be an alias to:
    ```
    PODInterval<MediaTime, WeakPtr<TextTrackCue, WeakPtrImplWithEventTargetData>>
    ```
    instead of:
    ```
    PODInterval<MediaTime, TextTrackCue*>
    ```
    per our recent smart pointer guidelines.

    When doing do, I noticed that PODInterval has different implementations when the
    second type is a WeakPtr. Adopting WeakPtr led to build errors because the
    PODInterval's specialization for WeakPtr was missing operator==(). To fix the
    build, I copied the generic PODInterval's operator==() and used it. However, I
    failed to noticed that the 2 specializations had different operator<()
    implementations as well. In particular, the generic operator<() was checking
    userData while the WeakPtr specialization one wasn't. This mismatch between
    operator==() (which was checking userData) and operator<() (which wasn't checking
    userData) was the cause of these crashes.

    I now updated operator<() to be the same of both specializations (except for
    calling `.get()` to extract the raw pointer from the WeakPtr) and this addressed
    the crashes on hulu.com.

    * Source/WebCore/platform/PODInterval.h:

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

Canonical link: https://commits.webkit.org/274594.2@safari-7619.1.4-branch


  Commit: 9973435ac6c2fc23e41975833a8b1d7ee1236cd5
      https://github.com/WebKit/WebKit/commit/9973435ac6c2fc23e41975833a8b1d7ee1236cd5
  Author: Timothy Hatcher <timothy at apple.com>
  Date:   2024-02-16 (Fri, 16 Feb 2024)

  Changed paths:
    M Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionTabCocoa.mm

  Log Message:
  -----------
  Cherry-pick 7900c68de6a3. rdar://122974809

    Exception in WebKit::WebExtensionTab::processes().
    https://webkit.org/b/269409
    rdar://122974809

    Reviewed by Jeff Miller and Brian Weinstein.

    When mainWebView() is nil, we need to be careful. Use [NSArray arrayWithObjects:]
    instead of [NSArray arrayWithObject:] since that will make a zero item array
    if the web view is nil, instead of throwing an exception.

    * Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionTabCocoa.mm:
    (WebKit::WebExtensionTab::processes const):

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

Canonical link: https://commits.webkit.org/274594.3@safari-7619.1.4-branch


  Commit: 3b2f33a17eaace08eedb18f085a210f86b7397d9
      https://github.com/WebKit/WebKit/commit/3b2f33a17eaace08eedb18f085a210f86b7397d9
  Author: Russell Epstein <repstein at apple.com>
  Date:   2024-02-16 (Fri, 16 Feb 2024)

  Changed paths:
    M Configurations/Version.xcconfig

  Log Message:
  -----------
  Versioning.

WebKit-7619.1.4.1

Canonical link: https://commits.webkit.org/274594.4@safari-7619.1.4-branch


  Commit: 4196e1994fe6913803b7c07d1e410ee803e327d1
      https://github.com/WebKit/WebKit/commit/4196e1994fe6913803b7c07d1e410ee803e327d1
  Author: Russell Epstein <repstein at apple.com>
  Date:   2024-02-16 (Fri, 16 Feb 2024)

  Changed paths:
    M .submitproject

  Log Message:
  -----------
  Cherry-pick 55303a435f63. rdar://123128300

    Update declarative filtering configuration to exclude skia sources
    rdar://123128300

    Reviewed by Alex Christensen.

    * .submitproject: Exclude Source/ThirdParty/skia
    Canonical link: https://commits.webkit.org/274905@main

Canonical link: https://commits.webkit.org/274594.5@safari-7619.1.4-branch


  Commit: 91a59b78a86f1f82b78686459d7d496d444d2cc5
      https://github.com/WebKit/WebKit/commit/91a59b78a86f1f82b78686459d7d496d444d2cc5
  Author: Russell Epstein <repstein at apple.com>
  Date:   2024-02-17 (Sat, 17 Feb 2024)

  Changed paths:
    M Configurations/Version.xcconfig

  Log Message:
  -----------
  Versioning.

WebKit-7619.1.4.2

Canonical link: https://commits.webkit.org/274594.6@safari-7619.1.4-branch


Compare: https://github.com/WebKit/WebKit/compare/4c6b79135b26%5E...91a59b78a86f

To unsubscribe from these emails, change your notification settings at https://github.com/WebKit/WebKit/settings/notifications


More information about the webkit-changes mailing list