chore: set release version to 1.38.0 (#1386 )

chore: update selector escaping, roll driver (#1385 )
fix: setfiles OOM exception (#1384 )
2026-05-22 18:53:15 +00:00 · 2023-09-18 17:32:02 -07:00 · 2023-09-18 16:22:23 -07:00 · 2023-09-18 15:48:56 -07:00 · 2023-09-18 15:41:38 -07:00 · 2023-09-12 09:10:13 -07:00
119 changed files with 4143 additions and 1197 deletions
@@ -1,5 +1,8 @@
 trigger:
  none
+  
+# don't trigger for Pull Requests
+pr: none

 pool:
  vmImage: ubuntu-22.04
@@ -43,15 +46,17 @@ steps:
    done
  displayName: 'Create .sha256 files'

- task: EsrpRelease@2
+- task: EsrpRelease@4
  inputs:
-    ConnectedServiceName: 'Playwright-Java-ESRP'
+    ConnectedServiceName: 'Playwright-ESRP'
    Intent: 'PackageDistribution'
    ContentType: 'Maven'
-    PackageLocation: './local-build'
+    ContentSource: 'Folder'
+    FolderLocation: './local-build'
+    WaitForReleaseCompletion: true
    Owners: 'yurys@microsoft.com'
    Approvers: 'maxschmitt@microsoft.com'
    ServiceEndpointUrl: 'https://api.esrp.microsoft.com'
-    MainPublisher: 'PlaywrightJava'
+    MainPublisher: 'Playwright'
    DomainTenantId: '72f988bf-86f1-41af-91ab-2d7cd011db47'
  displayName: 'ESRP Release to Maven'
@@ -7,19 +7,34 @@ assignees: ''

 ---

-**Context:**
- Playwright Version: [what Playwright version do you use?]
- Operating System: [e.g. Windows, Linux or Mac]
- Browser: [e.g. All, Chromium, Firefox, WebKit]
- Extra: [any specific details about your environment]
+<!-- ⚠️⚠️ Do not delete this template ⚠️⚠️ -->

-<!-- CLI to auto-capture this info -->
-<!-- npx envinfo --preset playwright --markdown -->
+<!-- 🔎 Search existing issues to avoid creating duplicates. -->
+<!-- 🧪 Test using the latest Playwright release to see if your issue has already been fixed -->
+<!-- 💡 Provide enough information for us to be able to reproduce your issue locally -->

-**Code Snippet**
+### System info
+- Playwright Version: [v1.XX]
+- Operating System: [All, Windows 11, Ubuntu 20, macOS 13.2, etc.]
+- Browser: [All, Chromium, Firefox, WebKit]
+- Other info:

-Help us help you! Put down a short code snippet that illustrates your bug and
-that we can run and debug locally. For example:
+### Source code
+
+- [ ] I provided exact source code that allows reproducing the issue locally.
+
+<!-- For simple cases, please provide a self-contained test file along with the config file -->
+<!-- For larger cases, you can provide a GitHub repo you created for this issue -->
+<!-- If we can not reproduce the problem locally, we won't be able to act on it -->
+<!-- You can still file without the exact code and we will try to help, but if we can't repro, it will be closed -->
+
+**Link to the GitHub repository with the repro**
+
+[https://github.com/your_profile/playwright_issue_title]
+
+or
+
+**Test file (self-contained)**

 ```java
 import com.microsoft.playwright.*;
@@ -36,6 +51,14 @@ public class ExampleReproducible {
 }
 ```

-**Describe the bug**
+**Steps**
+- [Run the test]
+- [...]

-Add any other details about the problem here.
+**Expected**
+
+[Describe expected behavior]
+
+**Actual**
+
+[Describe actual behavior]
@@ -1,4 +1,4 @@
 contact_links:
-  - name: Join our Slack community
-    url: https://aka.ms/playwright-slack
-    about: Ask questions and discuss with other community members
+  - name: Join our Discord Server
+    url: https://aka.ms/playwright/discord
+    about: Ask questions and discuss with other community members
@@ -1,10 +0,0 @@
---
-name: I have a question
-about: Feel free to ask us your questions!
-title: "[Question]"
-labels: ''
-assignees: ''
-
---
-
-
@@ -31,11 +31,11 @@ jobs:
    - name: Build & Install
      run: mvn -B install -D skipTests --no-transfer-progress
    - name: Run tests
-      run: mvn test --no-transfer-progress --fail-at-end
+      run: mvn test --no-transfer-progress --fail-at-end -D org.slf4j.simpleLogger.showDateTime=true -D org.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss
      env:
        BROWSER: ${{ matrix.browser }}
    - name: Run tracing tests w/ sources
-      run: mvn test --no-transfer-progress --fail-at-end -D test=*TestTracing*
+      run: mvn test --no-transfer-progress --fail-at-end -D test=*TestTracing* -D org.slf4j.simpleLogger.showDateTime=true -D org.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss
      env:
        BROWSER: ${{ matrix.browser }}
        PLAYWRIGHT_JAVA_SRC: src/test/java
@@ -79,7 +79,7 @@ jobs:
      - name: Build & Install
        run: mvn -B install -D skipTests --no-transfer-progress
      - name: Run tests
-        run: mvn test --no-transfer-progress --fail-at-end
+        run: mvn test --no-transfer-progress --fail-at-end -D org.slf4j.simpleLogger.showDateTime=true -D org.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss
        env:
          BROWSER: chromium
          BROWSER_CHANNEL: ${{ matrix.browser-channel }}
@@ -1,4 +1,4 @@
-name: Test Docker
+name: Docker
 on:
  push:
    paths:
@@ -18,13 +18,18 @@ on:
      - release-*
 jobs:
  test:
-    timeout-minutes: 60
-    runs-on: ubuntu-20.04
+    name: Test
+    timeout-minutes: 120
+    runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        flavor: [focal, jammy]
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
      - name: Build Docker image
-        run: bash utils/docker/build.sh --amd64 focal playwright-java:localbuild-focal
+        run: bash utils/docker/build.sh --amd64 ${{ matrix.flavor }} playwright-java:localbuild-${{ matrix.flavor }}
      - name: Test
        run: |
-          CONTAINER_ID="$(docker run --rm --ipc=host -v $(pwd):/root/playwright --name playwright-docker-test -d -t playwright-java:localbuild-focal /bin/bash)"
+          CONTAINER_ID="$(docker run --rm --ipc=host -v $(pwd):/root/playwright --name playwright-docker-test -d -t playwright-java:localbuild-${{ matrix.flavor }} /bin/bash)"
          docker exec "${CONTAINER_ID}" /root/playwright/tools/test-local-installation/create_project_and_run_tests.sh
@@ -11,9 +11,9 @@ Playwright is a Java library to automate [Chromium](https://www.chromium.org/Hom

 |          | Linux | macOS | Windows |
 |   :---   | :---: | :---: | :---:   |
-| Chromium <!-- GEN:chromium-version -->111.0.5563.19<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
-| WebKit <!-- GEN:webkit-version -->16.4<!-- GEN:stop --> | ✅ | ✅ | ✅ |
-| Firefox <!-- GEN:firefox-version -->109.0<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| Chromium <!-- GEN:chromium-version -->117.0.5938.62<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| WebKit <!-- GEN:webkit-version -->17.0<!-- GEN:stop --> | ✅ | ✅ | ✅ |
+| Firefox <!-- GEN:firefox-version -->117.0<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |

 Headless execution is supported for all the browsers on all platforms. Check out [system requirements](https://playwright.dev/java/docs/next/intro/#system-requirements) for details.

@@ -65,7 +65,7 @@ You can find Maven project with the examples [here](./examples).

 #### Page screenshot

-This code snippet navigates to whatsmyuseragent.org in Chromium, Firefox and WebKit, and saves 3 screenshots.
+This code snippet navigates to Playwright homepage in Chromium, Firefox and WebKit, and saves 3 screenshots.

 ```java
 import com.microsoft.playwright.*;
@@ -86,7 +86,7 @@ public class PageScreenshot {
        try (Browser browser = browserType.launch()) {
          BrowserContext context = browser.newContext();
          Page page = context.newPage();
-          page.navigate("http://whatsmyuseragent.org/");
+          page.navigate("https://playwright.dev/");
          page.screenshot(new Page.ScreenshotOptions().setPath(Paths.get("screenshot-" + browserType.name() + ".png")));
        }
      }
@@ -6,8 +6,15 @@
 * regenerate API: `./scripts/download_driver_for_all_platforms.sh -f && ./scripts/generate_api.sh && ./scripts/update_readme.sh`
 * commit & send PR with the roll

+### Finding driver version
+
+For development versions of Playwright, you can find the latest version by looking at [publish_canary](https://github.com/microsoft/playwright/actions/workflows/publish_canary.yml) workflow -> `publish canary NPM & Publish canary Docker` -> `build & publish driver` step -> `PACKAGE_VERSION`
+<img width="960" alt="image" src="https://github.com/microsoft/playwright-java/assets/9798949/4f33a7f1-b39a-4179-8ae7-fb1d84094c75">
+
+
 # Updating Version

 ```bash
 ./scripts/set_maven_version.sh 1.15.0
 ```
+
@@ -6,7 +6,7 @@
  <parent>
    <groupId>com.microsoft.playwright</groupId>
    <artifactId>parent-pom</artifactId>
-    <version>1.31.0-SNAPSHOT</version>
+    <version>1.38.0</version>
  </parent>

  <artifactId>driver-bundle</artifactId>
@@ -194,7 +194,11 @@ public class DriverJar extends Driver {
      }
    }
    if (name.contains("mac os x")) {
-      return "mac";
+      if (arch.equals("aarch64")) {
+        return "mac-arm64";
+      } else {
+        return "mac";
+      }
    }
    throw new RuntimeException("Unexpected os.name value: " + name);
  }
@@ -6,7 +6,7 @@
  <parent>
    <groupId>com.microsoft.playwright</groupId>
    <artifactId>parent-pom</artifactId>
-    <version>1.31.0-SNAPSHOT</version>
+    <version>1.38.0</version>
  </parent>

  <artifactId>driver</artifactId>
@@ -6,7 +6,7 @@

  <groupId>org.example</groupId>
  <artifactId>examples</artifactId>
-  <version>1.31.0-SNAPSHOT</version>
+  <version>1.38.0</version>
  <name>Playwright Client Examples</name>
  <properties>
    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -34,7 +34,7 @@ public class PageScreenshot {
        try (Browser browser = browserType.launch()) {
          BrowserContext context = browser.newContext();
          Page page = context.newPage();
-          page.navigate("http://whatsmyuseragent.org/");
+          page.navigate("https://playwright.dev/");
          page.screenshot(new Page.ScreenshotOptions().setPath(Paths.get("screenshot-" + browserType.name() + ".png")));
        }
      }
@@ -24,7 +24,7 @@ public class WebKitScreenshot {
    try (Playwright playwright = Playwright.create()) {
      Browser browser = playwright.webkit().launch();
      Page page = browser.newPage();
-      page.navigate("http://whatsmyuseragent.org/");
+      page.navigate("https://playwright.dev/");
      page.screenshot(new Page.ScreenshotOptions().setPath(Paths.get("example.png")));
    }
  }
@@ -7,7 +7,7 @@
  <parent>
    <groupId>com.microsoft.playwright</groupId>
    <artifactId>parent-pom</artifactId>
-    <version>1.31.0-SNAPSHOT</version>
+    <version>1.38.0</version>
  </parent>

  <artifactId>playwright</artifactId>
@@ -42,11 +42,12 @@ public interface APIRequest {
     */
    public String baseURL;
    /**
-     * An object containing additional HTTP headers to be sent with every request.
+     * An object containing additional HTTP headers to be sent with every request. Defaults to none.
     */
    public Map<String, String> extraHTTPHeaders;
    /**
-     * Credentials for <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication">HTTP authentication</a>.
+     * Credentials for <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication">HTTP authentication</a>. If
+     * no origin is specified, the username and password are sent to any servers upon unauthorized responses.
     */
    public HttpCredentials httpCredentials;
    /**
@@ -99,20 +100,22 @@ public interface APIRequest {
      return this;
    }
    /**
-     * An object containing additional HTTP headers to be sent with every request.
+     * An object containing additional HTTP headers to be sent with every request. Defaults to none.
     */
    public NewContextOptions setExtraHTTPHeaders(Map<String, String> extraHTTPHeaders) {
      this.extraHTTPHeaders = extraHTTPHeaders;
      return this;
    }
    /**
-     * Credentials for <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication">HTTP authentication</a>.
+     * Credentials for <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication">HTTP authentication</a>. If
+     * no origin is specified, the username and password are sent to any servers upon unauthorized responses.
     */
    public NewContextOptions setHttpCredentials(String username, String password) {
      return setHttpCredentials(new HttpCredentials(username, password));
    }
    /**
-     * Credentials for <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication">HTTP authentication</a>.
+     * Credentials for <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication">HTTP authentication</a>. If
+     * no origin is specified, the username and password are sent to any servers upon unauthorized responses.
     */
    public NewContextOptions setHttpCredentials(HttpCredentials httpCredentials) {
      this.httpCredentials = httpCredentials;
@@ -66,7 +66,7 @@ public interface Browser extends AutoCloseable {
     * Page.waitForURL()}, {@link Page#waitForRequest Page.waitForRequest()}, or {@link Page#waitForResponse
     * Page.waitForResponse()} it takes the base URL in consideration by using the <a
     * href="https://developer.mozilla.org/en-US/docs/Web/API/URL/URL">{@code URL()}</a> constructor for building the
-     * corresponding URL. Examples:
+     * corresponding URL. Unset by default. Examples:
     * <ul>
     * <li> baseURL: {@code http://localhost:3000} and navigating to {@code /bar.html} results in {@code
     * http://localhost:3000/bar.html}</li>
@@ -78,7 +78,7 @@ public interface Browser extends AutoCloseable {
     */
    public String baseURL;
    /**
-     * Toggles bypassing page's Content-Security-Policy.
+     * Toggles bypassing page's Content-Security-Policy. Defaults to {@code false}.
     */
    public Boolean bypassCSP;
    /**
@@ -88,11 +88,12 @@ public interface Browser extends AutoCloseable {
     */
    public Optional<ColorScheme> colorScheme;
    /**
-     * Specify device scale factor (can be thought of as dpr). Defaults to {@code 1}.
+     * Specify device scale factor (can be thought of as dpr). Defaults to {@code 1}. Learn more about <a
+     * href="https://playwright.dev/java/docs/emulation#devices">emulating devices with device scale factor</a>.
     */
    public Double deviceScaleFactor;
    /**
-     * An object containing additional HTTP headers to be sent with every request.
+     * An object containing additional HTTP headers to be sent with every request. Defaults to none.
     */
    public Map<String, String> extraHTTPHeaders;
    /**
@@ -103,11 +104,13 @@ public interface Browser extends AutoCloseable {
    public Optional<ForcedColors> forcedColors;
    public Geolocation geolocation;
    /**
-     * Specifies if viewport supports touch events. Defaults to false.
+     * Specifies if viewport supports touch events. Defaults to false. Learn more about <a
+     * href="https://playwright.dev/java/docs/emulation#devices">mobile emulation</a>.
     */
    public Boolean hasTouch;
    /**
-     * Credentials for <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication">HTTP authentication</a>.
+     * Credentials for <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication">HTTP authentication</a>. If
+     * no origin is specified, the username and password are sent to any servers upon unauthorized responses.
     */
    public HttpCredentials httpCredentials;
    /**
@@ -115,30 +118,35 @@ public interface Browser extends AutoCloseable {
     */
    public Boolean ignoreHTTPSErrors;
    /**
-     * Whether the {@code meta viewport} tag is taken into account and touch events are enabled. Defaults to {@code false}. Not
-     * supported in Firefox.
+     * Whether the {@code meta viewport} tag is taken into account and touch events are enabled. isMobile is a part of device,
+     * so you don't actually need to set it manually. Defaults to {@code false} and is not supported in Firefox. Learn more
+     * about <a href="https://playwright.dev/java/docs/emulation#ismobile">mobile emulation</a>.
     */
    public Boolean isMobile;
    /**
-     * Whether or not to enable JavaScript in the context. Defaults to {@code true}.
+     * Whether or not to enable JavaScript in the context. Defaults to {@code true}. Learn more about <a
+     * href="https://playwright.dev/java/docs/emulation#javascript-enabled">disabling JavaScript</a>.
     */
    public Boolean javaScriptEnabled;
    /**
     * Specify user locale, for example {@code en-GB}, {@code de-DE}, etc. Locale will affect {@code navigator.language} value,
-     * {@code Accept-Language} request header value as well as number and date formatting rules.
+     * {@code Accept-Language} request header value as well as number and date formatting rules. Defaults to the system default
+     * locale. Learn more about emulation in our <a
+     * href="https://playwright.dev/java/docs/emulation#locale--timezone">emulation guide</a>.
     */
    public String locale;
    /**
-     * Whether to emulate network being offline. Defaults to {@code false}.
+     * Whether to emulate network being offline. Defaults to {@code false}. Learn more about <a
+     * href="https://playwright.dev/java/docs/emulation#offline">network emulation</a>.
     */
    public Boolean offline;
    /**
     * A list of permissions to grant to all pages in this context. See {@link BrowserContext#grantPermissions
-     * BrowserContext.grantPermissions()} for more details.
+     * BrowserContext.grantPermissions()} for more details. Defaults to none.
     */
    public List<String> permissions;
    /**
-     * Network proxy settings to use with this context.
+     * Network proxy settings to use with this context. Defaults to none.
     *
     * <p> <strong>NOTE:</strong> For Chromium on Windows the browser needs to be launched with the global proxy for this option to work. If all contexts
     * override the proxy, global proxy will be never used and can be any string, for example {@code launch({ proxy: { server:
@@ -213,13 +221,14 @@ public interface Browser extends AutoCloseable {
    /**
     * If set to true, enables strict selectors mode for this context. In the strict selectors mode all operations on selectors
     * that imply single target DOM element will throw when more than one element matches the selector. This option does not
-     * affect any Locator APIs (Locators are always strict). See {@code Locator} to learn more about the strict mode.
+     * affect any Locator APIs (Locators are always strict). Defaults to {@code false}. See {@code Locator} to learn more about
+     * the strict mode.
     */
    public Boolean strictSelectors;
    /**
     * Changes the timezone of the context. See <a
     * href="https://cs.chromium.org/chromium/src/third_party/icu/source/data/misc/metaZones.txt?rcl=faee8bc70570192d82d2978a71e2a615788597d1">ICU's
-     * metaZones.txt</a> for a list of supported timezone IDs.
+     * metaZones.txt</a> for a list of supported timezone IDs. Defaults to the system timezone.
     */
    public String timezoneId;
    /**
@@ -228,7 +237,8 @@ public interface Browser extends AutoCloseable {
    public String userAgent;
    /**
     * Emulates consistent viewport for each page. Defaults to an 1280x720 viewport. Use {@code null} to disable the consistent
-     * viewport emulation.
+     * viewport emulation. Learn more about <a href="https://playwright.dev/java/docs/emulation#viewport">viewport
+     * emulation</a>.
     *
     * <p> <strong>NOTE:</strong> The {@code null} value opts out from the default presets, makes viewport depend on the host window size defined by the
     * operating system. It makes the execution of the tests non-deterministic.
@@ -247,7 +257,7 @@ public interface Browser extends AutoCloseable {
     * Page.waitForURL()}, {@link Page#waitForRequest Page.waitForRequest()}, or {@link Page#waitForResponse
     * Page.waitForResponse()} it takes the base URL in consideration by using the <a
     * href="https://developer.mozilla.org/en-US/docs/Web/API/URL/URL">{@code URL()}</a> constructor for building the
-     * corresponding URL. Examples:
+     * corresponding URL. Unset by default. Examples:
     * <ul>
     * <li> baseURL: {@code http://localhost:3000} and navigating to {@code /bar.html} results in {@code
     * http://localhost:3000/bar.html}</li>
@@ -262,7 +272,7 @@ public interface Browser extends AutoCloseable {
      return this;
    }
    /**
-     * Toggles bypassing page's Content-Security-Policy.
+     * Toggles bypassing page's Content-Security-Policy. Defaults to {@code false}.
     */
    public NewContextOptions setBypassCSP(boolean bypassCSP) {
      this.bypassCSP = bypassCSP;
@@ -278,14 +288,15 @@ public interface Browser extends AutoCloseable {
      return this;
    }
    /**
-     * Specify device scale factor (can be thought of as dpr). Defaults to {@code 1}.
+     * Specify device scale factor (can be thought of as dpr). Defaults to {@code 1}. Learn more about <a
+     * href="https://playwright.dev/java/docs/emulation#devices">emulating devices with device scale factor</a>.
     */
    public NewContextOptions setDeviceScaleFactor(double deviceScaleFactor) {
      this.deviceScaleFactor = deviceScaleFactor;
      return this;
    }
    /**
-     * An object containing additional HTTP headers to be sent with every request.
+     * An object containing additional HTTP headers to be sent with every request. Defaults to none.
     */
    public NewContextOptions setExtraHTTPHeaders(Map<String, String> extraHTTPHeaders) {
      this.extraHTTPHeaders = extraHTTPHeaders;
@@ -308,20 +319,23 @@ public interface Browser extends AutoCloseable {
      return this;
    }
    /**
-     * Specifies if viewport supports touch events. Defaults to false.
+     * Specifies if viewport supports touch events. Defaults to false. Learn more about <a
+     * href="https://playwright.dev/java/docs/emulation#devices">mobile emulation</a>.
     */
    public NewContextOptions setHasTouch(boolean hasTouch) {
      this.hasTouch = hasTouch;
      return this;
    }
    /**
-     * Credentials for <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication">HTTP authentication</a>.
+     * Credentials for <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication">HTTP authentication</a>. If
+     * no origin is specified, the username and password are sent to any servers upon unauthorized responses.
     */
    public NewContextOptions setHttpCredentials(String username, String password) {
      return setHttpCredentials(new HttpCredentials(username, password));
    }
    /**
-     * Credentials for <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication">HTTP authentication</a>.
+     * Credentials for <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication">HTTP authentication</a>. If
+     * no origin is specified, the username and password are sent to any servers upon unauthorized responses.
     */
    public NewContextOptions setHttpCredentials(HttpCredentials httpCredentials) {
      this.httpCredentials = httpCredentials;
@@ -335,15 +349,17 @@ public interface Browser extends AutoCloseable {
      return this;
    }
    /**
-     * Whether the {@code meta viewport} tag is taken into account and touch events are enabled. Defaults to {@code false}. Not
-     * supported in Firefox.
+     * Whether the {@code meta viewport} tag is taken into account and touch events are enabled. isMobile is a part of device,
+     * so you don't actually need to set it manually. Defaults to {@code false} and is not supported in Firefox. Learn more
+     * about <a href="https://playwright.dev/java/docs/emulation#ismobile">mobile emulation</a>.
     */
    public NewContextOptions setIsMobile(boolean isMobile) {
      this.isMobile = isMobile;
      return this;
    }
    /**
-     * Whether or not to enable JavaScript in the context. Defaults to {@code true}.
+     * Whether or not to enable JavaScript in the context. Defaults to {@code true}. Learn more about <a
+     * href="https://playwright.dev/java/docs/emulation#javascript-enabled">disabling JavaScript</a>.
     */
    public NewContextOptions setJavaScriptEnabled(boolean javaScriptEnabled) {
      this.javaScriptEnabled = javaScriptEnabled;
@@ -351,14 +367,17 @@ public interface Browser extends AutoCloseable {
    }
    /**
     * Specify user locale, for example {@code en-GB}, {@code de-DE}, etc. Locale will affect {@code navigator.language} value,
-     * {@code Accept-Language} request header value as well as number and date formatting rules.
+     * {@code Accept-Language} request header value as well as number and date formatting rules. Defaults to the system default
+     * locale. Learn more about emulation in our <a
+     * href="https://playwright.dev/java/docs/emulation#locale--timezone">emulation guide</a>.
     */
    public NewContextOptions setLocale(String locale) {
      this.locale = locale;
      return this;
    }
    /**
-     * Whether to emulate network being offline. Defaults to {@code false}.
+     * Whether to emulate network being offline. Defaults to {@code false}. Learn more about <a
+     * href="https://playwright.dev/java/docs/emulation#offline">network emulation</a>.
     */
    public NewContextOptions setOffline(boolean offline) {
      this.offline = offline;
@@ -366,14 +385,14 @@ public interface Browser extends AutoCloseable {
    }
    /**
     * A list of permissions to grant to all pages in this context. See {@link BrowserContext#grantPermissions
-     * BrowserContext.grantPermissions()} for more details.
+     * BrowserContext.grantPermissions()} for more details. Defaults to none.
     */
    public NewContextOptions setPermissions(List<String> permissions) {
      this.permissions = permissions;
      return this;
    }
    /**
-     * Network proxy settings to use with this context.
+     * Network proxy settings to use with this context. Defaults to none.
     *
     * <p> <strong>NOTE:</strong> For Chromium on Windows the browser needs to be launched with the global proxy for this option to work. If all contexts
     * override the proxy, global proxy will be never used and can be any string, for example {@code launch({ proxy: { server:
@@ -383,7 +402,7 @@ public interface Browser extends AutoCloseable {
      return setProxy(new Proxy(server));
    }
    /**
-     * Network proxy settings to use with this context.
+     * Network proxy settings to use with this context. Defaults to none.
     *
     * <p> <strong>NOTE:</strong> For Chromium on Windows the browser needs to be launched with the global proxy for this option to work. If all contexts
     * override the proxy, global proxy will be never used and can be any string, for example {@code launch({ proxy: { server:
@@ -516,7 +535,8 @@ public interface Browser extends AutoCloseable {
    /**
     * If set to true, enables strict selectors mode for this context. In the strict selectors mode all operations on selectors
     * that imply single target DOM element will throw when more than one element matches the selector. This option does not
-     * affect any Locator APIs (Locators are always strict). See {@code Locator} to learn more about the strict mode.
+     * affect any Locator APIs (Locators are always strict). Defaults to {@code false}. See {@code Locator} to learn more about
+     * the strict mode.
     */
    public NewContextOptions setStrictSelectors(boolean strictSelectors) {
      this.strictSelectors = strictSelectors;
@@ -525,7 +545,7 @@ public interface Browser extends AutoCloseable {
    /**
     * Changes the timezone of the context. See <a
     * href="https://cs.chromium.org/chromium/src/third_party/icu/source/data/misc/metaZones.txt?rcl=faee8bc70570192d82d2978a71e2a615788597d1">ICU's
-     * metaZones.txt</a> for a list of supported timezone IDs.
+     * metaZones.txt</a> for a list of supported timezone IDs. Defaults to the system timezone.
     */
    public NewContextOptions setTimezoneId(String timezoneId) {
      this.timezoneId = timezoneId;
@@ -540,7 +560,8 @@ public interface Browser extends AutoCloseable {
    }
    /**
     * Emulates consistent viewport for each page. Defaults to an 1280x720 viewport. Use {@code null} to disable the consistent
-     * viewport emulation.
+     * viewport emulation. Learn more about <a href="https://playwright.dev/java/docs/emulation#viewport">viewport
+     * emulation</a>.
     *
     * <p> <strong>NOTE:</strong> The {@code null} value opts out from the default presets, makes viewport depend on the host window size defined by the
     * operating system. It makes the execution of the tests non-deterministic.
@@ -550,7 +571,8 @@ public interface Browser extends AutoCloseable {
    }
    /**
     * Emulates consistent viewport for each page. Defaults to an 1280x720 viewport. Use {@code null} to disable the consistent
-     * viewport emulation.
+     * viewport emulation. Learn more about <a href="https://playwright.dev/java/docs/emulation#viewport">viewport
+     * emulation</a>.
     *
     * <p> <strong>NOTE:</strong> The {@code null} value opts out from the default presets, makes viewport depend on the host window size defined by the
     * operating system. It makes the execution of the tests non-deterministic.
@@ -570,7 +592,7 @@ public interface Browser extends AutoCloseable {
     * Page.waitForURL()}, {@link Page#waitForRequest Page.waitForRequest()}, or {@link Page#waitForResponse
     * Page.waitForResponse()} it takes the base URL in consideration by using the <a
     * href="https://developer.mozilla.org/en-US/docs/Web/API/URL/URL">{@code URL()}</a> constructor for building the
-     * corresponding URL. Examples:
+     * corresponding URL. Unset by default. Examples:
     * <ul>
     * <li> baseURL: {@code http://localhost:3000} and navigating to {@code /bar.html} results in {@code
     * http://localhost:3000/bar.html}</li>
@@ -582,7 +604,7 @@ public interface Browser extends AutoCloseable {
     */
    public String baseURL;
    /**
-     * Toggles bypassing page's Content-Security-Policy.
+     * Toggles bypassing page's Content-Security-Policy. Defaults to {@code false}.
     */
    public Boolean bypassCSP;
    /**
@@ -592,11 +614,12 @@ public interface Browser extends AutoCloseable {
     */
    public Optional<ColorScheme> colorScheme;
    /**
-     * Specify device scale factor (can be thought of as dpr). Defaults to {@code 1}.
+     * Specify device scale factor (can be thought of as dpr). Defaults to {@code 1}. Learn more about <a
+     * href="https://playwright.dev/java/docs/emulation#devices">emulating devices with device scale factor</a>.
     */
    public Double deviceScaleFactor;
    /**
-     * An object containing additional HTTP headers to be sent with every request.
+     * An object containing additional HTTP headers to be sent with every request. Defaults to none.
     */
    public Map<String, String> extraHTTPHeaders;
    /**
@@ -607,11 +630,13 @@ public interface Browser extends AutoCloseable {
    public Optional<ForcedColors> forcedColors;
    public Geolocation geolocation;
    /**
-     * Specifies if viewport supports touch events. Defaults to false.
+     * Specifies if viewport supports touch events. Defaults to false. Learn more about <a
+     * href="https://playwright.dev/java/docs/emulation#devices">mobile emulation</a>.
     */
    public Boolean hasTouch;
    /**
-     * Credentials for <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication">HTTP authentication</a>.
+     * Credentials for <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication">HTTP authentication</a>. If
+     * no origin is specified, the username and password are sent to any servers upon unauthorized responses.
     */
    public HttpCredentials httpCredentials;
    /**
@@ -619,30 +644,35 @@ public interface Browser extends AutoCloseable {
     */
    public Boolean ignoreHTTPSErrors;
    /**
-     * Whether the {@code meta viewport} tag is taken into account and touch events are enabled. Defaults to {@code false}. Not
-     * supported in Firefox.
+     * Whether the {@code meta viewport} tag is taken into account and touch events are enabled. isMobile is a part of device,
+     * so you don't actually need to set it manually. Defaults to {@code false} and is not supported in Firefox. Learn more
+     * about <a href="https://playwright.dev/java/docs/emulation#ismobile">mobile emulation</a>.
     */
    public Boolean isMobile;
    /**
-     * Whether or not to enable JavaScript in the context. Defaults to {@code true}.
+     * Whether or not to enable JavaScript in the context. Defaults to {@code true}. Learn more about <a
+     * href="https://playwright.dev/java/docs/emulation#javascript-enabled">disabling JavaScript</a>.
     */
    public Boolean javaScriptEnabled;
    /**
     * Specify user locale, for example {@code en-GB}, {@code de-DE}, etc. Locale will affect {@code navigator.language} value,
-     * {@code Accept-Language} request header value as well as number and date formatting rules.
+     * {@code Accept-Language} request header value as well as number and date formatting rules. Defaults to the system default
+     * locale. Learn more about emulation in our <a
+     * href="https://playwright.dev/java/docs/emulation#locale--timezone">emulation guide</a>.
     */
    public String locale;
    /**
-     * Whether to emulate network being offline. Defaults to {@code false}.
+     * Whether to emulate network being offline. Defaults to {@code false}. Learn more about <a
+     * href="https://playwright.dev/java/docs/emulation#offline">network emulation</a>.
     */
    public Boolean offline;
    /**
     * A list of permissions to grant to all pages in this context. See {@link BrowserContext#grantPermissions
-     * BrowserContext.grantPermissions()} for more details.
+     * BrowserContext.grantPermissions()} for more details. Defaults to none.
     */
    public List<String> permissions;
    /**
-     * Network proxy settings to use with this context.
+     * Network proxy settings to use with this context. Defaults to none.
     *
     * <p> <strong>NOTE:</strong> For Chromium on Windows the browser needs to be launched with the global proxy for this option to work. If all contexts
     * override the proxy, global proxy will be never used and can be any string, for example {@code launch({ proxy: { server:
@@ -717,13 +747,14 @@ public interface Browser extends AutoCloseable {
    /**
     * If set to true, enables strict selectors mode for this context. In the strict selectors mode all operations on selectors
     * that imply single target DOM element will throw when more than one element matches the selector. This option does not
-     * affect any Locator APIs (Locators are always strict). See {@code Locator} to learn more about the strict mode.
+     * affect any Locator APIs (Locators are always strict). Defaults to {@code false}. See {@code Locator} to learn more about
+     * the strict mode.
     */
    public Boolean strictSelectors;
    /**
     * Changes the timezone of the context. See <a
     * href="https://cs.chromium.org/chromium/src/third_party/icu/source/data/misc/metaZones.txt?rcl=faee8bc70570192d82d2978a71e2a615788597d1">ICU's
-     * metaZones.txt</a> for a list of supported timezone IDs.
+     * metaZones.txt</a> for a list of supported timezone IDs. Defaults to the system timezone.
     */
    public String timezoneId;
    /**
@@ -732,7 +763,8 @@ public interface Browser extends AutoCloseable {
    public String userAgent;
    /**
     * Emulates consistent viewport for each page. Defaults to an 1280x720 viewport. Use {@code null} to disable the consistent
-     * viewport emulation.
+     * viewport emulation. Learn more about <a href="https://playwright.dev/java/docs/emulation#viewport">viewport
+     * emulation</a>.
     *
     * <p> <strong>NOTE:</strong> The {@code null} value opts out from the default presets, makes viewport depend on the host window size defined by the
     * operating system. It makes the execution of the tests non-deterministic.
@@ -751,7 +783,7 @@ public interface Browser extends AutoCloseable {
     * Page.waitForURL()}, {@link Page#waitForRequest Page.waitForRequest()}, or {@link Page#waitForResponse
     * Page.waitForResponse()} it takes the base URL in consideration by using the <a
     * href="https://developer.mozilla.org/en-US/docs/Web/API/URL/URL">{@code URL()}</a> constructor for building the
-     * corresponding URL. Examples:
+     * corresponding URL. Unset by default. Examples:
     * <ul>
     * <li> baseURL: {@code http://localhost:3000} and navigating to {@code /bar.html} results in {@code
     * http://localhost:3000/bar.html}</li>
@@ -766,7 +798,7 @@ public interface Browser extends AutoCloseable {
      return this;
    }
    /**
-     * Toggles bypassing page's Content-Security-Policy.
+     * Toggles bypassing page's Content-Security-Policy. Defaults to {@code false}.
     */
    public NewPageOptions setBypassCSP(boolean bypassCSP) {
      this.bypassCSP = bypassCSP;
@@ -782,14 +814,15 @@ public interface Browser extends AutoCloseable {
      return this;
    }
    /**
-     * Specify device scale factor (can be thought of as dpr). Defaults to {@code 1}.
+     * Specify device scale factor (can be thought of as dpr). Defaults to {@code 1}. Learn more about <a
+     * href="https://playwright.dev/java/docs/emulation#devices">emulating devices with device scale factor</a>.
     */
    public NewPageOptions setDeviceScaleFactor(double deviceScaleFactor) {
      this.deviceScaleFactor = deviceScaleFactor;
      return this;
    }
    /**
-     * An object containing additional HTTP headers to be sent with every request.
+     * An object containing additional HTTP headers to be sent with every request. Defaults to none.
     */
    public NewPageOptions setExtraHTTPHeaders(Map<String, String> extraHTTPHeaders) {
      this.extraHTTPHeaders = extraHTTPHeaders;
@@ -812,20 +845,23 @@ public interface Browser extends AutoCloseable {
      return this;
    }
    /**
-     * Specifies if viewport supports touch events. Defaults to false.
+     * Specifies if viewport supports touch events. Defaults to false. Learn more about <a
+     * href="https://playwright.dev/java/docs/emulation#devices">mobile emulation</a>.
     */
    public NewPageOptions setHasTouch(boolean hasTouch) {
      this.hasTouch = hasTouch;
      return this;
    }
    /**
-     * Credentials for <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication">HTTP authentication</a>.
+     * Credentials for <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication">HTTP authentication</a>. If
+     * no origin is specified, the username and password are sent to any servers upon unauthorized responses.
     */
    public NewPageOptions setHttpCredentials(String username, String password) {
      return setHttpCredentials(new HttpCredentials(username, password));
    }
    /**
-     * Credentials for <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication">HTTP authentication</a>.
+     * Credentials for <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication">HTTP authentication</a>. If
+     * no origin is specified, the username and password are sent to any servers upon unauthorized responses.
     */
    public NewPageOptions setHttpCredentials(HttpCredentials httpCredentials) {
      this.httpCredentials = httpCredentials;
@@ -839,15 +875,17 @@ public interface Browser extends AutoCloseable {
      return this;
    }
    /**
-     * Whether the {@code meta viewport} tag is taken into account and touch events are enabled. Defaults to {@code false}. Not
-     * supported in Firefox.
+     * Whether the {@code meta viewport} tag is taken into account and touch events are enabled. isMobile is a part of device,
+     * so you don't actually need to set it manually. Defaults to {@code false} and is not supported in Firefox. Learn more
+     * about <a href="https://playwright.dev/java/docs/emulation#ismobile">mobile emulation</a>.
     */
    public NewPageOptions setIsMobile(boolean isMobile) {
      this.isMobile = isMobile;
      return this;
    }
    /**
-     * Whether or not to enable JavaScript in the context. Defaults to {@code true}.
+     * Whether or not to enable JavaScript in the context. Defaults to {@code true}. Learn more about <a
+     * href="https://playwright.dev/java/docs/emulation#javascript-enabled">disabling JavaScript</a>.
     */
    public NewPageOptions setJavaScriptEnabled(boolean javaScriptEnabled) {
      this.javaScriptEnabled = javaScriptEnabled;
@@ -855,14 +893,17 @@ public interface Browser extends AutoCloseable {
    }
    /**
     * Specify user locale, for example {@code en-GB}, {@code de-DE}, etc. Locale will affect {@code navigator.language} value,
-     * {@code Accept-Language} request header value as well as number and date formatting rules.
+     * {@code Accept-Language} request header value as well as number and date formatting rules. Defaults to the system default
+     * locale. Learn more about emulation in our <a
+     * href="https://playwright.dev/java/docs/emulation#locale--timezone">emulation guide</a>.
     */
    public NewPageOptions setLocale(String locale) {
      this.locale = locale;
      return this;
    }
    /**
-     * Whether to emulate network being offline. Defaults to {@code false}.
+     * Whether to emulate network being offline. Defaults to {@code false}. Learn more about <a
+     * href="https://playwright.dev/java/docs/emulation#offline">network emulation</a>.
     */
    public NewPageOptions setOffline(boolean offline) {
      this.offline = offline;
@@ -870,14 +911,14 @@ public interface Browser extends AutoCloseable {
    }
    /**
     * A list of permissions to grant to all pages in this context. See {@link BrowserContext#grantPermissions
-     * BrowserContext.grantPermissions()} for more details.
+     * BrowserContext.grantPermissions()} for more details. Defaults to none.
     */
    public NewPageOptions setPermissions(List<String> permissions) {
      this.permissions = permissions;
      return this;
    }
    /**
-     * Network proxy settings to use with this context.
+     * Network proxy settings to use with this context. Defaults to none.
     *
     * <p> <strong>NOTE:</strong> For Chromium on Windows the browser needs to be launched with the global proxy for this option to work. If all contexts
     * override the proxy, global proxy will be never used and can be any string, for example {@code launch({ proxy: { server:
@@ -887,7 +928,7 @@ public interface Browser extends AutoCloseable {
      return setProxy(new Proxy(server));
    }
    /**
-     * Network proxy settings to use with this context.
+     * Network proxy settings to use with this context. Defaults to none.
     *
     * <p> <strong>NOTE:</strong> For Chromium on Windows the browser needs to be launched with the global proxy for this option to work. If all contexts
     * override the proxy, global proxy will be never used and can be any string, for example {@code launch({ proxy: { server:
@@ -1020,7 +1061,8 @@ public interface Browser extends AutoCloseable {
    /**
     * If set to true, enables strict selectors mode for this context. In the strict selectors mode all operations on selectors
     * that imply single target DOM element will throw when more than one element matches the selector. This option does not
-     * affect any Locator APIs (Locators are always strict). See {@code Locator} to learn more about the strict mode.
+     * affect any Locator APIs (Locators are always strict). Defaults to {@code false}. See {@code Locator} to learn more about
+     * the strict mode.
     */
    public NewPageOptions setStrictSelectors(boolean strictSelectors) {
      this.strictSelectors = strictSelectors;
@@ -1029,7 +1071,7 @@ public interface Browser extends AutoCloseable {
    /**
     * Changes the timezone of the context. See <a
     * href="https://cs.chromium.org/chromium/src/third_party/icu/source/data/misc/metaZones.txt?rcl=faee8bc70570192d82d2978a71e2a615788597d1">ICU's
-     * metaZones.txt</a> for a list of supported timezone IDs.
+     * metaZones.txt</a> for a list of supported timezone IDs. Defaults to the system timezone.
     */
    public NewPageOptions setTimezoneId(String timezoneId) {
      this.timezoneId = timezoneId;
@@ -1044,7 +1086,8 @@ public interface Browser extends AutoCloseable {
    }
    /**
     * Emulates consistent viewport for each page. Defaults to an 1280x720 viewport. Use {@code null} to disable the consistent
-     * viewport emulation.
+     * viewport emulation. Learn more about <a href="https://playwright.dev/java/docs/emulation#viewport">viewport
+     * emulation</a>.
     *
     * <p> <strong>NOTE:</strong> The {@code null} value opts out from the default presets, makes viewport depend on the host window size defined by the
     * operating system. It makes the execution of the tests non-deterministic.
@@ -1054,7 +1097,8 @@ public interface Browser extends AutoCloseable {
    }
    /**
     * Emulates consistent viewport for each page. Defaults to an 1280x720 viewport. Use {@code null} to disable the consistent
-     * viewport emulation.
+     * viewport emulation. Learn more about <a href="https://playwright.dev/java/docs/emulation#viewport">viewport
+     * emulation</a>.
     *
     * <p> <strong>NOTE:</strong> The {@code null} value opts out from the default presets, makes viewport depend on the host window size defined by the
     * operating system. It makes the execution of the tests non-deterministic.
@@ -1142,6 +1186,14 @@ public interface Browser extends AutoCloseable {
   * @since v1.8
   */
  boolean isConnected();
+  /**
+   * <strong>NOTE:</strong> CDP Sessions are only supported on Chromium-based browsers.
+   *
+   * <p> Returns the newly created browser session.
+   *
+   * @since v1.11
+   */
+  CDPSession newBrowserCDPSession();
  /**
   * Creates a new browser context. It won't share cookies/cache with other browser contexts.
   *
@@ -20,6 +20,7 @@ import com.microsoft.playwright.options.*;
 import java.nio.file.Path;
 import java.util.*;
 import java.util.function.Consumer;
+import java.util.function.BooleanSupplier;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;

@@ -57,6 +58,51 @@ public interface BrowserContext extends AutoCloseable {
   */
  void offClose(Consumer<BrowserContext> handler);

+  /**
+   * Emitted when JavaScript within the page calls one of console API methods, e.g. {@code console.log} or {@code
+   * console.dir}. Also emitted if the page throws an error or a warning.
+   *
+   * <p> The arguments passed into {@code console.log} and the page are available on the {@code ConsoleMessage} event handler
+   * argument.
+   *
+   * <p> **Usage**
+   * <pre>{@code
+   * context.onConsoleMessage(msg -> {
+   *   for (int i = 0; i < msg.args().size(); ++i)
+   *     System.out.println(i + ": " + msg.args().get(i).jsonValue());
+   * });
+   * page.evaluate("() => console.log('hello', 5, { foo: 'bar' })");
+   * }</pre>
+   */
+  void onConsoleMessage(Consumer<ConsoleMessage> handler);
+  /**
+   * Removes handler that was previously added with {@link #onConsoleMessage onConsoleMessage(handler)}.
+   */
+  void offConsoleMessage(Consumer<ConsoleMessage> handler);
+
+  /**
+   * Emitted when a JavaScript dialog appears, such as {@code alert}, {@code prompt}, {@code confirm} or {@code
+   * beforeunload}. Listener **must** either {@link Dialog#accept Dialog.accept()} or {@link Dialog#dismiss Dialog.dismiss()}
+   * the dialog - otherwise the page will <a
+   * href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/EventLoop#never_blocking">freeze</a> waiting for the
+   * dialog, and actions like click will never finish.
+   *
+   * <p> **Usage**
+   * <pre>{@code
+   * context.onDialog(dialog -> {
+   *   dialog.accept();
+   * });
+   * }</pre>
+   *
+   * <p> <strong>NOTE:</strong> When no {@link Page#onDialog Page.onDialog()} or {@link BrowserContext#onDialog BrowserContext.onDialog()} listeners are
+   * present, all dialogs are automatically dismissed.
+   */
+  void onDialog(Consumer<Dialog> handler);
+  /**
+   * Removes handler that was previously added with {@link #onDialog onDialog(handler)}.
+   */
+  void offDialog(Consumer<Dialog> handler);
+
  /**
   * The event is emitted when a new Page is created in the BrowserContext. The page may still be loading. The event will
   * also fire for popup pages. See also {@link Page#onPopup Page.onPopup()} to receive events about popups relevant to a
@@ -81,6 +127,16 @@ public interface BrowserContext extends AutoCloseable {
   */
  void offPage(Consumer<Page> handler);

+  /**
+   * Emitted when exception is unhandled in any of the pages in this context. To listen for errors from a particular page,
+   * use {@link Page#onPageError Page.onPageError()} instead.
+   */
+  void onWebError(Consumer<WebError> handler);
+  /**
+   * Removes handler that was previously added with {@link #onWebError onWebError(handler)}.
+   */
+  void offWebError(Consumer<WebError> handler);
+
  /**
   * Emitted when a request is issued from any pages created through this context. The [request] object is read-only. To only
   * listen for requests from a particular page, use {@link Page#onRequest Page.onRequest()}.
@@ -189,6 +245,17 @@ public interface BrowserContext extends AutoCloseable {
     * written to disk when {@link BrowserContext#close BrowserContext.close()} is called.
     */
    public Boolean update;
+    /**
+     * Optional setting to control resource content management. If {@code attach} is specified, resources are persisted as
+     * separate files or entries in the ZIP archive. If {@code embed} is specified, content is stored inline the HAR file.
+     */
+    public RouteFromHarUpdateContentPolicy updateContent;
+    /**
+     * When set to {@code minimal}, only record information necessary for routing from HAR. This omits sizes, timing, page,
+     * cookies, security and other types of HAR information that are not used when replaying from HAR. Defaults to {@code
+     * minimal}.
+     */
+    public HarMode updateMode;
    /**
     * A glob pattern, regular expression or predicate to match the request URL. Only requests with URL matching the pattern
     * will be served from the HAR file. If not specified, all requests are served from the HAR file.
@@ -215,6 +282,23 @@ public interface BrowserContext extends AutoCloseable {
      this.update = update;
      return this;
    }
+    /**
+     * Optional setting to control resource content management. If {@code attach} is specified, resources are persisted as
+     * separate files or entries in the ZIP archive. If {@code embed} is specified, content is stored inline the HAR file.
+     */
+    public RouteFromHAROptions setUpdateContent(RouteFromHarUpdateContentPolicy updateContent) {
+      this.updateContent = updateContent;
+      return this;
+    }
+    /**
+     * When set to {@code minimal}, only record information necessary for routing from HAR. This omits sizes, timing, page,
+     * cookies, security and other types of HAR information that are not used when replaying from HAR. Defaults to {@code
+     * minimal}.
+     */
+    public RouteFromHAROptions setUpdateMode(HarMode updateMode) {
+      this.updateMode = updateMode;
+      return this;
+    }
    /**
     * A glob pattern, regular expression or predicate to match the request URL. Only requests with URL matching the pattern
     * will be served from the HAR file. If not specified, all requests are served from the HAR file.
@@ -248,6 +332,51 @@ public interface BrowserContext extends AutoCloseable {
      return this;
    }
  }
+  class WaitForConditionOptions {
+    /**
+     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The
+     * default value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or
+     * {@link Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
+     */
+    public Double timeout;
+
+    /**
+     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The
+     * default value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or
+     * {@link Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
+     */
+    public WaitForConditionOptions setTimeout(double timeout) {
+      this.timeout = timeout;
+      return this;
+    }
+  }
+  class WaitForConsoleMessageOptions {
+    /**
+     * Receives the {@code ConsoleMessage} object and resolves to truthy value when the waiting should resolve.
+     */
+    public Predicate<ConsoleMessage> predicate;
+    /**
+     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The
+     * default value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()}.
+     */
+    public Double timeout;
+
+    /**
+     * Receives the {@code ConsoleMessage} object and resolves to truthy value when the waiting should resolve.
+     */
+    public WaitForConsoleMessageOptions setPredicate(Predicate<ConsoleMessage> predicate) {
+      this.predicate = predicate;
+      return this;
+    }
+    /**
+     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The
+     * default value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()}.
+     */
+    public WaitForConsoleMessageOptions setTimeout(double timeout) {
+      this.timeout = timeout;
+      return this;
+    }
+  }
  class WaitForPageOptions {
    /**
     * Receives the {@code Page} object and resolves to truthy value when the waiting should resolve.
@@ -284,6 +413,9 @@ public interface BrowserContext extends AutoCloseable {
   * browserContext.addCookies(Arrays.asList(cookieObject1, cookieObject2));
   * }</pre>
   *
+   * @param cookies Adds cookies to the browser context.
+   *
+   * <p> For the cookie to apply to all subdomains as well, prefix domain with a dot, like this: ".example.com".
   * @since v1.8
   */
  void addCookies(List<Cookie> cookies);
@@ -630,6 +762,26 @@ public interface BrowserContext extends AutoCloseable {
   * @since v1.8
   */
  void grantPermissions(List<String> permissions, GrantPermissionsOptions options);
+  /**
+   * <strong>NOTE:</strong> CDP sessions are only supported on Chromium-based browsers.
+   *
+   * <p> Returns the newly created session.
+   *
+   * @param page Target to create new session for. For backwards-compatibility, this parameter is named {@code page}, but it can be a
+   * {@code Page} or {@code Frame} type.
+   * @since v1.11
+   */
+  CDPSession newCDPSession(Page page);
+  /**
+   * <strong>NOTE:</strong> CDP sessions are only supported on Chromium-based browsers.
+   *
+   * <p> Returns the newly created session.
+   *
+   * @param page Target to create new session for. For backwards-compatibility, this parameter is named {@code page}, but it can be a
+   * {@code Page} or {@code Frame} type.
+   * @since v1.11
+   */
+  CDPSession newCDPSession(Frame page);
  /**
   * Creates a new page in the browser context.
   *
@@ -974,7 +1126,7 @@ public interface BrowserContext extends AutoCloseable {
  void route(Predicate<String> url, Consumer<Route> handler, RouteOptions options);
  /**
   * If specified the network requests that are made in the context will be served from the HAR file. Read more about <a
-   * href="https://playwright.dev/java/docs/network#replaying-from-har">Replaying from HAR</a>.
+   * href="https://playwright.dev/java/docs/mock#replaying-from-har">Replaying from HAR</a>.
   *
   * <p> Playwright will not serve requests intercepted by Service Worker from the HAR file. See <a
   * href="https://github.com/microsoft/playwright/issues/1090">this</a> issue. We recommend disabling Service Workers when
@@ -989,7 +1141,7 @@ public interface BrowserContext extends AutoCloseable {
  }
  /**
   * If specified the network requests that are made in the context will be served from the HAR file. Read more about <a
-   * href="https://playwright.dev/java/docs/network#replaying-from-har">Replaying from HAR</a>.
+   * href="https://playwright.dev/java/docs/mock#replaying-from-har">Replaying from HAR</a>.
   *
   * <p> Playwright will not serve requests intercepted by Service Worker from the HAR file. See <a
   * href="https://github.com/microsoft/playwright/issues/1090">this</a> issue. We recommend disabling Service Workers when
@@ -1147,6 +1299,76 @@ public interface BrowserContext extends AutoCloseable {
   * @since v1.8
   */
  void unroute(Predicate<String> url, Consumer<Route> handler);
+  /**
+   * The method will block until the condition returns true. All Playwright events will be dispatched while the method is
+   * waiting for the condition.
+   *
+   * <p> **Usage**
+   *
+   * <p> Use the method to wait for a condition that depends on page events:
+   * <pre>{@code
+   * List<String> failedUrls = new ArrayList<>();
+   * context.onResponse(response -> {
+   *   if (!response.ok()) {
+   *     failedUrls.add(response.url());
+   *   }
+   * });
+   * page1.getByText("Create user").click();
+   * page2.getByText("Submit button").click();
+   * context.waitForCondition(() -> failedUrls.size() > 3);
+   * }</pre>
+   *
+   * @param condition Condition to wait for.
+   * @since v1.32
+   */
+  default void waitForCondition(BooleanSupplier condition) {
+    waitForCondition(condition, null);
+  }
+  /**
+   * The method will block until the condition returns true. All Playwright events will be dispatched while the method is
+   * waiting for the condition.
+   *
+   * <p> **Usage**
+   *
+   * <p> Use the method to wait for a condition that depends on page events:
+   * <pre>{@code
+   * List<String> failedUrls = new ArrayList<>();
+   * context.onResponse(response -> {
+   *   if (!response.ok()) {
+   *     failedUrls.add(response.url());
+   *   }
+   * });
+   * page1.getByText("Create user").click();
+   * page2.getByText("Submit button").click();
+   * context.waitForCondition(() -> failedUrls.size() > 3);
+   * }</pre>
+   *
+   * @param condition Condition to wait for.
+   * @since v1.32
+   */
+  void waitForCondition(BooleanSupplier condition, WaitForConditionOptions options);
+  /**
+   * Performs action and waits for a {@code ConsoleMessage} to be logged by in the pages in the context. If predicate is
+   * provided, it passes {@code ConsoleMessage} value into the {@code predicate} function and waits for {@code
+   * predicate(message)} to return a truthy value. Will throw an error if the page is closed before the {@link
+   * BrowserContext#onConsoleMessage BrowserContext.onConsoleMessage()} event is fired.
+   *
+   * @param callback Callback that performs the action triggering the event.
+   * @since v1.34
+   */
+  default ConsoleMessage waitForConsoleMessage(Runnable callback) {
+    return waitForConsoleMessage(null, callback);
+  }
+  /**
+   * Performs action and waits for a {@code ConsoleMessage} to be logged by in the pages in the context. If predicate is
+   * provided, it passes {@code ConsoleMessage} value into the {@code predicate} function and waits for {@code
+   * predicate(message)} to return a truthy value. Will throw an error if the page is closed before the {@link
+   * BrowserContext#onConsoleMessage BrowserContext.onConsoleMessage()} event is fired.
+   *
+   * @param callback Callback that performs the action triggering the event.
+   * @since v1.34
+   */
+  ConsoleMessage waitForConsoleMessage(WaitForConsoleMessageOptions options, Runnable callback);
  /**
   * Performs action and waits for a new {@code Page} to be created in the context. If predicate is provided, it passes
   * {@code Page} value into the {@code predicate} function and waits for {@code predicate(event)} to return a truthy value.
@@ -43,6 +43,26 @@ import java.util.regex.Pattern;
 */
 public interface BrowserType {
  class ConnectOptions {
+    /**
+     * This option exposes network available on the connecting client to the browser being connected to. Consists of a list of
+     * rules separated by comma.
+     *
+     * <p> Available rules:
+     * <ol>
+     * <li> Hostname pattern, for example: {@code example.com}, {@code *.org:99}, {@code x.*.y.com}, {@code *foo.org}.</li>
+     * <li> IP literal, for example: {@code 127.0.0.1}, {@code 0.0.0.0:99}, {@code [::1]}, {@code [0:0::1]:99}.</li>
+     * <li> {@code <loopback>} that matches local loopback interfaces: {@code localhost}, {@code *.localhost}, {@code 127.0.0.1},
+     * {@code [::1]}.</li>
+     * </ol>
+     *
+     * <p> Some common examples:
+     * <ol>
+     * <li> {@code "*"} to expose all network.</li>
+     * <li> {@code "<loopback>"} to expose localhost network.</li>
+     * <li> {@code "*.test.internal-domain,*.staging.internal-domain,<loopback>"} to expose test/staging deployments and localhost.</li>
+     * </ol>
+     */
+    public String exposeNetwork;
    /**
     * Additional HTTP headers to be sent with web socket connect request. Optional.
     */
@@ -57,6 +77,29 @@ public interface BrowserType {
     */
    public Double timeout;

+    /**
+     * This option exposes network available on the connecting client to the browser being connected to. Consists of a list of
+     * rules separated by comma.
+     *
+     * <p> Available rules:
+     * <ol>
+     * <li> Hostname pattern, for example: {@code example.com}, {@code *.org:99}, {@code x.*.y.com}, {@code *foo.org}.</li>
+     * <li> IP literal, for example: {@code 127.0.0.1}, {@code 0.0.0.0:99}, {@code [::1]}, {@code [0:0::1]:99}.</li>
+     * <li> {@code <loopback>} that matches local loopback interfaces: {@code localhost}, {@code *.localhost}, {@code 127.0.0.1},
+     * {@code [::1]}.</li>
+     * </ol>
+     *
+     * <p> Some common examples:
+     * <ol>
+     * <li> {@code "*"} to expose all network.</li>
+     * <li> {@code "<loopback>"} to expose localhost network.</li>
+     * <li> {@code "*.test.internal-domain,*.staging.internal-domain,<loopback>"} to expose test/staging deployments and localhost.</li>
+     * </ol>
+     */
+    public ConnectOptions setExposeNetwork(String exposeNetwork) {
+      this.exposeNetwork = exposeNetwork;
+      return this;
+    }
    /**
     * Additional HTTP headers to be sent with web socket connect request. Optional.
     */
@@ -382,7 +425,7 @@ public interface BrowserType {
     * Page.waitForURL()}, {@link Page#waitForRequest Page.waitForRequest()}, or {@link Page#waitForResponse
     * Page.waitForResponse()} it takes the base URL in consideration by using the <a
     * href="https://developer.mozilla.org/en-US/docs/Web/API/URL/URL">{@code URL()}</a> constructor for building the
-     * corresponding URL. Examples:
+     * corresponding URL. Unset by default. Examples:
     * <ul>
     * <li> baseURL: {@code http://localhost:3000} and navigating to {@code /bar.html} results in {@code
     * http://localhost:3000/bar.html}</li>
@@ -394,7 +437,7 @@ public interface BrowserType {
     */
    public String baseURL;
    /**
-     * Toggles bypassing page's Content-Security-Policy.
+     * Toggles bypassing page's Content-Security-Policy. Defaults to {@code false}.
     */
    public Boolean bypassCSP;
    /**
@@ -414,7 +457,8 @@ public interface BrowserType {
     */
    public Optional<ColorScheme> colorScheme;
    /**
-     * Specify device scale factor (can be thought of as dpr). Defaults to {@code 1}.
+     * Specify device scale factor (can be thought of as dpr). Defaults to {@code 1}. Learn more about <a
+     * href="https://playwright.dev/java/docs/emulation#devices">emulating devices with device scale factor</a>.
     */
    public Double deviceScaleFactor;
    /**
@@ -439,7 +483,7 @@ public interface BrowserType {
     */
    public Path executablePath;
    /**
-     * An object containing additional HTTP headers to be sent with every request.
+     * An object containing additional HTTP headers to be sent with every request. Defaults to none.
     */
    public Map<String, String> extraHTTPHeaders;
    /**
@@ -462,7 +506,8 @@ public interface BrowserType {
     */
    public Boolean handleSIGTERM;
    /**
-     * Specifies if viewport supports touch events. Defaults to false.
+     * Specifies if viewport supports touch events. Defaults to false. Learn more about <a
+     * href="https://playwright.dev/java/docs/emulation#devices">mobile emulation</a>.
     */
    public Boolean hasTouch;
    /**
@@ -473,7 +518,8 @@ public interface BrowserType {
     */
    public Boolean headless;
    /**
-     * Credentials for <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication">HTTP authentication</a>.
+     * Credentials for <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication">HTTP authentication</a>. If
+     * no origin is specified, the username and password are sent to any servers upon unauthorized responses.
     */
    public HttpCredentials httpCredentials;
    /**
@@ -491,26 +537,31 @@ public interface BrowserType {
     */
    public Boolean ignoreHTTPSErrors;
    /**
-     * Whether the {@code meta viewport} tag is taken into account and touch events are enabled. Defaults to {@code false}. Not
-     * supported in Firefox.
+     * Whether the {@code meta viewport} tag is taken into account and touch events are enabled. isMobile is a part of device,
+     * so you don't actually need to set it manually. Defaults to {@code false} and is not supported in Firefox. Learn more
+     * about <a href="https://playwright.dev/java/docs/emulation#ismobile">mobile emulation</a>.
     */
    public Boolean isMobile;
    /**
-     * Whether or not to enable JavaScript in the context. Defaults to {@code true}.
+     * Whether or not to enable JavaScript in the context. Defaults to {@code true}. Learn more about <a
+     * href="https://playwright.dev/java/docs/emulation#javascript-enabled">disabling JavaScript</a>.
     */
    public Boolean javaScriptEnabled;
    /**
     * Specify user locale, for example {@code en-GB}, {@code de-DE}, etc. Locale will affect {@code navigator.language} value,
-     * {@code Accept-Language} request header value as well as number and date formatting rules.
+     * {@code Accept-Language} request header value as well as number and date formatting rules. Defaults to the system default
+     * locale. Learn more about emulation in our <a
+     * href="https://playwright.dev/java/docs/emulation#locale--timezone">emulation guide</a>.
     */
    public String locale;
    /**
-     * Whether to emulate network being offline. Defaults to {@code false}.
+     * Whether to emulate network being offline. Defaults to {@code false}. Learn more about <a
+     * href="https://playwright.dev/java/docs/emulation#offline">network emulation</a>.
     */
    public Boolean offline;
    /**
     * A list of permissions to grant to all pages in this context. See {@link BrowserContext#grantPermissions
-     * BrowserContext.grantPermissions()} for more details.
+     * BrowserContext.grantPermissions()} for more details. Defaults to none.
     */
    public List<String> permissions;
    /**
@@ -578,7 +629,8 @@ public interface BrowserType {
    /**
     * If set to true, enables strict selectors mode for this context. In the strict selectors mode all operations on selectors
     * that imply single target DOM element will throw when more than one element matches the selector. This option does not
-     * affect any Locator APIs (Locators are always strict). See {@code Locator} to learn more about the strict mode.
+     * affect any Locator APIs (Locators are always strict). Defaults to {@code false}. See {@code Locator} to learn more about
+     * the strict mode.
     */
    public Boolean strictSelectors;
    /**
@@ -589,7 +641,7 @@ public interface BrowserType {
    /**
     * Changes the timezone of the context. See <a
     * href="https://cs.chromium.org/chromium/src/third_party/icu/source/data/misc/metaZones.txt?rcl=faee8bc70570192d82d2978a71e2a615788597d1">ICU's
-     * metaZones.txt</a> for a list of supported timezone IDs.
+     * metaZones.txt</a> for a list of supported timezone IDs. Defaults to the system timezone.
     */
    public String timezoneId;
    /**
@@ -602,7 +654,8 @@ public interface BrowserType {
    public String userAgent;
    /**
     * Emulates consistent viewport for each page. Defaults to an 1280x720 viewport. Use {@code null} to disable the consistent
-     * viewport emulation.
+     * viewport emulation. Learn more about <a href="https://playwright.dev/java/docs/emulation#viewport">viewport
+     * emulation</a>.
     *
     * <p> <strong>NOTE:</strong> The {@code null} value opts out from the default presets, makes viewport depend on the host window size defined by the
     * operating system. It makes the execution of the tests non-deterministic.
@@ -629,7 +682,7 @@ public interface BrowserType {
     * Page.waitForURL()}, {@link Page#waitForRequest Page.waitForRequest()}, or {@link Page#waitForResponse
     * Page.waitForResponse()} it takes the base URL in consideration by using the <a
     * href="https://developer.mozilla.org/en-US/docs/Web/API/URL/URL">{@code URL()}</a> constructor for building the
-     * corresponding URL. Examples:
+     * corresponding URL. Unset by default. Examples:
     * <ul>
     * <li> baseURL: {@code http://localhost:3000} and navigating to {@code /bar.html} results in {@code
     * http://localhost:3000/bar.html}</li>
@@ -644,7 +697,7 @@ public interface BrowserType {
      return this;
    }
    /**
-     * Toggles bypassing page's Content-Security-Policy.
+     * Toggles bypassing page's Content-Security-Policy. Defaults to {@code false}.
     */
    public LaunchPersistentContextOptions setBypassCSP(boolean bypassCSP) {
      this.bypassCSP = bypassCSP;
@@ -686,7 +739,8 @@ public interface BrowserType {
      return this;
    }
    /**
-     * Specify device scale factor (can be thought of as dpr). Defaults to {@code 1}.
+     * Specify device scale factor (can be thought of as dpr). Defaults to {@code 1}. Learn more about <a
+     * href="https://playwright.dev/java/docs/emulation#devices">emulating devices with device scale factor</a>.
     */
    public LaunchPersistentContextOptions setDeviceScaleFactor(double deviceScaleFactor) {
      this.deviceScaleFactor = deviceScaleFactor;
@@ -726,7 +780,7 @@ public interface BrowserType {
      return this;
    }
    /**
-     * An object containing additional HTTP headers to be sent with every request.
+     * An object containing additional HTTP headers to be sent with every request. Defaults to none.
     */
    public LaunchPersistentContextOptions setExtraHTTPHeaders(Map<String, String> extraHTTPHeaders) {
      this.extraHTTPHeaders = extraHTTPHeaders;
@@ -770,7 +824,8 @@ public interface BrowserType {
      return this;
    }
    /**
-     * Specifies if viewport supports touch events. Defaults to false.
+     * Specifies if viewport supports touch events. Defaults to false. Learn more about <a
+     * href="https://playwright.dev/java/docs/emulation#devices">mobile emulation</a>.
     */
    public LaunchPersistentContextOptions setHasTouch(boolean hasTouch) {
      this.hasTouch = hasTouch;
@@ -787,13 +842,15 @@ public interface BrowserType {
      return this;
    }
    /**
-     * Credentials for <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication">HTTP authentication</a>.
+     * Credentials for <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication">HTTP authentication</a>. If
+     * no origin is specified, the username and password are sent to any servers upon unauthorized responses.
     */
    public LaunchPersistentContextOptions setHttpCredentials(String username, String password) {
      return setHttpCredentials(new HttpCredentials(username, password));
    }
    /**
-     * Credentials for <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication">HTTP authentication</a>.
+     * Credentials for <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication">HTTP authentication</a>. If
+     * no origin is specified, the username and password are sent to any servers upon unauthorized responses.
     */
    public LaunchPersistentContextOptions setHttpCredentials(HttpCredentials httpCredentials) {
      this.httpCredentials = httpCredentials;
@@ -823,15 +880,17 @@ public interface BrowserType {
      return this;
    }
    /**
-     * Whether the {@code meta viewport} tag is taken into account and touch events are enabled. Defaults to {@code false}. Not
-     * supported in Firefox.
+     * Whether the {@code meta viewport} tag is taken into account and touch events are enabled. isMobile is a part of device,
+     * so you don't actually need to set it manually. Defaults to {@code false} and is not supported in Firefox. Learn more
+     * about <a href="https://playwright.dev/java/docs/emulation#ismobile">mobile emulation</a>.
     */
    public LaunchPersistentContextOptions setIsMobile(boolean isMobile) {
      this.isMobile = isMobile;
      return this;
    }
    /**
-     * Whether or not to enable JavaScript in the context. Defaults to {@code true}.
+     * Whether or not to enable JavaScript in the context. Defaults to {@code true}. Learn more about <a
+     * href="https://playwright.dev/java/docs/emulation#javascript-enabled">disabling JavaScript</a>.
     */
    public LaunchPersistentContextOptions setJavaScriptEnabled(boolean javaScriptEnabled) {
      this.javaScriptEnabled = javaScriptEnabled;
@@ -839,14 +898,17 @@ public interface BrowserType {
    }
    /**
     * Specify user locale, for example {@code en-GB}, {@code de-DE}, etc. Locale will affect {@code navigator.language} value,
-     * {@code Accept-Language} request header value as well as number and date formatting rules.
+     * {@code Accept-Language} request header value as well as number and date formatting rules. Defaults to the system default
+     * locale. Learn more about emulation in our <a
+     * href="https://playwright.dev/java/docs/emulation#locale--timezone">emulation guide</a>.
     */
    public LaunchPersistentContextOptions setLocale(String locale) {
      this.locale = locale;
      return this;
    }
    /**
-     * Whether to emulate network being offline. Defaults to {@code false}.
+     * Whether to emulate network being offline. Defaults to {@code false}. Learn more about <a
+     * href="https://playwright.dev/java/docs/emulation#offline">network emulation</a>.
     */
    public LaunchPersistentContextOptions setOffline(boolean offline) {
      this.offline = offline;
@@ -854,7 +916,7 @@ public interface BrowserType {
    }
    /**
     * A list of permissions to grant to all pages in this context. See {@link BrowserContext#grantPermissions
-     * BrowserContext.grantPermissions()} for more details.
+     * BrowserContext.grantPermissions()} for more details. Defaults to none.
     */
    public LaunchPersistentContextOptions setPermissions(List<String> permissions) {
      this.permissions = permissions;
@@ -986,7 +1048,8 @@ public interface BrowserType {
    /**
     * If set to true, enables strict selectors mode for this context. In the strict selectors mode all operations on selectors
     * that imply single target DOM element will throw when more than one element matches the selector. This option does not
-     * affect any Locator APIs (Locators are always strict). See {@code Locator} to learn more about the strict mode.
+     * affect any Locator APIs (Locators are always strict). Defaults to {@code false}. See {@code Locator} to learn more about
+     * the strict mode.
     */
    public LaunchPersistentContextOptions setStrictSelectors(boolean strictSelectors) {
      this.strictSelectors = strictSelectors;
@@ -1003,7 +1066,7 @@ public interface BrowserType {
    /**
     * Changes the timezone of the context. See <a
     * href="https://cs.chromium.org/chromium/src/third_party/icu/source/data/misc/metaZones.txt?rcl=faee8bc70570192d82d2978a71e2a615788597d1">ICU's
-     * metaZones.txt</a> for a list of supported timezone IDs.
+     * metaZones.txt</a> for a list of supported timezone IDs. Defaults to the system timezone.
     */
    public LaunchPersistentContextOptions setTimezoneId(String timezoneId) {
      this.timezoneId = timezoneId;
@@ -1025,7 +1088,8 @@ public interface BrowserType {
    }
    /**
     * Emulates consistent viewport for each page. Defaults to an 1280x720 viewport. Use {@code null} to disable the consistent
-     * viewport emulation.
+     * viewport emulation. Learn more about <a href="https://playwright.dev/java/docs/emulation#viewport">viewport
+     * emulation</a>.
     *
     * <p> <strong>NOTE:</strong> The {@code null} value opts out from the default presets, makes viewport depend on the host window size defined by the
     * operating system. It makes the execution of the tests non-deterministic.
@@ -1035,7 +1099,8 @@ public interface BrowserType {
    }
    /**
     * Emulates consistent viewport for each page. Defaults to an 1280x720 viewport. Use {@code null} to disable the consistent
-     * viewport emulation.
+     * viewport emulation. Learn more about <a href="https://playwright.dev/java/docs/emulation#viewport">viewport
+     * emulation</a>.
     *
     * <p> <strong>NOTE:</strong> The {@code null} value opts out from the default presets, makes viewport depend on the host window size defined by the
     * operating system. It makes the execution of the tests non-deterministic.
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright;
+
+import java.util.function.Consumer;
+import com.google.gson.JsonObject;
+
+/**
+ * The {@code CDPSession} instances are used to talk raw Chrome Devtools Protocol:
+ * <ul>
+ * <li> protocol methods can be called with {@code session.send} method.</li>
+ * <li> protocol events can be subscribed to with {@code session.on} method.</li>
+ * </ul>
+ *
+ * <p> Useful links:
+ * <ul>
+ * <li> Documentation on DevTools Protocol can be found here: <a
+ * href="https://chromedevtools.github.io/devtools-protocol/">DevTools Protocol Viewer</a>.</li>
+ * <li> Getting Started with DevTools Protocol: https://github.com/aslushnikov/getting-started-with-cdp/blob/master/README.md</li>
+ * <pre>{@code
+ * CDPSession client = page.context().newCDPSession(page);
+ * client.send("Runtime.enable");
+ *
+ * client.on("Animation.animationCreated", (event) -> System.out.println("Animation created!"));
+ *
+ * JsonObject response = client.send("Animation.getPlaybackRate");
+ * double playbackRate = response.get("playbackRate").getAsDouble();
+ * System.out.println("playback rate is " + playbackRate);
+ *
+ * JsonObject params = new JsonObject();
+ * params.addProperty("playbackRate", playbackRate / 2);
+ * client.send("Animation.setPlaybackRate", params);
+ * }</pre>
+ * </ul>
+ */
+public interface CDPSession {
+  /**
+   * Detaches the CDPSession from the target. Once detached, the CDPSession object won't emit any events and can't be used to
+   * send messages.
+   *
+   * @since v1.8
+   */
+  void detach();
+  /**
+   *
+   *
+   * @param method Protocol method name.
+   * @since v1.8
+   */
+  default JsonObject send(String method) {
+    return send(method, null);
+  }
+  /**
+   *
+   *
+   * @param method Protocol method name.
+   * @param args Optional method parameters.
+   * @since v1.8
+   */
+  JsonObject send(String method, JsonObject args);
+  /**
+   * Register an event handler for events with the specified event name. The given handler will be called for every event
+   * with the given name.
+   *
+   * @param eventName CDP event name.
+   * @param handler Event handler.
+   * @since v1.37
+   */
+  void on(String eventName, Consumer<JsonObject> handler);
+  /**
+   * Unregister an event handler for events with the specified event name. The given handler will not be called anymore for
+   * events with the given name.
+   *
+   * @param eventName CDP event name.
+   * @param handler Event handler.
+   * @since v1.37
+   */
+  void off(String eventName, Consumer<JsonObject> handler);
+}
+
@@ -56,6 +56,12 @@ public interface ConsoleMessage {
   * @since v1.8
   */
  String location();
+  /**
+   * The page that produced this console message, if any.
+   *
+   * @since v1.34
+   */
+  Page page();
  /**
   * The text of the console message.
   *
@@ -81,6 +81,12 @@ public interface Dialog {
   * @since v1.8
   */
  String message();
+  /**
+   * The page that initiated this dialog, if available.
+   *
+   * @since v1.34
+   */
+  Page page();
  /**
   * Returns dialog's type, can be one of {@code alert}, {@code beforeunload}, {@code confirm} or {@code prompt}.
   *
@@ -24,14 +24,16 @@ import java.nio.file.Path;
 *
 * <p> All the downloaded files belonging to the browser context are deleted when the browser context is closed.
 *
- * <p> Download event is emitted once the download starts. Download path becomes available once download completes:
+ * <p> Download event is emitted once the download starts. Download path becomes available once download completes.
 * <pre>{@code
- * // wait for download to start
+ * // Wait for the download to start
 * Download download = page.waitForDownload(() -> {
- *   page.getByText("Download file").click();
+ *     // Perform the action that initiates download
+ *     page.getByText("Download file").click();
 * });
- * // wait for download to complete
- * Path path = download.path();
+ *
+ * // Wait for the download process to complete and save the downloaded file somewhere
+ * download.saveAs(Paths.get("/path/to/save/at/", download.suggestedFilename()));
 * }</pre>
 */
 public interface Download {
@@ -80,6 +82,11 @@ public interface Download {
   * Copy the download to a user-specified path. It is safe to call this method while the download is still in progress. Will
   * wait for the download to finish if necessary.
   *
+   * <p> **Usage**
+   * <pre>{@code
+   * download.saveAs(Paths.get("/path/to/save/at/", download.suggestedFilename()));
+   * }</pre>
+   *
   * @param path Path where the download should be copied.
   * @since v1.8
   */
@@ -75,8 +75,8 @@ public interface ElementHandle extends JSHandle {
     */
    public Position position;
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public Double timeout;
@@ -120,8 +120,8 @@ public interface ElementHandle extends JSHandle {
      return this;
    }
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public CheckOptions setTimeout(double timeout) {
@@ -173,8 +173,8 @@ public interface ElementHandle extends JSHandle {
     */
    public Position position;
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public Double timeout;
@@ -247,8 +247,8 @@ public interface ElementHandle extends JSHandle {
      return this;
    }
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public ClickOptions setTimeout(double timeout) {
@@ -296,8 +296,8 @@ public interface ElementHandle extends JSHandle {
     */
    public Position position;
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public Double timeout;
@@ -363,8 +363,8 @@ public interface ElementHandle extends JSHandle {
      return this;
    }
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public DblclickOptions setTimeout(double timeout) {
@@ -394,8 +394,8 @@ public interface ElementHandle extends JSHandle {
     */
    public Boolean noWaitAfter;
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public Double timeout;
@@ -418,8 +418,8 @@ public interface ElementHandle extends JSHandle {
      return this;
    }
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public FillOptions setTimeout(double timeout) {
@@ -450,8 +450,8 @@ public interface ElementHandle extends JSHandle {
     */
    public Position position;
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public Double timeout;
@@ -503,8 +503,8 @@ public interface ElementHandle extends JSHandle {
      return this;
    }
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public HoverOptions setTimeout(double timeout) {
@@ -523,15 +523,15 @@ public interface ElementHandle extends JSHandle {
  }
  class InputValueOptions {
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public Double timeout;

    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public InputValueOptions setTimeout(double timeout) {
@@ -551,8 +551,8 @@ public interface ElementHandle extends JSHandle {
     */
    public Boolean noWaitAfter;
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public Double timeout;
@@ -574,8 +574,8 @@ public interface ElementHandle extends JSHandle {
      return this;
    }
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public PressOptions setTimeout(double timeout) {
@@ -602,9 +602,15 @@ public interface ElementHandle extends JSHandle {
    public ScreenshotCaret caret;
    /**
     * Specify locators that should be masked when the screenshot is taken. Masked elements will be overlaid with a pink box
-     * {@code #FF00FF} that completely covers its bounding box.
+     * {@code #FF00FF} (customized by {@code maskColor}) that completely covers its bounding box.
     */
    public List<Locator> mask;
+    /**
+     * Specify the color of the overlay box for masked elements, in <a
+     * href="https://developer.mozilla.org/en-US/docs/Web/CSS/color_value">CSS color format</a>. Default color is pink {@code
+     * #FF00FF}.
+     */
+    public String maskColor;
    /**
     * Hides default white background and allows capturing screenshots with transparency. Not applicable to {@code jpeg}
     * images. Defaults to {@code false}.
@@ -629,8 +635,8 @@ public interface ElementHandle extends JSHandle {
     */
    public ScreenshotScale scale;
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public Double timeout;
@@ -663,12 +669,21 @@ public interface ElementHandle extends JSHandle {
    }
    /**
     * Specify locators that should be masked when the screenshot is taken. Masked elements will be overlaid with a pink box
-     * {@code #FF00FF} that completely covers its bounding box.
+     * {@code #FF00FF} (customized by {@code maskColor}) that completely covers its bounding box.
     */
    public ScreenshotOptions setMask(List<Locator> mask) {
      this.mask = mask;
      return this;
    }
+    /**
+     * Specify the color of the overlay box for masked elements, in <a
+     * href="https://developer.mozilla.org/en-US/docs/Web/CSS/color_value">CSS color format</a>. Default color is pink {@code
+     * #FF00FF}.
+     */
+    public ScreenshotOptions setMaskColor(String maskColor) {
+      this.maskColor = maskColor;
+      return this;
+    }
    /**
     * Hides default white background and allows capturing screenshots with transparency. Not applicable to {@code jpeg}
     * images. Defaults to {@code false}.
@@ -705,8 +720,8 @@ public interface ElementHandle extends JSHandle {
      return this;
    }
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public ScreenshotOptions setTimeout(double timeout) {
@@ -723,15 +738,15 @@ public interface ElementHandle extends JSHandle {
  }
  class ScrollIntoViewIfNeededOptions {
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public Double timeout;

    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public ScrollIntoViewIfNeededOptions setTimeout(double timeout) {
@@ -752,8 +767,8 @@ public interface ElementHandle extends JSHandle {
     */
    public Boolean noWaitAfter;
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public Double timeout;
@@ -776,8 +791,8 @@ public interface ElementHandle extends JSHandle {
      return this;
    }
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public SelectOptionOptions setTimeout(double timeout) {
@@ -792,8 +807,8 @@ public interface ElementHandle extends JSHandle {
     */
    public Boolean force;
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public Double timeout;
@@ -807,8 +822,8 @@ public interface ElementHandle extends JSHandle {
      return this;
    }
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public SelectTextOptions setTimeout(double timeout) {
@@ -834,8 +849,8 @@ public interface ElementHandle extends JSHandle {
     */
    public Position position;
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public Double timeout;
@@ -879,8 +894,8 @@ public interface ElementHandle extends JSHandle {
      return this;
    }
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public SetCheckedOptions setTimeout(double timeout) {
@@ -905,8 +920,8 @@ public interface ElementHandle extends JSHandle {
     */
    public Boolean noWaitAfter;
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public Double timeout;
@@ -921,8 +936,8 @@ public interface ElementHandle extends JSHandle {
      return this;
    }
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public SetInputFilesOptions setTimeout(double timeout) {
@@ -953,8 +968,8 @@ public interface ElementHandle extends JSHandle {
     */
    public Position position;
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public Double timeout;
@@ -1006,8 +1021,8 @@ public interface ElementHandle extends JSHandle {
      return this;
    }
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public TapOptions setTimeout(double timeout) {
@@ -1036,8 +1051,8 @@ public interface ElementHandle extends JSHandle {
     */
    public Boolean noWaitAfter;
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public Double timeout;
@@ -1059,8 +1074,8 @@ public interface ElementHandle extends JSHandle {
      return this;
    }
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public TypeOptions setTimeout(double timeout) {
@@ -1086,8 +1101,8 @@ public interface ElementHandle extends JSHandle {
     */
    public Position position;
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public Double timeout;
@@ -1131,8 +1146,8 @@ public interface ElementHandle extends JSHandle {
      return this;
    }
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public UncheckOptions setTimeout(double timeout) {
@@ -1151,15 +1166,15 @@ public interface ElementHandle extends JSHandle {
  }
  class WaitForElementStateOptions {
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public Double timeout;

    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public WaitForElementStateOptions setTimeout(double timeout) {
@@ -1186,8 +1201,8 @@ public interface ElementHandle extends JSHandle {
     */
    public Boolean strict;
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public Double timeout;
@@ -1216,8 +1231,8 @@ public interface ElementHandle extends JSHandle {
      return this;
    }
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public WaitForSelectorOptions setTimeout(double timeout) {
@@ -1567,7 +1582,7 @@ public interface ElementHandle extends JSHandle {
   * href="https://developer.mozilla.org/en-US/docs/Web/API/HTMLLabelElement/control">control</a>, the control will be filled
   * instead.
   *
-   * <p> To send fine-grained keyboard events, use {@link ElementHandle#type ElementHandle.type()}.
+   * <p> To send fine-grained keyboard events, use {@link Locator#pressSequentially Locator.pressSequentially()}.
   *
   * @param value Value to set for the {@code <input>}, {@code <textarea>} or {@code [contenteditable]} element.
   * @since v1.8
@@ -1585,7 +1600,7 @@ public interface ElementHandle extends JSHandle {
   * href="https://developer.mozilla.org/en-US/docs/Web/API/HTMLLabelElement/control">control</a>, the control will be filled
   * instead.
   *
-   * <p> To send fine-grained keyboard events, use {@link ElementHandle#type ElementHandle.type()}.
+   * <p> To send fine-grained keyboard events, use {@link Locator#pressSequentially Locator.pressSequentially()}.
   *
   * @param value Value to set for the {@code <input>}, {@code <textarea>} or {@code [contenteditable]} element.
   * @since v1.8
@@ -2435,24 +2450,9 @@ public interface ElementHandle extends JSHandle {
   */
  String textContent();
  /**
-   * Focuses the element, and then sends a {@code keydown}, {@code keypress}/{@code input}, and {@code keyup} event for each
-   * character in the text.
-   *
-   * <p> To press a special key, like {@code Control} or {@code ArrowDown}, use {@link ElementHandle#press
-   * ElementHandle.press()}.
-   *
-   * <p> **Usage**
-   * <pre>{@code
-   * elementHandle.type("Hello"); // Types instantly
-   * elementHandle.type("World", new ElementHandle.TypeOptions().setDelay(100)); // Types slower, like a user
-   * }</pre>
-   *
-   * <p> An example of typing into a text field and then submitting the form:
-   * <pre>{@code
-   * ElementHandle elementHandle = page.querySelector("input");
-   * elementHandle.type("some text");
-   * elementHandle.press("Enter");
-   * }</pre>
+   * @deprecated In most cases, you should use {@link Locator#fill Locator.fill()} instead. You only need to press keys one by one if
+   * there is special keyboard handling on the page - in this case use {@link Locator#pressSequentially
+   * Locator.pressSequentially()}.
   *
   * @param text A text to type into a focused element.
   * @since v1.8
@@ -2461,24 +2461,9 @@ public interface ElementHandle extends JSHandle {
    type(text, null);
  }
  /**
-   * Focuses the element, and then sends a {@code keydown}, {@code keypress}/{@code input}, and {@code keyup} event for each
-   * character in the text.
-   *
-   * <p> To press a special key, like {@code Control} or {@code ArrowDown}, use {@link ElementHandle#press
-   * ElementHandle.press()}.
-   *
-   * <p> **Usage**
-   * <pre>{@code
-   * elementHandle.type("Hello"); // Types instantly
-   * elementHandle.type("World", new ElementHandle.TypeOptions().setDelay(100)); // Types slower, like a user
-   * }</pre>
-   *
-   * <p> An example of typing into a text field and then submitting the form:
-   * <pre>{@code
-   * ElementHandle elementHandle = page.querySelector("input");
-   * elementHandle.type("some text");
-   * elementHandle.press("Enter");
-   * }</pre>
+   * @deprecated In most cases, you should use {@link Locator#fill Locator.fill()} instead. You only need to press keys one by one if
+   * there is special keyboard handling on the page - in this case use {@link Locator#pressSequentially
+   * Locator.pressSequentially()}.
   *
   * @param text A text to type into a focused element.
   * @since v1.8
@@ -35,8 +35,8 @@ public interface FileChooser {
     */
    public Boolean noWaitAfter;
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public Double timeout;
@@ -51,8 +51,8 @@ public interface FileChooser {
      return this;
    }
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public SetFilesOptions setTimeout(double timeout) {
@@ -172,8 +172,8 @@ public interface Frame {
     */
    public Boolean strict;
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public Double timeout;
@@ -225,8 +225,8 @@ public interface Frame {
      return this;
    }
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public CheckOptions setTimeout(double timeout) {
@@ -283,8 +283,8 @@ public interface Frame {
     */
    public Boolean strict;
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public Double timeout;
@@ -365,8 +365,8 @@ public interface Frame {
      return this;
    }
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public ClickOptions setTimeout(double timeout) {
@@ -419,8 +419,8 @@ public interface Frame {
     */
    public Boolean strict;
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public Double timeout;
@@ -494,8 +494,8 @@ public interface Frame {
      return this;
    }
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public DblclickOptions setTimeout(double timeout) {
@@ -519,8 +519,8 @@ public interface Frame {
     */
    public Boolean strict;
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public Double timeout;
@@ -534,8 +534,8 @@ public interface Frame {
      return this;
    }
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public DispatchEventOptions setTimeout(double timeout) {
@@ -571,8 +571,8 @@ public interface Frame {
     */
    public Position targetPosition;
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public Double timeout;
@@ -639,8 +639,8 @@ public interface Frame {
      return this;
    }
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public DragAndDropOptions setTimeout(double timeout) {
@@ -691,8 +691,8 @@ public interface Frame {
     */
    public Boolean strict;
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public Double timeout;
@@ -723,8 +723,8 @@ public interface Frame {
      return this;
    }
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public FillOptions setTimeout(double timeout) {
@@ -739,8 +739,8 @@ public interface Frame {
     */
    public Boolean strict;
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public Double timeout;
@@ -754,8 +754,8 @@ public interface Frame {
      return this;
    }
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public FocusOptions setTimeout(double timeout) {
@@ -770,8 +770,8 @@ public interface Frame {
     */
    public Boolean strict;
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public Double timeout;
@@ -785,8 +785,8 @@ public interface Frame {
      return this;
    }
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public GetAttributeOptions setTimeout(double timeout) {
@@ -1046,8 +1046,8 @@ public interface Frame {
     * <ul>
     * <li> {@code "domcontentloaded"} - consider operation to be finished when the {@code DOMContentLoaded} event is fired.</li>
     * <li> {@code "load"} - consider operation to be finished when the {@code load} event is fired.</li>
-     * <li> {@code "networkidle"} - consider operation to be finished when there are no network connections for at least {@code 500}
-     * ms.</li>
+     * <li> {@code "networkidle"} - **DISCOURAGED** consider operation to be finished when there are no network connections for at
+     * least {@code 500} ms. Don't use this method for testing, rely on web assertions to assess readiness instead.</li>
     * <li> {@code "commit"} - consider operation to be finished when network response is received and the document started loading.</li>
     * </ul>
     */
@@ -1076,8 +1076,8 @@ public interface Frame {
     * <ul>
     * <li> {@code "domcontentloaded"} - consider operation to be finished when the {@code DOMContentLoaded} event is fired.</li>
     * <li> {@code "load"} - consider operation to be finished when the {@code load} event is fired.</li>
-     * <li> {@code "networkidle"} - consider operation to be finished when there are no network connections for at least {@code 500}
-     * ms.</li>
+     * <li> {@code "networkidle"} - **DISCOURAGED** consider operation to be finished when there are no network connections for at
+     * least {@code 500} ms. Don't use this method for testing, rely on web assertions to assess readiness instead.</li>
     * <li> {@code "commit"} - consider operation to be finished when network response is received and the document started loading.</li>
     * </ul>
     */
@@ -1114,8 +1114,8 @@ public interface Frame {
     */
    public Boolean strict;
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public Double timeout;
@@ -1175,8 +1175,8 @@ public interface Frame {
      return this;
    }
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public HoverOptions setTimeout(double timeout) {
@@ -1200,8 +1200,8 @@ public interface Frame {
     */
    public Boolean strict;
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public Double timeout;
@@ -1215,8 +1215,8 @@ public interface Frame {
      return this;
    }
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public InnerHTMLOptions setTimeout(double timeout) {
@@ -1231,8 +1231,8 @@ public interface Frame {
     */
    public Boolean strict;
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public Double timeout;
@@ -1246,8 +1246,8 @@ public interface Frame {
      return this;
    }
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public InnerTextOptions setTimeout(double timeout) {
@@ -1262,8 +1262,8 @@ public interface Frame {
     */
    public Boolean strict;
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public Double timeout;
@@ -1277,8 +1277,8 @@ public interface Frame {
      return this;
    }
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public InputValueOptions setTimeout(double timeout) {
@@ -1293,8 +1293,8 @@ public interface Frame {
     */
    public Boolean strict;
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public Double timeout;
@@ -1308,8 +1308,8 @@ public interface Frame {
      return this;
    }
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public IsCheckedOptions setTimeout(double timeout) {
@@ -1324,8 +1324,8 @@ public interface Frame {
     */
    public Boolean strict;
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public Double timeout;
@@ -1339,8 +1339,8 @@ public interface Frame {
      return this;
    }
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public IsDisabledOptions setTimeout(double timeout) {
@@ -1355,8 +1355,8 @@ public interface Frame {
     */
    public Boolean strict;
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public Double timeout;
@@ -1370,8 +1370,8 @@ public interface Frame {
      return this;
    }
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public IsEditableOptions setTimeout(double timeout) {
@@ -1386,8 +1386,8 @@ public interface Frame {
     */
    public Boolean strict;
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public Double timeout;
@@ -1401,8 +1401,8 @@ public interface Frame {
      return this;
    }
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public IsEnabledOptions setTimeout(double timeout) {
@@ -1476,6 +1476,19 @@ public interface Frame {
     * <p> Note that outer and inner locators must belong to the same frame. Inner locator must not contain {@code FrameLocator}s.
     */
    public Locator has;
+    /**
+     * Matches elements that do not contain an element that matches an inner locator. Inner locator is queried against the
+     * outer one. For example, {@code article} that does not have {@code div} matches {@code
+     * <article><span>Playwright</span></article>}.
+     *
+     * <p> Note that outer and inner locators must belong to the same frame. Inner locator must not contain {@code FrameLocator}s.
+     */
+    public Locator hasNot;
+    /**
+     * Matches elements that do not contain specified text somewhere inside, possibly in a child or a descendant element. When
+     * passed a [string], matching is case-insensitive and searches for a substring.
+     */
+    public Object hasNotText;
    /**
     * Matches elements containing specified text somewhere inside, possibly in a child or a descendant element. When passed a
     * [string], matching is case-insensitive and searches for a substring. For example, {@code "Playwright"} matches {@code
@@ -1493,6 +1506,33 @@ public interface Frame {
      this.has = has;
      return this;
    }
+    /**
+     * Matches elements that do not contain an element that matches an inner locator. Inner locator is queried against the
+     * outer one. For example, {@code article} that does not have {@code div} matches {@code
+     * <article><span>Playwright</span></article>}.
+     *
+     * <p> Note that outer and inner locators must belong to the same frame. Inner locator must not contain {@code FrameLocator}s.
+     */
+    public LocatorOptions setHasNot(Locator hasNot) {
+      this.hasNot = hasNot;
+      return this;
+    }
+    /**
+     * Matches elements that do not contain specified text somewhere inside, possibly in a child or a descendant element. When
+     * passed a [string], matching is case-insensitive and searches for a substring.
+     */
+    public LocatorOptions setHasNotText(String hasNotText) {
+      this.hasNotText = hasNotText;
+      return this;
+    }
+    /**
+     * Matches elements that do not contain specified text somewhere inside, possibly in a child or a descendant element. When
+     * passed a [string], matching is case-insensitive and searches for a substring.
+     */
+    public LocatorOptions setHasNotText(Pattern hasNotText) {
+      this.hasNotText = hasNotText;
+      return this;
+    }
    /**
     * Matches elements containing specified text somewhere inside, possibly in a child or a descendant element. When passed a
     * [string], matching is case-insensitive and searches for a substring. For example, {@code "Playwright"} matches {@code
@@ -1529,8 +1569,8 @@ public interface Frame {
     */
    public Boolean strict;
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public Double timeout;
@@ -1560,8 +1600,8 @@ public interface Frame {
      return this;
    }
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public PressOptions setTimeout(double timeout) {
@@ -1603,8 +1643,8 @@ public interface Frame {
     */
    public Boolean strict;
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public Double timeout;
@@ -1635,8 +1675,8 @@ public interface Frame {
      return this;
    }
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public SelectOptionOptions setTimeout(double timeout) {
@@ -1667,8 +1707,8 @@ public interface Frame {
     */
    public Boolean strict;
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public Double timeout;
@@ -1720,8 +1760,8 @@ public interface Frame {
      return this;
    }
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public SetCheckedOptions setTimeout(double timeout) {
@@ -1751,8 +1791,8 @@ public interface Frame {
     * <ul>
     * <li> {@code "domcontentloaded"} - consider operation to be finished when the {@code DOMContentLoaded} event is fired.</li>
     * <li> {@code "load"} - consider operation to be finished when the {@code load} event is fired.</li>
-     * <li> {@code "networkidle"} - consider operation to be finished when there are no network connections for at least {@code 500}
-     * ms.</li>
+     * <li> {@code "networkidle"} - **DISCOURAGED** consider operation to be finished when there are no network connections for at
+     * least {@code 500} ms. Don't use this method for testing, rely on web assertions to assess readiness instead.</li>
     * <li> {@code "commit"} - consider operation to be finished when network response is received and the document started loading.</li>
     * </ul>
     */
@@ -1773,8 +1813,8 @@ public interface Frame {
     * <ul>
     * <li> {@code "domcontentloaded"} - consider operation to be finished when the {@code DOMContentLoaded} event is fired.</li>
     * <li> {@code "load"} - consider operation to be finished when the {@code load} event is fired.</li>
-     * <li> {@code "networkidle"} - consider operation to be finished when there are no network connections for at least {@code 500}
-     * ms.</li>
+     * <li> {@code "networkidle"} - **DISCOURAGED** consider operation to be finished when there are no network connections for at
+     * least {@code 500} ms. Don't use this method for testing, rely on web assertions to assess readiness instead.</li>
     * <li> {@code "commit"} - consider operation to be finished when network response is received and the document started loading.</li>
     * </ul>
     */
@@ -1796,8 +1836,8 @@ public interface Frame {
     */
    public Boolean strict;
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public Double timeout;
@@ -1820,8 +1860,8 @@ public interface Frame {
      return this;
    }
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public SetInputFilesOptions setTimeout(double timeout) {
@@ -1857,8 +1897,8 @@ public interface Frame {
     */
    public Boolean strict;
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public Double timeout;
@@ -1918,8 +1958,8 @@ public interface Frame {
      return this;
    }
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public TapOptions setTimeout(double timeout) {
@@ -1943,8 +1983,8 @@ public interface Frame {
     */
    public Boolean strict;
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public Double timeout;
@@ -1958,8 +1998,8 @@ public interface Frame {
      return this;
    }
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public TextContentOptions setTimeout(double timeout) {
@@ -1984,8 +2024,8 @@ public interface Frame {
     */
    public Boolean strict;
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public Double timeout;
@@ -2015,8 +2055,8 @@ public interface Frame {
      return this;
    }
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public TypeOptions setTimeout(double timeout) {
@@ -2047,8 +2087,8 @@ public interface Frame {
     */
    public Boolean strict;
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public Double timeout;
@@ -2100,8 +2140,8 @@ public interface Frame {
      return this;
    }
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public UncheckOptions setTimeout(double timeout) {
@@ -2125,8 +2165,9 @@ public interface Frame {
     */
    public Double pollingInterval;
    /**
-     * maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The
-     * default value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()}.
+     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The
+     * default value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or
+     * {@link Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public Double timeout;

@@ -2139,8 +2180,9 @@ public interface Frame {
      return this;
    }
    /**
-     * maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The
-     * default value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()}.
+     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The
+     * default value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or
+     * {@link Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public WaitForFunctionOptions setTimeout(double timeout) {
      this.timeout = timeout;
@@ -2186,8 +2228,8 @@ public interface Frame {
     * <ul>
     * <li> {@code "domcontentloaded"} - consider operation to be finished when the {@code DOMContentLoaded} event is fired.</li>
     * <li> {@code "load"} - consider operation to be finished when the {@code load} event is fired.</li>
-     * <li> {@code "networkidle"} - consider operation to be finished when there are no network connections for at least {@code 500}
-     * ms.</li>
+     * <li> {@code "networkidle"} - **DISCOURAGED** consider operation to be finished when there are no network connections for at
+     * least {@code 500} ms. Don't use this method for testing, rely on web assertions to assess readiness instead.</li>
     * <li> {@code "commit"} - consider operation to be finished when network response is received and the document started loading.</li>
     * </ul>
     */
@@ -2235,8 +2277,8 @@ public interface Frame {
     * <ul>
     * <li> {@code "domcontentloaded"} - consider operation to be finished when the {@code DOMContentLoaded} event is fired.</li>
     * <li> {@code "load"} - consider operation to be finished when the {@code load} event is fired.</li>
-     * <li> {@code "networkidle"} - consider operation to be finished when there are no network connections for at least {@code 500}
-     * ms.</li>
+     * <li> {@code "networkidle"} - **DISCOURAGED** consider operation to be finished when there are no network connections for at
+     * least {@code 500} ms. Don't use this method for testing, rely on web assertions to assess readiness instead.</li>
     * <li> {@code "commit"} - consider operation to be finished when network response is received and the document started loading.</li>
     * </ul>
     */
@@ -2264,8 +2306,8 @@ public interface Frame {
     */
    public Boolean strict;
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public Double timeout;
@@ -2294,8 +2336,8 @@ public interface Frame {
      return this;
    }
    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be
-     * changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public WaitForSelectorOptions setTimeout(double timeout) {
@@ -2316,8 +2358,8 @@ public interface Frame {
     * <ul>
     * <li> {@code "domcontentloaded"} - consider operation to be finished when the {@code DOMContentLoaded} event is fired.</li>
     * <li> {@code "load"} - consider operation to be finished when the {@code load} event is fired.</li>
-     * <li> {@code "networkidle"} - consider operation to be finished when there are no network connections for at least {@code 500}
-     * ms.</li>
+     * <li> {@code "networkidle"} - **DISCOURAGED** consider operation to be finished when there are no network connections for at
+     * least {@code 500} ms. Don't use this method for testing, rely on web assertions to assess readiness instead.</li>
     * <li> {@code "commit"} - consider operation to be finished when network response is received and the document started loading.</li>
     * </ul>
     */
@@ -2338,8 +2380,8 @@ public interface Frame {
     * <ul>
     * <li> {@code "domcontentloaded"} - consider operation to be finished when the {@code DOMContentLoaded} event is fired.</li>
     * <li> {@code "load"} - consider operation to be finished when the {@code load} event is fired.</li>
-     * <li> {@code "networkidle"} - consider operation to be finished when there are no network connections for at least {@code 500}
-     * ms.</li>
+     * <li> {@code "networkidle"} - **DISCOURAGED** consider operation to be finished when there are no network connections for at
+     * least {@code 500} ms. Don't use this method for testing, rely on web assertions to assess readiness instead.</li>
     * <li> {@code "commit"} - consider operation to be finished when network response is received and the document started loading.</li>
     * </ul>
     */
@@ -2945,7 +2987,7 @@ public interface Frame {
   * href="https://developer.mozilla.org/en-US/docs/Web/API/HTMLLabelElement/control">control</a>, the control will be filled
   * instead.
   *
-   * <p> To send fine-grained keyboard events, use {@link Frame#type Frame.type()}.
+   * <p> To send fine-grained keyboard events, use {@link Locator#pressSequentially Locator.pressSequentially()}.
   *
   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be used.
   * @param value Value to fill for the {@code <input>}, {@code <textarea>} or {@code [contenteditable]} element.
@@ -2964,7 +3006,7 @@ public interface Frame {
   * href="https://developer.mozilla.org/en-US/docs/Web/API/HTMLLabelElement/control">control</a>, the control will be filled
   * instead.
   *
-   * <p> To send fine-grained keyboard events, use {@link Frame#type Frame.type()}.
+   * <p> To send fine-grained keyboard events, use {@link Locator#pressSequentially Locator.pressSequentially()}.
   *
   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be used.
   * @param value Value to fill for the {@code <input>}, {@code <textarea>} or {@code [contenteditable]} element.
@@ -3103,12 +3145,14 @@ public interface Frame {
   */
  Locator getByAltText(Pattern text, GetByAltTextOptions options);
  /**
-   * Allows locating input elements by the text of the associated label.
+   * Allows locating input elements by the text of the associated {@code <label>} or {@code aria-labelledby} element, or by
+   * the {@code aria-label} attribute.
   *
   * <p> **Usage**
   *
-   * <p> For example, this method will find the input by label text "Password" in the following DOM:
+   * <p> For example, this method will find inputs by label "Username" and "Password" in the following DOM:
   * <pre>{@code
+   * page.getByLabel("Username").fill("john");
   * page.getByLabel("Password").fill("secret");
   * }</pre>
   *
@@ -3119,12 +3163,14 @@ public interface Frame {
    return getByLabel(text, null);
  }
  /**
-   * Allows locating input elements by the text of the associated label.
+   * Allows locating input elements by the text of the associated {@code <label>} or {@code aria-labelledby} element, or by
+   * the {@code aria-label} attribute.
   *
   * <p> **Usage**
   *
-   * <p> For example, this method will find the input by label text "Password" in the following DOM:
+   * <p> For example, this method will find inputs by label "Username" and "Password" in the following DOM:
   * <pre>{@code
+   * page.getByLabel("Username").fill("john");
   * page.getByLabel("Password").fill("secret");
   * }</pre>
   *
@@ -3133,12 +3179,14 @@ public interface Frame {
   */
  Locator getByLabel(String text, GetByLabelOptions options);
  /**
-   * Allows locating input elements by the text of the associated label.
+   * Allows locating input elements by the text of the associated {@code <label>} or {@code aria-labelledby} element, or by
+   * the {@code aria-label} attribute.
   *
   * <p> **Usage**
   *
-   * <p> For example, this method will find the input by label text "Password" in the following DOM:
+   * <p> For example, this method will find inputs by label "Username" and "Password" in the following DOM:
   * <pre>{@code
+   * page.getByLabel("Username").fill("john");
   * page.getByLabel("Password").fill("secret");
   * }</pre>
   *
@@ -3149,12 +3197,14 @@ public interface Frame {
    return getByLabel(text, null);
  }
  /**
-   * Allows locating input elements by the text of the associated label.
+   * Allows locating input elements by the text of the associated {@code <label>} or {@code aria-labelledby} element, or by
+   * the {@code aria-label} attribute.
   *
   * <p> **Usage**
   *
-   * <p> For example, this method will find the input by label text "Password" in the following DOM:
+   * <p> For example, this method will find inputs by label "Username" and "Password" in the following DOM:
   * <pre>{@code
+   * page.getByLabel("Username").fill("john");
   * page.getByLabel("Password").fill("secret");
   * }</pre>
   *
@@ -4423,7 +4473,9 @@ public interface Frame {
   */
  void setChecked(String selector, boolean checked, SetCheckedOptions options);
  /**
-   *
+   * This method internally calls <a
+   * href="https://developer.mozilla.org/en-US/docs/Web/API/Document/write">document.write()</a>, inheriting all its specific
+   * characteristics and behaviors.
   *
   * @param html HTML markup to assign to the page.
   * @since v1.8
@@ -4432,7 +4484,9 @@ public interface Frame {
    setContent(html, null);
  }
  /**
-   *
+   * This method internally calls <a
+   * href="https://developer.mozilla.org/en-US/docs/Web/API/Document/write">document.write()</a>, inheriting all its specific
+   * characteristics and behaviors.
   *
   * @param html HTML markup to assign to the page.
   * @since v1.8
@@ -4623,19 +4677,9 @@ public interface Frame {
   */
  String title();
  /**
-   * Sends a {@code keydown}, {@code keypress}/{@code input}, and {@code keyup} event for each character in the text. {@code
-   * frame.type} can be used to send fine-grained keyboard events. To fill values in form fields, use {@link Frame#fill
-   * Frame.fill()}.
-   *
-   * <p> To press a special key, like {@code Control} or {@code ArrowDown}, use {@link Keyboard#press Keyboard.press()}.
-   *
-   * <p> **Usage**
-   * <pre>{@code
-   * // Types instantly
-   * frame.type("#mytextarea", "Hello");
-   * // Types slower, like a user
-   * frame.type("#mytextarea", "World", new Frame.TypeOptions().setDelay(100));
-   * }</pre>
+   * @deprecated In most cases, you should use {@link Locator#fill Locator.fill()} instead. You only need to press keys one by one if
+   * there is special keyboard handling on the page - in this case use {@link Locator#pressSequentially
+   * Locator.pressSequentially()}.
   *
   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be used.
   * @param text A text to type into a focused element.
@@ -4645,19 +4689,9 @@ public interface Frame {
    type(selector, text, null);
  }
  /**
-   * Sends a {@code keydown}, {@code keypress}/{@code input}, and {@code keyup} event for each character in the text. {@code
-   * frame.type} can be used to send fine-grained keyboard events. To fill values in form fields, use {@link Frame#fill
-   * Frame.fill()}.
-   *
-   * <p> To press a special key, like {@code Control} or {@code ArrowDown}, use {@link Keyboard#press Keyboard.press()}.
-   *
-   * <p> **Usage**
-   * <pre>{@code
-   * // Types instantly
-   * frame.type("#mytextarea", "Hello");
-   * // Types slower, like a user
-   * frame.type("#mytextarea", "World", new Frame.TypeOptions().setDelay(100));
-   * }</pre>
+   * @deprecated In most cases, you should use {@link Locator#fill Locator.fill()} instead. You only need to press keys one by one if
+   * there is special keyboard handling on the page - in this case use {@link Locator#pressSequentially
+   * Locator.pressSequentially()}.
   *
   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be used.
   * @param text A text to type into a focused element.
@@ -4839,7 +4873,8 @@ public interface Frame {
   * <ul>
   * <li> {@code "load"} - wait for the {@code load} event to be fired.</li>
   * <li> {@code "domcontentloaded"} - wait for the {@code DOMContentLoaded} event to be fired.</li>
-   * <li> {@code "networkidle"} - wait until there are no network connections for at least {@code 500} ms.</li>
+   * <li> {@code "networkidle"} - **DISCOURAGED** wait until there are no network connections for at least {@code 500} ms. Don't
+   * use this method for testing, rely on web assertions to assess readiness instead.</li>
   * </ul>
   * @since v1.8
   */
@@ -4880,30 +4915,14 @@ public interface Frame {
   * <ul>
   * <li> {@code "load"} - wait for the {@code load} event to be fired.</li>
   * <li> {@code "domcontentloaded"} - wait for the {@code DOMContentLoaded} event to be fired.</li>
-   * <li> {@code "networkidle"} - wait until there are no network connections for at least {@code 500} ms.</li>
+   * <li> {@code "networkidle"} - **DISCOURAGED** wait until there are no network connections for at least {@code 500} ms. Don't
+   * use this method for testing, rely on web assertions to assess readiness instead.</li>
   * </ul>
   * @since v1.8
   */
  void waitForLoadState(LoadState state, WaitForLoadStateOptions options);
  /**
-   * Waits for the frame navigation and returns the main resource response. In case of multiple redirects, the navigation
-   * will resolve with the response of the last redirect. In case of navigation to a different anchor or navigation due to
-   * History API usage, the navigation will resolve with {@code null}.
-   *
-   * <p> **Usage**
-   *
-   * <p> This method waits for the frame to navigate to a new URL. It is useful for when you run code which will indirectly cause
-   * the frame to navigate. Consider this example:
-   * <pre>{@code
-   * // The method returns after navigation has finished
-   * frame.waitForNavigation(() -> {
-   *   // Clicking the link will indirectly cause a navigation
-   *   frame.click("a.delayed-navigation");
-   * });
-   * }</pre>
-   *
-   * <p> <strong>NOTE:</strong> Usage of the <a href="https://developer.mozilla.org/en-US/docs/Web/API/History_API">History API</a> to change the URL is
-   * considered a navigation.
+   * @deprecated This method is inherently racy, please use {@link Frame#waitForURL Frame.waitForURL()} instead.
   *
   * @param callback Callback that performs the action triggering the event.
   * @since v1.8
@@ -4912,24 +4931,7 @@ public interface Frame {
    return waitForNavigation(null, callback);
  }
  /**
-   * Waits for the frame navigation and returns the main resource response. In case of multiple redirects, the navigation
-   * will resolve with the response of the last redirect. In case of navigation to a different anchor or navigation due to
-   * History API usage, the navigation will resolve with {@code null}.
-   *
-   * <p> **Usage**
-   *
-   * <p> This method waits for the frame to navigate to a new URL. It is useful for when you run code which will indirectly cause
-   * the frame to navigate. Consider this example:
-   * <pre>{@code
-   * // The method returns after navigation has finished
-   * frame.waitForNavigation(() -> {
-   *   // Clicking the link will indirectly cause a navigation
-   *   frame.click("a.delayed-navigation");
-   * });
-   * }</pre>
-   *
-   * <p> <strong>NOTE:</strong> Usage of the <a href="https://developer.mozilla.org/en-US/docs/Web/API/History_API">History API</a> to change the URL is
-   * considered a navigation.
+   * @deprecated This method is inherently racy, please use {@link Frame#waitForURL Frame.waitForURL()} instead.
   *
   * @param callback Callback that performs the action triggering the event.
   * @since v1.8
@@ -291,6 +291,19 @@ public interface FrameLocator {
     * <p> Note that outer and inner locators must belong to the same frame. Inner locator must not contain {@code FrameLocator}s.
     */
    public Locator has;
+    /**
+     * Matches elements that do not contain an element that matches an inner locator. Inner locator is queried against the
+     * outer one. For example, {@code article} that does not have {@code div} matches {@code
+     * <article><span>Playwright</span></article>}.
+     *
+     * <p> Note that outer and inner locators must belong to the same frame. Inner locator must not contain {@code FrameLocator}s.
+     */
+    public Locator hasNot;
+    /**
+     * Matches elements that do not contain specified text somewhere inside, possibly in a child or a descendant element. When
+     * passed a [string], matching is case-insensitive and searches for a substring.
+     */
+    public Object hasNotText;
    /**
     * Matches elements containing specified text somewhere inside, possibly in a child or a descendant element. When passed a
     * [string], matching is case-insensitive and searches for a substring. For example, {@code "Playwright"} matches {@code
@@ -308,6 +321,33 @@ public interface FrameLocator {
      this.has = has;
      return this;
    }
+    /**
+     * Matches elements that do not contain an element that matches an inner locator. Inner locator is queried against the
+     * outer one. For example, {@code article} that does not have {@code div} matches {@code
+     * <article><span>Playwright</span></article>}.
+     *
+     * <p> Note that outer and inner locators must belong to the same frame. Inner locator must not contain {@code FrameLocator}s.
+     */
+    public LocatorOptions setHasNot(Locator hasNot) {
+      this.hasNot = hasNot;
+      return this;
+    }
+    /**
+     * Matches elements that do not contain specified text somewhere inside, possibly in a child or a descendant element. When
+     * passed a [string], matching is case-insensitive and searches for a substring.
+     */
+    public LocatorOptions setHasNotText(String hasNotText) {
+      this.hasNotText = hasNotText;
+      return this;
+    }
+    /**
+     * Matches elements that do not contain specified text somewhere inside, possibly in a child or a descendant element. When
+     * passed a [string], matching is case-insensitive and searches for a substring.
+     */
+    public LocatorOptions setHasNotText(Pattern hasNotText) {
+      this.hasNotText = hasNotText;
+      return this;
+    }
    /**
     * Matches elements containing specified text somewhere inside, possibly in a child or a descendant element. When passed a
     * [string], matching is case-insensitive and searches for a substring. For example, {@code "Playwright"} matches {@code
@@ -402,12 +442,14 @@ public interface FrameLocator {
   */
  Locator getByAltText(Pattern text, GetByAltTextOptions options);
  /**
-   * Allows locating input elements by the text of the associated label.
+   * Allows locating input elements by the text of the associated {@code <label>} or {@code aria-labelledby} element, or by
+   * the {@code aria-label} attribute.
   *
   * <p> **Usage**
   *
-   * <p> For example, this method will find the input by label text "Password" in the following DOM:
+   * <p> For example, this method will find inputs by label "Username" and "Password" in the following DOM:
   * <pre>{@code
+   * page.getByLabel("Username").fill("john");
   * page.getByLabel("Password").fill("secret");
   * }</pre>
   *
@@ -418,12 +460,14 @@ public interface FrameLocator {
    return getByLabel(text, null);
  }
  /**
-   * Allows locating input elements by the text of the associated label.
+   * Allows locating input elements by the text of the associated {@code <label>} or {@code aria-labelledby} element, or by
+   * the {@code aria-label} attribute.
   *
   * <p> **Usage**
   *
-   * <p> For example, this method will find the input by label text "Password" in the following DOM:
+   * <p> For example, this method will find inputs by label "Username" and "Password" in the following DOM:
   * <pre>{@code
+   * page.getByLabel("Username").fill("john");
   * page.getByLabel("Password").fill("secret");
   * }</pre>
   *
@@ -432,12 +476,14 @@ public interface FrameLocator {
   */
  Locator getByLabel(String text, GetByLabelOptions options);
  /**
-   * Allows locating input elements by the text of the associated label.
+   * Allows locating input elements by the text of the associated {@code <label>} or {@code aria-labelledby} element, or by
+   * the {@code aria-label} attribute.
   *
   * <p> **Usage**
   *
-   * <p> For example, this method will find the input by label text "Password" in the following DOM:
+   * <p> For example, this method will find inputs by label "Username" and "Password" in the following DOM:
   * <pre>{@code
+   * page.getByLabel("Username").fill("john");
   * page.getByLabel("Password").fill("secret");
   * }</pre>
   *
@@ -448,12 +494,14 @@ public interface FrameLocator {
    return getByLabel(text, null);
  }
  /**
-   * Allows locating input elements by the text of the associated label.
+   * Allows locating input elements by the text of the associated {@code <label>} or {@code aria-labelledby} element, or by
+   * the {@code aria-label} attribute.
   *
   * <p> **Usage**
   *
-   * <p> For example, this method will find the input by label text "Password" in the following DOM:
+   * <p> For example, this method will find inputs by label "Username" and "Password" in the following DOM:
   * <pre>{@code
+   * page.getByLabel("Username").fill("john");
   * page.getByLabel("Password").fill("secret");
   * }</pre>
   *
@@ -899,11 +947,11 @@ public interface FrameLocator {
   *
   * <p> <a href="https://playwright.dev/java/docs/locators">Learn more about locators</a>.
   *
-   * @param selector A selector to use when resolving DOM element.
+   * @param selectorOrLocator A selector or locator to use when resolving DOM element.
   * @since v1.17
   */
-  default Locator locator(String selector) {
-    return locator(selector, null);
+  default Locator locator(String selectorOrLocator) {
+    return locator(selectorOrLocator, null);
  }
  /**
   * The method finds an element matching the specified selector in the locator's subtree. It also accepts filter options,
@@ -911,10 +959,32 @@ public interface FrameLocator {
   *
   * <p> <a href="https://playwright.dev/java/docs/locators">Learn more about locators</a>.
   *
-   * @param selector A selector to use when resolving DOM element.
+   * @param selectorOrLocator A selector or locator to use when resolving DOM element.
   * @since v1.17
   */
-  Locator locator(String selector, LocatorOptions options);
+  Locator locator(String selectorOrLocator, LocatorOptions options);
+  /**
+   * The method finds an element matching the specified selector in the locator's subtree. It also accepts filter options,
+   * similar to {@link Locator#filter Locator.filter()} method.
+   *
+   * <p> <a href="https://playwright.dev/java/docs/locators">Learn more about locators</a>.
+   *
+   * @param selectorOrLocator A selector or locator to use when resolving DOM element.
+   * @since v1.17
+   */
+  default Locator locator(Locator selectorOrLocator) {
+    return locator(selectorOrLocator, null);
+  }
+  /**
+   * The method finds an element matching the specified selector in the locator's subtree. It also accepts filter options,
+   * similar to {@link Locator#filter Locator.filter()} method.
+   *
+   * <p> <a href="https://playwright.dev/java/docs/locators">Learn more about locators</a>.
+   *
+   * @param selectorOrLocator A selector or locator to use when resolving DOM element.
+   * @since v1.17
+   */
+  Locator locator(Locator selectorOrLocator, LocatorOptions options);
  /**
   * Returns locator to the n-th matching frame. It's zero based, {@code nth(0)} selects the first frame.
   *
@@ -135,7 +135,7 @@ public interface JSHandle {
   *
   * <p> **Usage**
   * <pre>{@code
-   * JSHandle handle = page.evaluateHandle("() => ({window, document}"););
+   * JSHandle handle = page.evaluateHandle("() => ({ window, document })");
   * Map<String, JSHandle> properties = handle.getProperties();
   * JSHandle windowHandle = properties.get("window");
   * JSHandle documentHandle = properties.get("document");
@@ -132,7 +132,9 @@ public interface Keyboard {
   */
  void insertText(String text);
  /**
-   * {@code key} can specify the intended <a
+   * <strong>NOTE:</strong> In most cases, you should use {@link Locator#press Locator.press()} instead.
+   *
+   * <p> {@code key} can specify the intended <a
   * href="https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key">keyboardEvent.key</a> value or a single
   * character to generate the text for. A superset of the {@code key} values can be found <a
   * href="https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key/Key_Values">here</a>. Examples of the keys are:
@@ -175,7 +177,9 @@ public interface Keyboard {
    press(key, null);
  }
  /**
-   * {@code key} can specify the intended <a
+   * <strong>NOTE:</strong> In most cases, you should use {@link Locator#press Locator.press()} instead.
+   *
+   * <p> {@code key} can specify the intended <a
   * href="https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key">keyboardEvent.key</a> value or a single
   * character to generate the text for. A superset of the {@code key} values can be found <a
   * href="https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key/Key_Values">here</a>. Examples of the keys are:
@@ -216,7 +220,11 @@ public interface Keyboard {
   */
  void press(String key, PressOptions options);
  /**
-   * Sends a {@code keydown}, {@code keypress}/{@code input}, and {@code keyup} event for each character in the text.
+   * <strong>NOTE:</strong> In most cases, you should use {@link Locator#fill Locator.fill()} instead. You only need to press keys one by one if
+   * there is special keyboard handling on the page - in this case use {@link Locator#pressSequentially
+   * Locator.pressSequentially()}.
+   *
+   * <p> Sends a {@code keydown}, {@code keypress}/{@code input}, and {@code keyup} event for each character in the text.
   *
   * <p> To press a special key, like {@code Control} or {@code ArrowDown}, use {@link Keyboard#press Keyboard.press()}.
   *
@@ -239,7 +247,11 @@ public interface Keyboard {
    type(text, null);
  }
  /**
-   * Sends a {@code keydown}, {@code keypress}/{@code input}, and {@code keyup} event for each character in the text.
+   * <strong>NOTE:</strong> In most cases, you should use {@link Locator#fill Locator.fill()} instead. You only need to press keys one by one if
+   * there is special keyboard handling on the page - in this case use {@link Locator#pressSequentially
+   * Locator.pressSequentially()}.
+   *
+   * <p> Sends a {@code keydown}, {@code keypress}/{@code input}, and {@code keyup} event for each character in the text.
   *
   * <p> To press a special key, like {@code Control} or {@code ArrowDown}, use {@link Keyboard#press Keyboard.press()}.
   *
@@ -62,6 +62,22 @@ public interface Request {
  /**
   * Returns the {@code Frame} that initiated this request.
   *
+   * <p> **Usage**
+   * <pre>{@code
+   * String frameUrl = request.frame().url();
+   * }</pre>
+   *
+   * <p> **Details**
+   *
+   * <p> Note that in some cases the frame is not available, and this method will throw.
+   * <ul>
+   * <li> When request originates in the Service Worker. You can use {@code request.serviceWorker()} to check that.</li>
+   * <li> When navigation request is issued before the corresponding frame is created. You can use {@link
+   * Request#isNavigationRequest Request.isNavigationRequest()} to check that.</li>
+   * </ul>
+   *
+   * <p> Here is an example that handles all the cases:
+   *
   * @since v1.8
   */
  Frame frame();
@@ -91,6 +107,9 @@ public interface Request {
  /**
   * Whether this request is driving frame's navigation.
   *
+   * <p> Some navigation requests are issued before the corresponding frame is created, and therefore do not have {@link
+   * Request#frame Request.frame()} available.
+   *
   * @since v1.8
   */
  boolean isNavigationRequest();
@@ -154,6 +154,10 @@ public interface Route {
     * If set changes the post data of request.
     */
    public Object postData;
+    /**
+     * Request timeout in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout.
+     */
+    public Double timeout;
    /**
     * If set changes the request URL. New URL must have same protocol as original one.
     */
@@ -195,6 +199,13 @@ public interface Route {
      this.postData = postData;
      return this;
    }
+    /**
+     * Request timeout in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout.
+     */
+    public FetchOptions setTimeout(double timeout) {
+      this.timeout = timeout;
+      return this;
+    }
    /**
     * If set changes the request URL. New URL must have same protocol as original one.
     */
@@ -109,11 +109,24 @@ public interface Tracing {
    }
  }
  class StartChunkOptions {
+    /**
+     * If specified, the trace is going to be saved into the file with the given name inside the {@code tracesDir} folder
+     * specified in {@link BrowserType#launch BrowserType.launch()}.
+     */
+    public String name;
    /**
     * Trace name to be shown in the Trace Viewer.
     */
    public String title;

+    /**
+     * If specified, the trace is going to be saved into the file with the given name inside the {@code tracesDir} folder
+     * specified in {@link BrowserType#launch BrowserType.launch()}.
+     */
+    public StartChunkOptions setName(String name) {
+      this.name = name;
+      return this;
+    }
    /**
     * Trace name to be shown in the Trace Viewer.
     */
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright;
+
+
+/**
+ * {@code WebError} class represents an unhandled exeception thrown in the page. It is dispatched via the {@link
+ * BrowserContext#onWebError BrowserContext.onWebError()} event.
+ * <pre>{@code
+ * // Log all uncaught errors to the terminal
+ * context.onWebError(webError -> {
+ *   System.out.println("Uncaught exception: " + webError.error());
+ * });
+ *
+ * // Navigate to a page with an exception.
+ * page.navigate("data:text/html,<script>throw new Error('Test')</script>");
+ * }</pre>
+ */
+public interface WebError {
+  /**
+   * The page that produced this unhandled exception, if any.
+   *
+   * @since v1.38
+   */
+  Page page();
+  /**
+   * Unhandled error that was thrown.
+   *
+   * @since v1.38
+   */
+  String error();
+}
+
@@ -37,10 +37,29 @@ import java.util.regex.Pattern;
 * }</pre>
 */
 public interface LocatorAssertions {
+  class IsAttachedOptions {
+    public Boolean attached;
+    /**
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
+     */
+    public Double timeout;
+
+    public IsAttachedOptions setAttached(boolean attached) {
+      this.attached = attached;
+      return this;
+    }
+    /**
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
+     */
+    public IsAttachedOptions setTimeout(double timeout) {
+      this.timeout = timeout;
+      return this;
+    }
+  }
  class IsCheckedOptions {
    public Boolean checked;
    /**
-     * Time to retry the assertion for.
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
     */
    public Double timeout;

@@ -49,7 +68,7 @@ public interface LocatorAssertions {
      return this;
    }
    /**
-     * Time to retry the assertion for.
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
     */
    public IsCheckedOptions setTimeout(double timeout) {
      this.timeout = timeout;
@@ -58,12 +77,12 @@ public interface LocatorAssertions {
  }
  class IsDisabledOptions {
    /**
-     * Time to retry the assertion for.
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
     */
    public Double timeout;

    /**
-     * Time to retry the assertion for.
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
     */
    public IsDisabledOptions setTimeout(double timeout) {
      this.timeout = timeout;
@@ -73,7 +92,7 @@ public interface LocatorAssertions {
  class IsEditableOptions {
    public Boolean editable;
    /**
-     * Time to retry the assertion for.
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
     */
    public Double timeout;

@@ -82,7 +101,7 @@ public interface LocatorAssertions {
      return this;
    }
    /**
-     * Time to retry the assertion for.
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
     */
    public IsEditableOptions setTimeout(double timeout) {
      this.timeout = timeout;
@@ -91,12 +110,12 @@ public interface LocatorAssertions {
  }
  class IsEmptyOptions {
    /**
-     * Time to retry the assertion for.
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
     */
    public Double timeout;

    /**
-     * Time to retry the assertion for.
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
     */
    public IsEmptyOptions setTimeout(double timeout) {
      this.timeout = timeout;
@@ -106,7 +125,7 @@ public interface LocatorAssertions {
  class IsEnabledOptions {
    public Boolean enabled;
    /**
-     * Time to retry the assertion for.
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
     */
    public Double timeout;

@@ -115,7 +134,7 @@ public interface LocatorAssertions {
      return this;
    }
    /**
-     * Time to retry the assertion for.
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
     */
    public IsEnabledOptions setTimeout(double timeout) {
      this.timeout = timeout;
@@ -124,12 +143,12 @@ public interface LocatorAssertions {
  }
  class IsFocusedOptions {
    /**
-     * Time to retry the assertion for.
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
     */
    public Double timeout;

    /**
-     * Time to retry the assertion for.
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
     */
    public IsFocusedOptions setTimeout(double timeout) {
      this.timeout = timeout;
@@ -138,12 +157,12 @@ public interface LocatorAssertions {
  }
  class IsHiddenOptions {
    /**
-     * Time to retry the assertion for.
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
     */
    public Double timeout;

    /**
-     * Time to retry the assertion for.
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
     */
    public IsHiddenOptions setTimeout(double timeout) {
      this.timeout = timeout;
@@ -157,7 +176,7 @@ public interface LocatorAssertions {
     */
    public Double ratio;
    /**
-     * Time to retry the assertion for.
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
     */
    public Double timeout;

@@ -170,7 +189,7 @@ public interface LocatorAssertions {
      return this;
    }
    /**
-     * Time to retry the assertion for.
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
     */
    public IsInViewportOptions setTimeout(double timeout) {
      this.timeout = timeout;
@@ -179,13 +198,13 @@ public interface LocatorAssertions {
  }
  class IsVisibleOptions {
    /**
-     * Time to retry the assertion for.
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
     */
    public Double timeout;
    public Boolean visible;

    /**
-     * Time to retry the assertion for.
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
     */
    public IsVisibleOptions setTimeout(double timeout) {
      this.timeout = timeout;
@@ -203,7 +222,7 @@ public interface LocatorAssertions {
     */
    public Boolean ignoreCase;
    /**
-     * Time to retry the assertion for.
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
     */
    public Double timeout;
    /**
@@ -220,7 +239,7 @@ public interface LocatorAssertions {
      return this;
    }
    /**
-     * Time to retry the assertion for.
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
     */
    public ContainsTextOptions setTimeout(double timeout) {
      this.timeout = timeout;
@@ -236,12 +255,12 @@ public interface LocatorAssertions {
  }
  class HasAttributeOptions {
    /**
-     * Time to retry the assertion for.
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
     */
    public Double timeout;

    /**
-     * Time to retry the assertion for.
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
     */
    public HasAttributeOptions setTimeout(double timeout) {
      this.timeout = timeout;
@@ -250,12 +269,12 @@ public interface LocatorAssertions {
  }
  class HasClassOptions {
    /**
-     * Time to retry the assertion for.
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
     */
    public Double timeout;

    /**
-     * Time to retry the assertion for.
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
     */
    public HasClassOptions setTimeout(double timeout) {
      this.timeout = timeout;
@@ -264,12 +283,12 @@ public interface LocatorAssertions {
  }
  class HasCountOptions {
    /**
-     * Time to retry the assertion for.
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
     */
    public Double timeout;

    /**
-     * Time to retry the assertion for.
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
     */
    public HasCountOptions setTimeout(double timeout) {
      this.timeout = timeout;
@@ -278,12 +297,12 @@ public interface LocatorAssertions {
  }
  class HasCSSOptions {
    /**
-     * Time to retry the assertion for.
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
     */
    public Double timeout;

    /**
-     * Time to retry the assertion for.
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
     */
    public HasCSSOptions setTimeout(double timeout) {
      this.timeout = timeout;
@@ -292,12 +311,12 @@ public interface LocatorAssertions {
  }
  class HasIdOptions {
    /**
-     * Time to retry the assertion for.
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
     */
    public Double timeout;

    /**
-     * Time to retry the assertion for.
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
     */
    public HasIdOptions setTimeout(double timeout) {
      this.timeout = timeout;
@@ -306,12 +325,12 @@ public interface LocatorAssertions {
  }
  class HasJSPropertyOptions {
    /**
-     * Time to retry the assertion for.
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
     */
    public Double timeout;

    /**
-     * Time to retry the assertion for.
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
     */
    public HasJSPropertyOptions setTimeout(double timeout) {
      this.timeout = timeout;
@@ -325,7 +344,7 @@ public interface LocatorAssertions {
     */
    public Boolean ignoreCase;
    /**
-     * Time to retry the assertion for.
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
     */
    public Double timeout;
    /**
@@ -342,7 +361,7 @@ public interface LocatorAssertions {
      return this;
    }
    /**
-     * Time to retry the assertion for.
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
     */
    public HasTextOptions setTimeout(double timeout) {
      this.timeout = timeout;
@@ -358,12 +377,12 @@ public interface LocatorAssertions {
  }
  class HasValueOptions {
    /**
-     * Time to retry the assertion for.
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
     */
    public Double timeout;

    /**
-     * Time to retry the assertion for.
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
     */
    public HasValueOptions setTimeout(double timeout) {
      this.timeout = timeout;
@@ -372,12 +391,12 @@ public interface LocatorAssertions {
  }
  class HasValuesOptions {
    /**
-     * Time to retry the assertion for.
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
     */
    public Double timeout;

    /**
-     * Time to retry the assertion for.
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
     */
    public HasValuesOptions setTimeout(double timeout) {
      this.timeout = timeout;
@@ -394,6 +413,32 @@ public interface LocatorAssertions {
   * @since v1.20
   */
  LocatorAssertions not();
+  /**
+   * Ensures that {@code Locator} points to an <a href="https://playwright.dev/java/docs/actionability#attached">attached</a>
+   * DOM node.
+   *
+   * <p> **Usage**
+   * <pre>{@code
+   * assertThat(page.getByText("Hidden text")).isAttached();
+   * }</pre>
+   *
+   * @since v1.33
+   */
+  default void isAttached() {
+    isAttached(null);
+  }
+  /**
+   * Ensures that {@code Locator} points to an <a href="https://playwright.dev/java/docs/actionability#attached">attached</a>
+   * DOM node.
+   *
+   * <p> **Usage**
+   * <pre>{@code
+   * assertThat(page.getByText("Hidden text")).isAttached();
+   * }</pre>
+   *
+   * @since v1.33
+   */
+  void isAttached(IsAttachedOptions options);
  /**
   * Ensures the {@code Locator} points to a checked input.
   *
@@ -580,7 +625,7 @@ public interface LocatorAssertions {
   *
   * <p> **Usage**
   * <pre>{@code
-   * Locator locator = page.locator("button.submit");
+   * Locator locator = page.getByRole(AriaRole.BUTTON);
   * // Make sure at least some part of element intersects viewport.
   * assertThat(locator).isInViewport();
   * // Make sure element is fully outside of viewport.
@@ -600,7 +645,7 @@ public interface LocatorAssertions {
   *
   * <p> **Usage**
   * <pre>{@code
-   * Locator locator = page.locator("button.submit");
+   * Locator locator = page.getByRole(AriaRole.BUTTON);
   * // Make sure at least some part of element intersects viewport.
   * assertThat(locator).isInViewport();
   * // Make sure element is fully outside of viewport.
@@ -618,7 +663,7 @@ public interface LocatorAssertions {
   *
   * <p> **Usage**
   * <pre>{@code
-   * assertThat(page.locator(".my-element")).isVisible();
+   * assertThat(page.getByText("Welcome")).isVisible();
   * }</pre>
   *
   * @since v1.20
@@ -632,7 +677,7 @@ public interface LocatorAssertions {
   *
   * <p> **Usage**
   * <pre>{@code
-   * assertThat(page.locator(".my-element")).isVisible();
+   * assertThat(page.getByText("Welcome")).isVisible();
   * }</pre>
   *
   * @since v1.20
@@ -39,12 +39,12 @@ import java.util.regex.Pattern;
 public interface PageAssertions {
  class HasTitleOptions {
    /**
-     * Time to retry the assertion for.
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
     */
    public Double timeout;

    /**
-     * Time to retry the assertion for.
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
     */
    public HasTitleOptions setTimeout(double timeout) {
      this.timeout = timeout;
@@ -53,12 +53,12 @@ public interface PageAssertions {
  }
  class HasURLOptions {
    /**
-     * Time to retry the assertion for.
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
     */
    public Double timeout;

    /**
-     * Time to retry the assertion for.
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
     */
    public HasURLOptions setTimeout(double timeout) {
      this.timeout = timeout;
@@ -193,7 +193,7 @@ class APIRequestContextImpl extends ChannelOwner implements APIRequestContext {
  }

  private static RequestOptionsImpl ensureOptions(RequestOptions options, String method) {
-    RequestOptionsImpl impl = (RequestOptionsImpl) options;
+    RequestOptionsImpl impl = Utils.clone((RequestOptionsImpl) options);
    if (impl == null) {
      impl = new RequestOptionsImpl();
    }
@@ -19,6 +19,8 @@ package com.microsoft.playwright.impl;
 import com.google.gson.JsonObject;
 import com.microsoft.playwright.PlaywrightException;

+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.FileSystems;
 import java.nio.file.Path;
@@ -39,6 +41,20 @@ class ArtifactImpl extends ChannelOwner {
    return stream.stream();
  }

+  byte[] readAllBytes() {
+    final int bufLen = 1024 * 1024;
+    byte[] buf = new byte[bufLen];
+    int readLen;
+    try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); InputStream stream = createReadStream()) {
+      while ((readLen = stream.read(buf, 0, bufLen)) != -1) {
+        outputStream.write(buf, 0, readLen);
+      }
+      return outputStream.toByteArray();
+    } catch (IOException e) {
+      throw new PlaywrightException("Failed to read artifact",  e);
+    }
+  }
+
  public void cancel() {
    sendMessage("cancel");
  }
@@ -29,6 +29,7 @@ import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.*;
+import java.util.function.BooleanSupplier;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
@@ -46,11 +47,14 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
  private final APIRequestContextImpl request;
  final List<PageImpl> pages = new ArrayList<>();
  final Router routes = new Router();
-  private boolean isClosedOrClosing;
+  private boolean closeWasCalled;
+  private final WaitableEvent<EventType, ?> closePromise;
  final Map<String, BindingCallback> bindings = new HashMap<>();
  PageImpl ownerPage;
  private static final Map<EventType, String> eventSubscriptions() {
    Map<EventType, String> result = new HashMap<>();
+    result.put(EventType.CONSOLE, "console");
+    result.put(EventType.DIALOG, "dialog");
    result.put(EventType.REQUEST, "request");
    result.put(EventType.RESPONSE, "response");
    result.put(EventType.REQUESTFINISHED, "requestFinished");
@@ -75,7 +79,10 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {

  enum EventType {
    CLOSE,
+    CONSOLE,
+    DIALOG,
    PAGE,
+    WEBERROR,
    REQUEST,
    REQUESTFAILED,
    REQUESTFINISHED,
@@ -89,8 +96,9 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
    } else {
      browser = null;
    }
-    this.tracing = connection.getExistingObject(initializer.getAsJsonObject("tracing").get("guid").getAsString());
-    this.request = connection.getExistingObject(initializer.getAsJsonObject("requestContext").get("guid").getAsString());
+    tracing = connection.getExistingObject(initializer.getAsJsonObject("tracing").get("guid").getAsString());
+    request = connection.getExistingObject(initializer.getAsJsonObject("requestContext").get("guid").getAsString());
+    closePromise = new WaitableEvent<>(listeners, EventType.CLOSE);
  }

  void setRecordHar(Path path, HarContentPolicy policy) {
@@ -117,6 +125,26 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
    listeners.remove(EventType.CLOSE, handler);
  }

+  @Override
+  public void onConsoleMessage(Consumer<ConsoleMessage> handler) {
+    listeners.add(EventType.CONSOLE, handler);
+  }
+
+  @Override
+  public void offConsoleMessage(Consumer<ConsoleMessage> handler) {
+    listeners.remove(EventType.CONSOLE, handler);
+  }
+
+  @Override
+  public void onDialog(Consumer<Dialog> handler) {
+    listeners.add(EventType.DIALOG, handler);
+  }
+
+  @Override
+  public void offDialog(Consumer<Dialog> handler) {
+    listeners.remove(EventType.DIALOG, handler);
+  }
+
  @Override
  public void onPage(Consumer<Page> handler) {
    listeners.add(EventType.PAGE, handler);
@@ -127,6 +155,16 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
    listeners.remove(EventType.PAGE, handler);
  }

+  @Override
+  public void onWebError(Consumer<WebError> handler) {
+    listeners.add(EventType.WEBERROR, handler);
+  }
+
+  @Override
+  public void offWebError(Consumer<WebError> handler) {
+    listeners.remove(EventType.WEBERROR, handler);
+  }
+
  @Override
  public void onRequest(Consumer<Request> handler) {
    listeners.add(EventType.REQUEST, handler);
@@ -187,6 +225,22 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
    return waitForEventWithTimeout(EventType.PAGE, code, options.predicate, options.timeout);
  }

+  @Override
+  public CDPSession newCDPSession(Page page) {
+    JsonObject params = new JsonObject();
+    params.add("page", ((PageImpl) page).toProtocolRef());
+    JsonObject result = sendMessage("newCDPSession", params).getAsJsonObject();
+    return connection.getExistingObject(result.getAsJsonObject("session").get("guid").getAsString());
+  }
+
+  @Override
+  public CDPSession newCDPSession(Frame frame) {
+    JsonObject params = new JsonObject();
+    params.add("frame", ((FrameImpl) frame).toProtocolRef());
+    JsonObject result = sendMessage("newCDPSession", params).getAsJsonObject();
+    return connection.getExistingObject(result.getAsJsonObject("session").get("guid").getAsString());
+  }
+
  @Override
  public void close() {
    withLogging("BrowserContext.close", () -> closeImpl());
@@ -198,11 +252,8 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
  }

  private void closeImpl() {
-    if (isClosedOrClosing) {
-      return;
-    }
-    isClosedOrClosing = true;
-    try {
+    if (!closeWasCalled) {
+      closeWasCalled = true;
      for (Map.Entry<String, HarRecorder> entry : harRecorders.entrySet()) {
        JsonObject params = new JsonObject();
        params.addProperty("harId", entry.getKey());
@@ -224,13 +275,9 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
        }
        artifact.delete();
      }
-
      sendMessage("close");
-    } catch (PlaywrightException e) {
-      if (!isSafeCloseError(e)) {
-        throw e;
-      }
    }
+    runUntil(() -> {}, closePromise);
  }

  @Override
@@ -410,8 +457,12 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
    }
    JsonObject jsonOptions = new JsonObject();
    jsonOptions.addProperty("path", har.toAbsolutePath().toString());
-    jsonOptions.addProperty("content", HarContentPolicy.ATTACH.name().toLowerCase());
-    jsonOptions.addProperty("mode", HarMode.MINIMAL.name().toLowerCase());
+    jsonOptions.addProperty("content", options.updateContent == null ?
+      HarContentPolicy.ATTACH.name().toLowerCase() :
+      options.updateContent.name().toLowerCase());
+    jsonOptions.addProperty("mode", options.updateMode == null ?
+      HarMode.MINIMAL.name().toLowerCase() :
+      options.updateMode.name().toLowerCase());
    addHarUrlFilter(jsonOptions, options.url);
    params.add("options", jsonOptions);
    JsonObject json = sendMessage("harStart", params).getAsJsonObject();
@@ -421,6 +472,10 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {

  @Override
  public void setDefaultNavigationTimeout(double timeout) {
+    setDefaultNavigationTimeoutImpl(timeout);
+  }
+
+  void setDefaultNavigationTimeoutImpl(Double timeout) {
    withLogging("BrowserContext.setDefaultNavigationTimeout", () -> {
      timeoutSettings.setDefaultNavigationTimeout(timeout);
      JsonObject params = new JsonObject();
@@ -431,6 +486,10 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {

  @Override
  public void setDefaultTimeout(double timeout) {
+    setDefaultTimeoutImpl(timeout);
+  }
+
+  void setDefaultTimeoutImpl(Double timeout) {
    withLogging("BrowserContext.setDefaultTimeout", () -> {
      timeoutSettings.setDefaultTimeout(timeout);
      JsonObject params = new JsonObject();
@@ -507,6 +566,27 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
    unroute(new UrlMatcher(url), handler);
  }

+  @Override
+  public void waitForCondition(BooleanSupplier predicate, WaitForConditionOptions options) {
+    List<Waitable<Void>> waitables = new ArrayList<>();
+    waitables.add(new WaitableContextClose<>());
+    waitables.add(timeoutSettings.createWaitable(options == null ? null : options.timeout));
+    waitables.add(new WaitablePredicate<>(predicate));
+    runUntil(() -> {}, new WaitableRace<>(waitables));
+  }
+
+  @Override
+  public ConsoleMessage waitForConsoleMessage(WaitForConsoleMessageOptions options, Runnable code) {
+    return withWaitLogging("BrowserContext.waitForConsoleMessage", logger -> waitForConsoleMessageImpl(options, code));
+  }
+
+  private ConsoleMessage waitForConsoleMessageImpl(WaitForConsoleMessageOptions options, Runnable code) {
+    if (options == null) {
+      options = new WaitForConsoleMessageOptions();
+    }
+    return waitForEventWithTimeout(EventType.CONSOLE, code, options.predicate, options.timeout);
+  }
+
  private class WaitableContextClose<R> extends WaitableEvent<EventType, R> {
    WaitableContextClose() {
      super(BrowserContextImpl.this.listeners, EventType.CLOSE);
@@ -535,7 +615,7 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
      updateInterceptionPatterns();
    }
    if (handled == Router.HandleResult.NoMatchingHandler || handled == Router.HandleResult.Fallback) {
-      route.resume();
+      route.resume(null, true);
    }
  }

@@ -545,8 +625,38 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {

  @Override
  protected void handleEvent(String event, JsonObject params) {
-    if ("route".equals(event)) {
+    if ("dialog".equals(event)) {
+      String guid = params.getAsJsonObject("dialog").get("guid").getAsString();
+      DialogImpl dialog = connection.getExistingObject(guid);
+      boolean hasListeners = false;
+      if (listeners.hasListeners(EventType.DIALOG)) {
+        hasListeners = true;
+        listeners.notify(EventType.DIALOG, dialog);
+      }
+      PageImpl page = dialog.page();
+      if (page != null) {
+        if (page.listeners.hasListeners(PageImpl.EventType.DIALOG)) {
+          hasListeners = true;
+          page.listeners.notify(PageImpl.EventType.DIALOG, dialog);
+        }
+      }
+      // Although we do similar handling on the server side, we still need this logic
+      // on the client side due to a possible race condition between two async calls:
+      // a) removing "dialog" listener subscription (client->server)
+      // b) actual "dialog" event (server->client)
+      if (!hasListeners) {
+        if ("beforeunload".equals(dialog.type())) {
+          try {
+            dialog.accept();
+          } catch (PlaywrightException e) {
+          }
+        } else {
+          dialog.dismiss();
+        }
+      }
+    } else if ("route".equals(event)) {
      RouteImpl route = connection.getExistingObject(params.getAsJsonObject("route").get("guid").getAsString());
+      route.browserContext = this;
      handleRoute(route);
    } else if ("page".equals(event)) {
      PageImpl page = connection.getExistingObject(params.getAsJsonObject("page").get("guid").getAsString());
@@ -561,6 +671,14 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
      if (binding != null) {
        bindingCall.call(binding);
      }
+    } else if ("console".equals(event)) {
+      String guid = params.getAsJsonObject("message").get("guid").getAsString();
+      ConsoleMessageImpl message = connection.getExistingObject(guid);
+      listeners.notify(BrowserContextImpl.EventType.CONSOLE, message);
+      PageImpl page = message.page();
+      if (page != null) {
+        page.listeners.notify(PageImpl.EventType.CONSOLE, message);
+      }
    } else if ("request".equals(event)) {
      String guid = params.getAsJsonObject("request").get("guid").getAsString();
      RequestImpl request = connection.getExistingObject(guid);
@@ -604,13 +722,31 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
        PageImpl page = connection.getExistingObject(params.getAsJsonObject("page").get("guid").getAsString());
        page.listeners.notify(PageImpl.EventType.RESPONSE, response);
      }
+    } else if ("pageError".equals(event)) {
+      SerializedError error = gson().fromJson(params.getAsJsonObject("error"), SerializedError.class);
+      String errorStr = "";
+      if (error.error != null) {
+        errorStr = error.error.name + ": " + error.error.message;
+        if (error.error.stack != null && !error.error.stack.isEmpty()) {
+          errorStr += "\n" + error.error.stack;
+        }
+      }
+      PageImpl page;
+      try {
+        page = connection.getExistingObject(params.getAsJsonObject("page").get("guid").getAsString());
+      } catch (PlaywrightException e) {
+        page = null;
+      }
+      listeners.notify(BrowserContextImpl.EventType.WEBERROR, new WebErrorImpl(page, errorStr));
+      if (page != null) {
+        page.listeners.notify(PageImpl.EventType.PAGEERROR, errorStr);
+      }
    } else if ("close".equals(event)) {
      didClose();
    }
  }

  void didClose() {
-    isClosedOrClosing = true;
    if (browser != null) {
      browser.contexts.remove(this);
    }
@@ -28,7 +28,6 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.*;
 import java.util.function.Consumer;
-import java.util.regex.Pattern;

 import static com.microsoft.playwright.impl.Serialization.addHarUrlFilter;
 import static com.microsoft.playwright.impl.Serialization.gson;
@@ -41,6 +40,8 @@ class BrowserImpl extends ChannelOwner implements Browser {
  boolean isConnectedOverWebSocket;
  private boolean isConnected = true;
  BrowserTypeImpl browserType;
+  BrowserType.LaunchOptions launchOptions;
+  private Path tracePath;

  enum EventType {
    DISCONNECTED,
@@ -202,6 +203,10 @@ class BrowserImpl extends ChannelOwner implements Browser {
        params.addProperty("noDefaultViewport", true);
      }
    }
+    params.remove("acceptDownloads");
+    if (options.acceptDownloads != null) {
+      params.addProperty("acceptDownloads", options.acceptDownloads ? "accept" : "deny");
+    }
    JsonElement result = sendMessage("newContext", params);
    BrowserContextImpl context = connection.getExistingObject(result.getAsJsonObject().getAsJsonObject("context").get("guid").getAsString());
    context.videosDir = options.recordVideoDir;
@@ -209,6 +214,9 @@ class BrowserImpl extends ChannelOwner implements Browser {
      context.setBaseUrl(options.baseURL);
    }
    context.setRecordHar(recordHarPath, harContentPolicy);
+    if (launchOptions != null) {
+      context.tracing().setTracesDir(launchOptions.tracesDir);
+    }
    contexts.add(context);
    return context;
  }
@@ -227,6 +235,7 @@ class BrowserImpl extends ChannelOwner implements Browser {
    if (options == null) {
      options = new StartTracingOptions();
    }
+    tracePath = options.path;
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    if (page != null) {
      params.add("page", ((PageImpl) page).toProtocolRef());
@@ -241,7 +250,20 @@ class BrowserImpl extends ChannelOwner implements Browser {

  private byte[] stopTracingImpl() {
    JsonObject json = sendMessage("stopTracing").getAsJsonObject();
-    return Base64.getDecoder().decode(json.get("binary").getAsString());
+    ArtifactImpl artifact = connection.getExistingObject(json.getAsJsonObject().getAsJsonObject("artifact").get("guid").getAsString());
+    byte[] data = artifact.readAllBytes();
+    artifact.delete();
+    if (tracePath != null) {
+      try {
+        Files.createDirectories(tracePath.getParent());
+        Files.write(tracePath, data);
+      } catch (IOException e) {
+        throw new PlaywrightException("Failed to write trace file", e);
+      } finally {
+        tracePath = null;
+      }
+    }
+    return data;
  }

  private Page newPageImpl(NewPageOptions options) {
@@ -272,6 +294,13 @@ class BrowserImpl extends ChannelOwner implements Browser {
    }
  }

+  @Override
+  public CDPSession newBrowserCDPSession() {
+    JsonObject params = new JsonObject();
+    JsonObject result = sendMessage("newBrowserCDPSession", params).getAsJsonObject();
+    return connection.getExistingObject(result.getAsJsonObject("session").get("guid").getAsString());
+  }
+
  private void didClose() {
    isConnected = false;
    listeners.notify(EventType.DISCONNECTED, this);
@@ -52,6 +52,7 @@ class BrowserTypeImpl extends ChannelOwner implements BrowserType {
    JsonElement result = sendMessage("launch", params);
    BrowserImpl browser = connection.getExistingObject(result.getAsJsonObject().getAsJsonObject("browser").get("guid").getAsString());
    browser.browserType = this;
+    browser.launchOptions = options;
    return browser;
  }

@@ -222,6 +223,10 @@ class BrowserTypeImpl extends ChannelOwner implements BrowserType {
        params.addProperty("noDefaultViewport", true);
      }
    }
+    params.remove("acceptDownloads");
+    if (options.acceptDownloads != null) {
+      params.addProperty("acceptDownloads", options.acceptDownloads ? "accept" : "deny");
+    }
    JsonObject json = sendMessage("launchPersistentContext", params).getAsJsonObject();
    BrowserContextImpl context = connection.getExistingObject(json.getAsJsonObject("context").get("guid").getAsString());
    context.videosDir = options.recordVideoDir;
@@ -229,6 +234,7 @@ class BrowserTypeImpl extends ChannelOwner implements BrowserType {
      context.setBaseUrl(options.baseURL);
    }
    context.setRecordHar(recordHarPath, harContentPolicy);
+    context.tracing().setTracesDir(options.tracesDir);
    return context;
  }

@@ -0,0 +1,56 @@
+package com.microsoft.playwright.impl;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.microsoft.playwright.CDPSession;
+
+import java.util.HashMap;
+import java.util.function.Consumer;
+
+public class CDPSessionImpl extends ChannelOwner implements CDPSession {
+  private final ListenerCollection<String> listeners = new ListenerCollection<>(new HashMap<>(), this);
+
+  protected CDPSessionImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
+    super(parent, type, guid, initializer);
+  }
+
+  @Override
+  void handleEvent(String event, JsonObject parameters) {
+    super.handleEvent(event, parameters);
+    if ("event".equals(event)) {
+      String method = parameters.get("method").getAsString();
+      JsonObject params = parameters.get("params").getAsJsonObject();
+      listeners.notify(method, params);
+    }
+  }
+
+  public JsonObject send(String method) {
+    return send(method, null);
+  }
+
+  public JsonObject send(String method, JsonObject params) {
+    JsonObject args = new JsonObject();
+    if (params != null) {
+      args.add("params", params);
+    }
+    args.addProperty("method", method);
+    JsonElement response = connection.sendMessage(guid, "send", args);
+    if (response == null) return null;
+    else return response.getAsJsonObject().get("result").getAsJsonObject();
+  }
+
+  @Override
+  public void on(String event, Consumer<JsonObject> handler) {
+    listeners.add(event, handler);
+  }
+
+  @Override
+  public void off(String event, Consumer<JsonObject> handler) {
+    listeners.remove(event, handler);
+  }
+
+  @Override
+  public void detach() {
+    sendMessage("detach");
+  }
+}
@@ -16,6 +16,7 @@
 package com.microsoft.playwright.impl;

 import com.google.gson.Gson;
+import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.microsoft.playwright.Playwright;
@@ -28,6 +29,7 @@ import java.util.HashMap;
 import java.util.Map;

 import static com.microsoft.playwright.impl.Serialization.gson;
+import static java.lang.System.currentTimeMillis;

 class Message {
  int id;
@@ -67,6 +69,7 @@ public class Connection {
  }
  LocalUtils localUtils;
  final Map<String, String> env;
+  private int tracingCount;

  class Root extends ChannelOwner {
    Root(Connection connection) {
@@ -101,8 +104,12 @@ public class Connection {
    stackTraceCollector = StackTraceCollector.createFromEnv(env);
  }

-  boolean isCollectingStacks() {
-    return stackTraceCollector != null;
+  void setIsTracing(boolean tracing) {
+    if (tracing) {
+      ++tracingCount;
+    } else {
+      --tracingCount;
+    }
  }

  String setApiName(String name) {
@@ -120,10 +127,10 @@ public class Connection {
  }

  public WaitableResult<JsonElement> sendMessageAsync(String guid, String method, JsonObject params) {
-    return internalSendMessage(guid, method, params);
+    return internalSendMessage(guid, method, params, true);
  }

-  private WaitableResult<JsonElement> internalSendMessage(String guid, String method, JsonObject params) {
+  private WaitableResult<JsonElement> internalSendMessage(String guid, String method, JsonObject params, boolean sendStack) {
    int id = ++lastId;
    WaitableResult<JsonElement> result = new WaitableResult<>();
    callbacks.put(id, result);
@@ -133,6 +140,8 @@ public class Connection {
    message.addProperty("method", method);
    message.add("params", params);
    JsonObject metadata = new JsonObject();
+    metadata.addProperty("wallTime", currentTimeMillis());
+    JsonArray stack = null;
    if (apiName == null) {
      metadata.addProperty("internal", true);
    } else {
@@ -140,11 +149,27 @@ public class Connection {
      // All but first message in an API call are considered internal and will be hidden from the inspector.
      apiName = null;
      if (stackTraceCollector != null) {
-        metadata.add("stack", stackTraceCollector.currentStackTrace());
+        stack = stackTraceCollector.currentStackTrace();
+        if (!stack.isEmpty()) {
+          JsonObject location = new JsonObject();
+          JsonObject frame = stack.get(0).getAsJsonObject();
+          location.addProperty("file", frame.get("file").getAsString());
+          location.addProperty("line", frame.get("line").getAsInt());
+          location.addProperty("column", frame.get("column").getAsInt());
+          metadata.add("location", location);
+        }
      }
    }
    message.add("metadata", metadata);
    transport.send(message);
+    if (sendStack && tracingCount > 0 && stack != null && !method.startsWith("LocalUtils")) {
+      JsonObject callData = new JsonObject();
+      callData.addProperty("id", id);
+      callData.add("stack", stack);
+      JsonObject stackParams = new JsonObject();
+      stackParams.add("callData", callData);
+      internalSendMessage(localUtils.guid,"addStackToTracingNoReply", stackParams, false);
+    }
    return result;
  }

@@ -334,6 +359,9 @@ public class Connection {
      case "WritableStream":
        result = new WritableStream(parent, type, guid, initializer);
        break;
+      case "CDPSession":
+        result = new CDPSessionImpl(parent, type, guid, initializer);
+        break;
      default:
        throw new PlaywrightException("Unknown type " + type);
    }
@@ -20,6 +20,7 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.microsoft.playwright.ConsoleMessage;
 import com.microsoft.playwright.JSHandle;
+import com.microsoft.playwright.Page;

 import java.util.ArrayList;
 import java.util.List;
@@ -27,8 +28,16 @@ import java.util.List;
 import static com.microsoft.playwright.impl.Serialization.gson;

 public class ConsoleMessageImpl extends ChannelOwner implements ConsoleMessage {
+  private PageImpl page;
+
  public ConsoleMessageImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
    super(parent, type, guid, initializer);
+    // Note: currently, we only report console messages for pages and they always have a page.
+    // However, in the future we might report console messages for service workers or something else,
+    // where page() would be null.
+    if (initializer.has("page")) {
+      page = connection.getExistingObject(initializer.getAsJsonObject("page").get("guid").getAsString());
+    }
  }

  public String type() {
@@ -55,4 +64,9 @@ public class ConsoleMessageImpl extends ChannelOwner implements ConsoleMessage {
      location.get("lineNumber").getAsNumber() + ":" +
      location.get("columnNumber").getAsNumber();
  }
+
+  @Override
+  public PageImpl page() {
+    return page;
+  }
 }
@@ -18,10 +18,18 @@ package com.microsoft.playwright.impl;

 import com.google.gson.JsonObject;
 import com.microsoft.playwright.Dialog;
+import com.microsoft.playwright.Page;

 class DialogImpl extends ChannelOwner implements Dialog {
+  private PageImpl page;
+
  DialogImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
    super(parent, type, guid, initializer);
+    // Note: dialogs that open early during page initialization block it.
+    // Therefore, we must report the dialog without a page to be able to handle it.
+    if (initializer.has("page")) {
+      page = connection.getExistingObject(initializer.getAsJsonObject("page").get("guid").getAsString());
+    }
  }

  @Override
@@ -50,6 +58,11 @@ class DialogImpl extends ChannelOwner implements Dialog {
    return initializer.get("message").getAsString();
  }

+  @Override
+  public PageImpl page() {
+    return page;
+  }
+
  @Override
  public String type() {
    return initializer.get("type").getAsString();
@@ -18,6 +18,7 @@ package com.microsoft.playwright.impl;

 import com.microsoft.playwright.FrameLocator;
 import com.microsoft.playwright.Locator;
+import com.microsoft.playwright.PlaywrightException;
 import com.microsoft.playwright.options.AriaRole;

 import java.util.regex.Pattern;
@@ -119,6 +120,15 @@ class FrameLocatorImpl implements FrameLocator {
    return new LocatorImpl(frame, frameSelector + " >> internal:control=enter-frame >> " + selector, convertType(options, Locator.LocatorOptions.class));
  }

+  @Override
+  public Locator locator(Locator selectorOrLocator, LocatorOptions options) {
+    LocatorImpl other = (LocatorImpl) selectorOrLocator;
+    if (other.frame != frame) {
+      throw new PlaywrightException("Locators must belong to the same frame.");
+    }
+    return locator(other.selector, options);
+  }
+
  @Override
  public FrameLocator nth(int index) {
    return new FrameLocatorImpl(frame, frameSelector + " >> nth=" + index);
@@ -20,16 +20,38 @@ import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;

 import java.nio.file.Path;
+import java.util.List;
+
+import static com.microsoft.playwright.impl.Serialization.gson;

 class LocalUtils extends ChannelOwner {
  LocalUtils(ChannelOwner parent, String type, String guid, JsonObject initializer) {
    super(parent, type, guid, initializer);
  }

-  void zip(Path zipFile, JsonArray entries) {
+  void zip(Path zipFile, JsonArray entries, String stacksId, boolean appendMode, boolean includeSources) {
    JsonObject params = new JsonObject();
    params.addProperty("zipFile", zipFile.toString());
    params.add("entries", entries);
+    params.addProperty("mode", appendMode ? "append" : "write");
+    params.addProperty("stacksId", stacksId);
+    params.addProperty("includeSources", includeSources);
    sendMessage("zip", params);
  }
+
+  void traceDiscarded(String stacksId) {
+    JsonObject params = new JsonObject();
+    params.addProperty("stacksId", stacksId);
+    sendMessage("traceDiscarded", params);
+  }
+
+  String tracingStarted(String tracesDir, String traceName) {
+    JsonObject params = new JsonObject();
+    if (tracesDir != null) {
+      params.addProperty("tracesDir", "");
+    }
+    params.addProperty("traceName", traceName);
+    JsonObject json = connection.localUtils().sendMessage("tracingStarted", params).getAsJsonObject();
+    return json.get("stacksId").getAsString();
+  }
 }
@@ -288,8 +288,10 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse

  @Override
  public void isChecked(IsCheckedOptions options) {
-    String expression = (options != null && options.checked != null && !options.checked) ? "to.be.unchecked" : "to.be.checked";
-    expectTrue(expression, "Locator expected to be checked", convertType(options, FrameExpectOptions.class));
+    boolean unchecked = options != null && options.checked != null && !options.checked;
+    String expression = unchecked ? "to.be.unchecked" : "to.be.checked";
+    String message = "Locator expected to be " + (unchecked ? "un" : "") + "checked";
+    expectTrue(expression, message, convertType(options, FrameExpectOptions.class));
  }

  @Override
@@ -301,7 +303,8 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
  public void isEditable(IsEditableOptions options) {
    FrameExpectOptions frameOptions = convertType(options, FrameExpectOptions.class);
    boolean editable = options == null || options.editable == null || options.editable == true;
-    expectTrue(editable ? "to.be.editable" : "to.be.readonly", "Locator expected to be editable", frameOptions);
+    String message = "Locator expected to be " + (editable ? "editable" : "readonly");
+    expectTrue(editable ? "to.be.editable" : "to.be.readonly", message, frameOptions);
  }

  @Override
@@ -313,7 +316,8 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
  public void isEnabled(IsEnabledOptions options) {
    FrameExpectOptions frameOptions = convertType(options, FrameExpectOptions.class);
    boolean enabled = options == null || options.enabled == null || options.enabled == true;
-    expectTrue(enabled ? "to.be.enabled" : "to.be.disabled", "Locator expected to be enabled", frameOptions);
+    String message = "Locator expected to be " + (enabled ? "enabled" : "disabled");
+    expectTrue(enabled ? "to.be.enabled" : "to.be.disabled", message, frameOptions);
  }

  @Override
@@ -339,7 +343,8 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
  public void isVisible(IsVisibleOptions options) {
    FrameExpectOptions frameOptions = convertType(options, FrameExpectOptions.class);
    boolean visible = options == null || options.visible == null || options.visible == true;
-    expectTrue(visible ? "to.be.visible" : "to.be.hidden", "Locator expected to be visible", frameOptions);
+    String message = "Locator expected to be " + (visible ? "visible" : "hidden");
+    expectTrue(visible ? "to.be.visible" : "to.be.hidden", message, frameOptions);
  }

  private void expectTrue(String expression, String message, FrameExpectOptions options) {
@@ -352,6 +357,14 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
    return new LocatorAssertionsImpl(actualLocator, !isNot);
  }

+  @Override
+  public void isAttached(IsAttachedOptions options) {
+    FrameExpectOptions frameOptions = convertType(options, FrameExpectOptions.class);
+    boolean attached = options == null || options.attached == null || options.attached == true;
+    String message = "Locator expected to be " + (attached ? "attached" : "detached");
+    expectTrue(attached ? "to.be.attached" : "to.be.detached", message, frameOptions);
+  }
+
  private static Boolean shouldIgnoreCase(Object options) {
    if (options == null) {
      return null;
@@ -20,8 +20,8 @@ import static com.microsoft.playwright.impl.Utils.convertType;
 import static com.microsoft.playwright.impl.Utils.toJsRegexFlags;

 class LocatorImpl implements Locator {
-  private final FrameImpl frame;
-  private final String selector;
+  final FrameImpl frame;
+  final String selector;

  public LocatorImpl(FrameImpl frame, String selector, LocatorOptions options) {
    this.frame = frame;
@@ -29,12 +29,21 @@ class LocatorImpl implements Locator {
      if (options.hasText != null) {
        selector += " >> internal:has-text=" + escapeForTextSelector(options.hasText, false);
      }
+      if (options.hasNotText != null) {
+        selector += " >> internal:has-not-text=" + escapeForTextSelector(options.hasNotText, false);
+      }
      if (options.has != null) {
        LocatorImpl locator = (LocatorImpl) options.has;
        if (locator.frame != frame)
          throw new Error("Inner 'has' locator must belong to the same frame.");
        selector += " >> internal:has=" + gson().toJson(locator.selector);
      }
+      if (options.hasNot != null) {
+        LocatorImpl locator = (LocatorImpl) options.hasNot;
+        if (locator.frame != frame)
+          throw new Error("Inner 'hasNot' locator must belong to the same frame.");
+        selector += " >> internal:has-not=" + gson().toJson(locator.selector);
+      }
    }
    this.selector = selector;
  }
@@ -82,6 +91,14 @@ class LocatorImpl implements Locator {
    return (List<String>) frame.evalOnSelectorAll(selector, "ee => ee.map(e => e.textContent || '')");
  }

+  @Override
+  public Locator and(Locator locator) {
+    LocatorImpl other = (LocatorImpl) locator;
+    if (other.frame != frame)
+      throw new Error("Locators must belong to the same frame.");
+    return new LocatorImpl(frame, selector + " >> internal:and=" + gson().toJson(other.selector), null);
+  }
+
  @Override
  public void blur(BlurOptions options) {
    frame.withLogging("Locator.blur", () -> blurImpl(options));
@@ -384,11 +401,28 @@ class LocatorImpl implements Locator {
    return new LocatorImpl(frame, this.selector + " >> " + selector, options);
  }

+  @Override
+  public Locator locator(Locator selectorOrLocator, LocatorOptions options) {
+    LocatorImpl other = (LocatorImpl) selectorOrLocator;
+    if (other.frame != frame) {
+      throw new PlaywrightException("Locators must belong to the same frame.");
+    }
+    return new LocatorImpl(frame, this.selector + " >> internal:chain=" + gson().toJson(other.selector), options);
+  }
+
  @Override
  public Locator nth(int index) {
    return new LocatorImpl(frame, selector + " >> nth=" + index, null);
  }

+  @Override
+  public Locator or(Locator locator) {
+    LocatorImpl other = (LocatorImpl) locator;
+    if (other.frame != frame)
+      throw new Error("Locators must belong to the same frame.");
+    return new LocatorImpl(frame, selector + " >> internal:or=" + gson().toJson(other.selector), null);
+  }
+
  @Override
  public Page page() {
    return frame.page();
@@ -402,6 +436,11 @@ class LocatorImpl implements Locator {
    frame.press(selector, key, convertType(options, Frame.PressOptions.class).setStrict(true));
  }

+  @Override
+  public void pressSequentially(String text, PressSequentiallyOptions options) {
+    type(text, convertType(options, TypeOptions.class));
+  }
+
  @Override
  public byte[] screenshot(ScreenshotOptions options) {
    return withElement((h, o) -> h.screenshot(o), convertType(options, ElementHandle.ScreenshotOptions.class));
@@ -5,6 +5,7 @@ import com.microsoft.playwright.options.AriaRole;

 import java.util.regex.Pattern;

+import static com.microsoft.playwright.impl.Serialization.gson;
 import static com.microsoft.playwright.impl.Utils.toJsRegexFlags;

 public class LocatorUtils {
@@ -25,10 +26,7 @@ public class LocatorUtils {
  }

  private static String getByAttributeTextSelector(String attrName, Object value, boolean exact) {
-    if (value instanceof Pattern) {
-      return "internal:attr=[" + attrName + "=" + toJsRegExp((Pattern) value) + "]";
-    }
-    return "internal:attr=[" + attrName + "=" + escapeForAttributeSelector((String) value, exact) + "]";
+    return "internal:attr=[" + attrName + "=" + escapeForAttributeSelector(value, exact) + "]";
  }

  static String getByTestIdSelector(Object testId) {
@@ -71,14 +69,7 @@ public class LocatorUtils {
      if (options.level != null)
        addAttr(result, "level", options.level.toString());
      if (options.name != null) {
-        String name;
-        if (options.name instanceof String) {
-          name = escapeForAttributeSelector((String) options.name, options.exact != null && options.exact);
-        } else if (options.name instanceof Pattern) {
-          name = toJsRegExp((Pattern) options.name);
-        } else {
-          throw new IllegalArgumentException("options.name can be String or Pattern, found: " + options.name);
-        }
+        String name = escapeForAttributeSelector(options.name, options.exact != null && options.exact);
        addAttr(result, "name", name);
      }
      if (options.pressed != null)
@@ -87,38 +78,33 @@ public class LocatorUtils {
    return result.toString();
  }

-  static String escapeForTextSelector(Object text, boolean exact) {
-    return escapeForTextSelector(text, exact, false);
+  private static String escapeRegexForSelector(Pattern re) {
+    // Even number of backslashes followed by the quote -> insert a backslash.
+    return toJsRegExp(re).replaceAll("(^|[^\\\\])(\\\\\\\\)*([\"'`])", "$1$2\\\\$3").replaceAll(">>", "\\\\>\\\\>");
  }

-  private static String escapeForTextSelector(Object param, boolean exact, boolean caseSensitive) {
-    if (param instanceof Pattern) {
-      return toJsRegExp((Pattern) param);
+  static String escapeForTextSelector(Object value, boolean exact) {
+    if (value instanceof Pattern) {
+      return escapeRegexForSelector((Pattern) value);
    }
-    if (!(param instanceof String)) {
-      throw new IllegalArgumentException("text parameter must be Pattern or String: " + param);
+    if (value instanceof String) {
+      return gson().toJson(value) + (exact ? "s" : "i");
    }
-    String text = (String) param;
-    if (exact) {
-      return '"' + text.replace("\"", "\\\"") + '"';
-    }
-
-    if (text.contains("\"") || text.contains(">>") || text.startsWith("/")) {
-      return "/" + escapeForRegex(text).replaceAll("\\s+", "\\\\s+") + "/" + (caseSensitive ? "" : "i");
-    }
-    return text;
+    throw new IllegalArgumentException("text parameter must be Pattern or String: " + value);
  }

-  private static String escapeForRegex(String text) {
-    return text.replaceAll("[.*+?^>${}()|\\[\\]\\\\]", "\\\\\\\\$0");
-  }
-
-  private static String escapeForAttributeSelector(String value, boolean exact) {
-    // TODO: this should actually be
-    //   cssEscape(value).replace(/\\ /g, ' ')
-    // However, our attribute selectors do not conform to CSS parsing spec,
-    // so we escape them differently.
-    return '"' + value.replaceAll("\\\\", "\\\\\\\\").replaceAll("\"", "\\\\\"") + '"' + (exact ? "" : "i");
+  private static String escapeForAttributeSelector(Object value, boolean exact) {
+    if (value instanceof Pattern) {
+      return escapeRegexForSelector((Pattern) value);
+    }
+    if (value instanceof String) {
+      // TODO: this should actually be
+      //   cssEscape(value).replace(/\\ /g, ' ')
+      // However, our attribute selectors do not conform to CSS parsing spec,
+      // so we escape them differently.
+      return '"' + ((String) value).replaceAll("\\\\", "\\\\\\\\").replaceAll("\"", "\\\\\"") + '"' + (exact ? "" : "i");
+    }
+    throw new IllegalArgumentException("Attribute can be String or Pattern, found: " + value);
  }

  private static String toJsRegExp(Pattern pattern) {
@@ -25,6 +25,7 @@ import com.microsoft.playwright.options.*;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.*;
+import java.util.function.BooleanSupplier;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
@@ -50,6 +51,8 @@ public class PageImpl extends ChannelOwner implements Page {
  private final Set<FrameImpl> frames = new LinkedHashSet<>();
  private static final Map<EventType, String> eventSubscriptions() {
    Map<EventType, String> result = new HashMap<>();
+    result.put(EventType.CONSOLE, "console");
+    result.put(EventType.DIALOG, "dialog");
    result.put(EventType.REQUEST, "request");
    result.put(EventType.RESPONSE, "response");
    result.put(EventType.REQUESTFINISHED, "requestFinished");
@@ -112,22 +115,7 @@ public class PageImpl extends ChannelOwner implements Page {

  @Override
  protected void handleEvent(String event, JsonObject params) {
-    if ("dialog".equals(event)) {
-      String guid = params.getAsJsonObject("dialog").get("guid").getAsString();
-      DialogImpl dialog = connection.getExistingObject(guid);
-      if (listeners.hasListeners(EventType.DIALOG)) {
-        listeners.notify(EventType.DIALOG, dialog);
-      } else {
-        if ("beforeunload".equals(dialog.type())) {
-          try {
-            dialog.accept();
-          } catch (PlaywrightException e) {
-          }
-        } else {
-          dialog.dismiss();
-        }
-      }
-    } else if ("worker".equals(event)) {
+    if ("worker".equals(event)) {
      String guid = params.getAsJsonObject("worker").get("guid").getAsString();
      WorkerImpl worker = connection.getExistingObject(guid);
      worker.page = this;
@@ -137,10 +125,6 @@ public class PageImpl extends ChannelOwner implements Page {
      String guid = params.getAsJsonObject("webSocket").get("guid").getAsString();
      WebSocketImpl webSocket = connection.getExistingObject(guid);
      listeners.notify(EventType.WEBSOCKET, webSocket);
-    } else if ("console".equals(event)) {
-      String guid = params.getAsJsonObject("message").get("guid").getAsString();
-      ConsoleMessageImpl message = connection.getExistingObject(guid);
-      listeners.notify(EventType.CONSOLE, message);
    } else if ("download".equals(event)) {
      String artifactGuid = params.getAsJsonObject("artifact").get("guid").getAsString();
      ArtifactImpl artifact = connection.getExistingObject(artifactGuid);
@@ -187,6 +171,7 @@ public class PageImpl extends ChannelOwner implements Page {
      listeners.notify(EventType.FRAMEDETACHED, frame);
    } else if ("route".equals(event)) {
      RouteImpl route = connection.getExistingObject(params.getAsJsonObject("route").get("guid").getAsString());
+      route.browserContext = browserContext;
      Router.HandleResult handled = routes.handle(route);
      if (handled != Router.HandleResult.NoMatchingHandler) {
        updateInterceptionPatterns();
@@ -198,16 +183,6 @@ public class PageImpl extends ChannelOwner implements Page {
      String artifactGuid = params.getAsJsonObject("artifact").get("guid").getAsString();
      ArtifactImpl artifact = connection.getExistingObject(artifactGuid);
      forceVideo().setArtifact(artifact);
-    } else if ("pageError".equals(event)) {
-      SerializedError error = gson().fromJson(params.getAsJsonObject("error"), SerializedError.class);
-      String errorStr = "";
-      if (error.error != null) {
-        errorStr = error.error.name + ": " + error.error.message;
-        if (error.error.stack != null && !error.error.stack.isEmpty()) {
-          errorStr += "\n" + error.error.stack;
-        }
-      }
-      listeners.notify(EventType.PAGEERROR, errorStr);
    } else if ("crash".equals(event)) {
      listeners.notify(EventType.CRASH, this);
    } else if ("close".equals(event)) {
@@ -510,19 +485,21 @@ public class PageImpl extends ChannelOwner implements Page {

  @Override
  public void close(CloseOptions options) {
-    if (isClosed) {
-      return;
+    if (options == null) {
+      options = new CloseOptions();
    }
-    JsonObject params = options == null ? new JsonObject() : gson().toJsonTree(options).getAsJsonObject();
    try {
-      sendMessage("close", params);
-    } catch (PlaywrightException exception) {
-      if (!isSafeCloseError(exception)) {
-        throw exception;
+      if (ownedContext != null) {
+        ownedContext.close();
+      } else {
+        JsonObject params = gson().toJsonTree(options).getAsJsonObject();
+        sendMessage("close", params);
      }
-    }
-    if (ownedContext != null) {
-      ownedContext.close();
+    } catch (PlaywrightException exception) {
+      if (isSafeCloseError(exception) && (options.runBeforeUnload == null || !options.runBeforeUnload)) {
+        return;
+      }
+      throw exception;
    }
  }

@@ -950,7 +927,16 @@ public class PageImpl extends ChannelOwner implements Page {
  @Override
  public void pause() {
    withLogging("Page.pause", () -> {
-      runUntil(() -> {}, new WaitableRace<>(asList(context().pause(), (Waitable<JsonElement>) waitableClosedOrCrashed)));
+      Double defaultNavigationTimeout = browserContext.timeoutSettings.defaultNavigationTimeout();
+      Double defaultTimeout = browserContext.timeoutSettings.defaultTimeout();
+      browserContext.setDefaultNavigationTimeoutImpl(0.0);
+      browserContext.setDefaultTimeoutImpl(0.0);
+      try {
+        runUntil(() -> {}, new WaitableRace<>(asList(context().pause(), (Waitable<JsonElement>) waitableClosedOrCrashed)));
+      } finally {
+        browserContext.setDefaultNavigationTimeoutImpl(defaultNavigationTimeout);
+        browserContext.setDefaultTimeoutImpl(defaultTimeout);
+      }
    });
  }

@@ -960,9 +946,6 @@ public class PageImpl extends ChannelOwner implements Page {
  }

  private byte[] pdfImpl(PdfOptions options) {
-    if (!browserContext.browser().isChromium()) {
-      throw new PlaywrightException("Page.pdf only supported in headless Chromium");
-    }
    if (options == null) {
      options = new PdfOptions();
    }
@@ -1457,6 +1440,15 @@ public class PageImpl extends ChannelOwner implements Page {
      () -> mainFrame.waitForSelectorImpl(selector, convertType(options, Frame.WaitForSelectorOptions.class)));
  }

+  @Override
+  public void waitForCondition(BooleanSupplier predicate, WaitForConditionOptions options) {
+    List<Waitable<Void>> waitables = new ArrayList<>();
+    waitables.add(createWaitForCloseHelper());
+    waitables.add(createWaitableTimeout(options == null ? null : options.timeout));
+    waitables.add(new WaitablePredicate<>(predicate));
+    runUntil(() -> {}, new WaitableRace<>(waitables));
+  }
+
  @Override
  public void waitForTimeout(double timeout) {
    withLogging("Page.waitForTimeout", () -> mainFrame.waitForTimeoutImpl(timeout));
@@ -32,6 +32,7 @@ class SerializedValue{
  String v;
  String d;
  String u;
+  String bi;
  public static class R {
    String p;
    String f;
@@ -46,6 +47,10 @@ class SerializedValue{
  Number h;
  Integer id;
  Integer ref;
+  // JS representation of Map: [[key1, value1], [key2, value2], ...].
+  SerializedValue m;
+  // JS representation of Set: [item1, item2, ...].
+  SerializedValue se;
 }

 class SerializedArgument{
@@ -78,7 +78,13 @@ public class RequestImpl extends ChannelOwner implements Request {

  @Override
  public FrameImpl frame() {
-    return connection.getExistingObject(initializer.getAsJsonObject("frame").get("guid").getAsString());
+    FrameImpl frame = connection.getExistingObject(initializer.getAsJsonObject("frame").get("guid").getAsString());
+    if (frame.page == null) {
+      throw new PlaywrightException("Frame for this navigation request is not available, because the request\n" +
+        "was issued before the frame is created. You can check whether the request\n" +
+        "is a navigation request by calling isNavigationRequest() method.");
+    }
+    return frame;
  }

  @Override
@@ -32,7 +32,7 @@ import static com.microsoft.playwright.impl.Utils.convertType;
 public class RouteImpl extends ChannelOwner implements Route {
  private final RequestImpl request;
  private boolean handled;
-
+  BrowserContextImpl browserContext;
  boolean fallbackCalled;
  boolean shouldResumeIfFallbackIsCalled;

@@ -47,6 +47,7 @@ public class RouteImpl extends ChannelOwner implements Route {
    withLogging("Route.abort", () -> {
      JsonObject params = new JsonObject();
      params.addProperty("errorCode", errorCode);
+      params.addProperty("requestUrl", request.initializer.get("url").getAsString());
      sendMessageAsync("abort", params);
    });
  }
@@ -57,9 +58,13 @@ public class RouteImpl extends ChannelOwner implements Route {

  @Override
  public void resume(ResumeOptions options) {
+    resume(options, false);
+  }
+
+  void resume(ResumeOptions options, boolean isFallback) {
    startHandling();
    applyOverrides(convertType(options, FallbackOptions.class));
-    withLogging("Route.resume", () -> resumeImpl(request().fallbackOverridesForResume()));
+    withLogging("Route.resume", () -> resumeImpl(request().fallbackOverridesForResume(), isFallback));
  }

  @Override
@@ -70,7 +75,7 @@ public class RouteImpl extends ChannelOwner implements Route {
    }
    applyOverrides(options);
    if (shouldResumeIfFallbackIsCalled) {
-      resume();
+      resume(null, true);
    }
  }

@@ -91,11 +96,14 @@ public class RouteImpl extends ChannelOwner implements Route {
    } else {
      options.data = request.postDataBuffer();
    }
-    APIRequestContextImpl apiRequest = request.frame().page().context().request();
+    if (fetchOptions != null && fetchOptions.timeout != null) {
+      options.timeout = fetchOptions.timeout;
+    }
+    APIRequestContextImpl apiRequest = browserContext.request();
    String url = (fetchOptions == null || fetchOptions.url == null) ? request().url() : fetchOptions.url;
    return apiRequest.fetch(url, options);
  }
-  
+
  private void applyOverrides(FallbackOptions options) {
    if (options == null) {
      return;
@@ -110,7 +118,7 @@ public class RouteImpl extends ChannelOwner implements Route {
    request().applyFallbackOverrides(overrides);
  }

-  private void resumeImpl(RequestImpl.FallbackOverrides options) {
+  private void resumeImpl(RequestImpl.FallbackOverrides options, boolean isFallback) {
    JsonObject params = new JsonObject();
    if (options != null) {
      if (options.url != null) {
@@ -127,6 +135,8 @@ public class RouteImpl extends ChannelOwner implements Route {
        params.addProperty("postData", base64);
      }
    }
+    params.addProperty("requestUrl", request.initializer.get("url").getAsString());
+    params.addProperty("isFallback", isFallback);
    sendMessageAsync("continue", params);
  }

@@ -221,6 +231,7 @@ public class RouteImpl extends ChannelOwner implements Route {
    if (fetchResponseUid != null) {
      params.addProperty("fetchResponseUid", fetchResponseUid);
    }
+    params.addProperty("requestUrl", request.initializer.get("url").getAsString());
    sendMessageAsync("fulfill", params);
  }

@@ -28,6 +28,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.lang.reflect.Type;
+import java.math.BigInteger;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
@@ -162,6 +163,8 @@ class Serialization {
        result.d = ((LocalDateTime)value).atZone(ZoneId.systemDefault()).toInstant().toString();
      } else if (value instanceof URL) {
        result.u = ((URL)value).toString();
+      } else if (value instanceof BigInteger) {
+        result.bi = ((BigInteger)value).toString();
      } else if (value instanceof Pattern) {
        result.r = new SerializedValue.R();
        result.r.p = ((Pattern)value).pattern();
@@ -236,6 +239,9 @@ class Serialization {
        throw new PlaywrightException("Unexpected value: " + value.u, e);
      }
    }
+    if (value.bi != null) {
+      return (T) new BigInteger(value.bi);
+    }
    if (value.d != null)
      return (T)(Date.from(Instant.parse(value.d)));
    if (value.r != null)
@@ -274,6 +280,16 @@ class Serialization {
      }
      return (T) map;
    }
+    if (value.m != null) {
+      Map<?, ?> map = new LinkedHashMap<>();
+      idToValue.put(value.id, map);
+      return (T) map;
+    }
+    if (value.se != null) {
+      Map<?, ?> map = new LinkedHashMap<>();
+      idToValue.put(value.id, map);
+      return (T) map;
+    }
    throw new PlaywrightException("Unexpected result: " + gson().toJson(value));
  }

@@ -330,6 +346,11 @@ class Serialization {
  }

  static JsonArray toProtocol(Map<String, String> map) {
+    for (String value : map.values()) {
+      if (value == null) {
+        throw new PlaywrightException("Value cannot be null");
+      }
+    }
    return toNameValueArray(map);
  }

@@ -348,7 +369,11 @@ class Serialization {
    for (Map.Entry<String, ?> e : map.entrySet()) {
      JsonObject item = new JsonObject();
      item.addProperty("name", e.getKey());
-      item.add("value", gson().toJsonTree(e.getValue()));
+      if (e.getValue() instanceof FilePayload) {
+        item.add("value", gson().toJsonTree(e.getValue()));
+      } else {
+        item.addProperty("value", "" + e.getValue());
+      }
      array.add(item);
    }
    return array;
@@ -118,6 +118,7 @@ class StackTraceCollector {
      JsonObject jsonFrame = new JsonObject();
      jsonFrame.addProperty("file", sourceFile(frame));
      jsonFrame.addProperty("line", frame.getLineNumber());
+      jsonFrame.addProperty("column", 0);
      jsonFrame.addProperty("function", frame.getClassName() + "." + frame.getMethodName());
      jsonStack.add(jsonFrame);
    }
@@ -30,11 +30,18 @@ class TimeoutSettings {
    this.parent = parent;
  }

-  void setDefaultTimeout(double timeout) {
+  Double defaultTimeout() {
+    return defaultTimeout;
+  }
+  Double defaultNavigationTimeout() {
+    return defaultNavigationTimeout;
+  }
+
+  void setDefaultTimeout(Double timeout) {
    defaultTimeout = timeout;
  }

-  void setDefaultNavigationTimeout(double timeout) {
+  void setDefaultNavigationTimeout(Double timeout) {
    defaultNavigationTimeout = timeout;
  }

@@ -73,5 +80,4 @@ class TimeoutSettings {
    }
    return new WaitableTimeout<>(timeout(timeout));
  }
-
 }
@@ -18,7 +18,6 @@ package com.microsoft.playwright.impl;

 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
-import com.microsoft.playwright.PlaywrightException;
 import com.microsoft.playwright.Tracing;

 import java.nio.file.Path;
@@ -26,36 +25,56 @@ import java.nio.file.Path;
 import static com.microsoft.playwright.impl.Serialization.gson;

 class TracingImpl extends ChannelOwner implements Tracing {
+  private boolean includeSources;
+  private Path tracesDir;
+  private boolean isTracing;
+  private String stacksId;
+
+
  TracingImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
    super(parent, type, guid, initializer);
  }

  private void stopChunkImpl(Path path) {
-    JsonObject params = new JsonObject();
-    String mode = "doNotSave";
-    if (path != null) {
-      if (connection.isRemote) {
-        mode = "compressTrace";
-      } else {
-        mode = "compressTraceAndSources";
-      }
+    if (isTracing) {
+      isTracing = false;
+      connection.setIsTracing(false);
    }
-    params.addProperty("mode", mode);
+    JsonObject params = new JsonObject();
+
+    // Not interested in artifacts.
+    if (path == null) {
+      params.addProperty("mode", "discard");
+      sendMessage("tracingStopChunk", params);
+      if (stacksId != null) {
+        connection.localUtils().traceDiscarded(stacksId);
+      }
+      return;
+    }
+
+    boolean isLocal = !connection.isRemote;
+    if (isLocal) {
+      params.addProperty("mode", "entries");
+      JsonObject json = sendMessage("tracingStopChunk", params).getAsJsonObject();
+      JsonArray entries = json.getAsJsonArray("entries");
+      connection.localUtils.zip(path, entries, stacksId, false, includeSources);
+      return;
+    }
+
+    params.addProperty("mode", "archive");
    JsonObject json = sendMessage("tracingStopChunk", params).getAsJsonObject();
+    // The artifact may be missing if the browser closed while stopping tracing.
    if (!json.has("artifact")) {
+      if (stacksId != null) {
+        connection.localUtils().traceDiscarded(stacksId);
+      }
      return;
    }
    ArtifactImpl artifact = connection.getExistingObject(json.getAsJsonObject("artifact").get("guid").getAsString());
    artifact.saveAs(path);
    artifact.delete();

-    // Add local sources to the remote trace if necessary.
-    // In case of CDP connection since the connection is established by
-    // the driver it is safe to consider the artifact local.
-    if (connection.isRemote && json.has("sourceEntries")) {
-      JsonArray entries = json.getAsJsonArray("sourceEntries");
-      connection.localUtils.zip(path, entries);
-    }
+    connection.localUtils.zip(path, new JsonArray(), stacksId, true, includeSources);
  }

  @Override
@@ -74,8 +93,27 @@ class TracingImpl extends ChannelOwner implements Tracing {
    if (options == null) {
      options = new StartChunkOptions();
    }
-    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    sendMessage("tracingStartChunk", params);
+    tracingStartChunk(options.name, options.title);
+  }
+
+  private void tracingStartChunk(String name, String title) {
+    JsonObject params = new JsonObject();
+    if (name != null) {
+      params.addProperty("name", name);
+    }
+    if (title != null) {
+      params.addProperty("title", title);
+    }
+    JsonObject result = sendMessage("tracingStartChunk", params).getAsJsonObject();
+    startCollectingStacks(result.get("traceName").getAsString());
+  }
+
+  private void startCollectingStacks(String traceName) {
+    if (!isTracing) {
+      isTracing = true;
+      connection.setIsTracing(true);
+    }
+    stacksId = connection.localUtils().tracingStarted(tracesDir == null ? null : tracesDir.toString(), traceName);
  }

  private void startImpl(StartOptions options) {
@@ -83,15 +121,12 @@ class TracingImpl extends ChannelOwner implements Tracing {
      options = new StartOptions();
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    boolean includeSources = options.sources != null && options.sources;
+    includeSources = options.sources != null && options.sources;
    if (includeSources) {
-      if (!connection.isCollectingStacks()) {
-        throw new PlaywrightException("Source root directory must be specified via PLAYWRIGHT_JAVA_SRC environment variable when source collection is enabled");
-      }
      params.addProperty("sources", true);
    }
    sendMessage("tracingStart", params);
-    sendMessage("tracingStartChunk");
+    tracingStartChunk(options.name, options.title);
  }

  @Override
@@ -108,4 +143,8 @@ class TracingImpl extends ChannelOwner implements Tracing {
      stopChunkImpl(options == null ? null : options.path);
    });
  }
+
+  void setTracesDir(Path tracesDir) {
+    this.tracesDir = tracesDir;
+  }
 }
@@ -90,6 +90,11 @@ class UrlMatcher {
    if (this == o) return true;
    if (o == null || getClass() != o.getClass()) return false;
    UrlMatcher that = (UrlMatcher) o;
+    if (rawSource instanceof Pattern && that.rawSource instanceof Pattern) {
+      Pattern a = (Pattern) rawSource;
+      Pattern b = (Pattern) that.rawSource;
+      return a.pattern().equals(b.pattern()) && a.flags() == b.flags();
+    }
    return Objects.equals(rawSource, that.rawSource);
  }

@@ -18,6 +18,7 @@ package com.microsoft.playwright.impl;

 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
+import com.microsoft.playwright.ElementHandle;
 import com.microsoft.playwright.PlaywrightException;
 import com.microsoft.playwright.options.FilePayload;
 import com.microsoft.playwright.options.HttpHeader;
@@ -80,7 +81,16 @@ class Utils {
    }
  }

-  static Set<Character> escapeGlobChars = new HashSet<>(Arrays.asList('/', '$', '^', '+', '.', '(', ')', '=', '!', '|'));
+  static <T> T clone(T f) {
+    if (f == null) {
+      return f;
+    }
+    return convertType(f, (Class<T>) f.getClass());
+  }
+
+
+  // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_expressions#escaping
+  static Set<Character> escapeGlobChars = new HashSet<>(Arrays.asList('$', '^', '+', '.', '*', '(', ')', '|', '\\', '?', '{', '}', '[', ']'));

  static String globToRegex(String glob) {
    StringBuilder tokens = new StringBuilder();
@@ -88,8 +98,12 @@ class Utils {
    boolean inGroup = false;
    for (int i = 0; i < glob.length(); ++i) {
      char c = glob.charAt(i);
-      if (escapeGlobChars.contains(c)) {
-        tokens.append("\\").append(c);
+      if (c == '\\' && i + 1 < glob.length()) {
+        char nextChar = glob.charAt(++i);
+        if (escapeGlobChars.contains(nextChar)) {
+          tokens.append('\\');
+        }
+        tokens.append(nextChar);
        continue;
      }
      if (c == '*') {
@@ -114,6 +128,12 @@ class Utils {
        case '?':
          tokens.append('.');
          break;
+        case '[':
+          tokens.append('[');
+          break;
+        case ']':
+          tokens.append(']');
+          break;
        case '{':
          inGroup = true;
          tokens.append('(');
@@ -130,7 +150,11 @@ class Utils {
          tokens.append("\\").append(c);
          break;
        default:
+          if (escapeGlobChars.contains(c)) {
+            tokens.append('\\');
+          }
          tokens.append(c);
+          break;
      }
    }
    tokens.append('$');
@@ -150,19 +174,18 @@ class Utils {
    return mimeType;
  }

-  static final int maxUplodBufferSize = 50 * 1024 * 1024;
+  static final long maxUploadBufferSize = 50 * 1024 * 1024;

  static boolean hasLargeFile(Path[] files) {
+    long totalSize = 0;
    for (Path file: files) {
      try {
-        if (Files.size(file)> maxUplodBufferSize) {
-          return true;
-        }
+        totalSize += Files.size(file);
      } catch (IOException e) {
        throw new PlaywrightException("Cannot get file size.", e);
      }
    }
-    return false;
+    return totalSize > maxUploadBufferSize;
  }

  static void addLargeFileUploadParams(Path[] files, JsonObject params, BrowserContextImpl context) {
@@ -193,10 +216,12 @@ class Utils {
  }

  static void checkFilePayloadSize(FilePayload[] files) {
+    long totalSize = 0;
    for (FilePayload file: files) {
-      if (file.buffer.length > maxUplodBufferSize) {
-        throw new PlaywrightException("Cannot set buffer larger than 50Mb, please write it to a file and pass its path instead.");
-      }
+      totalSize += file.buffer.length;
+    }
+    if (totalSize > maxUploadBufferSize) {
+      throw new PlaywrightException("Cannot set buffer larger than 50Mb, please write it to a file and pass its path instead.");
    }
  }

@@ -243,7 +268,7 @@ class Utils {
  static void writeToFile(InputStream inputStream, Path path) {
    mkParentDirs(path);
    try (FileOutputStream out = new FileOutputStream(path.toFile())) {
-      byte[] buf = new byte[8192];
+      byte[] buf = new byte[1024 * 1024];
      int length;
      while ((length = inputStream.read(buf)) > 0) {
        out.write(buf, 0, length);
@@ -0,0 +1,25 @@
+package com.microsoft.playwright.impl;
+
+import java.util.function.BooleanSupplier;
+
+class WaitablePredicate<T> implements Waitable<T> {
+  private final BooleanSupplier predicate;
+
+  WaitablePredicate(BooleanSupplier predicate) {
+    this.predicate = predicate;
+  }
+
+  @Override
+  public boolean isDone() {
+    return predicate.getAsBoolean();
+  }
+
+  @Override
+  public T get() {
+    return null;
+  }
+
+  @Override
+  public void dispose() {
+  }
+}
@@ -0,0 +1,23 @@
+package com.microsoft.playwright.impl;
+
+import com.microsoft.playwright.WebError;
+
+public class WebErrorImpl implements WebError {
+  private final PageImpl page;
+  private final String error;
+
+  WebErrorImpl(PageImpl page, String error) {
+    this.page = page;
+    this.error = error;
+  }
+
+  @Override
+  public PageImpl page() {
+    return page;
+  }
+
+  @Override
+  public String error() {
+    return error;
+  }
+}
@@ -19,9 +19,20 @@ package com.microsoft.playwright.options;
 public class HttpCredentials {
  public String username;
  public String password;
+  /**
+   * Restrain sending http credentials on specific origin (scheme://host:port).
+   */
+  public String origin;

  public HttpCredentials(String username, String password) {
    this.username = username;
    this.password = password;
  }
+  /**
+   * Restrain sending http credentials on specific origin (scheme://host:port).
+   */
+  public HttpCredentials setOrigin(String origin) {
+    this.origin = origin;
+    return this;
+  }
 }
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.options;
+
+public enum RouteFromHarUpdateContentPolicy {
+  EMBED,
+  ATTACH
+}
@@ -52,8 +52,8 @@ public class Timing {
   */
  public double requestStart;
  /**
-   * Time immediately after the browser starts requesting the resource from the server, cache, or local resource. The value
-   * is given in milliseconds relative to {@code startTime}, -1 if not available.
+   * Time immediately after the browser receives the first byte of the response from the server, cache, or local resource.
+   * The value is given in milliseconds relative to {@code startTime}, -1 if not available.
   */
  public double responseStart;
  /**
@@ -20,10 +20,17 @@ import org.junit.jupiter.api.*;

 import com.microsoft.playwright.options.SameSiteAttribute;

+import javax.sql.rowset.Predicate;
 import java.io.IOException;
+import java.security.Provider;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.function.BooleanSupplier;
+import java.util.function.Supplier;

 import static com.microsoft.playwright.Utils.getBrowserNameFromEnv;
 import static com.microsoft.playwright.Utils.nextFreePort;
+import static org.junit.jupiter.api.Assertions.assertTrue;

@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestBase {
@@ -150,6 +157,13 @@ public class TestBase {
    }
  }

+  void waitForCondition(BooleanSupplier predicate) {
+    waitForCondition(predicate, 5_000);
+  }
+  void waitForCondition(BooleanSupplier predicate, int timeoutMs) {
+    page.waitForCondition(predicate, new Page.WaitForConditionOptions().setTimeout(timeoutMs));
+  }
+
  private static SameSiteAttribute initSameSiteAttribute() {
    if (isChromium()) return SameSiteAttribute.LAX;
    if (isWebKit()) return SameSiteAttribute.NONE;
@@ -16,10 +16,14 @@

 package com.microsoft.playwright;

+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
 import com.microsoft.playwright.options.BrowserChannel;
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;

+import java.util.concurrent.atomic.AtomicReference;
 import java.util.regex.Pattern;

 import static org.junit.jupiter.api.Assertions.*;
@@ -98,4 +102,29 @@ public class TestBrowser extends TestBase {
  void shouldReturnBrowserType() {
    assertEquals(browserType, browser.browserType());
  }
+
+  @Test
+  @EnabledIf(value = "com.microsoft.playwright.TestBase#isChromium", disabledReason = "Chrome Devtools Protocol supported by chromium only")
+  void shouldWorkWithNewBrowserCDPSession() {
+    CDPSession session = browser.newBrowserCDPSession();
+
+    JsonElement response = session.send("Browser.getVersion");
+    assertNotNull(response.getAsJsonObject().get("userAgent").toString());
+
+    AtomicReference<Boolean> gotEvent = new AtomicReference<>(false);
+
+    session.on("Target.targetCreated", jsonElement -> {
+      gotEvent.set(true);
+    });
+
+    JsonObject params = new JsonObject();
+    params.addProperty("discover", true);
+    session.send("Target.setDiscoverTargets", params);
+
+    Page page = browser.newPage();
+    assertTrue(gotEvent.get());
+    page.close();
+
+    session.detach();
+  }
 }
@@ -20,9 +20,11 @@ import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;

 import java.io.OutputStreamWriter;
+import java.util.ArrayList;
 import java.util.List;

 import static com.microsoft.playwright.Utils.verifyViewport;
+import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.*;

 public class TestBrowserContextBasic extends TestBase {
@@ -253,4 +255,33 @@ public class TestBrowserContextBasic extends TestBase {
    assertEquals(true, page.evaluate("() => window.navigator.onLine"));
    context.close();
  }
+
+  @Test
+  void shouldWaitForCondition() {
+    List<String> messages = new ArrayList<>();
+    page.onConsoleMessage(m -> messages.add(m.text()));
+    page.evaluate("setTimeout(() => {\n" +
+      "  console.log('foo');\n" +
+      "  console.log('bar');\n" +
+      "}, 100);");
+    context.waitForCondition(() -> messages.size() > 1);
+    assertEquals(asList("foo", "bar"), messages);
+  }
+
+  @Test
+  void waitForConditionTimeout() {
+    PlaywrightException e = assertThrows(PlaywrightException.class,
+      () -> context.waitForCondition(() -> false, new BrowserContext.WaitForConditionOptions().setTimeout(100)));
+    assertTrue(e.getMessage().contains("Timeout"), e.getMessage());
+  }
+  @Test
+  void waitForConditionPageClosed() {
+    PlaywrightException e = assertThrows(PlaywrightException.class,
+      () -> context.waitForCondition(() -> {
+        context.close();
+        return false;
+      }));
+    assertTrue(e.getMessage().contains("Context closed"), e.getMessage());
+  }
+
 }
@@ -0,0 +1,165 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+@EnabledIf(value = "com.microsoft.playwright.TestBase#isChromium", disabledReason = "Chrome Devtools Protocol supported by chromium only")
+public class TestBrowserContextCDPSession extends TestBase {
+
+  @Test
+  void shouldWork() {
+    CDPSession cdpSession = page.context().newCDPSession(page);
+    cdpSession.send("Runtime.enable");
+
+    JsonObject params = new JsonObject();
+    params.addProperty("expression", "window.foo = 'bar'");
+    cdpSession.send("Runtime.evaluate", params);
+
+    Object foo = page.evaluate("window['foo']");
+    assertEquals("bar", foo);
+  }
+
+  @Test
+  void shouldSendEvents() {
+    CDPSession cdpSession = page.context().newCDPSession(page);
+    cdpSession.send("Network.enable");
+
+    List<JsonElement> events = new ArrayList<>();
+    cdpSession.on("Network.requestWillBeSent", events::add);
+    page.navigate(server.EMPTY_PAGE);
+
+    assertEquals(1, events.size());
+  }
+
+  @Test
+  void shouldDetachSession() {
+    CDPSession cdpSession = page.context().newCDPSession(page);
+    cdpSession.send("Runtime.enable");
+
+    JsonObject params = new JsonObject();
+    params.addProperty("expression", "1 + 2");
+    params.addProperty("returnByValue", true);
+
+    JsonElement evaluateResult = cdpSession.send("Runtime.evaluate", params);
+    assertEquals(3, evaluateResult.getAsJsonObject().getAsJsonObject("result").get("value").getAsInt());
+
+    cdpSession.detach();
+
+    PlaywrightException exception = assertThrows(PlaywrightException.class, () -> {
+      cdpSession.send("Runtime.evaluate", params);
+    });
+    assertTrue(exception.getMessage().contains("Target page, context or browser has been closed"));
+  }
+
+  @Test
+  void shouldThrowNiceErrors() {
+    CDPSession cdpSession = page.context().newCDPSession(page);
+
+    PlaywrightException exception = assertThrows(PlaywrightException.class, () -> {
+      cdpSession.send("ThisCommand.DoesNotExist");
+    });
+    assertTrue(exception.getMessage().contains("'ThisCommand.DoesNotExist' wasn't found"));
+  }
+
+  @Test
+  void shouldWorkWithMainFrame() {
+    CDPSession cdpSession = page.context().newCDPSession(page.mainFrame());
+    JsonObject params = new JsonObject();
+    params.addProperty("expression", "window.foo = 'bar'");
+    cdpSession.send("Runtime.evaluate", params);
+
+    Object foo = page.evaluate("window['foo']");
+    assertEquals("bar", foo);
+  }
+
+  @Test
+  void shouldThrowIfTargetIsPartOfMain() {
+    page.navigate(server.PREFIX + "/frames/one-frame.html");
+    assertEquals(server.PREFIX + "/frames/one-frame.html", page.frames().get(0).url());
+    assertEquals(server.PREFIX + "/frames/frame.html", page.frames().get(1).url());
+
+    PlaywrightException exception = assertThrows(PlaywrightException.class, () -> {
+      page.context().newCDPSession(page.frames().get(1));
+    });
+    assertTrue(exception.getMessage().contains("This frame does not have a separate CDP session, it is a part of the parent frame's session"));
+  }
+
+  @Test
+  void shouldNotBreakPageClose() {
+    BrowserContext context = browser.newContext();
+    Page page = context.newPage();
+    CDPSession session = page.context().newCDPSession(page);
+    session.detach();
+    page.close();
+    context.close();
+  }
+
+  @Test
+  void shouldDetachWhenPageCloses() {
+    BrowserContext context = browser.newContext();
+    Page page = context.newPage();
+    CDPSession session = page.context().newCDPSession(page);
+    page.close();
+
+    PlaywrightException exception = assertThrows(PlaywrightException.class, session::detach);
+    assertTrue(exception.getMessage().contains("Target page, context or browser has been closed"));
+    context.close();
+  }
+
+  @Test
+  void shouldAddMultipleEventListeners() {
+    CDPSession cdpSession = page.context().newCDPSession(page);
+    cdpSession.send("Network.enable");
+
+    List<JsonObject> events = new ArrayList<>();
+    cdpSession.on("Network.requestWillBeSent", events::add);
+    cdpSession.on("Network.requestWillBeSent", events::add);
+
+    page.navigate(server.EMPTY_PAGE);
+    assertEquals(2, events.size());
+  }
+
+  @Test
+  void shouldRemoveEventListeners() {
+    CDPSession cdpSession = page.context().newCDPSession(page);
+    cdpSession.send("Network.enable");
+
+    List<JsonObject> events = new ArrayList<>();
+    Consumer<JsonObject> listener1 = events::add;
+    cdpSession.on("Network.requestWillBeSent", listener1);
+    cdpSession.on("Network.requestWillBeSent", events::add);
+
+    page.navigate(server.EMPTY_PAGE);
+    assertEquals(2, events.size());
+
+    cdpSession.off("Network.requestWillBeSent", listener1);
+    events.clear();
+
+    page.navigate(server.EMPTY_PAGE);
+    assertEquals(1, events.size());
+  }
+}
@@ -16,6 +16,7 @@

 package com.microsoft.playwright;

+import com.microsoft.playwright.options.HttpCredentials;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledIf;

@@ -74,4 +75,66 @@ public class TestBrowserContextCredentials extends TestBase {
      assertTrue(new String(response.body()).contains("Playground"));
    }
  }
+
+  @Test
+  void shouldWorkWithCorrectCredentialsAndMatchingOrigin() {
+    server.setAuth("/empty.html", "user", "pass");
+    final HttpCredentials httpCredentials = new HttpCredentials("user", "pass");
+    httpCredentials.setOrigin(server.PREFIX);
+    try (BrowserContext context = browser.newContext(new Browser.NewContextOptions()
+      .setHttpCredentials(httpCredentials))) {
+      Page page = context.newPage();
+      Response response = page.navigate(server.EMPTY_PAGE);
+      assertEquals(200, response.status());
+    }
+  }
+
+  @Test
+  void shouldWorkWithCorrectCredentialsAndMatchingOriginCaseInsensitive() {
+    server.setAuth("/empty.html", "user", "pass");
+    final HttpCredentials httpCredentials = new HttpCredentials("user", "pass");
+    httpCredentials.setOrigin(server.PREFIX.toUpperCase());
+    try (BrowserContext context = browser.newContext(new Browser.NewContextOptions()
+      .setHttpCredentials(httpCredentials))) {
+      Page page = context.newPage();
+      Response response = page.navigate(server.EMPTY_PAGE);
+      assertEquals(200, response.status());
+    }
+  }
+
+  @Test
+  void shouldFailWithCorrectCredentialsAndWrongOriginScheme() {
+    server.setAuth("/empty.html", "user", "pass");
+    final HttpCredentials httpCredentials = new HttpCredentials("user", "pass");
+    httpCredentials.setOrigin(Utils.generateDifferentOriginScheme(server));
+    try (BrowserContext context = browser.newContext(new Browser.NewContextOptions().setHttpCredentials(httpCredentials))) {
+      Page page = context.newPage();
+      Response response = page.navigate(server.EMPTY_PAGE);
+      assertEquals(401, response.status());
+    }
+  }
+
+  @Test
+  void shouldFailWithCorrectCredentialsAndWrongOriginHostname() {
+    server.setAuth("/empty.html", "user", "pass");
+    final HttpCredentials httpCredentials = new HttpCredentials("user", "pass");
+    httpCredentials.setOrigin(Utils.generateDifferentOriginHostname(server));
+    try (BrowserContext context = browser.newContext(new Browser.NewContextOptions().setHttpCredentials(httpCredentials))) {
+      Page page = context.newPage();
+      Response response = page.navigate(server.EMPTY_PAGE);
+      assertEquals(401, response.status());
+    }
+  }
+
+  @Test
+  void shouldFailWithCorrectCredentialsAndWrongOriginPort() {
+    server.setAuth("/empty.html", "user", "pass");
+    final HttpCredentials httpCredentials = new HttpCredentials("user", "pass");
+    httpCredentials.setOrigin(Utils.generateDifferentOriginPort(server));
+    try (BrowserContext context = browser.newContext(new Browser.NewContextOptions().setHttpCredentials(httpCredentials))) {
+      Page page = context.newPage();
+      Response response = page.navigate(server.EMPTY_PAGE);
+      assertEquals(401, response.status());
+    }
+  }
 }
@@ -0,0 +1,173 @@
+package com.microsoft.playwright;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIf;
+
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class TestBrowserContextEvents extends TestBase {
+  @Test
+  void consoleEventShouldWorkSmoke() {
+    ConsoleMessage message = context.waitForConsoleMessage(() -> {
+      page.evaluate("console.log('hello')");
+    });
+    assertEquals("hello", message.text());
+    assertEquals(page, message.page());
+  }
+
+  @Test
+  void consoleEventShouldWorkInPopup() {
+    Page[] popup = { null };
+    ConsoleMessage message = context.waitForConsoleMessage(() -> {
+      popup[0] = page.waitForPopup(() -> {
+        page.evaluate("const win = window.open('');\n" +
+          "win.console.log('hello');\n");
+      });
+    });
+    assertEquals("hello", message.text());
+    assertEquals(popup[0], message.page());
+  }
+
+  @Test
+  @DisabledIf(value="com.microsoft.playwright.TestBase#isFirefox", disabledReason="console message from javascript: url is not reported at all")
+  void consoleEventShouldWorkInPopup2() {
+    Page[] popup = { null };
+    ConsoleMessage message = context.waitForConsoleMessage(
+      new BrowserContext.WaitForConsoleMessageOptions().setPredicate(msg -> "log".equals(msg.type())),
+      () -> {
+        popup[0] = context.waitForPage(() -> {
+          page.evaluate("async () => {\n" +
+            "  const win = window.open('javascript:console.log(\"hello\")');\n" +
+            "  await new Promise(f => setTimeout(f, 0));\n" +
+            "  win.close();\n" +
+            "}");
+        });
+      });
+    assertEquals("hello", message.text());
+    assertEquals(popup[0], message.page());
+  }
+
+  @Test
+  @DisabledIf(value="com.microsoft.playwright.TestBase#isFirefox", disabledReason="console message is not reported at all")
+  void consoleEventShouldWorkInImmediatelyClosedPopup() {
+    Page[] popup = { null };
+    ConsoleMessage message = context.waitForConsoleMessage(() -> {
+      popup[0] = page.waitForPopup(() -> {
+        page.evaluate("async () => {\n" +
+          "      const win = window.open();\n" +
+          "      win.console.log('hello');\n" +
+          "      win.close();\n" +
+          "    }\n");
+      });
+    });
+    assertEquals("hello", message.text());
+    assertEquals(popup[0], message.page());
+  }
+
+  @Test
+  void dialogEventShouldWorkSmoke() {
+    Dialog[] dialog = { null };
+    context.onDialog(d -> {
+      dialog[0] = d;
+      dialog[0].accept("hello");
+    });
+    Object result = page.evaluate("prompt('hey?')");
+    assertEquals("hello", result);
+    context.waitForCondition(() -> dialog[0] != null);
+    assertEquals("hey?", dialog[0].message());
+    assertEquals(page, dialog[0].page());
+  }
+
+  @Test
+  void dialogEventShouldWorkInPopup() {
+    Dialog[] dialog = { null };
+    context.onDialog(d -> {
+      dialog[0] = d;
+      d.accept("hello");
+    });
+    Page popup = page.waitForPopup(() -> {
+      Object result = page.evaluate("() => {\n" +
+        "    const win = window.open('');\n" +
+        "    return win.prompt('hey?');\n" +
+        "  }");
+      assertEquals("hello", result);
+    });
+    assertEquals("hey?", dialog[0].message());
+    assertEquals(popup, dialog[0].page());
+  }
+
+  @Test
+  @DisabledIf(value="com.microsoft.playwright.TestBase#isFirefox", disabledReason="dialog from javascript: url is not reported at all")
+  void dialogEventShouldWorkInPopup2() {
+    Dialog[] dialog = { null };
+    context.onDialog(d -> {
+      dialog[0] = d;
+      d.accept("hello");
+    });
+    page.evaluate("window.open('javascript:prompt(\"hey?\")');");
+    context.waitForCondition(() -> dialog[0] != null);
+    assertEquals("hey?", dialog[0].message());
+    assertEquals(null, dialog[0].page());
+  }
+
+  @Test
+  void dialogEventShouldWorkInImmdiatelyClosedPopup() {
+    Dialog[] dialog = { null };
+    context.onDialog(d -> {
+      dialog[0] = d;
+      d.accept("hello");
+    });
+    Page popup = page.waitForPopup(() -> {
+      Object result = page.evaluate("async () => {\n" +
+        "    const win = window.open();\n" +
+        "    const result = win.prompt('hey?');\n" +
+        "    win.close();\n" +
+        "    return result;\n" +
+        "  }");
+      assertEquals("hello", result);
+    });
+    assertEquals("hey?", dialog[0].message());
+    assertEquals(popup, dialog[0].page());
+  }
+
+  @Test
+  void dialogEventShouldWorkWithInlineScriptTag() {
+    server.setRoute("/popup.html", exchange -> {
+      exchange.getResponseHeaders().add("content-type", "text/html");
+      exchange.sendResponseHeaders(200, 0);
+      try (Writer writer = new OutputStreamWriter(exchange.getResponseBody())) {
+        writer.write("<script>window.result = prompt('hey?')</script>");
+      }
+    });
+    page.navigate(server.EMPTY_PAGE);
+    page.setContent("<a href='popup.html' target=_blank>Click me</a>");
+    Dialog[] dialog = { null };
+    context.onDialog(d -> {
+      dialog[0] = d;
+      d.accept("hello");
+    });
+    Page popup = context.waitForPage(() -> page.click("a"));
+    page.waitForCondition(() -> dialog[0] != null);
+    assertEquals("hey?", dialog[0].message());
+    assertEquals(popup, dialog[0].page());
+    page.waitForCondition(() -> "hello".equals(popup.evaluate("window.result")),
+      new Page.WaitForConditionOptions().setTimeout(5_000));
+  }
+
+  @Test
+  void pageErrorEventShouldWork() {
+    WebError[] webError = { null };
+    context.onWebError(e -> {
+      webError[0] = e;
+    });
+    page.setContent("<script>throw new Error('boom')</script>");
+    waitForCondition(() -> webError[0] != null);
+    assertEquals(page, webError[0].page());
+    assertTrue(webError[0].error().contains("boom"), webError[0].error());
+  }
+
+}
@@ -511,14 +511,18 @@ public class TestBrowserContextFetch extends TestBase {
      FormData.create()
        .set("firstName", "John")
        .set("lastName", "Doe")
+        .set("age", 30)
+        .set("isMale", true)
        .set("file", "f.js")));

    assertEquals("POST", req.get().method);
    assertEquals(asList("application/x-www-form-urlencoded"), req.get().headers.get("content-type"));
    String body = new String(req.get().postBody);
-    assertTrue(body.contains("firstName=John"));
-    assertTrue(body.contains("lastName=Doe"));
-    assertTrue(body.contains("file=f.js"));
+    assertTrue(body.contains("firstName=John"), body);
+    assertTrue(body.contains("lastName=Doe"), body);
+    assertTrue(body.contains("age=30"), body);
+    assertTrue(body.contains("isMale=true"), body);
+    assertTrue(body.contains("file=f.js"), body);
  }

  @Test
@@ -526,6 +530,8 @@ public class TestBrowserContextFetch extends TestBase {
    Map<String, Object> data = mapOf(
      "firstName", "John",
      "lastName", "Doe",
+      "age", 30,
+      "isMale", true,
      "file", mapOf("name", "f.js")
    );
    Future<Server.Request> req = server.futureRequest("/empty.html");
@@ -671,4 +677,67 @@ public class TestBrowserContextFetch extends TestBase {
    e = assertThrows(PlaywrightException.class, () ->  context.request().post(server.EMPTY_PAGE));
    assertTrue(e.getMessage().contains("Target page, context or browser has been closed"), e.getMessage());
  }
+
+  @Test
+  void shouldWorkWithSetHTTPCredentialsAndMatchingOrigin() throws ExecutionException, InterruptedException {
+    server.setAuth("/empty.html", "user", "pass");
+    APIResponse response1 = context.request().get(server.EMPTY_PAGE);
+    assertEquals(401, response1.status());
+
+    final HttpCredentials httpCredentials = new HttpCredentials("user", "pass");
+    httpCredentials.setOrigin(server.PREFIX);
+    try (BrowserContext context2 = browser.newContext(
+      new Browser.NewContextOptions().setHttpCredentials(httpCredentials))) {
+      APIResponse response2 = context2.request().get(server.EMPTY_PAGE);
+      assertEquals(200, response2.status());
+    }
+  }
+
+  @Test
+  void shouldWorkWithSetHTTPCredentialsAndMatchingOriginCaseInsensitive() throws ExecutionException, InterruptedException {
+    server.setAuth("/empty.html", "user", "pass");
+    APIResponse response1 = context.request().get(server.EMPTY_PAGE);
+    assertEquals(401, response1.status());
+
+    final HttpCredentials httpCredentials = new HttpCredentials("user", "pass");
+    httpCredentials.setOrigin(server.PREFIX.toUpperCase());
+    try (BrowserContext context2 = browser.newContext(
+      new Browser.NewContextOptions().setHttpCredentials(httpCredentials))) {
+      APIResponse response2 = context2.request().get(server.EMPTY_PAGE);
+      assertEquals(200, response2.status());
+    }
+  }
+
+  @Test
+  void shouldReturnErrorWithCorrectCredentialsAndWrongOriginScheme() {
+    server.setAuth("/empty.html", "user", "pass");
+    final HttpCredentials httpCredentials = new HttpCredentials("user", "pass");
+    httpCredentials.setOrigin(Utils.generateDifferentOriginScheme(server));
+    try (BrowserContext context = browser.newContext(new Browser.NewContextOptions().setHttpCredentials(httpCredentials))) {
+      APIResponse response = context.request().get(server.EMPTY_PAGE);
+      assertEquals(401, response.status());
+    }
+  }
+
+  @Test
+  void shouldReturnErrorWithCorrectCredentialsAndWrongOriginHostname() {
+    server.setAuth("/empty.html", "user", "pass");
+    final HttpCredentials httpCredentials = new HttpCredentials("user", "pass");
+    httpCredentials.setOrigin(Utils.generateDifferentOriginHostname(server));
+    try (BrowserContext context = browser.newContext(new Browser.NewContextOptions().setHttpCredentials(httpCredentials))) {
+      APIResponse response = context.request().get(server.EMPTY_PAGE);
+      assertEquals(401, response.status());
+    }
+  }
+
+  @Test
+  void shouldReturnErrorWithCorrectCredentialsAndWrongOriginPort() {
+    server.setAuth("/empty.html", "user", "pass");
+    final HttpCredentials httpCredentials = new HttpCredentials("user", "pass");
+    httpCredentials.setOrigin(Utils.generateDifferentOriginPort(server));
+    try (BrowserContext context = browser.newContext(new Browser.NewContextOptions().setHttpCredentials(httpCredentials))) {
+      APIResponse response = context.request().get(server.EMPTY_PAGE);
+      assertEquals(401, response.status());
+    }
+  }
 }
@@ -19,6 +19,7 @@ package com.microsoft.playwright;
 import com.microsoft.playwright.options.HarContentPolicy;
 import com.microsoft.playwright.options.HarMode;
 import com.microsoft.playwright.options.HarNotFound;
+import com.microsoft.playwright.options.RouteFromHarUpdateContentPolicy;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledIf;
 import org.junit.jupiter.api.io.TempDir;
@@ -38,6 +39,7 @@ import static com.microsoft.playwright.Utils.copy;
 import static com.microsoft.playwright.Utils.extractZip;
 import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
 import static com.microsoft.playwright.options.HarContentPolicy.ATTACH;
+import static com.microsoft.playwright.options.HarContentPolicy.EMBED;
 import static org.junit.jupiter.api.Assertions.*;

 public class TestBrowserContextHar extends TestBase {
@@ -430,6 +432,27 @@ public class TestBrowserContextHar extends TestBase {
    }
  }

+  @Test
+  void shouldUpdateHarZipForPageWithDifferentOptions(@TempDir Path tmpDir) {
+    Path harPath = tmpDir.resolve("har.zip");
+    try (BrowserContext context1 = browser.newContext()) {
+      Page page1 = context1.newPage();
+      page1.routeFromHAR(harPath, new Page.RouteFromHAROptions()
+        .setUpdate(true)
+        .setUpdateContent(RouteFromHarUpdateContentPolicy.EMBED)
+        .setUpdateMode(HarMode.FULL));
+      page1.navigate(server.PREFIX + "/one-style.html");
+    }
+
+    try (BrowserContext context2 = browser.newContext()) {
+      Page page2 = context2.newPage();
+      page2.routeFromHAR(harPath, new Page.RouteFromHAROptions().setNotFound(HarNotFound.ABORT));
+      page2.navigate(server.PREFIX + "/one-style.html");
+      assertTrue(page2.content().contains("hello, world!"));
+      assertThat(page2.locator("body")).hasCSS("background-color", "rgb(255, 192, 203)");
+    }
+  }
+
  @Test
  void shouldUpdateExtractedHarZipForPage(@TempDir Path tmpDir) {
    Path harPath = tmpDir.resolve("har.har");
@@ -349,40 +349,7 @@ public class TestBrowserTypeConnect extends TestBase {
    }
    browser.close();
  }
-
-  @Test
-  void shouldNotThrowOnContextCloseAfterDisconnect() throws InterruptedException {
-    BrowserServer remoteServer = launchBrowserServer(browserType);
-    Browser browser = browserType.connect(remoteServer.wsEndpoint);
-    BrowserContext context = browser.newContext();
-    Page page = context.newPage();
-
-    remoteServer.kill();
-    while (browser.isConnected()) {
-      try {
-        page.waitForTimeout(10);
-      } catch (PlaywrightException e) {
-      }
-    }
-    context.close();
-  }
-
-  @Test
-  void shouldNotThrowOnPageCloseAfterDisconnect() throws InterruptedException {
-    BrowserServer remoteServer = launchBrowserServer(browserType);
-    Browser browser = browserType.connect(remoteServer.wsEndpoint);
-    Page page = browser.newPage();
-
-    remoteServer.kill();
-    while (browser.isConnected()) {
-      try {
-        page.waitForTimeout(10);
-      } catch (PlaywrightException e) {
-      }
-    }
-    page.close();
-  }
-
+  
  @Test
  void shouldSaveAsVideosFromRemoteBrowser(@TempDir Path tempDir) {
    Path videosPath = tempDir.resolve("videosPath");
@@ -16,8 +16,6 @@

 package com.microsoft.playwright;

-import com.microsoft.playwright.options.AriaRole;
-import com.microsoft.playwright.options.WaitUntilState;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledIf;
 import org.junit.jupiter.api.condition.EnabledIf;
@@ -407,6 +405,12 @@ public class TestClick extends TestBase {
    assertEquals(isWebKit() ? 1910 + 8 : 1910, page.evaluate("offsetY"));
  }

+  private static void expectCloseTo(double expected, double actual) {
+    if (Math.abs(expected - actual) > 2)
+      fail("Expected: " + expected + ", received: " + actual);
+  }
+
+
  @Test
  @DisabledIf(value="com.microsoft.playwright.TestBase#isFirefox", disabledReason="skip")
  void shouldClickTheButtonWithOffsetWithPageScale() {
@@ -421,20 +425,10 @@ public class TestClick extends TestBase {
      "}");
    page.click("button", new Page.ClickOptions().setPosition(20, 10));
    assertEquals("Clicked", page.evaluate("result"));
-    // 20;10 + 8px of border in each direction
-    int expectedX = 28;
-    int expectedY = 18;
-    if (isWebKit()) {
-      // WebKit rounds up during css -> dip -> css conversion.
-      expectedX = 26;
-      expectedY = 17;
-    } else if (isChromium() && !headful) {
-      // Headless Chromium rounds down during css -> dip -> css conversion.
-      expectedX = 27;
-      expectedY = 18;
-    }
-    assertEquals(expectedX, Math.round((Integer) page.evaluate("pageX") + 0.01));
-    assertEquals(expectedY, Math.round((Integer) page.evaluate("pageY") + 0.01));
+    // Expect 20;10 + 8px of border in each direction. Allow some delta as different
+    // browsers round up or down differently during css -> dip -> css conversion.
+    expectCloseTo(28, (Integer) page.evaluate("pageX"));
+    expectCloseTo(18, (Integer) page.evaluate("pageY"));
    context.close();
  }

@@ -12,7 +12,7 @@ public class TestElementHandleSelectText extends TestBase {
    ElementHandle textarea = page.querySelector("textarea");
    textarea.evaluate("textarea => textarea.value = 'some value'");
    textarea.selectText();
-    if (isFirefox()) {
+    if (isFirefox() || isWebKit()) {
      assertEquals(0, textarea.evaluate("el => el.selectionStart"));
      assertEquals(10, textarea.evaluate("el => el.selectionEnd"));
    } else {
@@ -26,7 +26,7 @@ public class TestElementHandleSelectText extends TestBase {
    ElementHandle input = page.querySelector("input");
    input.evaluate("input => input.value = 'some value'");
    input.selectText();
-    if (isFirefox()) {
+    if (isFirefox() || isWebKit()) {
      assertEquals(0, input.evaluate("el => el.selectionStart"));
      assertEquals(10, input.evaluate("el => el.selectionEnd"));
    } else {
@@ -1,6 +1,7 @@
 package com.microsoft.playwright;

 import com.google.gson.Gson;
+import com.microsoft.playwright.options.HttpCredentials;
 import com.microsoft.playwright.options.HttpHeader;
 import com.microsoft.playwright.options.RequestOptions;
 import org.junit.jupiter.api.Disabled;
@@ -380,4 +381,97 @@ public class TestGlobalFetch extends TestBase {
    }
    request.dispose();
  }
+
+  @Test
+  void shouldNotModifyRequestMethodInOptions() {
+    APIRequestContext request = playwright.request().newContext();
+    server.setRoute("/empty.html", exchange -> {
+      exchange.getResponseHeaders().set("Content-type", "text/plain");
+      exchange.sendResponseHeaders(200, 0);
+      try (Writer writer = new OutputStreamWriter(exchange.getResponseBody())) {
+        writer.write(exchange.getRequestMethod());
+      }
+    });
+    RequestOptions options = RequestOptions.create();
+    options.setTimeout(10000);
+    {
+      APIResponse response = request.fetch(server.EMPTY_PAGE, options);
+      assertTrue(response.ok());
+      assertEquals("GET", response.text());
+    }
+    {
+      APIResponse response = request.delete(server.EMPTY_PAGE, options);
+      assertTrue(response.ok());
+      assertEquals("DELETE", response.text());
+    }
+    {
+      APIResponse response = request.put(server.EMPTY_PAGE, options);
+      assertTrue(response.ok());
+      assertEquals("PUT", response.text());
+    }
+    request.dispose();
+  }
+
+  @Test
+  void shouldSupportGlobalHttpCredentialsOptionAndMatchingOrigin() {
+    server.setAuth("/empty.html", "user", "pass");
+    APIRequestContext request1 = playwright.request().newContext();
+    APIResponse response1 = request1.get(server.EMPTY_PAGE);
+    assertEquals(401, response1.status());
+    request1.dispose();
+
+    final HttpCredentials httpCredentials = new HttpCredentials("user", "pass");
+    httpCredentials.setOrigin(server.PREFIX);
+    APIRequestContext request2 = playwright.request().newContext(new APIRequest.NewContextOptions().setHttpCredentials(httpCredentials));
+    APIResponse response2 = request2.get(server.EMPTY_PAGE);
+    assertEquals(200, response2.status());
+    request2.dispose();
+  }
+
+  @Test
+  void shouldSupportGlobalHttpCredentialsOptionAndMatchingOriginCaseInsensitive() {
+    server.setAuth("/empty.html", "user", "pass");
+    APIRequestContext request1 = playwright.request().newContext();
+    APIResponse response1 = request1.get(server.EMPTY_PAGE);
+    assertEquals(401, response1.status());
+    request1.dispose();
+
+    final HttpCredentials httpCredentials = new HttpCredentials("user", "pass");
+    httpCredentials.setOrigin(server.PREFIX.toUpperCase());
+    APIRequestContext request2 = playwright.request().newContext(new APIRequest.NewContextOptions().setHttpCredentials(httpCredentials));
+    APIResponse response2 = request2.get(server.EMPTY_PAGE);
+    assertEquals(200, response2.status());
+    request2.dispose();
+  }
+
+  @Test
+  void shouldReturnErrorWithCorrectCredentialsAndWrongOriginScheme() {
+    server.setAuth("/empty.html", "user", "pass");
+    final HttpCredentials httpCredentials = new HttpCredentials("user", "pass");
+    httpCredentials.setOrigin(Utils.generateDifferentOriginScheme(server));
+    APIRequestContext request = playwright.request().newContext(new APIRequest.NewContextOptions().setHttpCredentials(httpCredentials));
+    APIResponse response = request.get(server.EMPTY_PAGE);
+    assertEquals(401, response.status());
+  }
+
+  @Test
+  void shouldReturnErrorWithCorrectCredentialsAndWrongOriginHostname() {
+    server.setAuth("/empty.html", "user", "pass");
+    final HttpCredentials httpCredentials = new HttpCredentials("user", "pass");
+    httpCredentials.setOrigin(Utils.generateDifferentOriginHostname(server));
+    APIRequestContext request = playwright.request().newContext(new APIRequest.NewContextOptions().setHttpCredentials(httpCredentials));
+    APIResponse response = request.get(server.EMPTY_PAGE);
+    assertEquals(401, response.status());
+  }
+
+  @Test
+  void shouldReturnErrorWithCorrectCredentialsAndWrongOriginPort() {
+    server.setAuth("/empty.html", "user", "pass");
+    final HttpCredentials httpCredentials = new HttpCredentials("user", "pass");
+    httpCredentials.setOrigin(Utils.generateDifferentOriginPort(server));
+    APIRequestContext request = playwright.request().newContext(new APIRequest.NewContextOptions().setHttpCredentials(httpCredentials));
+    APIResponse response = request.get(server.EMPTY_PAGE);
+    assertEquals(401, response.status());
+  }
+
 }
@@ -673,6 +673,15 @@ public class TestLocatorAssertions extends TestBase {
    assertThat(locator).isChecked(new LocatorAssertions.IsCheckedOptions().setChecked(false));
  }

+  @Test
+  void isCheckedFalseFail() {
+    page.setContent("<input checked type=checkbox></input>");
+    Locator locator = page.locator("input");
+    AssertionFailedError error = assertThrows(AssertionFailedError.class,
+      () -> assertThat(locator).isChecked(new LocatorAssertions.IsCheckedOptions().setChecked(false).setTimeout(1000)));
+    assertTrue(error.getMessage().contains("Locator expected to be unchecked"), error.getMessage());
+  }
+
  @Test
  void isDisabledPass() {
    page.setContent("<button disabled>Text</button>");
@@ -723,6 +732,15 @@ public class TestLocatorAssertions extends TestBase {
    assertTrue(e.getMessage().contains("Locator expected to be editable"), e.getMessage());
  }

+  @Test
+  void isEditableFalseFail() {
+    page.setContent("<input></input>");
+    Locator locator = page.locator("input");
+    AssertionFailedError error = assertThrows(AssertionFailedError.class,
+      () -> assertThat(locator).isEditable(new LocatorAssertions.IsEditableOptions().setEditable(false).setTimeout(1000)));
+    assertTrue(error.getMessage().contains("Locator expected to be readonly"), error.getMessage());
+  }
+
  @Test
  void notIsEditableFail() {
    page.setContent("<input></input>");
@@ -839,6 +857,15 @@ public class TestLocatorAssertions extends TestBase {
    assertThat(locator).isEnabled(new LocatorAssertions.IsEnabledOptions().setEnabled(false));
  }

+  @Test
+  void isEnabledFalseFail() {
+    page.setContent("<button>Text</button>");
+    Locator locator = page.locator("button");
+    AssertionFailedError error = assertThrows(AssertionFailedError.class,
+      () -> assertThat(locator).isEnabled(new LocatorAssertions.IsEnabledOptions().setEnabled(false).setTimeout(1000)));
+    assertTrue(error.getMessage().contains("Locator expected to be disabled"), error.getMessage());
+  }
+
  @Test
  void isEnabledEventually() {
    page.setContent("<button disabled>Text</button>");
@@ -949,6 +976,15 @@ public class TestLocatorAssertions extends TestBase {
    assertTrue(e.getMessage().contains("Locator expected to be visible"), e.getMessage());
  }

+  @Test
+  void isVisibleFalseFail() {
+    page.setContent("<input></input>");
+    Locator locator = page.locator("input");
+    AssertionFailedError error = assertThrows(AssertionFailedError.class,
+      () -> assertThat(locator).isVisible(new LocatorAssertions.IsVisibleOptions().setVisible(false).setTimeout(1000)));
+    assertTrue(error.getMessage().contains("Locator expected to be hidden"), error.getMessage());
+  }
+
  @Test
  void notIsVisibleFail() {
    page.setContent("<input></input>");
@@ -0,0 +1,102 @@
+package com.microsoft.playwright;
+
+import com.microsoft.playwright.assertions.LocatorAssertions;
+import org.junit.jupiter.api.Test;
+import org.opentest4j.AssertionFailedError;
+
+import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
+import static org.junit.jupiter.api.Assertions.*;
+
+public class TestLocatorAssertions2 extends TestBase {
+  @Test
+  void isAttachedDefault() {
+    page.setContent("<input></input>");
+    Locator locator = page.locator("input");
+    assertThat(locator).isAttached();
+  }
+
+  @Test
+  void isAttachedWithHiddenElement() {
+    page.setContent("<button style='display:none'>hello</button>");
+    Locator locator = page.locator("button");
+    assertThat(locator).isAttached();
+  }
+
+  @Test
+  void isAttachedWithNot() {
+    page.setContent("<button>hello</button>");
+    Locator locator = page.locator("input");
+    assertThat(locator).not().isAttached();
+  }
+
+  @Test
+  void isAttachedWithAttachedTrue() {
+    page.setContent("<button>hello</button>");
+    Locator locator = page.locator("button");
+    assertThat(locator).isAttached(new LocatorAssertions.IsAttachedOptions().setAttached(true));
+  }
+
+  @Test
+  void isAttachedWithAttachedFalse() {
+    page.setContent("<button>hello</button>");
+    Locator locator = page.locator("input");
+    assertThat(locator).isAttached(new LocatorAssertions.IsAttachedOptions().setAttached(false));
+  }
+
+  @Test
+  void isAttachedWithNotAndAttachedFalse() {
+    page.setContent("<button>hello</button>");
+    Locator locator = page.locator("button");
+    assertThat(locator).not().isAttached(new LocatorAssertions.IsAttachedOptions().setAttached(false));
+  }
+
+  @Test
+  void isAttachedEventually() {
+    page.setContent("<div></div>");
+    Locator locator = page.locator("span");
+      page.evalOnSelector("div", "div => setTimeout(() => {\n" +
+        "      div.innerHTML = '<span>Hello</span>'\n" +
+        "    }, 100)");
+    assertThat(locator).isAttached();
+  }
+
+  @Test
+  void isAttachedEventuallyWithNot() {
+    page.setContent("<div><span>Hello</span></div>");
+    Locator locator = page.locator("span");
+      page.evalOnSelector("div",  "div => setTimeout(() => {\n" +
+        "      div.textContent = '';\n" +
+        "    }, 0)");
+    assertThat(locator).not().isAttached();
+  }
+
+  @Test
+  void isAttachedFail() {
+    page.setContent("<button>Hello</button>");
+    Locator locator = page.locator("input");
+    AssertionFailedError error = assertThrows(AssertionFailedError.class,
+      () -> assertThat(locator).isAttached(new LocatorAssertions.IsAttachedOptions().setTimeout(1000)));
+    assertFalse(error.getMessage().contains("locator resolved to"), error.getMessage());
+  }
+
+  @Test
+  void isAttachedFailWithNot() {
+    page.setContent("<input></input>");
+    Locator locator = page.locator("input");
+    AssertionFailedError error = assertThrows(AssertionFailedError.class,
+      () -> assertThat(locator).not().isAttached(new LocatorAssertions.IsAttachedOptions().setTimeout(1000)));
+    assertTrue(error.getMessage().contains("locator resolved to <input/>"), error.getMessage());
+  }
+
+  @Test
+  void isAttachedWithImpossibleTimeout() {
+    page.setContent("<div id=node>Text content</div>");
+    assertThat(page.locator("#node")).isAttached(new LocatorAssertions.IsAttachedOptions().setTimeout(1));
+  }
+
+  @Test
+  void isAttachedWithImpossibleTimeoutNot() {
+    page.setContent("<div id=node>Text content</div>");
+    assertThat(page.locator("no-such-thing")).not().isAttached(new LocatorAssertions.IsAttachedOptions().setTimeout(1));
+  }
+}
@@ -102,4 +102,25 @@ public class TestLocatorMisc extends TestBase{
    assertTrue(blurred[0]);
    assertEquals(false, button.evaluate("button => document.activeElement === button"));
  }
+  @Test
+  void LocatorLocatorAndFrameLocatorLocatorShouldAcceptLocator() {
+    page.setContent("<div><input value=outer></div>\n" +
+      "    <iframe srcdoc=\"<div><input value=inner></div>\"></iframe>\n");
+    Locator inputLocator = page.locator("input");
+    assertEquals("outer", inputLocator.inputValue());
+    assertEquals("outer", page.locator("div").locator(inputLocator).inputValue());
+    assertEquals("inner", page.frameLocator("iframe").locator(inputLocator).inputValue());
+    assertEquals("inner", page.frameLocator("iframe").locator("div").locator(inputLocator).inputValue());
+
+    Locator divLocator = page.locator("div");
+    assertEquals("outer", divLocator.locator("input").inputValue());
+    assertEquals("inner", page.frameLocator("iframe").locator(divLocator).locator("input").inputValue());
+  }
+
+  @Test
+  void shouldPressSequentially() {
+    page.setContent("<input type='text' />");
+    page.locator("input").pressSequentially("hello");
+    assertEquals("hello", page.evalOnSelector("input", "input => input.value"));
+  }
 }
@@ -27,6 +27,7 @@ import java.util.stream.Collectors;

 import static com.microsoft.playwright.options.LoadState.DOMCONTENTLOADED;
 import static com.microsoft.playwright.options.LoadState.LOAD;
+import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.*;

 public class TestPageBasic extends TestBase {
@@ -296,7 +297,7 @@ public class TestPageBasic extends TestBase {
  void frameFocusShouldWorkMultipleTimes() {
    Page page1 = context.newPage();
    Page page2 = context.newPage();
-    for (Page page : Arrays.asList(page1, page2)) {
+    for (Page page : asList(page1, page2)) {
      page.setContent("<button id='foo' onfocus='window.gotFocus=true'></button>");
      page.focus("#foo");
      assertEquals(true, page.evaluate("() => !!window['gotFocus']"));
@@ -309,4 +310,32 @@ public class TestPageBasic extends TestBase {
    page.dragAndDrop("#source", "#target");
    assertEquals(true, page.evalOnSelector("#target", "target => target.contains(document.querySelector('#source'))"));
  }
+
+  @Test
+  void shouldWaitForCondition() {
+    List<String> messages = new ArrayList<>();
+    page.onConsoleMessage(m -> messages.add(m.text()));
+    page.evaluate("setTimeout(() => {\n" +
+      "  console.log('foo');\n" +
+      "  console.log('bar');\n" +
+      "}, 100);");
+    page.waitForCondition(() -> messages.size() > 1);
+    assertEquals(asList("foo", "bar"), messages);
+  }
+
+  @Test
+  void waitForConditionTimeout() {
+    PlaywrightException e = assertThrows(PlaywrightException.class,
+      () -> page.waitForCondition(() -> false, new Page.WaitForConditionOptions().setTimeout(100)));
+    assertTrue(e.getMessage().contains("Timeout"), e.getMessage());
+  }
+  @Test
+  void waitForConditionPageClosed() {
+    PlaywrightException e = assertThrows(PlaywrightException.class,
+      () -> page.waitForCondition(() -> {
+        page.close();
+        return false;
+      }));
+    assertTrue(e.getMessage().contains("Page closed"), e.getMessage());
+  }
 }
@@ -19,6 +19,7 @@ package com.microsoft.playwright;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledIf;

+import java.math.BigInteger;
 import java.time.*;
 import java.util.Map;
 import java.util.regex.Pattern;
@@ -115,6 +116,12 @@ public class TestPageEvaluate extends TestBase {
    assertEquals(true, result);
  }

+  @Test
+  void shouldTransferBigint() {
+    assertEquals(new BigInteger("42", 10), page.evaluate("() => 42n"));
+    assertEquals(new BigInteger("17", 10), page.evaluate("a => a", new BigInteger("17", 10)));
+  }
+
  //  @Test
  void shouldTransferMapsAsEmptyObjects() {
    // Not applicable.
@@ -638,4 +645,14 @@ public class TestPageEvaluate extends TestBase {
    assertTrue(object instanceof Date);
    assertEquals(Date.from(instant), object);
  }
+
+  @Test
+  void shouldTransferMaps() {
+    assertEquals(mapOf(), page.evaluate("() => new Map([[1, { test: 42n }]])"));
+  }
+
+  @Test
+  void shouldTransferSets() {
+    assertEquals(mapOf(), page.evaluate("() => new Set([1, { test: 42n }])"));
+  }
 }
@@ -66,17 +66,18 @@ public class TestPageEventNetwork extends TestBase {
    assertTrue(failedRequests.get(0).url().contains("one-style.css"));
    assertNull(failedRequests.get(0).response());
    assertEquals("stylesheet", failedRequests.get(0).resourceType());
+    String error = failedRequests.get(0).failure();
    if (isChromium()) {
-      assertEquals("net::ERR_EMPTY_RESPONSE", failedRequests.get(0).failure());
+      assertEquals("net::ERR_EMPTY_RESPONSE", error);
    } else if (isWebKit()) {
      if (isMac)
-        assertEquals("The network connection was lost.", failedRequests.get(0).failure());
+        assertEquals("The network connection was lost.", error);
      else if (isWindows)
-        assertEquals("Server returned nothing (no headers, no data)", failedRequests.get(0).failure());
+        assertEquals("Server returned nothing (no headers, no data)", error);
      else
-        assertEquals("Message Corrupt", failedRequests.get(0).failure());
+        assertTrue("Message Corrupt".equals(error) || "Connection terminated unexpectedly".equals(error), error);
    } else {
-      assertEquals("NS_ERROR_NET_RESET", failedRequests.get(0).failure());
+      assertEquals("NS_ERROR_NET_RESET", error);
    }
    assertNotNull(failedRequests.get(0).frame());
  }
@@ -0,0 +1,17 @@
+package com.microsoft.playwright;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class TestPageEventPopup extends TestBase {
+  @Test
+  void shouldWorkWithClickingTarget_blank() {
+    page.navigate(server.EMPTY_PAGE);
+    page.setContent("<a target=_blank rel='opener' href='/one-style.html'>yo</a>");
+    Page popup = page.waitForPopup(() -> page.click("a"));
+    assertEquals(false, page.evaluate("() => !!window.opener"));
+    assertEquals(true, popup.evaluate("() => !!window.opener"));
+    assertEquals(popup, popup.mainFrame().page());
+  }
+}
@@ -2,6 +2,8 @@ package com.microsoft.playwright;

 import org.junit.jupiter.api.Test;

+import java.io.OutputStreamWriter;
+import java.io.Writer;
 import java.util.HashMap;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
@@ -71,6 +73,23 @@ public class TestPageInterception extends TestBase {
    assertTrue(response.headers().get("content-type").contains("text/html"));
  }

+  @Test
+  void shouldSupportTimeoutOptionInRouteFetch() {
+    server.setRoute("/slow", exchange -> {
+      exchange.getResponseHeaders().set("Content-type", "text/plain");
+      exchange.sendResponseHeaders(200, 4096);
+    });
+
+    page.route("**/*", route -> {
+      PlaywrightException error = assertThrows(PlaywrightException.class,
+        () -> route.fetch(new Route.FetchOptions().setTimeout(1000)));
+      assertTrue(error.getMessage().contains("Request timed out after 1000ms"), error.getMessage());
+    });
+    PlaywrightException error = assertThrows(PlaywrightException.class,
+      () -> page.navigate(server.PREFIX + "/slow", new Page.NavigateOptions().setTimeout(2000)));
+    assertTrue(error.getMessage().contains("Timeout 2000ms exceeded"), error.getMessage());
+  }
+
  @Test
  void shouldInterceptWithUrlOverride() {
    page.route("**/*.html", route -> {
@@ -105,4 +124,15 @@ public class TestPageInterception extends TestBase {
    page.navigate(server.PREFIX + "/foo");
    assertTrue(page.content().contains("hello"));
  }
+
+  @Test
+  void shouldProperlyHandleCharacterSetsInGlobs() {
+    page.route("**/[a-z]*.html", route -> {
+      APIResponse response = route.fetch(new Route.FetchOptions().setUrl(server.PREFIX + "/one-style.html"));
+      route.fulfill(new Route.FulfillOptions().setResponse(response));
+    });
+    Response response = page.navigate(server.PREFIX + "/empty.html");
+    assertEquals(200, response.status());
+    assertTrue(response.text().contains("one-style.css"), response.text());
+  }
 }
@@ -16,6 +16,7 @@

 package com.microsoft.playwright;

+import com.microsoft.playwright.options.AriaRole;
 import org.junit.jupiter.api.Test;

 import java.util.regex.Pattern;
@@ -106,6 +107,39 @@ public class TestPageLocatorQuery extends TestBase {
    assertEquals("Hello \"world\"", page.locator("div", new Page.LocatorOptions().setHasText(Pattern.compile("Hello \"world\""))).textContent());
  }

+  @Test
+  void shouldFilterByRegexWithASingleQuote() {
+    page.setContent("<button>let's let's<span>hello</span></button>");
+    assertThat(page.locator("button", new Page.LocatorOptions().setHasText(Pattern.compile("let's", Pattern.CASE_INSENSITIVE))).locator("span")).hasText("hello");
+    assertThat(page.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName(Pattern.compile("let's", Pattern.CASE_INSENSITIVE))).locator("span")).hasText("hello");
+    assertThat(page.locator("button", new Page.LocatorOptions().setHasText(Pattern.compile("let\'s", Pattern.CASE_INSENSITIVE))).locator("span")).hasText("hello");
+    assertThat(page.getByRole(AriaRole.BUTTON,  new Page.GetByRoleOptions().setName(Pattern.compile("let\'s", Pattern.CASE_INSENSITIVE))).locator("span")).hasText("hello");
+    assertThat(page.locator("button", new Page.LocatorOptions().setHasText(Pattern.compile("'s", Pattern.CASE_INSENSITIVE))).locator("span")).hasText("hello");
+    assertThat(page.getByRole(AriaRole.BUTTON,  new Page.GetByRoleOptions().setName(Pattern.compile("'s", Pattern.CASE_INSENSITIVE))).locator("span")).hasText("hello");
+    assertThat(page.locator("button", new Page.LocatorOptions().setHasText(Pattern.compile("\'s", Pattern.CASE_INSENSITIVE))).locator("span")).hasText("hello");
+    assertThat(page.getByRole(AriaRole.BUTTON,  new Page.GetByRoleOptions().setName(Pattern.compile("\'s", Pattern.CASE_INSENSITIVE))).locator("span")).hasText("hello");
+    assertThat(page.locator("button", new Page.LocatorOptions().setHasText(Pattern.compile("let['abc]s", Pattern.CASE_INSENSITIVE))).locator("span")).hasText("hello");
+    assertThat(page.getByRole(AriaRole.BUTTON,  new Page.GetByRoleOptions().setName(Pattern.compile("let['abc]s", Pattern.CASE_INSENSITIVE))).locator("span")).hasText("hello");
+    assertThat(page.locator("button", new Page.LocatorOptions().setHasText(Pattern.compile("let\\\\'s", Pattern.CASE_INSENSITIVE)))).not().isVisible();
+    assertThat(page.getByRole(AriaRole.BUTTON,  new Page.GetByRoleOptions().setName(Pattern.compile("let\\\\'s", Pattern.CASE_INSENSITIVE)))).not().isVisible();
+    assertThat(page.locator("button", new Page.LocatorOptions().setHasText(Pattern.compile("let's let\\'s", Pattern.CASE_INSENSITIVE))).locator("span")).hasText("hello");
+    assertThat(page.getByRole(AriaRole.BUTTON,  new Page.GetByRoleOptions().setName(Pattern.compile("let's let\\'s", Pattern.CASE_INSENSITIVE))).locator("span")).hasText("hello");
+    assertThat(page.locator("button", new Page.LocatorOptions().setHasText(Pattern.compile("let\\'s let's", Pattern.CASE_INSENSITIVE))).locator("span")).hasText("hello");
+    assertThat(page.getByRole(AriaRole.BUTTON,  new Page.GetByRoleOptions().setName(Pattern.compile("let\\'s let's", Pattern.CASE_INSENSITIVE))).locator("span")).hasText("hello");
+
+    page.setContent("<button>let\\'s let\\'s<span>hello</span></button>");
+    assertThat(page.locator("button", new Page.LocatorOptions().setHasText(Pattern.compile("let\\'s", Pattern.CASE_INSENSITIVE)))).not().isVisible();
+    assertThat(page.getByRole(AriaRole.BUTTON,  new Page.GetByRoleOptions().setName(Pattern.compile("let\\'s", Pattern.CASE_INSENSITIVE)))).not().isVisible();
+    assertThat(page.locator("button", new Page.LocatorOptions().setHasText(Pattern.compile("let\\\\'s", Pattern.CASE_INSENSITIVE))).locator("span")).hasText("hello");
+    assertThat(page.getByRole(AriaRole.BUTTON,  new Page.GetByRoleOptions().setName(Pattern.compile("let\\\\'s", Pattern.CASE_INSENSITIVE))).locator("span")).hasText("hello");
+    assertThat(page.locator("button", new Page.LocatorOptions().setHasText(Pattern.compile("let\\\\\\'s", Pattern.CASE_INSENSITIVE))).locator("span")).hasText("hello");
+    assertThat(page.getByRole(AriaRole.BUTTON,  new Page.GetByRoleOptions().setName(Pattern.compile("let\\\\\\'s", Pattern.CASE_INSENSITIVE))).locator("span")).hasText("hello");
+    assertThat(page.locator("button", new Page.LocatorOptions().setHasText(Pattern.compile("let\\\\'s let\\\\\\'s", Pattern.CASE_INSENSITIVE))).locator("span")).hasText("hello");
+    assertThat(page.getByRole(AriaRole.BUTTON,  new Page.GetByRoleOptions().setName(Pattern.compile("let\\\\'s let\\\\\\'s", Pattern.CASE_INSENSITIVE))).locator("span")).hasText("hello");
+    assertThat(page.locator("button", new Page.LocatorOptions().setHasText(Pattern.compile("let\\\\\\'s let\\\\'s", Pattern.CASE_INSENSITIVE))).locator("span")).hasText("hello");
+    assertThat(page.getByRole(AriaRole.BUTTON,  new Page.GetByRoleOptions().setName(Pattern.compile("let\\\\\\'s let\\\\'s", Pattern.CASE_INSENSITIVE))).locator("span")).hasText("hello");
+  }
+
  @Test
  void shouldFilterByRegexAndRegexpFlags() {
    page.setContent("<div>Hello \"world\"</div><div>Hello world</div>");
@@ -140,18 +174,21 @@ public class TestPageLocatorQuery extends TestBase {
      new Page.LocatorOptions().setHasText("Save & Continue")).textContent());
  }

+  private static String removeHighlight(String markup) {
+    return markup.replaceAll("\\s__playwright_target__=\"[^\"]+\"", "");
+  }
  @Test
  void shouldSupportHasLocator() {
    page.setContent("<div><span>hello</span></div><div><span>world</span></div>");
    assertThat(page.locator("div", new Page.LocatorOptions().setHas(page.locator("text=world")))).hasCount(1);
-    assertEquals("<div><span>world</span></div>", page.locator("div", new Page.LocatorOptions().setHas(page.locator("text=world"))).evaluate("e => e.outerHTML"));
+    assertEquals("<div><span>world</span></div>", removeHighlight((String) page.locator("div", new Page.LocatorOptions().setHas(page.locator("text=world"))).evaluate("e => e.outerHTML")));
    assertThat(page.locator("div", new Page.LocatorOptions().setHas(page.locator("text='hello'")))).hasCount(1);
-    assertEquals("<div><span>hello</span></div>", page.locator("div", new Page.LocatorOptions().setHas(page.locator("text='hello'"))).evaluate("e => e.outerHTML"));
+    assertEquals("<div><span>hello</span></div>", removeHighlight((String) page.locator("div", new Page.LocatorOptions().setHas(page.locator("text='hello'"))).evaluate("e => e.outerHTML")));
    assertThat(page.locator("div", new Page.LocatorOptions().setHas(page.locator("xpath=./span")))).hasCount(2);
    assertThat(page.locator("div", new Page.LocatorOptions().setHas(page.locator("span")))).hasCount(2);
    assertThat(page.locator("div", new Page.LocatorOptions().setHas(page.locator("span", new Page.LocatorOptions().setHasText("wor"))))).hasCount(1);
-    assertEquals("<div><span>world</span></div>", page.locator("div", new Page.LocatorOptions().setHas(
-      page.locator("span", new Page.LocatorOptions().setHasText("wor")))).evaluate("e => e.outerHTML"));
+    assertEquals("<div><span>world</span></div>", removeHighlight((String) page.locator("div", new Page.LocatorOptions().setHas(
+      page.locator("span", new Page.LocatorOptions().setHasText("wor")))).evaluate("e => e.outerHTML")));
    assertThat(page.locator("div", new Page.LocatorOptions()
        .setHas(page.locator("span")).setHasText("wor"))).hasCount(1);
  }
@@ -169,5 +206,56 @@ public class TestPageLocatorQuery extends TestBase {
    assertThat(page.locator("div").filter(new Locator.FilterOptions()
      .setHas(page.locator("span"))
      .setHasText("world"))).hasCount(1);
+    assertThat(page.locator("div").filter(new Locator.FilterOptions()
+      .setHasNot(page.locator("span", new Page.LocatorOptions().setHasText("world"))))).hasCount(1);
+    assertThat(page.locator("div").filter(new Locator.FilterOptions()
+      .setHasNot(page.locator("section")))).hasCount(2);
+    assertThat(page.locator("div").filter(new Locator.FilterOptions()
+      .setHasNot(page.locator("span")))).hasCount(0);
+    assertThat(page.locator("div").filter(new Locator.FilterOptions().setHasNotText("hello"))).hasCount(1);
+    assertThat(page.locator("div").filter(new Locator.FilterOptions().setHasNotText("foo"))).hasCount(2);
  }
+
+
+  @Test
+  void shouldSupportLocatorAnd() {
+    page.setContent("<div data-testid=foo>hello</div><div data-testid=bar>world</div>\n" +
+      "    <span data-testid=foo>hello2</span><span data-testid=bar>world2</span>");
+    assertThat(page.locator("div").and(page.locator("div"))).hasCount(2);
+    assertThat(page.locator("div").and(page.getByTestId("foo"))).hasText(new String[] { "hello" });
+    assertThat(page.locator("div").and(page.getByTestId("bar"))).hasText(new String[] { "world" });
+    assertThat(page.getByTestId("foo").and(page.locator("div"))).hasText(new String[] { "hello" });
+    assertThat(page.getByTestId("bar").and(page.locator("span"))).hasText(new String[] { "world2" });
+    assertThat(page.locator("span").and(page.getByTestId(Pattern.compile("bar|foo")))).hasCount(2);
+  }
+
+  @Test
+  void shouldSupportLocatorOr() {
+    page.setContent("<div>hello</div><span>world</span>");
+    assertThat(page.locator("div").or(page.locator("span"))).hasCount(2);
+    assertThat(page.locator("div").or(page.locator("span"))).hasText(new String[]{"hello", "world"});
+    assertThat(page.locator("span").or(page.locator("article")).or(page.locator("div"))).hasText(new String[]{"hello", "world"});
+    assertThat(page.locator("article").or(page.locator("someting"))).hasCount(0);
+    assertThat(page.locator("article").or(page.locator("div"))).hasText("hello");
+    assertThat(page.locator("article").or(page.locator("span"))).hasText("world");
+    assertThat(page.locator("div").or(page.locator("article"))).hasText("hello");
+    assertThat(page.locator("span").or(page.locator("article"))).hasText("world");
+  }
+
+  @Test
+  void shouldSupportLocatorLocatorWithAndOr() {
+    page.setContent("\n" +
+      "    <div>one <span>two</span> <button>three</button> </div>\n" +
+      "    <span>four</span>\n" +
+      "    <button>five</button>\n" +
+      "  ");
+
+    assertThat(page.locator("div").locator(page.locator("button"))).hasText(new String[] {"three"});
+    assertThat(page.locator("div").locator(page.locator("button").or(page.locator("span")))).hasText(new String[]{"two", "three"});
+    assertThat(page.locator("button").or(page.locator("span"))).hasText(new String[]{"two", "three", "four", "five"});
+
+    assertThat(page.locator("div").locator(page.locator("button").and(page.getByRole(AriaRole.BUTTON)))).hasText(new String[]{"three"});
+    assertThat(page.locator("button").and(page.getByRole(AriaRole.BUTTON))).hasText(new String[]{"three", "five"});
+  }
+
 }
@@ -21,6 +21,8 @@ import com.microsoft.playwright.options.HttpHeader;
 import org.junit.jupiter.api.Test;

 import java.nio.charset.StandardCharsets;
+import java.time.Duration;
+import java.time.Instant;
 import java.util.*;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
@@ -113,4 +115,24 @@ public class TestPageNetworkRequest extends TestBase {
    assertEquals("POST", request.method());
    assertEquals(403, request.response().status());
  }
+
+  @Test
+  void shouldNotAllowToAccessFrameOnPopupMainRequest() {
+    page.setContent("<a target=_blank href='" + server.EMPTY_PAGE + "'>click me</a>");
+    Request[] request = { null };
+    PlaywrightException[] error = { null };
+    page.context().onRequest(req -> {
+      request[0] = req;
+      try {
+        req.frame();
+      } catch (PlaywrightException e) {
+        error[0] = e;
+      }
+    });
+    page.getByText("click me").click();
+    waitForCondition(() -> request[0] != null);
+    assertTrue(request[0].isNavigationRequest());
+    assertTrue(error[0].getMessage().contains("Frame for this navigation request is not available"), error[0].getMessage());
+  }
+
 }
@@ -56,6 +56,7 @@ public class TestPageNetworkResponse extends TestBase {
      exchange.sendResponseHeaders(200, 0);
      OutputStreamWriter writer = new OutputStreamWriter(exchange.getResponseBody());
      writer.write("hello ");
+      writer.flush();
    });

    // send request and wait for server response
@@ -80,6 +81,7 @@ public class TestPageNetworkResponse extends TestBase {
      exchange.sendResponseHeaders(200, 0);
      OutputStreamWriter writer = new OutputStreamWriter(exchange.getResponseBody());
      writer.write("hello ");
+      writer.flush();
    });

    // send request and wait for server response
@@ -0,0 +1,18 @@
+package com.microsoft.playwright;
+
+import org.junit.jupiter.api.Test;
+
+import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
+
+public class TestPageRequestIntercept extends TestBase {
+  @Test
+  void shouldFulfillPopupMainRequestUsingAlias() {
+    page.context().route("**/*", route -> {
+      APIResponse response = route.fetch();
+      route.fulfill(new Route.FulfillOptions().setResponse(response).setBody("hello" ));
+    });
+    page.setContent("<a target=_blank href='" + server.EMPTY_PAGE + "'>click me</a>");
+    Page popup = page.waitForPopup(() -> page.getByText("click me").click());
+    assertThat(popup.locator("body")).hasText("hello");
+  }
+}
@@ -82,12 +82,12 @@ public class TestPageRoute extends TestBase {
      intercepted.add(4);
      route.fallback();
    };
-    page.route("**/empty.html", handler4);
+    page.route(Pattern.compile("empty.html"), handler4);
    page.navigate(server.EMPTY_PAGE);
    assertEquals(asList(4, 3, 2, 1), intercepted);

    intercepted.clear();
-    page.unroute("**/empty.html", handler4);
+    page.unroute(Pattern.compile("empty.html"), handler4);
    page.navigate(server.EMPTY_PAGE);
    assertEquals(asList(3, 2, 1), intercepted);

@@ -97,6 +97,42 @@ public class TestPageRoute extends TestBase {
    assertEquals(asList(1), intercepted);
  }

+  @Test
+  void shouldSupportQuestionMarkInGlobPattern() {
+    server.setRoute("/index", exchange -> {
+      exchange.sendResponseHeaders(200, 0);
+      try (OutputStreamWriter writer = new OutputStreamWriter(exchange.getResponseBody())) {
+        writer.write("index-no-hello");
+      }
+    });
+    server.setRoute("/index123hello", exchange -> {
+      exchange.sendResponseHeaders(200, 0);
+      try (OutputStreamWriter writer = new OutputStreamWriter(exchange.getResponseBody())) {
+        writer.write("index123hello");
+      }
+    });
+
+    page.route("**/index?hello", route -> {
+      route.fulfill(new Route.FulfillOptions().setBody("intercepted any character"));
+    });
+
+    page.route("**/index\\?hello", route -> {
+      route.fulfill(new Route.FulfillOptions().setBody("intercepted question mark"));
+    });
+
+    page.navigate(server.PREFIX + "/index?hello");
+    assertTrue(page.content().contains("intercepted question mark"), page.content());
+
+    page.navigate(server.PREFIX + "/index");
+    assertTrue(page.content().contains("index-no-hello"), page.content());
+
+    page.navigate(server.PREFIX + "/index1hello");
+    assertTrue(page.content().contains("intercepted any character"), page.content());
+
+    page.navigate(server.PREFIX + "/index123hello");
+    assertTrue(page.content().contains("index123hello"), page.content());
+  }
+
  @Test
  void shouldUnroutePredicate() {
    List<Integer> intercepted = new ArrayList<>();
@@ -35,6 +35,7 @@ import java.util.Arrays;
 import static com.microsoft.playwright.options.ScreenshotAnimations.DISABLED;
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;

 // TODO: suite.skip(browserName === "firefox" && headful");
 public class TestPageScreenshot extends TestBase {
@@ -233,4 +234,19 @@ public class TestPageScreenshot extends TestBase {
    }
    assertTrue(hasDifferentScreenshots);
  }
+
+  @Test
+  void shouldWorkWhenMaskColorIsNotPinkF0F() {
+    page.setViewportSize(500, 500);
+    page.navigate(server.PREFIX + "/grid.html");
+    byte[] screenshot1 = page.screenshot(
+      new Page.ScreenshotOptions()
+        .setMask(asList(page.locator("div").nth(5)))
+        .setMaskColor("#00FF00"));
+    byte[] screenshot2 = page.screenshot(
+      new Page.ScreenshotOptions()
+        .setMask(asList(page.locator("div").nth(5))));
+    assertThrows(AssertionError.class, () -> assertArrayEquals(screenshot1, screenshot2));
+  }
+
 }
@@ -73,6 +73,6 @@ public class TestPageSetExtraHttpHeaders extends TestBase {
    PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
      browser.newContext(new Browser.NewContextOptions().setExtraHTTPHeaders(mapOf("foo", null)));
    });
-    assertTrue(e.getMessage().contains("expected string, got undefined"));
+    assertTrue(e.getMessage().contains("Value cannot be null"));
  }
 }
@@ -16,6 +16,7 @@

 package com.microsoft.playwright;

+import com.microsoft.playwright.options.AriaRole;
 import com.microsoft.playwright.options.FilePayload;
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
@@ -96,6 +97,34 @@ public class TestPageSetInputFiles extends TestBase {
    assertEquals(200 * 1024 * 1024, fields.get(0).content.length());
  }

+  @Test
+  void shouldUploadMultipleLargeFiles(@TempDir Path tmpDir) throws IOException, ExecutionException, InterruptedException {
+    Assumptions.assumeTrue(3 <= (Runtime.getRuntime().maxMemory() >> 30), "Fails if max heap size is < 3Gb");
+    int filesCount = 10;
+    page.navigate(server.PREFIX + "/input/fileupload-multi.html");
+    Path uploadFile = tmpDir.resolve("50MB_1.zip");
+    String str = String.join("", Collections.nCopies(1024, "A"));
+
+    try (Writer stream = new OutputStreamWriter(Files.newOutputStream(uploadFile))) {
+      for (int i = 0; i < 49 * 1024; i++) {
+        stream.write(str);
+      }
+    }
+    Locator input = page.locator("input[type='file']");
+    List<Path> uploadFiles = new ArrayList<>();
+    uploadFiles.add(uploadFile);
+    for (int i = 1; i < filesCount; i++) {
+      Path dstFile = tmpDir.resolve("50MB_" + i + ".zip");
+      Files.copy(uploadFile, dstFile);
+      uploadFiles.add(dstFile);
+    }
+    FileChooser fileChooser = page.waitForFileChooser(() -> input.click());
+    fileChooser.setFiles(uploadFiles.toArray(new Path[0]));
+    Object filesLen = page.getByRole(AriaRole.TEXTBOX).evaluate("e => e.files.length");
+    assertTrue(fileChooser.isMultiple());
+    assertEquals(filesCount, filesLen);
+  }
+
  @Test
  void shouldUploadLargeFileWithRelativePath(@TempDir Path tmpDir) throws IOException, ExecutionException, InterruptedException {
    Assumptions.assumeTrue(3 <= (Runtime.getRuntime().maxMemory() >> 30), "Fails if max heap size is < 3Gb");
@@ -58,19 +58,21 @@ public class TestPageWaitForNavigation extends TestBase {

  @Test
  void shouldWorkWithCommit() {
+    server.setRoute("/script.js", exchange -> {});
    server.setRoute("/empty.html", exchange -> {
      exchange.getResponseHeaders().add("Content-Type", "text/html");
-      exchange.sendResponseHeaders(200, 8192);
-      OutputStreamWriter writer = new OutputStreamWriter(exchange.getResponseBody());
-      writer.write("<title>" + String.join("", nCopies(4100, "A")));
-      writer.flush();
+      exchange.sendResponseHeaders(200, 0);
+      try (OutputStreamWriter writer = new OutputStreamWriter(exchange.getResponseBody())) {
+        writer.write("<title>Hello</title><script src=\"script.js\"></script>");
+      }
    });
    page.waitForNavigation(new Page.WaitForNavigationOptions().setWaitUntil(WaitUntilState.COMMIT), () -> {
      try {
-        page.navigate(server.EMPTY_PAGE, new Page.NavigateOptions().setTimeout(100));
+        page.navigate(server.EMPTY_PAGE, new Page.NavigateOptions().setTimeout(1000));
      } catch (TimeoutError e) {
      }
    });
+    assertEquals("Hello", page.title());
  }

  @Test
@@ -239,16 +241,18 @@ public class TestPageWaitForNavigation extends TestBase {
    page.navigate(server.PREFIX + "/frames/one-frame.html");
    Frame frame = page.frames().get(1);
    server.setRoute("/empty.html", exchange -> {});
+    server.setRoute("/one-style.css", exchange -> {});
    PlaywrightException ex = assertThrows(PlaywrightException.class, () -> {
      frame.waitForNavigation(() -> {
-        Future<Server.Request> req = server.futureRequest("/empty.html");
-        page.evalOnSelector("iframe", "frame => { frame.contentWindow.location.href = '/empty.html'; }");
+        Future<Server.Request> req = server.futureRequest("/one-style.css");
+        page.evalOnSelector("iframe", "frame => { frame.contentWindow.location.href = '/one-style.html'; }");
        try {
+          // Make sure policy checks pass and navigation actually begins before removing the frame to avoid other errors
          req.get();
        } catch (InterruptedException | ExecutionException e) {
          throw new RuntimeException(e);
        }
-        page.evaluate("setTimeout(() => document.querySelector('iframe').remove());");
+        page.evalOnSelector("iframe", "frame => setTimeout(() => frame.remove(), 0)");
      });
    });
    assertTrue(ex.getMessage().contains("frame was detached"), ex.getMessage());
@@ -52,18 +52,20 @@ public class TestPageWaitForUrl extends TestBase {

  @Test
  void shouldWorkWithCommit() {
+    server.setRoute("/script.js", exchange -> {});
    server.setRoute("/empty.html", exchange -> {
      exchange.getResponseHeaders().add("Content-Type", "text/html");
-      exchange.sendResponseHeaders(200, 8192);
-      OutputStreamWriter writer = new OutputStreamWriter(exchange.getResponseBody());
-      writer.write("<title>" + String.join("", nCopies(4100, "A")));
-      writer.flush();
+      exchange.sendResponseHeaders(200, 0);
+      try (OutputStreamWriter writer = new OutputStreamWriter(exchange.getResponseBody())) {
+        writer.write("<title>Hello</title><script src=\"script.js\"></script>");
+      }
    });
    try {
      page.navigate(server.EMPTY_PAGE, new Page.NavigateOptions().setTimeout(100));
    } catch (TimeoutError e) {
    }
    page.waitForURL("**/empty.html", new Page.WaitForURLOptions().setWaitUntil(WaitUntilState.COMMIT));
+    assertEquals("Hello", page.title());
  }

  @Test
@@ -52,6 +52,18 @@ public class TestPdf extends TestBase {
  @DisabledIf(value="com.microsoft.playwright.TestBase#isChromium", disabledReason="skip")
  void shouldThrowInNonChromium() {
    PlaywrightException e = assertThrows(PlaywrightException.class, () -> page.pdf());
-    assertTrue(e.getMessage().contains("Page.pdf only supported in headless Chromium"));
+    assertTrue(e.getMessage().contains("PDF generation is only supported for Headless Chromium"), e.getMessage());
+  }
+
+
+  @Test
+  @DisabledIf(value="com.microsoft.playwright.TestBase#isChromium", disabledReason="skip")
+  void correctExceptionWithPersistentContext(@TempDir Path tempDir) {
+    Path profile = tempDir.resolve("profile");
+    try (BrowserContext context = browserType.launchPersistentContext(profile)) {
+      Page page = context.newPage();
+      PlaywrightException e = assertThrows(PlaywrightException.class, () -> page.pdf());
+      assertTrue(e.getMessage().contains("PDF generation is only supported for Headless Chromium"), e.getMessage());
+    }
  }
 }
@@ -153,6 +153,25 @@ public class TestSelectorsGetBy extends TestBase {
    assertThat(page.getByTitle("my title", new Page.GetByTitleOptions().setExact(true))).hasCount(1, new LocatorAssertions.HasCountOptions().setTimeout(500));
    assertThat(page.getByTitle("my t\\itle", new Page.GetByTitleOptions().setExact(true))).hasCount(0, new LocatorAssertions.HasCountOptions().setTimeout(500));
    assertThat(page.getByTitle("my t\\\\itle", new Page.GetByTitleOptions().setExact(true))).hasCount(0, new LocatorAssertions.HasCountOptions().setTimeout(500));
+
+    page.setContent("<label for=target>foo &gt;&gt; bar</label><input id=target>");
+    page.evalOnSelector("input", "input => {\n" +
+      "    input.setAttribute('placeholder', 'foo >> bar');\n" +
+      "    input.setAttribute('title', 'foo >> bar');\n" +
+      "    input.setAttribute('alt', 'foo >> bar');\n" +
+      "  }");
+    assertEquals("foo >> bar", page.getByText("foo >> bar").textContent());
+    assertThat(page.locator("label")).hasText("foo >> bar");
+    assertThat(page.getByText("foo >> bar")).hasText("foo >> bar");
+    assertEquals("foo >> bar", page.getByText(Pattern.compile("foo >> bar")).textContent());
+    assertThat(page.getByLabel("foo >> bar")).hasAttribute("id", "target");
+    assertThat(page.getByLabel(Pattern.compile("foo >> bar"))).hasAttribute("id", "target");
+    assertThat(page.getByPlaceholder("foo >> bar")).hasAttribute("id", "target");
+    assertThat(page.getByAltText("foo >> bar")).hasAttribute("id", "target");
+    assertThat(page.getByTitle("foo >> bar")).hasAttribute("id", "target");
+    assertThat(page.getByPlaceholder(Pattern.compile("foo >> bar"))).hasAttribute("id", "target");
+    assertThat(page.getByAltText(Pattern.compile("foo >> bar"))).hasAttribute("id", "target");
+    assertThat(page.getByTitle(Pattern.compile("foo >> bar"))).hasAttribute("id", "target");
  }

  @Test
@@ -2,6 +2,7 @@ package com.microsoft.playwright;

 import org.junit.jupiter.api.Test;

+import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.*;

 public class TestSelectorsMisc extends TestBase {
@@ -194,4 +195,48 @@ public class TestSelectorsMisc extends TestBase {
    e = assertThrows(PlaywrightException.class, () -> page.querySelector("div >> left-of='span',3,4"));
    assertTrue(e.getMessage().contains("Malformed selector: left-of='span',3,4"));
  }
+
+  @Test
+  void shouldWorkWithInternalHasNot() {
+    page.setContent("<section><span></span><div></div></section><section><br></section>");
+    assertEquals(1, page.evalOnSelectorAll("section >> internal:has-not=\"span\"", "els => els.length"));
+    assertEquals(0, page.evalOnSelectorAll("section >> internal:has-not=\"span, div, br\"", "els => els.length"));
+    assertEquals(1, page.evalOnSelectorAll("section >> internal:has-not=\"br\"", "els => els.length"));
+    assertEquals(1, page.evalOnSelectorAll("section >> internal:has-not=\"span, div\"", "els => els.length"));
+    assertEquals(2, page.evalOnSelectorAll("section >> internal:has-not=\"article\"", "els => els.length"));
+  }
+
+  @Test
+  void shouldWorkWithInternalAnd() {
+    page.setContent("<div class=foo>hello</div><div class=bar>world</div>\n" +
+      "    <span class=foo>hello2</span><span class=bar>world2</span>");
+    assertEquals(asList(), page.evalOnSelectorAll("div >> internal:and=\"span\"", "els => els.map(e => e.textContent)"));
+    assertEquals(asList("hello"), page.evalOnSelectorAll("div >> internal:and=\".foo\"", "els => els.map(e => e.textContent)"));
+    assertEquals(asList("world"), page.evalOnSelectorAll("div >> internal:and=\".bar\"", "els => els.map(e => e.textContent)"));
+    assertEquals(asList("hello2", "world2"), page.evalOnSelectorAll("span >> internal:and=\"span\"", "els => els.map(e => e.textContent)"));
+    assertEquals(asList("hello"), page.evalOnSelectorAll(".foo >> internal:and=\"div\"", "els => els.map(e => e.textContent)"));
+    assertEquals(asList("world2"), page.evalOnSelectorAll(".bar >> internal:and=\"span\"", "els => els.map(e => e.textContent)"));
+  }
+
+  @Test
+  void shouldWorkWithInternalOr() {
+    page.setContent("<div>hello</div>\n" +
+      "    <span>world</span>");
+    assertEquals(asList("hello", "world"), page.evalOnSelectorAll("div >> internal:or=\"span\"", "els => els.map(e => e.textContent)"));
+    assertEquals(asList("hello", "world"), page.evalOnSelectorAll("span >> internal:or=\"div\"", "els => els.map(e => e.textContent)"));
+    assertEquals(0, page.evalOnSelectorAll("article >> internal:or=\"something\"", "els => els.length"));
+    assertEquals("hello", page.locator("article >> internal:or=\"div\"").textContent());
+    assertEquals("world", page.locator("article >> internal:or=\"span\"").textContent());
+    assertEquals("hello", page.locator("div >> internal:or=\"article\"").textContent());
+    assertEquals("world", page.locator("span >> internal:or=\"article\"").textContent());
+  }
+  @Test
+  void shouldWorkWithInternalChain() {
+    page.setContent("<div>one <span>two</span> <button>three</button> </div>\n" +
+      "    <span>four</span>\n" +
+      "    <button>five</button>");
+    assertEquals(asList("three"), page.evalOnSelectorAll("div >> internal:chain=\"button\"", "els => els.map(e => e.textContent)"));
+    assertEquals(asList("two", "three"), page.evalOnSelectorAll("div >> internal:chain=\"span >> internal:or=\\\"button\\\"\"", "els => els.map(e => e.textContent)"));
+  }
+
 }
@@ -9,6 +9,18 @@ import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.assertEquals;

 public class TestSelectorsText extends TestBase {
+
+  @Test
+  void shouldWorkSmoke() {
+    page.setContent("<div>Hi&gt;&gt;<span></span></div>");
+    assertEquals("<span></span>", page.evalOnSelector("text=\"Hi>>\">>span", "e => e.outerHTML"));
+    assertEquals("<span></span>", page.evalOnSelector("text=/Hi\\>\\>/ >> span", "e => e.outerHTML"));
+
+    page.setContent("<div>let's<span>hello</span></div>");
+    assertEquals("<span>hello</span>", page.evalOnSelector("text=/let's/i >> span", "e => e.outerHTML"));
+    assertEquals("<span>hello</span>", page.evalOnSelector("text=/let\'s/i >> span", "e => e.outerHTML"));
+  }
+
  @Test
  void hasTextAndInternalTextShouldMatchFullNodeTextInStrictMode() {
    page.setContent("<div id=div1>hello<span>world</span></div>\n" +
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Yury Semikhatsky	414abb83fe	chore: set release version to 1.38.0 (#1386 )	2023-09-18 17:32:02 -07:00
Yury Semikhatsky	85c5f90029	chore: update selector escaping, roll driver (#1385 )	2023-09-18 16:22:23 -07:00
railwayursin	30778a3b04	fix: setfiles OOM exception (#1384 )	2023-09-18 15:48:56 -07:00
Max Schmitt	25ba8474f4	devops: fix publishing (#1378 )	2023-09-18 15:41:38 -07:00
Yury Semikhatsky	5394b5d9b3	chore: roll driver 1.38.0-alpha-sep-10-2023 (#1380 )	2023-09-12 09:10:13 -07:00
Yury Semikhatsky	883487772a	Revert "feat(soft-assertions): Implement soft assertions for playwrig… (#1377 ) Revert "feat(soft-assertions): Implement soft assertions for playwright-java (#1361)" This reverts commit `86f929aaf0`.	2023-09-06 15:27:30 -07:00
Yury Semikhatsky	4d912193e7	chore: support js Map, Set in protocol results (#1376 )	2023-09-06 13:33:16 -07:00
Yury Semikhatsky	05eb1f1161	chore: roll 1.38.0-alpha-sep-5-2023 (#1374 )	2023-09-05 11:21:45 -07:00
Oliver Weiler	2dbfa9d38e	chore: Generate metadata for method parameters (#1370 )	2023-09-01 09:30:52 -07:00
uchagani	86f929aaf0	feat(soft-assertions): Implement soft assertions for playwright-java (#1361 )	2023-08-28 12:41:44 -07:00
Yury Semikhatsky	fa75e29fcf	chore: roll driver to 1.38.0-alpha-aug-23 (#1362 ) Reference https://github.com/microsoft/playwright-java/issues/1353	2023-08-23 18:41:40 -07:00
Yury Semikhatsky	7d5953c96e	Revert "SoftAssertions Implementation (#1340 )" (#1357 ) This reverts commit `632fba54a5`.	2023-08-17 10:11:30 -07:00
uchagani	632fba54a5	SoftAssertions Implementation (#1340 )	2023-08-17 10:06:04 -07:00
Yury Semikhatsky	f76af33f52	docs: update ROLLING.md with instructions how to find driver version (#1356 )	2023-08-17 10:04:38 -07:00
Yury Semikhatsky	4204096c24	chore: set dev version to 1.38 (#1350 )	2023-08-11 15:31:11 -07:00
Yury Semikhatsky	d3495ca511	chore: roll driver to 1.37.0-beta (#1348 )	2023-08-11 15:12:37 -07:00
Raphi	4b873ec3ad	feat: Add support for Chrome DevTools Protocol (CDPSession) (#1329 ) Add new methods BrowserContext.newCDPSession and Browser.newBrowserCDPSession to create a Chrome DevTools Protocol[1] session for the page and browser respectively. Fixes #823 [1] https://chromedevtools.github.io/devtools-protocol/	2023-08-10 16:42:57 -07:00
Yury Semikhatsky	463146ab11	chore: set dev version to 1.37 (#1337 )	2023-07-14 14:50:36 -07:00
Yury Semikhatsky	f6bc9a8b3d	chore: roll driver to 1.36.1 (#1335 )	2023-07-14 14:42:12 -07:00
Yury Semikhatsky	35e3c3653e	fix: form data field encoding (#1333 ) Fixes #1331	2023-07-11 09:52:21 -07:00
Yury Semikhatsky	ed63ba4dcf	chore: roll 1.36.0-beta-1689010164000 (#1332 ) References #1311	2023-07-10 12:50:24 -07:00
Yury Semikhatsky	48a92d1a62	chore: roll to 1.36.0-alpha-jul-7-2023 (#1330 )	2023-07-07 11:50:08 -07:00
Yury Semikhatsky	d219fddc8b	fix: NPE after pause (#1314 )	2023-06-20 12:02:50 -07:00
Yury Semikhatsky	7a1bbe23b1	chore: bump dev version to 1.36.0-SNAPSHOT (#1305 )	2023-06-12 15:57:36 -07:00
Yury Semikhatsky	2a047bff9a	chore: roll 1.35.0 (#1304 )	2023-06-12 15:54:40 -07:00
Yury Semikhatsky	4e5285950d	chore: roll to 1.35.0-beta (#1298 )	2023-06-08 18:23:19 -07:00
Yury Semikhatsky	b8a9d888be	fix: NPE in Page.pdf for persistent context (#1292 ) Fixes #1291	2023-05-26 12:00:07 -07:00
Yury Semikhatsky	5a4640fe2a	chore: set dev version to 1.35 (#1288 )	2023-05-24 16:45:39 -07:00
Yury Semikhatsky	2ba018dd7e	chore: roll driver to 1.34.2 (#1286 )	2023-05-24 16:34:52 -07:00
Nour Z	7f3db2ff46	fix: updated dead links to use playwright homepage	2023-05-23 15:27:55 -07:00
Yury Semikhatsky	8547c706ea	feat: roll 1.34 beta driver, implement context events (#1283 )	2023-05-18 15:57:39 -07:00
Max Schmitt	30a696172a	devops(docker): fix Docker publishing (#1277 )	2023-05-09 08:55:36 +02:00
Yury Semikhatsky	23de4518f4	chore: bump dev version to 1.34 (#1273 )	2023-05-02 13:40:57 -07:00
Yury Semikhatsky	343502d559	chore: roll driver to 1.33.0 (#1271 )	2023-05-02 12:19:34 -07:00
Max Schmitt	83837af5e5	docker: use Jammy as Docker default (#1267 )	2023-04-27 18:27:54 +02:00
Sébastien Richert	7163012709	test: Restrain sending http credentials on a specific origin (for roll 1.33 driver) (#1253 ) * test: Restrain sending http credentials on a specific origin (for driver 1.33 roll) Verify that the httpCredentials are not sent when origin mismatch (scheme or hostname or port). See https://github.com/microsoft/playwright/pull/20374 * test: Restrain sending http credentials on a specific origin Verify that the httpCredentials are not sent when origin mismatch (scheme or hostname or port). See https://github.com/microsoft/playwright/pull/20374	2023-04-26 14:48:38 -07:00
Yury Semikhatsky	be59662a62	feat: roll driver to 1.33.0 beta (#1266 )	2023-04-26 14:28:46 -07:00
Yury Semikhatsky	45591df430	feat: roll driver to Apr 12, implement new APIs (#1264 )	2023-04-12 13:38:04 -07:00
Max Schmitt	804c577070	devops: publish Jammy Docker images (#1262 )	2023-04-12 19:41:41 +02:00
Yury Semikhatsky	c237fae71e	feat: bundle arm64 node binary for Apple Silicon (#1255 )	2023-03-29 17:35:33 -07:00
Yury Semikhatsky	1783b117e6	chore: bump dev revision to 1.33 (#1252 )	2023-03-27 15:58:29 -07:00
Yury Semikhatsky	5f3b5dbe27	test: align waitForNavigation test with upstream (#1250 )	2023-03-27 14:19:39 -07:00
Yury Semikhatsky	bc50392220	chore: throw on context.close() if it was closed externally (#1248 ) This is a backport of https://github.com/microsoft/playwright/commit/09ff7eaaf2ab40fcaf0abb85f0308a91e1460a97	2023-03-27 14:00:42 -07:00
Max Schmitt	96d74ef678	devops: don't trigger release workflow for PRs (#1247 )	2023-03-27 22:34:59 +02:00
Max Schmitt	ab89f6a953	chore: fix Docker image build (#1245 )	2023-03-27 22:27:48 +02:00
Yury Semikhatsky	05f641c5af	chore: roll driver to 1.32.1 (#1244 )	2023-03-27 12:53:58 -07:00
Yury Semikhatsky	d0bbf54b3b	chore: roll diver to 1.32.0-beta-1679357626000 (#1238 )	2023-03-20 22:03:41 -07:00
Yury Semikhatsky	7db3e3f401	chore: update community link	2023-03-20 18:38:04 -07:00
Yury Semikhatsky	470df42b36	feat: roll 1.32 driver, implement waitForCondition (#1237 ) * Rolled recent driver * Implemented waitForCondition in Page and BrowserContext https://github.com/microsoft/playwright-java/issues/1208 Fixes https://github.com/microsoft/playwright-java/issues/1228	2023-03-20 10:27:29 -07:00
Yury Semikhatsky	b260125389	fix: do not modify fetch options.method (#1232 )	2023-03-15 12:27:54 -07:00
Yury Semikhatsky	f8fc1068bc	chore: roll 1.32.0-alpha driver (#1223 )	2023-03-10 10:05:19 -08:00
Yury Semikhatsky	2db2762a0d	devops: delete question temolate	2023-03-02 15:33:00 -08:00
Yury Semikhatsky	cd56352278	devops: update issue templates	2023-03-02 15:31:14 -08:00
Yury Semikhatsky	6c729a8c9d	devops: print test timestamps in GHA logs (#1224 )	2023-03-02 10:11:00 -08:00
Yury Semikhatsky	fe3e3e55dc	fix: better assertThat error message for isChecked=false (#1221 ) Fixes #1209	2023-03-01 08:52:27 -08:00
Yury Semikhatsky	1dc938cc67	test: make waitForNavigation pass in ff (#1220 )	2023-02-28 13:21:46 -08:00
Yury Semikhatsky	05239433d2	test: make firefox not hang on shouldRejectResponseFinishedIfPageCloses (#1218 )	2023-02-27 18:43:46 -08:00
Yury Semikhatsky	9fdcbb63f9	chore: bump dev version to 1.32.0-SNAPSHOT (#1212 )	2023-02-22 11:20:04 -08:00