chore: mark 1.37.0 (#1349 )

chore: roll driver to 1.37.0-beta (#1348 )
feat: Add support for Chrome DevTools Protocol (CDPSession) (#1329 )
2026-05-23 11:13:15 +00:00 · 2023-08-14 09:08:57 -07:00 · 2023-08-11 15:12:37 -07:00 · 2023-08-10 16:42:57 -07:00 · 2023-07-14 14:50:36 -07:00 · 2023-07-14 14:42:12 -07:00
54 changed files with 958 additions and 192 deletions
@@ -11,9 +11,9 @@ Playwright is a Java library to automate [Chromium](https://www.chromium.org/Hom

 |          | Linux | macOS | Windows |
 |   :---   | :---: | :---: | :---:   |
-| Chromium <!-- GEN:chromium-version -->114.0.5735.35<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
-| WebKit <!-- GEN:webkit-version -->16.4<!-- GEN:stop --> | ✅ | ✅ | ✅ |
-| Firefox <!-- GEN:firefox-version -->113.0<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| Chromium <!-- GEN:chromium-version -->116.0.5845.82<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| WebKit <!-- GEN:webkit-version -->17.0<!-- GEN:stop --> | ✅ | ✅ | ✅ |
+| Firefox <!-- GEN:firefox-version -->115.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.

@@ -6,7 +6,7 @@
  <parent>
    <groupId>com.microsoft.playwright</groupId>
    <artifactId>parent-pom</artifactId>
-    <version>1.34.0-SNAPSHOT</version>
+    <version>1.37.0</version>
  </parent>

  <artifactId>driver-bundle</artifactId>
@@ -6,7 +6,7 @@
  <parent>
    <groupId>com.microsoft.playwright</groupId>
    <artifactId>parent-pom</artifactId>
-    <version>1.34.0-SNAPSHOT</version>
+    <version>1.37.0</version>
  </parent>

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

  <groupId>org.example</groupId>
  <artifactId>examples</artifactId>
-  <version>1.34.0-SNAPSHOT</version>
+  <version>1.37.0</version>
  <name>Playwright Client Examples</name>
  <properties>
    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -7,7 +7,7 @@
  <parent>
    <groupId>com.microsoft.playwright</groupId>
    <artifactId>parent-pom</artifactId>
-    <version>1.34.0-SNAPSHOT</version>
+    <version>1.37.0</version>
  </parent>

  <artifactId>playwright</artifactId>
@@ -42,7 +42,7 @@ 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;
    /**
@@ -100,7 +100,7 @@ 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;
@@ -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;
    /**
@@ -93,7 +93,7 @@ public interface Browser extends AutoCloseable {
     */
    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;
    /**
@@ -120,7 +120,7 @@ public interface Browser extends AutoCloseable {
    /**
     * 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>.
+     * about <a href="https://playwright.dev/java/docs/emulation#ismobile">mobile emulation</a>.
     */
    public Boolean isMobile;
    /**
@@ -130,8 +130,9 @@ public interface Browser extends AutoCloseable {
    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. Learn more about emulation in
-     * our <a href="https://playwright.dev/java/docs/emulation#locale--timezone">emulation guide</a>.
+     * {@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;
    /**
@@ -141,11 +142,11 @@ public interface Browser extends AutoCloseable {
    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:
@@ -220,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;
    /**
@@ -234,8 +236,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. Learn more about <a href="https://playwright.dev/java/docs/emulation#viewport">viewport
+     * Emulates consistent viewport for each page. Defaults to an 1280x720 viewport. Use {@code null} to disable the consistent
+     * 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
@@ -255,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>
@@ -270,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;
@@ -294,7 +296,7 @@ public interface Browser extends AutoCloseable {
      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;
@@ -349,7 +351,7 @@ public interface Browser extends AutoCloseable {
    /**
     * 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>.
+     * about <a href="https://playwright.dev/java/docs/emulation#ismobile">mobile emulation</a>.
     */
    public NewContextOptions setIsMobile(boolean isMobile) {
      this.isMobile = isMobile;
@@ -365,8 +367,9 @@ 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. Learn more about emulation in
-     * our <a href="https://playwright.dev/java/docs/emulation#locale--timezone">emulation guide</a>.
+     * {@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;
@@ -382,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:
@@ -399,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:
@@ -532,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;
@@ -541,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;
@@ -555,8 +559,8 @@ public interface Browser extends AutoCloseable {
      return this;
    }
    /**
-     * Emulates consistent viewport for each page. Defaults to an 1280x720 viewport.  Use {@code null} to disable the
-     * consistent viewport emulation. Learn more about <a href="https://playwright.dev/java/docs/emulation#viewport">viewport
+     * Emulates consistent viewport for each page. Defaults to an 1280x720 viewport. Use {@code null} to disable the consistent
+     * 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
@@ -566,8 +570,8 @@ public interface Browser extends AutoCloseable {
      return setViewportSize(new ViewportSize(width, height));
    }
    /**
-     * Emulates consistent viewport for each page. Defaults to an 1280x720 viewport.  Use {@code null} to disable the
-     * consistent viewport emulation. Learn more about <a href="https://playwright.dev/java/docs/emulation#viewport">viewport
+     * Emulates consistent viewport for each page. Defaults to an 1280x720 viewport. Use {@code null} to disable the consistent
+     * 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
@@ -588,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>
@@ -600,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;
    /**
@@ -615,7 +619,7 @@ public interface Browser extends AutoCloseable {
     */
    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;
    /**
@@ -642,7 +646,7 @@ public interface Browser extends AutoCloseable {
    /**
     * 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>.
+     * about <a href="https://playwright.dev/java/docs/emulation#ismobile">mobile emulation</a>.
     */
    public Boolean isMobile;
    /**
@@ -652,8 +656,9 @@ public interface Browser extends AutoCloseable {
    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. Learn more about emulation in
-     * our <a href="https://playwright.dev/java/docs/emulation#locale--timezone">emulation guide</a>.
+     * {@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;
    /**
@@ -663,11 +668,11 @@ public interface Browser extends AutoCloseable {
    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:
@@ -742,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;
    /**
@@ -756,8 +762,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. Learn more about <a href="https://playwright.dev/java/docs/emulation#viewport">viewport
+     * Emulates consistent viewport for each page. Defaults to an 1280x720 viewport. Use {@code null} to disable the consistent
+     * 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
@@ -777,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>
@@ -792,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;
@@ -816,7 +822,7 @@ public interface Browser extends AutoCloseable {
      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;
@@ -871,7 +877,7 @@ public interface Browser extends AutoCloseable {
    /**
     * 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>.
+     * about <a href="https://playwright.dev/java/docs/emulation#ismobile">mobile emulation</a>.
     */
    public NewPageOptions setIsMobile(boolean isMobile) {
      this.isMobile = isMobile;
@@ -887,8 +893,9 @@ 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. Learn more about emulation in
-     * our <a href="https://playwright.dev/java/docs/emulation#locale--timezone">emulation guide</a>.
+     * {@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;
@@ -904,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:
@@ -921,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:
@@ -1054,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;
@@ -1063,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;
@@ -1077,8 +1085,8 @@ public interface Browser extends AutoCloseable {
      return this;
    }
    /**
-     * Emulates consistent viewport for each page. Defaults to an 1280x720 viewport.  Use {@code null} to disable the
-     * consistent viewport emulation. Learn more about <a href="https://playwright.dev/java/docs/emulation#viewport">viewport
+     * Emulates consistent viewport for each page. Defaults to an 1280x720 viewport. Use {@code null} to disable the consistent
+     * 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
@@ -1088,8 +1096,8 @@ public interface Browser extends AutoCloseable {
      return setViewportSize(new ViewportSize(width, height));
    }
    /**
-     * Emulates consistent viewport for each page. Defaults to an 1280x720 viewport.  Use {@code null} to disable the
-     * consistent viewport emulation. Learn more about <a href="https://playwright.dev/java/docs/emulation#viewport">viewport
+     * Emulates consistent viewport for each page. Defaults to an 1280x720 viewport. Use {@code null} to disable the consistent
+     * 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
@@ -1178,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.
   *
@@ -752,6 +752,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.
   *
@@ -1096,7 +1116,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
@@ -1111,7 +1131,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
@@ -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;
    /**
@@ -440,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;
    /**
@@ -496,7 +539,7 @@ public interface BrowserType {
    /**
     * 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>.
+     * about <a href="https://playwright.dev/java/docs/emulation#ismobile">mobile emulation</a>.
     */
    public Boolean isMobile;
    /**
@@ -506,8 +549,9 @@ public interface BrowserType {
    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. Learn more about emulation in
-     * our <a href="https://playwright.dev/java/docs/emulation#locale--timezone">emulation guide</a>.
+     * {@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;
    /**
@@ -517,7 +561,7 @@ public interface BrowserType {
    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;
    /**
@@ -585,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;
    /**
@@ -596,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;
    /**
@@ -608,8 +653,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. Learn more about <a href="https://playwright.dev/java/docs/emulation#viewport">viewport
+     * Emulates consistent viewport for each page. Defaults to an 1280x720 viewport. Use {@code null} to disable the consistent
+     * 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
@@ -637,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>
@@ -652,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;
@@ -735,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;
@@ -837,7 +882,7 @@ public interface BrowserType {
    /**
     * 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>.
+     * about <a href="https://playwright.dev/java/docs/emulation#ismobile">mobile emulation</a>.
     */
    public LaunchPersistentContextOptions setIsMobile(boolean isMobile) {
      this.isMobile = isMobile;
@@ -853,8 +898,9 @@ 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. Learn more about emulation in
-     * our <a href="https://playwright.dev/java/docs/emulation#locale--timezone">emulation guide</a>.
+     * {@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;
@@ -870,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;
@@ -1002,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;
@@ -1019,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;
@@ -1040,8 +1087,8 @@ public interface BrowserType {
      return this;
    }
    /**
-     * Emulates consistent viewport for each page. Defaults to an 1280x720 viewport.  Use {@code null} to disable the
-     * consistent viewport emulation. Learn more about <a href="https://playwright.dev/java/docs/emulation#viewport">viewport
+     * Emulates consistent viewport for each page. Defaults to an 1280x720 viewport. Use {@code null} to disable the consistent
+     * 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
@@ -1051,8 +1098,8 @@ public interface BrowserType {
      return setViewportSize(new ViewportSize(width, height));
    }
    /**
-     * Emulates consistent viewport for each page. Defaults to an 1280x720 viewport.  Use {@code null} to disable the
-     * consistent viewport emulation. Learn more about <a href="https://playwright.dev/java/docs/emulation#viewport">viewport
+     * Emulates consistent viewport for each page. Defaults to an 1280x720 viewport. Use {@code null} to disable the consistent
+     * 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
@@ -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);
+}
+
@@ -59,7 +59,7 @@ public interface ConsoleMessage {
  /**
   * The page that produced this console message, if any.
   *
-   * @since v1.33
+   * @since v1.34
   */
  Page page();
  /**
@@ -84,7 +84,7 @@ public interface Dialog {
  /**
   * The page that initiated this dialog, if available.
   *
-   * @since v1.33
+   * @since v1.34
   */
  Page page();
  /**
@@ -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}.
@@ -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}.
@@ -4473,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
@@ -4482,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
@@ -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");
@@ -23,7 +23,7 @@ import java.util.regex.Pattern;

 /**
 * Locators are the central piece of Playwright's auto-waiting and retry-ability. In a nutshell, locators represent a way
- * to find element(s) on the page at any moment. Locator can be created with the {@link Page#locator Page.locator()}
+ * to find element(s) on the page at any moment. A locator can be created with the {@link Page#locator Page.locator()}
 * method.
 *
 * <p> <a href="https://playwright.dev/java/docs/locators">Learn more about locators</a>.
@@ -1407,9 +1407,15 @@ public interface Locator {
    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}.
@@ -1468,12 +1474,21 @@ public interface Locator {
    }
    /**
     * 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}.
@@ -2018,7 +2033,7 @@ public interface Locator {
    }
  }
  /**
-   * When locator points to a list of elements, returns array of locators, pointing to respective elements.
+   * When the locator points to a list of elements, this returns an array of locators, pointing to their respective elements.
   *
   * <p> <strong>NOTE:</strong> {@link Locator#all Locator.all()} does not wait for elements to match the locator, and instead immediately returns
   * whatever is present in the page.  When the list of elements changes dynamically, {@link Locator#all Locator.all()} will
@@ -2067,7 +2082,7 @@ public interface Locator {
   * }</pre>
   *
   * @param locator Additional locator to match.
-   * @since v1.33
+   * @since v1.34
   */
  Locator and(Locator locator);
  /**
@@ -4850,7 +4865,10 @@ public interface Locator {
   */
  String textContent(TextContentOptions options);
  /**
-   * Focuses the element, and then sends a {@code keydown}, {@code keypress}/{@code input}, and {@code keyup} event for each
+   * <strong>NOTE:</strong> In most cases, you should use {@link Locator#fill Locator.fill()} instead. You only need to type characters if there is
+   * special keyboard handling on the page.
+   *
+   * <p> 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 Locator#press Locator.press()}.
@@ -4875,7 +4893,10 @@ public interface Locator {
    type(text, null);
  }
  /**
-   * Focuses the element, and then sends a {@code keydown}, {@code keypress}/{@code input}, and {@code keyup} event for each
+   * <strong>NOTE:</strong> In most cases, you should use {@link Locator#fill Locator.fill()} instead. You only need to type characters if there is
+   * special keyboard handling on the page.
+   *
+   * <p> 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 Locator#press Locator.press()}.
@@ -2407,9 +2407,15 @@ public interface Page extends AutoCloseable {
    public Boolean fullPage;
    /**
     * 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}.
@@ -2489,12 +2495,21 @@ public interface Page extends AutoCloseable {
    }
    /**
     * 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}.
@@ -6186,7 +6201,7 @@ public interface Page extends AutoCloseable {
  void route(Predicate<String> url, Consumer<Route> handler, RouteOptions options);
  /**
   * If specified the network requests that are made in the page 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
@@ -6201,7 +6216,7 @@ public interface Page extends AutoCloseable {
  }
  /**
   * If specified the network requests that are made in the page 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
@@ -6657,7 +6672,9 @@ public interface Page extends AutoCloseable {
   */
  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
@@ -6666,7 +6683,9 @@ public interface Page extends AutoCloseable {
    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
@@ -40,7 +40,7 @@ public interface LocatorAssertions {
  class IsAttachedOptions {
    public Boolean attached;
    /**
-     * Time to retry the assertion for.
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
     */
    public Double timeout;

@@ -49,7 +49,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 IsAttachedOptions setTimeout(double timeout) {
      this.timeout = timeout;
@@ -59,7 +59,7 @@ public interface LocatorAssertions {
  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;

@@ -68,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;
@@ -77,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;
@@ -92,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;

@@ -101,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;
@@ -110,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;
@@ -125,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;

@@ -134,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;
@@ -143,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;
@@ -157,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;
@@ -176,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;

@@ -189,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;
@@ -198,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;
@@ -222,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;
    /**
@@ -239,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;
@@ -255,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;
@@ -269,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;
@@ -283,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;
@@ -297,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;
@@ -311,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;
@@ -325,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;
@@ -344,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;
    /**
@@ -361,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;
@@ -377,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;
@@ -391,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;
@@ -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;
@@ -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");
  }
@@ -214,6 +214,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());
@@ -445,6 +461,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();
@@ -455,6 +475,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();
@@ -580,7 +604,7 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
      updateInterceptionPatterns();
    }
    if (handled == Router.HandleResult.NoMatchingHandler || handled == Router.HandleResult.Fallback) {
-      route.resume();
+      route.resume(null, true);
    }
  }

@@ -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;
@@ -42,6 +41,7 @@ class BrowserImpl extends ChannelOwner implements Browser {
  private boolean isConnected = true;
  BrowserTypeImpl browserType;
  BrowserType.LaunchOptions launchOptions;
+  private Path tracePath;

  enum EventType {
    DISCONNECTED,
@@ -231,6 +231,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());
@@ -245,7 +246,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) {
@@ -276,6 +290,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);
@@ -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");
+  }
+}
@@ -359,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);
    }
@@ -407,7 +407,7 @@ class LocatorImpl implements Locator {
    if (other.frame != frame) {
      throw new PlaywrightException("Locators must belong to the same frame.");
    }
-    return locator(other.selector, options);
+    return new LocatorImpl(frame, this.selector + " >> internal:chain=" + gson().toJson(other.selector), options);
  }

  @Override
@@ -936,7 +936,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);
+      }
    });
  }

@@ -946,9 +955,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();
    }
@@ -32,6 +32,7 @@ class SerializedValue{
  String v;
  String d;
  String u;
+  String bi;
  public static class R {
    String p;
    String f;
@@ -58,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
@@ -71,7 +75,7 @@ public class RouteImpl extends ChannelOwner implements Route {
    }
    applyOverrides(options);
    if (shouldResumeIfFallbackIsCalled) {
-      resume();
+      resume(null, true);
    }
  }

@@ -114,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) {
@@ -132,6 +136,7 @@ public class RouteImpl extends ChannelOwner implements Route {
      }
    }
    params.addProperty("requestUrl", request.initializer.get("url").getAsString());
+    params.addProperty("isFallback", isFallback);
    sendMessageAsync("continue", 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)
@@ -330,6 +336,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 +359,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;
@@ -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));
  }
-
 }
@@ -89,7 +89,8 @@ class Utils {
  }


-  static Set<Character> escapeGlobChars = new HashSet<>(Arrays.asList('/', '$', '^', '+', '.', '(', ')', '=', '!', '|'));
+  // 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();
@@ -97,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 == '*') {
@@ -123,6 +128,12 @@ class Utils {
        case '?':
          tokens.append('.');
          break;
+        case '[':
+          tokens.append('[');
+          break;
+        case ']':
+          tokens.append(']');
+          break;
        case '{':
          inGroup = true;
          tokens.append('(');
@@ -139,7 +150,11 @@ class Utils {
          tokens.append("\\").append(c);
          break;
        default:
+          if (escapeGlobChars.contains(c)) {
+            tokens.append('\\');
+          }
          tokens.append(c);
+          break;
      }
    }
    tokens.append('$');
@@ -162,16 +177,15 @@ class Utils {
  static final int maxUplodBufferSize = 50 * 1024 * 1024;

  static boolean hasLargeFile(Path[] files) {
+    int 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 > maxUplodBufferSize;
  }

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

  static void checkFilePayloadSize(FilePayload[] files) {
+    int 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 > maxUplodBufferSize) {
+      throw new PlaywrightException("Cannot set buffer larger than 50Mb, please write it to a file and pass its path instead.");
    }
  }

@@ -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();
+  }
 }
@@ -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());
+  }
+}
@@ -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");
@@ -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.
@@ -124,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;
@@ -207,4 +208,21 @@ public class TestPageLocatorQuery extends TestBase {
    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"});
+  }
+
 }
@@ -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");
@@ -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());
+    }
  }
 }
@@ -230,4 +230,13 @@ public class TestSelectorsMisc extends TestBase {
    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)"));
+  }
+
 }
@@ -16,6 +16,7 @@

 package com.microsoft.playwright;

+import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledIf;
 import org.junit.jupiter.api.condition.EnabledIf;
@@ -28,6 +29,11 @@ import static org.junit.jupiter.api.Assertions.*;

 public class TestWorkers extends TestBase {

+  private int browserMajorVersion() {
+    String version = browser.version();
+    return Integer.parseInt(version.split("\\.")[0]);
+  }
+
  @Test
  void pageWorkers() {
    Worker worker = page.waitForWorker(() -> page.navigate(server.PREFIX + "/worker/worker.html"));
@@ -145,6 +151,7 @@ public class TestWorkers extends TestBase {

  @Test
  void shouldReportNetworkActivity() {
+    Assumptions.assumeFalse(isFirefox() && browserMajorVersion() < 114);
    Worker worker = page.waitForWorker(() -> page.navigate(server.PREFIX + "/worker/worker.html"));
    String url = server.PREFIX + "/one-style.css";
    Request[] request = {null};
@@ -160,6 +167,7 @@ public class TestWorkers extends TestBase {

  @Test
  void shouldReportNetworkActivityOnWorkerCreation() {
+    Assumptions.assumeFalse(isFirefox() && browserMajorVersion() < 114);
    // Chromium needs waitForDebugger enabled for this one.
    page.navigate(server.EMPTY_PAGE);
    String url = server.PREFIX + "/one-style.css";
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>File upload test</title>
+  </head>
+  <body>
+    <form action="/upload" method="post" enctype="multipart/form-data">
+      <input type="file" multiple name="file1">
+      <input type="submit">
+    </form>
+  </body>
+</html>
@@ -6,7 +6,7 @@

  <groupId>com.microsoft.playwright</groupId>
  <artifactId>parent-pom</artifactId>
-  <version>1.34.0-SNAPSHOT</version>
+  <version>1.37.0</version>
  <packaging>pom</packaging>
  <name>Playwright Parent Project</name>
  <description>Java library to automate Chromium, Firefox and WebKit with a single API.
@@ -1 +1 @@
-1.34.2
+1.37.0-beta-1691701681000
@@ -6,7 +6,7 @@

  <groupId>com.microsoft.playwright</groupId>
  <artifactId>api-generator</artifactId>
-  <version>1.34.0-SNAPSHOT</version>
+  <version>1.37.0</version>
  <name>Playwright - API Generator</name>
  <description>
    This is an internal module used to generate Java API from the upstream Playwright
@@ -964,7 +964,7 @@ class Interface extends TypeDefinition {
    if (asList("Page", "Frame", "ElementHandle", "Locator", "APIRequest", "Browser", "BrowserContext", "BrowserType", "Route", "Request", "Response", "JSHandle", "ConsoleMessage", "APIResponse", "Playwright").contains(jsonName)) {
      output.add("import java.util.*;");
    }
-    if (asList("Page", "Browser", "BrowserContext", "WebSocket", "Worker").contains(jsonName)) {
+    if (asList("Page", "Browser", "BrowserContext", "WebSocket", "Worker", "CDPSession").contains(jsonName)) {
      output.add("import java.util.function.Consumer;");
    }
    if (asList("Page", "BrowserContext").contains(jsonName)) {
@@ -977,6 +977,9 @@ class Interface extends TypeDefinition {
    if (asList("Page", "Frame", "FrameLocator", "Locator", "Browser", "BrowserType", "BrowserContext", "PageAssertions", "LocatorAssertions").contains(jsonName)) {
      output.add("import java.util.regex.Pattern;");
    }
+    if ("CDPSession".equals(jsonName)) {
+      output.add("import com.google.gson.JsonObject;");
+    }
    if ("PlaywrightAssertions".equals(jsonName)) {
      output.add("import com.microsoft.playwright.APIResponse;");
      output.add("import com.microsoft.playwright.Locator;");
@@ -4,7 +4,7 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>com.microsoft.playwright</groupId>
  <artifactId>test-cli-fatjar</artifactId>
-  <version>1.34.0-SNAPSHOT</version>
+  <version>1.37.0</version>
  <name>Test Playwright Command Line FatJar</name>
  <properties>
    <compiler.version>1.8</compiler.version>
@@ -4,7 +4,7 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>com.microsoft.playwright</groupId>
  <artifactId>test-cli-version</artifactId>
-  <version>1.34.0-SNAPSHOT</version>
+  <version>1.37.0</version>
  <name>Test Playwright Command Line Version</name>
  <properties>
    <compiler.version>1.8</compiler.version>
@@ -4,7 +4,7 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>com.microsoft.playwright</groupId>
  <artifactId>test-local-installation</artifactId>
-  <version>1.34.0-SNAPSHOT</version>
+  <version>1.37.0</version>
  <name>Test local installation</name>
  <description>Runs Playwright test suite (copied from playwright module) against locally cached Playwright</description>
  <properties>
@@ -9,7 +9,7 @@
  </parent>
  <groupId>com.microsoft.playwright</groupId>
  <artifactId>test-spring-boot-starter</artifactId>
-  <version>1.34.0-SNAPSHOT</version>
+  <version>1.37.0</version>
  <name>Test Playwright With Spring Boot</name>
  <properties>
    <spring.version>2.4.3</spring.version>
@@ -6,7 +6,7 @@

  <groupId>com.microsoft.playwright</groupId>
  <artifactId>update-version</artifactId>
-  <version>1.34.0-SNAPSHOT</version>
+  <version>1.37.0</version>
  <name>Playwright - Update Version in Documentation</name>
  <description>
    This is an internal module used to update versions in the documentation based on
Author	SHA1	Message	Date
Yury Semikhatsky	0a5673b8bc	chore: mark 1.37.0 (#1349 )	2023-08-14 09:08:57 -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