chore: mark 1.37.0 (#1349 )

2026-05-23 11:13:15 +00:00 · 2023-08-14 09:08:57 -07:00
318 changed files with 6239 additions and 19358 deletions
@@ -1,115 +0,0 @@
-{
-  "hydrated": false,
-  "properties": {
-    "helpUri": "https://eng.ms/docs/microsoft-security/security/azure-security/cloudai-security-fundamentals-engineering/security-integration/guardian-wiki/microsoft-guardian/general/suppressions",
-    "hydrationStatus": "This file does not contain identifying data. It is safe to check into your repo. To hydrate this file with identifying data, run `guardian hydrate --help` and follow the guidance."
-  },
-  "version": "1.0.0",
-  "suppressionSets": {
-    "default": {
-      "name": "default",
-      "createdDate": "2024-02-06 20:37:57Z",
-      "lastUpdatedDate": "2024-02-06 20:37:57Z"
-    }
-  },
-  "results": {
-    "de854c6ab9b27b1ec642cec1a51059b92f88815a231c1c8f4b8e71d9e378f174": {
-      "signature": "de854c6ab9b27b1ec642cec1a51059b92f88815a231c1c8f4b8e71d9e378f174",
-      "alternativeSignatures": [
-        "79827cf2e75a7f99eec716562fb9fa0d49014ac96b7afc76d29d79a33e8edd94"
-      ],
-      "memberOf": [
-        "default"
-      ],
-      "createdDate": "2024-02-06 20:37:57Z"
-    },
-    "ebe0026db71ae4bb2d8e76b706198003079a5c095658de8dd49e67f7e572ea46": {
-      "signature": "ebe0026db71ae4bb2d8e76b706198003079a5c095658de8dd49e67f7e572ea46",
-      "alternativeSignatures": [],
-      "memberOf": [
-        "default"
-      ],
-      "createdDate": "2024-02-06 20:37:57Z"
-    },
-    "bb02ef965dce40b6c950b6d0cf8a9f41c08c5e33f17268fb208f3687b11ffa26": {
-      "signature": "bb02ef965dce40b6c950b6d0cf8a9f41c08c5e33f17268fb208f3687b11ffa26",
-      "alternativeSignatures": [
-        "3a8630eaccc2c5c39ae78836bb115bf55557058bad206fdad7dbe4f0ae466ed1"
-      ],
-      "memberOf": [
-        "default"
-      ],
-      "createdDate": "2024-02-06 20:37:57Z"
-    },
-    "dffa3e24f6dc7542d741b2fab22eec657aca441a51cee515ca9bb4932995a416": {
-      "signature": "dffa3e24f6dc7542d741b2fab22eec657aca441a51cee515ca9bb4932995a416",
-      "alternativeSignatures": [
-        "56a4b454840e2c21d44a76d9ab09fde76fba682ce7508a3f6abf7b411d389e56"
-      ],
-      "memberOf": [
-        "default"
-      ],
-      "createdDate": "2024-02-06 20:37:57Z"
-    },
-    "5dbcaaac8cdccc6df557cbde94e5d7e0f1c8a67546ba82a1b85b629030f3d311": {
-      "signature": "5dbcaaac8cdccc6df557cbde94e5d7e0f1c8a67546ba82a1b85b629030f3d311",
-      "alternativeSignatures": [
-        "fdb8e8af8d5697f767d0e55194f91d4a089d981555e00d058ba866acb8602014"
-      ],
-      "memberOf": [
-        "default"
-      ],
-      "createdDate": "2024-02-06 20:37:57Z"
-    },
-    "b7db026b2a60bdb63af1c0938ac16d9414bb4d38e9efdc51626e12aa55f6b72f": {
-      "signature": "b7db026b2a60bdb63af1c0938ac16d9414bb4d38e9efdc51626e12aa55f6b72f",
-      "alternativeSignatures": [
-        "bf7bb897e644659827d8dc8d55f719296d3ab94dc750b666ce90d8057361d9d5"
-      ],
-      "memberOf": [
-        "default"
-      ],
-      "createdDate": "2024-02-06 20:37:57Z"
-    },
-    "aa702d85554c352e3016e3ec3d790df489833dc97e3733c58b57915ec125f47b": {
-      "signature": "aa702d85554c352e3016e3ec3d790df489833dc97e3733c58b57915ec125f47b",
-      "alternativeSignatures": [
-        "948787329d52a66b4691383c81af407b03e68344a6685bbab3cfa8eb8db34f81"
-      ],
-      "memberOf": [
-        "default"
-      ],
-      "createdDate": "2024-02-06 20:37:57Z"
-    },
-    "38174b5c9b474c3c0278d4c4173c14022e03dec3dc4db5ced51d2ca8459e7f2a": {
-      "signature": "38174b5c9b474c3c0278d4c4173c14022e03dec3dc4db5ced51d2ca8459e7f2a",
-      "alternativeSignatures": [
-        "a9efa99679f3966da96a8b89f1250576cfceda774556d43ea89ea84289967276"
-      ],
-      "memberOf": [
-        "default"
-      ],
-      "createdDate": "2024-02-06 20:37:57Z"
-    },
-    "08a4e1be4662d897e5b2b7a7dc6d6901405462cd2d5f8ad433c13e12a8503fb6": {
-      "signature": "08a4e1be4662d897e5b2b7a7dc6d6901405462cd2d5f8ad433c13e12a8503fb6",
-      "alternativeSignatures": [
-        "009132f89939956a3f4471bb13353394015c9a7e675d118aa427e75f05658e05"
-      ],
-      "memberOf": [
-        "default"
-      ],
-      "createdDate": "2024-02-06 20:37:57Z"
-    },
-    "551d69737553150380e58bc9a8ae1e8f17da931561ea4e195781fb8cad225188": {
-      "signature": "551d69737553150380e58bc9a8ae1e8f17da931561ea4e195781fb8cad225188",
-      "alternativeSignatures": [
-        "617ad56322c5fb82a162b0b583e676d66a8e76b0d444aaab487865e4bf89e83b"
-      ],
-      "memberOf": [
-        "default"
-      ],
-      "createdDate": "2024-02-06 20:37:57Z"
-    }
-  }
-}
@@ -1,97 +1,60 @@
+trigger:
+  none
+  
+# don't trigger for Pull Requests
 pr: none

-trigger:
-  tags:
-    include:
-    - '*'
+pool:
+  vmImage: ubuntu-22.04

-resources:
-  repositories:
-  - repository: 1esPipelines
-    type: git
-    name: 1ESPipelineTemplates/1ESPipelineTemplates
-    ref: refs/tags/release
+steps:
+- bash: |
+    if [[ ! "$CURRENT_BRANCH" =~ ^release-.* ]]; then
+      echo "Can only publish from a release branch."
+      echo "Unexpected branch name: $CURRENT_BRANCH"
+      exit 1
+    fi
+  env:
+    CURRENT_BRANCH: ${{ variables['Build.SourceBranchName'] }}
+  displayName: "Check the branch is a release branch"

-extends:
-  template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
-  parameters:
-    pool:
-      name: DevDivPlaywrightAzurePipelinesUbuntu2204
-      os: linux
-    sdl:
-      sourceAnalysisPool:
-        name: DevDivPlaywrightAzurePipelinesWindows2022
-        # The image must be windows-based due to restrictions of the SDL tools. See: https://aka.ms/AAo6v8e
-        # In the case of a windows build, this can be the same as the above pool image.
-        os: windows
-      suppression:
-        suppressionFile: $(Build.SourcesDirectory)\.azure-pipelines\guardian\SDL\.gdnsuppress
-    stages:
-    - stage: Stage
-      jobs:
-      - job: Build
-        templateContext:
-          outputs:
-          - output: pipelineArtifact
-            path: $(Build.ArtifactStagingDirectory)/esrp-build
-            artifact: esrp-build
-        steps:
-        - bash: |
-            if [[ ! "$CURRENT_BRANCH" =~ ^v1\..* ]]; then
-              echo "Can only publish from a release tag branch (v1.*)."
-              echo "Unexpected branch name: $CURRENT_BRANCH"
-              exit 1
-            fi
-          env:
-            CURRENT_BRANCH: ${{ variables['Build.SourceBranchName'] }}
-          displayName: "Check the branch is a release branch"
-        
-        - bash: |
-            echo "importing GPG key:"
-            # Pipeline variables do not preserve line ends so we use base64 instead of --armored as a workaround.
-            echo $GPG_PRIVATE_KEY_BASE64 | base64 -d | gpg --batch --import
-            echo "list keys after import:"
-            gpg --list-keys
-          env:
-           GPG_PRIVATE_KEY_BASE64: $(GPG_PRIVATE_KEY_BASE64) # secret variable has to be mapped to an env variable
-          displayName: "Import gpg key"
-        
-        - bash: ./scripts/download_driver.sh
-          displayName: 'Download driver'
-        
-        - bash: mvn -B deploy -D skipTests --no-transfer-progress --activate-profiles release -D gpg.passphrase=$GPG_PASSPHRASE -DaltDeploymentRepository=snapshot-repo::default::file:$(Build.ArtifactStagingDirectory)/esrp-build
-          displayName: 'Build and deploy to a local directory'
-          env:
-            GPG_PASSPHRASE: $(GPG_PASSPHRASE) # secret variable has to be mapped to an env variable
+- bash: |
+    echo "importing GPG key:"
+    # Pipeline variables do not preserve line ends so we use base64 instead of --armored as a workaround.
+    echo $GPG_PRIVATE_KEY_BASE64 | base64 -d | gpg --batch --import
+    echo "list keys after import:"
+    gpg --list-keys
+  env:
+   GPG_PRIVATE_KEY_BASE64: $(GPG_PRIVATE_KEY_BASE64) # secret variable has to be mapped to an env variable
+  displayName: "Import gpg key"

-      - job: Publish
-        dependsOn: Build
-        templateContext:
-          type: releaseJob
-          isProduction: true
-          inputs:
-          - input: pipelineArtifact
-            artifactName: esrp-build
-            targetPath: $(Build.ArtifactStagingDirectory)/esrp-build
-        steps:
-          - checkout: none
-          - task: EsrpRelease@9
-            inputs:
-              connectedservicename: 'Playwright-ESRP-PME'
-              usemanagedidentity: true
-              keyvaultname: 'playwright-esrp-pme'
-              signcertname: 'ESRP-Release-Sign'
-              clientid: '13434a40-7de4-4c23-81a3-d843dc81c2c5'
-              intent: 'PackageDistribution'
-              contenttype: 'Maven'
-              # Keeping it commented out as a workaround for:
-              # https://portal.microsofticm.com/imp/v3/incidents/incident/499972482/summary
-              # contentsource: 'folder'
-              folderlocation: '$(Build.ArtifactStagingDirectory)/esrp-build'
-              waitforreleasecompletion: true
-              owners: 'yurys@microsoft.com'
-              approvers: 'yurys@microsoft.com'
-              serviceendpointurl: 'https://api.esrp.microsoft.com'
-              mainpublisher: 'Playwright'
-              domaintenantid: '975f013f-7f24-47e8-a7d3-abc4752bf346'
-            displayName: 'ESRP Release to Maven'
+- bash: ./scripts/download_driver_for_all_platforms.sh
+  displayName: 'Download driver'
+
+- bash: mvn -B deploy -D skipTests --no-transfer-progress --activate-profiles release -D gpg.passphrase=$GPG_PASSPHRASE -DaltDeploymentRepository=snapshot-repo::default::file:$(pwd)/local-build
+  displayName: 'Build and deploy to a local directory'
+  env:
+    GPG_PASSPHRASE: $(GPG_PASSPHRASE) # secret variable has to be mapped to an env variable
+
+- bash: |
+    for file in $(find snapshots -type f); do
+      echo "processing: $file"
+      if [[ $file =~ \.(md5|sha1|sha256)$ ]]; then
+        continue
+      fi
+      sha256sum "$file" | cut -f1 -d \ > "$file.sha256"
+    done
+  displayName: 'Create .sha256 files'
+
+- task: EsrpRelease@2
+  inputs:
+    ConnectedServiceName: 'Playwright-Java-ESRP'
+    Intent: 'PackageDistribution'
+    ContentType: 'Maven'
+    PackageLocation: './local-build'
+    Owners: 'yurys@microsoft.com'
+    Approvers: 'maxschmitt@microsoft.com'
+    ServiceEndpointUrl: 'https://api.esrp.microsoft.com'
+    MainPublisher: 'PlaywrightJava'
+    DomainTenantId: '72f988bf-86f1-41af-91ab-2d7cd011db47'
+  displayName: 'ESRP Release to Maven'
@@ -1,22 +0,0 @@
---
-name: playwright-roll
-description: Roll Playwright Java to a new version
---
-
-Help the user roll to a new version of Playwright.
-ROLLING.md contains general instructions and scripts.
-
-Start with updating the version and generating the API to see the state of things.
-Afterwards, work through the list of changes that need to be backported.
-You can find a list of pull requests that might need to be taking into account in the issue titled "Backport changes".
-Work through them one-by-one and check off the items that you have handled.
-Not all of them will be relevant, some might have partially been reverted, etc. - so feel free to check with the upstream release branch.
-
-Rolling includes:
- updating client implementation to match changes in the upstream JS implementation (see ../playwright/packages/playwright-core/src/client)
- adding a couple of new tests to verify new/changed functionality
-
-## Tips & Tricks
- Project checkouts are in the parent directory (`../`).
- When updating checkboxes, store the issue content into /tmp and edit it there, then update the issue based on the file
- use the "gh" cli to interact with GitHub
@@ -1,28 +0,0 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the
-// README at: https://github.com/devcontainers/templates/tree/main/src/java
-{
-	"name": "Java",
-	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
-	"image": "mcr.microsoft.com/devcontainers/java:1-21-bookworm",
-
-	"features": {
-		"ghcr.io/devcontainers/features/java:1": {
-			"version": "none",
-			"installGradle": "false",
-			"installMaven": "true"
-		},
-		"ghcr.io/devcontainers/features/docker-outside-of-docker:1": {}
-	}
-
-	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	// "forwardPorts": [],
-
-	// Use 'postCreateCommand' to run commands after the container is created.
-	// "postCreateCommand": "java -version",
-
-	// Configure tool-specific properties.
-	// "customizations": {},
-
-	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
-	// "remoteUser": "root"
-}
@@ -0,0 +1,64 @@
+---
+name: Bug Report
+about: Something doesn't work like it should? Tell us!
+title: "[BUG]"
+labels: ''
+assignees: ''
+
+---
+
+<!-- ⚠️⚠️ Do not delete this template ⚠️⚠️ -->
+
+<!-- 🔎 Search existing issues to avoid creating duplicates. -->
+<!-- 🧪 Test using the latest Playwright release to see if your issue has already been fixed -->
+<!-- 💡 Provide enough information for us to be able to reproduce your issue locally -->
+
+### System info
+- Playwright Version: [v1.XX]
+- Operating System: [All, Windows 11, Ubuntu 20, macOS 13.2, etc.]
+- Browser: [All, Chromium, Firefox, WebKit]
+- Other info:
+
+### Source code
+
+- [ ] I provided exact source code that allows reproducing the issue locally.
+
+<!-- For simple cases, please provide a self-contained test file along with the config file -->
+<!-- For larger cases, you can provide a GitHub repo you created for this issue -->
+<!-- If we can not reproduce the problem locally, we won't be able to act on it -->
+<!-- You can still file without the exact code and we will try to help, but if we can't repro, it will be closed -->
+
+**Link to the GitHub repository with the repro**
+
+[https://github.com/your_profile/playwright_issue_title]
+
+or
+
+**Test file (self-contained)**
+
+```java
+import com.microsoft.playwright.*;
+
+public class ExampleReproducible {
+  public static void main(String[] args) {
+    try (Playwright playwright = Playwright.create()) {
+      Browser browser = playwright.chromium().launch();
+      BrowserContext context = browser.newContext();
+      Page page = context.newPage();
+      // ...
+    }
+  }
+}
+```
+
+**Steps**
+- [Run the test]
+- [...]
+
+**Expected**
+
+[Describe expected behavior]
+
+**Actual**
+
+[Describe actual behavior]
@@ -1,95 +0,0 @@
-name: Bug Report 🪲
-description: Create a bug report to help us improve
-title: '[Bug]: '
-body:
-  - type: markdown
-    attributes:
-      value: |
-        # Please follow these steps first:
-  - type: markdown
-    attributes:
-      value: |
-        ## Troubleshoot
-        If Playwright is not behaving the way you expect, we'd ask you to look at the [documentation](https://playwright.dev/java/docs/intro) and search the issue tracker for evidence supporting your expectation.
-        Please make reasonable efforts to troubleshoot and rule out issues with your code, the configuration, or any 3rd party libraries you might be using.
-        Playwright offers [several debugging tools](https://playwright.dev/java/docs/debug) that you can use to troubleshoot your issues.
-  - type: markdown
-    attributes:
-      value: |
-        ## Ask for help through appropriate channels
-        If you feel unsure about the cause of the problem, consider asking for help on for example [StackOverflow](https://stackoverflow.com/questions/ask) or our [Discord channel](https://aka.ms/playwright/discord) before posting a bug report. The issue tracker is not a help forum.
-  - type: markdown
-    attributes:
-      value: |
-        ## Make a minimal reproduction
-        To file the report, you will need a GitHub repository with a minimal (but complete) example and simple/clear steps on how to reproduce the bug.
-        The simpler you can make it, the more likely we are to successfully verify and fix the bug.
-  - type: markdown
-    attributes:
-      value: |
-        > [!IMPORTANT]
-        > Bug reports without a minimal reproduction will be rejected.
-
-        ---
-  - type: input
-    id: version
-    attributes:
-      label: Version
-      description: |
-        The version of Playwright you are using.
-        Is it the [latest](https://github.com/microsoft/playwright-java/releases)? Test and see if the bug has already been fixed.
-      placeholder: ex. 1.41.1
-    validations:
-      required: true
-  - type: textarea
-    id: reproduction
-    attributes:
-      label: Steps to reproduce
-      description: Please link to a repository with a minimal reproduction and describe accurately how we can reproduce/verify the bug.
-      placeholder: |
-        Example steps (replace with your own):
-        1. Clone my repo at https://github.com/<myuser>/example
-        2. mvn test
-        3. You should see the error come up
-    validations:
-      required: true
-  - type: textarea
-    id: expected
-    attributes:
-      label: Expected behavior
-      description: A description of what you expect to happen.
-      placeholder: I expect to see X or Y
-    validations:
-      required: true
-  - type: textarea
-    id: what-happened
-    attributes:
-      label: Actual behavior
-      description: |
-        A clear and concise description of the unexpected behavior.
-        Please include any relevant output here, especially any error messages.
-      placeholder: A bug happened!
-    validations:
-      required: true
-  - type: textarea
-    id: context
-    attributes:
-      label: Additional context
-      description: Anything else that might be relevant
-    validations:
-      required: false
-  - type: textarea
-    id: envinfo
-    attributes:
-      label: Environment
-      description: |
-        Please provide information about the environment you are running in.
-      placeholder: |
-        - Operating System: [Ubuntu 22.04]
-        - CPU: [arm64]
-        - Browser: [All, Chromium, Firefox, WebKit]
-        - Java Version: [20]
-        - Maven Version: [3.8.6]
-        - Other info:
-    validations:
-      required: true
@@ -1,4 +1,3 @@
-blank_issues_enabled: false
 contact_links:
  - name: Join our Discord Server
    url: https://aka.ms/playwright/discord
@@ -1,29 +0,0 @@
-name: Documentation 📖
-description: Submit a request to add or update documentation
-title: '[Docs]: '
-labels: ['Documentation :book:']
-body:
-  - type: markdown
-    attributes:
-      value: |
-        ### Thank you for helping us improve our documentation!
-        Please be sure you are looking at [the Next version of the documentation](https://playwright.dev/java/docs/next/intro) before opening an issue here.
-  - type: textarea
-    id: links
-    attributes:
-      label: Page(s)
-      description: |
-        Links to one or more documentation pages that should be modified.
-        If you are reporting an issue with a specific section of a page, try to link directly to the nearest anchor.
-        If you are suggesting that a new page be created, link to the parent of the proposed page.
-    validations:
-      required: true
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: |
-        Describe the change you are requesting.
-        If the issue pertains to a single function or matcher, be sure to specify the entire call signature.
-    validations:
-      required: true
@@ -1,30 +0,0 @@
-name: Feature Request 🚀
-description: Submit a proposal for a new feature
-title: '[Feature]: '
-body:
-  - type: markdown
-    attributes:
-      value: |
-        ### Thank you for taking the time to suggest a new feature!
-  - type: textarea
-    id: description
-    attributes:
-      label: '🚀 Feature Request'
-      description: A clear and concise description of what the feature is.
-    validations:
-      required: true
-  - type: textarea
-    id: example
-    attributes:
-      label: Example
-      description: Describe how this feature would be used.
-    validations:
-      required: false
-  - type: textarea
-    id: motivation
-    attributes:
-      label: Motivation
-      description: |
-        Outline your motivation for the proposal. How will it make Playwright better?
-    validations:
-      required: true
@@ -0,0 +1,11 @@
+---
+name: Feature request
+about: Request new features to be added
+title: "[Feature]"
+labels: ''
+assignees: ''
+
+---
+
+Let us know what functionality you'd like to see in Playwright and what your use case is.
+Do you think others might benefit from this as well?
@@ -1,27 +0,0 @@
-name: 'Questions / Help 💬'
-description: If you have questions, please check StackOverflow or Discord
-title: '[Please read the message below]'
-labels: [':speech_balloon: Question']
-body:
-  - type: markdown
-    attributes:
-      value: |
-        ## Questions and Help 💬
-
-        This issue tracker is reserved for bug reports and feature requests.
-
-        For anything else, such as questions or getting help, please see:
-
-        - [The Playwright documentation](https://playwright.dev/java)
-        - [Our Discord server](https://aka.ms/playwright/discord)
-  - type: checkboxes
-    id: no-post
-    attributes:
-      label: |
-        Please do not submit this issue.
-      description: |
-        > [!IMPORTANT]
-        > This issue will be closed.
-      options:
-        - label: I understand
-          required: true
@@ -0,0 +1,38 @@
+---
+name: Report regression
+about: Functionality that used to work and does not any more
+title: "[REGRESSION]: "
+labels: ''
+assignees: ''
+
+---
+
+**Context:**
+- GOOD Playwright Version: [what Playwright version worked nicely?]
+- BAD Playwright Version: [what Playwright version doesn't work any more?]
+- Operating System: [e.g. Windows, Linux or Mac]
+- Extra: [any specific details about your environment]
+
+**Code Snippet**
+
+Help us help you! Put down a short code snippet that illustrates your bug and
+that we can run and debug locally. For example:
+
+```java
+import com.microsoft.playwright.*;
+
+public class ExampleReproducible {
+  public static void main(String[] args) {
+    try (Playwright playwright = Playwright.create()) {
+      Browser browser = playwright.chromium().launch();
+      BrowserContext context = browser.newContext();
+      Page page = context.newPage();
+      // ...
+    }
+  }
+}
+```
+
+**Describe the bug**
+
+Add any other details about the problem here.
@@ -1,90 +0,0 @@
-name: Report regression
-description: Functionality that used to work and does not any more
-title: "[Regression]: "
-body:
-  - type: markdown
-    attributes:
-      value: |
-        # Please follow these steps first:
-  - type: markdown
-    attributes:
-      value: |
-        ## Make a minimal reproduction
-        To file the report, you will need a GitHub repository with a minimal (but complete) example and simple/clear steps on how to reproduce the regression.
-        The simpler you can make it, the more likely we are to successfully verify and fix the regression.
-  - type: markdown
-    attributes:
-      value: |
-        > [!IMPORTANT]
-        > Regression reports without a minimal reproduction will be rejected.
-
-        ---
-  - type: input
-    id: goodVersion
-    attributes:
-      label: Last Good Version
-      description: |
-        Last version of Playwright where the feature was working.
-      placeholder: ex. 1.40.1
-    validations:
-      required: true
-  - type: input
-    id: badVersion
-    attributes:
-      label: First Bad Version
-      description: |
-        First version of Playwright where the feature was broken.
-        Is it the [latest](https://github.com/microsoft/playwright-java/releases)? Test and see if the regression has already been fixed.
-      placeholder: ex. 1.41.1
-    validations:
-      required: true
-  - type: textarea
-    id: reproduction
-    attributes:
-      label: Steps to reproduce
-      description: Please link to a repository with a minimal reproduction and describe accurately how we can reproduce/verify the bug.
-      placeholder: |
-        Example steps (replace with your own):
-        1. Clone my repo at https://github.com/<myuser>/example
-        2. mvn test
-        3. You should see the error come up
-    validations:
-      required: true
-  - type: textarea
-    id: expected
-    attributes:
-      label: Expected behavior
-      description: A description of what you expect to happen.
-      placeholder: I expect to see X or Y
-    validations:
-      required: true
-  - type: textarea
-    id: what-happened
-    attributes:
-      label: Actual behavior
-      description: A clear and concise description of the unexpected behavior.
-      placeholder: A bug happened!
-    validations:
-      required: true
-  - type: textarea
-    id: context
-    attributes:
-      label: Additional context
-      description: Anything else that might be relevant
-    validations:
-      required: false
-  - type: textarea
-    id: envinfo
-    attributes:
-      label: Environment
-      description: |
-        Please provide information about the environment you are running in.
-      placeholder: |
-        - Operating System: [Ubuntu 22.04]
-        - CPU: [arm64]
-        - Browser: [All, Chromium, Firefox, WebKit]
-        - Java Version: [20]
-        - Maven Version: [3.8.6]
-        - Other info:
-    validations:
-      required: true
@@ -1,27 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "maven"
-    directory: "/" # Location of the pom.xml file
-    schedule:
-      interval: "monthly"
-    open-pull-requests-limit: 10
-    groups:
-      # Create a group of dependencies to be updated together in one pull request
-      all:
-        applies-to: version-updates
-        patterns:
-          - "*"
-        update-types:
-          - "minor"
-          - "patch"
-    allow:
-      - dependency-type: "direct" # Optional: Only update direct dependencies
-      - dependency-type: "indirect" # Optional: Only update indirect (transitive) dependencies
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "monthly"
-    groups:
-      actions:
-        patterns:
-          - "*" 
@@ -0,0 +1,25 @@
+name: "devrelease:docker"
+
+on:
+  push:
+    branches:
+      - main
+jobs:
+  publish-canary-docker:
+    name: "publish to DockerHub"
+    runs-on: ubuntu-20.04
+    if: github.repository == 'microsoft/playwright-java'
+    steps:
+    - uses: actions/checkout@v2
+    - uses: azure/docker-login@v1
+      with:
+        login-server: playwright.azurecr.io
+        username: playwright
+        password: ${{ secrets.DOCKER_PASSWORD }}
+    - uses: actions/checkout@v2
+    - name: Set up Docker QEMU for arm64 docker builds
+      uses: docker/setup-qemu-action@v1
+      with:
+        platforms: arm64
+    - name: publish docker canary
+      run: ./utils/docker/publish_docker.sh canary
@@ -1,30 +0,0 @@
-name: Publish Release Docker
-on:
-  release:
-    types: [published]
-  workflow_dispatch:
-jobs:
-  publish-canary-docker:
-    name: publish to DockerHub
-    runs-on: ubuntu-22.04
-    permissions:
-      id-token: write   # This is required for OIDC login (azure/login) to succeed
-      contents: read    # This is required for actions/checkout to succeed
-    environment: Docker
-    if: github.repository == 'microsoft/playwright-java'
-    steps:
-    - uses: actions/checkout@v6
-    - name: Azure login
-      uses: azure/login@v2
-      with:
-        client-id: ${{ secrets.AZURE_DOCKER_CLIENT_ID }}
-        tenant-id: ${{ secrets.AZURE_DOCKER_TENANT_ID }}
-        subscription-id: ${{ secrets.AZURE_DOCKER_SUBSCRIPTION_ID }}
-    - name: Login to ACR via OIDC
-      run: az acr login --name playwright
-    - name: Set up Docker QEMU for arm64 docker builds
-      uses: docker/setup-qemu-action@v3
-      with:
-        platforms: arm64
-    - uses: actions/checkout@v6
-    - run: ./utils/docker/publish_docker.sh stable
@@ -0,0 +1,33 @@
+name: Publish Release Docker
+on:
+  release:
+    types: [published]
+  workflow_dispatch:
+    inputs:
+      is_release:
+        required: true
+        type: boolean
+        description: "Is this a release image?"
+    branches:
+      - release-*
+jobs:
+  publish-canary-docker:
+    name: publish to DockerHub
+    runs-on: ubuntu-20.04
+    if: github.repository == 'microsoft/playwright-java'
+    steps:
+    - uses: actions/checkout@v2
+    - uses: azure/docker-login@v1
+      with:
+        login-server: playwright.azurecr.io
+        username: playwright
+        password: ${{ secrets.DOCKER_PASSWORD }}
+    - name: Set up Docker QEMU for arm64 docker builds
+      uses: docker/setup-qemu-action@v1
+      with:
+        platforms: arm64
+    - uses: actions/checkout@v2
+    - run: ./utils/docker/publish_docker.sh stable
+      if: (github.event_name != 'workflow_dispatch' && !github.event.release.prerelease) || (github.event_name == 'workflow_dispatch' && github.event.inputs.is_release == 'true')
+    - run: ./utils/docker/publish_docker.sh canary
+      if: (github.event_name != 'workflow_dispatch' && github.event.release.prerelease) || (github.event_name == 'workflow_dispatch' && github.event.inputs.is_release != 'true')
@@ -8,8 +8,6 @@ on:
    branches:
      - main
      - release-*
-env:
-  PW_MAX_RETRIES: 3
 jobs:
  dev:
    timeout-minutes: 30
@@ -20,25 +18,24 @@ jobs:
        browser: [chromium, firefox, webkit]
    runs-on: ${{ matrix.os }}
    steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v2
+    - uses: microsoft/playwright-github-action@v1
    - name: Set up JDK 1.8
-      uses: actions/setup-java@v5
+      uses: actions/setup-java@v2
      with:
        distribution: zulu
        java-version: 8
    - name: Download drivers
      shell: bash
-      run: scripts/download_driver.sh
+      run: scripts/download_driver_for_all_platforms.sh
    - name: Build & Install
      run: mvn -B install -D skipTests --no-transfer-progress
-    - name: Install browsers
-      run: mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI -D exec.args="install --with-deps" -f playwright/pom.xml --no-transfer-progress
    - name: Run tests
      run: mvn test --no-transfer-progress --fail-at-end -D org.slf4j.simpleLogger.showDateTime=true -D org.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss
      env:
        BROWSER: ${{ matrix.browser }}
    - name: Run tracing tests w/ sources
-      run: mvn test --no-transfer-progress --fail-at-end --projects=playwright -D test=*TestTracing* -D org.slf4j.simpleLogger.showDateTime=true -D org.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss
+      run: mvn test --no-transfer-progress --fail-at-end -D test=*TestTracing* -D org.slf4j.simpleLogger.showDateTime=true -D org.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss
      env:
        BROWSER: ${{ matrix.browser }}
        PLAYWRIGHT_JAVA_SRC: src/test/java
@@ -65,34 +62,29 @@ jobs:
            browser-channel: msedge
    runs-on: ${{ matrix.os }}
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v2
+      - uses: microsoft/playwright-github-action@v1
      - name: Install Media Pack
        if: matrix.os == 'windows-latest'
        shell: powershell
        run: Install-WindowsFeature Server-Media-Foundation
      - name: Set up JDK 1.8
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@v2
        with:
          distribution: zulu
          java-version: 8
      - name: Download drivers
        shell: bash
-        run: scripts/download_driver.sh
+        run: scripts/download_driver_for_all_platforms.sh
      - name: Build & Install
        run: mvn -B install -D skipTests --no-transfer-progress
-      - name: Install browsers
-        run: mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI -D exec.args="install --with-deps" -f playwright/pom.xml --no-transfer-progress
-      - name: Install MS Edge
-        if: matrix.browser-channel == 'msedge' && matrix.os == 'macos-latest'
-        shell: bash
-        run: mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI -D exec.args="install msedge" -f playwright/pom.xml
      - name: Run tests
        run: mvn test --no-transfer-progress --fail-at-end -D org.slf4j.simpleLogger.showDateTime=true -D org.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss
        env:
          BROWSER: chromium
          BROWSER_CHANNEL: ${{ matrix.browser-channel }}

-  Java_21:
+  Java_17:
    timeout-minutes: 30
    strategy:
      fail-fast: false
@@ -100,19 +92,18 @@ jobs:
        browser: [chromium, firefox, webkit]
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v6
-      - name: Set up JDK 21
-        uses: actions/setup-java@v5
+      - uses: actions/checkout@v2
+      - uses: microsoft/playwright-github-action@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v2
        with:
          distribution: adopt
-          java-version: 21
+          java-version: 17
      - name: Download drivers
        shell: bash
-        run: scripts/download_driver.sh
+        run: scripts/download_driver_for_all_platforms.sh
      - name: Build & Install
        run: mvn -B install -D skipTests --no-transfer-progress
-      - name: Install browsers
-        run: mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI -D exec.args="install --with-deps" -f playwright/pom.xml --no-transfer-progress
      - name: Run tests
        run: mvn test --no-transfer-progress --fail-at-end
        env:
@@ -13,15 +13,15 @@ jobs:
    timeout-minutes: 30
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v2
      - name: Cache Maven packages
-        uses: actions/cache@v4
+        uses: actions/cache@v2
        with:
          path: ~/.m2
          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
          restore-keys: ${{ runner.os }}-m2
      - name: Download drivers
-        run: scripts/download_driver.sh
+        run: scripts/download_driver_for_all_platforms.sh
      - name: Intall Playwright
        run: mvn install -D skipTests --no-transfer-progress
      - name: Test CLI
@@ -11,7 +11,7 @@ on:
    paths:
      - .github/workflows/test_docker.yml
      - '**/Dockerfile*'
-      - scripts/DRIVER_VERSION
+      - scripts/CLI_VERSION
      - '**/pom.xml'
    branches:
      - main
@@ -20,33 +20,16 @@ jobs:
  test:
    name: Test
    timeout-minutes: 120
-    runs-on: ${{ matrix.runs-on }}
-    env:
-      PW_MAX_RETRIES: 3
+    runs-on: ubuntu-22.04
    strategy:
      fail-fast: false
      matrix:
-        flavor: [jammy, noble]
-        runs-on: [ubuntu-24.04, ubuntu-24.04-arm]
+        flavor: [focal, jammy]
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v3
      - name: Build Docker image
+        run: bash utils/docker/build.sh --amd64 ${{ matrix.flavor }} playwright-java:localbuild-${{ matrix.flavor }}
+      - name: Test
        run: |
-          ARCH="${{ matrix.runs-on == 'ubuntu-24.04-arm' && 'arm64' || 'amd64' }}"
-          bash utils/docker/build.sh --$ARCH ${{ matrix.flavor }} playwright-java:localbuild-${{ matrix.flavor }}
-      - name: Start container
-        run: |
-            CONTAINER_ID=$(docker run --rm -e CI -e PW_MAX_RETRIES --ipc=host -v "$(pwd)":/root/playwright --name playwright-docker-test -d -t playwright-java:localbuild-${{ matrix.flavor }} /bin/bash)
-            echo "CONTAINER_ID=$CONTAINER_ID" >> $GITHUB_ENV
-
-      - name: Run test in container
-        run: |
-            docker exec "$CONTAINER_ID" /root/playwright/tools/test-local-installation/create_project_and_run_tests.sh
-
-      - name: Test ClassLoader
-        run: |
-            docker exec "${CONTAINER_ID}" /root/playwright/tools/test-spring-boot-starter/package_and_run_async_test.sh
-
-      - name: Stop container
-        run: |
-            docker stop "$CONTAINER_ID"
+          CONTAINER_ID="$(docker run --rm --ipc=host -v $(pwd):/root/playwright --name playwright-docker-test -d -t playwright-java:localbuild-${{ matrix.flavor }} /bin/bash)"
+          docker exec "${CONTAINER_ID}" /root/playwright/tools/test-local-installation/create_project_and_run_tests.sh
@@ -0,0 +1,21 @@
+name: "Internal Tests"
+
+on:
+  push:
+    branches:
+      - main
+      - release-*
+
+jobs:
+  trigger:
+    name: "trigger"
+    runs-on: ubuntu-20.04
+    steps:
+    - run: |
+        curl -X POST \
+          -H "Accept: application/vnd.github.v3+json" \
+          -H "Authorization: token ${GH_TOKEN}" \
+          --data "{\"event_type\": \"playwright_tests_java\", \"client_payload\": {\"ref\": \"${GITHUB_SHA}\"}}" \
+          https://api.github.com/repos/microsoft/playwright-browsers/dispatches
+      env:
+        GH_TOKEN: ${{ secrets.REPOSITORY_DISPATCH_PERSONAL_ACCESS_TOKEN }}
@@ -19,15 +19,12 @@ jobs:
    timeout-minutes: 30
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v2
+      - uses: microsoft/playwright-github-action@v1
      - name: Download drivers
-        run: scripts/download_driver.sh
+        run: scripts/download_driver_for_all_platforms.sh
      - name: Regenerate APIs
        run: scripts/generate_api.sh
-      - name: Build & Install
-        run: mvn -B install -D skipTests --no-transfer-progress
-      - name: Install browsers
-        run: mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI -D exec.args="install --with-deps" -f playwright/pom.xml --no-transfer-progress
      - name: Update browser versions in README
        run: scripts/update_readme.sh
      - name: Verify API is up to date
@@ -20,12 +20,14 @@ git clone https://github.com/microsoft/playwright-java
 cd playwright-java
 ```

-2. Run the following script to download Playwright driver for all platforms into `driver-bundle/src/main/resources/driver/` directory (browser binaries for Chromium, Firefox and WebKit will be automatically downloaded later on first Playwright run).
+2. Run the following script to download playwright-cli binaries for all platforms into `driver-bundle/src/main/resources/driver/` directory (browser binaries for Chromium, Firefox and WebKit will be automatically downloaded later on first Playwright run).

 ```bash
-scripts/download_driver.sh
+scripts/download_driver_for_all_platforms.sh
 ```

+Names of published driver archives can be found at https://github.com/microsoft/playwright-cli/actions
+
 ### Building and running the tests with Maven

 ```bash
@@ -39,19 +41,25 @@ BROWSER=chromium mvn test -Dtest=TestPageNetworkSizes

 ### Generating API

-Public Java API is generated from api.json which is produced by `print-api-json` command of playwright CLI. To regenerate Java interfaces for the current driver run the following commands:
+Public Java API is generated from api.json which is produced by `playwright-cli print-api-json`. To regenerate
+Java interfaces for the current driver run the following commands:

 ```bash
-./scripts/download_driver.sh
+./scripts/download_driver_for_all_platforms.sh
 ./scripts/generate_api.sh
 ```

 #### Updating driver version

-Versions of published driver archives can be found in [publish canary](https://github.com/microsoft/playwright/actions/workflows/publish_canary.yml) and [publish release](https://github.com/microsoft/playwright/actions/workflows/publish_release_driver.yml) actions logs. To update the driver to a particular version run the following command:
+Driver version is read from [scripts/CLI_VERSION](https://github.com/microsoft/playwright-java/blob/main/scripts/CLI_VERSION) and can be found in the upstream [GHA build](https://github.com/microsoft/playwright/actions/workflows/publish_canary.yml) logs. To update the driver to a particular version run the following commands:

 ```bash
-scripts/roll_driver.sh [version]
+cat > scripts/CLI_VERSION
+<paste new version>
+^D
+./scripts/download_driver_for_all_platforms.sh -f
+./scripts/generate_api.sh
+./scripts/update_readme.sh
 ```

 ### Code Style
@@ -1,3 +0,0 @@
-path_classifiers:
-  tests:
-    - "playwright/src/test/**"
@@ -2,7 +2,8 @@

 [![javadoc](https://javadoc.io/badge2/com.microsoft.playwright/playwright/javadoc.svg)](https://javadoc.io/doc/com.microsoft.playwright/playwright)
 [![maven version](https://img.shields.io/maven-central/v/com.microsoft.playwright/playwright)](https://search.maven.org/search?q=com.microsoft.playwright)
-[![Join Discord](https://img.shields.io/badge/join-discord-infomational)](https://aka.ms/playwright/discord)
+[![Sonatype Nexus (Snapshots)](https://img.shields.io/nexus/s/https/oss.sonatype.org/com.microsoft.playwright/playwright.svg)](https://oss.sonatype.org/content/repositories/snapshots/com/microsoft/playwright/playwright/)
+[![Join Slack](https://img.shields.io/badge/join-slack-infomational)](https://aka.ms/playwright-slack)

 #### [Website](https://playwright.dev/java/) | [API reference](https://www.javadoc.io/doc/com.microsoft.playwright/playwright/latest/index.html)

@@ -10,19 +11,59 @@ Playwright is a Java library to automate [Chromium](https://www.chromium.org/Hom

 |          | Linux | macOS | Windows |
 |   :---   | :---: | :---: | :---:   |
-| Chromium <!-- GEN:chromium-version -->145.0.7632.6<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
-| WebKit <!-- GEN:webkit-version -->26.0<!-- GEN:stop --> | ✅ | ✅ | ✅ |
-| Firefox <!-- GEN:firefox-version -->146.0.1<!-- 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: |

-## Documentation
+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.

-[https://playwright.dev/java/docs/intro](https://playwright.dev/java/docs/intro)
+* [Usage](#usage)
+  - [Add Maven dependency](#add-maven-dependency)
+  - [Is Playwright thread-safe?](#is-playwright-thread-safe)
+* [Examples](#examples)
+  - [Page screenshot](#page-screenshot)
+  - [Mobile and geolocation](#mobile-and-geolocation)
+  - [Evaluate JavaScript in browser](#evaluate-javascript-in-browser)
+  - [Intercept network requests](#intercept-network-requests)
+* [Documentation](#documentation)
+* [Contributing](#contributing)
+* [Is Playwright for Java ready?](#is-playwright-for-java-ready)

-## API Reference
+## Usage

-[https://playwright.dev/java/docs/api/class-playwright](https://playwright.dev/java/docs/api/class-playwright)
+Playwright requires **Java 8** or newer.

-## Example
+#### Add Maven dependency
+
+Playwright is distributed as a set of [Maven](https://maven.apache.org/what-is-maven.html) modules. The easiest way to use it is to add one dependency to your Maven `pom.xml` file as described below. If you're not familiar with Maven please refer to its [documentation](https://maven.apache.org/guides/getting-started/maven-in-five-minutes.html).
+
+To run Playwright simply add following dependency to your Maven project:
+
+```xml
+<dependency>
+  <groupId>com.microsoft.playwright</groupId>
+  <artifactId>playwright</artifactId>
+  <version>1.28.1</version>
+</dependency>
+```
+
+To run Playwright using Gradle add following dependency to your build.gradle file:
+
+```gradle
+dependencies {
+  implementation group: 'com.microsoft.playwright', name: 'playwright', version: '1.28.1'
+}
+```
+
+#### Is Playwright thread-safe?
+
+No, Playwright is not thread safe, i.e. all its methods as well as methods on all objects created by it (such as BrowserContext, Browser, Page etc.) are expected to be called on the same thread where Playwright object was created or proper synchronization should be implemented to ensure only one thread calls Playwright methods at any given time. Having said that it's okay to create multiple Playwright instances each on its own thread.
+
+## Examples
+
+You can find Maven project with the examples [here](./examples).
+
+#### Page screenshot

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

@@ -54,9 +95,100 @@ public class PageScreenshot {
 }
 ```

-## Other languages
+#### Mobile and geolocation

-More comfortable in another programming language? [Playwright](https://playwright.dev) is also available in
- [Node.js (JavaScript / TypeScript)](https://playwright.dev/docs/intro),
- [Python](https://playwright.dev/python/docs/intro).
- [.NET](https://playwright.dev/dotnet/docs/intro),
+This snippet emulates Mobile Chromium on a device at a given geolocation, navigates to openstreetmap.org, performs action and takes a screenshot.
+
+```java
+import com.microsoft.playwright.options.*;
+import com.microsoft.playwright.*;
+
+import java.nio.file.Paths;
+
+import static java.util.Arrays.asList;
+
+public class MobileAndGeolocation {
+  public static void main(String[] args) {
+    try (Playwright playwright = Playwright.create()) {
+      Browser browser = playwright.chromium().launch();
+      BrowserContext context = browser.newContext(new Browser.NewContextOptions()
+        .setUserAgent("Mozilla/5.0 (Linux; Android 8.0; Pixel 2 Build/OPD3.170816.012) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3765.0 Mobile Safari/537.36")
+        .setViewportSize(411, 731)
+        .setDeviceScaleFactor(2.625)
+        .setIsMobile(true)
+        .setHasTouch(true)
+        .setLocale("en-US")
+        .setGeolocation(41.889938, 12.492507)
+        .setPermissions(asList("geolocation")));
+      Page page = context.newPage();
+      page.navigate("https://www.openstreetmap.org/");
+      page.click("a[data-original-title=\"Show My Location\"]");
+      page.screenshot(new Page.ScreenshotOptions().setPath(Paths.get("colosseum-pixel2.png")));
+    }
+  }
+}
+```
+
+#### Evaluate JavaScript in browser
+
+This code snippet navigates to example.com in Firefox, and executes a script in the page context.
+
+```java
+import com.microsoft.playwright.*;
+
+public class EvaluateInBrowserContext {
+  public static void main(String[] args) {
+    try (Playwright playwright = Playwright.create()) {
+      Browser browser = playwright.firefox().launch();
+      BrowserContext context = browser.newContext();
+      Page page = context.newPage();
+      page.navigate("https://www.example.com/");
+      Object dimensions = page.evaluate("() => {\n" +
+        "  return {\n" +
+        "      width: document.documentElement.clientWidth,\n" +
+        "      height: document.documentElement.clientHeight,\n" +
+        "      deviceScaleFactor: window.devicePixelRatio\n" +
+        "  }\n" +
+        "}");
+      System.out.println(dimensions);
+    }
+  }
+}
+```
+
+#### Intercept network requests
+
+This code snippet sets up request routing for a WebKit page to log all network requests.
+
+```java
+import com.microsoft.playwright.*;
+
+public class InterceptNetworkRequests {
+  public static void main(String[] args) {
+    try (Playwright playwright = Playwright.create()) {
+      Browser browser = playwright.webkit().launch();
+      BrowserContext context = browser.newContext();
+      Page page = context.newPage();
+      page.route("**", route -> {
+        System.out.println(route.request().url());
+        route.resume();
+      });
+      page.navigate("http://todomvc.com");
+    }
+  }
+}
+```
+
+## Documentation
+
+Check out our official [documentation site](https://playwright.dev/java).
+
+You can also browse [javadoc online](https://www.javadoc.io/doc/com.microsoft.playwright/playwright/latest/index.html).
+
+## Contributing
+
+Follow [the instructions](https://github.com/microsoft/playwright-java/blob/main/CONTRIBUTING.md#getting-code) to build the project from source and install the driver.
+
+## Is Playwright for Java ready?
+
+Yes, Playwright for Java is ready. v1.10.0 is the first stable release. Going forward we will adhere to [semantic versioning](https://semver.org/) of the API.
@@ -2,18 +2,12 @@

 * make sure to have at least Java 8 and Maven 3.6.3
 * clone playwright for java: http://github.com/microsoft/playwright-java
-* `./scripts/roll_driver.sh 1.47.0-beta-1726138322000`
+* set new driver version in `scripts/CLI_VERSION`
+* regenerate API: `./scripts/download_driver_for_all_platforms.sh -f && ./scripts/generate_api.sh && ./scripts/update_readme.sh`
 * commit & send PR with the roll

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

 ```bash
 ./scripts/set_maven_version.sh 1.15.0
 ```
-
@@ -1,17 +0,0 @@
-# Support
-
-## How to file issues and get help
-
-This project uses GitHub issues to track bugs and feature requests. Please search the [existing issues][gh-issues] before filing new ones to avoid duplicates. For new issues, file your bug or feature request as a new issue using corresponding template.
-
-For help and questions about using this project, please see the [docs site for Playwright for Java][docs].
-
-Join our community [Discord Server][discord-server] to connect with other developers using Playwright and ask questions in our 'help-playwright' forum.
-
-## Microsoft Support Policy
-
-Support for Playwright for Java is limited to the resources listed above.
-
-[gh-issues]: https://github.com/microsoft/playwright-java/issues/
-[docs]: https://playwright.dev/java/
-[discord-server]: https://aka.ms/playwright/discord
@@ -6,7 +6,7 @@
  <parent>
    <groupId>com.microsoft.playwright</groupId>
    <artifactId>parent-pom</artifactId>
-    <version>1.58.0</version>
+    <version>1.37.0</version>
  </parent>

  <artifactId>driver-bundle</artifactId>
@@ -29,6 +29,7 @@ import java.util.concurrent.TimeUnit;
 public class DriverJar extends Driver {
  private static final String PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = "PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD";
  private static final String SELENIUM_REMOTE_URL = "SELENIUM_REMOTE_URL";
+  static final String PLAYWRIGHT_NODEJS_PATH = "PLAYWRIGHT_NODEJS_PATH";
  private final Path driverTempDir;
  private Path preinstalledNodePath;

@@ -63,7 +64,7 @@ public class DriverJar extends Driver {
      env.put(PLAYWRIGHT_NODEJS_PATH, preinstalledNodePath.toString());
    }
    extractDriverToTempDir();
-    logMessage("extracted driver from jar to " + driverDir());
+    logMessage("extracted driver from jar to " + driverPath());
    if (installBrowsers)
      installBrowsers(env);
  }
@@ -74,14 +75,14 @@ public class DriverJar extends Driver {
      skip = System.getenv(PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD);
    }
    if (skip != null && !"0".equals(skip) && !"false".equals(skip)) {
-      logMessage("Skipping browsers download because `PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD` env variable is set");
+      System.out.println("Skipping browsers download because `PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD` env variable is set");
      return;
    }
    if (env.get(SELENIUM_REMOTE_URL) != null || System.getenv(SELENIUM_REMOTE_URL) != null) {
      logMessage("Skipping browsers download because `SELENIUM_REMOTE_URL` env variable is set");
      return;
    }
-    Path driver = driverDir();
+    Path driver = driverPath();
    if (!Files.exists(driver)) {
      throw new RuntimeException("Failed to find driver: " + driver);
    }
@@ -114,7 +115,7 @@ public class DriverJar extends Driver {
  }

  public static URI getDriverResourceURI() throws URISyntaxException {
-    ClassLoader classloader = DriverJar.class.getClassLoader();
+    ClassLoader classloader = Thread.currentThread().getContextClassLoader();
    return classloader.getResource("driver/" + platformDir()).toURI();
  }

@@ -203,7 +204,7 @@ public class DriverJar extends Driver {
  }

  @Override
-  public Path driverDir() {
+  protected Path driverDir() {
    return driverTempDir;
  }
 }
@@ -32,7 +32,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;

-import static com.microsoft.playwright.impl.driver.Driver.PLAYWRIGHT_NODEJS_PATH;
+import static com.microsoft.playwright.impl.driver.jar.DriverJar.PLAYWRIGHT_NODEJS_PATH;
 import static java.util.Collections.singletonMap;
 import static org.junit.jupiter.api.Assertions.*;

@@ -83,7 +83,7 @@ public class TestInstall {
  @Test
  void playwrightCliInstalled() throws Exception {
    Driver driver = Driver.createAndInstall(Collections.emptyMap(), false);
-    assertTrue(Files.exists(driver.driverDir()));
+    assertTrue(Files.exists(driver.driverPath()));

    ProcessBuilder pb = driver.createProcessBuilder();
    pb.command().add("install");
@@ -98,7 +98,7 @@ public class TestInstall {
  void playwrightDriverInAlternativeTmpdir(@TempDir Path tmpdir) throws Exception {
    System.setProperty("playwright.driver.tmpdir", tmpdir.toString());
    DriverJar driver = new DriverJar();
-    assertTrue(driver.driverDir().startsWith(tmpdir), "Driver path: " + driver.driverDir() + " tmp: " + tmpdir);
+    assertTrue(driver.driverPath().startsWith(tmpdir), "Driver path: " + driver.driverPath() + " tmp: " + tmpdir);
  }

  @Test
@@ -135,7 +135,7 @@ public class TestInstall {
  private static String extractNodeJsToTemp() throws URISyntaxException, IOException {
    DriverJar auxDriver = new DriverJar();
    auxDriver.extractDriverToTempDir();
-    String nodePath = auxDriver.driverDir().resolve(isWindows() ? "node.exe" : "node").toString();
+    String nodePath = auxDriver.driverPath().getParent().resolve(isWindows() ? "node.exe" : "node").toString();
    return nodePath;
  }

@@ -145,9 +145,9 @@ public class TestInstall {
  }

  private static void canSpecifyPreinstalledNodeJsShared(Driver driver, Path tmpDir) throws IOException, URISyntaxException, InterruptedException {
-    Path builtinNode = driver.driverDir().resolve("node");
+    Path builtinNode = driver.driverPath().getParent().resolve("node");
    assertFalse(Files.exists(builtinNode), builtinNode.toString());
-    Path builtinNodeExe = driver.driverDir().resolve("node.exe");
+    Path builtinNodeExe = driver.driverPath().getParent().resolve("node.exe");
    assertFalse(Files.exists(builtinNodeExe), builtinNodeExe.toString());

    ProcessBuilder pb = driver.createProcessBuilder();
@@ -6,7 +6,7 @@
  <parent>
    <groupId>com.microsoft.playwright</groupId>
    <artifactId>parent-pom</artifactId>
-    <version>1.58.0</version>
+    <version>1.37.0</version>
  </parent>

  <artifactId>driver</artifactId>
@@ -18,6 +18,7 @@ package com.microsoft.playwright.impl.driver;

 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;

@@ -29,8 +30,7 @@ import static com.microsoft.playwright.impl.driver.DriverLogging.logWithTimestam
 * loaded from the driver-bundle module if that module is in the classpath.
 */
 public abstract class Driver {
-  protected final Map<String, String> env = new LinkedHashMap<>(System.getenv());
-  public static final String PLAYWRIGHT_NODEJS_PATH = "PLAYWRIGHT_NODEJS_PATH";
+  protected final Map<String, String> env = new LinkedHashMap<>();

  private static Driver instance;

@@ -47,7 +47,7 @@ public abstract class Driver {
    }

    @Override
-    public Path driverDir() {
+    protected Path driverDir() {
      return driverDir;
    }
  }
@@ -65,14 +65,14 @@ public abstract class Driver {
  }
  protected abstract void initialize(Boolean installBrowsers) throws Exception;

+  public Path driverPath() {
+    String cliFileName = System.getProperty("os.name").toLowerCase().contains("windows") ?
+      "playwright.cmd" : "playwright.sh";
+    return driverDir().resolve(cliFileName);
+  }
+
  public ProcessBuilder createProcessBuilder() {
-    String nodePath = env.get("PLAYWRIGHT_NODEJS_PATH");
-    if (nodePath == null) {
-      String node = System.getProperty("os.name").toLowerCase().contains("windows") ? "node.exe" : "node";
-      nodePath = driverDir().resolve(node).toAbsolutePath().toString();
-    }
-    ProcessBuilder pb = new ProcessBuilder(nodePath);
-    pb.command().add(driverDir().resolve("package").resolve("cli.js").toAbsolutePath().toString());
+    ProcessBuilder pb = new ProcessBuilder(driverPath().toString());
    pb.environment().putAll(env);
    pb.environment().put("PW_LANG_NAME", "java");
    pb.environment().put("PW_LANG_NAME_VERSION", getMajorJavaVersion());
@@ -118,7 +118,7 @@ public abstract class Driver {
    return (Driver) jarDriver.getDeclaredConstructor().newInstance();
  }

-  public abstract Path driverDir();
+  protected abstract Path driverDir();

  protected static void logMessage(String message) {
    // This matches log format produced by the server.
@@ -6,17 +6,16 @@

  <groupId>org.example</groupId>
  <artifactId>examples</artifactId>
-  <version>1.58.0</version>
+  <version>1.37.0</version>
  <name>Playwright Client Examples</name>
  <properties>
    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <playwright.version>1.58.0</playwright.version>
  </properties>
  <dependencies>
    <dependency>
      <groupId>com.microsoft.playwright</groupId>
      <artifactId>playwright</artifactId>
-      <version>${playwright.version}</version>
+      <version>1.30.0</version>
    </dependency>
  </dependencies>
  <build>
@@ -24,7 +23,7 @@
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.12.1</version>
+        <version>3.1</version>
        <configuration>
          <source>1.8</source>
          <target>1.8</target>
@@ -7,7 +7,7 @@
  <parent>
    <groupId>com.microsoft.playwright</groupId>
    <artifactId>parent-pom</artifactId>
-    <version>1.58.0</version>
+    <version>1.37.0</version>
  </parent>

  <artifactId>playwright</artifactId>
@@ -57,23 +57,10 @@
      <groupId>org.java-websocket</groupId>
      <artifactId>Java-WebSocket</artifactId>
    </dependency>
-    <!-- 
-      The following slf4j-simple dependency resolves the warning:
-      'SLF4J(W): No SLF4J providers were found.'
-      This warning is produced by the org.java-websocket library.
-    -->
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-simple</artifactId>
-    </dependency>
    <dependency>
      <groupId>org.junit.jupiter</groupId>
      <artifactId>junit-jupiter-engine</artifactId>
    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-params</artifactId>
-    </dependency>
    <dependency>
      <groupId>org.opentest4j</groupId>
      <artifactId>opentest4j</artifactId>
@@ -23,14 +23,14 @@ import java.util.*;
 /**
 * Exposes API that can be used for the Web API testing. This class is used for creating {@code APIRequestContext} instance
 * which in turn can be used for sending web requests. An instance of this class can be obtained via {@link
- * com.microsoft.playwright.Playwright#request Playwright.request()}. For more information see {@code APIRequestContext}.
+ * Playwright#request Playwright.request()}. For more information see {@code APIRequestContext}.
 */
 public interface APIRequest {
  class NewContextOptions {
    /**
-     * Methods like {@link com.microsoft.playwright.APIRequestContext#get APIRequestContext.get()} take the base URL into
-     * 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:
+     * Methods like {@link APIRequestContext#get APIRequestContext.get()} take the base URL into 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:
     * <ul>
     * <li> baseURL: {@code http://localhost:3000} and sending request to {@code /bar.html} results in {@code
     * http://localhost:3000/bar.html}</li>
@@ -41,32 +41,10 @@ public interface APIRequest {
     * </ul>
     */
    public String baseURL;
-    /**
-     * TLS Client Authentication allows the server to request a client certificate and verify it.
-     *
-     * <p> <strong>Details</strong>
-     *
-     * <p> An array of client certificates to be used. Each certificate object must have either both {@code certPath} and {@code
-     * keyPath}, a single {@code pfxPath}, or their corresponding direct value equivalents ({@code cert} and {@code key}, or
-     * {@code pfx}). Optionally, {@code passphrase} property should be provided if the certificate is encrypted. The {@code
-     * origin} property should be provided with an exact match to the request origin that the certificate is valid for.
-     *
-     * <p> Client certificate authentication is only active when at least one client certificate is provided. If you want to reject
-     * all client certificates sent by the server, you need to provide a client certificate with an {@code origin} that does
-     * not match any of the domains you plan to visit.
-     *
-     * <p> <strong>NOTE:</strong> When using WebKit on macOS, accessing {@code localhost} will not pick up client certificates. You can make it work by
-     * replacing {@code localhost} with {@code local.playwright}.
-     */
-    public List<ClientCertificate> clientCertificates;
    /**
     * An object containing additional HTTP headers to be sent with every request. Defaults to none.
     */
    public Map<String, String> extraHTTPHeaders;
-    /**
-     * Whether to throw on response codes other than 2xx and 3xx. By default response object is returned for all status codes.
-     */
-    public Boolean failOnStatusCode;
    /**
     * Credentials for <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication">HTTP authentication</a>. If
     * no origin is specified, the username and password are sent to any servers upon unauthorized responses.
@@ -76,29 +54,22 @@ public interface APIRequest {
     * Whether to ignore HTTPS errors when sending network requests. Defaults to {@code false}.
     */
    public Boolean ignoreHTTPSErrors;
-    /**
-     * Maximum number of request redirects that will be followed automatically. An error will be thrown if the number is
-     * exceeded. Defaults to {@code 20}. Pass {@code 0} to not follow redirects. This can be overwritten for each request
-     * individually.
-     */
-    public Integer maxRedirects;
    /**
     * Network proxy settings.
     */
    public Proxy proxy;
    /**
     * Populates context with given storage state. This option can be used to initialize context with logged-in information
-     * obtained via {@link com.microsoft.playwright.BrowserContext#storageState BrowserContext.storageState()} or {@link
-     * com.microsoft.playwright.APIRequestContext#storageState APIRequestContext.storageState()}. Either a path to the file
-     * with saved storage, or the value returned by one of {@link com.microsoft.playwright.BrowserContext#storageState
-     * BrowserContext.storageState()} or {@link com.microsoft.playwright.APIRequestContext#storageState
+     * obtained via {@link BrowserContext#storageState BrowserContext.storageState()} or {@link APIRequestContext#storageState
+     * APIRequestContext.storageState()}. Either a path to the file with saved storage, or the value returned by one of {@link
+     * BrowserContext#storageState BrowserContext.storageState()} or {@link APIRequestContext#storageState
     * APIRequestContext.storageState()} methods.
     */
    public String storageState;
    /**
     * Populates context with given storage state. This option can be used to initialize context with logged-in information
-     * obtained via {@link com.microsoft.playwright.BrowserContext#storageState BrowserContext.storageState()}. Path to the
-     * file with saved storage state.
+     * obtained via {@link BrowserContext#storageState BrowserContext.storageState()}. Path to the file with saved storage
+     * state.
     */
    public Path storageStatePath;
    /**
@@ -112,9 +83,9 @@ public interface APIRequest {
    public String userAgent;

    /**
-     * Methods like {@link com.microsoft.playwright.APIRequestContext#get APIRequestContext.get()} take the base URL into
-     * 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:
+     * Methods like {@link APIRequestContext#get APIRequestContext.get()} take the base URL into 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:
     * <ul>
     * <li> baseURL: {@code http://localhost:3000} and sending request to {@code /bar.html} results in {@code
     * http://localhost:3000/bar.html}</li>
@@ -128,27 +99,6 @@ public interface APIRequest {
      this.baseURL = baseURL;
      return this;
    }
-    /**
-     * TLS Client Authentication allows the server to request a client certificate and verify it.
-     *
-     * <p> <strong>Details</strong>
-     *
-     * <p> An array of client certificates to be used. Each certificate object must have either both {@code certPath} and {@code
-     * keyPath}, a single {@code pfxPath}, or their corresponding direct value equivalents ({@code cert} and {@code key}, or
-     * {@code pfx}). Optionally, {@code passphrase} property should be provided if the certificate is encrypted. The {@code
-     * origin} property should be provided with an exact match to the request origin that the certificate is valid for.
-     *
-     * <p> Client certificate authentication is only active when at least one client certificate is provided. If you want to reject
-     * all client certificates sent by the server, you need to provide a client certificate with an {@code origin} that does
-     * not match any of the domains you plan to visit.
-     *
-     * <p> <strong>NOTE:</strong> When using WebKit on macOS, accessing {@code localhost} will not pick up client certificates. You can make it work by
-     * replacing {@code localhost} with {@code local.playwright}.
-     */
-    public NewContextOptions setClientCertificates(List<ClientCertificate> clientCertificates) {
-      this.clientCertificates = clientCertificates;
-      return this;
-    }
    /**
     * An object containing additional HTTP headers to be sent with every request. Defaults to none.
     */
@@ -156,13 +106,6 @@ public interface APIRequest {
      this.extraHTTPHeaders = extraHTTPHeaders;
      return this;
    }
-    /**
-     * Whether to throw on response codes other than 2xx and 3xx. By default response object is returned for all status codes.
-     */
-    public NewContextOptions setFailOnStatusCode(boolean failOnStatusCode) {
-      this.failOnStatusCode = failOnStatusCode;
-      return this;
-    }
    /**
     * Credentials for <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication">HTTP authentication</a>. If
     * no origin is specified, the username and password are sent to any servers upon unauthorized responses.
@@ -185,15 +128,6 @@ public interface APIRequest {
      this.ignoreHTTPSErrors = ignoreHTTPSErrors;
      return this;
    }
-    /**
-     * Maximum number of request redirects that will be followed automatically. An error will be thrown if the number is
-     * exceeded. Defaults to {@code 20}. Pass {@code 0} to not follow redirects. This can be overwritten for each request
-     * individually.
-     */
-    public NewContextOptions setMaxRedirects(int maxRedirects) {
-      this.maxRedirects = maxRedirects;
-      return this;
-    }
    /**
     * Network proxy settings.
     */
@@ -209,10 +143,9 @@ public interface APIRequest {
    }
    /**
     * Populates context with given storage state. This option can be used to initialize context with logged-in information
-     * obtained via {@link com.microsoft.playwright.BrowserContext#storageState BrowserContext.storageState()} or {@link
-     * com.microsoft.playwright.APIRequestContext#storageState APIRequestContext.storageState()}. Either a path to the file
-     * with saved storage, or the value returned by one of {@link com.microsoft.playwright.BrowserContext#storageState
-     * BrowserContext.storageState()} or {@link com.microsoft.playwright.APIRequestContext#storageState
+     * obtained via {@link BrowserContext#storageState BrowserContext.storageState()} or {@link APIRequestContext#storageState
+     * APIRequestContext.storageState()}. Either a path to the file with saved storage, or the value returned by one of {@link
+     * BrowserContext#storageState BrowserContext.storageState()} or {@link APIRequestContext#storageState
     * APIRequestContext.storageState()} methods.
     */
    public NewContextOptions setStorageState(String storageState) {
@@ -221,8 +154,8 @@ public interface APIRequest {
    }
    /**
     * Populates context with given storage state. This option can be used to initialize context with logged-in information
-     * obtained via {@link com.microsoft.playwright.BrowserContext#storageState BrowserContext.storageState()}. Path to the
-     * file with saved storage state.
+     * obtained via {@link BrowserContext#storageState BrowserContext.storageState()}. Path to the file with saved storage
+     * state.
     */
    public NewContextOptions setStorageStatePath(Path storageStatePath) {
      this.storageStatePath = storageStatePath;
@@ -24,57 +24,30 @@ import java.nio.file.Path;
 * environment or the service to your e2e test.
 *
 * <p> Each Playwright browser context has associated with it {@code APIRequestContext} instance which shares cookie storage
- * with the browser context and can be accessed via {@link com.microsoft.playwright.BrowserContext#request
- * BrowserContext.request()} or {@link com.microsoft.playwright.Page#request Page.request()}. It is also possible to create
- * a new APIRequestContext instance manually by calling {@link com.microsoft.playwright.APIRequest#newContext
- * APIRequest.newContext()}.
+ * with the browser context and can be accessed via {@link BrowserContext#request BrowserContext.request()} or {@link
+ * Page#request Page.request()}. It is also possible to create a new APIRequestContext instance manually by calling {@link
+ * APIRequest#newContext APIRequest.newContext()}.
 *
- * <p> <strong>Cookie management</strong>
+ * <p> **Cookie management**
 *
- * <p> {@code APIRequestContext} returned by {@link com.microsoft.playwright.BrowserContext#request BrowserContext.request()}
- * and {@link com.microsoft.playwright.Page#request Page.request()} shares cookie storage with the corresponding {@code
- * BrowserContext}. Each API request will have {@code Cookie} header populated with the values from the browser context. If
- * the API response contains {@code Set-Cookie} header it will automatically update {@code BrowserContext} cookies and
- * requests made from the page will pick them up. This means that if you log in using this API, your e2e test will be
- * logged in and vice versa.
+ * <p> {@code APIRequestContext} returned by {@link BrowserContext#request BrowserContext.request()} and {@link Page#request
+ * Page.request()} shares cookie storage with the corresponding {@code BrowserContext}. Each API request will have {@code
+ * Cookie} header populated with the values from the browser context. If the API response contains {@code Set-Cookie}
+ * header it will automatically update {@code BrowserContext} cookies and requests made from the page will pick them up.
+ * This means that if you log in using this API, your e2e test will be logged in and vice versa.
 *
 * <p> If you want API requests to not interfere with the browser cookies you should create a new {@code APIRequestContext} by
- * calling {@link com.microsoft.playwright.APIRequest#newContext APIRequest.newContext()}. Such {@code APIRequestContext}
- * object will have its own isolated cookie storage.
+ * calling {@link APIRequest#newContext APIRequest.newContext()}. Such {@code APIRequestContext} object will have its own
+ * isolated cookie storage.
 */
 public interface APIRequestContext {
-  class DisposeOptions {
-    /**
-     * The reason to be reported to the operations interrupted by the context disposal.
-     */
-    public String reason;
-
-    /**
-     * The reason to be reported to the operations interrupted by the context disposal.
-     */
-    public DisposeOptions setReason(String reason) {
-      this.reason = reason;
-      return this;
-    }
-  }
  class StorageStateOptions {
-    /**
-     * Set to {@code true} to include IndexedDB in the storage state snapshot.
-     */
-    public Boolean indexedDB;
    /**
     * The file path to save the storage state to. If {@code path} is a relative path, then it is resolved relative to current
     * working directory. If no path is provided, storage state is still returned, but won't be saved to the disk.
     */
    public Path path;

-    /**
-     * Set to {@code true} to include IndexedDB in the storage state snapshot.
-     */
-    public StorageStateOptions setIndexedDB(boolean indexedDB) {
-      this.indexedDB = indexedDB;
-      return this;
-    }
    /**
     * The file path to save the storage state to. If {@code path} is a relative path, then it is resolved relative to current
     * working directory. If no path is provided, storage state is still returned, but won't be saved to the disk.
@@ -106,32 +79,19 @@ public interface APIRequestContext {
   */
  APIResponse delete(String url, RequestOptions params);
  /**
-   * All responses returned by {@link com.microsoft.playwright.APIRequestContext#get APIRequestContext.get()} and similar
-   * methods are stored in the memory, so that you can later call {@link com.microsoft.playwright.APIResponse#body
-   * APIResponse.body()}.This method discards all its resources, calling any method on disposed {@code APIRequestContext}
-   * will throw an exception.
+   * All responses returned by {@link APIRequestContext#get APIRequestContext.get()} and similar methods are stored in the
+   * memory, so that you can later call {@link APIResponse#body APIResponse.body()}. This method discards all stored
+   * responses, and makes {@link APIResponse#body APIResponse.body()} throw "Response disposed" error.
   *
   * @since v1.16
   */
-  default void dispose() {
-    dispose(null);
-  }
-  /**
-   * All responses returned by {@link com.microsoft.playwright.APIRequestContext#get APIRequestContext.get()} and similar
-   * methods are stored in the memory, so that you can later call {@link com.microsoft.playwright.APIResponse#body
-   * APIResponse.body()}.This method discards all its resources, calling any method on disposed {@code APIRequestContext}
-   * will throw an exception.
-   *
-   * @since v1.16
-   */
-  void dispose(DisposeOptions options);
+  void dispose();
  /**
   * Sends HTTP(S) request and returns its response. The method will populate request cookies from the context and update
-   * context cookies from the response. The method will automatically follow redirects.
+   * context cookies from the response. The method will automatically follow redirects. JSON objects can be passed directly
+   * to the request.
   *
-   * <p> <strong>Usage</strong>
-   *
-   * <p> JSON objects can be passed directly to the request:
+   * <p> **Usage**
   * <pre>{@code
   * Map<String, Object> data = new HashMap();
   * data.put("title", "Book Title");
@@ -139,8 +99,8 @@ public interface APIRequestContext {
   * request.fetch("https://example.com/api/createBook", RequestOptions.create().setMethod("post").setData(data));
   * }</pre>
   *
-   * <p> The common way to send file(s) in the body of a request is to upload them as form fields with {@code
-   * multipart/form-data} encoding, by specifiying the {@code multipart} parameter:
+   * <p> The common way to send file(s) in the body of a request is to encode it as form fields with {@code multipart/form-data}
+   * encoding. You can achieve that with Playwright API like this:
   * <pre>{@code
   * // Pass file path to the form data constructor:
   * Path file = Paths.get("team.csv");
@@ -151,7 +111,7 @@ public interface APIRequestContext {
   * // Or you can pass the file content directly as FilePayload object:
   * FilePayload filePayload = new FilePayload("f.js", "text/javascript",
   *       "console.log(2022);".getBytes(StandardCharsets.UTF_8));
-   * APIResponse response = request.fetch("https://example.com/api/uploadScript",
+   * APIResponse response = request.fetch("https://example.com/api/uploadTeamList",
   *   RequestOptions.create().setMethod("post").setMultipart(
   *     FormData.create().set("fileField", filePayload)));
   * }</pre>
@@ -164,11 +124,10 @@ public interface APIRequestContext {
  }
  /**
   * Sends HTTP(S) request and returns its response. The method will populate request cookies from the context and update
-   * context cookies from the response. The method will automatically follow redirects.
+   * context cookies from the response. The method will automatically follow redirects. JSON objects can be passed directly
+   * to the request.
   *
-   * <p> <strong>Usage</strong>
-   *
-   * <p> JSON objects can be passed directly to the request:
+   * <p> **Usage**
   * <pre>{@code
   * Map<String, Object> data = new HashMap();
   * data.put("title", "Book Title");
@@ -176,8 +135,8 @@ public interface APIRequestContext {
   * request.fetch("https://example.com/api/createBook", RequestOptions.create().setMethod("post").setData(data));
   * }</pre>
   *
-   * <p> The common way to send file(s) in the body of a request is to upload them as form fields with {@code
-   * multipart/form-data} encoding, by specifiying the {@code multipart} parameter:
+   * <p> The common way to send file(s) in the body of a request is to encode it as form fields with {@code multipart/form-data}
+   * encoding. You can achieve that with Playwright API like this:
   * <pre>{@code
   * // Pass file path to the form data constructor:
   * Path file = Paths.get("team.csv");
@@ -188,7 +147,7 @@ public interface APIRequestContext {
   * // Or you can pass the file content directly as FilePayload object:
   * FilePayload filePayload = new FilePayload("f.js", "text/javascript",
   *       "console.log(2022);".getBytes(StandardCharsets.UTF_8));
-   * APIResponse response = request.fetch("https://example.com/api/uploadScript",
+   * APIResponse response = request.fetch("https://example.com/api/uploadTeamList",
   *   RequestOptions.create().setMethod("post").setMultipart(
   *     FormData.create().set("fileField", filePayload)));
   * }</pre>
@@ -200,11 +159,10 @@ public interface APIRequestContext {
  APIResponse fetch(String urlOrRequest, RequestOptions params);
  /**
   * Sends HTTP(S) request and returns its response. The method will populate request cookies from the context and update
-   * context cookies from the response. The method will automatically follow redirects.
+   * context cookies from the response. The method will automatically follow redirects. JSON objects can be passed directly
+   * to the request.
   *
-   * <p> <strong>Usage</strong>
-   *
-   * <p> JSON objects can be passed directly to the request:
+   * <p> **Usage**
   * <pre>{@code
   * Map<String, Object> data = new HashMap();
   * data.put("title", "Book Title");
@@ -212,8 +170,8 @@ public interface APIRequestContext {
   * request.fetch("https://example.com/api/createBook", RequestOptions.create().setMethod("post").setData(data));
   * }</pre>
   *
-   * <p> The common way to send file(s) in the body of a request is to upload them as form fields with {@code
-   * multipart/form-data} encoding, by specifiying the {@code multipart} parameter:
+   * <p> The common way to send file(s) in the body of a request is to encode it as form fields with {@code multipart/form-data}
+   * encoding. You can achieve that with Playwright API like this:
   * <pre>{@code
   * // Pass file path to the form data constructor:
   * Path file = Paths.get("team.csv");
@@ -224,7 +182,7 @@ public interface APIRequestContext {
   * // Or you can pass the file content directly as FilePayload object:
   * FilePayload filePayload = new FilePayload("f.js", "text/javascript",
   *       "console.log(2022);".getBytes(StandardCharsets.UTF_8));
-   * APIResponse response = request.fetch("https://example.com/api/uploadScript",
+   * APIResponse response = request.fetch("https://example.com/api/uploadTeamList",
   *   RequestOptions.create().setMethod("post").setMultipart(
   *     FormData.create().set("fileField", filePayload)));
   * }</pre>
@@ -237,11 +195,10 @@ public interface APIRequestContext {
  }
  /**
   * Sends HTTP(S) request and returns its response. The method will populate request cookies from the context and update
-   * context cookies from the response. The method will automatically follow redirects.
+   * context cookies from the response. The method will automatically follow redirects. JSON objects can be passed directly
+   * to the request.
   *
-   * <p> <strong>Usage</strong>
-   *
-   * <p> JSON objects can be passed directly to the request:
+   * <p> **Usage**
   * <pre>{@code
   * Map<String, Object> data = new HashMap();
   * data.put("title", "Book Title");
@@ -249,8 +206,8 @@ public interface APIRequestContext {
   * request.fetch("https://example.com/api/createBook", RequestOptions.create().setMethod("post").setData(data));
   * }</pre>
   *
-   * <p> The common way to send file(s) in the body of a request is to upload them as form fields with {@code
-   * multipart/form-data} encoding, by specifiying the {@code multipart} parameter:
+   * <p> The common way to send file(s) in the body of a request is to encode it as form fields with {@code multipart/form-data}
+   * encoding. You can achieve that with Playwright API like this:
   * <pre>{@code
   * // Pass file path to the form data constructor:
   * Path file = Paths.get("team.csv");
@@ -261,7 +218,7 @@ public interface APIRequestContext {
   * // Or you can pass the file content directly as FilePayload object:
   * FilePayload filePayload = new FilePayload("f.js", "text/javascript",
   *       "console.log(2022);".getBytes(StandardCharsets.UTF_8));
-   * APIResponse response = request.fetch("https://example.com/api/uploadScript",
+   * APIResponse response = request.fetch("https://example.com/api/uploadTeamList",
   *   RequestOptions.create().setMethod("post").setMultipart(
   *     FormData.create().set("fileField", filePayload)));
   * }</pre>
@@ -276,7 +233,7 @@ public interface APIRequestContext {
   * response. The method will populate request cookies from the context and update context cookies from the response. The
   * method will automatically follow redirects.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   *
   * <p> Request parameters can be configured with {@code params} option, they will be serialized into the URL search parameters:
   * <pre>{@code
@@ -296,7 +253,7 @@ public interface APIRequestContext {
   * response. The method will populate request cookies from the context and update context cookies from the response. The
   * method will automatically follow redirects.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   *
   * <p> Request parameters can be configured with {@code params} option, they will be serialized into the URL search parameters:
   * <pre>{@code
@@ -357,7 +314,7 @@ public interface APIRequestContext {
   * response. The method will populate request cookies from the context and update context cookies from the response. The
   * method will automatically follow redirects.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   *
   * <p> JSON objects can be passed directly to the request:
   * <pre>{@code
@@ -377,8 +334,7 @@ public interface APIRequestContext {
   * }</pre>
   *
   * <p> The common way to send file(s) in the body of a request is to upload them as form fields with {@code
-   * multipart/form-data} encoding. Use {@code FormData} to construct request body and pass it to the request as {@code
-   * multipart} parameter:
+   * multipart/form-data} encoding. You can achieve that with Playwright API like this:
   * <pre>{@code
   * // Pass file path to the form data constructor:
   * Path file = Paths.get("team.csv");
@@ -387,9 +343,9 @@ public interface APIRequestContext {
   *     FormData.create().set("fileField", file)));
   *
   * // Or you can pass the file content directly as FilePayload object:
-   * FilePayload filePayload1 = new FilePayload("f1.js", "text/javascript",
+   * FilePayload filePayload = new FilePayload("f.js", "text/javascript",
   *       "console.log(2022);".getBytes(StandardCharsets.UTF_8));
-   * APIResponse response = request.post("https://example.com/api/uploadScript",
+   * APIResponse response = request.post("https://example.com/api/uploadTeamList",
   *   RequestOptions.create().setMultipart(
   *     FormData.create().set("fileField", filePayload)));
   * }</pre>
@@ -405,7 +361,7 @@ public interface APIRequestContext {
   * response. The method will populate request cookies from the context and update context cookies from the response. The
   * method will automatically follow redirects.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   *
   * <p> JSON objects can be passed directly to the request:
   * <pre>{@code
@@ -425,8 +381,7 @@ public interface APIRequestContext {
   * }</pre>
   *
   * <p> The common way to send file(s) in the body of a request is to upload them as form fields with {@code
-   * multipart/form-data} encoding. Use {@code FormData} to construct request body and pass it to the request as {@code
-   * multipart} parameter:
+   * multipart/form-data} encoding. You can achieve that with Playwright API like this:
   * <pre>{@code
   * // Pass file path to the form data constructor:
   * Path file = Paths.get("team.csv");
@@ -435,9 +390,9 @@ public interface APIRequestContext {
   *     FormData.create().set("fileField", file)));
   *
   * // Or you can pass the file content directly as FilePayload object:
-   * FilePayload filePayload1 = new FilePayload("f1.js", "text/javascript",
+   * FilePayload filePayload = new FilePayload("f.js", "text/javascript",
   *       "console.log(2022);".getBytes(StandardCharsets.UTF_8));
-   * APIResponse response = request.post("https://example.com/api/uploadScript",
+   * APIResponse response = request.post("https://example.com/api/uploadTeamList",
   *   RequestOptions.create().setMultipart(
   *     FormData.create().set("fileField", filePayload)));
   * }</pre>
@@ -20,8 +20,8 @@ import com.microsoft.playwright.options.*;
 import java.util.*;

 /**
- * {@code APIResponse} class represents responses returned by {@link com.microsoft.playwright.APIRequestContext#get
- * APIRequestContext.get()} and similar methods.
+ * {@code APIResponse} class represents responses returned by {@link APIRequestContext#get APIRequestContext.get()} and
+ * similar methods.
 */
 public interface APIResponse {
  /**
@@ -43,8 +43,8 @@ public interface APIResponse {
   */
  Map<String, String> headers();
  /**
-   * An array with all the response HTTP headers associated with this response. Header names are not lower-cased. Headers
-   * with multiple entries, such as {@code Set-Cookie}, appear in the array multiple times.
+   * An array with all the request HTTP headers associated with this response. Header names are not lower-cased. Headers with
+   * multiple entries, such as {@code Set-Cookie}, appear in the array multiple times.
   *
   * @since v1.16
   */
@@ -23,21 +23,21 @@ import java.util.function.Consumer;
 import java.util.regex.Pattern;

 /**
- * A Browser is created via {@link com.microsoft.playwright.BrowserType#launch BrowserType.launch()}. An example of using a
- * {@code Browser} to create a {@code Page}:
+ * A Browser is created via {@link BrowserType#launch BrowserType.launch()}. An example of using a {@code Browser} to
+ * create a {@code Page}:
 * <pre>{@code
 * import com.microsoft.playwright.*;
 *
 * public class Example {
- *  public static void main(String[] args) {
- *    try (Playwright playwright = Playwright.create()) {
- *      BrowserType firefox = playwright.firefox();
- *      Browser browser = firefox.launch();
- *      Page page = browser.newPage();
- *      page.navigate("https://example.com");
- *      browser.close();
- *    }
- *  }
+ *   public static void main(String[] args) {
+ *     try (Playwright playwright = Playwright.create()) {
+ *       BrowserType firefox = playwright.firefox()
+ *       Browser browser = firefox.launch();
+ *       Page page = browser.newPage();
+ *       page.navigate('https://example.com');
+ *       browser.close();
+ *     }
+ *   }
 * }
 * }</pre>
 */
@@ -47,7 +47,7 @@ public interface Browser extends AutoCloseable {
   * Emitted when Browser gets disconnected from the browser application. This might happen because of one of the following:
   * <ul>
   * <li> Browser application is closed or crashed.</li>
-   * <li> The {@link com.microsoft.playwright.Browser#close Browser.close()} method was called.</li>
+   * <li> The {@link Browser#close Browser.close()} method was called.</li>
   * </ul>
   */
  void onDisconnected(Consumer<Browser> handler);
@@ -56,31 +56,16 @@ public interface Browser extends AutoCloseable {
   */
  void offDisconnected(Consumer<Browser> handler);

-  class CloseOptions {
-    /**
-     * The reason to be reported to the operations interrupted by the browser closure.
-     */
-    public String reason;
-
-    /**
-     * The reason to be reported to the operations interrupted by the browser closure.
-     */
-    public CloseOptions setReason(String reason) {
-      this.reason = reason;
-      return this;
-    }
-  }
  class NewContextOptions {
    /**
     * Whether to automatically download all the attachments. Defaults to {@code true} where all the downloads are accepted.
     */
    public Boolean acceptDownloads;
    /**
-     * When using {@link com.microsoft.playwright.Page#navigate Page.navigate()}, {@link com.microsoft.playwright.Page#route
-     * Page.route()}, {@link com.microsoft.playwright.Page#waitForURL Page.waitForURL()}, {@link
-     * com.microsoft.playwright.Page#waitForRequest Page.waitForRequest()}, or {@link
-     * com.microsoft.playwright.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
+     * When using {@link Page#navigate Page.navigate()}, {@link Page#route Page.route()}, {@link Page#waitForURL
+     * 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. Unset by default. Examples:
     * <ul>
     * <li> baseURL: {@code http://localhost:3000} and navigating to {@code /bar.html} results in {@code
@@ -97,37 +82,11 @@ public interface Browser extends AutoCloseable {
     */
    public Boolean bypassCSP;
    /**
-     * TLS Client Authentication allows the server to request a client certificate and verify it.
-     *
-     * <p> <strong>Details</strong>
-     *
-     * <p> An array of client certificates to be used. Each certificate object must have either both {@code certPath} and {@code
-     * keyPath}, a single {@code pfxPath}, or their corresponding direct value equivalents ({@code cert} and {@code key}, or
-     * {@code pfx}). Optionally, {@code passphrase} property should be provided if the certificate is encrypted. The {@code
-     * origin} property should be provided with an exact match to the request origin that the certificate is valid for.
-     *
-     * <p> Client certificate authentication is only active when at least one client certificate is provided. If you want to reject
-     * all client certificates sent by the server, you need to provide a client certificate with an {@code origin} that does
-     * not match any of the domains you plan to visit.
-     *
-     * <p> <strong>NOTE:</strong> When using WebKit on macOS, accessing {@code localhost} will not pick up client certificates. You can make it work by
-     * replacing {@code localhost} with {@code local.playwright}.
-     */
-    public List<ClientCertificate> clientCertificates;
-    /**
-     * Emulates <a
-     * href="https://developer.mozilla.org/en-US/docs/Web/CSS/@media/prefers-color-scheme">prefers-colors-scheme</a> media
-     * feature, supported values are {@code "light"} and {@code "dark"}. See {@link com.microsoft.playwright.Page#emulateMedia
-     * Page.emulateMedia()} for more details. Passing {@code null} resets emulation to system defaults. Defaults to {@code
-     * "light"}.
+     * Emulates {@code "prefers-colors-scheme"} media feature, supported values are {@code "light"}, {@code "dark"}, {@code
+     * "no-preference"}. See {@link Page#emulateMedia Page.emulateMedia()} for more details. Passing {@code null} resets
+     * emulation to system defaults. Defaults to {@code "light"}.
     */
    public Optional<ColorScheme> colorScheme;
-    /**
-     * Emulates {@code "prefers-contrast"} media feature, supported values are {@code "no-preference"}, {@code "more"}. See
-     * {@link com.microsoft.playwright.Page#emulateMedia Page.emulateMedia()} for more details. Passing {@code null} resets
-     * emulation to system defaults. Defaults to {@code "no-preference"}.
-     */
-    public Optional<Contrast> contrast;
    /**
     * Specify device scale factor (can be thought of as dpr). Defaults to {@code 1}. Learn more about <a
     * href="https://playwright.dev/java/docs/emulation#devices">emulating devices with device scale factor</a>.
@@ -139,8 +98,8 @@ public interface Browser extends AutoCloseable {
    public Map<String, String> extraHTTPHeaders;
    /**
     * Emulates {@code "forced-colors"} media feature, supported values are {@code "active"}, {@code "none"}. See {@link
-     * com.microsoft.playwright.Page#emulateMedia Page.emulateMedia()} for more details. Passing {@code null} resets emulation
-     * to system defaults. Defaults to {@code "none"}.
+     * Page#emulateMedia Page.emulateMedia()} for more details. Passing {@code null} resets emulation to system defaults.
+     * Defaults to {@code "none"}.
     */
    public Optional<ForcedColors> forcedColors;
    public Geolocation geolocation;
@@ -182,13 +141,16 @@ public interface Browser extends AutoCloseable {
     */
    public Boolean offline;
    /**
-     * A list of permissions to grant to all pages in this context. See {@link
-     * com.microsoft.playwright.BrowserContext#grantPermissions BrowserContext.grantPermissions()} for more details. Defaults
-     * to none.
+     * A list of permissions to grant to all pages in this context. See {@link BrowserContext#grantPermissions
+     * BrowserContext.grantPermissions()} for more details. Defaults to none.
     */
    public List<String> permissions;
    /**
     * 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:
+     * 'http://per-context' } })}.
     */
    public Proxy proxy;
    /**
@@ -209,14 +171,14 @@ public interface Browser extends AutoCloseable {
    public Boolean recordHarOmitContent;
    /**
     * Enables <a href="http://www.softwareishard.com/blog/har-12-spec">HAR</a> recording for all pages into the specified HAR
-     * file on the filesystem. If not specified, the HAR is not recorded. Make sure to call {@link
-     * com.microsoft.playwright.BrowserContext#close BrowserContext.close()} for the HAR to be saved.
+     * file on the filesystem. If not specified, the HAR is not recorded. Make sure to call {@link BrowserContext#close
+     * BrowserContext.close()} for the HAR to be saved.
     */
    public Path recordHarPath;
    public Object recordHarUrlFilter;
    /**
     * Enables video recording for all pages into the specified directory. If not specified videos are not recorded. Make sure
-     * to call {@link com.microsoft.playwright.BrowserContext#close BrowserContext.close()} for videos to be saved.
+     * to call {@link BrowserContext#close BrowserContext.close()} for videos to be saved.
     */
    public Path recordVideoDir;
    /**
@@ -227,8 +189,8 @@ public interface Browser extends AutoCloseable {
    public RecordVideoSize recordVideoSize;
    /**
     * Emulates {@code "prefers-reduced-motion"} media feature, supported values are {@code "reduce"}, {@code "no-preference"}.
-     * See {@link com.microsoft.playwright.Page#emulateMedia Page.emulateMedia()} for more details. Passing {@code null} resets
-     * emulation to system defaults. Defaults to {@code "no-preference"}.
+     * See {@link Page#emulateMedia Page.emulateMedia()} for more details. Passing {@code null} resets emulation to system
+     * defaults. Defaults to {@code "no-preference"}.
     */
    public Optional<ReducedMotion> reducedMotion;
    /**
@@ -247,13 +209,13 @@ public interface Browser extends AutoCloseable {
    public ServiceWorkerPolicy serviceWorkers;
    /**
     * Populates context with given storage state. This option can be used to initialize context with logged-in information
-     * obtained via {@link com.microsoft.playwright.BrowserContext#storageState BrowserContext.storageState()}.
+     * obtained via {@link BrowserContext#storageState BrowserContext.storageState()}.
     */
    public String storageState;
    /**
     * Populates context with given storage state. This option can be used to initialize context with logged-in information
-     * obtained via {@link com.microsoft.playwright.BrowserContext#storageState BrowserContext.storageState()}. Path to the
-     * file with saved storage state.
+     * obtained via {@link BrowserContext#storageState BrowserContext.storageState()}. Path to the file with saved storage
+     * state.
     */
    public Path storageStatePath;
    /**
@@ -291,11 +253,10 @@ public interface Browser extends AutoCloseable {
      return this;
    }
    /**
-     * When using {@link com.microsoft.playwright.Page#navigate Page.navigate()}, {@link com.microsoft.playwright.Page#route
-     * Page.route()}, {@link com.microsoft.playwright.Page#waitForURL Page.waitForURL()}, {@link
-     * com.microsoft.playwright.Page#waitForRequest Page.waitForRequest()}, or {@link
-     * com.microsoft.playwright.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
+     * When using {@link Page#navigate Page.navigate()}, {@link Page#route Page.route()}, {@link Page#waitForURL
+     * 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. Unset by default. Examples:
     * <ul>
     * <li> baseURL: {@code http://localhost:3000} and navigating to {@code /bar.html} results in {@code
@@ -318,46 +279,14 @@ public interface Browser extends AutoCloseable {
      return this;
    }
    /**
-     * TLS Client Authentication allows the server to request a client certificate and verify it.
-     *
-     * <p> <strong>Details</strong>
-     *
-     * <p> An array of client certificates to be used. Each certificate object must have either both {@code certPath} and {@code
-     * keyPath}, a single {@code pfxPath}, or their corresponding direct value equivalents ({@code cert} and {@code key}, or
-     * {@code pfx}). Optionally, {@code passphrase} property should be provided if the certificate is encrypted. The {@code
-     * origin} property should be provided with an exact match to the request origin that the certificate is valid for.
-     *
-     * <p> Client certificate authentication is only active when at least one client certificate is provided. If you want to reject
-     * all client certificates sent by the server, you need to provide a client certificate with an {@code origin} that does
-     * not match any of the domains you plan to visit.
-     *
-     * <p> <strong>NOTE:</strong> When using WebKit on macOS, accessing {@code localhost} will not pick up client certificates. You can make it work by
-     * replacing {@code localhost} with {@code local.playwright}.
-     */
-    public NewContextOptions setClientCertificates(List<ClientCertificate> clientCertificates) {
-      this.clientCertificates = clientCertificates;
-      return this;
-    }
-    /**
-     * Emulates <a
-     * href="https://developer.mozilla.org/en-US/docs/Web/CSS/@media/prefers-color-scheme">prefers-colors-scheme</a> media
-     * feature, supported values are {@code "light"} and {@code "dark"}. See {@link com.microsoft.playwright.Page#emulateMedia
-     * Page.emulateMedia()} for more details. Passing {@code null} resets emulation to system defaults. Defaults to {@code
-     * "light"}.
+     * Emulates {@code "prefers-colors-scheme"} media feature, supported values are {@code "light"}, {@code "dark"}, {@code
+     * "no-preference"}. See {@link Page#emulateMedia Page.emulateMedia()} for more details. Passing {@code null} resets
+     * emulation to system defaults. Defaults to {@code "light"}.
     */
    public NewContextOptions setColorScheme(ColorScheme colorScheme) {
      this.colorScheme = Optional.ofNullable(colorScheme);
      return this;
    }
-    /**
-     * Emulates {@code "prefers-contrast"} media feature, supported values are {@code "no-preference"}, {@code "more"}. See
-     * {@link com.microsoft.playwright.Page#emulateMedia Page.emulateMedia()} for more details. Passing {@code null} resets
-     * emulation to system defaults. Defaults to {@code "no-preference"}.
-     */
-    public NewContextOptions setContrast(Contrast contrast) {
-      this.contrast = Optional.ofNullable(contrast);
-      return this;
-    }
    /**
     * Specify device scale factor (can be thought of as dpr). Defaults to {@code 1}. Learn more about <a
     * href="https://playwright.dev/java/docs/emulation#devices">emulating devices with device scale factor</a>.
@@ -375,8 +304,8 @@ public interface Browser extends AutoCloseable {
    }
    /**
     * Emulates {@code "forced-colors"} media feature, supported values are {@code "active"}, {@code "none"}. See {@link
-     * com.microsoft.playwright.Page#emulateMedia Page.emulateMedia()} for more details. Passing {@code null} resets emulation
-     * to system defaults. Defaults to {@code "none"}.
+     * Page#emulateMedia Page.emulateMedia()} for more details. Passing {@code null} resets emulation to system defaults.
+     * Defaults to {@code "none"}.
     */
    public NewContextOptions setForcedColors(ForcedColors forcedColors) {
      this.forcedColors = Optional.ofNullable(forcedColors);
@@ -455,9 +384,8 @@ public interface Browser extends AutoCloseable {
      return this;
    }
    /**
-     * A list of permissions to grant to all pages in this context. See {@link
-     * com.microsoft.playwright.BrowserContext#grantPermissions BrowserContext.grantPermissions()} for more details. Defaults
-     * to none.
+     * A list of permissions to grant to all pages in this context. See {@link BrowserContext#grantPermissions
+     * BrowserContext.grantPermissions()} for more details. Defaults to none.
     */
    public NewContextOptions setPermissions(List<String> permissions) {
      this.permissions = permissions;
@@ -465,12 +393,20 @@ public interface Browser extends AutoCloseable {
    }
    /**
     * 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:
+     * 'http://per-context' } })}.
     */
    public NewContextOptions setProxy(String server) {
      return setProxy(new Proxy(server));
    }
    /**
     * 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:
+     * 'http://per-context' } })}.
     */
    public NewContextOptions setProxy(Proxy proxy) {
      this.proxy = proxy;
@@ -503,8 +439,8 @@ public interface Browser extends AutoCloseable {
    }
    /**
     * Enables <a href="http://www.softwareishard.com/blog/har-12-spec">HAR</a> recording for all pages into the specified HAR
-     * file on the filesystem. If not specified, the HAR is not recorded. Make sure to call {@link
-     * com.microsoft.playwright.BrowserContext#close BrowserContext.close()} for the HAR to be saved.
+     * file on the filesystem. If not specified, the HAR is not recorded. Make sure to call {@link BrowserContext#close
+     * BrowserContext.close()} for the HAR to be saved.
     */
    public NewContextOptions setRecordHarPath(Path recordHarPath) {
      this.recordHarPath = recordHarPath;
@@ -520,7 +456,7 @@ public interface Browser extends AutoCloseable {
    }
    /**
     * Enables video recording for all pages into the specified directory. If not specified videos are not recorded. Make sure
-     * to call {@link com.microsoft.playwright.BrowserContext#close BrowserContext.close()} for videos to be saved.
+     * to call {@link BrowserContext#close BrowserContext.close()} for videos to be saved.
     */
    public NewContextOptions setRecordVideoDir(Path recordVideoDir) {
      this.recordVideoDir = recordVideoDir;
@@ -545,8 +481,8 @@ public interface Browser extends AutoCloseable {
    }
    /**
     * Emulates {@code "prefers-reduced-motion"} media feature, supported values are {@code "reduce"}, {@code "no-preference"}.
-     * See {@link com.microsoft.playwright.Page#emulateMedia Page.emulateMedia()} for more details. Passing {@code null} resets
-     * emulation to system defaults. Defaults to {@code "no-preference"}.
+     * See {@link Page#emulateMedia Page.emulateMedia()} for more details. Passing {@code null} resets emulation to system
+     * defaults. Defaults to {@code "no-preference"}.
     */
    public NewContextOptions setReducedMotion(ReducedMotion reducedMotion) {
      this.reducedMotion = Optional.ofNullable(reducedMotion);
@@ -581,7 +517,7 @@ public interface Browser extends AutoCloseable {
    }
    /**
     * Populates context with given storage state. This option can be used to initialize context with logged-in information
-     * obtained via {@link com.microsoft.playwright.BrowserContext#storageState BrowserContext.storageState()}.
+     * obtained via {@link BrowserContext#storageState BrowserContext.storageState()}.
     */
    public NewContextOptions setStorageState(String storageState) {
      this.storageState = storageState;
@@ -589,8 +525,8 @@ public interface Browser extends AutoCloseable {
    }
    /**
     * Populates context with given storage state. This option can be used to initialize context with logged-in information
-     * obtained via {@link com.microsoft.playwright.BrowserContext#storageState BrowserContext.storageState()}. Path to the
-     * file with saved storage state.
+     * obtained via {@link BrowserContext#storageState BrowserContext.storageState()}. Path to the file with saved storage
+     * state.
     */
    public NewContextOptions setStorageStatePath(Path storageStatePath) {
      this.storageStatePath = storageStatePath;
@@ -652,11 +588,10 @@ public interface Browser extends AutoCloseable {
     */
    public Boolean acceptDownloads;
    /**
-     * When using {@link com.microsoft.playwright.Page#navigate Page.navigate()}, {@link com.microsoft.playwright.Page#route
-     * Page.route()}, {@link com.microsoft.playwright.Page#waitForURL Page.waitForURL()}, {@link
-     * com.microsoft.playwright.Page#waitForRequest Page.waitForRequest()}, or {@link
-     * com.microsoft.playwright.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
+     * When using {@link Page#navigate Page.navigate()}, {@link Page#route Page.route()}, {@link Page#waitForURL
+     * 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. Unset by default. Examples:
     * <ul>
     * <li> baseURL: {@code http://localhost:3000} and navigating to {@code /bar.html} results in {@code
@@ -673,37 +608,11 @@ public interface Browser extends AutoCloseable {
     */
    public Boolean bypassCSP;
    /**
-     * TLS Client Authentication allows the server to request a client certificate and verify it.
-     *
-     * <p> <strong>Details</strong>
-     *
-     * <p> An array of client certificates to be used. Each certificate object must have either both {@code certPath} and {@code
-     * keyPath}, a single {@code pfxPath}, or their corresponding direct value equivalents ({@code cert} and {@code key}, or
-     * {@code pfx}). Optionally, {@code passphrase} property should be provided if the certificate is encrypted. The {@code
-     * origin} property should be provided with an exact match to the request origin that the certificate is valid for.
-     *
-     * <p> Client certificate authentication is only active when at least one client certificate is provided. If you want to reject
-     * all client certificates sent by the server, you need to provide a client certificate with an {@code origin} that does
-     * not match any of the domains you plan to visit.
-     *
-     * <p> <strong>NOTE:</strong> When using WebKit on macOS, accessing {@code localhost} will not pick up client certificates. You can make it work by
-     * replacing {@code localhost} with {@code local.playwright}.
-     */
-    public List<ClientCertificate> clientCertificates;
-    /**
-     * Emulates <a
-     * href="https://developer.mozilla.org/en-US/docs/Web/CSS/@media/prefers-color-scheme">prefers-colors-scheme</a> media
-     * feature, supported values are {@code "light"} and {@code "dark"}. See {@link com.microsoft.playwright.Page#emulateMedia
-     * Page.emulateMedia()} for more details. Passing {@code null} resets emulation to system defaults. Defaults to {@code
-     * "light"}.
+     * Emulates {@code "prefers-colors-scheme"} media feature, supported values are {@code "light"}, {@code "dark"}, {@code
+     * "no-preference"}. See {@link Page#emulateMedia Page.emulateMedia()} for more details. Passing {@code null} resets
+     * emulation to system defaults. Defaults to {@code "light"}.
     */
    public Optional<ColorScheme> colorScheme;
-    /**
-     * Emulates {@code "prefers-contrast"} media feature, supported values are {@code "no-preference"}, {@code "more"}. See
-     * {@link com.microsoft.playwright.Page#emulateMedia Page.emulateMedia()} for more details. Passing {@code null} resets
-     * emulation to system defaults. Defaults to {@code "no-preference"}.
-     */
-    public Optional<Contrast> contrast;
    /**
     * Specify device scale factor (can be thought of as dpr). Defaults to {@code 1}. Learn more about <a
     * href="https://playwright.dev/java/docs/emulation#devices">emulating devices with device scale factor</a>.
@@ -715,8 +624,8 @@ public interface Browser extends AutoCloseable {
    public Map<String, String> extraHTTPHeaders;
    /**
     * Emulates {@code "forced-colors"} media feature, supported values are {@code "active"}, {@code "none"}. See {@link
-     * com.microsoft.playwright.Page#emulateMedia Page.emulateMedia()} for more details. Passing {@code null} resets emulation
-     * to system defaults. Defaults to {@code "none"}.
+     * Page#emulateMedia Page.emulateMedia()} for more details. Passing {@code null} resets emulation to system defaults.
+     * Defaults to {@code "none"}.
     */
    public Optional<ForcedColors> forcedColors;
    public Geolocation geolocation;
@@ -758,13 +667,16 @@ public interface Browser extends AutoCloseable {
     */
    public Boolean offline;
    /**
-     * A list of permissions to grant to all pages in this context. See {@link
-     * com.microsoft.playwright.BrowserContext#grantPermissions BrowserContext.grantPermissions()} for more details. Defaults
-     * to none.
+     * A list of permissions to grant to all pages in this context. See {@link BrowserContext#grantPermissions
+     * BrowserContext.grantPermissions()} for more details. Defaults to none.
     */
    public List<String> permissions;
    /**
     * 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:
+     * 'http://per-context' } })}.
     */
    public Proxy proxy;
    /**
@@ -785,14 +697,14 @@ public interface Browser extends AutoCloseable {
    public Boolean recordHarOmitContent;
    /**
     * Enables <a href="http://www.softwareishard.com/blog/har-12-spec">HAR</a> recording for all pages into the specified HAR
-     * file on the filesystem. If not specified, the HAR is not recorded. Make sure to call {@link
-     * com.microsoft.playwright.BrowserContext#close BrowserContext.close()} for the HAR to be saved.
+     * file on the filesystem. If not specified, the HAR is not recorded. Make sure to call {@link BrowserContext#close
+     * BrowserContext.close()} for the HAR to be saved.
     */
    public Path recordHarPath;
    public Object recordHarUrlFilter;
    /**
     * Enables video recording for all pages into the specified directory. If not specified videos are not recorded. Make sure
-     * to call {@link com.microsoft.playwright.BrowserContext#close BrowserContext.close()} for videos to be saved.
+     * to call {@link BrowserContext#close BrowserContext.close()} for videos to be saved.
     */
    public Path recordVideoDir;
    /**
@@ -803,8 +715,8 @@ public interface Browser extends AutoCloseable {
    public RecordVideoSize recordVideoSize;
    /**
     * Emulates {@code "prefers-reduced-motion"} media feature, supported values are {@code "reduce"}, {@code "no-preference"}.
-     * See {@link com.microsoft.playwright.Page#emulateMedia Page.emulateMedia()} for more details. Passing {@code null} resets
-     * emulation to system defaults. Defaults to {@code "no-preference"}.
+     * See {@link Page#emulateMedia Page.emulateMedia()} for more details. Passing {@code null} resets emulation to system
+     * defaults. Defaults to {@code "no-preference"}.
     */
    public Optional<ReducedMotion> reducedMotion;
    /**
@@ -823,13 +735,13 @@ public interface Browser extends AutoCloseable {
    public ServiceWorkerPolicy serviceWorkers;
    /**
     * Populates context with given storage state. This option can be used to initialize context with logged-in information
-     * obtained via {@link com.microsoft.playwright.BrowserContext#storageState BrowserContext.storageState()}.
+     * obtained via {@link BrowserContext#storageState BrowserContext.storageState()}.
     */
    public String storageState;
    /**
     * Populates context with given storage state. This option can be used to initialize context with logged-in information
-     * obtained via {@link com.microsoft.playwright.BrowserContext#storageState BrowserContext.storageState()}. Path to the
-     * file with saved storage state.
+     * obtained via {@link BrowserContext#storageState BrowserContext.storageState()}. Path to the file with saved storage
+     * state.
     */
    public Path storageStatePath;
    /**
@@ -867,11 +779,10 @@ public interface Browser extends AutoCloseable {
      return this;
    }
    /**
-     * When using {@link com.microsoft.playwright.Page#navigate Page.navigate()}, {@link com.microsoft.playwright.Page#route
-     * Page.route()}, {@link com.microsoft.playwright.Page#waitForURL Page.waitForURL()}, {@link
-     * com.microsoft.playwright.Page#waitForRequest Page.waitForRequest()}, or {@link
-     * com.microsoft.playwright.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
+     * When using {@link Page#navigate Page.navigate()}, {@link Page#route Page.route()}, {@link Page#waitForURL
+     * 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. Unset by default. Examples:
     * <ul>
     * <li> baseURL: {@code http://localhost:3000} and navigating to {@code /bar.html} results in {@code
@@ -894,46 +805,14 @@ public interface Browser extends AutoCloseable {
      return this;
    }
    /**
-     * TLS Client Authentication allows the server to request a client certificate and verify it.
-     *
-     * <p> <strong>Details</strong>
-     *
-     * <p> An array of client certificates to be used. Each certificate object must have either both {@code certPath} and {@code
-     * keyPath}, a single {@code pfxPath}, or their corresponding direct value equivalents ({@code cert} and {@code key}, or
-     * {@code pfx}). Optionally, {@code passphrase} property should be provided if the certificate is encrypted. The {@code
-     * origin} property should be provided with an exact match to the request origin that the certificate is valid for.
-     *
-     * <p> Client certificate authentication is only active when at least one client certificate is provided. If you want to reject
-     * all client certificates sent by the server, you need to provide a client certificate with an {@code origin} that does
-     * not match any of the domains you plan to visit.
-     *
-     * <p> <strong>NOTE:</strong> When using WebKit on macOS, accessing {@code localhost} will not pick up client certificates. You can make it work by
-     * replacing {@code localhost} with {@code local.playwright}.
-     */
-    public NewPageOptions setClientCertificates(List<ClientCertificate> clientCertificates) {
-      this.clientCertificates = clientCertificates;
-      return this;
-    }
-    /**
-     * Emulates <a
-     * href="https://developer.mozilla.org/en-US/docs/Web/CSS/@media/prefers-color-scheme">prefers-colors-scheme</a> media
-     * feature, supported values are {@code "light"} and {@code "dark"}. See {@link com.microsoft.playwright.Page#emulateMedia
-     * Page.emulateMedia()} for more details. Passing {@code null} resets emulation to system defaults. Defaults to {@code
-     * "light"}.
+     * Emulates {@code "prefers-colors-scheme"} media feature, supported values are {@code "light"}, {@code "dark"}, {@code
+     * "no-preference"}. See {@link Page#emulateMedia Page.emulateMedia()} for more details. Passing {@code null} resets
+     * emulation to system defaults. Defaults to {@code "light"}.
     */
    public NewPageOptions setColorScheme(ColorScheme colorScheme) {
      this.colorScheme = Optional.ofNullable(colorScheme);
      return this;
    }
-    /**
-     * Emulates {@code "prefers-contrast"} media feature, supported values are {@code "no-preference"}, {@code "more"}. See
-     * {@link com.microsoft.playwright.Page#emulateMedia Page.emulateMedia()} for more details. Passing {@code null} resets
-     * emulation to system defaults. Defaults to {@code "no-preference"}.
-     */
-    public NewPageOptions setContrast(Contrast contrast) {
-      this.contrast = Optional.ofNullable(contrast);
-      return this;
-    }
    /**
     * Specify device scale factor (can be thought of as dpr). Defaults to {@code 1}. Learn more about <a
     * href="https://playwright.dev/java/docs/emulation#devices">emulating devices with device scale factor</a>.
@@ -951,8 +830,8 @@ public interface Browser extends AutoCloseable {
    }
    /**
     * Emulates {@code "forced-colors"} media feature, supported values are {@code "active"}, {@code "none"}. See {@link
-     * com.microsoft.playwright.Page#emulateMedia Page.emulateMedia()} for more details. Passing {@code null} resets emulation
-     * to system defaults. Defaults to {@code "none"}.
+     * Page#emulateMedia Page.emulateMedia()} for more details. Passing {@code null} resets emulation to system defaults.
+     * Defaults to {@code "none"}.
     */
    public NewPageOptions setForcedColors(ForcedColors forcedColors) {
      this.forcedColors = Optional.ofNullable(forcedColors);
@@ -1031,9 +910,8 @@ public interface Browser extends AutoCloseable {
      return this;
    }
    /**
-     * A list of permissions to grant to all pages in this context. See {@link
-     * com.microsoft.playwright.BrowserContext#grantPermissions BrowserContext.grantPermissions()} for more details. Defaults
-     * to none.
+     * A list of permissions to grant to all pages in this context. See {@link BrowserContext#grantPermissions
+     * BrowserContext.grantPermissions()} for more details. Defaults to none.
     */
    public NewPageOptions setPermissions(List<String> permissions) {
      this.permissions = permissions;
@@ -1041,12 +919,20 @@ public interface Browser extends AutoCloseable {
    }
    /**
     * 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:
+     * 'http://per-context' } })}.
     */
    public NewPageOptions setProxy(String server) {
      return setProxy(new Proxy(server));
    }
    /**
     * 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:
+     * 'http://per-context' } })}.
     */
    public NewPageOptions setProxy(Proxy proxy) {
      this.proxy = proxy;
@@ -1079,8 +965,8 @@ public interface Browser extends AutoCloseable {
    }
    /**
     * Enables <a href="http://www.softwareishard.com/blog/har-12-spec">HAR</a> recording for all pages into the specified HAR
-     * file on the filesystem. If not specified, the HAR is not recorded. Make sure to call {@link
-     * com.microsoft.playwright.BrowserContext#close BrowserContext.close()} for the HAR to be saved.
+     * file on the filesystem. If not specified, the HAR is not recorded. Make sure to call {@link BrowserContext#close
+     * BrowserContext.close()} for the HAR to be saved.
     */
    public NewPageOptions setRecordHarPath(Path recordHarPath) {
      this.recordHarPath = recordHarPath;
@@ -1096,7 +982,7 @@ public interface Browser extends AutoCloseable {
    }
    /**
     * Enables video recording for all pages into the specified directory. If not specified videos are not recorded. Make sure
-     * to call {@link com.microsoft.playwright.BrowserContext#close BrowserContext.close()} for videos to be saved.
+     * to call {@link BrowserContext#close BrowserContext.close()} for videos to be saved.
     */
    public NewPageOptions setRecordVideoDir(Path recordVideoDir) {
      this.recordVideoDir = recordVideoDir;
@@ -1121,8 +1007,8 @@ public interface Browser extends AutoCloseable {
    }
    /**
     * Emulates {@code "prefers-reduced-motion"} media feature, supported values are {@code "reduce"}, {@code "no-preference"}.
-     * See {@link com.microsoft.playwright.Page#emulateMedia Page.emulateMedia()} for more details. Passing {@code null} resets
-     * emulation to system defaults. Defaults to {@code "no-preference"}.
+     * See {@link Page#emulateMedia Page.emulateMedia()} for more details. Passing {@code null} resets emulation to system
+     * defaults. Defaults to {@code "no-preference"}.
     */
    public NewPageOptions setReducedMotion(ReducedMotion reducedMotion) {
      this.reducedMotion = Optional.ofNullable(reducedMotion);
@@ -1157,7 +1043,7 @@ public interface Browser extends AutoCloseable {
    }
    /**
     * Populates context with given storage state. This option can be used to initialize context with logged-in information
-     * obtained via {@link com.microsoft.playwright.BrowserContext#storageState BrowserContext.storageState()}.
+     * obtained via {@link BrowserContext#storageState BrowserContext.storageState()}.
     */
    public NewPageOptions setStorageState(String storageState) {
      this.storageState = storageState;
@@ -1165,8 +1051,8 @@ public interface Browser extends AutoCloseable {
    }
    /**
     * Populates context with given storage state. This option can be used to initialize context with logged-in information
-     * obtained via {@link com.microsoft.playwright.BrowserContext#storageState BrowserContext.storageState()}. Path to the
-     * file with saved storage state.
+     * obtained via {@link BrowserContext#storageState BrowserContext.storageState()}. Path to the file with saved storage
+     * state.
     */
    public NewPageOptions setStorageStatePath(Path storageStatePath) {
      this.storageStatePath = storageStatePath;
@@ -1265,45 +1151,25 @@ public interface Browser extends AutoCloseable {
   */
  BrowserType browserType();
  /**
-   * In case this browser is obtained using {@link com.microsoft.playwright.BrowserType#launch BrowserType.launch()}, closes
-   * the browser and all of its pages (if any were opened).
+   * In case this browser is obtained using {@link BrowserType#launch BrowserType.launch()}, closes the browser and all of
+   * its pages (if any were opened).
   *
   * <p> In case this browser is connected to, clears all created contexts belonging to this browser and disconnects from the
   * browser server.
   *
-   * <p> <strong>NOTE:</strong> This is similar to force-quitting the browser. To close pages gracefully and ensure you receive page close events, call
-   * {@link com.microsoft.playwright.BrowserContext#close BrowserContext.close()} on any {@code BrowserContext} instances you
-   * explicitly created earlier using {@link com.microsoft.playwright.Browser#newContext Browser.newContext()} **before**
-   * calling {@link com.microsoft.playwright.Browser#close Browser.close()}.
+   * <p> <strong>NOTE:</strong> This is similar to force quitting the browser. Therefore, you should call {@link BrowserContext#close
+   * BrowserContext.close()} on any {@code BrowserContext}'s you explicitly created earlier with {@link Browser#newContext
+   * Browser.newContext()} **before** calling {@link Browser#close Browser.close()}.
   *
   * <p> The {@code Browser} object itself is considered to be disposed and cannot be used anymore.
   *
   * @since v1.8
   */
-  default void close() {
-    close(null);
-  }
-  /**
-   * In case this browser is obtained using {@link com.microsoft.playwright.BrowserType#launch BrowserType.launch()}, closes
-   * the browser and all of its pages (if any were opened).
-   *
-   * <p> In case this browser is connected to, clears all created contexts belonging to this browser and disconnects from the
-   * browser server.
-   *
-   * <p> <strong>NOTE:</strong> This is similar to force-quitting the browser. To close pages gracefully and ensure you receive page close events, call
-   * {@link com.microsoft.playwright.BrowserContext#close BrowserContext.close()} on any {@code BrowserContext} instances you
-   * explicitly created earlier using {@link com.microsoft.playwright.Browser#newContext Browser.newContext()} **before**
-   * calling {@link com.microsoft.playwright.Browser#close Browser.close()}.
-   *
-   * <p> The {@code Browser} object itself is considered to be disposed and cannot be used anymore.
-   *
-   * @since v1.8
-   */
-  void close(CloseOptions options);
+  void close();
  /**
   * Returns an array of all open browser contexts. In a newly created browser, this will return zero browser contexts.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   * <pre>{@code
   * Browser browser = pw.webkit().launch();
   * System.out.println(browser.contexts().size()); // prints "0"
@@ -1332,18 +1198,18 @@ public interface Browser extends AutoCloseable {
   * Creates a new browser context. It won't share cookies/cache with other browser contexts.
   *
   * <p> <strong>NOTE:</strong> If directly using this method to create {@code BrowserContext}s, it is best practice to explicitly close the returned
-   * context via {@link com.microsoft.playwright.BrowserContext#close BrowserContext.close()} when your code is done with the
-   * {@code BrowserContext}, and before calling {@link com.microsoft.playwright.Browser#close Browser.close()}. This will
-   * ensure the {@code context} is closed gracefully and any artifacts—like HARs and videos—are fully flushed and saved.
+   * context via {@link BrowserContext#close BrowserContext.close()} when your code is done with the {@code BrowserContext},
+   * and before calling {@link Browser#close Browser.close()}. This will ensure the {@code context} is closed gracefully and
+   * any artifacts—like HARs and videos—are fully flushed and saved.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   * <pre>{@code
   * Browser browser = playwright.firefox().launch();  // Or 'chromium' or 'webkit'.
   * // Create a new incognito browser context.
   * BrowserContext context = browser.newContext();
   * // Create a new page in a pristine context.
   * Page page = context.newPage();
-   * page.navigate("https://example.com");
+   * page.navigate('https://example.com');
   *
   * // Graceful close up everything
   * context.close();
@@ -1359,18 +1225,18 @@ public interface Browser extends AutoCloseable {
   * Creates a new browser context. It won't share cookies/cache with other browser contexts.
   *
   * <p> <strong>NOTE:</strong> If directly using this method to create {@code BrowserContext}s, it is best practice to explicitly close the returned
-   * context via {@link com.microsoft.playwright.BrowserContext#close BrowserContext.close()} when your code is done with the
-   * {@code BrowserContext}, and before calling {@link com.microsoft.playwright.Browser#close Browser.close()}. This will
-   * ensure the {@code context} is closed gracefully and any artifacts—like HARs and videos—are fully flushed and saved.
+   * context via {@link BrowserContext#close BrowserContext.close()} when your code is done with the {@code BrowserContext},
+   * and before calling {@link Browser#close Browser.close()}. This will ensure the {@code context} is closed gracefully and
+   * any artifacts—like HARs and videos—are fully flushed and saved.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   * <pre>{@code
   * Browser browser = playwright.firefox().launch();  // Or 'chromium' or 'webkit'.
   * // Create a new incognito browser context.
   * BrowserContext context = browser.newContext();
   * // Create a new page in a pristine context.
   * Page page = context.newPage();
-   * page.navigate("https://example.com");
+   * page.navigate('https://example.com');
   *
   * // Graceful close up everything
   * context.close();
@@ -1384,9 +1250,8 @@ public interface Browser extends AutoCloseable {
   * Creates a new page in a new browser context. Closing this page will close the context as well.
   *
   * <p> This is a convenience API that should only be used for the single-page scenarios and short snippets. Production code and
-   * testing frameworks should explicitly create {@link com.microsoft.playwright.Browser#newContext Browser.newContext()}
-   * followed by the {@link com.microsoft.playwright.BrowserContext#newPage BrowserContext.newPage()} to control their exact
-   * life times.
+   * testing frameworks should explicitly create {@link Browser#newContext Browser.newContext()} followed by the {@link
+   * BrowserContext#newPage BrowserContext.newPage()} to control their exact life times.
   *
   * @since v1.8
   */
@@ -1397,9 +1262,8 @@ public interface Browser extends AutoCloseable {
   * Creates a new page in a new browser context. Closing this page will close the context as well.
   *
   * <p> This is a convenience API that should only be used for the single-page scenarios and short snippets. Production code and
-   * testing frameworks should explicitly create {@link com.microsoft.playwright.Browser#newContext Browser.newContext()}
-   * followed by the {@link com.microsoft.playwright.BrowserContext#newPage BrowserContext.newPage()} to control their exact
-   * life times.
+   * testing frameworks should explicitly create {@link Browser#newContext Browser.newContext()} followed by the {@link
+   * BrowserContext#newPage BrowserContext.newPage()} to control their exact life times.
   *
   * @since v1.8
   */
@@ -1410,15 +1274,14 @@ public interface Browser extends AutoCloseable {
   * href="https://playwright.dev/java/docs/trace-viewer">Playwright Tracing</a> could be found <a
   * href="https://playwright.dev/java/docs/api/class-tracing">here</a>.
   *
-   * <p> You can use {@link com.microsoft.playwright.Browser#startTracing Browser.startTracing()} and {@link
-   * com.microsoft.playwright.Browser#stopTracing Browser.stopTracing()} to create a trace file that can be opened in Chrome
-   * DevTools performance panel.
+   * <p> You can use {@link Browser#startTracing Browser.startTracing()} and {@link Browser#stopTracing Browser.stopTracing()} to
+   * create a trace file that can be opened in Chrome DevTools performance panel.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   * <pre>{@code
   * browser.startTracing(page, new Browser.StartTracingOptions()
   *   .setPath(Paths.get("trace.json")));
-   * page.navigate("https://www.google.com");
+   * page.goto('https://www.google.com');
   * browser.stopTracing();
   * }</pre>
   *
@@ -1434,15 +1297,14 @@ public interface Browser extends AutoCloseable {
   * href="https://playwright.dev/java/docs/trace-viewer">Playwright Tracing</a> could be found <a
   * href="https://playwright.dev/java/docs/api/class-tracing">here</a>.
   *
-   * <p> You can use {@link com.microsoft.playwright.Browser#startTracing Browser.startTracing()} and {@link
-   * com.microsoft.playwright.Browser#stopTracing Browser.stopTracing()} to create a trace file that can be opened in Chrome
-   * DevTools performance panel.
+   * <p> You can use {@link Browser#startTracing Browser.startTracing()} and {@link Browser#stopTracing Browser.stopTracing()} to
+   * create a trace file that can be opened in Chrome DevTools performance panel.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   * <pre>{@code
   * browser.startTracing(page, new Browser.StartTracingOptions()
   *   .setPath(Paths.get("trace.json")));
-   * page.navigate("https://www.google.com");
+   * page.goto('https://www.google.com');
   * browser.stopTracing();
   * }</pre>
   *
@@ -1457,15 +1319,14 @@ public interface Browser extends AutoCloseable {
   * href="https://playwright.dev/java/docs/trace-viewer">Playwright Tracing</a> could be found <a
   * href="https://playwright.dev/java/docs/api/class-tracing">here</a>.
   *
-   * <p> You can use {@link com.microsoft.playwright.Browser#startTracing Browser.startTracing()} and {@link
-   * com.microsoft.playwright.Browser#stopTracing Browser.stopTracing()} to create a trace file that can be opened in Chrome
-   * DevTools performance panel.
+   * <p> You can use {@link Browser#startTracing Browser.startTracing()} and {@link Browser#stopTracing Browser.stopTracing()} to
+   * create a trace file that can be opened in Chrome DevTools performance panel.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   * <pre>{@code
   * browser.startTracing(page, new Browser.StartTracingOptions()
   *   .setPath(Paths.get("trace.json")));
-   * page.navigate("https://www.google.com");
+   * page.goto('https://www.google.com');
   * browser.stopTracing();
   * }</pre>
   *
@@ -128,11 +128,6 @@ public interface BrowserType {
     * Additional HTTP headers to be sent with connect request. Optional.
     */
    public Map<String, String> headers;
-    /**
-     * Tells Playwright that it runs on the same host as the CDP server. It will enable certain optimizations that rely upon
-     * the file system being the same between Playwright and the Browser.
-     */
-    public Boolean isLocal;
    /**
     * Slows down Playwright operations by the specified amount of milliseconds. Useful so that you can see what is going on.
     * Defaults to 0.
@@ -151,14 +146,6 @@ public interface BrowserType {
      this.headers = headers;
      return this;
    }
-    /**
-     * Tells Playwright that it runs on the same host as the CDP server. It will enable certain optimizations that rely upon
-     * the file system being the same between Playwright and the Browser.
-     */
-    public ConnectOverCDPOptions setIsLocal(boolean isLocal) {
-      this.isLocal = isLocal;
-      return this;
-    }
    /**
     * Slows down Playwright operations by the specified amount of milliseconds. Useful so that you can see what is going on.
     * Defaults to 0.
@@ -178,27 +165,25 @@ public interface BrowserType {
  }
  class LaunchOptions {
    /**
-     * <strong>NOTE:</strong> Use custom browser args at your own risk, as some of them may break Playwright functionality.
-     *
-     * <p> Additional arguments to pass to the browser instance. The list of Chromium flags can be found <a
-     * href="https://peter.sh/experiments/chromium-command-line-switches/">here</a>.
+     * Additional arguments to pass to the browser instance. The list of Chromium flags can be found <a
+     * href="http://peter.sh/experiments/chromium-command-line-switches/">here</a>.
     */
    public List<String> args;
    /**
-     * Browser distribution channel.
-     *
-     * <p> Use "chromium" to <a href="https://playwright.dev/java/docs/browsers#chromium-new-headless-mode">opt in to new headless
-     * mode</a>.
-     *
-     * <p> Use "chrome", "chrome-beta", "chrome-dev", "chrome-canary", "msedge", "msedge-beta", "msedge-dev", or "msedge-canary" to
-     * use branded <a href="https://playwright.dev/java/docs/browsers#google-chrome--microsoft-edge">Google Chrome and
-     * Microsoft Edge</a>.
+     * Browser distribution channel.  Supported values are "chrome", "chrome-beta", "chrome-dev", "chrome-canary", "msedge",
+     * "msedge-beta", "msedge-dev", "msedge-canary". Read more about using <a
+     * href="https://playwright.dev/java/docs/browsers#google-chrome--microsoft-edge">Google Chrome and Microsoft Edge</a>.
     */
    public Object channel;
    /**
     * Enable Chromium sandboxing. Defaults to {@code false}.
     */
    public Boolean chromiumSandbox;
+    /**
+     * **Chromium-only** Whether to auto-open a Developer Tools panel for each tab. If this option is {@code true}, the {@code
+     * headless} option will be set {@code false}.
+     */
+    public Boolean devtools;
    /**
     * If specified, accepted downloads are downloaded into this directory. Otherwise, temporary directory is created and is
     * deleted when browser is closed. In either case, the downloads are deleted when the browser context they were created in
@@ -218,9 +203,6 @@ public interface BrowserType {
    /**
     * Firefox user preferences. Learn more about the Firefox user preferences at <a
     * href="https://support.mozilla.org/en-US/kb/about-config-editor-firefox">{@code about:config}</a>.
-     *
-     * <p> You can also provide a path to a custom <a href="https://mozilla.github.io/policy-templates/">{@code policies.json}
-     * file</a> via {@code PLAYWRIGHT_FIREFOX_POLICIES_JSON} environment variable.
     */
    public Map<String, Object> firefoxUserPrefs;
    /**
@@ -238,7 +220,8 @@ public interface BrowserType {
    /**
     * Whether to run browser in headless mode. More details for <a
     * href="https://developers.google.com/web/updates/2017/04/headless-chrome">Chromium</a> and <a
-     * href="https://hacks.mozilla.org/2017/12/using-headless-mode-in-firefox/">Firefox</a>. Defaults to {@code true}.
+     * href="https://developer.mozilla.org/en-US/docs/Mozilla/Firefox/Headless_mode">Firefox</a>. Defaults to {@code true}
+     * unless the {@code devtools} option is {@code true}.
     */
    public Boolean headless;
    /**
@@ -270,10 +253,8 @@ public interface BrowserType {
    public Path tracesDir;

    /**
-     * <strong>NOTE:</strong> Use custom browser args at your own risk, as some of them may break Playwright functionality.
-     *
-     * <p> Additional arguments to pass to the browser instance. The list of Chromium flags can be found <a
-     * href="https://peter.sh/experiments/chromium-command-line-switches/">here</a>.
+     * Additional arguments to pass to the browser instance. The list of Chromium flags can be found <a
+     * href="http://peter.sh/experiments/chromium-command-line-switches/">here</a>.
     */
    public LaunchOptions setArgs(List<String> args) {
      this.args = args;
@@ -281,28 +262,18 @@ public interface BrowserType {
    }
    @Deprecated
    /**
-     * Browser distribution channel.
-     *
-     * <p> Use "chromium" to <a href="https://playwright.dev/java/docs/browsers#chromium-new-headless-mode">opt in to new headless
-     * mode</a>.
-     *
-     * <p> Use "chrome", "chrome-beta", "chrome-dev", "chrome-canary", "msedge", "msedge-beta", "msedge-dev", or "msedge-canary" to
-     * use branded <a href="https://playwright.dev/java/docs/browsers#google-chrome--microsoft-edge">Google Chrome and
-     * Microsoft Edge</a>.
+     * Browser distribution channel.  Supported values are "chrome", "chrome-beta", "chrome-dev", "chrome-canary", "msedge",
+     * "msedge-beta", "msedge-dev", "msedge-canary". Read more about using <a
+     * href="https://playwright.dev/java/docs/browsers#google-chrome--microsoft-edge">Google Chrome and Microsoft Edge</a>.
     */
    public LaunchOptions setChannel(BrowserChannel channel) {
      this.channel = channel;
      return this;
    }
    /**
-     * Browser distribution channel.
-     *
-     * <p> Use "chromium" to <a href="https://playwright.dev/java/docs/browsers#chromium-new-headless-mode">opt in to new headless
-     * mode</a>.
-     *
-     * <p> Use "chrome", "chrome-beta", "chrome-dev", "chrome-canary", "msedge", "msedge-beta", "msedge-dev", or "msedge-canary" to
-     * use branded <a href="https://playwright.dev/java/docs/browsers#google-chrome--microsoft-edge">Google Chrome and
-     * Microsoft Edge</a>.
+     * Browser distribution channel.  Supported values are "chrome", "chrome-beta", "chrome-dev", "chrome-canary", "msedge",
+     * "msedge-beta", "msedge-dev", "msedge-canary". Read more about using <a
+     * href="https://playwright.dev/java/docs/browsers#google-chrome--microsoft-edge">Google Chrome and Microsoft Edge</a>.
     */
    public LaunchOptions setChannel(String channel) {
      this.channel = channel;
@@ -315,6 +286,14 @@ public interface BrowserType {
      this.chromiumSandbox = chromiumSandbox;
      return this;
    }
+    /**
+     * **Chromium-only** Whether to auto-open a Developer Tools panel for each tab. If this option is {@code true}, the {@code
+     * headless} option will be set {@code false}.
+     */
+    public LaunchOptions setDevtools(boolean devtools) {
+      this.devtools = devtools;
+      return this;
+    }
    /**
     * If specified, accepted downloads are downloaded into this directory. Otherwise, temporary directory is created and is
     * deleted when browser is closed. In either case, the downloads are deleted when the browser context they were created in
@@ -343,9 +322,6 @@ public interface BrowserType {
    /**
     * Firefox user preferences. Learn more about the Firefox user preferences at <a
     * href="https://support.mozilla.org/en-US/kb/about-config-editor-firefox">{@code about:config}</a>.
-     *
-     * <p> You can also provide a path to a custom <a href="https://mozilla.github.io/policy-templates/">{@code policies.json}
-     * file</a> via {@code PLAYWRIGHT_FIREFOX_POLICIES_JSON} environment variable.
     */
    public LaunchOptions setFirefoxUserPrefs(Map<String, Object> firefoxUserPrefs) {
      this.firefoxUserPrefs = firefoxUserPrefs;
@@ -375,7 +351,8 @@ public interface BrowserType {
    /**
     * Whether to run browser in headless mode. More details for <a
     * href="https://developers.google.com/web/updates/2017/04/headless-chrome">Chromium</a> and <a
-     * href="https://hacks.mozilla.org/2017/12/using-headless-mode-in-firefox/">Firefox</a>. Defaults to {@code true}.
+     * href="https://developer.mozilla.org/en-US/docs/Mozilla/Firefox/Headless_mode">Firefox</a>. Defaults to {@code true}
+     * unless the {@code devtools} option is {@code true}.
     */
    public LaunchOptions setHeadless(boolean headless) {
      this.headless = headless;
@@ -439,18 +416,15 @@ public interface BrowserType {
     */
    public Boolean acceptDownloads;
    /**
-     * <strong>NOTE:</strong> Use custom browser args at your own risk, as some of them may break Playwright functionality.
-     *
-     * <p> Additional arguments to pass to the browser instance. The list of Chromium flags can be found <a
-     * href="https://peter.sh/experiments/chromium-command-line-switches/">here</a>.
+     * Additional arguments to pass to the browser instance. The list of Chromium flags can be found <a
+     * href="http://peter.sh/experiments/chromium-command-line-switches/">here</a>.
     */
    public List<String> args;
    /**
-     * When using {@link com.microsoft.playwright.Page#navigate Page.navigate()}, {@link com.microsoft.playwright.Page#route
-     * Page.route()}, {@link com.microsoft.playwright.Page#waitForURL Page.waitForURL()}, {@link
-     * com.microsoft.playwright.Page#waitForRequest Page.waitForRequest()}, or {@link
-     * com.microsoft.playwright.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
+     * When using {@link Page#navigate Page.navigate()}, {@link Page#route Page.route()}, {@link Page#waitForURL
+     * 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. Unset by default. Examples:
     * <ul>
     * <li> baseURL: {@code http://localhost:3000} and navigating to {@code /bar.html} results in {@code
@@ -467,14 +441,9 @@ public interface BrowserType {
     */
    public Boolean bypassCSP;
    /**
-     * Browser distribution channel.
-     *
-     * <p> Use "chromium" to <a href="https://playwright.dev/java/docs/browsers#chromium-new-headless-mode">opt in to new headless
-     * mode</a>.
-     *
-     * <p> Use "chrome", "chrome-beta", "chrome-dev", "chrome-canary", "msedge", "msedge-beta", "msedge-dev", or "msedge-canary" to
-     * use branded <a href="https://playwright.dev/java/docs/browsers#google-chrome--microsoft-edge">Google Chrome and
-     * Microsoft Edge</a>.
+     * Browser distribution channel.  Supported values are "chrome", "chrome-beta", "chrome-dev", "chrome-canary", "msedge",
+     * "msedge-beta", "msedge-dev", "msedge-canary". Read more about using <a
+     * href="https://playwright.dev/java/docs/browsers#google-chrome--microsoft-edge">Google Chrome and Microsoft Edge</a>.
     */
    public Object channel;
    /**
@@ -482,42 +451,21 @@ public interface BrowserType {
     */
    public Boolean chromiumSandbox;
    /**
-     * TLS Client Authentication allows the server to request a client certificate and verify it.
-     *
-     * <p> <strong>Details</strong>
-     *
-     * <p> An array of client certificates to be used. Each certificate object must have either both {@code certPath} and {@code
-     * keyPath}, a single {@code pfxPath}, or their corresponding direct value equivalents ({@code cert} and {@code key}, or
-     * {@code pfx}). Optionally, {@code passphrase} property should be provided if the certificate is encrypted. The {@code
-     * origin} property should be provided with an exact match to the request origin that the certificate is valid for.
-     *
-     * <p> Client certificate authentication is only active when at least one client certificate is provided. If you want to reject
-     * all client certificates sent by the server, you need to provide a client certificate with an {@code origin} that does
-     * not match any of the domains you plan to visit.
-     *
-     * <p> <strong>NOTE:</strong> When using WebKit on macOS, accessing {@code localhost} will not pick up client certificates. You can make it work by
-     * replacing {@code localhost} with {@code local.playwright}.
-     */
-    public List<ClientCertificate> clientCertificates;
-    /**
-     * Emulates <a
-     * href="https://developer.mozilla.org/en-US/docs/Web/CSS/@media/prefers-color-scheme">prefers-colors-scheme</a> media
-     * feature, supported values are {@code "light"} and {@code "dark"}. See {@link com.microsoft.playwright.Page#emulateMedia
-     * Page.emulateMedia()} for more details. Passing {@code null} resets emulation to system defaults. Defaults to {@code
-     * "light"}.
+     * Emulates {@code "prefers-colors-scheme"} media feature, supported values are {@code "light"}, {@code "dark"}, {@code
+     * "no-preference"}. See {@link Page#emulateMedia Page.emulateMedia()} for more details. Passing {@code null} resets
+     * emulation to system defaults. Defaults to {@code "light"}.
     */
    public Optional<ColorScheme> colorScheme;
-    /**
-     * Emulates {@code "prefers-contrast"} media feature, supported values are {@code "no-preference"}, {@code "more"}. See
-     * {@link com.microsoft.playwright.Page#emulateMedia Page.emulateMedia()} for more details. Passing {@code null} resets
-     * emulation to system defaults. Defaults to {@code "no-preference"}.
-     */
-    public Optional<Contrast> contrast;
    /**
     * Specify device scale factor (can be thought of as dpr). Defaults to {@code 1}. Learn more about <a
     * href="https://playwright.dev/java/docs/emulation#devices">emulating devices with device scale factor</a>.
     */
    public Double deviceScaleFactor;
+    /**
+     * **Chromium-only** Whether to auto-open a Developer Tools panel for each tab. If this option is {@code true}, the {@code
+     * headless} option will be set {@code false}.
+     */
+    public Boolean devtools;
    /**
     * If specified, accepted downloads are downloaded into this directory. Otherwise, temporary directory is created and is
     * deleted when browser is closed. In either case, the downloads are deleted when the browser context they were created in
@@ -538,18 +486,10 @@ public interface BrowserType {
     * An object containing additional HTTP headers to be sent with every request. Defaults to none.
     */
    public Map<String, String> extraHTTPHeaders;
-    /**
-     * Firefox user preferences. Learn more about the Firefox user preferences at <a
-     * href="https://support.mozilla.org/en-US/kb/about-config-editor-firefox">{@code about:config}</a>.
-     *
-     * <p> You can also provide a path to a custom <a href="https://mozilla.github.io/policy-templates/">{@code policies.json}
-     * file</a> via {@code PLAYWRIGHT_FIREFOX_POLICIES_JSON} environment variable.
-     */
-    public Map<String, Object> firefoxUserPrefs;
    /**
     * Emulates {@code "forced-colors"} media feature, supported values are {@code "active"}, {@code "none"}. See {@link
-     * com.microsoft.playwright.Page#emulateMedia Page.emulateMedia()} for more details. Passing {@code null} resets emulation
-     * to system defaults. Defaults to {@code "none"}.
+     * Page#emulateMedia Page.emulateMedia()} for more details. Passing {@code null} resets emulation to system defaults.
+     * Defaults to {@code "none"}.
     */
    public Optional<ForcedColors> forcedColors;
    public Geolocation geolocation;
@@ -573,7 +513,8 @@ public interface BrowserType {
    /**
     * Whether to run browser in headless mode. More details for <a
     * href="https://developers.google.com/web/updates/2017/04/headless-chrome">Chromium</a> and <a
-     * href="https://hacks.mozilla.org/2017/12/using-headless-mode-in-firefox/">Firefox</a>. Defaults to {@code true}.
+     * href="https://developer.mozilla.org/en-US/docs/Mozilla/Firefox/Headless_mode">Firefox</a>. Defaults to {@code true}
+     * unless the {@code devtools} option is {@code true}.
     */
    public Boolean headless;
    /**
@@ -619,9 +560,8 @@ public interface BrowserType {
     */
    public Boolean offline;
    /**
-     * A list of permissions to grant to all pages in this context. See {@link
-     * com.microsoft.playwright.BrowserContext#grantPermissions BrowserContext.grantPermissions()} for more details. Defaults
-     * to none.
+     * A list of permissions to grant to all pages in this context. See {@link BrowserContext#grantPermissions
+     * BrowserContext.grantPermissions()} for more details. Defaults to none.
     */
    public List<String> permissions;
    /**
@@ -646,14 +586,14 @@ public interface BrowserType {
    public Boolean recordHarOmitContent;
    /**
     * Enables <a href="http://www.softwareishard.com/blog/har-12-spec">HAR</a> recording for all pages into the specified HAR
-     * file on the filesystem. If not specified, the HAR is not recorded. Make sure to call {@link
-     * com.microsoft.playwright.BrowserContext#close BrowserContext.close()} for the HAR to be saved.
+     * file on the filesystem. If not specified, the HAR is not recorded. Make sure to call {@link BrowserContext#close
+     * BrowserContext.close()} for the HAR to be saved.
     */
    public Path recordHarPath;
    public Object recordHarUrlFilter;
    /**
     * Enables video recording for all pages into the specified directory. If not specified videos are not recorded. Make sure
-     * to call {@link com.microsoft.playwright.BrowserContext#close BrowserContext.close()} for videos to be saved.
+     * to call {@link BrowserContext#close BrowserContext.close()} for videos to be saved.
     */
    public Path recordVideoDir;
    /**
@@ -664,8 +604,8 @@ public interface BrowserType {
    public RecordVideoSize recordVideoSize;
    /**
     * Emulates {@code "prefers-reduced-motion"} media feature, supported values are {@code "reduce"}, {@code "no-preference"}.
-     * See {@link com.microsoft.playwright.Page#emulateMedia Page.emulateMedia()} for more details. Passing {@code null} resets
-     * emulation to system defaults. Defaults to {@code "no-preference"}.
+     * See {@link Page#emulateMedia Page.emulateMedia()} for more details. Passing {@code null} resets emulation to system
+     * defaults. Defaults to {@code "no-preference"}.
     */
    public Optional<ReducedMotion> reducedMotion;
    /**
@@ -730,21 +670,18 @@ public interface BrowserType {
      return this;
    }
    /**
-     * <strong>NOTE:</strong> Use custom browser args at your own risk, as some of them may break Playwright functionality.
-     *
-     * <p> Additional arguments to pass to the browser instance. The list of Chromium flags can be found <a
-     * href="https://peter.sh/experiments/chromium-command-line-switches/">here</a>.
+     * Additional arguments to pass to the browser instance. The list of Chromium flags can be found <a
+     * href="http://peter.sh/experiments/chromium-command-line-switches/">here</a>.
     */
    public LaunchPersistentContextOptions setArgs(List<String> args) {
      this.args = args;
      return this;
    }
    /**
-     * When using {@link com.microsoft.playwright.Page#navigate Page.navigate()}, {@link com.microsoft.playwright.Page#route
-     * Page.route()}, {@link com.microsoft.playwright.Page#waitForURL Page.waitForURL()}, {@link
-     * com.microsoft.playwright.Page#waitForRequest Page.waitForRequest()}, or {@link
-     * com.microsoft.playwright.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
+     * When using {@link Page#navigate Page.navigate()}, {@link Page#route Page.route()}, {@link Page#waitForURL
+     * 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. Unset by default. Examples:
     * <ul>
     * <li> baseURL: {@code http://localhost:3000} and navigating to {@code /bar.html} results in {@code
@@ -768,28 +705,18 @@ public interface BrowserType {
    }
    @Deprecated
    /**
-     * Browser distribution channel.
-     *
-     * <p> Use "chromium" to <a href="https://playwright.dev/java/docs/browsers#chromium-new-headless-mode">opt in to new headless
-     * mode</a>.
-     *
-     * <p> Use "chrome", "chrome-beta", "chrome-dev", "chrome-canary", "msedge", "msedge-beta", "msedge-dev", or "msedge-canary" to
-     * use branded <a href="https://playwright.dev/java/docs/browsers#google-chrome--microsoft-edge">Google Chrome and
-     * Microsoft Edge</a>.
+     * Browser distribution channel.  Supported values are "chrome", "chrome-beta", "chrome-dev", "chrome-canary", "msedge",
+     * "msedge-beta", "msedge-dev", "msedge-canary". Read more about using <a
+     * href="https://playwright.dev/java/docs/browsers#google-chrome--microsoft-edge">Google Chrome and Microsoft Edge</a>.
     */
    public LaunchPersistentContextOptions setChannel(BrowserChannel channel) {
      this.channel = channel;
      return this;
    }
    /**
-     * Browser distribution channel.
-     *
-     * <p> Use "chromium" to <a href="https://playwright.dev/java/docs/browsers#chromium-new-headless-mode">opt in to new headless
-     * mode</a>.
-     *
-     * <p> Use "chrome", "chrome-beta", "chrome-dev", "chrome-canary", "msedge", "msedge-beta", "msedge-dev", or "msedge-canary" to
-     * use branded <a href="https://playwright.dev/java/docs/browsers#google-chrome--microsoft-edge">Google Chrome and
-     * Microsoft Edge</a>.
+     * Browser distribution channel.  Supported values are "chrome", "chrome-beta", "chrome-dev", "chrome-canary", "msedge",
+     * "msedge-beta", "msedge-dev", "msedge-canary". Read more about using <a
+     * href="https://playwright.dev/java/docs/browsers#google-chrome--microsoft-edge">Google Chrome and Microsoft Edge</a>.
     */
    public LaunchPersistentContextOptions setChannel(String channel) {
      this.channel = channel;
@@ -803,46 +730,14 @@ public interface BrowserType {
      return this;
    }
    /**
-     * TLS Client Authentication allows the server to request a client certificate and verify it.
-     *
-     * <p> <strong>Details</strong>
-     *
-     * <p> An array of client certificates to be used. Each certificate object must have either both {@code certPath} and {@code
-     * keyPath}, a single {@code pfxPath}, or their corresponding direct value equivalents ({@code cert} and {@code key}, or
-     * {@code pfx}). Optionally, {@code passphrase} property should be provided if the certificate is encrypted. The {@code
-     * origin} property should be provided with an exact match to the request origin that the certificate is valid for.
-     *
-     * <p> Client certificate authentication is only active when at least one client certificate is provided. If you want to reject
-     * all client certificates sent by the server, you need to provide a client certificate with an {@code origin} that does
-     * not match any of the domains you plan to visit.
-     *
-     * <p> <strong>NOTE:</strong> When using WebKit on macOS, accessing {@code localhost} will not pick up client certificates. You can make it work by
-     * replacing {@code localhost} with {@code local.playwright}.
-     */
-    public LaunchPersistentContextOptions setClientCertificates(List<ClientCertificate> clientCertificates) {
-      this.clientCertificates = clientCertificates;
-      return this;
-    }
-    /**
-     * Emulates <a
-     * href="https://developer.mozilla.org/en-US/docs/Web/CSS/@media/prefers-color-scheme">prefers-colors-scheme</a> media
-     * feature, supported values are {@code "light"} and {@code "dark"}. See {@link com.microsoft.playwright.Page#emulateMedia
-     * Page.emulateMedia()} for more details. Passing {@code null} resets emulation to system defaults. Defaults to {@code
-     * "light"}.
+     * Emulates {@code "prefers-colors-scheme"} media feature, supported values are {@code "light"}, {@code "dark"}, {@code
+     * "no-preference"}. See {@link Page#emulateMedia Page.emulateMedia()} for more details. Passing {@code null} resets
+     * emulation to system defaults. Defaults to {@code "light"}.
     */
    public LaunchPersistentContextOptions setColorScheme(ColorScheme colorScheme) {
      this.colorScheme = Optional.ofNullable(colorScheme);
      return this;
    }
-    /**
-     * Emulates {@code "prefers-contrast"} media feature, supported values are {@code "no-preference"}, {@code "more"}. See
-     * {@link com.microsoft.playwright.Page#emulateMedia Page.emulateMedia()} for more details. Passing {@code null} resets
-     * emulation to system defaults. Defaults to {@code "no-preference"}.
-     */
-    public LaunchPersistentContextOptions setContrast(Contrast contrast) {
-      this.contrast = Optional.ofNullable(contrast);
-      return this;
-    }
    /**
     * Specify device scale factor (can be thought of as dpr). Defaults to {@code 1}. Learn more about <a
     * href="https://playwright.dev/java/docs/emulation#devices">emulating devices with device scale factor</a>.
@@ -851,6 +746,14 @@ public interface BrowserType {
      this.deviceScaleFactor = deviceScaleFactor;
      return this;
    }
+    /**
+     * **Chromium-only** Whether to auto-open a Developer Tools panel for each tab. If this option is {@code true}, the {@code
+     * headless} option will be set {@code false}.
+     */
+    public LaunchPersistentContextOptions setDevtools(boolean devtools) {
+      this.devtools = devtools;
+      return this;
+    }
    /**
     * If specified, accepted downloads are downloaded into this directory. Otherwise, temporary directory is created and is
     * deleted when browser is closed. In either case, the downloads are deleted when the browser context they were created in
@@ -883,21 +786,10 @@ public interface BrowserType {
      this.extraHTTPHeaders = extraHTTPHeaders;
      return this;
    }
-    /**
-     * Firefox user preferences. Learn more about the Firefox user preferences at <a
-     * href="https://support.mozilla.org/en-US/kb/about-config-editor-firefox">{@code about:config}</a>.
-     *
-     * <p> You can also provide a path to a custom <a href="https://mozilla.github.io/policy-templates/">{@code policies.json}
-     * file</a> via {@code PLAYWRIGHT_FIREFOX_POLICIES_JSON} environment variable.
-     */
-    public LaunchPersistentContextOptions setFirefoxUserPrefs(Map<String, Object> firefoxUserPrefs) {
-      this.firefoxUserPrefs = firefoxUserPrefs;
-      return this;
-    }
    /**
     * Emulates {@code "forced-colors"} media feature, supported values are {@code "active"}, {@code "none"}. See {@link
-     * com.microsoft.playwright.Page#emulateMedia Page.emulateMedia()} for more details. Passing {@code null} resets emulation
-     * to system defaults. Defaults to {@code "none"}.
+     * Page#emulateMedia Page.emulateMedia()} for more details. Passing {@code null} resets emulation to system defaults.
+     * Defaults to {@code "none"}.
     */
    public LaunchPersistentContextOptions setForcedColors(ForcedColors forcedColors) {
      this.forcedColors = Optional.ofNullable(forcedColors);
@@ -942,7 +834,8 @@ public interface BrowserType {
    /**
     * Whether to run browser in headless mode. More details for <a
     * href="https://developers.google.com/web/updates/2017/04/headless-chrome">Chromium</a> and <a
-     * href="https://hacks.mozilla.org/2017/12/using-headless-mode-in-firefox/">Firefox</a>. Defaults to {@code true}.
+     * href="https://developer.mozilla.org/en-US/docs/Mozilla/Firefox/Headless_mode">Firefox</a>. Defaults to {@code true}
+     * unless the {@code devtools} option is {@code true}.
     */
    public LaunchPersistentContextOptions setHeadless(boolean headless) {
      this.headless = headless;
@@ -1022,9 +915,8 @@ public interface BrowserType {
      return this;
    }
    /**
-     * A list of permissions to grant to all pages in this context. See {@link
-     * com.microsoft.playwright.BrowserContext#grantPermissions BrowserContext.grantPermissions()} for more details. Defaults
-     * to none.
+     * A list of permissions to grant to all pages in this context. See {@link BrowserContext#grantPermissions
+     * BrowserContext.grantPermissions()} for more details. Defaults to none.
     */
    public LaunchPersistentContextOptions setPermissions(List<String> permissions) {
      this.permissions = permissions;
@@ -1070,8 +962,8 @@ public interface BrowserType {
    }
    /**
     * Enables <a href="http://www.softwareishard.com/blog/har-12-spec">HAR</a> recording for all pages into the specified HAR
-     * file on the filesystem. If not specified, the HAR is not recorded. Make sure to call {@link
-     * com.microsoft.playwright.BrowserContext#close BrowserContext.close()} for the HAR to be saved.
+     * file on the filesystem. If not specified, the HAR is not recorded. Make sure to call {@link BrowserContext#close
+     * BrowserContext.close()} for the HAR to be saved.
     */
    public LaunchPersistentContextOptions setRecordHarPath(Path recordHarPath) {
      this.recordHarPath = recordHarPath;
@@ -1087,7 +979,7 @@ public interface BrowserType {
    }
    /**
     * Enables video recording for all pages into the specified directory. If not specified videos are not recorded. Make sure
-     * to call {@link com.microsoft.playwright.BrowserContext#close BrowserContext.close()} for videos to be saved.
+     * to call {@link BrowserContext#close BrowserContext.close()} for videos to be saved.
     */
    public LaunchPersistentContextOptions setRecordVideoDir(Path recordVideoDir) {
      this.recordVideoDir = recordVideoDir;
@@ -1112,8 +1004,8 @@ public interface BrowserType {
    }
    /**
     * Emulates {@code "prefers-reduced-motion"} media feature, supported values are {@code "reduce"}, {@code "no-preference"}.
-     * See {@link com.microsoft.playwright.Page#emulateMedia Page.emulateMedia()} for more details. Passing {@code null} resets
-     * emulation to system defaults. Defaults to {@code "no-preference"}.
+     * See {@link Page#emulateMedia Page.emulateMedia()} for more details. Passing {@code null} resets emulation to system
+     * defaults. Defaults to {@code "no-preference"}.
     */
    public LaunchPersistentContextOptions setReducedMotion(ReducedMotion reducedMotion) {
      this.reducedMotion = Optional.ofNullable(reducedMotion);
@@ -1219,40 +1111,33 @@ public interface BrowserType {
    }
  }
  /**
-   * This method attaches Playwright to an existing browser instance created via {@code BrowserType.launchServer} in Node.js.
+   * This method attaches Playwright to an existing browser instance. When connecting to another browser launched via {@code
+   * BrowserType.launchServer} in Node.js, the major and minor version needs to match the client version (1.2.3 → is
+   * compatible with 1.2.x).
   *
-   * <p> <strong>NOTE:</strong> The major and minor version of the Playwright instance that connects needs to match the version of Playwright that
-   * launches the browser (1.2.3 → is compatible with 1.2.x).
-   *
-   * @param wsEndpoint A Playwright browser websocket endpoint to connect to. You obtain this endpoint via {@code BrowserServer.wsEndpoint}.
+   * @param wsEndpoint A browser websocket endpoint to connect to.
   * @since v1.8
   */
  default Browser connect(String wsEndpoint) {
    return connect(wsEndpoint, null);
  }
  /**
-   * This method attaches Playwright to an existing browser instance created via {@code BrowserType.launchServer} in Node.js.
+   * This method attaches Playwright to an existing browser instance. When connecting to another browser launched via {@code
+   * BrowserType.launchServer} in Node.js, the major and minor version needs to match the client version (1.2.3 → is
+   * compatible with 1.2.x).
   *
-   * <p> <strong>NOTE:</strong> The major and minor version of the Playwright instance that connects needs to match the version of Playwright that
-   * launches the browser (1.2.3 → is compatible with 1.2.x).
-   *
-   * @param wsEndpoint A Playwright browser websocket endpoint to connect to. You obtain this endpoint via {@code BrowserServer.wsEndpoint}.
+   * @param wsEndpoint A browser websocket endpoint to connect to.
   * @since v1.8
   */
  Browser connect(String wsEndpoint, ConnectOptions options);
  /**
   * This method attaches Playwright to an existing browser instance using the Chrome DevTools Protocol.
   *
-   * <p> The default browser context is accessible via {@link com.microsoft.playwright.Browser#contexts Browser.contexts()}.
+   * <p> The default browser context is accessible via {@link Browser#contexts Browser.contexts()}.
   *
   * <p> <strong>NOTE:</strong> Connecting over the Chrome DevTools Protocol is only supported for Chromium-based browsers.
   *
-   * <p> <strong>NOTE:</strong> This connection is significantly lower fidelity than the Playwright protocol connection via {@link
-   * com.microsoft.playwright.BrowserType#connect BrowserType.connect()}. If you are experiencing issues or attempting to use
-   * advanced functionality, you probably want to use {@link com.microsoft.playwright.BrowserType#connect
-   * BrowserType.connect()}.
-   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   * <pre>{@code
   * Browser browser = playwright.chromium().connectOverCDP("http://localhost:9222");
   * BrowserContext defaultContext = browser.contexts().get(0);
@@ -1269,16 +1154,11 @@ public interface BrowserType {
  /**
   * This method attaches Playwright to an existing browser instance using the Chrome DevTools Protocol.
   *
-   * <p> The default browser context is accessible via {@link com.microsoft.playwright.Browser#contexts Browser.contexts()}.
+   * <p> The default browser context is accessible via {@link Browser#contexts Browser.contexts()}.
   *
   * <p> <strong>NOTE:</strong> Connecting over the Chrome DevTools Protocol is only supported for Chromium-based browsers.
   *
-   * <p> <strong>NOTE:</strong> This connection is significantly lower fidelity than the Playwright protocol connection via {@link
-   * com.microsoft.playwright.BrowserType#connect BrowserType.connect()}. If you are experiencing issues or attempting to use
-   * advanced functionality, you probably want to use {@link com.microsoft.playwright.BrowserType#connect
-   * BrowserType.connect()}.
-   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   * <pre>{@code
   * Browser browser = playwright.chromium().connectOverCDP("http://localhost:9222");
   * BrowserContext defaultContext = browser.contexts().get(0);
@@ -1299,7 +1179,7 @@ public interface BrowserType {
  /**
   * Returns the browser instance.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   *
   * <p> You can use {@code ignoreDefaultArgs} to filter out {@code --mute-audio} from default arguments:
   * <pre>{@code
@@ -1335,7 +1215,7 @@ public interface BrowserType {
  /**
   * Returns the browser instance.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   *
   * <p> You can use {@code ignoreDefaultArgs} to filter out {@code --mute-audio} from default arguments:
   * <pre>{@code
@@ -1372,20 +1252,11 @@ public interface BrowserType {
   * <p> Launches browser that uses persistent storage located at {@code userDataDir} and returns the only context. Closing this
   * context will automatically close the browser.
   *
-   * @param userDataDir Path to a User Data Directory, which stores browser session data like cookies and local storage. Pass an empty string to
-   * create a temporary directory.
-   *
-   * <p> More details for <a
+   * @param userDataDir Path to a User Data Directory, which stores browser session data like cookies and local storage. More details for <a
   * href="https://chromium.googlesource.com/chromium/src/+/master/docs/user_data_dir.md#introduction">Chromium</a> and <a
-   * href="https://wiki.mozilla.org/Firefox/CommandLineOptions#User_profile">Firefox</a>. Chromium's user data directory is
-   * the **parent** directory of the "Profile Path" seen at {@code chrome://version}.
-   *
-   * <p> Note that browsers do not allow launching multiple instances with the same User Data Directory.
-   *
-   * <p> <strong>NOTE:</strong> Chromium/Chrome: Due to recent Chrome policy changes, automating the default Chrome user profile is not supported.
-   * Pointing {@code userDataDir} to Chrome's main "User Data" directory (the profile used for your regular browsing) may
-   * result in pages not loading or the browser exiting. Create and use a separate directory (for example, an empty folder)
-   * as your automation profile instead. See https://developer.chrome.com/blog/remote-debugging-port for details.
+   * href="https://developer.mozilla.org/en-US/docs/Mozilla/Command_Line_Options#User_Profile">Firefox</a>. Note that
+   * Chromium's user data directory is the **parent** directory of the "Profile Path" seen at {@code chrome://version}. Pass
+   * an empty string to use a temporary directory instead.
   * @since v1.8
   */
  default BrowserContext launchPersistentContext(Path userDataDir) {
@@ -1397,20 +1268,11 @@ public interface BrowserType {
   * <p> Launches browser that uses persistent storage located at {@code userDataDir} and returns the only context. Closing this
   * context will automatically close the browser.
   *
-   * @param userDataDir Path to a User Data Directory, which stores browser session data like cookies and local storage. Pass an empty string to
-   * create a temporary directory.
-   *
-   * <p> More details for <a
+   * @param userDataDir Path to a User Data Directory, which stores browser session data like cookies and local storage. More details for <a
   * href="https://chromium.googlesource.com/chromium/src/+/master/docs/user_data_dir.md#introduction">Chromium</a> and <a
-   * href="https://wiki.mozilla.org/Firefox/CommandLineOptions#User_profile">Firefox</a>. Chromium's user data directory is
-   * the **parent** directory of the "Profile Path" seen at {@code chrome://version}.
-   *
-   * <p> Note that browsers do not allow launching multiple instances with the same User Data Directory.
-   *
-   * <p> <strong>NOTE:</strong> Chromium/Chrome: Due to recent Chrome policy changes, automating the default Chrome user profile is not supported.
-   * Pointing {@code userDataDir} to Chrome's main "User Data" directory (the profile used for your regular browsing) may
-   * result in pages not loading or the browser exiting. Create and use a separate directory (for example, an empty folder)
-   * as your automation profile instead. See https://developer.chrome.com/blog/remote-debugging-port for details.
+   * href="https://developer.mozilla.org/en-US/docs/Mozilla/Command_Line_Options#User_Profile">Firefox</a>. Note that
+   * Chromium's user data directory is the **parent** directory of the "Profile Path" seen at {@code chrome://version}. Pass
+   * an empty string to use a temporary directory instead.
   * @since v1.8
   */
  BrowserContext launchPersistentContext(Path userDataDir, LaunchPersistentContextOptions options);
@@ -31,7 +31,6 @@ import com.google.gson.JsonObject;
 * <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>
- * </ul>
 * <pre>{@code
 * CDPSession client = page.context().newCDPSession(page);
 * client.send("Runtime.enable");
@@ -46,6 +45,7 @@ import com.google.gson.JsonObject;
 * params.addProperty("playbackRate", playbackRate / 2);
 * client.send("Animation.setPlaybackRate", params);
 * }</pre>
+ * </ul>
 */
 public interface CDPSession {
  /**
@@ -1,366 +0,0 @@
-/*
- * 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.Date;
-
-/**
- * Accurately simulating time-dependent behavior is essential for verifying the correctness of applications. Learn more
- * about <a href="https://playwright.dev/java/docs/clock">clock emulation</a>.
- *
- * <p> Note that clock is installed for the entire {@code BrowserContext}, so the time in all the pages and iframes is
- * controlled by the same clock.
- */
-public interface Clock {
-  class InstallOptions {
-    /**
-     * Time to initialize with, current system time by default.
-     */
-    public Object time;
-
-    /**
-     * Time to initialize with, current system time by default.
-     */
-    public InstallOptions setTime(long time) {
-      this.time = time;
-      return this;
-    }
-    /**
-     * Time to initialize with, current system time by default.
-     */
-    public InstallOptions setTime(String time) {
-      this.time = time;
-      return this;
-    }
-    /**
-     * Time to initialize with, current system time by default.
-     */
-    public InstallOptions setTime(Date time) {
-      this.time = time;
-      return this;
-    }
-  }
-  /**
-   * Advance the clock by jumping forward in time. Only fires due timers at most once. This is equivalent to user closing the
-   * laptop lid for a while and reopening it later, after given time.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * page.clock().fastForward(1000);
-   * page.clock().fastForward("30:00");
-   * }</pre>
-   *
-   * @param ticks Time may be the number of milliseconds to advance the clock by or a human-readable string. Valid string formats are "08"
-   * for eight seconds, "01:00" for one minute and "02:34:10" for two hours, 34 minutes and ten seconds.
-   * @since v1.45
-   */
-  void fastForward(long ticks);
-  /**
-   * Advance the clock by jumping forward in time. Only fires due timers at most once. This is equivalent to user closing the
-   * laptop lid for a while and reopening it later, after given time.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * page.clock().fastForward(1000);
-   * page.clock().fastForward("30:00");
-   * }</pre>
-   *
-   * @param ticks Time may be the number of milliseconds to advance the clock by or a human-readable string. Valid string formats are "08"
-   * for eight seconds, "01:00" for one minute and "02:34:10" for two hours, 34 minutes and ten seconds.
-   * @since v1.45
-   */
-  void fastForward(String ticks);
-  /**
-   * Install fake implementations for the following time-related functions:
-   * <ul>
-   * <li> {@code Date}</li>
-   * <li> {@code setTimeout}</li>
-   * <li> {@code clearTimeout}</li>
-   * <li> {@code setInterval}</li>
-   * <li> {@code clearInterval}</li>
-   * <li> {@code requestAnimationFrame}</li>
-   * <li> {@code cancelAnimationFrame}</li>
-   * <li> {@code requestIdleCallback}</li>
-   * <li> {@code cancelIdleCallback}</li>
-   * <li> {@code performance}</li>
-   * </ul>
-   *
-   * <p> Fake timers are used to manually control the flow of time in tests. They allow you to advance time, fire timers, and
-   * control the behavior of time-dependent functions. See {@link com.microsoft.playwright.Clock#runFor Clock.runFor()} and
-   * {@link com.microsoft.playwright.Clock#fastForward Clock.fastForward()} for more information.
-   *
-   * @since v1.45
-   */
-  default void install() {
-    install(null);
-  }
-  /**
-   * Install fake implementations for the following time-related functions:
-   * <ul>
-   * <li> {@code Date}</li>
-   * <li> {@code setTimeout}</li>
-   * <li> {@code clearTimeout}</li>
-   * <li> {@code setInterval}</li>
-   * <li> {@code clearInterval}</li>
-   * <li> {@code requestAnimationFrame}</li>
-   * <li> {@code cancelAnimationFrame}</li>
-   * <li> {@code requestIdleCallback}</li>
-   * <li> {@code cancelIdleCallback}</li>
-   * <li> {@code performance}</li>
-   * </ul>
-   *
-   * <p> Fake timers are used to manually control the flow of time in tests. They allow you to advance time, fire timers, and
-   * control the behavior of time-dependent functions. See {@link com.microsoft.playwright.Clock#runFor Clock.runFor()} and
-   * {@link com.microsoft.playwright.Clock#fastForward Clock.fastForward()} for more information.
-   *
-   * @since v1.45
-   */
-  void install(InstallOptions options);
-  /**
-   * Advance the clock, firing all the time-related callbacks.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * page.clock().runFor(1000);
-   * page.clock().runFor("30:00");
-   * }</pre>
-   *
-   * @param ticks Time may be the number of milliseconds to advance the clock by or a human-readable string. Valid string formats are "08"
-   * for eight seconds, "01:00" for one minute and "02:34:10" for two hours, 34 minutes and ten seconds.
-   * @since v1.45
-   */
-  void runFor(long ticks);
-  /**
-   * Advance the clock, firing all the time-related callbacks.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * page.clock().runFor(1000);
-   * page.clock().runFor("30:00");
-   * }</pre>
-   *
-   * @param ticks Time may be the number of milliseconds to advance the clock by or a human-readable string. Valid string formats are "08"
-   * for eight seconds, "01:00" for one minute and "02:34:10" for two hours, 34 minutes and ten seconds.
-   * @since v1.45
-   */
-  void runFor(String ticks);
-  /**
-   * Advance the clock by jumping forward in time and pause the time. Once this method is called, no timers are fired unless
-   * {@link com.microsoft.playwright.Clock#runFor Clock.runFor()}, {@link com.microsoft.playwright.Clock#fastForward
-   * Clock.fastForward()}, {@link com.microsoft.playwright.Clock#pauseAt Clock.pauseAt()} or {@link
-   * com.microsoft.playwright.Clock#resume Clock.resume()} is called.
-   *
-   * <p> Only fires due timers at most once. This is equivalent to user closing the laptop lid for a while and reopening it at
-   * the specified time and pausing.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * SimpleDateFormat format = new SimpleDateFormat("yyy-MM-dd");
-   * page.clock().pauseAt(format.parse("2020-02-02"));
-   * page.clock().pauseAt("2020-02-02");
-   * }</pre>
-   *
-   * <p> For best results, install the clock before navigating the page and set it to a time slightly before the intended test
-   * time. This ensures that all timers run normally during page loading, preventing the page from getting stuck. Once the
-   * page has fully loaded, you can safely use {@link com.microsoft.playwright.Clock#pauseAt Clock.pauseAt()} to pause the
-   * clock.
-   * <pre>{@code
-   * // Initialize clock with some time before the test time and let the page load
-   * // naturally. `Date.now` will progress as the timers fire.
-   * SimpleDateFormat format = new SimpleDateFormat("yyy-MM-dd'T'HH:mm:ss");
-   * page.clock().install(new Clock.InstallOptions().setTime(format.parse("2024-12-10T08:00:00")));
-   * page.navigate("http://localhost:3333");
-   * page.clock().pauseAt(format.parse("2024-12-10T10:00:00"));
-   * }</pre>
-   *
-   * @param time Time to pause at.
-   * @since v1.45
-   */
-  void pauseAt(long time);
-  /**
-   * Advance the clock by jumping forward in time and pause the time. Once this method is called, no timers are fired unless
-   * {@link com.microsoft.playwright.Clock#runFor Clock.runFor()}, {@link com.microsoft.playwright.Clock#fastForward
-   * Clock.fastForward()}, {@link com.microsoft.playwright.Clock#pauseAt Clock.pauseAt()} or {@link
-   * com.microsoft.playwright.Clock#resume Clock.resume()} is called.
-   *
-   * <p> Only fires due timers at most once. This is equivalent to user closing the laptop lid for a while and reopening it at
-   * the specified time and pausing.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * SimpleDateFormat format = new SimpleDateFormat("yyy-MM-dd");
-   * page.clock().pauseAt(format.parse("2020-02-02"));
-   * page.clock().pauseAt("2020-02-02");
-   * }</pre>
-   *
-   * <p> For best results, install the clock before navigating the page and set it to a time slightly before the intended test
-   * time. This ensures that all timers run normally during page loading, preventing the page from getting stuck. Once the
-   * page has fully loaded, you can safely use {@link com.microsoft.playwright.Clock#pauseAt Clock.pauseAt()} to pause the
-   * clock.
-   * <pre>{@code
-   * // Initialize clock with some time before the test time and let the page load
-   * // naturally. `Date.now` will progress as the timers fire.
-   * SimpleDateFormat format = new SimpleDateFormat("yyy-MM-dd'T'HH:mm:ss");
-   * page.clock().install(new Clock.InstallOptions().setTime(format.parse("2024-12-10T08:00:00")));
-   * page.navigate("http://localhost:3333");
-   * page.clock().pauseAt(format.parse("2024-12-10T10:00:00"));
-   * }</pre>
-   *
-   * @param time Time to pause at.
-   * @since v1.45
-   */
-  void pauseAt(String time);
-  /**
-   * Advance the clock by jumping forward in time and pause the time. Once this method is called, no timers are fired unless
-   * {@link com.microsoft.playwright.Clock#runFor Clock.runFor()}, {@link com.microsoft.playwright.Clock#fastForward
-   * Clock.fastForward()}, {@link com.microsoft.playwright.Clock#pauseAt Clock.pauseAt()} or {@link
-   * com.microsoft.playwright.Clock#resume Clock.resume()} is called.
-   *
-   * <p> Only fires due timers at most once. This is equivalent to user closing the laptop lid for a while and reopening it at
-   * the specified time and pausing.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * SimpleDateFormat format = new SimpleDateFormat("yyy-MM-dd");
-   * page.clock().pauseAt(format.parse("2020-02-02"));
-   * page.clock().pauseAt("2020-02-02");
-   * }</pre>
-   *
-   * <p> For best results, install the clock before navigating the page and set it to a time slightly before the intended test
-   * time. This ensures that all timers run normally during page loading, preventing the page from getting stuck. Once the
-   * page has fully loaded, you can safely use {@link com.microsoft.playwright.Clock#pauseAt Clock.pauseAt()} to pause the
-   * clock.
-   * <pre>{@code
-   * // Initialize clock with some time before the test time and let the page load
-   * // naturally. `Date.now` will progress as the timers fire.
-   * SimpleDateFormat format = new SimpleDateFormat("yyy-MM-dd'T'HH:mm:ss");
-   * page.clock().install(new Clock.InstallOptions().setTime(format.parse("2024-12-10T08:00:00")));
-   * page.navigate("http://localhost:3333");
-   * page.clock().pauseAt(format.parse("2024-12-10T10:00:00"));
-   * }</pre>
-   *
-   * @param time Time to pause at.
-   * @since v1.45
-   */
-  void pauseAt(Date time);
-  /**
-   * Resumes timers. Once this method is called, time resumes flowing, timers are fired as usual.
-   *
-   * @since v1.45
-   */
-  void resume();
-  /**
-   * Makes {@code Date.now} and {@code new Date()} return fixed fake time at all times, keeps all the timers running.
-   *
-   * <p> Use this method for simple scenarios where you only need to test with a predefined time. For more advanced scenarios,
-   * use {@link com.microsoft.playwright.Clock#install Clock.install()} instead. Read docs on <a
-   * href="https://playwright.dev/java/docs/clock">clock emulation</a> to learn more.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * page.clock().setFixedTime(new Date());
-   * page.clock().setFixedTime(new SimpleDateFormat("yyy-MM-dd").parse("2020-02-02"));
-   * page.clock().setFixedTime("2020-02-02");
-   * }</pre>
-   *
-   * @param time Time to be set in milliseconds.
-   * @since v1.45
-   */
-  void setFixedTime(long time);
-  /**
-   * Makes {@code Date.now} and {@code new Date()} return fixed fake time at all times, keeps all the timers running.
-   *
-   * <p> Use this method for simple scenarios where you only need to test with a predefined time. For more advanced scenarios,
-   * use {@link com.microsoft.playwright.Clock#install Clock.install()} instead. Read docs on <a
-   * href="https://playwright.dev/java/docs/clock">clock emulation</a> to learn more.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * page.clock().setFixedTime(new Date());
-   * page.clock().setFixedTime(new SimpleDateFormat("yyy-MM-dd").parse("2020-02-02"));
-   * page.clock().setFixedTime("2020-02-02");
-   * }</pre>
-   *
-   * @param time Time to be set in milliseconds.
-   * @since v1.45
-   */
-  void setFixedTime(String time);
-  /**
-   * Makes {@code Date.now} and {@code new Date()} return fixed fake time at all times, keeps all the timers running.
-   *
-   * <p> Use this method for simple scenarios where you only need to test with a predefined time. For more advanced scenarios,
-   * use {@link com.microsoft.playwright.Clock#install Clock.install()} instead. Read docs on <a
-   * href="https://playwright.dev/java/docs/clock">clock emulation</a> to learn more.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * page.clock().setFixedTime(new Date());
-   * page.clock().setFixedTime(new SimpleDateFormat("yyy-MM-dd").parse("2020-02-02"));
-   * page.clock().setFixedTime("2020-02-02");
-   * }</pre>
-   *
-   * @param time Time to be set in milliseconds.
-   * @since v1.45
-   */
-  void setFixedTime(Date time);
-  /**
-   * Sets system time, but does not trigger any timers. Use this to test how the web page reacts to a time shift, for example
-   * switching from summer to winter time, or changing time zones.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * page.clock().setSystemTime(new Date());
-   * page.clock().setSystemTime(new SimpleDateFormat("yyy-MM-dd").parse("2020-02-02"));
-   * page.clock().setSystemTime("2020-02-02");
-   * }</pre>
-   *
-   * @param time Time to be set in milliseconds.
-   * @since v1.45
-   */
-  void setSystemTime(long time);
-  /**
-   * Sets system time, but does not trigger any timers. Use this to test how the web page reacts to a time shift, for example
-   * switching from summer to winter time, or changing time zones.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * page.clock().setSystemTime(new Date());
-   * page.clock().setSystemTime(new SimpleDateFormat("yyy-MM-dd").parse("2020-02-02"));
-   * page.clock().setSystemTime("2020-02-02");
-   * }</pre>
-   *
-   * @param time Time to be set in milliseconds.
-   * @since v1.45
-   */
-  void setSystemTime(String time);
-  /**
-   * Sets system time, but does not trigger any timers. Use this to test how the web page reacts to a time shift, for example
-   * switching from summer to winter time, or changing time zones.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * page.clock().setSystemTime(new Date());
-   * page.clock().setSystemTime(new SimpleDateFormat("yyy-MM-dd").parse("2020-02-02"));
-   * page.clock().setSystemTime("2020-02-02");
-   * }</pre>
-   *
-   * @param time Time to be set in milliseconds.
-   * @since v1.45
-   */
-  void setSystemTime(Date time);
-}
-
@@ -19,9 +19,8 @@ package com.microsoft.playwright;
 import java.util.*;

 /**
- * {@code ConsoleMessage} objects are dispatched by page via the {@link com.microsoft.playwright.Page#onConsoleMessage
- * Page.onConsoleMessage()} event. For each console message logged in the page there will be corresponding event in the
- * Playwright context.
+ * {@code ConsoleMessage} objects are dispatched by page via the {@link Page#onConsoleMessage Page.onConsoleMessage()}
+ * event. For each console messages logged in the page there will be corresponding event in the Playwright context.
 * <pre>{@code
 * // Listen for all console messages and print them to the standard output.
 * page.onConsoleMessage(msg -> System.out.println(msg.text()));
@@ -39,14 +38,14 @@ import java.util.*;
 * });
 *
 * // Deconstruct console.log arguments
- * msg.args().get(0).jsonValue(); // hello
- * msg.args().get(1).jsonValue(); // 42
+ * msg.args().get(0).jsonValue() // hello
+ * msg.args().get(1).jsonValue() // 42
 * }</pre>
 */
 public interface ConsoleMessage {
  /**
-   * List of arguments passed to a {@code console} function call. See also {@link
-   * com.microsoft.playwright.Page#onConsoleMessage Page.onConsoleMessage()}.
+   * List of arguments passed to a {@code console} function call. See also {@link Page#onConsoleMessage
+   * Page.onConsoleMessage()}.
   *
   * @since v1.8
   */
@@ -78,12 +77,5 @@ public interface ConsoleMessage {
   * @since v1.8
   */
  String type();
-  /**
-   * The web worker or service worker that produced this console message, if any. Note that console messages from web workers
-   * also have non-null {@link com.microsoft.playwright.ConsoleMessage#page ConsoleMessage.page()}.
-   *
-   * @since v1.57
-   */
-  Worker worker();
 }

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


 /**
- * {@code Dialog} objects are dispatched by page via the {@link com.microsoft.playwright.Page#onDialog Page.onDialog()}
- * event.
+ * {@code Dialog} objects are dispatched by page via the {@link Page#onDialog Page.onDialog()} event.
 *
 * <p> An example of using {@code Dialog} class:
 * <pre>{@code
@@ -42,9 +41,9 @@ package com.microsoft.playwright;
 * }
 * }</pre>
 *
- * <p> <strong>NOTE:</strong> Dialogs are dismissed automatically, unless there is a {@link com.microsoft.playwright.Page#onDialog Page.onDialog()}
- * listener. When listener is present, it **must** either {@link com.microsoft.playwright.Dialog#accept Dialog.accept()} or
- * {@link com.microsoft.playwright.Dialog#dismiss Dialog.dismiss()} the dialog - otherwise the page will <a
+ * <p> <strong>NOTE:</strong> Dialogs are dismissed automatically, unless there is a {@link Page#onDialog Page.onDialog()} listener. When listener is
+ * present, it **must** either {@link Dialog#accept Dialog.accept()} or {@link Dialog#dismiss Dialog.dismiss()} the dialog
+ * - otherwise the page will <a
 * href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/EventLoop#never_blocking">freeze</a> waiting for the
 * dialog, and actions like click will never finish.
 */
@@ -20,21 +20,18 @@ import java.io.InputStream;
 import java.nio.file.Path;

 /**
- * {@code Download} objects are dispatched by page via the {@link com.microsoft.playwright.Page#onDownload
- * Page.onDownload()} event.
+ * {@code Download} objects are dispatched by page via the {@link Page#onDownload Page.onDownload()} event.
 *
 * <p> All the downloaded files belonging to the browser context are deleted when the browser context is closed.
 *
- * <p> Download event is emitted once the download starts. Download path becomes available once download completes.
+ * <p> Download event is emitted once the download starts. Download path becomes available once download completes:
 * <pre>{@code
- * // Wait for the download to start
+ * // wait for download to start
 * Download download = page.waitForDownload(() -> {
- *     // Perform the action that initiates download
- *     page.getByText("Download file").click();
+ *   page.getByText("Download file").click();
 * });
- *
- * // Wait for the download process to complete and save the downloaded file somewhere
- * download.saveAs(Paths.get("/path/to/save/at/", download.suggestedFilename()));
+ * // wait for download to complete
+ * Path path = download.path();
 * }</pre>
 */
 public interface Download {
@@ -46,10 +43,7 @@ public interface Download {
   */
  void cancel();
  /**
-   * Returns a readable stream for a successful download, or throws for a failed/canceled download.
-   *
-   * <p> <strong>NOTE:</strong> If you don't need a readable stream, it's usually simpler to read the file from disk after the download completed. See
-   * {@link com.microsoft.playwright.Download#path Download.path()}.
+   * Returns readable stream for current download or {@code null} if download failed.
   *
   * @since v1.8
   */
@@ -73,11 +67,11 @@ public interface Download {
   */
  Page page();
  /**
-   * Returns path to the downloaded file for a successful download, or throws for a failed/canceled download. The method will
-   * wait for the download to finish if necessary. The method throws when connected remotely.
+   * Returns path to the downloaded file in case of successful download. The method will wait for the download to finish if
+   * necessary. The method throws when connected remotely.
   *
-   * <p> Note that the download's file name is a random GUID, use {@link com.microsoft.playwright.Download#suggestedFilename
-   * Download.suggestedFilename()} to get suggested file name.
+   * <p> Note that the download's file name is a random GUID, use {@link Download#suggestedFilename Download.suggestedFilename()}
+   * to get suggested file name.
   *
   * @since v1.8
   */
@@ -86,11 +80,6 @@ public interface Download {
   * Copy the download to a user-specified path. It is safe to call this method while the download is still in progress. Will
   * wait for the download to finish if necessary.
   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * download.saveAs(Paths.get("/path/to/save/at/", download.suggestedFilename()));
-   * }</pre>
-   *
   * @param path Path where the download should be copied.
   * @since v1.8
   */
@@ -20,8 +20,7 @@ import com.microsoft.playwright.options.*;
 import java.nio.file.Path;

 /**
- * {@code FileChooser} objects are dispatched by the page in the {@link com.microsoft.playwright.Page#onFileChooser
- * Page.onFileChooser()} event.
+ * {@code FileChooser} objects are dispatched by the page in the {@link Page#onFileChooser Page.onFileChooser()} event.
 * <pre>{@code
 * FileChooser fileChooser = page.waitForFileChooser(() -> page.getByText("Upload file").click());
 * fileChooser.setFiles(Paths.get("myfile.pdf"));
@@ -30,19 +29,22 @@ import java.nio.file.Path;
 public interface FileChooser {
  class SetFilesOptions {
    /**
-     * @deprecated This option has no effect.
+     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
+     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
+     * inaccessible pages. Defaults to {@code false}.
     */
    public Boolean noWaitAfter;
    /**
     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
-     * value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
-     * BrowserContext.setDefaultTimeout()} or {@link com.microsoft.playwright.Page#setDefaultTimeout Page.setDefaultTimeout()}
-     * methods.
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public Double timeout;

    /**
-     * @deprecated This option has no effect.
+     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
+     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
+     * inaccessible pages. Defaults to {@code false}.
     */
    public SetFilesOptions setNoWaitAfter(boolean noWaitAfter) {
      this.noWaitAfter = noWaitAfter;
@@ -50,9 +52,8 @@ public interface FileChooser {
    }
    /**
     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
-     * value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
-     * BrowserContext.setDefaultTimeout()} or {@link com.microsoft.playwright.Page#setDefaultTimeout Page.setDefaultTimeout()}
-     * methods.
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
+     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
     */
    public SetFilesOptions setTimeout(double timeout) {
      this.timeout = timeout;
@@ -21,35 +21,32 @@ import java.util.regex.Pattern;

 /**
 * FrameLocator represents a view to the {@code iframe} on the page. It captures the logic sufficient to retrieve the
- * {@code iframe} and locate elements in that iframe. FrameLocator can be created with either {@link
- * com.microsoft.playwright.Locator#contentFrame Locator.contentFrame()}, {@link com.microsoft.playwright.Page#frameLocator
- * Page.frameLocator()} or {@link com.microsoft.playwright.Locator#frameLocator Locator.frameLocator()} method.
+ * {@code iframe} and locate elements in that iframe. FrameLocator can be created with either {@link Page#frameLocator
+ * Page.frameLocator()} or {@link Locator#frameLocator Locator.frameLocator()} method.
 * <pre>{@code
- * Locator locator = page.locator("#my-frame").contentFrame().getByText("Submit");
+ * Locator locator = page.frameLocator("#my-frame").getByText("Submit");
 * locator.click();
 * }</pre>
 *
- * <p> <strong>Strictness</strong>
+ * <p> **Strictness**
 *
 * <p> Frame locators are strict. This means that all operations on frame locators will throw if more than one element matches
 * a given selector.
 * <pre>{@code
 * // Throws if there are several frames in DOM:
- * page.locator(".result-frame").contentFrame().getByRole(AriaRole.BUTTON).click();
+ * page.frame_locator(".result-frame").getByRole(AriaRole.BUTTON).click();
 *
 * // Works because we explicitly tell locator to pick the first frame:
- * page.locator(".result-frame").first().contentFrame().getByRole(AriaRole.BUTTON).click();
+ * page.frame_locator(".result-frame").first().getByRole(AriaRole.BUTTON).click();
 * }</pre>
 *
- * <p> <strong>Converting Locator to FrameLocator</strong>
+ * <p> **Converting Locator to FrameLocator**
 *
- * <p> If you have a {@code Locator} object pointing to an {@code iframe} it can be converted to {@code FrameLocator} using
- * {@link com.microsoft.playwright.Locator#contentFrame Locator.contentFrame()}.
- *
- * <p> <strong>Converting FrameLocator to Locator</strong>
- *
- * <p> If you have a {@code FrameLocator} object it can be converted to {@code Locator} pointing to the same {@code iframe}
- * using {@link com.microsoft.playwright.FrameLocator#owner FrameLocator.owner()}.
+ * <p> If you have a {@code Locator} object pointing to an {@code iframe} it can be converted to {@code FrameLocator} using <a
+ * href="https://developer.mozilla.org/en-US/docs/Web/CSS/:scope">{@code :scope}</a> CSS selector:
+ * <pre>{@code
+ * Locator frameLocator = locator.frameLocator(':scope');
+ * }</pre>
 */
 public interface FrameLocator {
  class GetByAltTextOptions {
@@ -288,14 +285,8 @@ public interface FrameLocator {
  }
  class LocatorOptions {
    /**
-     * Narrows down the results of the method to those which contain elements matching this relative locator. For example,
-     * {@code article} that has {@code text=Playwright} matches {@code <article><div>Playwright</div></article>}.
-     *
-     * <p> Inner locator **must be relative** to the outer locator and is queried starting with the outer locator match, not the
-     * document root. For example, you can find {@code content} that has {@code div} in {@code
-     * <article><content><div>Playwright</div></content></article>}. However, looking for {@code content} that has {@code
-     * article div} will fail, because the inner locator must be relative and should not use any elements outside the {@code
-     * content}.
+     * Matches elements containing an element that matches an inner locator. Inner locator is queried against the outer one.
+     * For example, {@code article} that has {@code text=Playwright} matches {@code <article><div>Playwright</div></article>}.
     *
     * <p> Note that outer and inner locators must belong to the same frame. Inner locator must not contain {@code FrameLocator}s.
     */
@@ -321,14 +312,8 @@ public interface FrameLocator {
    public Object hasText;

    /**
-     * Narrows down the results of the method to those which contain elements matching this relative locator. For example,
-     * {@code article} that has {@code text=Playwright} matches {@code <article><div>Playwright</div></article>}.
-     *
-     * <p> Inner locator **must be relative** to the outer locator and is queried starting with the outer locator match, not the
-     * document root. For example, you can find {@code content} that has {@code div} in {@code
-     * <article><content><div>Playwright</div></content></article>}. However, looking for {@code content} that has {@code
-     * article div} will fail, because the inner locator must be relative and should not use any elements outside the {@code
-     * content}.
+     * Matches elements containing an element that matches an inner locator. Inner locator is queried against the outer one.
+     * For example, {@code article} that has {@code text=Playwright} matches {@code <article><div>Playwright</div></article>}.
     *
     * <p> Note that outer and inner locators must belong to the same frame. Inner locator must not contain {@code FrameLocator}s.
     */
@@ -383,8 +368,7 @@ public interface FrameLocator {
    }
  }
  /**
-   * @deprecated Use {@link com.microsoft.playwright.Locator#first Locator.first()} followed by {@link
-   * com.microsoft.playwright.Locator#contentFrame Locator.contentFrame()} instead.
+   * Returns locator to the first matching frame.
   *
   * @since v1.17
   */
@@ -400,7 +384,7 @@ public interface FrameLocator {
  /**
   * Allows locating elements by their alt text.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   *
   * <p> For example, this method will find the image by alt text "Playwright logo":
   * <pre>{@code
@@ -416,7 +400,7 @@ public interface FrameLocator {
  /**
   * Allows locating elements by their alt text.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   *
   * <p> For example, this method will find the image by alt text "Playwright logo":
   * <pre>{@code
@@ -430,7 +414,7 @@ public interface FrameLocator {
  /**
   * Allows locating elements by their alt text.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   *
   * <p> For example, this method will find the image by alt text "Playwright logo":
   * <pre>{@code
@@ -446,7 +430,7 @@ public interface FrameLocator {
  /**
   * Allows locating elements by their alt text.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   *
   * <p> For example, this method will find the image by alt text "Playwright logo":
   * <pre>{@code
@@ -461,7 +445,7 @@ public interface FrameLocator {
   * Allows locating input elements by the text of the associated {@code <label>} or {@code aria-labelledby} element, or by
   * the {@code aria-label} attribute.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   *
   * <p> For example, this method will find inputs by label "Username" and "Password" in the following DOM:
   * <pre>{@code
@@ -479,7 +463,7 @@ public interface FrameLocator {
   * Allows locating input elements by the text of the associated {@code <label>} or {@code aria-labelledby} element, or by
   * the {@code aria-label} attribute.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   *
   * <p> For example, this method will find inputs by label "Username" and "Password" in the following DOM:
   * <pre>{@code
@@ -495,7 +479,7 @@ public interface FrameLocator {
   * Allows locating input elements by the text of the associated {@code <label>} or {@code aria-labelledby} element, or by
   * the {@code aria-label} attribute.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   *
   * <p> For example, this method will find inputs by label "Username" and "Password" in the following DOM:
   * <pre>{@code
@@ -513,7 +497,7 @@ public interface FrameLocator {
   * Allows locating input elements by the text of the associated {@code <label>} or {@code aria-labelledby} element, or by
   * the {@code aria-label} attribute.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   *
   * <p> For example, this method will find inputs by label "Username" and "Password" in the following DOM:
   * <pre>{@code
@@ -528,7 +512,7 @@ public interface FrameLocator {
  /**
   * Allows locating input elements by the placeholder text.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   *
   * <p> For example, consider the following DOM structure.
   *
@@ -546,7 +530,7 @@ public interface FrameLocator {
  /**
   * Allows locating input elements by the placeholder text.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   *
   * <p> For example, consider the following DOM structure.
   *
@@ -562,7 +546,7 @@ public interface FrameLocator {
  /**
   * Allows locating input elements by the placeholder text.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   *
   * <p> For example, consider the following DOM structure.
   *
@@ -580,7 +564,7 @@ public interface FrameLocator {
  /**
   * Allows locating input elements by the placeholder text.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   *
   * <p> For example, consider the following DOM structure.
   *
@@ -598,7 +582,7 @@ public interface FrameLocator {
   * href="https://www.w3.org/TR/wai-aria-1.2/#aria-attributes">ARIA attributes</a> and <a
   * href="https://w3c.github.io/accname/#dfn-accessible-name">accessible name</a>.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   *
   * <p> Consider the following DOM structure.
   *
@@ -619,7 +603,7 @@ public interface FrameLocator {
   *     .click();
   * }</pre>
   *
-   * <p> <strong>Details</strong>
+   * <p> **Details**
   *
   * <p> Role selector **does not replace** accessibility audits and conformance tests, but rather gives early feedback about the
   * ARIA guidelines.
@@ -641,7 +625,7 @@ public interface FrameLocator {
   * href="https://www.w3.org/TR/wai-aria-1.2/#aria-attributes">ARIA attributes</a> and <a
   * href="https://w3c.github.io/accname/#dfn-accessible-name">accessible name</a>.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   *
   * <p> Consider the following DOM structure.
   *
@@ -662,7 +646,7 @@ public interface FrameLocator {
   *     .click();
   * }</pre>
   *
-   * <p> <strong>Details</strong>
+   * <p> **Details**
   *
   * <p> Role selector **does not replace** accessibility audits and conformance tests, but rather gives early feedback about the
   * ARIA guidelines.
@@ -680,7 +664,7 @@ public interface FrameLocator {
  /**
   * Locate element by the test id.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   *
   * <p> Consider the following DOM structure.
   *
@@ -689,11 +673,10 @@ public interface FrameLocator {
   * page.getByTestId("directions").click();
   * }</pre>
   *
-   * <p> <strong>Details</strong>
+   * <p> **Details**
   *
-   * <p> By default, the {@code data-testid} attribute is used as a test id. Use {@link
-   * com.microsoft.playwright.Selectors#setTestIdAttribute Selectors.setTestIdAttribute()} to configure a different test id
-   * attribute if necessary.
+   * <p> By default, the {@code data-testid} attribute is used as a test id. Use {@link Selectors#setTestIdAttribute
+   * Selectors.setTestIdAttribute()} to configure a different test id attribute if necessary.
   *
   * @param testId Id to locate the element by.
   * @since v1.27
@@ -702,7 +685,7 @@ public interface FrameLocator {
  /**
   * Locate element by the test id.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   *
   * <p> Consider the following DOM structure.
   *
@@ -711,11 +694,10 @@ public interface FrameLocator {
   * page.getByTestId("directions").click();
   * }</pre>
   *
-   * <p> <strong>Details</strong>
+   * <p> **Details**
   *
-   * <p> By default, the {@code data-testid} attribute is used as a test id. Use {@link
-   * com.microsoft.playwright.Selectors#setTestIdAttribute Selectors.setTestIdAttribute()} to configure a different test id
-   * attribute if necessary.
+   * <p> By default, the {@code data-testid} attribute is used as a test id. Use {@link Selectors#setTestIdAttribute
+   * Selectors.setTestIdAttribute()} to configure a different test id attribute if necessary.
   *
   * @param testId Id to locate the element by.
   * @since v1.27
@@ -724,32 +706,32 @@ public interface FrameLocator {
  /**
   * Allows locating elements that contain given text.
   *
-   * <p> See also {@link com.microsoft.playwright.Locator#filter Locator.filter()} that allows to match by another criteria, like
-   * an accessible role, and then filter by the text content.
+   * <p> See also {@link Locator#filter Locator.filter()} that allows to match by another criteria, like an accessible role, and
+   * then filter by the text content.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   *
   * <p> Consider the following DOM structure:
   *
   * <p> You can locate by text substring, exact string, or a regular expression:
   * <pre>{@code
   * // Matches <span>
-   * page.getByText("world");
+   * page.getByText("world")
   *
   * // Matches first <div>
-   * page.getByText("Hello world");
+   * page.getByText("Hello world")
   *
   * // Matches second <div>
-   * page.getByText("Hello", new Page.GetByTextOptions().setExact(true));
+   * page.getByText("Hello", new Page.GetByTextOptions().setExact(true))
   *
   * // Matches both <div>s
-   * page.getByText(Pattern.compile("Hello"));
+   * page.getByText(Pattern.compile("Hello"))
   *
   * // Matches second <div>
-   * page.getByText(Pattern.compile("^hello$", Pattern.CASE_INSENSITIVE));
+   * page.getByText(Pattern.compile("^hello$", Pattern.CASE_INSENSITIVE))
   * }</pre>
   *
-   * <p> <strong>Details</strong>
+   * <p> **Details**
   *
   * <p> Matching by text always normalizes whitespace, even with exact match. For example, it turns multiple spaces into one,
   * turns line breaks into spaces and ignores leading and trailing whitespace.
@@ -766,32 +748,32 @@ public interface FrameLocator {
  /**
   * Allows locating elements that contain given text.
   *
-   * <p> See also {@link com.microsoft.playwright.Locator#filter Locator.filter()} that allows to match by another criteria, like
-   * an accessible role, and then filter by the text content.
+   * <p> See also {@link Locator#filter Locator.filter()} that allows to match by another criteria, like an accessible role, and
+   * then filter by the text content.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   *
   * <p> Consider the following DOM structure:
   *
   * <p> You can locate by text substring, exact string, or a regular expression:
   * <pre>{@code
   * // Matches <span>
-   * page.getByText("world");
+   * page.getByText("world")
   *
   * // Matches first <div>
-   * page.getByText("Hello world");
+   * page.getByText("Hello world")
   *
   * // Matches second <div>
-   * page.getByText("Hello", new Page.GetByTextOptions().setExact(true));
+   * page.getByText("Hello", new Page.GetByTextOptions().setExact(true))
   *
   * // Matches both <div>s
-   * page.getByText(Pattern.compile("Hello"));
+   * page.getByText(Pattern.compile("Hello"))
   *
   * // Matches second <div>
-   * page.getByText(Pattern.compile("^hello$", Pattern.CASE_INSENSITIVE));
+   * page.getByText(Pattern.compile("^hello$", Pattern.CASE_INSENSITIVE))
   * }</pre>
   *
-   * <p> <strong>Details</strong>
+   * <p> **Details**
   *
   * <p> Matching by text always normalizes whitespace, even with exact match. For example, it turns multiple spaces into one,
   * turns line breaks into spaces and ignores leading and trailing whitespace.
@@ -806,32 +788,32 @@ public interface FrameLocator {
  /**
   * Allows locating elements that contain given text.
   *
-   * <p> See also {@link com.microsoft.playwright.Locator#filter Locator.filter()} that allows to match by another criteria, like
-   * an accessible role, and then filter by the text content.
+   * <p> See also {@link Locator#filter Locator.filter()} that allows to match by another criteria, like an accessible role, and
+   * then filter by the text content.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   *
   * <p> Consider the following DOM structure:
   *
   * <p> You can locate by text substring, exact string, or a regular expression:
   * <pre>{@code
   * // Matches <span>
-   * page.getByText("world");
+   * page.getByText("world")
   *
   * // Matches first <div>
-   * page.getByText("Hello world");
+   * page.getByText("Hello world")
   *
   * // Matches second <div>
-   * page.getByText("Hello", new Page.GetByTextOptions().setExact(true));
+   * page.getByText("Hello", new Page.GetByTextOptions().setExact(true))
   *
   * // Matches both <div>s
-   * page.getByText(Pattern.compile("Hello"));
+   * page.getByText(Pattern.compile("Hello"))
   *
   * // Matches second <div>
-   * page.getByText(Pattern.compile("^hello$", Pattern.CASE_INSENSITIVE));
+   * page.getByText(Pattern.compile("^hello$", Pattern.CASE_INSENSITIVE))
   * }</pre>
   *
-   * <p> <strong>Details</strong>
+   * <p> **Details**
   *
   * <p> Matching by text always normalizes whitespace, even with exact match. For example, it turns multiple spaces into one,
   * turns line breaks into spaces and ignores leading and trailing whitespace.
@@ -848,32 +830,32 @@ public interface FrameLocator {
  /**
   * Allows locating elements that contain given text.
   *
-   * <p> See also {@link com.microsoft.playwright.Locator#filter Locator.filter()} that allows to match by another criteria, like
-   * an accessible role, and then filter by the text content.
+   * <p> See also {@link Locator#filter Locator.filter()} that allows to match by another criteria, like an accessible role, and
+   * then filter by the text content.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   *
   * <p> Consider the following DOM structure:
   *
   * <p> You can locate by text substring, exact string, or a regular expression:
   * <pre>{@code
   * // Matches <span>
-   * page.getByText("world");
+   * page.getByText("world")
   *
   * // Matches first <div>
-   * page.getByText("Hello world");
+   * page.getByText("Hello world")
   *
   * // Matches second <div>
-   * page.getByText("Hello", new Page.GetByTextOptions().setExact(true));
+   * page.getByText("Hello", new Page.GetByTextOptions().setExact(true))
   *
   * // Matches both <div>s
-   * page.getByText(Pattern.compile("Hello"));
+   * page.getByText(Pattern.compile("Hello"))
   *
   * // Matches second <div>
-   * page.getByText(Pattern.compile("^hello$", Pattern.CASE_INSENSITIVE));
+   * page.getByText(Pattern.compile("^hello$", Pattern.CASE_INSENSITIVE))
   * }</pre>
   *
-   * <p> <strong>Details</strong>
+   * <p> **Details**
   *
   * <p> Matching by text always normalizes whitespace, even with exact match. For example, it turns multiple spaces into one,
   * turns line breaks into spaces and ignores leading and trailing whitespace.
@@ -888,7 +870,7 @@ public interface FrameLocator {
  /**
   * Allows locating elements by their title attribute.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   *
   * <p> Consider the following DOM structure.
   *
@@ -906,7 +888,7 @@ public interface FrameLocator {
  /**
   * Allows locating elements by their title attribute.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   *
   * <p> Consider the following DOM structure.
   *
@@ -922,7 +904,7 @@ public interface FrameLocator {
  /**
   * Allows locating elements by their title attribute.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   *
   * <p> Consider the following DOM structure.
   *
@@ -940,7 +922,7 @@ public interface FrameLocator {
  /**
   * Allows locating elements by their title attribute.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   *
   * <p> Consider the following DOM structure.
   *
@@ -954,15 +936,14 @@ public interface FrameLocator {
   */
  Locator getByTitle(Pattern text, GetByTitleOptions options);
  /**
-   * @deprecated Use {@link com.microsoft.playwright.Locator#last Locator.last()} followed by {@link
-   * com.microsoft.playwright.Locator#contentFrame Locator.contentFrame()} instead.
+   * Returns locator to the last matching frame.
   *
   * @since v1.17
   */
  FrameLocator last();
  /**
   * The method finds an element matching the specified selector in the locator's subtree. It also accepts filter options,
-   * similar to {@link com.microsoft.playwright.Locator#filter Locator.filter()} method.
+   * similar to {@link Locator#filter Locator.filter()} method.
   *
   * <p> <a href="https://playwright.dev/java/docs/locators">Learn more about locators</a>.
   *
@@ -974,7 +955,7 @@ public interface FrameLocator {
  }
  /**
   * The method finds an element matching the specified selector in the locator's subtree. It also accepts filter options,
-   * similar to {@link com.microsoft.playwright.Locator#filter Locator.filter()} method.
+   * similar to {@link Locator#filter Locator.filter()} method.
   *
   * <p> <a href="https://playwright.dev/java/docs/locators">Learn more about locators</a>.
   *
@@ -984,7 +965,7 @@ public interface FrameLocator {
  Locator locator(String selectorOrLocator, LocatorOptions options);
  /**
   * The method finds an element matching the specified selector in the locator's subtree. It also accepts filter options,
-   * similar to {@link com.microsoft.playwright.Locator#filter Locator.filter()} method.
+   * similar to {@link Locator#filter Locator.filter()} method.
   *
   * <p> <a href="https://playwright.dev/java/docs/locators">Learn more about locators</a>.
   *
@@ -996,7 +977,7 @@ public interface FrameLocator {
  }
  /**
   * The method finds an element matching the specified selector in the locator's subtree. It also accepts filter options,
-   * similar to {@link com.microsoft.playwright.Locator#filter Locator.filter()} method.
+   * similar to {@link Locator#filter Locator.filter()} method.
   *
   * <p> <a href="https://playwright.dev/java/docs/locators">Learn more about locators</a>.
   *
@@ -1005,30 +986,10 @@ public interface FrameLocator {
   */
  Locator locator(Locator selectorOrLocator, LocatorOptions options);
  /**
-   * @deprecated Use {@link com.microsoft.playwright.Locator#nth Locator.nth()} followed by {@link
-   * com.microsoft.playwright.Locator#contentFrame Locator.contentFrame()} instead.
+   * Returns locator to the n-th matching frame. It's zero based, {@code nth(0)} selects the first frame.
   *
   * @since v1.17
   */
  FrameLocator nth(int index);
-  /**
-   * Returns a {@code Locator} object pointing to the same {@code iframe} as this frame locator.
-   *
-   * <p> Useful when you have a {@code FrameLocator} object obtained somewhere, and later on would like to interact with the
-   * {@code iframe} element.
-   *
-   * <p> For a reverse operation, use {@link com.microsoft.playwright.Locator#contentFrame Locator.contentFrame()}.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * FrameLocator frameLocator = page.locator("iframe[name=\"embedded\"]").contentFrame();
-   * // ...
-   * Locator locator = frameLocator.owner();
-   * assertThat(locator).isVisible();
-   * }</pre>
-   *
-   * @since v1.43
-   */
-  Locator owner();
 }

@@ -19,20 +19,19 @@ package com.microsoft.playwright;
 import java.util.*;

 /**
- * JSHandle represents an in-page JavaScript object. JSHandles can be created with the {@link
- * com.microsoft.playwright.Page#evaluateHandle Page.evaluateHandle()} method.
+ * JSHandle represents an in-page JavaScript object. JSHandles can be created with the {@link Page#evaluateHandle
+ * Page.evaluateHandle()} method.
 * <pre>{@code
 * JSHandle windowHandle = page.evaluateHandle("() => window");
 * // ...
 * }</pre>
 *
 * <p> JSHandle prevents the referenced JavaScript object being garbage collected unless the handle is exposed with {@link
- * com.microsoft.playwright.JSHandle#dispose JSHandle.dispose()}. JSHandles are auto-disposed when their origin frame gets
- * navigated or the parent context gets destroyed.
+ * JSHandle#dispose JSHandle.dispose()}. JSHandles are auto-disposed when their origin frame gets navigated or the parent
+ * context gets destroyed.
 *
- * <p> JSHandle instances can be used as an argument in {@link com.microsoft.playwright.Page#evalOnSelector
- * Page.evalOnSelector()}, {@link com.microsoft.playwright.Page#evaluate Page.evaluate()} and {@link
- * com.microsoft.playwright.Page#evaluateHandle Page.evaluateHandle()} methods.
+ * <p> JSHandle instances can be used as an argument in {@link Page#evalOnSelector Page.evalOnSelector()}, {@link Page#evaluate
+ * Page.evaluate()} and {@link Page#evaluateHandle Page.evaluateHandle()} methods.
 */
 public interface JSHandle {
  /**
@@ -56,7 +55,7 @@ public interface JSHandle {
   * href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a>, then {@code
   * handle.evaluate} would wait for the promise to resolve and return its value.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   * <pre>{@code
   * ElementHandle tweetHandle = page.querySelector(".tweet .retweets");
   * assertEquals("10 retweets", tweetHandle.evaluate("node => node.innerText"));
@@ -78,7 +77,7 @@ public interface JSHandle {
   * href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a>, then {@code
   * handle.evaluate} would wait for the promise to resolve and return its value.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   * <pre>{@code
   * ElementHandle tweetHandle = page.querySelector(".tweet .retweets");
   * assertEquals("10 retweets", tweetHandle.evaluate("node => node.innerText"));
@@ -102,7 +101,7 @@ public interface JSHandle {
   * href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a>, then {@code
   * jsHandle.evaluateHandle} would wait for the promise to resolve and return its value.
   *
-   * <p> See {@link com.microsoft.playwright.Page#evaluateHandle Page.evaluateHandle()} for more details.
+   * <p> See {@link Page#evaluateHandle Page.evaluateHandle()} for more details.
   *
   * @param expression JavaScript expression to be evaluated in the browser context. If the expression evaluates to a function, the function is
   * automatically invoked.
@@ -123,7 +122,7 @@ public interface JSHandle {
   * href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a>, then {@code
   * jsHandle.evaluateHandle} would wait for the promise to resolve and return its value.
   *
-   * <p> See {@link com.microsoft.playwright.Page#evaluateHandle Page.evaluateHandle()} for more details.
+   * <p> See {@link Page#evaluateHandle Page.evaluateHandle()} for more details.
   *
   * @param expression JavaScript expression to be evaluated in the browser context. If the expression evaluates to a function, the function is
   * automatically invoked.
@@ -134,7 +133,7 @@ public interface JSHandle {
  /**
   * The method returns a map with **own property names** as keys and JSHandle instances for the property values.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   * <pre>{@code
   * JSHandle handle = page.evaluateHandle("() => ({ window, document })");
   * Map<String, JSHandle> properties = handle.getProperties();
@@ -19,13 +19,12 @@ package com.microsoft.playwright;
 import com.microsoft.playwright.options.*;

 /**
- * Keyboard provides an api for managing a virtual keyboard. The high level api is {@link
- * com.microsoft.playwright.Keyboard#type Keyboard.type()}, which takes raw characters and generates proper {@code
- * keydown}, {@code keypress}/{@code input}, and {@code keyup} events on your page.
+ * Keyboard provides an api for managing a virtual keyboard. The high level api is {@link Keyboard#type Keyboard.type()},
+ * which takes raw characters and generates proper {@code keydown}, {@code keypress}/{@code input}, and {@code keyup}
+ * events on your page.
 *
- * <p> For finer control, you can use {@link com.microsoft.playwright.Keyboard#down Keyboard.down()}, {@link
- * com.microsoft.playwright.Keyboard#up Keyboard.up()}, and {@link com.microsoft.playwright.Keyboard#insertText
- * Keyboard.insertText()} to manually fire events as if they were generated from a real keyboard.
+ * <p> For finer control, you can use {@link Keyboard#down Keyboard.down()}, {@link Keyboard#up Keyboard.up()}, and {@link
+ * Keyboard#insertText Keyboard.insertText()} to manually fire events as if they were generated from a real keyboard.
 *
 * <p> An example of holding down {@code Shift} in order to select and delete some text:
 * <pre>{@code
@@ -48,7 +47,10 @@ import com.microsoft.playwright.options.*;
 *
 * <p> An example to trigger select-all with the keyboard
 * <pre>{@code
- * page.keyboard().press("ControlOrMeta+A");
+ * // on Windows and Linux
+ * page.keyboard().press("Control+A");
+ * // on macOS
+ * page.keyboard().press("Meta+A");
 * }</pre>
 */
 public interface Keyboard {
@@ -94,8 +96,7 @@ public interface Keyboard {
   * ArrowUp}, etc.
   *
   * <p> Following modification shortcuts are also supported: {@code Shift}, {@code Control}, {@code Alt}, {@code Meta}, {@code
-   * ShiftLeft}, {@code ControlOrMeta}. {@code ControlOrMeta} resolves to {@code Control} on Windows and Linux and to {@code
-   * Meta} on macOS.
+   * ShiftLeft}.
   *
   * <p> Holding down {@code Shift} will type the text that corresponds to the {@code key} in the upper case.
   *
@@ -103,12 +104,11 @@ public interface Keyboard {
   * different respective texts.
   *
   * <p> If {@code key} is a modifier key, {@code Shift}, {@code Meta}, {@code Control}, or {@code Alt}, subsequent key presses
-   * will be sent with that modifier active. To release the modifier key, use {@link com.microsoft.playwright.Keyboard#up
-   * Keyboard.up()}.
+   * will be sent with that modifier active. To release the modifier key, use {@link Keyboard#up Keyboard.up()}.
   *
-   * <p> After the key is pressed once, subsequent calls to {@link com.microsoft.playwright.Keyboard#down Keyboard.down()} will
-   * have <a href="https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/repeat">repeat</a> set to true. To release
-   * the key, use {@link com.microsoft.playwright.Keyboard#up Keyboard.up()}.
+   * <p> After the key is pressed once, subsequent calls to {@link Keyboard#down Keyboard.down()} will have <a
+   * href="https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/repeat">repeat</a> set to true. To release the key,
+   * use {@link Keyboard#up Keyboard.up()}.
   *
   * <p> <strong>NOTE:</strong> Modifier keys DO influence {@code keyboard.down}. Holding down {@code Shift} will type the text in upper case.
   *
@@ -119,7 +119,7 @@ public interface Keyboard {
  /**
   * Dispatches only {@code input} event, does not emit the {@code keydown}, {@code keyup} or {@code keypress} events.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   * <pre>{@code
   * page.keyboard().insertText("嗨");
   * }</pre>
@@ -132,9 +132,7 @@ public interface Keyboard {
   */
  void insertText(String text);
  /**
-   * <strong>NOTE:</strong> In most cases, you should use {@link com.microsoft.playwright.Locator#press Locator.press()} instead.
-   *
-   * <p> {@code key} can specify the intended <a
+   * {@code key} can specify the intended <a
   * href="https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key">keyboardEvent.key</a> value or a single
   * character to generate the text for. A superset of the {@code key} values can be found <a
   * href="https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key/Key_Values">here</a>. Examples of the keys are:
@@ -145,23 +143,22 @@ public interface Keyboard {
   * ArrowUp}, etc.
   *
   * <p> Following modification shortcuts are also supported: {@code Shift}, {@code Control}, {@code Alt}, {@code Meta}, {@code
-   * ShiftLeft}, {@code ControlOrMeta}. {@code ControlOrMeta} resolves to {@code Control} on Windows and Linux and to {@code
-   * Meta} on macOS.
+   * ShiftLeft}.
   *
   * <p> Holding down {@code Shift} will type the text that corresponds to the {@code key} in the upper case.
   *
   * <p> If {@code key} is a single character, it is case-sensitive, so the values {@code a} and {@code A} will generate
   * different respective texts.
   *
-   * <p> Shortcuts such as {@code key: "Control+o"}, {@code key: "Control++} or {@code key: "Control+Shift+T"} are supported as
-   * well. When specified with the modifier, modifier is pressed and being held while the subsequent key is being pressed.
+   * <p> Shortcuts such as {@code key: "Control+o"} or {@code key: "Control+Shift+T"} are supported as well. When specified with
+   * the modifier, modifier is pressed and being held while the subsequent key is being pressed.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   * <pre>{@code
   * Page page = browser.newPage();
   * page.navigate("https://keycode.info");
   * page.keyboard().press("A");
-   * page.screenshot(new Page.ScreenshotOptions().setPath(Paths.get("A.png")));
+   * page.screenshot(new Page.ScreenshotOptions().setPath(Paths.get("A.png"));
   * page.keyboard().press("ArrowLeft");
   * page.screenshot(new Page.ScreenshotOptions().setPath(Paths.get("ArrowLeft.png")));
   * page.keyboard().press("Shift+O");
@@ -169,8 +166,7 @@ public interface Keyboard {
   * browser.close();
   * }</pre>
   *
-   * <p> Shortcut for {@link com.microsoft.playwright.Keyboard#down Keyboard.down()} and {@link
-   * com.microsoft.playwright.Keyboard#up Keyboard.up()}.
+   * <p> Shortcut for {@link Keyboard#down Keyboard.down()} and {@link Keyboard#up Keyboard.up()}.
   *
   * @param key Name of the key to press or a character to generate, such as {@code ArrowLeft} or {@code a}.
   * @since v1.8
@@ -179,9 +175,7 @@ public interface Keyboard {
    press(key, null);
  }
  /**
-   * <strong>NOTE:</strong> In most cases, you should use {@link com.microsoft.playwright.Locator#press Locator.press()} instead.
-   *
-   * <p> {@code key} can specify the intended <a
+   * {@code key} can specify the intended <a
   * href="https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key">keyboardEvent.key</a> value or a single
   * character to generate the text for. A superset of the {@code key} values can be found <a
   * href="https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key/Key_Values">here</a>. Examples of the keys are:
@@ -192,23 +186,22 @@ public interface Keyboard {
   * ArrowUp}, etc.
   *
   * <p> Following modification shortcuts are also supported: {@code Shift}, {@code Control}, {@code Alt}, {@code Meta}, {@code
-   * ShiftLeft}, {@code ControlOrMeta}. {@code ControlOrMeta} resolves to {@code Control} on Windows and Linux and to {@code
-   * Meta} on macOS.
+   * ShiftLeft}.
   *
   * <p> Holding down {@code Shift} will type the text that corresponds to the {@code key} in the upper case.
   *
   * <p> If {@code key} is a single character, it is case-sensitive, so the values {@code a} and {@code A} will generate
   * different respective texts.
   *
-   * <p> Shortcuts such as {@code key: "Control+o"}, {@code key: "Control++} or {@code key: "Control+Shift+T"} are supported as
-   * well. When specified with the modifier, modifier is pressed and being held while the subsequent key is being pressed.
+   * <p> Shortcuts such as {@code key: "Control+o"} or {@code key: "Control+Shift+T"} are supported as well. When specified with
+   * the modifier, modifier is pressed and being held while the subsequent key is being pressed.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   * <pre>{@code
   * Page page = browser.newPage();
   * page.navigate("https://keycode.info");
   * page.keyboard().press("A");
-   * page.screenshot(new Page.ScreenshotOptions().setPath(Paths.get("A.png")));
+   * page.screenshot(new Page.ScreenshotOptions().setPath(Paths.get("A.png"));
   * page.keyboard().press("ArrowLeft");
   * page.screenshot(new Page.ScreenshotOptions().setPath(Paths.get("ArrowLeft.png")));
   * page.keyboard().press("Shift+O");
@@ -216,24 +209,18 @@ public interface Keyboard {
   * browser.close();
   * }</pre>
   *
-   * <p> Shortcut for {@link com.microsoft.playwright.Keyboard#down Keyboard.down()} and {@link
-   * com.microsoft.playwright.Keyboard#up Keyboard.up()}.
+   * <p> Shortcut for {@link Keyboard#down Keyboard.down()} and {@link Keyboard#up Keyboard.up()}.
   *
   * @param key Name of the key to press or a character to generate, such as {@code ArrowLeft} or {@code a}.
   * @since v1.8
   */
  void press(String key, PressOptions options);
  /**
-   * <strong>NOTE:</strong> In most cases, you should use {@link com.microsoft.playwright.Locator#fill Locator.fill()} instead. You only need to
-   * press keys one by one if there is special keyboard handling on the page - in this case use {@link
-   * com.microsoft.playwright.Locator#pressSequentially Locator.pressSequentially()}.
+   * Sends a {@code keydown}, {@code keypress}/{@code input}, and {@code keyup} event for each character in the text.
   *
-   * <p> Sends a {@code keydown}, {@code keypress}/{@code input}, and {@code keyup} event for each character in the text.
+   * <p> To press a special key, like {@code Control} or {@code ArrowDown}, use {@link Keyboard#press Keyboard.press()}.
   *
-   * <p> To press a special key, like {@code Control} or {@code ArrowDown}, use {@link com.microsoft.playwright.Keyboard#press
-   * Keyboard.press()}.
-   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   * <pre>{@code
   * // Types instantly
   * page.keyboard().type("Hello");
@@ -252,16 +239,11 @@ public interface Keyboard {
    type(text, null);
  }
  /**
-   * <strong>NOTE:</strong> In most cases, you should use {@link com.microsoft.playwright.Locator#fill Locator.fill()} instead. You only need to
-   * press keys one by one if there is special keyboard handling on the page - in this case use {@link
-   * com.microsoft.playwright.Locator#pressSequentially Locator.pressSequentially()}.
+   * Sends a {@code keydown}, {@code keypress}/{@code input}, and {@code keyup} event for each character in the text.
   *
-   * <p> Sends a {@code keydown}, {@code keypress}/{@code input}, and {@code keyup} event for each character in the text.
+   * <p> To press a special key, like {@code Control} or {@code ArrowDown}, use {@link Keyboard#press Keyboard.press()}.
   *
-   * <p> To press a special key, like {@code Control} or {@code ArrowDown}, use {@link com.microsoft.playwright.Keyboard#press
-   * Keyboard.press()}.
-   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   * <pre>{@code
   * // Types instantly
   * page.keyboard().type("Hello");
@@ -21,12 +21,7 @@ import com.microsoft.playwright.options.*;
 /**
 * The Mouse class operates in main-frame CSS pixels relative to the top-left corner of the viewport.
 *
- * <p> <strong>NOTE:</strong> If you want to debug where the mouse moved, you can use the <a
- * href="https://playwright.dev/java/docs/trace-viewer-intro">Trace viewer</a> or <a
- * href="https://playwright.dev/java/docs/running-tests">Playwright Inspector</a>. A red dot showing the location of the
- * mouse will be shown for every mouse action.
- *
- * <p> Every {@code page} object has its own Mouse, accessible with {@link com.microsoft.playwright.Page#mouse Page.mouse()}.
+ * <p> Every {@code page} object has its own Mouse, accessible with {@link Page#mouse Page.mouse()}.
 * <pre>{@code
 * // Using ‘page.mouse’ to trace a 100x100 square.
 * page.mouse().move(0, 0);
@@ -127,16 +122,12 @@ public interface Mouse {
  }
  class MoveOptions {
    /**
-     * Defaults to 1. Sends {@code n} interpolated {@code mousemove} events to represent travel between Playwright's current
-     * cursor position and the provided destination. When set to 1, emits a single {@code mousemove} event at the destination
-     * location.
+     * Defaults to 1. Sends intermediate {@code mousemove} events.
     */
    public Integer steps;

    /**
-     * Defaults to 1. Sends {@code n} interpolated {@code mousemove} events to represent travel between Playwright's current
-     * cursor position and the provided destination. When set to 1, emits a single {@code mousemove} event at the destination
-     * location.
+     * Defaults to 1. Sends intermediate {@code mousemove} events.
     */
    public MoveOptions setSteps(int steps) {
      this.steps = steps;
@@ -169,44 +160,32 @@ public interface Mouse {
    }
  }
  /**
-   * Shortcut for {@link com.microsoft.playwright.Mouse#move Mouse.move()}, {@link com.microsoft.playwright.Mouse#down
-   * Mouse.down()}, {@link com.microsoft.playwright.Mouse#up Mouse.up()}.
+   * Shortcut for {@link Mouse#move Mouse.move()}, {@link Mouse#down Mouse.down()}, {@link Mouse#up Mouse.up()}.
   *
-   * @param x X coordinate relative to the main frame's viewport in CSS pixels.
-   * @param y Y coordinate relative to the main frame's viewport in CSS pixels.
   * @since v1.8
   */
  default void click(double x, double y) {
    click(x, y, null);
  }
  /**
-   * Shortcut for {@link com.microsoft.playwright.Mouse#move Mouse.move()}, {@link com.microsoft.playwright.Mouse#down
-   * Mouse.down()}, {@link com.microsoft.playwright.Mouse#up Mouse.up()}.
+   * Shortcut for {@link Mouse#move Mouse.move()}, {@link Mouse#down Mouse.down()}, {@link Mouse#up Mouse.up()}.
   *
-   * @param x X coordinate relative to the main frame's viewport in CSS pixels.
-   * @param y Y coordinate relative to the main frame's viewport in CSS pixels.
   * @since v1.8
   */
  void click(double x, double y, ClickOptions options);
  /**
-   * Shortcut for {@link com.microsoft.playwright.Mouse#move Mouse.move()}, {@link com.microsoft.playwright.Mouse#down
-   * Mouse.down()}, {@link com.microsoft.playwright.Mouse#up Mouse.up()}, {@link com.microsoft.playwright.Mouse#down
-   * Mouse.down()} and {@link com.microsoft.playwright.Mouse#up Mouse.up()}.
+   * Shortcut for {@link Mouse#move Mouse.move()}, {@link Mouse#down Mouse.down()}, {@link Mouse#up Mouse.up()}, {@link
+   * Mouse#down Mouse.down()} and {@link Mouse#up Mouse.up()}.
   *
-   * @param x X coordinate relative to the main frame's viewport in CSS pixels.
-   * @param y Y coordinate relative to the main frame's viewport in CSS pixels.
   * @since v1.8
   */
  default void dblclick(double x, double y) {
    dblclick(x, y, null);
  }
  /**
-   * Shortcut for {@link com.microsoft.playwright.Mouse#move Mouse.move()}, {@link com.microsoft.playwright.Mouse#down
-   * Mouse.down()}, {@link com.microsoft.playwright.Mouse#up Mouse.up()}, {@link com.microsoft.playwright.Mouse#down
-   * Mouse.down()} and {@link com.microsoft.playwright.Mouse#up Mouse.up()}.
+   * Shortcut for {@link Mouse#move Mouse.move()}, {@link Mouse#down Mouse.down()}, {@link Mouse#up Mouse.up()}, {@link
+   * Mouse#down Mouse.down()} and {@link Mouse#up Mouse.up()}.
   *
-   * @param x X coordinate relative to the main frame's viewport in CSS pixels.
-   * @param y Y coordinate relative to the main frame's viewport in CSS pixels.
   * @since v1.8
   */
  void dblclick(double x, double y, DblclickOptions options);
@@ -227,8 +206,6 @@ public interface Mouse {
  /**
   * Dispatches a {@code mousemove} event.
   *
-   * @param x X coordinate relative to the main frame's viewport in CSS pixels.
-   * @param y Y coordinate relative to the main frame's viewport in CSS pixels.
   * @since v1.8
   */
  default void move(double x, double y) {
@@ -237,8 +214,6 @@ public interface Mouse {
  /**
   * Dispatches a {@code mousemove} event.
   *
-   * @param x X coordinate relative to the main frame's viewport in CSS pixels.
-   * @param y Y coordinate relative to the main frame's viewport in CSS pixels.
   * @since v1.8
   */
  void move(double x, double y, MoveOptions options);
@@ -257,8 +232,7 @@ public interface Mouse {
   */
  void up(UpOptions options);
  /**
-   * Dispatches a {@code wheel} event. This method is usually used to manually scroll the page. See <a
-   * href="https://playwright.dev/java/docs/input#scrolling">scrolling</a> for alternative ways to scroll.
+   * Dispatches a {@code wheel} event.
   *
   * <p> <strong>NOTE:</strong> Wheel events may cause scrolling if they are not handled, and this method does not wait for the scrolling to finish
   * before returning.
@@ -94,8 +94,8 @@ public interface Playwright extends AutoCloseable {
   */
  void close();
  /**
-   * Launches new Playwright driver process and connects to it. {@link com.microsoft.playwright.Playwright#close
-   * Playwright.close()} should be called when the instance is no longer needed.
+   * Launches new Playwright driver process and connects to it. {@link Playwright#close Playwright.close()} should be called
+   * when the instance is no longer needed.
   * <pre>{@code
   * Playwright playwright = Playwright.create();
   * Browser browser = playwright.webkit().launch();
@@ -22,15 +22,14 @@ import java.util.*;
 /**
 * Whenever the page sends a request for a network resource the following sequence of events are emitted by {@code Page}:
 * <ul>
- * <li> {@link com.microsoft.playwright.Page#onRequest Page.onRequest()} emitted when the request is issued by the page.</li>
- * <li> {@link com.microsoft.playwright.Page#onResponse Page.onResponse()} emitted when/if the response status and headers are
- * received for the request.</li>
- * <li> {@link com.microsoft.playwright.Page#onRequestFinished Page.onRequestFinished()} emitted when the response body is
- * downloaded and the request is complete.</li>
+ * <li> {@link Page#onRequest Page.onRequest()} emitted when the request is issued by the page.</li>
+ * <li> {@link Page#onResponse Page.onResponse()} emitted when/if the response status and headers are received for the request.</li>
+ * <li> {@link Page#onRequestFinished Page.onRequestFinished()} emitted when the response body is downloaded and the request is
+ * complete.</li>
 * </ul>
 *
 * <p> If request fails at some point, then instead of {@code "requestfinished"} event (and possibly instead of 'response'
- * event), the  {@link com.microsoft.playwright.Page#onRequestFailed Page.onRequestFailed()} event is emitted.
+ * event), the  {@link Page#onRequestFailed Page.onRequestFailed()} event is emitted.
 *
 * <p> <strong>NOTE:</strong> HTTP Error responses, such as 404 or 503, are still successful responses from HTTP standpoint, so request will complete
 * with {@code "requestfinished"} event.
@@ -48,7 +47,7 @@ public interface Request {
  /**
   * The method returns {@code null} unless this request has failed, as reported by {@code requestfailed} event.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   *
   * <p> Example of logging of all the failed requests:
   * <pre>{@code
@@ -63,43 +62,27 @@ public interface Request {
  /**
   * Returns the {@code Frame} that initiated this request.
   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * String frameUrl = request.frame().url();
-   * }</pre>
-   *
-   * <p> <strong>Details</strong>
-   *
-   * <p> Note that in some cases the frame is not available, and this method will throw.
-   * <ul>
-   * <li> When request originates in the Service Worker. You can use {@code request.serviceWorker()} to check that.</li>
-   * <li> When navigation request is issued before the corresponding frame is created. You can use {@link
-   * com.microsoft.playwright.Request#isNavigationRequest Request.isNavigationRequest()} to check that.</li>
-   * </ul>
-   *
-   * <p> Here is an example that handles all the cases:
-   *
   * @since v1.8
   */
  Frame frame();
  /**
   * An object with the request HTTP headers. The header names are lower-cased. Note that this method does not return
-   * security-related headers, including cookie-related ones. You can use {@link com.microsoft.playwright.Request#allHeaders
-   * Request.allHeaders()} for complete list of headers that include {@code cookie} information.
+   * security-related headers, including cookie-related ones. You can use {@link Request#allHeaders Request.allHeaders()} for
+   * complete list of headers that include {@code cookie} information.
   *
   * @since v1.8
   */
  Map<String, String> headers();
  /**
-   * An array with all the request HTTP headers associated with this request. Unlike {@link
-   * com.microsoft.playwright.Request#allHeaders Request.allHeaders()}, header names are NOT lower-cased. Headers with
-   * multiple entries, such as {@code Set-Cookie}, appear in the array multiple times.
+   * An array with all the request HTTP headers associated with this request. Unlike {@link Request#allHeaders
+   * Request.allHeaders()}, header names are NOT lower-cased. Headers with multiple entries, such as {@code Set-Cookie},
+   * appear in the array multiple times.
   *
   * @since v1.15
   */
  List<HttpHeader> headersArray();
  /**
-   * Returns the value of the header matching the name. The name is case-insensitive.
+   * Returns the value of the header matching the name. The name is case insensitive.
   *
   * @param name Name of the header.
   * @since v1.15
@@ -108,9 +91,6 @@ public interface Request {
  /**
   * Whether this request is driving frame's navigation.
   *
-   * <p> Some navigation requests are issued before the corresponding frame is created, and therefore do not have {@link
-   * com.microsoft.playwright.Request#frame Request.frame()} available.
-   *
   * @since v1.8
   */
  boolean isNavigationRequest();
@@ -139,7 +119,7 @@ public interface Request {
   * connected by {@code redirectedFrom()} and {@code redirectedTo()} methods. When multiple server redirects has happened,
   * it is possible to construct the whole redirect chain by repeatedly calling {@code redirectedFrom()}.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   *
   * <p> For example, if the website {@code http://example.com} redirects to {@code https://example.com}:
   * <pre>{@code
@@ -159,9 +139,9 @@ public interface Request {
  /**
   * New request issued by the browser if the server responded with redirect.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   *
-   * <p> This method is the opposite of {@link com.microsoft.playwright.Request#redirectedFrom Request.redirectedFrom()}:
+   * <p> This method is the opposite of {@link Request#redirectedFrom Request.redirectedFrom()}:
   * <pre>{@code
   * System.out.println(request.redirectedFrom().redirectedTo() == request); // true
   * }</pre>
@@ -194,7 +174,7 @@ public interface Request {
   * {@code responseEnd} becomes available when request finishes. Find more information at <a
   * href="https://developer.mozilla.org/en-US/docs/Web/API/PerformanceResourceTiming">Resource Timing API</a>.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   * <pre>{@code
   * page.onRequestFinished(request -> {
   *   Timing timing = request.timing();
@@ -56,22 +56,22 @@ public interface Response {
  boolean fromServiceWorker();
  /**
   * An object with the response HTTP headers. The header names are lower-cased. Note that this method does not return
-   * security-related headers, including cookie-related ones. You can use {@link com.microsoft.playwright.Response#allHeaders
-   * Response.allHeaders()} for complete list of headers that include {@code cookie} information.
+   * security-related headers, including cookie-related ones. You can use {@link Response#allHeaders Response.allHeaders()}
+   * for complete list of headers that include {@code cookie} information.
   *
   * @since v1.8
   */
  Map<String, String> headers();
  /**
-   * An array with all the request HTTP headers associated with this response. Unlike {@link
-   * com.microsoft.playwright.Response#allHeaders Response.allHeaders()}, header names are NOT lower-cased. Headers with
-   * multiple entries, such as {@code Set-Cookie}, appear in the array multiple times.
+   * An array with all the request HTTP headers associated with this response. Unlike {@link Response#allHeaders
+   * Response.allHeaders()}, header names are NOT lower-cased. Headers with multiple entries, such as {@code Set-Cookie},
+   * appear in the array multiple times.
   *
   * @since v1.15
   */
  List<HttpHeader> headersArray();
  /**
-   * Returns the value of the header matching the name. The name is case-insensitive. If multiple headers have the same name
+   * Returns the value of the header matching the name. The name is case insensitive. If multiple headers have the same name
   * (except {@code set-cookie}), they are returned as a list separated by {@code , }. For {@code set-cookie}, the {@code \n}
   * separator is used. If no headers are found, {@code null} is returned.
   *
@@ -80,7 +80,7 @@ public interface Response {
   */
  String headerValue(String name);
  /**
-   * Returns all values of the headers matching the name, for example {@code set-cookie}. The name is case-insensitive.
+   * Returns all values of the headers matching the name, for example {@code set-cookie}. The name is case insensitive.
   *
   * @param name Name of the header.
   * @since v1.15
@@ -20,9 +20,8 @@ import java.nio.file.Path;
 import java.util.*;

 /**
- * Whenever a network route is set up with {@link com.microsoft.playwright.Page#route Page.route()} or {@link
- * com.microsoft.playwright.BrowserContext#route BrowserContext.route()}, the {@code Route} object allows to handle the
- * route.
+ * Whenever a network route is set up with {@link Page#route Page.route()} or {@link BrowserContext#route
+ * BrowserContext.route()}, the {@code Route} object allows to handle the route.
 *
 * <p> Learn more about <a href="https://playwright.dev/java/docs/network">networking</a>.
 */
@@ -147,12 +146,6 @@ public interface Route {
     * exceeded. Defaults to {@code 20}. Pass {@code 0} to not follow redirects.
     */
    public Integer maxRedirects;
-    /**
-     * Maximum number of times network errors should be retried. Currently only {@code ECONNRESET} error is retried. Does not
-     * retry based on HTTP response codes. An error will be thrown if the limit is exceeded. Defaults to {@code 0} - no
-     * retries.
-     */
-    public Integer maxRetries;
    /**
     * If set changes the request method (e.g. GET or POST).
     */
@@ -185,15 +178,6 @@ public interface Route {
      this.maxRedirects = maxRedirects;
      return this;
    }
-    /**
-     * Maximum number of times network errors should be retried. Currently only {@code ECONNRESET} error is retried. Does not
-     * retry based on HTTP response codes. An error will be thrown if the limit is exceeded. Defaults to {@code 0} - no
-     * retries.
-     */
-    public FetchOptions setMaxRetries(int maxRetries) {
-      this.maxRetries = maxRetries;
-      return this;
-    }
    /**
     * If set changes the request method (e.g. GET or POST).
     */
@@ -348,9 +332,9 @@ public interface Route {
   */
  void abort(String errorCode);
  /**
-   * Sends route's request to the network with optional overrides.
+   * Continues route's request with optional overrides.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   * <pre>{@code
   * page.route("**\/*", route -> {
   *   // Override headers
@@ -361,19 +345,12 @@ public interface Route {
   * });
   * }</pre>
   *
-   * <p> <strong>Details</strong>
+   * <p> **Details**
   *
-   * <p> The {@code headers} option applies to both the routed request and any redirects it initiates. However, {@code url},
-   * {@code method}, and {@code postData} only apply to the original request and are not carried over to redirected requests.
-   *
-   * <p> {@link com.microsoft.playwright.Route#resume Route.resume()} will immediately send the request to the network, other
-   * matching handlers won't be invoked. Use {@link com.microsoft.playwright.Route#fallback Route.fallback()} If you want
-   * next matching handler in the chain to be invoked.
-   *
-   * <p> <strong>NOTE:</strong> Some request headers are **forbidden** and cannot be overridden (for example, {@code Cookie}, {@code Host}, {@code
-   * Content-Length} and others, see <a
-   * href="https://developer.mozilla.org/en-US/docs/Glossary/Forbidden_request_header">this MDN page</a> for full list). If
-   * an override is provided for a forbidden header, it will be ignored and the original request header will be used.To set custom cookies, use {@link com.microsoft.playwright.BrowserContext#addCookies BrowserContext.addCookies()}.
+   * <p> Note that any overrides such as {@code url} or {@code headers} only apply to the request being routed. If this request
+   * results in a redirect, overrides will not be applied to the new redirected request. If you want to propagate a header
+   * through redirects, use the combination of {@link Route#fetch Route.fetch()} and {@link Route#fulfill Route.fulfill()}
+   * instead.
   *
   * @since v1.8
   */
@@ -381,9 +358,9 @@ public interface Route {
    resume(null);
  }
  /**
-   * Sends route's request to the network with optional overrides.
+   * Continues route's request with optional overrides.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   * <pre>{@code
   * page.route("**\/*", route -> {
   *   // Override headers
@@ -394,33 +371,23 @@ public interface Route {
   * });
   * }</pre>
   *
-   * <p> <strong>Details</strong>
+   * <p> **Details**
   *
-   * <p> The {@code headers} option applies to both the routed request and any redirects it initiates. However, {@code url},
-   * {@code method}, and {@code postData} only apply to the original request and are not carried over to redirected requests.
-   *
-   * <p> {@link com.microsoft.playwright.Route#resume Route.resume()} will immediately send the request to the network, other
-   * matching handlers won't be invoked. Use {@link com.microsoft.playwright.Route#fallback Route.fallback()} If you want
-   * next matching handler in the chain to be invoked.
-   *
-   * <p> <strong>NOTE:</strong> Some request headers are **forbidden** and cannot be overridden (for example, {@code Cookie}, {@code Host}, {@code
-   * Content-Length} and others, see <a
-   * href="https://developer.mozilla.org/en-US/docs/Glossary/Forbidden_request_header">this MDN page</a> for full list). If
-   * an override is provided for a forbidden header, it will be ignored and the original request header will be used.To set custom cookies, use {@link com.microsoft.playwright.BrowserContext#addCookies BrowserContext.addCookies()}.
+   * <p> Note that any overrides such as {@code url} or {@code headers} only apply to the request being routed. If this request
+   * results in a redirect, overrides will not be applied to the new redirected request. If you want to propagate a header
+   * through redirects, use the combination of {@link Route#fetch Route.fetch()} and {@link Route#fulfill Route.fulfill()}
+   * instead.
   *
   * @since v1.8
   */
  void resume(ResumeOptions options);
  /**
-   * Continues route's request with optional overrides. The method is similar to {@link com.microsoft.playwright.Route#resume
-   * Route.resume()} with the difference that other matching handlers will be invoked before sending the request.
-   *
-   * <p> <strong>Usage</strong>
-   *
-   * <p> When several routes match the given pattern, they run in the order opposite to their registration. That way the last
+   * When several routes match the given pattern, they run in the order opposite to their registration. That way the last
   * registered route can always override all the previous ones. In the example below, request will be handled by the
   * bottom-most handler first, then it'll fall back to the previous one and in the end will be aborted by the first
   * registered route.
+   *
+   * <p> **Usage**
   * <pre>{@code
   * page.route("**\/*", route -> {
   *   // Runs last.
@@ -474,24 +441,18 @@ public interface Route {
   * });
   * }</pre>
   *
-   * <p> Use {@link com.microsoft.playwright.Route#resume Route.resume()} to immediately send the request to the network, other
-   * matching handlers won't be invoked in that case.
-   *
   * @since v1.23
   */
  default void fallback() {
    fallback(null);
  }
  /**
-   * Continues route's request with optional overrides. The method is similar to {@link com.microsoft.playwright.Route#resume
-   * Route.resume()} with the difference that other matching handlers will be invoked before sending the request.
-   *
-   * <p> <strong>Usage</strong>
-   *
-   * <p> When several routes match the given pattern, they run in the order opposite to their registration. That way the last
+   * When several routes match the given pattern, they run in the order opposite to their registration. That way the last
   * registered route can always override all the previous ones. In the example below, request will be handled by the
   * bottom-most handler first, then it'll fall back to the previous one and in the end will be aborted by the first
   * registered route.
+   *
+   * <p> **Usage**
   * <pre>{@code
   * page.route("**\/*", route -> {
   *   // Runs last.
@@ -545,9 +506,6 @@ public interface Route {
   * });
   * }</pre>
   *
-   * <p> Use {@link com.microsoft.playwright.Route#resume Route.resume()} to immediately send the request to the network, other
-   * matching handlers won't be invoked in that case.
-   *
   * @since v1.23
   */
  void fallback(FallbackOptions options);
@@ -555,7 +513,7 @@ public interface Route {
   * Performs the request and fetches result without fulfilling it, so that the response could be modified and then
   * fulfilled.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   * <pre>{@code
   * page.route("https://dog.ceo/api/breeds/list/all", route -> {
   *   APIResponse response = route.fetch();
@@ -568,11 +526,11 @@ public interface Route {
   * });
   * }</pre>
   *
-   * <p> <strong>Details</strong>
+   * <p> **Details**
   *
   * <p> Note that {@code headers} option will apply to the fetched request as well as any redirects initiated by it. If you want
-   * to only apply {@code headers} to the original request, but not to redirects, look into {@link
-   * com.microsoft.playwright.Route#resume Route.resume()} instead.
+   * to only apply {@code headers} to the original request, but not to redirects, look into {@link Route#resume
+   * Route.resume()} instead.
   *
   * @since v1.29
   */
@@ -583,7 +541,7 @@ public interface Route {
   * Performs the request and fetches result without fulfilling it, so that the response could be modified and then
   * fulfilled.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   * <pre>{@code
   * page.route("https://dog.ceo/api/breeds/list/all", route -> {
   *   APIResponse response = route.fetch();
@@ -596,11 +554,11 @@ public interface Route {
   * });
   * }</pre>
   *
-   * <p> <strong>Details</strong>
+   * <p> **Details**
   *
   * <p> Note that {@code headers} option will apply to the fetched request as well as any redirects initiated by it. If you want
-   * to only apply {@code headers} to the original request, but not to redirects, look into {@link
-   * com.microsoft.playwright.Route#resume Route.resume()} instead.
+   * to only apply {@code headers} to the original request, but not to redirects, look into {@link Route#resume
+   * Route.resume()} instead.
   *
   * @since v1.29
   */
@@ -608,7 +566,7 @@ public interface Route {
  /**
   * Fulfills route's request with given response.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   *
   * <p> An example of fulfilling all requests with 404 responses:
   * <pre>{@code
@@ -634,7 +592,7 @@ public interface Route {
  /**
   * Fulfills route's request with given response.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   *
   * <p> An example of fulfilling all requests with 404 responses:
   * <pre>{@code
@@ -44,7 +44,7 @@ public interface Selectors {
  /**
   * Selectors must be registered before creating the page.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   *
   * <p> An example of registering selector engine that queries elements based on a tag name:
   * <pre>{@code
@@ -84,7 +84,7 @@ public interface Selectors {
  /**
   * Selectors must be registered before creating the page.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   *
   * <p> An example of registering selector engine that queries elements based on a tag name:
   * <pre>{@code
@@ -122,7 +122,7 @@ public interface Selectors {
  /**
   * Selectors must be registered before creating the page.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   *
   * <p> An example of registering selector engine that queries elements based on a tag name:
   * <pre>{@code
@@ -162,7 +162,7 @@ public interface Selectors {
  /**
   * Selectors must be registered before creating the page.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   *
   * <p> An example of registering selector engine that queries elements based on a tag name:
   * <pre>{@code
@@ -198,8 +198,8 @@ public interface Selectors {
   */
  void register(String name, Path script, RegisterOptions options);
  /**
-   * Defines custom attribute name to be used in {@link com.microsoft.playwright.Page#getByTestId Page.getByTestId()}. {@code
-   * data-testid} is used by default.
+   * Defines custom attribute name to be used in {@link Page#getByTestId Page.getByTestId()}. {@code data-testid} is used by
+   * default.
   *
   * @param attributeName Test id attribute name.
   * @since v1.27
@@ -20,19 +20,13 @@ package com.microsoft.playwright;
 /**
 * The Touchscreen class operates in main-frame CSS pixels relative to the top-left corner of the viewport. Methods on the
 * touchscreen can only be used in browser contexts that have been initialized with {@code hasTouch} set to true.
- *
- * <p> This class is limited to emulating tap gestures. For examples of other gestures simulated by manually dispatching touch
- * events, see the <a href="https://playwright.dev/java/docs/touch-events">emulating legacy touch events</a> page.
 */
 public interface Touchscreen {
  /**
   * Dispatches a {@code touchstart} and {@code touchend} event with a single touch at the position ({@code x},{@code y}).
   *
-   * <p> <strong>NOTE:</strong> {@link com.microsoft.playwright.Page#tap Page.tap()} the method will throw if {@code hasTouch} option of the browser
-   * context is false.
+   * <p> <strong>NOTE:</strong> {@link Page#tap Page.tap()} the method will throw if {@code hasTouch} option of the browser context is false.
   *
-   * @param x X coordinate relative to the main frame's viewport in CSS pixels.
-   * @param y Y coordinate relative to the main frame's viewport in CSS pixels.
   * @since v1.8
   */
  void tap(double x, double y);
@@ -16,19 +16,12 @@

 package com.microsoft.playwright;

-import com.microsoft.playwright.options.*;
 import java.nio.file.Path;

 /**
 * API for collecting and saving Playwright traces. Playwright traces can be opened in <a
 * href="https://playwright.dev/java/docs/trace-viewer">Trace Viewer</a> after Playwright script runs.
 *
- * <p> <strong>NOTE:</strong> You probably want to <a href="https://playwright.dev/docs/api/class-testoptions#test-options-trace">enable tracing in
- * your config file</a> instead of using {@code context.tracing}.The {@code context.tracing} API captures browser operations and network activity, but it doesn't record test assertions
- * (like {@code expect} calls). We recommend <a
- * href="https://playwright.dev/docs/api/class-testoptions#test-options-trace">enabling tracing through Playwright Test
- * configuration</a>, which includes those assertions and provides a more complete trace for debugging test failures.
- *
 * <p> Start recording a trace before performing actions. At the end, stop tracing and save it to a file.
 * <pre>{@code
 * Browser browser = chromium.launch();
@@ -45,10 +38,8 @@ import java.nio.file.Path;
 public interface Tracing {
  class StartOptions {
    /**
-     * If specified, intermediate trace files are going to be saved into the files with the given name prefix inside the {@code
-     * tracesDir} directory specified in {@link com.microsoft.playwright.BrowserType#launch BrowserType.launch()}. To specify
-     * the final trace zip file name, you need to pass {@code path} option to {@link com.microsoft.playwright.Tracing#stop
-     * Tracing.stop()} instead.
+     * If specified, the trace is going to be saved into the file with the given name inside the {@code tracesDir} folder
+     * specified in {@link BrowserType#launch BrowserType.launch()}.
     */
    public String name;
    /**
@@ -75,10 +66,8 @@ public interface Tracing {
    public String title;

    /**
-     * If specified, intermediate trace files are going to be saved into the files with the given name prefix inside the {@code
-     * tracesDir} directory specified in {@link com.microsoft.playwright.BrowserType#launch BrowserType.launch()}. To specify
-     * the final trace zip file name, you need to pass {@code path} option to {@link com.microsoft.playwright.Tracing#stop
-     * Tracing.stop()} instead.
+     * If specified, the trace is going to be saved into the file with the given name inside the {@code tracesDir} folder
+     * specified in {@link BrowserType#launch BrowserType.launch()}.
     */
    public StartOptions setName(String name) {
      this.name = name;
@@ -121,10 +110,8 @@ public interface Tracing {
  }
  class StartChunkOptions {
    /**
-     * If specified, intermediate trace files are going to be saved into the files with the given name prefix inside the {@code
-     * tracesDir} directory specified in {@link com.microsoft.playwright.BrowserType#launch BrowserType.launch()}. To specify
-     * the final trace zip file name, you need to pass {@code path} option to {@link com.microsoft.playwright.Tracing#stopChunk
-     * Tracing.stopChunk()} instead.
+     * If specified, the trace is going to be saved into the file with the given name inside the {@code tracesDir} folder
+     * specified in {@link BrowserType#launch BrowserType.launch()}.
     */
    public String name;
    /**
@@ -133,10 +120,8 @@ public interface Tracing {
    public String title;

    /**
-     * If specified, intermediate trace files are going to be saved into the files with the given name prefix inside the {@code
-     * tracesDir} directory specified in {@link com.microsoft.playwright.BrowserType#launch BrowserType.launch()}. To specify
-     * the final trace zip file name, you need to pass {@code path} option to {@link com.microsoft.playwright.Tracing#stopChunk
-     * Tracing.stopChunk()} instead.
+     * If specified, the trace is going to be saved into the file with the given name inside the {@code tracesDir} folder
+     * specified in {@link BrowserType#launch BrowserType.launch()}.
     */
    public StartChunkOptions setName(String name) {
      this.name = name;
@@ -150,29 +135,6 @@ public interface Tracing {
      return this;
    }
  }
-  class GroupOptions {
-    /**
-     * Specifies a custom location for the group to be shown in the trace viewer. Defaults to the location of the {@link
-     * com.microsoft.playwright.Tracing#group Tracing.group()} call.
-     */
-    public Location location;
-
-    /**
-     * Specifies a custom location for the group to be shown in the trace viewer. Defaults to the location of the {@link
-     * com.microsoft.playwright.Tracing#group Tracing.group()} call.
-     */
-    public GroupOptions setLocation(String file) {
-      return setLocation(new Location(file));
-    }
-    /**
-     * Specifies a custom location for the group to be shown in the trace viewer. Defaults to the location of the {@link
-     * com.microsoft.playwright.Tracing#group Tracing.group()} call.
-     */
-    public GroupOptions setLocation(Location location) {
-      this.location = location;
-      return this;
-    }
-  }
  class StopOptions {
    /**
     * Export trace into the file with the given path.
@@ -189,14 +151,14 @@ public interface Tracing {
  }
  class StopChunkOptions {
    /**
-     * Export trace collected since the last {@link com.microsoft.playwright.Tracing#startChunk Tracing.startChunk()} call into
-     * the file with the given path.
+     * Export trace collected since the last {@link Tracing#startChunk Tracing.startChunk()} call into the file with the given
+     * path.
     */
    public Path path;

    /**
-     * Export trace collected since the last {@link com.microsoft.playwright.Tracing#startChunk Tracing.startChunk()} call into
-     * the file with the given path.
+     * Export trace collected since the last {@link Tracing#startChunk Tracing.startChunk()} call into the file with the given
+     * path.
     */
    public StopChunkOptions setPath(Path path) {
      this.path = path;
@@ -206,13 +168,7 @@ public interface Tracing {
  /**
   * Start tracing.
   *
-   * <p> <strong>NOTE:</strong> You probably want to <a href="https://playwright.dev/docs/api/class-testoptions#test-options-trace">enable tracing in
-   * your config file</a> instead of using {@code Tracing.start}.The {@code context.tracing} API captures browser operations and network activity, but it doesn't record test assertions
-   * (like {@code expect} calls). We recommend <a
-   * href="https://playwright.dev/docs/api/class-testoptions#test-options-trace">enabling tracing through Playwright Test
-   * configuration</a>, which includes those assertions and provides a more complete trace for debugging test failures.
-   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   * <pre>{@code
   * context.tracing().start(new Tracing.StartOptions()
   *   .setScreenshots(true)
@@ -231,13 +187,7 @@ public interface Tracing {
  /**
   * Start tracing.
   *
-   * <p> <strong>NOTE:</strong> You probably want to <a href="https://playwright.dev/docs/api/class-testoptions#test-options-trace">enable tracing in
-   * your config file</a> instead of using {@code Tracing.start}.The {@code context.tracing} API captures browser operations and network activity, but it doesn't record test assertions
-   * (like {@code expect} calls). We recommend <a
-   * href="https://playwright.dev/docs/api/class-testoptions#test-options-trace">enabling tracing through Playwright Test
-   * configuration</a>, which includes those assertions and provides a more complete trace for debugging test failures.
-   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   * <pre>{@code
   * context.tracing().start(new Tracing.StartOptions()
   *   .setScreenshots(true)
@@ -253,11 +203,10 @@ public interface Tracing {
  void start(StartOptions options);
  /**
   * Start a new trace chunk. If you'd like to record multiple traces on the same {@code BrowserContext}, use {@link
-   * com.microsoft.playwright.Tracing#start Tracing.start()} once, and then create multiple trace chunks with {@link
-   * com.microsoft.playwright.Tracing#startChunk Tracing.startChunk()} and {@link com.microsoft.playwright.Tracing#stopChunk
-   * Tracing.stopChunk()}.
+   * Tracing#start Tracing.start()} once, and then create multiple trace chunks with {@link Tracing#startChunk
+   * Tracing.startChunk()} and {@link Tracing#stopChunk Tracing.stopChunk()}.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   * <pre>{@code
   * context.tracing().start(new Tracing.StartOptions()
   *   .setScreenshots(true)
@@ -285,11 +234,10 @@ public interface Tracing {
  }
  /**
   * Start a new trace chunk. If you'd like to record multiple traces on the same {@code BrowserContext}, use {@link
-   * com.microsoft.playwright.Tracing#start Tracing.start()} once, and then create multiple trace chunks with {@link
-   * com.microsoft.playwright.Tracing#startChunk Tracing.startChunk()} and {@link com.microsoft.playwright.Tracing#stopChunk
-   * Tracing.stopChunk()}.
+   * Tracing#start Tracing.start()} once, and then create multiple trace chunks with {@link Tracing#startChunk
+   * Tracing.startChunk()} and {@link Tracing#stopChunk Tracing.stopChunk()}.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   * <pre>{@code
   * context.tracing().start(new Tracing.StartOptions()
   *   .setScreenshots(true)
@@ -313,56 +261,6 @@ public interface Tracing {
   * @since v1.15
   */
  void startChunk(StartChunkOptions options);
-  /**
-   * <strong>NOTE:</strong> Use {@code test.step} instead when available.
-   *
-   * <p> Creates a new group within the trace, assigning any subsequent API calls to this group, until {@link
-   * com.microsoft.playwright.Tracing#groupEnd Tracing.groupEnd()} is called. Groups can be nested and will be visible in the
-   * trace viewer.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * // All actions between group and groupEnd
-   * // will be shown in the trace viewer as a group.
-   * page.context().tracing().group("Open Playwright.dev > API");
-   * page.navigate("https://playwright.dev/");
-   * page.getByRole(AriaRole.LINK, new Page.GetByRoleOptions().setName("API")).click();
-   * page.context().tracing().groupEnd();
-   * }</pre>
-   *
-   * @param name Group name shown in the trace viewer.
-   * @since v1.49
-   */
-  default void group(String name) {
-    group(name, null);
-  }
-  /**
-   * <strong>NOTE:</strong> Use {@code test.step} instead when available.
-   *
-   * <p> Creates a new group within the trace, assigning any subsequent API calls to this group, until {@link
-   * com.microsoft.playwright.Tracing#groupEnd Tracing.groupEnd()} is called. Groups can be nested and will be visible in the
-   * trace viewer.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * // All actions between group and groupEnd
-   * // will be shown in the trace viewer as a group.
-   * page.context().tracing().group("Open Playwright.dev > API");
-   * page.navigate("https://playwright.dev/");
-   * page.getByRole(AriaRole.LINK, new Page.GetByRoleOptions().setName("API")).click();
-   * page.context().tracing().groupEnd();
-   * }</pre>
-   *
-   * @param name Group name shown in the trace viewer.
-   * @since v1.49
-   */
-  void group(String name, GroupOptions options);
-  /**
-   * Closes the last group created by {@link com.microsoft.playwright.Tracing#group Tracing.group()}.
-   *
-   * @since v1.49
-   */
-  void groupEnd();
  /**
   * Stop tracing.
   *
@@ -378,8 +276,7 @@ public interface Tracing {
   */
  void stop(StopOptions options);
  /**
-   * Stop the trace chunk. See {@link com.microsoft.playwright.Tracing#startChunk Tracing.startChunk()} for more details
-   * about multiple trace chunks.
+   * Stop the trace chunk. See {@link Tracing#startChunk Tracing.startChunk()} for more details about multiple trace chunks.
   *
   * @since v1.15
   */
@@ -387,8 +284,7 @@ public interface Tracing {
    stopChunk(null);
  }
  /**
-   * Stop the trace chunk. See {@link com.microsoft.playwright.Tracing#startChunk Tracing.startChunk()} for more details
-   * about multiple trace chunks.
+   * Stop the trace chunk. See {@link Tracing#startChunk Tracing.startChunk()} for more details about multiple trace chunks.
   *
   * @since v1.15
   */
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) Microsoft Corporation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.microsoft.playwright;
-
-
-/**
- * {@code WebError} class represents an unhandled exception thrown in the page. It is dispatched via the {@link
- * com.microsoft.playwright.BrowserContext#onWebError BrowserContext.onWebError()} event.
- * <pre>{@code
- * // Log all uncaught errors to the terminal
- * context.onWebError(webError -> {
- *   System.out.println("Uncaught exception: " + webError.error());
- * });
- *
- * // Navigate to a page with an exception.
- * page.navigate("data:text/html,<script>throw new Error('Test')</script>");
- * }</pre>
- */
-public interface WebError {
-  /**
-   * The page that produced this unhandled exception, if any.
-   *
-   * @since v1.38
-   */
-  Page page();
-  /**
-   * Unhandled error that was thrown.
-   *
-   * @since v1.38
-   */
-  String error();
-}
-
@@ -20,10 +20,7 @@ import java.util.function.Consumer;
 import java.util.function.Predicate;

 /**
- * The {@code WebSocket} class represents WebSocket connections within a page. It provides the ability to inspect and
- * manipulate the data being transmitted and received.
- *
- * <p> If you want to intercept or modify WebSocket frames, consider using {@code WebSocketRoute}.
+ * The {@code WebSocket} class represents websocket connections in the page.
 */
 public interface WebSocket {

@@ -70,8 +67,7 @@ public interface WebSocket {
    public Predicate<WebSocketFrame> predicate;
    /**
     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The
-     * default value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
-     * BrowserContext.setDefaultTimeout()}.
+     * default value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()}.
     */
    public Double timeout;

@@ -84,8 +80,7 @@ public interface WebSocket {
    }
    /**
     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The
-     * default value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
-     * BrowserContext.setDefaultTimeout()}.
+     * default value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()}.
     */
    public WaitForFrameReceivedOptions setTimeout(double timeout) {
      this.timeout = timeout;
@@ -99,8 +94,7 @@ public interface WebSocket {
    public Predicate<WebSocketFrame> predicate;
    /**
     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The
-     * default value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
-     * BrowserContext.setDefaultTimeout()}.
+     * default value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()}.
     */
    public Double timeout;

@@ -113,8 +107,7 @@ public interface WebSocket {
    }
    /**
     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The
-     * default value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
-     * BrowserContext.setDefaultTimeout()}.
+     * default value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()}.
     */
    public WaitForFrameSentOptions setTimeout(double timeout) {
      this.timeout = timeout;
@@ -19,8 +19,8 @@ package com.microsoft.playwright;

 /**
 * The {@code WebSocketFrame} class represents frames sent over {@code WebSocket} connections in the page. Frame payload is
- * returned by either {@link com.microsoft.playwright.WebSocketFrame#text WebSocketFrame.text()} or {@link
- * com.microsoft.playwright.WebSocketFrame#binary WebSocketFrame.binary()} method depending on the its type.
+ * returned by either {@link WebSocketFrame#text WebSocketFrame.text()} or {@link WebSocketFrame#binary
+ * WebSocketFrame.binary()} method depending on the its type.
 */
 public interface WebSocketFrame {
  /**
@@ -1,223 +0,0 @@
-/*
- * 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.BiConsumer;
-import java.util.function.Consumer;
-
-/**
- * Whenever a <a href="https://developer.mozilla.org/en-US/docs/Web/API/WebSocket">{@code WebSocket}</a> route is set up
- * with {@link com.microsoft.playwright.Page#routeWebSocket Page.routeWebSocket()} or {@link
- * com.microsoft.playwright.BrowserContext#routeWebSocket BrowserContext.routeWebSocket()}, the {@code WebSocketRoute}
- * object allows to handle the WebSocket, like an actual server would do.
- *
- * <p> <strong>Mocking</strong>
- *
- * <p> By default, the routed WebSocket will not connect to the server. This way, you can mock entire communication over the
- * WebSocket. Here is an example that responds to a {@code "request"} with a {@code "response"}.
- * <pre>{@code
- * page.routeWebSocket("wss://example.com/ws", ws -> {
- *   ws.onMessage(frame -> {
- *     if ("request".equals(frame.text()))
- *       ws.send("response");
- *   });
- * });
- * }</pre>
- *
- * <p> Since we do not call {@link com.microsoft.playwright.WebSocketRoute#connectToServer WebSocketRoute.connectToServer()}
- * inside the WebSocket route handler, Playwright assumes that WebSocket will be mocked, and opens the WebSocket inside the
- * page automatically.
- *
- * <p> Here is another example that handles JSON messages:
- * <pre>{@code
- * page.routeWebSocket("wss://example.com/ws", ws -> {
- *   ws.onMessage(frame -> {
- *     JsonObject json = new JsonParser().parse(frame.text()).getAsJsonObject();
- *     if ("question".equals(json.get("request").getAsString())) {
- *       Map<String, String> result = new HashMap();
- *       result.put("response", "answer");
- *       ws.send(gson.toJson(result));
- *     }
- *   });
- * });
- * }</pre>
- *
- * <p> <strong>Intercepting</strong>
- *
- * <p> Alternatively, you may want to connect to the actual server, but intercept messages in-between and modify or block them.
- * Calling {@link com.microsoft.playwright.WebSocketRoute#connectToServer WebSocketRoute.connectToServer()} returns a
- * server-side {@code WebSocketRoute} instance that you can send messages to, or handle incoming messages.
- *
- * <p> Below is an example that modifies some messages sent by the page to the server. Messages sent from the server to the
- * page are left intact, relying on the default forwarding.
- * <pre>{@code
- * page.routeWebSocket("/ws", ws -> {
- *   WebSocketRoute server = ws.connectToServer();
- *   ws.onMessage(frame -> {
- *     if ("request".equals(frame.text()))
- *       server.send("request2");
- *     else
- *       server.send(frame.text());
- *   });
- * });
- * }</pre>
- *
- * <p> After connecting to the server, all **messages are forwarded** between the page and the server by default.
- *
- * <p> However, if you call {@link com.microsoft.playwright.WebSocketRoute#onMessage WebSocketRoute.onMessage()} on the
- * original route, messages from the page to the server **will not be forwarded** anymore, but should instead be handled by
- * the {@code handler}.
- *
- * <p> Similarly, calling {@link com.microsoft.playwright.WebSocketRoute#onMessage WebSocketRoute.onMessage()} on the
- * server-side WebSocket will **stop forwarding messages** from the server to the page, and {@code handler} should take
- * care of them.
- *
- * <p> The following example blocks some messages in both directions. Since it calls {@link
- * com.microsoft.playwright.WebSocketRoute#onMessage WebSocketRoute.onMessage()} in both directions, there is no automatic
- * forwarding at all.
- * <pre>{@code
- * page.routeWebSocket("/ws", ws -> {
- *   WebSocketRoute server = ws.connectToServer();
- *   ws.onMessage(frame -> {
- *     if (!"blocked-from-the-page".equals(frame.text()))
- *       server.send(frame.text());
- *   });
- *   server.onMessage(frame -> {
- *     if (!"blocked-from-the-server".equals(frame.text()))
- *       ws.send(frame.text());
- *   });
- * });
- * }</pre>
- */
-public interface WebSocketRoute {
-  class CloseOptions {
-    /**
-     * Optional <a href="https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/close#code">close code</a>.
-     */
-    public Integer code;
-    /**
-     * Optional <a href="https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/close#reason">close reason</a>.
-     */
-    public String reason;
-
-    /**
-     * Optional <a href="https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/close#code">close code</a>.
-     */
-    public CloseOptions setCode(int code) {
-      this.code = code;
-      return this;
-    }
-    /**
-     * Optional <a href="https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/close#reason">close reason</a>.
-     */
-    public CloseOptions setReason(String reason) {
-      this.reason = reason;
-      return this;
-    }
-  }
-  /**
-   * Closes one side of the WebSocket connection.
-   *
-   * @since v1.48
-   */
-  default void close() {
-    close(null);
-  }
-  /**
-   * Closes one side of the WebSocket connection.
-   *
-   * @since v1.48
-   */
-  void close(CloseOptions options);
-  /**
-   * By default, routed WebSocket does not connect to the server, so you can mock entire WebSocket communication. This method
-   * connects to the actual WebSocket server, and returns the server-side {@code WebSocketRoute} instance, giving the ability
-   * to send and receive messages from the server.
-   *
-   * <p> Once connected to the server:
-   * <ul>
-   * <li> Messages received from the server will be **automatically forwarded** to the WebSocket in the page, unless {@link
-   * com.microsoft.playwright.WebSocketRoute#onMessage WebSocketRoute.onMessage()} is called on the server-side {@code
-   * WebSocketRoute}.</li>
-   * <li> Messages sent by the <a href="https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/send">{@code
-   * WebSocket.send()}</a> call in the page will be **automatically forwarded** to the server, unless {@link
-   * com.microsoft.playwright.WebSocketRoute#onMessage WebSocketRoute.onMessage()} is called on the original {@code
-   * WebSocketRoute}.</li>
-   * </ul>
-   *
-   * <p> See examples at the top for more details.
-   *
-   * @since v1.48
-   */
-  WebSocketRoute connectToServer();
-  /**
-   * Allows to handle <a href="https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/close">{@code WebSocket.close}</a>.
-   *
-   * <p> By default, closing one side of the connection, either in the page or on the server, will close the other side. However,
-   * when {@link com.microsoft.playwright.WebSocketRoute#onClose WebSocketRoute.onClose()} handler is set up, the default
-   * forwarding of closure is disabled, and handler should take care of it.
-   *
-   * @param handler Function that will handle WebSocket closure. Received an optional <a
-   * href="https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/close#code">close code</a> and an optional <a
-   * href="https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/close#reason">close reason</a>.
-   * @since v1.48
-   */
-  void onClose(BiConsumer<Integer, String> handler);
-  /**
-   * This method allows to handle messages that are sent by the WebSocket, either from the page or from the server.
-   *
-   * <p> When called on the original WebSocket route, this method handles messages sent from the page. You can handle this
-   * messages by responding to them with {@link com.microsoft.playwright.WebSocketRoute#send WebSocketRoute.send()},
-   * forwarding them to the server-side connection returned by {@link com.microsoft.playwright.WebSocketRoute#connectToServer
-   * WebSocketRoute.connectToServer()} or do something else.
-   *
-   * <p> Once this method is called, messages are not automatically forwarded to the server or to the page - you should do that
-   * manually by calling {@link com.microsoft.playwright.WebSocketRoute#send WebSocketRoute.send()}. See examples at the top
-   * for more details.
-   *
-   * <p> Calling this method again will override the handler with a new one.
-   *
-   * @param handler Function that will handle messages.
-   * @since v1.48
-   */
-  void onMessage(Consumer<WebSocketFrame> handler);
-  /**
-   * Sends a message to the WebSocket. When called on the original WebSocket, sends the message to the page. When called on
-   * the result of {@link com.microsoft.playwright.WebSocketRoute#connectToServer WebSocketRoute.connectToServer()}, sends
-   * the message to the server. See examples at the top for more details.
-   *
-   * @param message Message to send.
-   * @since v1.48
-   */
-  void send(String message);
-  /**
-   * Sends a message to the WebSocket. When called on the original WebSocket, sends the message to the page. When called on
-   * the result of {@link com.microsoft.playwright.WebSocketRoute#connectToServer WebSocketRoute.connectToServer()}, sends
-   * the message to the server. See examples at the top for more details.
-   *
-   * @param message Message to send.
-   * @since v1.48
-   */
-  void send(byte[] message);
-  /**
-   * URL of the WebSocket created in the page.
-   *
-   * @since v1.48
-   */
-  String url();
-}
-
@@ -17,7 +17,6 @@
 package com.microsoft.playwright;

 import java.util.function.Consumer;
-import java.util.function.Predicate;

 /**
 * The Worker class represents a <a href="https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API">WebWorker</a>.
@@ -45,74 +44,32 @@ public interface Worker {
   */
  void offClose(Consumer<Worker> handler);

-  /**
-   * Emitted when JavaScript within the worker calls one of console API methods, e.g. {@code console.log} or {@code
-   * console.dir}.
-   */
-  void onConsole(Consumer<ConsoleMessage> handler);
-  /**
-   * Removes handler that was previously added with {@link #onConsole onConsole(handler)}.
-   */
-  void offConsole(Consumer<ConsoleMessage> handler);
-
  class WaitForCloseOptions {
    /**
     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The
-     * default value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
-     * BrowserContext.setDefaultTimeout()}.
+     * default value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()}.
     */
    public Double timeout;

    /**
     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The
-     * default value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
-     * BrowserContext.setDefaultTimeout()}.
+     * default value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()}.
     */
    public WaitForCloseOptions setTimeout(double timeout) {
      this.timeout = timeout;
      return this;
    }
  }
-  class WaitForConsoleMessageOptions {
-    /**
-     * Receives the {@code ConsoleMessage} object and resolves to true when the waiting should resolve.
-     */
-    public Predicate<ConsoleMessage> predicate;
-    /**
-     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The
-     * default value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
-     * BrowserContext.setDefaultTimeout()}.
-     */
-    public Double timeout;
-
-    /**
-     * Receives the {@code ConsoleMessage} object and resolves to true when the waiting should resolve.
-     */
-    public WaitForConsoleMessageOptions setPredicate(Predicate<ConsoleMessage> predicate) {
-      this.predicate = predicate;
-      return this;
-    }
-    /**
-     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The
-     * default value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
-     * BrowserContext.setDefaultTimeout()}.
-     */
-    public WaitForConsoleMessageOptions setTimeout(double timeout) {
-      this.timeout = timeout;
-      return this;
-    }
-  }
  /**
   * Returns the return value of {@code expression}.
   *
-   * <p> If the function passed to the {@link com.microsoft.playwright.Worker#evaluate Worker.evaluate()} returns a <a
+   * <p> If the function passed to the {@link Worker#evaluate Worker.evaluate()} returns a <a
   * href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a>, then {@link
-   * com.microsoft.playwright.Worker#evaluate Worker.evaluate()} would wait for the promise to resolve and return its value.
+   * Worker#evaluate Worker.evaluate()} would wait for the promise to resolve and return its value.
   *
-   * <p> If the function passed to the {@link com.microsoft.playwright.Worker#evaluate Worker.evaluate()} returns a
-   * non-[Serializable] value, then {@link com.microsoft.playwright.Worker#evaluate Worker.evaluate()} returns {@code
-   * undefined}. Playwright also supports transferring some additional values that are not serializable by {@code JSON}:
-   * {@code -0}, {@code NaN}, {@code Infinity}, {@code -Infinity}.
+   * <p> If the function passed to the {@link Worker#evaluate Worker.evaluate()} returns a non-[Serializable] value, then {@link
+   * Worker#evaluate Worker.evaluate()} returns {@code undefined}. Playwright also supports transferring some additional
+   * values that are not serializable by {@code JSON}: {@code -0}, {@code NaN}, {@code Infinity}, {@code -Infinity}.
   *
   * @param expression JavaScript expression to be evaluated in the browser context. If the expression evaluates to a function, the function is
   * automatically invoked.
@@ -124,14 +81,13 @@ public interface Worker {
  /**
   * Returns the return value of {@code expression}.
   *
-   * <p> If the function passed to the {@link com.microsoft.playwright.Worker#evaluate Worker.evaluate()} returns a <a
+   * <p> If the function passed to the {@link Worker#evaluate Worker.evaluate()} returns a <a
   * href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a>, then {@link
-   * com.microsoft.playwright.Worker#evaluate Worker.evaluate()} would wait for the promise to resolve and return its value.
+   * Worker#evaluate Worker.evaluate()} would wait for the promise to resolve and return its value.
   *
-   * <p> If the function passed to the {@link com.microsoft.playwright.Worker#evaluate Worker.evaluate()} returns a
-   * non-[Serializable] value, then {@link com.microsoft.playwright.Worker#evaluate Worker.evaluate()} returns {@code
-   * undefined}. Playwright also supports transferring some additional values that are not serializable by {@code JSON}:
-   * {@code -0}, {@code NaN}, {@code Infinity}, {@code -Infinity}.
+   * <p> If the function passed to the {@link Worker#evaluate Worker.evaluate()} returns a non-[Serializable] value, then {@link
+   * Worker#evaluate Worker.evaluate()} returns {@code undefined}. Playwright also supports transferring some additional
+   * values that are not serializable by {@code JSON}: {@code -0}, {@code NaN}, {@code Infinity}, {@code -Infinity}.
   *
   * @param expression JavaScript expression to be evaluated in the browser context. If the expression evaluates to a function, the function is
   * automatically invoked.
@@ -142,14 +98,12 @@ public interface Worker {
  /**
   * Returns the return value of {@code expression} as a {@code JSHandle}.
   *
-   * <p> The only difference between {@link com.microsoft.playwright.Worker#evaluate Worker.evaluate()} and {@link
-   * com.microsoft.playwright.Worker#evaluateHandle Worker.evaluateHandle()} is that {@link
-   * com.microsoft.playwright.Worker#evaluateHandle Worker.evaluateHandle()} returns {@code JSHandle}.
+   * <p> The only difference between {@link Worker#evaluate Worker.evaluate()} and {@link Worker#evaluateHandle
+   * Worker.evaluateHandle()} is that {@link Worker#evaluateHandle Worker.evaluateHandle()} returns {@code JSHandle}.
   *
-   * <p> If the function passed to the {@link com.microsoft.playwright.Worker#evaluateHandle Worker.evaluateHandle()} returns a
-   * <a href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a>, then
-   * {@link com.microsoft.playwright.Worker#evaluateHandle Worker.evaluateHandle()} would wait for the promise to resolve and
-   * return its value.
+   * <p> If the function passed to the {@link Worker#evaluateHandle Worker.evaluateHandle()} returns a <a
+   * href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a>, then {@link
+   * Worker#evaluateHandle Worker.evaluateHandle()} would wait for the promise to resolve and return its value.
   *
   * @param expression JavaScript expression to be evaluated in the browser context. If the expression evaluates to a function, the function is
   * automatically invoked.
@@ -161,14 +115,12 @@ public interface Worker {
  /**
   * Returns the return value of {@code expression} as a {@code JSHandle}.
   *
-   * <p> The only difference between {@link com.microsoft.playwright.Worker#evaluate Worker.evaluate()} and {@link
-   * com.microsoft.playwright.Worker#evaluateHandle Worker.evaluateHandle()} is that {@link
-   * com.microsoft.playwright.Worker#evaluateHandle Worker.evaluateHandle()} returns {@code JSHandle}.
+   * <p> The only difference between {@link Worker#evaluate Worker.evaluate()} and {@link Worker#evaluateHandle
+   * Worker.evaluateHandle()} is that {@link Worker#evaluateHandle Worker.evaluateHandle()} returns {@code JSHandle}.
   *
-   * <p> If the function passed to the {@link com.microsoft.playwright.Worker#evaluateHandle Worker.evaluateHandle()} returns a
-   * <a href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a>, then
-   * {@link com.microsoft.playwright.Worker#evaluateHandle Worker.evaluateHandle()} would wait for the promise to resolve and
-   * return its value.
+   * <p> If the function passed to the {@link Worker#evaluateHandle Worker.evaluateHandle()} returns a <a
+   * href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a>, then {@link
+   * Worker#evaluateHandle Worker.evaluateHandle()} would wait for the promise to resolve and return its value.
   *
   * @param expression JavaScript expression to be evaluated in the browser context. If the expression evaluates to a function, the function is
   * automatically invoked.
@@ -198,21 +150,5 @@ public interface Worker {
   * @since v1.10
   */
  Worker waitForClose(WaitForCloseOptions options, Runnable callback);
-  /**
-   * Performs action and waits for a console message.
-   *
-   * @param callback Callback that performs the action triggering the event.
-   * @since v1.57
-   */
-  default ConsoleMessage waitForConsoleMessage(Runnable callback) {
-    return waitForConsoleMessage(null, callback);
-  }
-  /**
-   * Performs action and waits for a console message.
-   *
-   * @param callback Callback that performs the action triggering the event.
-   * @since v1.57
-   */
-  ConsoleMessage waitForConsoleMessage(WaitForConsoleMessageOptions options, Runnable callback);
 }

@@ -21,15 +21,15 @@ package com.microsoft.playwright.assertions;
 * The {@code APIResponseAssertions} class provides assertion methods that can be used to make assertions about the {@code
 * APIResponse} in the tests.
 * <pre>{@code
- * // ...
+ * ...
 * import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
 *
 * public class TestPage {
- *   // ...
+ *   ...
 *   @Test
 *   void navigatesToLoginPage() {
- *     // ...
- *     APIResponse response = page.request().get("https://playwright.dev");
+ *     ...
+ *     APIResponse response = page.request().get('https://playwright.dev');
 *     assertThat(response).isOK();
 *   }
 * }
@@ -49,7 +49,7 @@ public interface APIResponseAssertions {
  /**
   * Ensures the response status code is within {@code 200..299} range.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   * <pre>{@code
   * assertThat(response).isOK();
   * }</pre>
@@ -22,14 +22,14 @@ import java.util.regex.Pattern;
 * The {@code PageAssertions} class provides assertion methods that can be used to make assertions about the {@code Page}
 * state in the tests.
 * <pre>{@code
- * // ...
+ * ...
 * import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
 *
 * public class TestPage {
- *   // ...
+ *   ...
 *   @Test
 *   void navigatesToLoginPage() {
- *     // ...
+ *     ...
 *     page.getByText("Sign in").click();
 *     assertThat(page).hasURL(Pattern.compile(".*\/login"));
 *   }
@@ -52,24 +52,11 @@ public interface PageAssertions {
    }
  }
  class HasURLOptions {
-    /**
-     * Whether to perform case-insensitive match. {@code ignoreCase} option takes precedence over the corresponding regular
-     * expression parameter if specified. A provided predicate ignores this flag.
-     */
-    public Boolean ignoreCase;
    /**
     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
     */
    public Double timeout;

-    /**
-     * Whether to perform case-insensitive match. {@code ignoreCase} option takes precedence over the corresponding regular
-     * expression parameter if specified. A provided predicate ignores this flag.
-     */
-    public HasURLOptions setIgnoreCase(boolean ignoreCase) {
-      this.ignoreCase = ignoreCase;
-      return this;
-    }
    /**
     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
     */
@@ -91,7 +78,7 @@ public interface PageAssertions {
  /**
   * Ensures the page has the given title.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   * <pre>{@code
   * assertThat(page).hasTitle("Playwright");
   * }</pre>
@@ -105,7 +92,7 @@ public interface PageAssertions {
  /**
   * Ensures the page has the given title.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   * <pre>{@code
   * assertThat(page).hasTitle("Playwright");
   * }</pre>
@@ -117,7 +104,7 @@ public interface PageAssertions {
  /**
   * Ensures the page has the given title.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   * <pre>{@code
   * assertThat(page).hasTitle("Playwright");
   * }</pre>
@@ -131,7 +118,7 @@ public interface PageAssertions {
  /**
   * Ensures the page has the given title.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   * <pre>{@code
   * assertThat(page).hasTitle("Playwright");
   * }</pre>
@@ -143,7 +130,7 @@ public interface PageAssertions {
  /**
   * Ensures the page is navigated to the given URL.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   * <pre>{@code
   * assertThat(page).hasURL(".com");
   * }</pre>
@@ -157,7 +144,7 @@ public interface PageAssertions {
  /**
   * Ensures the page is navigated to the given URL.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   * <pre>{@code
   * assertThat(page).hasURL(".com");
   * }</pre>
@@ -169,7 +156,7 @@ public interface PageAssertions {
  /**
   * Ensures the page is navigated to the given URL.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   * <pre>{@code
   * assertThat(page).hasURL(".com");
   * }</pre>
@@ -183,7 +170,7 @@ public interface PageAssertions {
  /**
   * Ensures the page is navigated to the given URL.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   * <pre>{@code
   * assertThat(page).hasURL(".com");
   * }</pre>
@@ -30,13 +30,14 @@ import com.microsoft.playwright.impl.PageAssertionsImpl;
 *
 * <p> Consider the following example:
 * <pre>{@code
+ * ...
 * import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
 *
 * public class TestExample {
- *   // ...
+ *   ...
 *   @Test
 *   void statusBecomesSubmitted() {
- *     // ...
+ *     ...
 *     page.locator("#submit-button").click();
 *     assertThat(page.locator(".status")).hasText("Submitted");
 *   }
@@ -53,7 +54,7 @@ public interface PlaywrightAssertions {
  /**
   * Creates a {@code APIResponseAssertions} object for the given {@code APIResponse}.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   * <pre>{@code
   * PlaywrightAssertions.assertThat(response).isOK();
   * }</pre>
@@ -68,7 +69,7 @@ public interface PlaywrightAssertions {
  /**
   * Creates a {@code LocatorAssertions} object for the given {@code Locator}.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   * <pre>{@code
   * PlaywrightAssertions.assertThat(locator).isVisible();
   * }</pre>
@@ -83,7 +84,7 @@ public interface PlaywrightAssertions {
  /**
   * Creates a {@code PageAssertions} object for the given {@code Page}.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   * <pre>{@code
   * PlaywrightAssertions.assertThat(page).hasTitle("News");
   * }</pre>
@@ -98,7 +99,7 @@ public interface PlaywrightAssertions {
  /**
   * Changes default timeout for Playwright assertions from 5 seconds to the specified value.
   *
-   * <p> <strong>Usage</strong>
+   * <p> **Usage**
   * <pre>{@code
   * PlaywrightAssertions.setDefaultAssertionTimeout(30_000);
   * }</pre>
@@ -106,8 +107,8 @@ public interface PlaywrightAssertions {
   * @param timeout Timeout in milliseconds.
   * @since v1.25
   */
-  static void setDefaultAssertionTimeout(double timeout) {
-    AssertionsTimeout.setDefaultTimeout(timeout);
+  static void setDefaultAssertionTimeout(double milliseconds) {
+    AssertionsTimeout.setDefaultTimeout(milliseconds);
  }

 }
@@ -1,22 +1,8 @@
-/*
- * 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.impl;

-import com.google.gson.*;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
 import com.microsoft.playwright.APIRequestContext;
 import com.microsoft.playwright.APIResponse;
 import com.microsoft.playwright.PlaywrightException;
@@ -29,7 +15,6 @@ import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.Base64;
 import java.util.LinkedHashMap;
-import java.util.List;
 import java.util.Map;

 import static com.microsoft.playwright.impl.Serialization.*;
@@ -37,9 +22,6 @@ import static com.microsoft.playwright.impl.Utils.toFilePayload;

 class APIRequestContextImpl extends ChannelOwner implements APIRequestContext {
  private final TracingImpl tracing;
-  private String disposeReason;
-
-  protected TimeoutSettings timeoutSettings = new TimeoutSettings();

  APIRequestContextImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
    super(parent, type, guid, initializer);
@@ -52,18 +34,13 @@ class APIRequestContextImpl extends ChannelOwner implements APIRequestContext {
  }

  @Override
-  public void dispose(DisposeOptions options) {
-    if (options == null) {
-      options = new DisposeOptions();
-    }
-    disposeReason = options.reason;
-    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    sendMessage("dispose", params, NO_TIMEOUT);
+  public void dispose() {
+    withLogging("APIRequestContext.dispose", () -> sendMessage("dispose"));
  }

  @Override
  public APIResponse fetch(String urlOrRequest, RequestOptions options) {
-    return fetchImpl(urlOrRequest, (RequestOptionsImpl) options);
+    return withLogging("APIRequestContext.fetch", () -> fetchImpl(urlOrRequest, (RequestOptionsImpl) options));
  }

  @Override
@@ -85,13 +62,9 @@ class APIRequestContextImpl extends ChannelOwner implements APIRequestContext {
  }

  private APIResponse fetchImpl(String url, RequestOptionsImpl options) {
-    if (disposeReason != null) {
-      throw new PlaywrightException(disposeReason);
-    }
    if (options == null) {
      options = new RequestOptionsImpl();
    }
-    options.timeout = timeoutSettings.timeout(options.timeout);
    JsonObject params = new JsonObject();
    params.addProperty("url", url);
    if (options.params != null) {
@@ -99,7 +72,7 @@ class APIRequestContextImpl extends ChannelOwner implements APIRequestContext {
      for (Map.Entry<String, ?> e : options.params.entrySet()) {
        queryParams.put(e.getKey(), "" + e.getValue());
      }
-      params.add("params", toNameValueArray(queryParams.entrySet()));
+      params.add("params", toNameValueArray(queryParams));
    }
    if (options.method != null) {
      params.addProperty("method", options.method);
@@ -112,14 +85,11 @@ class APIRequestContextImpl extends ChannelOwner implements APIRequestContext {
      byte[] bytes = null;
      if (options.data instanceof byte[]) {
        bytes = (byte[]) options.data;
-      } else if (options.data instanceof String) {
-        String stringData = (String) options.data;
-        if (!isJsonContentType(options.headers) || isJsonParsable(stringData)) {
-          bytes = (stringData).getBytes(StandardCharsets.UTF_8);
-        }
+      } else if (options.data instanceof String && !isJsonContentType(options.headers)) {
+        bytes = ((String) options.data).getBytes(StandardCharsets.UTF_8);
      }
      if (bytes == null) {
-        params.addProperty("jsonData", jsonDataSerializer.toJson(options.data));
+        params.add("jsonData", gson().toJsonTree(options.data));
      } else {
        String base64 = Base64.getEncoder().encodeToString(bytes);
        params.addProperty("postData", base64);
@@ -131,6 +101,9 @@ class APIRequestContextImpl extends ChannelOwner implements APIRequestContext {
    if (options.multipart != null) {
      params.add("multipartData", serializeMultipartData(options.multipart.fields));
    }
+    if (options.timeout != null) {
+      params.addProperty("timeout", options.timeout);
+    }
    if (options.failOnStatusCode != null) {
      params.addProperty("failOnStatusCode", options.failOnStatusCode);
    }
@@ -143,13 +116,7 @@ class APIRequestContextImpl extends ChannelOwner implements APIRequestContext {
      }
      params.addProperty("maxRedirects", options.maxRedirects);
    }
-    if (options.maxRetries != null) {
-      if (options.maxRetries < 0) {
-        throw new PlaywrightException("'maxRetries' must be greater than or equal to '0'");
-      }
-      params.addProperty("maxRetries", options.maxRetries);
-    }
-    JsonObject json = sendMessage("fetch", params, timeoutSettings.timeout(options.timeout)).getAsJsonObject();
+    JsonObject json = sendMessage("fetch", params).getAsJsonObject();
    return new APIResponseImpl(this, json.getAsJsonObject("response"));
  }

@@ -165,9 +132,9 @@ class APIRequestContextImpl extends ChannelOwner implements APIRequestContext {
    return false;
  }

-  private static JsonArray serializeMultipartData(List<? extends Map.Entry<String, Object>> data) {
+  private static JsonArray serializeMultipartData(Map<String, Object> data) {
    JsonArray result = new JsonArray();
-    for (Map.Entry<String, ?> e : data) {
+    for (Map.Entry<String, Object> e : data.entrySet()) {
      FilePayload filePayload = null;
      if (e.getValue() instanceof FilePayload) {
        filePayload = (FilePayload) e.getValue();
@@ -215,12 +182,14 @@ class APIRequestContextImpl extends ChannelOwner implements APIRequestContext {

  @Override
  public String storageState(StorageStateOptions options) {
-    JsonElement json = sendMessage("storageState");
-    String storageState = json.toString();
-    if (options != null && options.path != null) {
-      Utils.writeToFile(storageState.getBytes(StandardCharsets.UTF_8), options.path);
-    }
-    return storageState;
+    return withLogging("APIRequestContext.storageState", () -> {
+      JsonElement json = sendMessage("storageState");
+      String storageState = json.toString();
+      if (options != null && options.path != null) {
+        Utils.writeToFile(storageState.getBytes(StandardCharsets.UTF_8), options.path);
+      }
+      return storageState;
+    });
  }

  private static RequestOptionsImpl ensureOptions(RequestOptions options, String method) {
@@ -233,21 +202,4 @@ class APIRequestContextImpl extends ChannelOwner implements APIRequestContext {
    }
    return impl;
  }
-
-  private static boolean isJsonParsable(String value) {
-    try {
-      JsonElement result = JsonParser.parseString(value);
-      if (result != null && result.isJsonPrimitive()) {
-        JsonPrimitive primitive = result.getAsJsonPrimitive();
-        if (primitive.isString() && value.equals(primitive.getAsString())) {
-          // Gson parses unquoted strings too, but we don't want to treat them
-          // as valid JSON.
-          return false;
-        }
-      }
-      return true;
-    } catch (JsonSyntaxException error) {
-      return false;
-    }
-  }
 }
@@ -1,35 +1,15 @@
-/*
- * 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.impl;

 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import com.microsoft.playwright.APIRequest;
 import com.microsoft.playwright.PlaywrightException;
-import com.microsoft.playwright.options.ClientCertificate;

 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
-import java.util.List;

-import static com.microsoft.playwright.impl.ChannelOwner.NO_TIMEOUT;
 import static com.microsoft.playwright.impl.Serialization.gson;
-import static com.microsoft.playwright.impl.Utils.addToProtocol;

 class APIRequestImpl implements APIRequest {
  private final PlaywrightImpl playwright;
@@ -40,10 +20,12 @@ class APIRequestImpl implements APIRequest {

  @Override
  public APIRequestContextImpl newContext(NewContextOptions options) {
+    return playwright.withLogging("APIRequest.newContext", () -> newContextImpl(options));
+  }
+
+  private APIRequestContextImpl newContextImpl(NewContextOptions options) {
    if (options == null) {
      options = new NewContextOptions();
-    } else {
-      options = Utils.clone(options);
    }
    if (options.storageStatePath != null) {
      try {
@@ -59,19 +41,13 @@ class APIRequestImpl implements APIRequest {
      storageState = new Gson().fromJson(options.storageState, JsonObject.class);
      options.storageState = null;
    }
-    List<ClientCertificate> clientCertificateList = options.clientCertificates;
-    options.clientCertificates = null;
-    Double timeout = options.timeout;
-    // Timeout is handled on the client.
-    options.timeout = null;
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    if (storageState != null) {
      params.add("storageState", storageState);
    }
-    addToProtocol(params, clientCertificateList);
-    JsonObject result = playwright.sendMessage("newRequest", params, NO_TIMEOUT).getAsJsonObject();
+
+    JsonObject result = playwright.sendMessage("newRequest", params).getAsJsonObject();
    APIRequestContextImpl context = playwright.connection.getExistingObject(result.getAsJsonObject("request").get("guid").getAsString());
-    context.timeoutSettings.setDefaultTimeout(timeout);
    return context;
  }
 }
@@ -17,6 +17,7 @@
 package com.microsoft.playwright.impl;

 import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.reflect.TypeToken;
 import com.microsoft.playwright.APIResponse;
@@ -28,7 +29,6 @@ import java.util.Base64;
 import java.util.List;
 import java.util.Map;

-import static com.microsoft.playwright.impl.ChannelOwner.NO_TIMEOUT;
 import static com.microsoft.playwright.impl.Serialization.gson;
 import static com.microsoft.playwright.impl.Utils.isSafeCloseError;
 import static java.util.Arrays.asList;
@@ -46,27 +46,31 @@ class APIResponseImpl implements APIResponse {

  @Override
  public byte[] body() {
-    try {
-      JsonObject params = new JsonObject();
-      params.addProperty("fetchUid", fetchUid());
-      JsonObject json = context.sendMessage("fetchResponseBody", params, NO_TIMEOUT).getAsJsonObject();
-      if (!json.has("binary")) {
-        throw new PlaywrightException("Response has been disposed");
+    return context.withLogging("APIResponse.body", () -> {
+      try {
+        JsonObject params = new JsonObject();
+        params.addProperty("fetchUid", fetchUid());
+        JsonObject json = context.sendMessage("fetchResponseBody", params).getAsJsonObject();
+        if (!json.has("binary")) {
+          throw new PlaywrightException("Response has been disposed");
+        }
+        return Base64.getDecoder().decode(json.get("binary").getAsString());
+      } catch (PlaywrightException e) {
+        if (isSafeCloseError(e)) {
+          throw new PlaywrightException("Response has been disposed");
+        }
+        throw e;
      }
-      return Base64.getDecoder().decode(json.get("binary").getAsString());
-    } catch (PlaywrightException e) {
-      if (isSafeCloseError(e)) {
-        throw new PlaywrightException("Response has been disposed");
-      }
-      throw e;
-    }
+    });
  }

  @Override
  public void dispose() {
-    JsonObject params = new JsonObject();
-    params.addProperty("fetchUid", fetchUid());
-    context.sendMessage("disposeAPIResponse", params, NO_TIMEOUT);
+    context.withLogging("APIResponse.dispose", () -> {
+      JsonObject params = new JsonObject();
+      params.addProperty("fetchUid", fetchUid());
+      context.sendMessage("disposeAPIResponse", params);
+    });
  }

  @Override
@@ -112,7 +116,7 @@ class APIResponseImpl implements APIResponse {
  List<String> fetchLog() {
    JsonObject params = new JsonObject();
    params.addProperty("fetchUid", fetchUid());
-    JsonObject json = context.sendMessage("fetchLog", params, NO_TIMEOUT).getAsJsonObject();
+    JsonObject json = context.sendMessage("fetchLog", params).getAsJsonObject();
    JsonArray log = json.get("log").getAsJsonArray();
    return gson().fromJson(log, new TypeToken<List<String>>() {}.getType());
  }
@@ -34,6 +34,9 @@ class ArtifactImpl extends ChannelOwner {

  public InputStream createReadStream() {
    JsonObject result = sendMessage("stream").getAsJsonObject();
+    if (!result.has("stream")) {
+      return null;
+    }
    Stream stream = connection.getExistingObject(result.getAsJsonObject("stream").get("guid").getAsString());
    return stream.stream();
  }
@@ -86,6 +89,6 @@ class ArtifactImpl extends ChannelOwner {

    JsonObject params = new JsonObject();
    params.addProperty("path", path.toString());
-    sendMessage("saveAs", params, NO_TIMEOUT);
+    sendMessage("saveAs", params);
  }
 }
@@ -16,10 +16,10 @@

 package com.microsoft.playwright.impl;

+import com.microsoft.playwright.PlaywrightException;
 import org.opentest4j.AssertionFailedError;
 import org.opentest4j.ValueWrapper;

-import java.lang.reflect.Field;
 import java.util.Collection;
 import java.util.List;
 import java.util.regex.Pattern;
@@ -28,56 +28,53 @@ import java.util.stream.Collectors;
 import static com.microsoft.playwright.impl.Utils.toJsRegexFlags;
 import static java.util.Arrays.asList;

-abstract class AssertionsBase {
+class AssertionsBase {
+  final LocatorImpl actualLocator;
  final boolean isNot;

-  AssertionsBase(boolean isNot) {
+  AssertionsBase(LocatorImpl actual, boolean isNot) {
+    this.actualLocator = actual;
    this.isNot = isNot;
  }

-  void expectImpl(String expression, ExpectedTextValue textValue, Object expected, String message, FrameExpectOptions options, String title) {
-    expectImpl(expression, asList(textValue), expected, message, options, title);
+  void expectImpl(String expression, ExpectedTextValue textValue, Object expected, String message, FrameExpectOptions options) {
+    expectImpl(expression, asList(textValue), expected, message, options);
  }

-  void expectImpl(String expression, List<ExpectedTextValue> expectedText, Object expected, String message, FrameExpectOptions options, String title) {
+  void expectImpl(String expression, List<ExpectedTextValue> expectedText, Object expected, String message, FrameExpectOptions options) {
    if (options == null) {
      options = new FrameExpectOptions();
    }
    options.expectedText = expectedText;
-    expectImpl(expression, options, expected, message, title);
+    options.isNot = isNot;
+    expectImpl(expression, options, expected, message);
  }

-  void expectImpl(String expression, FrameExpectOptions expectOptions, Object expected, String message, String title) {
+  void expectImpl(String expression, FrameExpectOptions expectOptions, Object expected, String message) {
    if (expectOptions.timeout == null) {
      expectOptions.timeout = AssertionsTimeout.defaultTimeout;
    }
-    expectOptions.isNot = isNot;
-    if (isNot) {
+    if (expectOptions.isNot) {
      message = message.replace("expected to", "expected not to");
    }
-    FrameExpectResult result = doExpect(expression, expectOptions, title);
+    FrameExpectResult result = actualLocator.expect(expression, expectOptions);
    if (result.matches == isNot) {
      Object actual = result.received == null ? null : Serialization.deserialize(result.received);
-      String log = (result.log == null) ? "" : String.join("\n", result.log);
+      String log = String.join("\n", result.log);
      if (!log.isEmpty()) {
        log = "\nCall log:\n" + log;
      }
-      if (result.errorMessage != null) {
-        message += "\n" + result.errorMessage;
-      }
      if (expected == null) {
        throw new AssertionFailedError(message + log);
      }
      ValueWrapper expectedValue = formatValue(expected);
      ValueWrapper actualValue = formatValue(actual);
-      message += "\nExpected: " + expectedValue.getStringRepresentation() + "\nReceived: " + actualValue.getStringRepresentation() + "\n";
+      message += ": " + expectedValue.getStringRepresentation() + "\nReceived: " + actualValue.getStringRepresentation() + "\n";
      throw new AssertionFailedError(message + log, expectedValue, actualValue);
    }
  }

-  abstract FrameExpectResult doExpect(String expression, FrameExpectOptions expectOptions, String title);
-
-  protected static ValueWrapper formatValue(Object value) {
+  private static ValueWrapper formatValue(Object value) {
    if (value == null || !value.getClass().isArray()) {
      return ValueWrapper.create(value);
    }
@@ -94,17 +91,4 @@ abstract class AssertionsBase {
    }
    return expected;
  }
-
-  static Boolean shouldIgnoreCase(Object options) {
-    if (options == null) {
-      return null;
-    }
-    try {
-      Field fromField = options.getClass().getDeclaredField("ignoreCase");
-      Object value = fromField.get(options);
-      return (Boolean) value;
-    } catch (NoSuchFieldException | IllegalAccessException e) {
-      return null;
-    }
-  }
 }
@@ -78,11 +78,11 @@ class BindingCall extends ChannelOwner {

      JsonObject params = new JsonObject();
      params.add("result", gson().toJsonTree(serializeArgument(result)));
-      sendMessage("resolve", params, NO_TIMEOUT);
+      sendMessage("resolve", params);
    } catch (RuntimeException exception) {
      JsonObject params = new JsonObject();
      params.add("error", gson().toJsonTree(serializeError(exception)));
-      sendMessage("reject", params, NO_TIMEOUT);
+      sendMessage("reject", params);
    }
  }
 }
@@ -34,27 +34,23 @@ import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;

-import static com.microsoft.playwright.impl.Serialization.*;
-import static com.microsoft.playwright.impl.Utils.*;
+import static com.microsoft.playwright.impl.Serialization.addHarUrlFilter;
+import static com.microsoft.playwright.impl.Serialization.gson;
+import static com.microsoft.playwright.impl.Utils.isSafeCloseError;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.nio.file.Files.readAllBytes;
 import static java.util.Arrays.asList;

 class BrowserContextImpl extends ChannelOwner implements BrowserContext {
-  protected BrowserImpl browser;
+  private final BrowserImpl browser;
  private final TracingImpl tracing;
  private final APIRequestContextImpl request;
-  private final ClockImpl clock;
  final List<PageImpl> pages = new ArrayList<>();
-
  final Router routes = new Router();
-  final WebSocketRouter webSocketRoutes = new WebSocketRouter();
-  private boolean closingOrClosed;
+  private boolean closeWasCalled;
  private final WaitableEvent<EventType, ?> closePromise;
  final Map<String, BindingCallback> bindings = new HashMap<>();
  PageImpl ownerPage;
-  private String closeReason;
-
  private static final Map<EventType, String> eventSubscriptions() {
    Map<EventType, String> result = new HashMap<>();
    result.put(EventType.CONSOLE, "console");
@@ -67,6 +63,8 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
  }
  private final ListenerCollection<EventType> listeners = new ListenerCollection<>(eventSubscriptions(), this);
  final TimeoutSettings timeoutSettings = new TimeoutSettings();
+  Path videosDir;
+  URL baseUrl;
  final Map<String, HarRecorder> harRecorders = new HashMap<>();

  static class HarRecorder {
@@ -84,7 +82,6 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
    CONSOLE,
    DIALOG,
    PAGE,
-    WEBERROR,
    REQUEST,
    REQUESTFAILED,
    REQUESTFINISHED,
@@ -93,48 +90,28 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {

  BrowserContextImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
    super(parent, type, guid, initializer);
+    if (parent instanceof BrowserImpl) {
+      browser = (BrowserImpl) parent;
+    } else {
+      browser = null;
+    }
    tracing = connection.getExistingObject(initializer.getAsJsonObject("tracing").get("guid").getAsString());
    request = connection.getExistingObject(initializer.getAsJsonObject("requestContext").get("guid").getAsString());
-    request.timeoutSettings = timeoutSettings;
-    clock = new ClockImpl(this);
    closePromise = new WaitableEvent<>(listeners, EventType.CLOSE);
  }

-  Path videosDir() {
-    JsonObject recordVideo = initializer.getAsJsonObject("options").getAsJsonObject("recordVideo");
-    if (recordVideo == null) {
-      return null;
+  void setRecordHar(Path path, HarContentPolicy policy) {
+    if (path != null) {
+      harRecorders.put("", new HarRecorder(path, policy));
    }
-    return Paths.get(recordVideo.get("dir").getAsString());
  }

-  URL baseUrl() {
-    JsonElement url = initializer.getAsJsonObject("options").get("baseURL");
-    if (url != null) {
-      try {
-        return new URL(url.getAsString());
-      } catch (MalformedURLException e) {
-      }
+  void setBaseUrl(String spec) {
+    try {
+      this.baseUrl = new URL(spec);
+    } catch (MalformedURLException e) {
+      this.baseUrl = null;
    }
-    return null;
-  }
-
-  String effectiveCloseReason() {
-    if (closeReason != null) {
-      return closeReason;
-    }
-    if (browser != null) {
-      return browser.closeReason;
-    }
-    return null;
-  }
-
-  @Override
-  public void onBackgroundPage(Consumer<Page> handler) {
-  }
-
-  @Override
-  public void offBackgroundPage(Consumer<Page> handler) {
  }

  @Override
@@ -177,16 +154,6 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
    listeners.remove(EventType.PAGE, handler);
  }

-  @Override
-  public void onWebError(Consumer<WebError> handler) {
-    listeners.add(EventType.WEBERROR, handler);
-  }
-
-  @Override
-  public void offWebError(Consumer<WebError> handler) {
-    listeners.remove(EventType.WEBERROR, handler);
-  }
-
  @Override
  public void onRequest(Consumer<Request> handler) {
    listeners.add(EventType.REQUEST, handler);
@@ -227,11 +194,6 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
    listeners.remove(EventType.RESPONSE, handler);
  }

-  @Override
-  public ClockImpl clock() {
-    return clock;
-  }
-
  private <T> T waitForEventWithTimeout(EventType eventType, Runnable code, Predicate<T> predicate, Double timeout) {
    List<Waitable<T>> waitables = new ArrayList<>();
    waitables.add(new WaitableEvent<>(listeners, eventType, predicate));
@@ -256,7 +218,7 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
  public CDPSession newCDPSession(Page page) {
    JsonObject params = new JsonObject();
    params.add("page", ((PageImpl) page).toProtocolRef());
-    JsonObject result = sendMessage("newCDPSession", params, NO_TIMEOUT).getAsJsonObject();
+    JsonObject result = sendMessage("newCDPSession", params).getAsJsonObject();
    return connection.getExistingObject(result.getAsJsonObject("session").get("guid").getAsString());
  }

@@ -264,23 +226,27 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
  public CDPSession newCDPSession(Frame frame) {
    JsonObject params = new JsonObject();
    params.add("frame", ((FrameImpl) frame).toProtocolRef());
-    JsonObject result = sendMessage("newCDPSession", params, NO_TIMEOUT).getAsJsonObject();
+    JsonObject result = sendMessage("newCDPSession", params).getAsJsonObject();
    return connection.getExistingObject(result.getAsJsonObject("session").get("guid").getAsString());
  }

  @Override
-  public void close(CloseOptions options) {
-    if (!closingOrClosed) {
-      closingOrClosed = true;
-      if (options == null) {
-        options = new CloseOptions();
-      }
-      closeReason = options.reason;
-      request.dispose(convertType(options, APIRequestContext.DisposeOptions.class));
+  public void close() {
+    withLogging("BrowserContext.close", () -> closeImpl());
+  }
+
+  @Override
+  public List<Cookie> cookies(String url) {
+    return cookies(url == null ? new ArrayList<>() : Collections.singletonList(url));
+  }
+
+  private void closeImpl() {
+    if (!closeWasCalled) {
+      closeWasCalled = true;
      for (Map.Entry<String, HarRecorder> entry : harRecorders.entrySet()) {
        JsonObject params = new JsonObject();
        params.addProperty("harId", entry.getKey());
-        JsonObject json = sendMessage("harExport", params, NO_TIMEOUT).getAsJsonObject();
+        JsonObject json = sendMessage("harExport", params).getAsJsonObject();
        ArtifactImpl artifact = connection.getExistingObject(json.getAsJsonObject("artifact").get("guid").getAsString());
        // Server side will compress artifact if content is attach or if file is .zip.
        HarRecorder harParams = entry.getValue();
@@ -292,51 +258,47 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
          JsonObject unzipParams = new JsonObject();
          unzipParams.addProperty("zipFile", tmpPath);
          unzipParams.addProperty("harFile", harParams.path.toString());
-          connection.localUtils.sendMessage("harUnzip", unzipParams, NO_TIMEOUT);
+          connection.localUtils.sendMessage("harUnzip", unzipParams);
        } else {
          artifact.saveAs(harParams.path);
        }
        artifact.delete();
      }
-      JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-      sendMessage("close", params, NO_TIMEOUT);
+      sendMessage("close");
    }
    runUntil(() -> {}, closePromise);
  }

-  @Override
-  public List<Cookie> cookies(String url) {
-    return cookies(url == null ? new ArrayList<>() : Collections.singletonList(url));
-  }
-
-
  @Override
  public void addCookies(List<Cookie> cookies) {
-    JsonObject params = new JsonObject();
-    params.add("cookies", gson().toJsonTree(cookies));
-    sendMessage("addCookies", params, NO_TIMEOUT);
+    withLogging("BrowserContext.addCookies", () -> {
+      JsonObject params = new JsonObject();
+      params.add("cookies", gson().toJsonTree(cookies));
+      sendMessage("addCookies", params);
+    });
  }

  @Override
  public void addInitScript(String script) {
-    JsonObject params = new JsonObject();
-    params.addProperty("source", script);
-    sendMessage("addInitScript", params, NO_TIMEOUT);
+    withLogging("BrowserContext.addInitScript", () -> addInitScriptImpl(script));
  }

  @Override
  public void addInitScript(Path path) {
-    try {
-      byte[] bytes = readAllBytes(path);
-      addInitScript(new String(bytes, UTF_8));
-    } catch (IOException e) {
-      throw new PlaywrightException("Failed to read script from file", e);
-    }
+    withLogging("BrowserContext.addInitScript", () -> {
+      try {
+        byte[] bytes = readAllBytes(path);
+        addInitScriptImpl(new String(bytes, UTF_8));
+      } catch (IOException e) {
+        throw new PlaywrightException("Failed to read script from file", e);
+      }
+    });
  }

-  @Override
-  public List<Page> backgroundPages() {
-    return Collections.emptyList();
+  private void addInitScriptImpl(String script) {
+    JsonObject params = new JsonObject();
+    params.addProperty("source", script);
+    sendMessage("addInitScript", params);
  }

  @Override
@@ -345,47 +307,34 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
  }

  @Override
-  public void clearCookies(ClearCookiesOptions options) {
-    if (options == null) {
-      options = new ClearCookiesOptions();
-    }
-    JsonObject params = new JsonObject();
-    setStringOrRegex(params, "name", options.name);
-    setStringOrRegex(params, "domain", options.domain);
-    setStringOrRegex(params, "path", options.path);
-    sendMessage("clearCookies", params, NO_TIMEOUT);
-  }
-
-  private static void setStringOrRegex(JsonObject params, String name, Object value) {
-    if (value instanceof String) {
-      params.addProperty(name, (String) value);
-    } else if (value instanceof Pattern) {
-      Pattern pattern = (Pattern) value;
-      params.addProperty(name + "RegexSource", pattern.pattern());
-      params.addProperty(name + "RegexFlags", toJsRegexFlags(pattern));
-    }
+  public void clearCookies() {
+    withLogging("BrowserContext.clearCookies", () -> sendMessage("clearCookies"));
  }

  @Override
  public void clearPermissions() {
-    sendMessage("clearPermissions");
+    withLogging("BrowserContext.clearPermissions", () -> sendMessage("clearPermissions"));
  }

  @Override
  public List<Cookie> cookies(List<String> urls) {
+    return withLogging("BrowserContext.cookies", () -> cookiesImpl(urls));
+  }
+
+  private List<Cookie> cookiesImpl(List<String> urls) {
    JsonObject params = new JsonObject();
    if (urls == null) {
      urls = new ArrayList<>();
    }
    params.add("urls", gson().toJsonTree(urls));
-    JsonObject json = sendMessage("cookies", params, NO_TIMEOUT).getAsJsonObject();
+    JsonObject json = sendMessage("cookies", params).getAsJsonObject();
    Cookie[] cookies = gson().fromJson(json.getAsJsonArray("cookies"), Cookie[].class);
    return asList(cookies);
  }

  @Override
  public void exposeBinding(String name, BindingCallback playwrightBinding, ExposeBindingOptions options) {
-    exposeBindingImpl(name, playwrightBinding, options);
+    withLogging("BrowserContext.exposeBinding", () -> exposeBindingImpl(name, playwrightBinding, options));
  }

  private void exposeBindingImpl(String name, BindingCallback playwrightBinding, ExposeBindingOptions options) {
@@ -404,16 +353,21 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
    if (options != null && options.handle != null && options.handle) {
      params.addProperty("needsHandle", true);
    }
-    sendMessage("exposeBinding", params, NO_TIMEOUT);
+    sendMessage("exposeBinding", params);
  }

  @Override
  public void exposeFunction(String name, FunctionCallback playwrightFunction) {
-    exposeBindingImpl(name, (BindingCallback.Source source, Object... args) -> playwrightFunction.call(args), null);
+    withLogging("BrowserContext.exposeFunction",
+      () -> exposeBindingImpl(name, (BindingCallback.Source source, Object... args) -> playwrightFunction.call(args), null));
  }

  @Override
  public void grantPermissions(List<String> permissions, GrantPermissionsOptions options) {
+    withLogging("BrowserContext.grantPermissions", () -> grantPermissionsImpl(permissions, options));
+  }
+
+  private void grantPermissionsImpl(List<String> permissions, GrantPermissionsOptions options) {
    if (options == null) {
      options = new GrantPermissionsOptions();
    }
@@ -422,11 +376,15 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    params.add("permissions", gson().toJsonTree(permissions));
-    sendMessage("grantPermissions", params, NO_TIMEOUT);
+    sendMessage("grantPermissions", params);
  }

  @Override
  public PageImpl newPage() {
+    return withLogging("BrowserContext.newPage", () -> newPageImpl());
+  }
+
+  private PageImpl newPageImpl() {
    if (ownerPage != null) {
      throw new PlaywrightException("Please use browser.newContext()");
    }
@@ -446,7 +404,7 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {

  @Override
  public void route(String url, Consumer<Route> handler, RouteOptions options) {
-    route(UrlMatcher.forGlob(baseUrl(), url, this.connection.localUtils, false), handler, options);
+    route(new UrlMatcher(baseUrl, url), handler, options);
  }

  @Override
@@ -465,118 +423,116 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
      options = new RouteFromHAROptions();
    }
    if (options.update != null && options.update) {
-      recordIntoHar(null, har, options, null);
+      recordIntoHar(null, har, options);
      return;
    }
-    UrlMatcher matcher = UrlMatcher.forOneOf(baseUrl(), options.url, this.connection.localUtils, false);
+    UrlMatcher matcher = UrlMatcher.forOneOf(baseUrl, options.url);
    HARRouter harRouter = new HARRouter(connection.localUtils, har, options.notFound);
    onClose(context -> harRouter.dispose());
    route(matcher, route -> harRouter.handle(route), null);
  }

  private void route(UrlMatcher matcher, Consumer<Route> handler, RouteOptions options) {
-    routes.add(matcher, handler, options == null ? null : options.times);
-    updateInterceptionPatterns();
+    withLogging("BrowserContext.route", () -> {
+      routes.add(matcher, handler, options == null ? null : options.times);
+      updateInterceptionPatterns();
+    });
  }

-  @Override
-  public void routeWebSocket(String url, Consumer<WebSocketRoute> handler) {
-    routeWebSocketImpl(UrlMatcher.forGlob(baseUrl(), url, this.connection.localUtils, true), handler);
-  }
-
-  @Override
-  public void routeWebSocket(Pattern pattern, Consumer<WebSocketRoute> handler) {
-    routeWebSocketImpl(new UrlMatcher(pattern), handler);
-  }
-
-  @Override
-  public void routeWebSocket(Predicate<String> predicate, Consumer<WebSocketRoute> handler) {
-    routeWebSocketImpl(new UrlMatcher(predicate), handler);
-  }
-
-  private void routeWebSocketImpl(UrlMatcher matcher, Consumer<WebSocketRoute> handler) {
-    webSocketRoutes.add(matcher, handler);
-    updateWebSocketInterceptionPatterns();
-  }
-
-  void recordIntoHar(PageImpl page, Path har, RouteFromHAROptions options, HarContentPolicy contentPolicy) {
-    if (contentPolicy == null) {
-      contentPolicy = Utils.convertType(options.updateContent, HarContentPolicy.class);
-    }
-    if (contentPolicy == null) {
-      contentPolicy = HarContentPolicy.ATTACH;
-    }
-
+  void recordIntoHar(PageImpl page, Path har, RouteFromHAROptions options) {
    JsonObject params = new JsonObject();
    if (page != null) {
      params.add("page", page.toProtocolRef());
    }
-    JsonObject recordHarArgs = new JsonObject();
-    recordHarArgs.addProperty("zip", har.toString().endsWith(".zip"));
-    recordHarArgs.addProperty("content", contentPolicy.name().toLowerCase());
-    recordHarArgs.addProperty("mode", (options.updateMode == null ? HarMode.MINIMAL : options.updateMode).name().toLowerCase());
-    addHarUrlFilter(recordHarArgs, options.url);
-
-    params.add("options", recordHarArgs);
-    JsonObject json = sendMessage("harStart", params, NO_TIMEOUT).getAsJsonObject();
+    JsonObject jsonOptions = new JsonObject();
+    jsonOptions.addProperty("path", har.toAbsolutePath().toString());
+    jsonOptions.addProperty("content", options.updateContent == null ?
+      HarContentPolicy.ATTACH.name().toLowerCase() :
+      options.updateContent.name().toLowerCase());
+    jsonOptions.addProperty("mode", options.updateMode == null ?
+      HarMode.MINIMAL.name().toLowerCase() :
+      options.updateMode.name().toLowerCase());
+    addHarUrlFilter(jsonOptions, options.url);
+    params.add("options", jsonOptions);
+    JsonObject json = sendMessage("harStart", params).getAsJsonObject();
    String harId = json.get("harId").getAsString();
-    harRecorders.put(harId, new HarRecorder(har, contentPolicy));
+    harRecorders.put(harId, new HarRecorder(har, HarContentPolicy.ATTACH));
  }

  @Override
  public void setDefaultNavigationTimeout(double timeout) {
-    timeoutSettings.setDefaultNavigationTimeout(timeout);
+    setDefaultNavigationTimeoutImpl(timeout);
+  }
+
+  void setDefaultNavigationTimeoutImpl(Double timeout) {
+    withLogging("BrowserContext.setDefaultNavigationTimeout", () -> {
+      timeoutSettings.setDefaultNavigationTimeout(timeout);
+      JsonObject params = new JsonObject();
+      params.addProperty("timeout", timeout);
+      sendMessage("setDefaultNavigationTimeoutNoReply", params);
+    });
  }

  @Override
  public void setDefaultTimeout(double timeout) {
-    timeoutSettings.setDefaultTimeout(timeout);
+    setDefaultTimeoutImpl(timeout);
+  }
+
+  void setDefaultTimeoutImpl(Double timeout) {
+    withLogging("BrowserContext.setDefaultTimeout", () -> {
+      timeoutSettings.setDefaultTimeout(timeout);
+      JsonObject params = new JsonObject();
+      params.addProperty("timeout", timeout);
+      sendMessage("setDefaultTimeoutNoReply", params);
+    });
  }

  @Override
  public void setExtraHTTPHeaders(Map<String, String> headers) {
-    JsonObject params = new JsonObject();
-    JsonArray jsonHeaders = new JsonArray();
-    for (Map.Entry<String, String> e : headers.entrySet()) {
-      JsonObject header = new JsonObject();
-      header.addProperty("name", e.getKey());
-      header.addProperty("value", e.getValue());
-      jsonHeaders.add(header);
-    }
-    params.add("headers", jsonHeaders);
-    sendMessage("setExtraHTTPHeaders", params, NO_TIMEOUT);
+    withLogging("BrowserContext.setExtraHTTPHeaders", () -> {
+      JsonObject params = new JsonObject();
+      JsonArray jsonHeaders = new JsonArray();
+      for (Map.Entry<String, String> e : headers.entrySet()) {
+        JsonObject header = new JsonObject();
+        header.addProperty("name", e.getKey());
+        header.addProperty("value", e.getValue());
+        jsonHeaders.add(header);
+      }
+      params.add("headers", jsonHeaders);
+      sendMessage("setExtraHTTPHeaders", params);
+    });
  }

  @Override
  public void setGeolocation(Geolocation geolocation) {
-    JsonObject params = new JsonObject();
-    if (geolocation != null) {
-      params.add("geolocation", gson().toJsonTree(geolocation));
-    }
-    sendMessage("setGeolocation", params, NO_TIMEOUT);
+    withLogging("BrowserContext.setGeolocation", () -> {
+      JsonObject params = new JsonObject();
+      if (geolocation != null) {
+        params.add("geolocation", gson().toJsonTree(geolocation));
+      }
+      sendMessage("setGeolocation", params);
+    });
  }

  @Override
  public void setOffline(boolean offline) {
-    JsonObject params = new JsonObject();
-    params.addProperty("offline", offline);
-    sendMessage("setOffline", params, NO_TIMEOUT);
+    withLogging("BrowserContext.setOffline", () -> {
+      JsonObject params = new JsonObject();
+      params.addProperty("offline", offline);
+      sendMessage("setOffline", params);
+    });
  }

  @Override
  public String storageState(StorageStateOptions options) {
-    if (options == null) {
-      options = new StorageStateOptions();
-    }
-    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    params.remove("path");
-    JsonElement json = sendMessage("storageState", params, NO_TIMEOUT);
-
-    String storageState = json.toString();
-    if (options.path != null) {
-      Utils.writeToFile(storageState.getBytes(StandardCharsets.UTF_8), options.path);
-    }
-    return storageState;
+    return withLogging("BrowserContext.storageState", () -> {
+      JsonElement json = sendMessage("storageState");
+      String storageState = json.toString();
+      if (options != null && options.path != null) {
+        Utils.writeToFile(storageState.getBytes(StandardCharsets.UTF_8), options.path);
+      }
+      return storageState;
+    });
  }

  @Override
@@ -584,15 +540,9 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
    return tracing;
  }

-  @Override
-  public void unrouteAll() {
-    routes.removeAll();
-    updateInterceptionPatterns();
-  }
-
  @Override
  public void unroute(String url, Consumer<Route> handler) {
-    unroute(UrlMatcher.forGlob(this.baseUrl(), url, this.connection.localUtils, false), handler);
+    unroute(new UrlMatcher(this.baseUrl, url), handler);
  }

  @Override
@@ -633,21 +583,19 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {

    @Override
    public R get() {
-      throw new TargetClosedError(effectiveCloseReason());
+      throw new PlaywrightException("Context closed");
    }
  }

  private void unroute(UrlMatcher matcher, Consumer<Route> handler) {
-    routes.remove(matcher, handler);
-    updateInterceptionPatterns();
+    withLogging("BrowserContext.unroute", () -> {
+      routes.remove(matcher, handler);
+      updateInterceptionPatterns();
+    });
  }

  private void updateInterceptionPatterns() {
-    sendMessage("setNetworkInterceptionPatterns", routes.interceptionPatterns(), NO_TIMEOUT);
-  }
-
-  private void updateWebSocketInterceptionPatterns() {
-    sendMessage("setWebSocketInterceptionPatterns", webSocketRoutes.interceptionPatterns(), NO_TIMEOUT);
+    sendMessage("setNetworkInterceptionPatterns", routes.interceptionPatterns());
  }

  void handleRoute(RouteImpl route) {
@@ -660,12 +608,6 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
    }
  }

-  void handleWebSocketRoute(WebSocketRouteImpl route) {
-    if (!webSocketRoutes.handle(route)) {
-      route.connectToServer();
-    }
-  }
-
  WaitableResult<JsonElement> pause() {
    return sendMessageAsync("pause", new JsonObject());
  }
@@ -703,11 +645,7 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
      }
    } else if ("route".equals(event)) {
      RouteImpl route = connection.getExistingObject(params.getAsJsonObject("route").get("guid").getAsString());
-      route.browserContext = this;
      handleRoute(route);
-    } else if ("webSocketRoute".equals(event)) {
-      WebSocketRouteImpl route = connection.getExistingObject(params.getAsJsonObject("webSocketRoute").get("guid").getAsString());
-      handleWebSocketRoute(route);
    } else if ("page".equals(event)) {
      PageImpl page = connection.getExistingObject(params.getAsJsonObject("page").get("guid").getAsString());
      pages.add(page);
@@ -722,19 +660,10 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
        bindingCall.call(binding);
      }
    } else if ("console".equals(event)) {
-      PageImpl page = null;
-      if (params.has("page")) {
-        page = connection.getExistingObject(params.getAsJsonObject("page").get("guid").getAsString());
-      }
-      WorkerImpl worker = null;
-      if (params.has("worker")) {
-        worker = connection.getExistingObject(params.getAsJsonObject("worker").get("guid").getAsString());
-      }
-      ConsoleMessageImpl message = new ConsoleMessageImpl(connection, params, page, worker);
+      String guid = params.getAsJsonObject("message").get("guid").getAsString();
+      ConsoleMessageImpl message = connection.getExistingObject(guid);
      listeners.notify(BrowserContextImpl.EventType.CONSOLE, message);
-      if (worker != null) {
-        worker.listeners.notify(WorkerImpl.EventType.CONSOLE, message);
-      }
+      PageImpl page = message.page();
      if (page != null) {
        page.listeners.notify(PageImpl.EventType.CONSOLE, message);
      }
@@ -781,79 +710,22 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
        PageImpl page = connection.getExistingObject(params.getAsJsonObject("page").get("guid").getAsString());
        page.listeners.notify(PageImpl.EventType.RESPONSE, response);
      }
-    } else if ("pageError".equals(event)) {
-      String errorStr = parseError(params.getAsJsonObject("error"));
-      PageImpl page;
-      try {
-        page = connection.getExistingObject(params.getAsJsonObject("page").get("guid").getAsString());
-      } catch (PlaywrightException e) {
-        page = null;
-      }
-      listeners.notify(BrowserContextImpl.EventType.WEBERROR, new WebErrorImpl(page, errorStr));
-      if (page != null) {
-        page.listeners.notify(PageImpl.EventType.PAGEERROR, errorStr);
-      }
    } else if ("close".equals(event)) {
      didClose();
    }
  }

  void didClose() {
-    closingOrClosed = true;
    if (browser != null) {
      browser.contexts.remove(this);
-      browser.browserType.playwright.selectors.contextsForSelectors.remove(this);
    }
    listeners.notify(EventType.CLOSE, this);
  }

-  WritableStream createTempFile(String name, long lastModifiedMs) {
+  WritableStream createTempFile(String name) {
    JsonObject params = new JsonObject();
    params.addProperty("name", name);
-    params.addProperty("lastModifiedMs", lastModifiedMs);
-    JsonObject json = sendMessage("createTempFile", params, NO_TIMEOUT).getAsJsonObject();
+    JsonObject json = sendMessage("createTempFile", params).getAsJsonObject();
    return connection.getExistingObject(json.getAsJsonObject("writableStream").get("guid").getAsString());
  }
-
-  protected void initializeHarFromOptions(Browser.NewContextOptions options) {
-    if (options.recordHarPath == null) {
-      if (options.recordHarOmitContent != null) {
-        throw new PlaywrightException("recordHarOmitContent is set but recordHarPath is null");
-      }
-      if (options.recordHarUrlFilter != null) {
-        throw new PlaywrightException("recordHarUrlFilter is set but recordHarPath is null");
-      }
-      if (options.recordHarMode != null) {
-        throw new PlaywrightException("recordHarMode is set but recordHarPath is null");
-      }
-      if (options.recordHarContent != null) {
-        throw new PlaywrightException("recordHarContent is set but recordHarPath is null");
-      }
-      return;
-    }
-
-    HarContentPolicy contentPolicy = options.recordHarContent;
-    if (contentPolicy == null && options.recordHarOmitContent != null && options.recordHarOmitContent == true) {
-      contentPolicy = HarContentPolicy.OMIT;
-    }
-    if (contentPolicy == null) {
-      contentPolicy = options.recordHarPath.endsWith(".zip") ? HarContentPolicy.ATTACH : HarContentPolicy.EMBED;
-    }
-    RouteFromHAROptions routeFromHAROptions = new RouteFromHAROptions();
-
-    if (options.recordHarUrlFilter instanceof String) {
-      routeFromHAROptions.setUrl((String) options.recordHarUrlFilter);
-    } else if (options.recordHarUrlFilter instanceof Pattern) {
-      routeFromHAROptions.setUrl((Pattern) options.recordHarUrlFilter);
-    }
-
-    if (options.recordHarMode != null) {
-      routeFromHAROptions.updateMode = options.recordHarMode;
-    } else {
-      routeFromHAROptions.updateMode = HarMode.FULL;
-    }
-    routeFromHAROptions.url = options.recordHarUrlFilter;
-
-    recordIntoHar(null, options.recordHarPath, routeFromHAROptions, contentPolicy);
-  }
 }
@@ -20,6 +20,7 @@ import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.microsoft.playwright.*;
+import com.microsoft.playwright.options.HarContentPolicy;

 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -28,8 +29,10 @@ import java.nio.file.Path;
 import java.util.*;
 import java.util.function.Consumer;

+import static com.microsoft.playwright.impl.Serialization.addHarUrlFilter;
 import static com.microsoft.playwright.impl.Serialization.gson;
 import static com.microsoft.playwright.impl.Utils.*;
+import static com.microsoft.playwright.impl.Utils.convertType;

 class BrowserImpl extends ChannelOwner implements Browser {
  final Set<BrowserContextImpl> contexts = new HashSet<>();
@@ -39,7 +42,6 @@ class BrowserImpl extends ChannelOwner implements Browser {
  BrowserTypeImpl browserType;
  BrowserType.LaunchOptions launchOptions;
  private Path tracePath;
-  String closeReason;

  enum EventType {
    DISCONNECTED,
@@ -65,11 +67,11 @@ class BrowserImpl extends ChannelOwner implements Browser {
  }

  @Override
-  public void close(CloseOptions options) {
-    if (options == null) {
-      options = new CloseOptions();
-    }
-    closeReason = options.reason;
+  public void close() {
+    withLogging("Browser.close", () -> closeImpl());
+  }
+
+  private void closeImpl() {
    if (isConnectedOverWebSocket) {
      try {
        connection.close();
@@ -110,20 +112,16 @@ class BrowserImpl extends ChannelOwner implements Browser {

  @Override
  public BrowserContextImpl newContext(NewContextOptions options) {
+    return withLogging("Browser.newContext", () -> newContextImpl(options));
+  }
+
+  private BrowserContextImpl newContextImpl(NewContextOptions options) {
    if (options == null) {
      options = new NewContextOptions();
    } else {
      // Make a copy so that we can nullify some fields below.
      options = convertType(options, NewContextOptions.class);
    }
-
-    NewContextOptions harOptions = Utils.clone(options);
-    options.recordHarContent = null;
-    options.recordHarMode = null;
-    options.recordHarPath = null;
-    options.recordHarOmitContent = null;
-    options.recordHarUrlFilter = null;
-
    if (options.storageStatePath != null) {
      try {
        byte[] bytes = Files.readAllBytes(options.storageStatePath);
@@ -138,13 +136,54 @@ class BrowserImpl extends ChannelOwner implements Browser {
      storageState = new Gson().fromJson(options.storageState, JsonObject.class);
      options.storageState = null;
    }
+    JsonObject recordHar = null;
+    Path recordHarPath = options.recordHarPath;
+    HarContentPolicy harContentPolicy = null;
+    if (options.recordHarPath != null) {
+      recordHar = new JsonObject();
+      recordHar.addProperty("path", options.recordHarPath.toString());
+      if (options.recordHarContent != null) {
+        harContentPolicy = options.recordHarContent;
+      } else if (options.recordHarOmitContent != null && options.recordHarOmitContent) {
+        harContentPolicy = HarContentPolicy.OMIT;
+      }
+      if (harContentPolicy != null) {
+        recordHar.addProperty("content", harContentPolicy.name().toLowerCase());
+      }
+      if (options.recordHarMode != null) {
+        recordHar.addProperty("mode", options.recordHarMode.name().toLowerCase());
+      }
+      addHarUrlFilter(recordHar, options.recordHarUrlFilter);
+      options.recordHarPath = null;
+      options.recordHarMode = null;
+      options.recordHarOmitContent = null;
+      options.recordHarContent = null;
+      options.recordHarUrlFilter = null;
+    } else {
+      if (options.recordHarOmitContent != null) {
+        throw new PlaywrightException("recordHarOmitContent is set but recordHarPath is null");
+      }
+      if (options.recordHarUrlFilter != null) {
+        throw new PlaywrightException("recordHarUrlFilter is set but recordHarPath is null");
+      }
+      if (options.recordHarMode != null) {
+        throw new PlaywrightException("recordHarMode is set but recordHarPath is null");
+      }
+      if (options.recordHarContent != null) {
+        throw new PlaywrightException("recordHarContent is set but recordHarPath is null");
+      }
+    }
+
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    if (storageState != null) {
      params.add("storageState", storageState);
    }
+    if (recordHar != null) {
+      params.add("recordHar", recordHar);
+    }
    if (options.recordVideoDir != null) {
      JsonObject recordVideo = new JsonObject();
-      recordVideo.addProperty("dir", options.recordVideoDir.toAbsolutePath().toString());
+      recordVideo.addProperty("dir", options.recordVideoDir.toString());
      if (options.recordVideoSize != null) {
        recordVideo.add("size", gson().toJsonTree(options.recordVideoSize));
      }
@@ -164,26 +203,31 @@ class BrowserImpl extends ChannelOwner implements Browser {
        params.addProperty("noDefaultViewport", true);
      }
    }
-    addToProtocol(params, options.clientCertificates);
-    params.remove("acceptDownloads");
-    if (options.acceptDownloads != null) {
-      params.addProperty("acceptDownloads", options.acceptDownloads ? "accept" : "deny");
-    }
-    params.add("selectorEngines", gson().toJsonTree(browserType.playwright.selectors.selectorEngines));
-    params.addProperty("testIdAttributeName", browserType.playwright.selectors.testIdAttributeName);
-    JsonElement result = sendMessage("newContext", params, NO_TIMEOUT);
+    JsonElement result = sendMessage("newContext", params);
    BrowserContextImpl context = connection.getExistingObject(result.getAsJsonObject().getAsJsonObject("context").get("guid").getAsString());
-    context.initializeHarFromOptions(harOptions);
+    context.videosDir = options.recordVideoDir;
+    if (options.baseURL != null) {
+      context.setBaseUrl(options.baseURL);
+    }
+    context.setRecordHar(recordHarPath, harContentPolicy);
+    if (launchOptions != null) {
+      context.tracing().setTracesDir(launchOptions.tracesDir);
+    }
+    contexts.add(context);
    return context;
  }

  @Override
  public Page newPage(NewPageOptions options) {
-    return withTitle("Create Page", () -> newPageImpl(options));
+    return withLogging("Browser.newPage", () -> newPageImpl(options));
  }

  @Override
  public void startTracing(Page page, StartTracingOptions options) {
+    withLogging("Browser.startTracing", () -> startTracingImpl(page, options));
+  }
+
+  private void startTracingImpl(Page page, StartTracingOptions options) {
    if (options == null) {
      options = new StartTracingOptions();
    }
@@ -192,11 +236,15 @@ class BrowserImpl extends ChannelOwner implements Browser {
    if (page != null) {
      params.add("page", ((PageImpl) page).toProtocolRef());
    }
-    sendMessage("startTracing", params, NO_TIMEOUT);
+    sendMessage("startTracing", params);
  }

  @Override
  public byte[] stopTracing() {
+    return withLogging("Browser.stopTracing", () -> stopTracingImpl());
+  }
+
+  private byte[] stopTracingImpl() {
    JsonObject json = sendMessage("stopTracing").getAsJsonObject();
    ArtifactImpl artifact = connection.getExistingObject(json.getAsJsonObject().getAsJsonObject("artifact").get("guid").getAsString());
    byte[] data = artifact.readAllBytes();
@@ -237,46 +285,18 @@ class BrowserImpl extends ChannelOwner implements Browser {

  @Override
  void handleEvent(String event, JsonObject parameters) {
-    switch (event) {
-      case "context":
-        didCreateContext(connection.getExistingObject(parameters.getAsJsonObject("context").get("guid").getAsString()));
-        break;
-      case "close":
-        didClose();
-        break;
+    if ("close".equals(event)) {
+      didClose();
    }
  }

  @Override
  public CDPSession newBrowserCDPSession() {
    JsonObject params = new JsonObject();
-    JsonObject result = sendMessage("newBrowserCDPSession", params, NO_TIMEOUT).getAsJsonObject();
+    JsonObject result = sendMessage("newBrowserCDPSession", params).getAsJsonObject();
    return connection.getExistingObject(result.getAsJsonObject("session").get("guid").getAsString());
  }

-  protected void connectToBrowserType(BrowserTypeImpl browserType, Path tracesDir){
-    // Note: when using connect(), `browserType` is different from `this.parent`.
-    // This is why browser type is not wired up in the constructor, and instead this separate method is called later on.
-    this.browserType = browserType;
-    this.tracePath = tracesDir;
-
-    for (BrowserContextImpl context : contexts) {
-      context.tracing().setTracesDir(tracesDir);
-      browserType.playwright.selectors.contextsForSelectors.add(context);
-    }
-  }
-
-  private void didCreateContext(BrowserContextImpl context) {
-    context.browser = this;
-    contexts.add(context);
-    // Note: when connecting to a browser, initial contexts arrive before `_browserType` is set,
-    // and will be configured later in `ConnectToBrowserType`.
-    if (browserType != null) {
-      context.tracing().setTracesDir(tracePath);
-      browserType.playwright.selectors.contextsForSelectors.add(context);
-    }
-  }
-
  private void didClose() {
    isConnected = false;
    listeners.notify(EventType.DISCONNECTED, this);
@@ -22,18 +22,18 @@ import com.google.gson.JsonObject;
 import com.microsoft.playwright.Browser;
 import com.microsoft.playwright.BrowserType;
 import com.microsoft.playwright.PlaywrightException;
+import com.microsoft.playwright.options.HarContentPolicy;

 import java.io.IOException;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.function.Consumer;

+import static com.microsoft.playwright.impl.Serialization.addHarUrlFilter;
 import static com.microsoft.playwright.impl.Serialization.gson;
-import static com.microsoft.playwright.impl.Utils.addToProtocol;
 import static com.microsoft.playwright.impl.Utils.convertType;

 class BrowserTypeImpl extends ChannelOwner implements BrowserType {
-  protected PlaywrightImpl playwright;
+  LocalUtils localUtils;

  BrowserTypeImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
    super(parent, type, guid, initializer);
@@ -41,11 +41,15 @@ class BrowserTypeImpl extends ChannelOwner implements BrowserType {

  @Override
  public BrowserImpl launch(LaunchOptions options) {
+    return withLogging("BrowserType.launch", () -> launchImpl(options));
+  }
+
+  private BrowserImpl launchImpl(LaunchOptions options) {
    if (options == null) {
      options = new LaunchOptions();
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    JsonElement result = sendMessage("launch", params, TimeoutSettings.launchTimeout(options.timeout));
+    JsonElement result = sendMessage("launch", params);
    BrowserImpl browser = connection.getExistingObject(result.getAsJsonObject().getAsJsonObject("browser").get("guid").getAsString());
    browser.browserType = this;
    browser.launchOptions = options;
@@ -54,6 +58,10 @@ class BrowserTypeImpl extends ChannelOwner implements BrowserType {

  @Override
  public Browser connect(String wsEndpoint, ConnectOptions options) {
+    return withLogging("BrowserType.connect", () -> connectImpl(wsEndpoint, options));
+  }
+
+  private Browser connectImpl(String wsEndpoint, ConnectOptions options) {
    if (options == null) {
      options = new ConnectOptions();
    }
@@ -76,12 +84,7 @@ class BrowserTypeImpl extends ChannelOwner implements BrowserType {
      headers.addProperty("x-playwright-browser", name());
    }

-    Double timeout = options.timeout;
-    if (timeout == null) {
-      timeout = 0.0;
-    }
-
-    JsonObject json = connection.localUtils().sendMessage("connect", params, timeout).getAsJsonObject();
+    JsonObject json = connection.localUtils().sendMessage("connect", params).getAsJsonObject();
    JsonPipe pipe = connection.getExistingObject(json.getAsJsonObject("pipe").get("guid").getAsString());
    Connection connection = new Connection(pipe, this.connection.env, this.connection.localUtils);
    PlaywrightImpl playwright = connection.initializePlaywright();
@@ -93,13 +96,14 @@ class BrowserTypeImpl extends ChannelOwner implements BrowserType {
      }
      throw new PlaywrightException("Malformed endpoint. Did you use launchServer method?");
    }
-    playwright.selectors = this.playwright.selectors;
+    playwright.initSharedSelectors(this.connection.getExistingObject("Playwright"));
    BrowserImpl browser = connection.getExistingObject(playwright.initializer.getAsJsonObject("preLaunchedBrowser").get("guid").getAsString());
    browser.isConnectedOverWebSocket = true;
-    browser.connectToBrowserType(this, null);
+    browser.browserType = this;
    Consumer<JsonPipe> connectionCloseListener = t -> browser.notifyRemoteClosed();
    pipe.onClose(connectionCloseListener);
    browser.onDisconnected(b -> {
+      playwright.unregisterSelectors();
      pipe.offClose(connectionCloseListener);
      try {
        connection.close();
@@ -115,16 +119,25 @@ class BrowserTypeImpl extends ChannelOwner implements BrowserType {
    if (!"chromium".equals(name())) {
      throw new PlaywrightException("Connecting over CDP is only supported in Chromium.");
    }
+    return withLogging("BrowserType.connectOverCDP", () -> connectOverCDPImpl(endpointURL, options));
+  }
+
+  private Browser connectOverCDPImpl(String endpointURL, ConnectOverCDPOptions options) {
    if (options == null) {
      options = new ConnectOverCDPOptions();
    }

    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    params.addProperty("endpointURL", endpointURL);
-    JsonObject json = sendMessage("connectOverCDP", params, TimeoutSettings.launchTimeout(options.timeout)).getAsJsonObject();
+    JsonObject json = sendMessage("connectOverCDP", params).getAsJsonObject();

    BrowserImpl browser = connection.getExistingObject(json.getAsJsonObject("browser").get("guid").getAsString());
-    browser.connectToBrowserType(this, null);
+    browser.browserType = this;
+    if (json.has("defaultContext")) {
+      String contextId = json.getAsJsonObject("defaultContext").get("guid").getAsString();
+      BrowserContextImpl defaultContext = connection.getExistingObject(contextId);
+      browser.contexts.add(defaultContext);
+    }
    return browser;
  }

@@ -134,29 +147,63 @@ class BrowserTypeImpl extends ChannelOwner implements BrowserType {

  @Override
  public BrowserContextImpl launchPersistentContext(Path userDataDir, LaunchPersistentContextOptions options) {
+    return withLogging("BrowserType.launchPersistentContext",
+      () -> launchPersistentContextImpl(userDataDir, options));
+  }
+
+  private BrowserContextImpl launchPersistentContextImpl(Path userDataDir, LaunchPersistentContextOptions options) {
    if (options == null) {
      options = new LaunchPersistentContextOptions();
    } else {
      // Make a copy so that we can nullify some fields below.
      options = convertType(options, LaunchPersistentContextOptions.class);
    }
-
-    Browser.NewContextOptions harOptions = convertType(options, Browser.NewContextOptions.class);
-    options.recordHarContent = null;
-    options.recordHarMode = null;
-    options.recordHarPath = null;
-    options.recordHarOmitContent = null;
-    options.recordHarUrlFilter = null;
+    JsonObject recordHar = null;
+    Path recordHarPath = options.recordHarPath;
+    HarContentPolicy harContentPolicy = null;
+    if (options.recordHarPath != null) {
+      recordHar = new JsonObject();
+      recordHar.addProperty("path", options.recordHarPath.toString());
+      if (options.recordHarContent != null) {
+        harContentPolicy = options.recordHarContent;
+      } else if (options.recordHarOmitContent != null && options.recordHarOmitContent) {
+        harContentPolicy = HarContentPolicy.OMIT;
+      }
+      if (harContentPolicy != null) {
+        recordHar.addProperty("content", harContentPolicy.name().toLowerCase());
+      }
+      if (options.recordHarMode != null) {
+        recordHar.addProperty("mode", options.recordHarMode.toString().toLowerCase());
+      }
+      addHarUrlFilter(recordHar, options.recordHarUrlFilter);
+      options.recordHarPath = null;
+      options.recordHarMode = null;
+      options.recordHarOmitContent = null;
+      options.recordHarContent = null;
+      options.recordHarUrlFilter = null;
+    } else {
+      if (options.recordHarOmitContent != null) {
+        throw new PlaywrightException("recordHarOmitContent is set but recordHarPath is null");
+      }
+      if (options.recordHarUrlFilter != null) {
+        throw new PlaywrightException("recordHarUrlFilter is set but recordHarPath is null");
+      }
+      if (options.recordHarMode != null) {
+        throw new PlaywrightException("recordHarMode is set but recordHarPath is null");
+      }
+      if (options.recordHarContent != null) {
+        throw new PlaywrightException("recordHarContent is set but recordHarPath is null");
+      }
+    }

    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    if (!userDataDir.isAbsolute() && !userDataDir.toString().isEmpty()) {
-      Path cwd = Paths.get("").toAbsolutePath();
-      userDataDir = cwd.resolve(userDataDir);
-    }
    params.addProperty("userDataDir", userDataDir.toString());
+    if (recordHar != null) {
+      params.add("recordHar", recordHar);
+    }
    if (options.recordVideoDir != null) {
      JsonObject recordVideo = new JsonObject();
-      recordVideo.addProperty("dir", options.recordVideoDir.toAbsolutePath().toString());
+      recordVideo.addProperty("dir", options.recordVideoDir.toString());
      if (options.recordVideoSize != null) {
        recordVideo.add("size", gson().toJsonTree(options.recordVideoSize));
      }
@@ -176,18 +223,13 @@ class BrowserTypeImpl extends ChannelOwner implements BrowserType {
        params.addProperty("noDefaultViewport", true);
      }
    }
-    addToProtocol(params, options.clientCertificates);
-    params.remove("acceptDownloads");
-    if (options.acceptDownloads != null) {
-      params.addProperty("acceptDownloads", options.acceptDownloads ? "accept" : "deny");
-    }
-    params.add("selectorEngines", gson().toJsonTree(playwright.selectors.selectorEngines));
-    params.addProperty("testIdAttributeName", playwright.selectors.testIdAttributeName);
-    JsonObject json = sendMessage("launchPersistentContext", params, TimeoutSettings.launchTimeout(options.timeout)).getAsJsonObject();
-    BrowserImpl browser = connection.getExistingObject(json.getAsJsonObject("browser").get("guid").getAsString());
-    browser.connectToBrowserType(this, options.tracesDir);
+    JsonObject json = sendMessage("launchPersistentContext", params).getAsJsonObject();
    BrowserContextImpl context = connection.getExistingObject(json.getAsJsonObject("context").get("guid").getAsString());
-    context.initializeHarFromOptions(harOptions);
+    context.videosDir = options.recordVideoDir;
+    if (options.baseURL != null) {
+      context.setBaseUrl(options.baseURL);
+    }
+    context.setRecordHar(recordHarPath, harContentPolicy);
    context.tracing().setTracesDir(options.tracesDir);
    return context;
  }
@@ -1,19 +1,3 @@
-/*
- * 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.impl;

 import com.google.gson.JsonElement;
@@ -35,10 +19,7 @@ public class CDPSessionImpl extends ChannelOwner implements CDPSession {
    super.handleEvent(event, parameters);
    if ("event".equals(event)) {
      String method = parameters.get("method").getAsString();
-      JsonObject params = null;
-      if (parameters.has("params")) {
-        params = parameters.get("params").getAsJsonObject();
-      }
+      JsonObject params = parameters.get("params").getAsJsonObject();
      listeners.notify(method, params);
    }
  }
@@ -18,11 +18,11 @@ package com.microsoft.playwright.impl;

 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
-import com.microsoft.playwright.PlaywrightException;

 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.function.BinaryOperator;
 import java.util.function.Function;
 import java.util.function.Supplier;

@@ -34,9 +34,6 @@ class ChannelOwner extends LoggingSupport {
  final String type;
  final String guid;
  final JsonObject initializer;
-  private boolean wasCollected;
-
-  static Double NO_TIMEOUT = null;

  protected ChannelOwner(ChannelOwner parent, String type, String guid, JsonObject initializer) {
    this(parent.connection, parent, type, guid, initializer);
@@ -60,16 +57,15 @@ class ChannelOwner extends LoggingSupport {
    }
  }

-  void disposeChannelOwner(boolean wasGarbageCollected) {
+  void disconnect() {
    // Clean up from parent and connection.
    if (parent != null) {
      parent.objects.remove(guid);
    }
    connection.unregisterObject(guid);
-    wasCollected = wasGarbageCollected;
    // Dispose all children.
    for (ChannelOwner child : new ArrayList<>(objects.values())) {
-      child.disposeChannelOwner(wasGarbageCollected);
+      child.disconnect();
    }
    objects.clear();
  }
@@ -84,51 +80,28 @@ class ChannelOwner extends LoggingSupport {
    return new WaitForEventLogger<>(this, apiName, code).get();
  }

-
-  void withTitle(String title, Runnable code) {
-    withTitle(title, () -> {
-      code.run();
-      return null;
-    });
-  }
-
-  <T> T withTitle(String title, Supplier<T> code) {
-    String previousTitle = connection.setTitle(title);
+  @Override
+  <T> T withLogging(String apiName, Supplier<T> code) {
+    String previousApiName = connection.setApiName(apiName);
    try {
-      return code.get();
+      return super.withLogging(apiName, code);
    } finally {
-      connection.setTitle(previousTitle);
+      connection.setApiName(previousApiName);
    }
  }

-  WaitableResult<JsonElement> sendMessageAsync(String method) {
-    return sendMessageAsync(method, new JsonObject());
-  }
-
  WaitableResult<JsonElement> sendMessageAsync(String method, JsonObject params) {
-    checkNotCollected();
    return connection.sendMessageAsync(guid, method, params);
  }

  JsonElement sendMessage(String method) {
-    return sendMessage(method, new JsonObject(), NO_TIMEOUT);
+    return sendMessage(method, new JsonObject());
  }

-  JsonElement sendMessage(String method, JsonObject params, Double timeout) {
-    checkNotCollected();
-    if (timeout != null) {
-      params.addProperty("timeout", timeout);
-    } else if (params.has("timeout")) {
-      throw new PlaywrightException("Internal error: timeout must be passed explicitly.");
-    }
+  JsonElement sendMessage(String method, JsonObject params) {
    return connection.sendMessage(guid, method, params);
  }

-  private void checkNotCollected() {
-    if (wasCollected)
-      throw new PlaywrightException("The object has been collected to prevent unbounded heap growth.");
-  }
-
  <T> T runUntil(Runnable code, Waitable<T> waitable) {
    try {
      code.run();
@@ -1,136 +0,0 @@
-package com.microsoft.playwright.impl;
-
-import com.google.gson.JsonObject;
-import com.microsoft.playwright.Clock;
-
-import java.util.Date;
-
-import static com.microsoft.playwright.impl.ChannelOwner.NO_TIMEOUT;
-
-class ClockImpl implements Clock {
-  private final ChannelOwner browserContext;
-
-  ClockImpl(BrowserContextImpl browserContext) {
-    this.browserContext = browserContext;
-  }
-
-  private void sendMessageWithLogging(String method, JsonObject params) {
-    String capitalizedMethod = method.substring(0, 1).toUpperCase() + method.substring(1);
-    browserContext.sendMessage("clock" + capitalizedMethod, params, NO_TIMEOUT);
-  }
-
-  @Override
-  public void fastForward(long ticks) {
-    JsonObject params = new JsonObject();
-    params.addProperty("ticksNumber", ticks);
-    sendMessageWithLogging("fastForward", params);
-  }
-
-  @Override
-  public void fastForward(String ticks) {
-    JsonObject params = new JsonObject();
-    params.addProperty("ticksString", ticks);
-    sendMessageWithLogging("fastForward", params);
-  }
-
-  @Override
-  public void install(InstallOptions options) {
-    JsonObject params = new JsonObject();
-    if (options != null) {
-      parseTime(options.time, params);
-    }
-    sendMessageWithLogging("install", params);
-  }
-
-  @Override
-  public void runFor(long ticks) {
-    JsonObject params = new JsonObject();
-    params.addProperty("ticksNumber", ticks);
-    sendMessageWithLogging("runFor", params);
-  }
-
-  @Override
-  public void runFor(String ticks) {
-    JsonObject params = new JsonObject();
-    params.addProperty("ticksString", ticks);
-    sendMessageWithLogging("runFor", params);
-  }
-
-  @Override
-  public void pauseAt(long time) {
-    JsonObject params = new JsonObject();
-    params.addProperty("timeNumber", time);
-    sendMessageWithLogging("pauseAt", params);
-  }
-
-  @Override
-  public void pauseAt(String time) {
-    JsonObject params = new JsonObject();
-    params.addProperty("timeString", time);
-    sendMessageWithLogging("pauseAt", params);
-  }
-
-  @Override
-  public void pauseAt(Date time) {
-    JsonObject params = new JsonObject();
-    params.addProperty("timeNumber", time.getTime());
-    sendMessageWithLogging("pauseAt", params);
-  }
-
-  @Override
-  public void resume() {
-    sendMessageWithLogging("resume", new JsonObject());
-  }
-
-  @Override
-  public void setFixedTime(long time) {
-    JsonObject params = new JsonObject();
-    params.addProperty("timeNumber", time);
-    sendMessageWithLogging("setFixedTime", params);
-  }
-
-  @Override
-  public void setFixedTime(String time) {
-    JsonObject params = new JsonObject();
-    params.addProperty("timeString", time);
-    sendMessageWithLogging("setFixedTime", params);
-  }
-
-  @Override
-  public void setFixedTime(Date time) {
-    JsonObject params = new JsonObject();
-    params.addProperty("timeNumber", time.getTime());
-    sendMessageWithLogging("setFixedTime", params);
-  }
-
-  @Override
-  public void setSystemTime(long time) {
-    JsonObject params = new JsonObject();
-    params.addProperty("timeNumber", time);
-    sendMessageWithLogging("setSystemTime", params);
-  }
-
-  @Override
-  public void setSystemTime(String time) {
-    JsonObject params = new JsonObject();
-    params.addProperty("timeString", time);
-    sendMessageWithLogging("setSystemTime", params);
-  }
-
-  @Override
-  public void setSystemTime(Date time) {
-    JsonObject params = new JsonObject();
-    params.addProperty("timeNumber", time.getTime());
-    sendMessageWithLogging("setSystemTime", params);
-  }
-
-  private static void parseTime(Object time, JsonObject params) {
-    if (time instanceof Long) {
-      params.addProperty("timeNumber", (Long) time);
-    } else if (time instanceof Date) {
-      params.addProperty("timeNumber", ((Date) time).getTime());
-    } else if (time instanceof String) {
-      params.addProperty("timeString", (String) time);
-    }
-  }
-}
@@ -19,14 +19,13 @@ import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
+import com.microsoft.playwright.Playwright;
 import com.microsoft.playwright.PlaywrightException;
 import com.microsoft.playwright.TimeoutError;

 import java.io.IOException;
 import java.time.Duration;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;

 import static com.microsoft.playwright.impl.Serialization.gson;
@@ -39,7 +38,6 @@ class Message {
  JsonObject params;
  JsonElement result;
  SerializedError error;
-  JsonArray log;

  @Override
  public String toString() {
@@ -63,15 +61,13 @@ public class Connection {
  private int lastId = 0;
  private final StackTraceCollector stackTraceCollector;
  private final Map<Integer, WaitableResult<JsonElement>> callbacks = new HashMap<>();
-  private String title;
-  private boolean titleReported = false;
+  private String apiName;
  private static final boolean isLogging;
  static {
    String debug = System.getenv("DEBUG");
    isLogging = (debug != null) && debug.contains("pw:channel");
  }
  LocalUtils localUtils;
-  PlaywrightImpl playwright;
  final Map<String, String> env;
  private int tracingCount;

@@ -80,10 +76,10 @@ public class Connection {
      super(connection, "Root", "");
    }

-    PlaywrightImpl initialize() {
+    Playwright initialize() {
      JsonObject params = new JsonObject();
      params.addProperty("sdkLanguage", "java");
-      JsonElement result = sendMessage("initialize", params.getAsJsonObject(), NO_TIMEOUT);
+      JsonElement result = sendMessage("initialize", params.getAsJsonObject());
      return this.connection.getExistingObject(result.getAsJsonObject().getAsJsonObject("playwright").get("guid").getAsString());
    }
  }
@@ -116,10 +112,9 @@ public class Connection {
    }
  }

-  String setTitle(String newTitle) {
-    String previous = title;
-    titleReported = false;
-    title = newTitle;
+  String setApiName(String name) {
+    String previous = apiName;
+    apiName = name;
    return previous;
  }

@@ -147,14 +142,12 @@ public class Connection {
    JsonObject metadata = new JsonObject();
    metadata.addProperty("wallTime", currentTimeMillis());
    JsonArray stack = null;
-    if (titleReported) {
+    if (apiName == null) {
      metadata.addProperty("internal", true);
    } else {
-      if (title != null) {
-        metadata.addProperty("title", title);
-        // All but first message in a custom-titled API call are considered internal and will be hidden from the inspector.
-        titleReported = true;
-      }
+      metadata.addProperty("apiName", apiName);
+      // All but first message in an API call are considered internal and will be hidden from the inspector.
+      apiName = null;
      if (stackTraceCollector != null) {
        stack = stackTraceCollector.currentStackTrace();
        if (!stack.isEmpty()) {
@@ -181,8 +174,7 @@ public class Connection {
  }

  public PlaywrightImpl initializePlaywright() {
-    playwright = root.initialize();
-    return playwright;
+    return (PlaywrightImpl) this.root.initialize();
  }

  LocalUtils localUtils() {
@@ -214,30 +206,6 @@ public class Connection {
    dispatch(messageObj);
  }

-  private static String formatCallLog(JsonArray log) {
-    if (log == null) {
-      return "";
-    }
-    boolean allEmpty = true;
-    for (JsonElement e: log) {
-      if (!e.getAsString().isEmpty()) {
-        allEmpty = false;
-        break;
-      }
-    }
-    if (allEmpty) {
-      return "";
-    }
-    List<String> lines = new ArrayList<>();
-    lines.add("");
-    lines.add("Call log:");
-    for (JsonElement e: log) {
-      lines.add("- " + e.getAsString());
-    }
-    lines.add("");
-    return String.join("\n", lines);
-  }
-
  private void dispatch(Message message) {
 //    System.out.println("Message: " + message.method + " " + message.id);
    if (message.id != 0) {
@@ -250,16 +218,12 @@ public class Connection {
      if (message.error == null) {
        callback.complete(message.result);
      } else {
-        String callLog = formatCallLog(message.log);
        if (message.error.error == null) {
-          callback.completeExceptionally(new PlaywrightException(message.error + callLog));
+          callback.completeExceptionally(new PlaywrightException(message.error.toString()));
        } else if ("TimeoutError".equals(message.error.error.name)) {
-          callback.completeExceptionally(new TimeoutError(message.error.error + callLog));
-        } else if ("TargetClosedError".equals(message.error.error.name)) {
-          callback.completeExceptionally(new TargetClosedError(message.error.error + callLog));
-
+          callback.completeExceptionally(new TimeoutError(message.error.error.toString()));
        } else {
-          callback.completeExceptionally(new DriverException(message.error.error + callLog));
+          callback.completeExceptionally(new DriverException(message.error.error));
        }
      }
      return;
@@ -288,8 +252,7 @@ public class Connection {
      return;
    }
    if (message.method.equals("__dispose__")) {
-      boolean wasCollected = message.params.has("reason") && "gc".equals(message.params.get("reason").getAsString());
-      object.disposeChannelOwner(wasCollected);
+      object.disconnect();
      return;
    }
    object.handleEvent(message.method, message.params);
@@ -330,6 +293,9 @@ public class Connection {
      case "BrowserContext":
        result = new BrowserContextImpl(parent, type, guid, initializer);
        break;
+      case "ConsoleMessage":
+        result = new ConsoleMessageImpl(parent, type, guid, initializer);
+        break;
      case "Dialog":
        result = new DialogImpl(parent, type, guid, initializer);
        break;
@@ -376,6 +342,9 @@ public class Connection {
      case "Stream":
        result = new Stream(parent, type, guid, initializer);
        break;
+      case "Selectors":
+        result = new SelectorsImpl(parent, type, guid, initializer);
+        break;
      case "SocksSupport":
        break;
      case "Tracing":
@@ -384,9 +353,6 @@ public class Connection {
      case "WebSocket":
        result = new WebSocketImpl(parent, type, guid, initializer);
        break;
-      case "WebSocketRoute":
-        result = new WebSocketRouteImpl(parent, type, guid, initializer);
-        break;
      case "Worker":
        result = new WorkerImpl(parent, type, guid, initializer);
        break;
@@ -20,33 +20,30 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.microsoft.playwright.ConsoleMessage;
 import com.microsoft.playwright.JSHandle;
-import com.microsoft.playwright.Worker;
+import com.microsoft.playwright.Page;

 import java.util.ArrayList;
 import java.util.List;

-public class ConsoleMessageImpl implements ConsoleMessage {
-  private final Connection connection;
-  private final PageImpl page;
-  private final WorkerImpl worker;
-  private final JsonObject initializer;
+import static com.microsoft.playwright.impl.Serialization.gson;

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

  public String type() {
    return initializer.get("type").getAsString();
  }

-  @Override
-  public Worker worker() {
-    return worker;
-  }
-
  public String text() {
    return initializer.get("text").getAsString();
  }
@@ -34,16 +34,18 @@ class DialogImpl extends ChannelOwner implements Dialog {

  @Override
  public void accept(String promptText) {
-    JsonObject params = new JsonObject();
-    if (promptText != null) {
-      params.addProperty("promptText", promptText);
-    }
-    sendMessage("accept", params, NO_TIMEOUT);
+    withLogging("Dialog.accept", () -> {
+      JsonObject params = new JsonObject();
+      if (promptText != null) {
+        params.addProperty("promptText", promptText);
+      }
+      sendMessage("accept", params);
+    });
  }

  @Override
  public void dismiss() {
-    sendMessage("dismiss");
+    withLogging("Dialog.dismiss", () -> sendMessage("dismiss"));
  }

  @Override
@@ -46,22 +46,22 @@ class DownloadImpl implements Download {

  @Override
  public void cancel() {
-    artifact.cancel();
+    page.withLogging("Download.cancel", () -> artifact.cancel());
  }

  @Override
  public InputStream createReadStream() {
-    return artifact.createReadStream();
+    return page.withLogging("Download.createReadStream", () -> artifact.createReadStream());
  }

  @Override
  public void delete() {
-    artifact.delete();
+    page.withLogging("Download.delete", () -> artifact.delete());
  }

  @Override
  public String failure() {
-    return artifact.failure();
+    return page.withLogging("Download.failure", () -> artifact.failure());
  }

  @Override
@@ -71,11 +71,11 @@ class DownloadImpl implements Download {

  @Override
  public Path path() {
-    return artifact.pathAfterFinished();
+    return page.withLogging("Download.path", () -> artifact.pathAfterFinished());
  }

  @Override
  public void saveAs(Path path) {
-    artifact.saveAs(path);
+    page.withLogging("Download.saveAs", () -> artifact.saveAs(path));
  }
 }
@@ -22,7 +22,7 @@ import java.io.PrintStream;
 import java.io.PrintWriter;

 class DriverException extends PlaywrightException {
-  DriverException(String error) {
-    super(error);
+  DriverException(SerializedError.Error error) {
+    super(error.toString());
  }
 }
@@ -21,30 +21,26 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.microsoft.playwright.ElementHandle;
 import com.microsoft.playwright.Frame;
-import com.microsoft.playwright.PlaywrightException;
 import com.microsoft.playwright.options.BoundingBox;
 import com.microsoft.playwright.options.ElementState;
 import com.microsoft.playwright.options.FilePayload;
 import com.microsoft.playwright.options.SelectOption;

-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Base64;
 import java.util.List;

 import static com.microsoft.playwright.impl.Serialization.*;
 import static com.microsoft.playwright.impl.Utils.*;
-import static com.microsoft.playwright.impl.Utils.addFilePathUploadParams;
+import static com.microsoft.playwright.impl.Utils.addLargeFileUploadParams;
 import static com.microsoft.playwright.options.ScreenshotType.JPEG;
 import static com.microsoft.playwright.options.ScreenshotType.PNG;

 public class ElementHandleImpl extends JSHandleImpl implements ElementHandle {
-  private final FrameImpl frame;
-
  ElementHandleImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
    super(parent, type, guid, initializer);
-    this.frame = (FrameImpl)parent;
  }

  @Override
@@ -54,83 +50,105 @@ public class ElementHandleImpl extends JSHandleImpl implements ElementHandle {

  @Override
  public ElementHandle querySelector(String selector) {
-    JsonObject params = new JsonObject();
-    params.addProperty("selector", selector);
-    JsonElement json = sendMessage("querySelector", params, NO_TIMEOUT);
-    JsonObject element = json.getAsJsonObject().getAsJsonObject("element");
-    if (element == null) {
-      return null;
-    }
-    return connection.getExistingObject(element.get("guid").getAsString());
+    return withLogging("ElementHandle.querySelector", () -> {
+      JsonObject params = new JsonObject();
+      params.addProperty("selector", selector);
+      JsonElement json = sendMessage("querySelector", params);
+      JsonObject element = json.getAsJsonObject().getAsJsonObject("element");
+      if (element == null) {
+        return null;
+      }
+      return connection.getExistingObject(element.get("guid").getAsString());
+    });
  }

  @Override
  public List<ElementHandle> querySelectorAll(String selector) {
-    JsonObject params = new JsonObject();
-    params.addProperty("selector", selector);
-    JsonElement json = sendMessage("querySelectorAll", params, NO_TIMEOUT);
-    JsonArray elements = json.getAsJsonObject().getAsJsonArray("elements");
-    if (elements == null) {
-      return null;
-    }
-    List<ElementHandle> handles = new ArrayList<>();
-    for (JsonElement item : elements) {
-      handles.add(connection.getExistingObject(item.getAsJsonObject().get("guid").getAsString()));
-    }
-    return handles;
+    return withLogging("ElementHandle.<", () -> {
+      JsonObject params = new JsonObject();
+      params.addProperty("selector", selector);
+      JsonElement json = sendMessage("querySelectorAll", params);
+      JsonArray elements = json.getAsJsonObject().getAsJsonArray("elements");
+      if (elements == null) {
+        return null;
+      }
+      List<ElementHandle> handles = new ArrayList<>();
+      for (JsonElement item : elements) {
+        handles.add(connection.getExistingObject(item.getAsJsonObject().get("guid").getAsString()));
+      }
+      return handles;
+    });
  }

  @Override
  public Object evalOnSelector(String selector, String pageFunction, Object arg) {
-    JsonObject params = new JsonObject();
-    params.addProperty("selector", selector);
-    params.addProperty("expression", pageFunction);
-    params.add("arg", gson().toJsonTree(serializeArgument(arg)));
-    JsonElement json = sendMessage("evalOnSelector", params, NO_TIMEOUT);
-    SerializedValue value = gson().fromJson(json.getAsJsonObject().get("value"), SerializedValue.class);
-    return deserialize(value);
+    return withLogging("ElementHandle.evalOnSelector", () -> {
+      JsonObject params = new JsonObject();
+      params.addProperty("selector", selector);
+      params.addProperty("expression", pageFunction);
+      params.add("arg", gson().toJsonTree(serializeArgument(arg)));
+      JsonElement json = sendMessage("evalOnSelector", params);
+      SerializedValue value = gson().fromJson(json.getAsJsonObject().get("value"), SerializedValue.class);
+      return deserialize(value);
+    });
  }

  @Override
  public Object evalOnSelectorAll(String selector, String pageFunction, Object arg) {
-    JsonObject params = new JsonObject();
-    params.addProperty("selector", selector);
-    params.addProperty("expression", pageFunction);
-    params.add("arg", gson().toJsonTree(serializeArgument(arg)));
-    JsonElement json = sendMessage("evalOnSelectorAll", params, NO_TIMEOUT);
-    SerializedValue value = gson().fromJson(json.getAsJsonObject().get("value"), SerializedValue.class);
-    return deserialize(value);
+    return withLogging("ElementHandle.evalOnSelectorAll", () -> {
+      JsonObject params = new JsonObject();
+      params.addProperty("selector", selector);
+      params.addProperty("expression", pageFunction);
+      params.add("arg", gson().toJsonTree(serializeArgument(arg)));
+      JsonElement json = sendMessage("evalOnSelectorAll", params);
+      SerializedValue value = gson().fromJson(json.getAsJsonObject().get("value"), SerializedValue.class);
+      return deserialize(value);
+    });
  }

  @Override
  public BoundingBox boundingBox() {
-    JsonObject json = sendMessage("boundingBox").getAsJsonObject();
-    if (!json.has("value")) {
-      return null;
-    }
-    return gson().fromJson(json.get("value"), BoundingBox.class);
+    return withLogging("ElementHandle.boundingBox", () -> {
+      JsonObject json = sendMessage("boundingBox").getAsJsonObject();
+      if (!json.has("value")) {
+        return null;
+      }
+      return gson().fromJson(json.get("value"), BoundingBox.class);
+    });
  }

  @Override
  public void check(CheckOptions options) {
+    withLogging("ElementHandle.check", () -> checkImpl(options));
+  }
+
+  private void checkImpl(CheckOptions options) {
    if (options == null) {
      options = new CheckOptions();
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    sendMessage("check", params, frame.timeout(options.timeout));
+    sendMessage("check", params);
  }

  @Override
  public void click(ClickOptions options) {
+    withLogging("ElementHandle.click", () -> clickImpl(options));
+  }
+
+  private void clickImpl(ClickOptions options) {
    if (options == null) {
      options = new ClickOptions();
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    sendMessage("click", params, frame.timeout(options.timeout));
+    sendMessage("click", params);
  }

  @Override
  public Frame contentFrame() {
+    return withLogging("ElementHandle.contentFrame", () -> contentFrameImpl());
+  }
+
+  private Frame contentFrameImpl() {
    JsonObject json = sendMessage("contentFrame").getAsJsonObject();
    if (!json.has("frame")) {
      return null;
@@ -140,132 +158,177 @@ public class ElementHandleImpl extends JSHandleImpl implements ElementHandle {

  @Override
  public void dblclick(DblclickOptions options) {
+    withLogging("ElementHandle.dblclick", () -> dblclickImpl(options));
+  }
+
+  private void dblclickImpl(DblclickOptions options) {
    if (options == null) {
      options = new DblclickOptions();
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    sendMessage("dblclick", params, frame.timeout(options.timeout));
+    sendMessage("dblclick", params);
  }

  @Override
  public void dispatchEvent(String type, Object eventInit) {
-    JsonObject params = new JsonObject();
-    params.addProperty("type", type);
-    params.add("eventInit", gson().toJsonTree(serializeArgument(eventInit)));
-    sendMessage("dispatchEvent", params, NO_TIMEOUT);
+    withLogging("ElementHandle.dispatchEvent", () -> {
+      JsonObject params = new JsonObject();
+      params.addProperty("type", type);
+      params.add("eventInit", gson().toJsonTree(serializeArgument(eventInit)));
+      sendMessage("dispatchEvent", params);
+    });
  }

  @Override
  public void fill(String value, FillOptions options) {
+    withLogging("ElementHandle.fill", () -> fillImpl(value, options));
+  }
+
+  private void fillImpl(String value, FillOptions options) {
    if (options == null) {
      options = new FillOptions();
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    params.addProperty("value", value);
-    sendMessage("fill", params, frame.timeout(options.timeout));
+    sendMessage("fill", params);
  }

  @Override
  public void focus() {
-    sendMessage("focus");
+    withLogging("ElementHandle.focus", () -> sendMessage("focus"));
  }

  @Override
  public String getAttribute(String name) {
-    JsonObject params = new JsonObject();
-    params.addProperty("name", name);
-    JsonObject json = sendMessage("getAttribute", params, NO_TIMEOUT).getAsJsonObject();
-    return json.has("value") ? json.get("value").getAsString() : null;
+    return withLogging("ElementHandle.getAttribute", () -> {
+      JsonObject params = new JsonObject();
+      params.addProperty("name", name);
+      JsonObject json = sendMessage("getAttribute", params).getAsJsonObject();
+      return json.has("value") ? json.get("value").getAsString() : null;
+    });
  }

  @Override
  public void hover(HoverOptions options) {
+    withLogging("ElementHandle.hover", () -> hoverImpl(options));
+  }
+
+  private void hoverImpl(HoverOptions options) {
    if (options == null) {
      options = new HoverOptions();
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    sendMessage("hover", params, frame.timeout(options.timeout));
+    sendMessage("hover", params);
  }

  @Override
  public String innerHTML() {
-    JsonObject json = sendMessage("innerHTML").getAsJsonObject();
-    return json.get("value").getAsString();
+    return withLogging("ElementHandle.innerHTML", () -> {
+      JsonObject json = sendMessage("innerHTML").getAsJsonObject();
+      return json.get("value").getAsString();
+    });
  }

  @Override
  public String innerText() {
-    JsonObject json = sendMessage("innerText").getAsJsonObject();
-    return json.get("value").getAsString();
+    return withLogging("ElementHandle.innerText", () -> {
+      JsonObject json = sendMessage("innerText").getAsJsonObject();
+      return json.get("value").getAsString();
+    });
  }

  @Override
  public String inputValue(InputValueOptions options) {
+    return withLogging("ElementHandle.inputValue", () -> inputValueImpl(options));
+  }
+
+  private String inputValueImpl(InputValueOptions options) {
    if (options == null) {
      options = new InputValueOptions();
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    JsonObject json = sendMessage("inputValue", params, NO_TIMEOUT).getAsJsonObject();
+    JsonObject json = sendMessage("inputValue", params).getAsJsonObject();
    return json.get("value").getAsString();
  }

  @Override
  public boolean isChecked() {
-    JsonObject json = sendMessage("isChecked").getAsJsonObject();
-    return json.get("value").getAsBoolean();
+    return withLogging("ElementHandle.isChecked", () -> {
+      JsonObject json = sendMessage("isChecked").getAsJsonObject();
+      return json.get("value").getAsBoolean();
+    });
  }

  @Override
  public boolean isDisabled() {
-    JsonObject json = sendMessage("isDisabled").getAsJsonObject();
-    return json.get("value").getAsBoolean();
+    return withLogging("ElementHandle.isDisabled", () -> {
+      JsonObject json = sendMessage("isDisabled").getAsJsonObject();
+      return json.get("value").getAsBoolean();
+    });
  }

  @Override
  public boolean isEditable() {
-    JsonObject json = sendMessage("isEditable").getAsJsonObject();
-    return json.get("value").getAsBoolean();
+    return withLogging("ElementHandle.isEditable", () -> {
+      JsonObject json = sendMessage("isEditable").getAsJsonObject();
+      return json.get("value").getAsBoolean();
+    });
  }

  @Override
  public boolean isEnabled() {
-    JsonObject json = sendMessage("isEnabled").getAsJsonObject();
-    return json.get("value").getAsBoolean();
+    return withLogging("ElementHandle.isEnabled", () -> {
+      JsonObject json = sendMessage("isEnabled").getAsJsonObject();
+      return json.get("value").getAsBoolean();
+    });
  }

  @Override
  public boolean isHidden() {
-    JsonObject json = sendMessage("isHidden").getAsJsonObject();
-    return json.get("value").getAsBoolean();
+    return withLogging("ElementHandle.isHidden", () -> {
+      JsonObject json = sendMessage("isHidden").getAsJsonObject();
+      return json.get("value").getAsBoolean();
+    });
  }

  @Override
  public boolean isVisible() {
-    JsonObject json = sendMessage("isVisible").getAsJsonObject();
-    return json.get("value").getAsBoolean();
+    return withLogging("ElementHandle.isVisible", () -> {
+      JsonObject json = sendMessage("isVisible").getAsJsonObject();
+      return json.get("value").getAsBoolean();
+    });
  }

  @Override
  public FrameImpl ownerFrame() {
-    JsonObject json = sendMessage("ownerFrame").getAsJsonObject();
-    if (!json.has("frame")) {
-      return null;
-    }
-    return connection.getExistingObject(json.getAsJsonObject("frame").get("guid").getAsString());
+    return withLogging("ElementHandle.ownerFrame", () -> {
+      JsonObject json = sendMessage("ownerFrame").getAsJsonObject();
+      if (!json.has("frame")) {
+        return null;
+      }
+      return connection.getExistingObject(json.getAsJsonObject("frame").get("guid").getAsString());
+    });
  }

  @Override
  public void press(String key, PressOptions options) {
+    withLogging("ElementHandle.press", () -> pressImpl(key, options));
+  }
+  private void pressImpl(String key, PressOptions options) {
    if (options == null) {
      options = new PressOptions();
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    params.addProperty("key", key);
-    sendMessage("press", params, frame.timeout(options.timeout));
+    sendMessage("press", params);
  }

  @Override
  public byte[] screenshot(ScreenshotOptions options) {
+    return withLogging("ElementHandle.screenshot", () -> screenshotImpl(options));
+  }
+
+  private byte[] screenshotImpl(ScreenshotOptions options) {
    if (options == null) {
      options = new ScreenshotOptions();
    }
@@ -284,7 +347,7 @@ public class ElementHandleImpl extends JSHandleImpl implements ElementHandle {
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    params.remove("path");
-    JsonObject json = sendMessage("screenshot", params, frame.timeout(options.timeout)).getAsJsonObject();
+    JsonObject json = sendMessage("screenshot", params).getAsJsonObject();

    byte[] buffer = Base64.getDecoder().decode(json.get("binary").getAsString());
    if (options.path != null) {
@@ -295,11 +358,7 @@ public class ElementHandleImpl extends JSHandleImpl implements ElementHandle {

  @Override
  public void scrollIntoViewIfNeeded(ScrollIntoViewIfNeededOptions options) {
-    if (options == null) {
-      options = new ScrollIntoViewIfNeededOptions();
-    }
-    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    sendMessage("scrollIntoViewIfNeeded", params, frame.timeout(options.timeout));
+    withLogging("ElementHandle.scrollIntoViewIfNeeded", () -> scrollIntoViewIfNeededImpl(options));
  }

  @Override
@@ -323,7 +382,7 @@ public class ElementHandleImpl extends JSHandleImpl implements ElementHandle {
    if (values != null) {
      params.add("options", toSelectValueOrLabel(values));
    }
-    return selectOption(params, options.timeout);
+    return selectOption(params);
  }

  @Override
@@ -332,6 +391,13 @@ public class ElementHandleImpl extends JSHandleImpl implements ElementHandle {
    return selectOption(values, options);
  }

+  private void scrollIntoViewIfNeededImpl(ScrollIntoViewIfNeededOptions options) {
+    if (options == null) {
+      options = new ScrollIntoViewIfNeededOptions();
+    }
+    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
+    sendMessage("scrollIntoViewIfNeeded", params);
+  }

  @Override
  public List<String> selectOption(SelectOption[] values, SelectOptionOptions options) {
@@ -342,7 +408,7 @@ public class ElementHandleImpl extends JSHandleImpl implements ElementHandle {
    if (values != null) {
      params.add("options", gson().toJsonTree(values));
    }
-    return selectOption(params, options.timeout);
+    return selectOption(params);
  }

  @Override
@@ -354,21 +420,19 @@ public class ElementHandleImpl extends JSHandleImpl implements ElementHandle {
    if (values != null) {
      params.add("elements", Serialization.toProtocol(values));
    }
-    return selectOption(params, options.timeout);
+    return selectOption(params);
  }

-  private List<String> selectOption(JsonObject params, Double timeout) {
-    JsonObject json = sendMessage("selectOption", params, frame.timeout(timeout)).getAsJsonObject();
-    return parseStringList(json.getAsJsonArray("values"));
+  private List<String> selectOption(JsonObject params) {
+    return withLogging("SelectOption", () -> {
+      JsonObject json = sendMessage("selectOption", params).getAsJsonObject();
+      return parseStringList(json.getAsJsonArray("values"));
+    });
  }

  @Override
  public void selectText(SelectTextOptions options) {
-    if (options == null) {
-      options = new SelectTextOptions();
-    }
-    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    sendMessage("selectText", params, frame.timeout(options.timeout));
+    withLogging("ElementHandle.selectText", () -> selectTextImpl(options));
  }

  @Override
@@ -385,19 +449,34 @@ public class ElementHandleImpl extends JSHandleImpl implements ElementHandle {
    setInputFiles(new Path[]{files}, options);
  }

+  private void selectTextImpl(SelectTextOptions options) {
+    if (options == null) {
+      options = new SelectTextOptions();
+    }
+    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
+    sendMessage("selectText", params);
+  }

  @Override
  public void setInputFiles(Path[] files, SetInputFilesOptions options) {
+    withLogging("ElementHandle.setInputFiles", () -> setInputFilesImpl(files, options));
+  }
+
+  void setInputFilesImpl(Path[] files, SetInputFilesOptions options) {
    FrameImpl frame = ownerFrame();
    if (frame == null) {
      throw new Error("Cannot set input files to detached element");
    }
-    if (options == null) {
-      options = new SetInputFilesOptions();
+    if (hasLargeFile(files)) {
+      if (options == null) {
+        options = new SetInputFilesOptions();
+      }
+      JsonObject params = gson().toJsonTree(options).getAsJsonObject();
+      addLargeFileUploadParams(files, params, frame.page().context());
+      sendMessage("setInputFilePaths", params);
+    } else {
+      setInputFilesImpl(Utils.toFilePayloads(files), options);
    }
-    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    addFilePathUploadParams(files, params, frame.page().context());
-    sendMessage("setInputFiles", params, frame.timeout(options.timeout));
  }

  @Override
@@ -407,51 +486,77 @@ public class ElementHandleImpl extends JSHandleImpl implements ElementHandle {

  @Override
  public void setInputFiles(FilePayload[] files, SetInputFilesOptions options) {
+    withLogging("ElementHandle.setInputFiles", () -> setInputFilesImpl(files, options));
+  }
+
+  void setInputFilesImpl(FilePayload[] files, SetInputFilesOptions options) {
    checkFilePayloadSize(files);
    if (options == null) {
      options = new SetInputFilesOptions();
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    params.add("payloads", Serialization.toJsonArray(files));
-    sendMessage("setInputFiles", params, frame.timeout(options.timeout));
+    params.add("files", Serialization.toJsonArray(files));
+    sendMessage("setInputFiles", params);
  }

  @Override
  public void tap(TapOptions options) {
+    withLogging("ElementHandle.tap", () -> tapImpl(options));
+  }
+
+  private void tapImpl(TapOptions options) {
    if (options == null) {
      options = new TapOptions();
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    sendMessage("tap", params, frame.timeout(options.timeout));
+    sendMessage("tap", params);
  }

  @Override
  public String textContent() {
-    JsonObject json = sendMessage("textContent").getAsJsonObject();
-    return json.has("value") ? json.get("value").getAsString() : null;
+    return withLogging("ElementHandle.textContent", () -> textContentImpl());
+  }
+
+  private String textContentImpl() {
+    return withLogging("ElementHandle.textContent", () -> {
+      JsonObject json = sendMessage("textContent").getAsJsonObject();
+      return json.has("value") ? json.get("value").getAsString() : null;
+    });
  }

  @Override
  public void type(String text, TypeOptions options) {
+    withLogging("ElementHandle.type", () -> typeImpl(text, options));
+  }
+
+  private void typeImpl(String text, TypeOptions options) {
    if (options == null) {
      options = new TypeOptions();
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    params.addProperty("text", text);
-    sendMessage("type", params, frame.timeout(options.timeout));
+    sendMessage("type", params);
  }

  @Override
  public void uncheck(UncheckOptions options) {
+    withLogging("ElementHandle.uncheck", () -> uncheckImpl(options));
+  }
+
+  private void uncheckImpl(UncheckOptions options) {
    if (options == null) {
      options = new UncheckOptions();
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    sendMessage("uncheck", params, frame.timeout(options.timeout));
+    sendMessage("uncheck", params);
  }

  @Override
  public void waitForElementState(ElementState state, WaitForElementStateOptions options) {
+    withLogging("ElementHandle.waitForElementState", () -> waitForElementStateImpl(state, options));
+  }
+
+  private void waitForElementStateImpl(ElementState state, WaitForElementStateOptions options) {
    if (options == null) {
      options = new WaitForElementStateOptions();
    }
@@ -460,7 +565,7 @@ public class ElementHandleImpl extends JSHandleImpl implements ElementHandle {
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    params.addProperty("state", toProtocol(state));
-    sendMessage("waitForElementState", params, frame.timeout(options.timeout));
+    sendMessage("waitForElementState", params);
  }

  private static String toProtocol(ElementState state) {
@@ -469,12 +574,16 @@ public class ElementHandleImpl extends JSHandleImpl implements ElementHandle {

  @Override
  public ElementHandle waitForSelector(String selector, WaitForSelectorOptions options) {
+    return withLogging("ElementHandle.waitForSelector", () -> waitForSelectorImpl(selector, options));
+  }
+
+  private ElementHandle waitForSelectorImpl(String selector, WaitForSelectorOptions options) {
    if (options == null) {
      options = new WaitForSelectorOptions();
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    params.addProperty("selector", selector);
-    JsonElement json = sendMessage("waitForSelector", params, frame.timeout(options.timeout)).getAsJsonObject();
+    JsonElement json = sendMessage("waitForSelector", params);
    JsonObject element = json.getAsJsonObject().getAsJsonObject("element");
    if (element == null) {
      return null;
@@ -58,7 +58,8 @@ class FileChooserImpl implements FileChooser {

  @Override
  public void setFiles(Path[] files, SetFilesOptions options) {
-    element.setInputFiles(files, convertType(options, ElementHandle.SetInputFilesOptions.class));
+    page.withLogging("FileChooser.setInputFiles",
+      () -> element.setInputFilesImpl(files, convertType(options, ElementHandle.SetInputFilesOptions.class)));
  }

  @Override
@@ -68,6 +69,7 @@ class FileChooserImpl implements FileChooser {

  @Override
  public void setFiles(FilePayload[] files, SetFilesOptions options) {
-    element.setInputFiles(files, convertType(options, ElementHandle.SetInputFilesOptions.class));
+    page.withLogging("FileChooser.setInputFiles",
+      () -> element.setInputFilesImpl(files, convertType(options, ElementHandle.SetInputFilesOptions.class)));
  }
 }
@@ -20,93 +20,39 @@ import com.microsoft.playwright.options.FilePayload;
 import com.microsoft.playwright.options.FormData;

 import java.nio.file.Path;
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.LinkedHashMap;
+import java.util.Map;

 public class FormDataImpl implements FormData {
-  static class Field implements Map.Entry<String, Object> {
-    final String name;
-    final Object value;
-
-    private Field(String name, Object value) {
-        this.name = name;
-        this.value = value;
-    }
-
-    @Override
-    public String getKey() {
-      return name;
-    }
-
-    @Override
-    public Object getValue() {
-      return value;
-    }
-
-    @Override
-    public Object setValue(Object value) {
-      throw new UnsupportedOperationException();
-    }
-  }
-  List<Field> fields = new ArrayList();
-
-  @Override
-  public FormData append(String name, String value) {
-    return appendImpl(name, value);
-  }
-
-  @Override
-  public FormData append(String name, boolean value) {
-    return appendImpl(name, value);
-  }
-
-  @Override
-  public FormData append(String name, int value) {
-    return appendImpl(name, value);
-  }
-
-  @Override
-  public FormData append(String name, Path value) {
-    return appendImpl(name, value);
-  }
-
-  @Override
-  public FormData append(String name, FilePayload value) {
-    return appendImpl(name, value);
-  }
+  Map<String, Object> fields = new LinkedHashMap<>();

  @Override
  public FormData set(String name, String value) {
-    return setImpl(name, value);
+    fields.put(name, value);
+    return this;
  }

  @Override
  public FormData set(String name, boolean value) {
-    return setImpl(name, value);
+    fields.put(name, value);
+    return this;
  }

  @Override
  public FormData set(String name, int value) {
-    return setImpl(name, value);
+    fields.put(name, value);
+    return this;
  }

  @Override
  public FormData set(String name, Path value) {
-    return setImpl(name, value);
+    fields.put(name, value);
+    return this;
  }

  @Override
  public FormData set(String name, FilePayload value) {
-    return setImpl(name, value);
-  }
-
-  private FormData setImpl(String name, Object value) {
-    fields = fields.stream().filter(f -> !name.equals(f.name)).collect(Collectors.toList());
-    return appendImpl(name, value);
-  }
-
-  private FormData appendImpl(String name, Object value) {
-    fields.add(new Field(name, value));
+    fields.put(name, value);
    return this;
  }
 }
@@ -74,12 +74,16 @@ public class FrameImpl extends ChannelOwner implements Frame {

  @Override
  public ElementHandle querySelector(String selector, QuerySelectorOptions options) {
+    return withLogging("Frame.querySelector", () -> querySelectorImpl(selector, options));
+  }
+
+  ElementHandleImpl querySelectorImpl(String selector, QuerySelectorOptions options) {
    if (options == null) {
      options = new QuerySelectorOptions();
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    params.addProperty("selector", selector);
-    JsonElement json = sendMessage("querySelector", params, NO_TIMEOUT);
+    JsonElement json = sendMessage("querySelector", params);
    JsonObject element = json.getAsJsonObject().getAsJsonObject("element");
    if (element == null) {
      return null;
@@ -89,18 +93,7 @@ public class FrameImpl extends ChannelOwner implements Frame {

  @Override
  public List<ElementHandle> querySelectorAll(String selector) {
-    JsonObject params = new JsonObject();
-    params.addProperty("selector", selector);
-    JsonElement json = sendMessage("querySelectorAll", params, NO_TIMEOUT);
-    JsonArray elements = json.getAsJsonObject().getAsJsonArray("elements");
-    if (elements == null) {
-      return null;
-    }
-    List<ElementHandle> handles = new ArrayList<>();
-    for (JsonElement item : elements) {
-      handles.add(connection.getExistingObject(item.getAsJsonObject().get("guid").getAsString()));
-    }
-    return handles;
+    return withLogging("Frame.querySelectorAll", () -> querySelectorAllImpl(selector));
  }

  @Override
@@ -117,7 +110,7 @@ public class FrameImpl extends ChannelOwner implements Frame {

  @Override
  public List<String> selectOption(String selector, String[] values, SelectOptionOptions options) {
-    return selectOptionImpl(selector, values, options);
+    return withLogging("Frame.selectOption", () -> selectOptionImpl(selector, values, options));
  }

  @Override
@@ -126,10 +119,24 @@ public class FrameImpl extends ChannelOwner implements Frame {
    return selectOption(selector, values, options);
  }

+  List<ElementHandle> querySelectorAllImpl(String selector) {
+    JsonObject params = new JsonObject();
+    params.addProperty("selector", selector);
+    JsonElement json = sendMessage("querySelectorAll", params);
+    JsonArray elements = json.getAsJsonObject().getAsJsonArray("elements");
+    if (elements == null) {
+      return null;
+    }
+    List<ElementHandle> handles = new ArrayList<>();
+    for (JsonElement item : elements) {
+      handles.add(connection.getExistingObject(item.getAsJsonObject().get("guid").getAsString()));
+    }
+    return handles;
+  }

  @Override
  public Object evalOnSelector(String selector, String pageFunction, Object arg, EvalOnSelectorOptions options) {
-    return evalOnSelectorImpl(selector, pageFunction, arg, options);
+    return withLogging("Frame.evalOnSelector", () -> evalOnSelectorImpl(selector, pageFunction, arg, options));
  }

  Object evalOnSelectorImpl(String selector, String pageFunction, Object arg, EvalOnSelectorOptions options) {
@@ -140,14 +147,14 @@ public class FrameImpl extends ChannelOwner implements Frame {
    params.addProperty("selector", selector);
    params.addProperty("expression", pageFunction);
    params.add("arg", gson().toJsonTree(serializeArgument(arg)));
-    JsonElement json = sendMessage("evalOnSelector", params, NO_TIMEOUT);
+    JsonElement json = sendMessage("evalOnSelector", params);
    SerializedValue value = gson().fromJson(json.getAsJsonObject().get("value"), SerializedValue.class);
    return deserialize(value);
  }

  @Override
  public Object evalOnSelectorAll(String selector, String pageFunction, Object arg) {
-    return evalOnSelectorAllImpl(selector, pageFunction, arg);
+    return withLogging("Frame.evalOnSelectorAll", () -> evalOnSelectorAllImpl(selector, pageFunction, arg));
  }

  Object evalOnSelectorAllImpl(String selector, String pageFunction, Object arg) {
@@ -155,14 +162,14 @@ public class FrameImpl extends ChannelOwner implements Frame {
    params.addProperty("selector", selector);
    params.addProperty("expression", pageFunction);
    params.add("arg", gson().toJsonTree(serializeArgument(arg)));
-    JsonElement json = sendMessage("evalOnSelectorAll", params, NO_TIMEOUT);
+    JsonElement json = sendMessage("evalOnSelectorAll", params);
    SerializedValue value = gson().fromJson(json.getAsJsonObject().get("value"), SerializedValue.class);
    return deserialize(value);
  }

  @Override
  public ElementHandle addScriptTag(AddScriptTagOptions options){
-    return addScriptTagImpl(options);
+    return withLogging("Frame.addScriptTag", () -> addScriptTagImpl(options));
  }

  ElementHandle addScriptTagImpl(AddScriptTagOptions options) {
@@ -179,16 +186,16 @@ public class FrameImpl extends ChannelOwner implements Frame {
        throw new PlaywrightException("Failed to read from file", e);
      }
      String content = new String(encoded, StandardCharsets.UTF_8);
-      content = addSourceUrlToScript(content, options.path);
+      content += "//# sourceURL=" + options.path.toString().replace("\n", "");
      jsonOptions.addProperty("content", content);
    }
-    JsonElement json = sendMessage("addScriptTag", jsonOptions, NO_TIMEOUT);
+    JsonElement json = sendMessage("addScriptTag", jsonOptions);
    return connection.getExistingObject(json.getAsJsonObject().getAsJsonObject("element").get("guid").getAsString());
  }

  @Override
  public ElementHandle addStyleTag(AddStyleTagOptions options){
-    return addStyleTagImpl(options);
+    return withLogging("Frame.addStyleTag", () -> addStyleTagImpl(options));
  }

  ElementHandle addStyleTagImpl(AddStyleTagOptions options) {
@@ -208,18 +215,22 @@ public class FrameImpl extends ChannelOwner implements Frame {
      content += "/*# sourceURL=" + options.path.toString().replace("\n", "") + "*/";
      jsonOptions.addProperty("content", content);
    }
-    JsonElement json = sendMessage("addStyleTag", jsonOptions, NO_TIMEOUT);
+    JsonElement json = sendMessage("addStyleTag", jsonOptions);
    return connection.getExistingObject(json.getAsJsonObject().getAsJsonObject("element").get("guid").getAsString());
  }

  @Override
  public void check(String selector, CheckOptions options){
+    withLogging("Frame.check", () -> checkImpl(selector, options));
+  }
+
+  void checkImpl(String selector, CheckOptions options) {
    if (options == null) {
      options = new CheckOptions();
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    params.addProperty("selector", selector);
-    sendMessage("check", params, timeout(options.timeout));
+    sendMessage("check", params);
  }

  @Override
@@ -229,45 +240,47 @@ public class FrameImpl extends ChannelOwner implements Frame {

  @Override
  public void click(String selector, ClickOptions options) {
-    clickImpl(selector, options, null);
+    withLogging("Frame.click", () -> clickImpl(selector, options));
  }

-  void clickImpl(String selector, ClickOptions options, Integer steps) {
+  void clickImpl(String selector, ClickOptions options) {
    if (options == null) {
      options = new ClickOptions();
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    params.addProperty("selector", selector);
-    if (steps != null) {
-      params.addProperty("steps", steps);
-    }
-    sendMessage("click", params, timeout(options.timeout));
+    sendMessage("click", params);
  }

  @Override
  public String content() {
+    return withLogging("Frame.content", () -> contentImpl());
+  }
+
+  String contentImpl() {
    return sendMessage("content").getAsJsonObject().get("value").getAsString();
  }

  @Override
  public void dblclick(String selector, DblclickOptions options) {
-    dblclickImpl(selector, options, null);
+    withLogging("Frame.dblclick", () -> dblclickImpl(selector, options));
  }

-  void dblclickImpl(String selector, DblclickOptions options, Integer steps) {
+  void dblclickImpl(String selector, DblclickOptions options) {
    if (options == null) {
      options = new DblclickOptions();
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    params.addProperty("selector", selector);
-    if (steps != null) {
-      params.addProperty("steps", steps);
-    }
-    sendMessage("dblclick", params, timeout(options.timeout));
+    sendMessage("dblclick", params);
  }

  @Override
  public void dispatchEvent(String selector, String type, Object eventInit, DispatchEventOptions options) {
+    withLogging("Frame.dispatchEvent", () -> dispatchEventImpl(selector, type, eventInit, options));
+  }
+
+  void dispatchEventImpl(String selector, String type, Object eventInit, DispatchEventOptions options) {
    if (options == null) {
      options = new DispatchEventOptions();
    }
@@ -275,55 +288,71 @@ public class FrameImpl extends ChannelOwner implements Frame {
    params.addProperty("selector", selector);
    params.addProperty("type", type);
    params.add("eventInit", gson().toJsonTree(serializeArgument(eventInit)));
-    sendMessage("dispatchEvent", params, timeout(options.timeout));
+    sendMessage("dispatchEvent", params);
  }

  @Override
  public Object evaluate(String expression, Object arg) {
+    return withLogging("Frame.evaluate", () -> evaluateImpl(expression, arg));
+  }
+
+  Object evaluateImpl(String expression, Object arg) {
    JsonObject params = new JsonObject();
    params.addProperty("expression", expression);
    params.addProperty("world", "main");
    params.add("arg", gson().toJsonTree(serializeArgument(arg)));
-    JsonElement json = sendMessage("evaluateExpression", params, NO_TIMEOUT);
+    JsonElement json = sendMessage("evaluateExpression", params);
    SerializedValue value = gson().fromJson(json.getAsJsonObject().get("value"), SerializedValue.class);
    return deserialize(value);
  }

  @Override
  public JSHandle evaluateHandle(String pageFunction, Object arg) {
+    return withLogging("Frame.evaluateHandle", () -> evaluateHandleImpl(pageFunction, arg));
+  }
+
+  JSHandle evaluateHandleImpl(String pageFunction, Object arg) {
    JsonObject params = new JsonObject();
    params.addProperty("expression", pageFunction);
    params.addProperty("world", "main");
    params.add("arg", gson().toJsonTree(serializeArgument(arg)));
-    JsonElement json = sendMessage("evaluateExpressionHandle", params, NO_TIMEOUT);
+    JsonElement json = sendMessage("evaluateExpressionHandle", params);
    return connection.getExistingObject(json.getAsJsonObject().getAsJsonObject("handle").get("guid").getAsString());
  }

  @Override
  public void fill(String selector, String value, FillOptions options) {
+    withLogging("Frame.fill", () -> fillImpl(selector, value, options));
+  }
+
+  void fillImpl(String selector, String value, FillOptions options) {
    if (options == null) {
      options = new FillOptions();
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    params.addProperty("selector", selector);
    params.addProperty("value", value);
-    sendMessage("fill", params, timeout(options.timeout));
+    sendMessage("fill", params);
  }

  @Override
  public void focus(String selector, FocusOptions options) {
+    withLogging("Frame.focus", () -> focusImpl(selector, options));
+  }
+
+  void focusImpl(String selector, FocusOptions options) {
    if (options == null) {
      options = new FocusOptions();
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    params.addProperty("selector", selector);
-    sendMessage("focus", params, timeout(options.timeout));
+    sendMessage("focus", params);
  }

  @Override
  public ElementHandle frameElement() {
-    JsonObject json = sendMessage("frameElement").getAsJsonObject();
-    return connection.getExistingObject(json.getAsJsonObject("element").get("guid").getAsString());
+    return withLogging("Frame.frameElement", () -> frameElementImpl());
+
  }

  @Override
@@ -331,9 +360,14 @@ public class FrameImpl extends ChannelOwner implements Frame {
    return new FrameLocatorImpl(this, selector);
  }

+  ElementHandle frameElementImpl() {
+    JsonObject json = sendMessage("frameElement").getAsJsonObject();
+    return connection.getExistingObject(json.getAsJsonObject("element").get("guid").getAsString());
+  }
+
  @Override
  public String getAttribute(String selector, String name, GetAttributeOptions options) {
-    return getAttributeImpl(selector, name, options);
+    return withLogging("Frame.getAttribute", () -> getAttributeImpl(selector, name, options));
  }

  @Override
@@ -373,12 +407,12 @@ public class FrameImpl extends ChannelOwner implements Frame {

  @Override
  public Locator getByTestId(String testId) {
-    return locator(getByTestIdSelector(testId, connection.playwright));
+    return locator(getByTestIdSelector(testId));
  }

  @Override
  public Locator getByTestId(Pattern testId) {
-    return locator(getByTestIdSelector(testId, connection.playwright));
+    return locator(getByTestIdSelector(testId));
  }

  @Override
@@ -408,7 +442,7 @@ public class FrameImpl extends ChannelOwner implements Frame {
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    params.addProperty("selector", selector);
    params.addProperty("name", name);
-    JsonObject json = sendMessage("getAttribute", params, timeout(options.timeout)).getAsJsonObject();
+    JsonObject json = sendMessage("getAttribute", params).getAsJsonObject();
    if (json.has("value")) {
      return json.get("value").getAsString();
    }
@@ -417,7 +451,7 @@ public class FrameImpl extends ChannelOwner implements Frame {

  @Override
  public ResponseImpl navigate(String url, NavigateOptions options) {
-    return navigateImpl(url, options);
+    return withLogging("Page.navigate", () -> navigateImpl(url, options));
  }

  ResponseImpl navigateImpl(String url, NavigateOptions options) {
@@ -426,7 +460,7 @@ public class FrameImpl extends ChannelOwner implements Frame {
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    params.addProperty("url", url);
-    JsonElement result = sendMessage("goto", params, navigationTimeout(options.timeout));
+    JsonElement result = sendMessage("goto", params);
    JsonObject jsonResponse = result.getAsJsonObject().getAsJsonObject("response");
    if (jsonResponse == null) {
      return null;
@@ -436,7 +470,7 @@ public class FrameImpl extends ChannelOwner implements Frame {

  @Override
  public void hover(String selector, HoverOptions options) {
-    hoverImpl(selector, options);
+    withLogging("Frame.hover", () -> hoverImpl(selector, options));
  }

  void hoverImpl(String selector, HoverOptions options) {
@@ -445,30 +479,27 @@ public class FrameImpl extends ChannelOwner implements Frame {
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    params.addProperty("selector", selector);
-    sendMessage("hover", params, timeout(options.timeout));
+    sendMessage("hover", params);
  }

  @Override
  public void dragAndDrop(String source, String target, DragAndDropOptions options) {
-    dragAndDropImpl(source, target, options, null);
+    withLogging("Frame.dragAndDrop", () -> dragAndDropImpl(source, target, options));
  }

-  void dragAndDropImpl(String source, String target, DragAndDropOptions options, Integer steps) {
+  void dragAndDropImpl(String source, String target, DragAndDropOptions options) {
    if (options == null) {
      options = new DragAndDropOptions();
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    params.addProperty("source", source);
    params.addProperty("target", target);
-    if (steps != null) {
-      params.addProperty("steps", steps);
-    }
-    sendMessage("dragAndDrop", params, timeout(options.timeout));
+    sendMessage("dragAndDrop", params);
  }

  @Override
  public String innerHTML(String selector, InnerHTMLOptions options) {
-    return innerHTMLImpl(selector, options);
+    return withLogging("Frame.innerHTML", () -> innerHTMLImpl(selector, options));
  }

  String innerHTMLImpl(String selector, InnerHTMLOptions options) {
@@ -477,13 +508,13 @@ public class FrameImpl extends ChannelOwner implements Frame {
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    params.addProperty("selector", selector);
-    JsonObject json = sendMessage("innerHTML", params, timeout(options.timeout)).getAsJsonObject();
+    JsonObject json = sendMessage("innerHTML", params).getAsJsonObject();
    return json.get("value").getAsString();
  }

  @Override
  public String innerText(String selector, InnerTextOptions options) {
-    return innerTextImpl(selector, options);
+    return withLogging("Frame.innerText", () -> innerTextImpl(selector, options));
  }

  String innerTextImpl(String selector, InnerTextOptions options) {
@@ -492,13 +523,13 @@ public class FrameImpl extends ChannelOwner implements Frame {
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    params.addProperty("selector", selector);
-    JsonObject json = sendMessage("innerText", params, timeout(options.timeout)).getAsJsonObject();
+    JsonObject json = sendMessage("innerText", params).getAsJsonObject();
    return json.get("value").getAsString();
  }

  @Override
  public String inputValue(String selector, InputValueOptions options) {
-    return inputValueImpl(selector, options);
+    return withLogging("Frame.inputValue", () -> inputValueImpl(selector, options));
  }

  String inputValueImpl(String selector, InputValueOptions options) {
@@ -507,13 +538,13 @@ public class FrameImpl extends ChannelOwner implements Frame {
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    params.addProperty("selector", selector);
-    JsonObject json = sendMessage("inputValue", params, timeout(options.timeout)).getAsJsonObject();
+    JsonObject json = sendMessage("inputValue", params).getAsJsonObject();
    return json.get("value").getAsString();
  }

  @Override
  public boolean isChecked(String selector, IsCheckedOptions options) {
-    return isCheckedImpl(selector, options);
+    return withLogging("Page.isChecked", () -> isCheckedImpl(selector, options));
  }

  boolean isCheckedImpl(String selector, IsCheckedOptions options) {
@@ -522,7 +553,7 @@ public class FrameImpl extends ChannelOwner implements Frame {
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    params.addProperty("selector", selector);
-    JsonObject json = sendMessage("isChecked", params, timeout(options.timeout)).getAsJsonObject();
+    JsonObject json = sendMessage("isChecked", params).getAsJsonObject();
    return json.get("value").getAsBoolean();
  }

@@ -533,7 +564,7 @@ public class FrameImpl extends ChannelOwner implements Frame {

  @Override
  public boolean isDisabled(String selector, IsDisabledOptions options) {
-    return isDisabledImpl(selector, options);
+    return withLogging("Page.isDisabled", () -> isDisabledImpl(selector, options));
  }

  boolean isDisabledImpl(String selector, IsDisabledOptions options) {
@@ -542,13 +573,13 @@ public class FrameImpl extends ChannelOwner implements Frame {
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    params.addProperty("selector", selector);
-    JsonObject json = sendMessage("isDisabled", params, timeout(options.timeout)).getAsJsonObject();
+    JsonObject json = sendMessage("isDisabled", params).getAsJsonObject();
    return json.get("value").getAsBoolean();
  }

  @Override
  public boolean isEditable(String selector, IsEditableOptions options) {
-    return isEditableImpl(selector, options);
+    return withLogging("Page.isEditable", () -> isEditableImpl(selector, options));
  }

  boolean isEditableImpl(String selector, IsEditableOptions options) {
@@ -557,13 +588,13 @@ public class FrameImpl extends ChannelOwner implements Frame {
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    params.addProperty("selector", selector);
-    JsonObject json = sendMessage("isEditable", params, timeout(options.timeout)).getAsJsonObject();
+    JsonObject json = sendMessage("isEditable", params).getAsJsonObject();
    return json.get("value").getAsBoolean();
  }

  @Override
  public boolean isEnabled(String selector, IsEnabledOptions options) {
-    return isEnabledImpl(selector, options);
+    return withLogging("Page.isEnabled", () -> isEnabledImpl(selector, options));
  }

  boolean isEnabledImpl(String selector, IsEnabledOptions options) {
@@ -572,13 +603,13 @@ public class FrameImpl extends ChannelOwner implements Frame {
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    params.addProperty("selector", selector);
-    JsonObject json = sendMessage("isEnabled", params, timeout(options.timeout)).getAsJsonObject();
+    JsonObject json = sendMessage("isEnabled", params).getAsJsonObject();
    return json.get("value").getAsBoolean();
  }

  @Override
  public boolean isHidden(String selector, IsHiddenOptions options) {
-    return isHiddenImpl(selector, options);
+    return withLogging("Page.isHidden", () -> isHiddenImpl(selector, options));
  }

  boolean isHiddenImpl(String selector, IsHiddenOptions options) {
@@ -587,13 +618,13 @@ public class FrameImpl extends ChannelOwner implements Frame {
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    params.addProperty("selector", selector);
-    JsonObject json = sendMessage("isHidden", params, timeout(options.timeout)).getAsJsonObject();
+    JsonObject json = sendMessage("isHidden", params).getAsJsonObject();
    return json.get("value").getAsBoolean();
  }

  @Override
  public boolean isVisible(String selector, IsVisibleOptions options) {
-    return isVisibleImpl(selector, options);
+    return withLogging("Page.isVisible", () -> isVisibleImpl(selector, options));
  }

  @Override
@@ -607,7 +638,7 @@ public class FrameImpl extends ChannelOwner implements Frame {
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    params.addProperty("selector", selector);
-    JsonObject json = sendMessage("isVisible", params, timeout(options.timeout)).getAsJsonObject();
+    JsonObject json = sendMessage("isVisible", params).getAsJsonObject();
    return json.get("value").getAsBoolean();
  }

@@ -628,7 +659,7 @@ public class FrameImpl extends ChannelOwner implements Frame {

  @Override
  public void press(String selector, String key, PressOptions options) {
-    pressImpl(selector, key, options);
+    withLogging("Frame.press", () -> pressImpl(selector, key, options));
  }

  void pressImpl(String selector, String key, PressOptions options) {
@@ -638,12 +669,12 @@ public class FrameImpl extends ChannelOwner implements Frame {
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    params.addProperty("selector", selector);
    params.addProperty("key", key);
-    sendMessage("press", params, timeout(options.timeout));
+    sendMessage("press", params);
  }

  @Override
  public List<String> selectOption(String selector, SelectOption[] values, SelectOptionOptions options) {
-    return selectOptionImpl(selector, values, options);
+    return withLogging("Frame.selectOption", () -> selectOptionImpl(selector, values, options));
  }

  List<String> selectOptionImpl(String selector, SelectOption[] values, SelectOptionOptions options) {
@@ -655,7 +686,7 @@ public class FrameImpl extends ChannelOwner implements Frame {
    if (values != null) {
      params.add("options", gson().toJsonTree(values));
    }
-    return selectOption(params, options.timeout);
+    return selectOption(params);
  }

  List<String> selectOptionImpl(String selector, String[] values, SelectOptionOptions options) {
@@ -667,12 +698,12 @@ public class FrameImpl extends ChannelOwner implements Frame {
    if (values != null) {
      params.add("options", toSelectValueOrLabel(values));
    }
-    return selectOption(params, options.timeout);
+    return selectOption(params);
  }

  @Override
  public List<String> selectOption(String selector, ElementHandle[] values, SelectOptionOptions options) {
-    return selectOptionImpl(selector, values, options);
+    return withLogging("Frame.selectOption", () -> selectOptionImpl(selector, values, options));
  }

  List<String> selectOptionImpl(String selector, ElementHandle[] values, SelectOptionOptions options) {
@@ -684,35 +715,30 @@ public class FrameImpl extends ChannelOwner implements Frame {
    if (values != null) {
      params.add("elements", Serialization.toProtocol(values));
    }
-    return selectOption(params, options.timeout);
+    return selectOption(params);
  }

-  private List<String> selectOption(JsonObject params, Double timeout) {
-    JsonObject json = sendMessage("selectOption", params, timeout(timeout)).getAsJsonObject();
+  private List<String> selectOption(JsonObject params) {
+    JsonObject json = sendMessage("selectOption", params).getAsJsonObject();
    return parseStringList(json.getAsJsonArray("values"));
  }

  @Override
  public void setChecked(String selector, boolean checked, SetCheckedOptions options) {
-    setCheckedImpl(selector, checked, options);
+    withLogging("Frame.setChecked", () -> setCheckedImpl(selector, checked, options));
  }

  void setCheckedImpl(String selector, boolean checked, SetCheckedOptions options) {
    if (checked) {
-      check(selector, convertType(options, CheckOptions.class));
+      checkImpl(selector, convertType(options, CheckOptions.class));
    } else {
-      uncheck(selector, convertType(options, UncheckOptions.class));
+      uncheckImpl(selector, convertType(options, UncheckOptions.class));
    }
  }

  @Override
  public void setContent(String html, SetContentOptions options) {
-    if (options == null) {
-      options = new SetContentOptions();
-    }
-    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    params.addProperty("html", html);
-    sendMessage("setContent", params, navigationTimeout(options.timeout));
+    withLogging("Frame.setContent", () -> setContentImpl(html, options));
  }

  @Override
@@ -720,19 +746,32 @@ public class FrameImpl extends ChannelOwner implements Frame {
    setInputFiles(selector, new Path[] {files}, options);
  }

+  void setContentImpl(String html, SetContentOptions options) {
+    if (options == null) {
+      options = new SetContentOptions();
+    }
+    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
+    params.addProperty("html", html);
+    sendMessage("setContent", params);
+  }
+
  @Override
  public void setInputFiles(String selector, Path[] files, SetInputFilesOptions options) {
-    setInputFilesImpl(selector, files, options);
+    withLogging("Frame.setInputFiles", () -> setInputFilesImpl(selector, files, options));
  }

  void setInputFilesImpl(String selector, Path[] files, SetInputFilesOptions options) {
-    if (options == null) {
-      options = new SetInputFilesOptions();
+    if (hasLargeFile(files)) {
+      if (options == null) {
+        options = new SetInputFilesOptions();
+      }
+      JsonObject params = gson().toJsonTree(options).getAsJsonObject();
+      addLargeFileUploadParams(files, params, page.context());
+      params.addProperty("selector", selector);
+      sendMessage("setInputFilePaths", params);
+    } else {
+      setInputFilesImpl(selector, Utils.toFilePayloads(files), options);
    }
-    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    addFilePathUploadParams(files, params, page.context());
-    params.addProperty("selector", selector);
-    sendMessage("setInputFiles", params, timeout(options.timeout));
  }

  @Override
@@ -742,7 +781,7 @@ public class FrameImpl extends ChannelOwner implements Frame {

  @Override
  public void setInputFiles(String selector, FilePayload[] files, SetInputFilesOptions options) {
-    setInputFilesImpl(selector, files, options);
+    withLogging("Frame.setInputFiles", () -> setInputFilesImpl(selector, files, options));
  }

  void setInputFilesImpl(String selector, FilePayload[] files, SetInputFilesOptions options) {
@@ -752,55 +791,74 @@ public class FrameImpl extends ChannelOwner implements Frame {
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    params.addProperty("selector", selector);
-    params.add("payloads", toJsonArray(files));
-    sendMessage("setInputFiles", params, timeout(options.timeout));
+    params.add("files", toJsonArray(files));
+    sendMessage("setInputFiles", params);
  }

  @Override
  public void tap(String selector, TapOptions options) {
+    withLogging("Frame.tap", () -> tapImpl(selector, options));
+  }
+  void tapImpl(String selector, TapOptions options) {
    if (options == null) {
      options = new TapOptions();
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    params.addProperty("selector", selector);
-    sendMessage("tap", params, timeout(options.timeout));
+    sendMessage("tap", params);
  }

  @Override
  public String textContent(String selector, TextContentOptions options) {
+    return withLogging("Frame.textContent", () -> textContentImpl(selector, options));
+  }
+
+  String textContentImpl(String selector, TextContentOptions options) {
    if (options == null) {
      options = new TextContentOptions();
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    params.addProperty("selector", selector);
-    return sendMessage("textContent", params, timeout(options.timeout)).getAsJsonObject().get("value").getAsString();
+    return sendMessage("textContent", params).getAsJsonObject().get("value").getAsString();
  }

  @Override
  public String title() {
+    return withLogging("Frame.title", () -> titleImpl());
+  }
+
+  String titleImpl() {
    JsonElement json = sendMessage("title");
    return json.getAsJsonObject().get("value").getAsString();
  }

  @Override
  public void type(String selector, String text, TypeOptions options) {
+    withLogging("Frame.type", () -> typeImpl(selector, text, options));
+  }
+
+  void typeImpl(String selector, String text, TypeOptions options) {
    if (options == null) {
      options = new TypeOptions();
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    params.addProperty("selector", selector);
    params.addProperty("text", text);
-    sendMessage("type", params, timeout(options.timeout));
+    sendMessage("type", params);
  }

  @Override
  public void uncheck(String selector, UncheckOptions options) {
+    withLogging("Frame.uncheck", () -> uncheckImpl(selector, options));
+  }
+
+  void uncheckImpl(String selector, UncheckOptions options) {
    if (options == null) {
      options = new UncheckOptions();
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    params.addProperty("selector", selector);
-    sendMessage("uncheck", params, timeout(options.timeout));
+    sendMessage("uncheck", params);
  }

  @Override
@@ -810,13 +868,17 @@ public class FrameImpl extends ChannelOwner implements Frame {

  @Override
  public JSHandle waitForFunction(String pageFunction, Object arg, WaitForFunctionOptions options) {
+    return withLogging("Frame.waitForFunction", () -> waitForFunctionImpl(pageFunction, arg, options));
+  }
+
+  JSHandle waitForFunctionImpl(String pageFunction, Object arg, WaitForFunctionOptions options) {
    if (options == null) {
      options = new WaitForFunctionOptions();
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    params.addProperty("expression", pageFunction);
    params.add("arg", gson().toJsonTree(serializeArgument(arg)));
-    JsonElement json = sendMessage("waitForFunction", params, timeout(options.timeout));
+    JsonElement json = sendMessage("waitForFunction", params);
    JsonObject element = json.getAsJsonObject().getAsJsonObject("handle");
    return connection.getExistingObject(element.get("guid").getAsString());
  }
@@ -973,7 +1035,7 @@ public class FrameImpl extends ChannelOwner implements Frame {

    List<Waitable<Response>> waitables = new ArrayList<>();
    if (matcher == null) {
-      matcher = UrlMatcher.forOneOf(page.context().baseUrl(), options.url, this.connection.localUtils, false);
+      matcher = UrlMatcher.forOneOf(page.context().baseUrl, options.url);
    }
    logger.log("waiting for navigation " + matcher);
    waitables.add(new WaitForNavigationHelper(matcher, options.waitUntil, logger));
@@ -985,6 +1047,10 @@ public class FrameImpl extends ChannelOwner implements Frame {

  @Override
  public ElementHandle waitForSelector(String selector, WaitForSelectorOptions options) {
+    return withLogging("Frame.waitForSelector", () -> waitForSelectorImpl(selector, options));
+  }
+
+  ElementHandle waitForSelectorImpl(String selector, WaitForSelectorOptions options) {
    return waitForSelectorImpl(selector, options, false);
  }

@@ -995,7 +1061,7 @@ public class FrameImpl extends ChannelOwner implements Frame {
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    params.addProperty("selector", selector);
    params.addProperty("omitReturnValue", omitReturnValue);
-    JsonElement json = sendMessage("waitForSelector", params, timeout(options.timeout));
+    JsonElement json = sendMessage("waitForSelector", params);
    JsonObject element = json.getAsJsonObject().getAsJsonObject("element");
    if (element == null) {
      return null;
@@ -1005,14 +1071,18 @@ public class FrameImpl extends ChannelOwner implements Frame {

  @Override
  public void waitForTimeout(double timeout) {
+    withLogging("Frame.waitForTimeout", () -> waitForTimeoutImpl(timeout));
+  }
+
+  void waitForTimeoutImpl(double timeout) {
    JsonObject params = new JsonObject();
-    params.addProperty("waitTimeout", timeout);
-    sendMessage("waitForTimeout", params, NO_TIMEOUT);
+    params.addProperty("timeout", timeout);
+    sendMessage("waitForTimeout", params);
  }

  @Override
  public void waitForURL(String url, WaitForURLOptions options) {
-    waitForURL(UrlMatcher.forGlob(page.context().baseUrl(), url, this.connection.localUtils, false), options);
+    waitForURL(new UrlMatcher(page.context().baseUrl, url), options);
  }

  @Override
@@ -1047,14 +1117,14 @@ public class FrameImpl extends ChannelOwner implements Frame {
  int queryCount(String selector) {
    JsonObject params = new JsonObject();
    params.addProperty("selector", selector);
-    JsonObject result = sendMessage("queryCount", params, NO_TIMEOUT).getAsJsonObject();
+    JsonObject result = sendMessage("queryCount", params).getAsJsonObject();
    return result.get("value").getAsInt();
  }

  void highlightImpl(String selector) {
    JsonObject params = new JsonObject();
    params.addProperty("selector", selector);
-    sendMessage("highlight", params, NO_TIMEOUT);
+    sendMessage("highlight", params);
  }

  protected void handleEvent(String event, JsonObject params) {
@@ -1085,30 +1155,4 @@ public class FrameImpl extends ChannelOwner implements Frame {
      internalListeners.notify(InternalEventType.NAVIGATED, params);
    }
  }
-
-  protected double timeout(Double timeout) {
-    if (page != null) {
-      return page.timeoutSettings.timeout(timeout);
-    }
-    return new TimeoutSettings().timeout(timeout);
-  }
-
-  protected double navigationTimeout(Double timeout) {
-    if (page != null) {
-      return page.timeoutSettings.navigationTimeout(timeout);
-    }
-    return new TimeoutSettings().navigationTimeout(timeout);
-  }
-
-  FrameExpectResult expect(String expression, FrameExpectOptions options, String title) {
-    return withTitle(title, () -> expect(expression, options));
-  }
-
-  FrameExpectResult expect(String expression, FrameExpectOptions options) {
-    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    params.addProperty("expression", expression);
-    JsonElement json = sendMessage("expect", params, options.timeout);
-    FrameExpectResult result = gson().fromJson(json, FrameExpectResult.class);
-    return result;
-  }
 }
@@ -82,12 +82,12 @@ class FrameLocatorImpl implements FrameLocator {

  @Override
  public Locator getByTestId(String testId) {
-    return locator(getByTestIdSelector(testId, frame.connection.playwright));
+    return locator(getByTestIdSelector(testId));
  }

  @Override
  public Locator getByTestId(Pattern testId) {
-    return locator(getByTestIdSelector(testId, frame.connection.playwright));
+    return locator(getByTestIdSelector(testId));
  }

  @Override
@@ -133,9 +133,4 @@ class FrameLocatorImpl implements FrameLocator {
  public FrameLocator nth(int index) {
    return new FrameLocatorImpl(frame, frameSelector + " >> nth=" + index);
  }
-
-  @Override
-  public Locator owner() {
-    return new LocatorImpl(frame, frameSelector, null);
-  }
 }
@@ -26,7 +26,6 @@ import java.nio.file.Path;
 import java.util.Base64;
 import java.util.Map;

-import static com.microsoft.playwright.impl.ChannelOwner.NO_TIMEOUT;
 import static com.microsoft.playwright.impl.LoggingSupport.*;
 import static com.microsoft.playwright.impl.Serialization.fromNameValues;
 import static com.microsoft.playwright.impl.Serialization.gson;
@@ -42,7 +41,7 @@ public class HARRouter {

    JsonObject params = new JsonObject();
    params.addProperty("file", harFile.toString());
-    JsonObject json = localUtils.sendMessage("harOpen", params, NO_TIMEOUT).getAsJsonObject();
+    JsonObject json = localUtils.sendMessage("harOpen", params).getAsJsonObject();
    if (json.has("error")) {
      throw new PlaywrightException(json.get("error").getAsString());
    }
@@ -62,7 +61,7 @@ public class HARRouter {
      params.addProperty("postData", base64);
    }
    params.addProperty("isNavigationRequest", request.isNavigationRequest());
-    JsonObject response = localUtils.sendMessage("harLookup", params, NO_TIMEOUT).getAsJsonObject();
+    JsonObject response = localUtils.sendMessage("harLookup", params).getAsJsonObject();

    String action = response.get("action").getAsString();
    if ("redirect".equals(action)) {
@@ -74,14 +73,6 @@ public class HARRouter {

    if ("fulfill".equals(action)) {
      int status = response.get("status").getAsInt();
-      // If the response status is -1, the request was canceled or stalled, so we just stall it here.
-      // See https://github.com/microsoft/playwright/issues/29311.
-      // TODO: it'd be better to abort such requests, but then we likely need to respect the timing,
-      // because the request might have been stalled for a long time until the very end of the
-      // test when HAR was recorded but we'd abort it immediately.
-      if (status == -1) {
-        return;
-      }
      Map<String, String> headers = fromNameValues(response.getAsJsonArray("headers"));
      byte[] buffer = Base64.getDecoder().decode(response.get("body").getAsString());
      route.fulfill(new Route.FulfillOptions()
@@ -41,58 +41,65 @@ public class JSHandleImpl extends ChannelOwner implements JSHandle {

  @Override
  public void dispose() {
-    try {
-      sendMessage("dispose");
-    } catch (TargetClosedError e) {
-    }
+    withLogging("JSHandle.dispose", () -> sendMessage("dispose"));
  }

  @Override
  public Object evaluate(String pageFunction, Object arg) {
-    JsonObject params = new JsonObject();
-    params.addProperty("expression", pageFunction);
-    params.addProperty("world", "main");
-    params.add("arg", gson().toJsonTree(serializeArgument(arg)));
-    JsonElement json = sendMessage("evaluateExpression", params, NO_TIMEOUT);
-    SerializedValue value = gson().fromJson(json.getAsJsonObject().get("value"), SerializedValue.class);
-    return deserialize(value);
+    return withLogging("JSHandle.evaluate", () -> {
+      JsonObject params = new JsonObject();
+      params.addProperty("expression", pageFunction);
+      params.addProperty("world", "main");
+      params.add("arg", gson().toJsonTree(serializeArgument(arg)));
+      JsonElement json = sendMessage("evaluateExpression", params);
+      SerializedValue value = gson().fromJson(json.getAsJsonObject().get("value"), SerializedValue.class);
+      return deserialize(value);
+    });
  }

  @Override
  public JSHandle evaluateHandle(String pageFunction, Object arg) {
-    JsonObject params = new JsonObject();
-    params.addProperty("expression", pageFunction);
-    params.addProperty("world", "main");
-    params.add("arg", gson().toJsonTree(serializeArgument(arg)));
-    JsonElement json = sendMessage("evaluateExpressionHandle", params, NO_TIMEOUT);
-    return connection.getExistingObject(json.getAsJsonObject().getAsJsonObject("handle").get("guid").getAsString());
+    return withLogging("JSHandle.evaluateHandle", () -> {
+      JsonObject params = new JsonObject();
+      params.addProperty("expression", pageFunction);
+      params.addProperty("world", "main");
+      params.add("arg", gson().toJsonTree(serializeArgument(arg)));
+      JsonElement json = sendMessage("evaluateExpressionHandle", params);
+      return connection.getExistingObject(json.getAsJsonObject().getAsJsonObject("handle").get("guid").getAsString());
+    });
  }

  @Override
  public Map<String, JSHandle> getProperties() {
-    JsonObject json = sendMessage("getPropertyList").getAsJsonObject();
-    Map<String, JSHandle> result = new HashMap<>();
-    for (JsonElement e : json.getAsJsonArray("properties")) {
-      JsonObject item = e.getAsJsonObject();
-      JSHandle value = connection.getExistingObject(item.getAsJsonObject("value").get("guid").getAsString());
-      result.put(item.get("name").getAsString(), value);
-    }
-    return result;
+    return withLogging("JSHandle.getProperties", () -> {
+      JsonObject json = sendMessage("getPropertyList").getAsJsonObject();
+      Map<String, JSHandle> result = new HashMap<>();
+      for (JsonElement e : json.getAsJsonArray("properties")) {
+        JsonObject item = e.getAsJsonObject();
+        JSHandle value = connection.getExistingObject(item.getAsJsonObject("value").get("guid").getAsString());
+        result.put(item.get("name").getAsString(), value);
+      }
+      return result;
+    });
  }

  @Override
  public JSHandle getProperty(String propertyName) {
-    JsonObject params = new JsonObject();
-    params.addProperty("name", propertyName);
-    JsonObject json = sendMessage("getProperty", params, NO_TIMEOUT).getAsJsonObject();
-    return connection.getExistingObject(json.getAsJsonObject("handle").get("guid").getAsString());
+    return withLogging("JSHandle.getProperty", () -> {
+      JsonObject params = new JsonObject();
+      params.addProperty("name", propertyName);
+      JsonObject json = sendMessage("getProperty", params).getAsJsonObject();
+      return connection.getExistingObject(json.getAsJsonObject("handle").get("guid").getAsString());
+    });
  }

  @Override
  public Object jsonValue() {
-    JsonObject json = sendMessage("jsonValue").getAsJsonObject();
-    SerializedValue value = gson().fromJson(json.get("value"), SerializedValue.class);
-    return deserialize(value);
+    return withLogging("JSHandle.jsonValue", () -> {
+      JsonObject json = sendMessage("jsonValue").getAsJsonObject();
+      SerializedValue value = gson().fromJson(json.get("value"), SerializedValue.class);
+      return deserialize(value);
+    });
  }

  @Override
@@ -33,7 +33,6 @@ class JsonPipe extends ChannelOwner implements Transport {
  private ListenerCollection<EventType> listeners = new ListenerCollection<>();
  private enum EventType { CLOSE }
  private boolean isClosed;
-  private String closeReason = "Browser has been closed";

  JsonPipe(ChannelOwner parent, String type, String guid, JsonObject initializer) {
    super(parent, type, guid, initializer);
@@ -44,7 +43,7 @@ class JsonPipe extends ChannelOwner implements Transport {
    checkIfClosed();
    JsonObject params = new JsonObject();
    params.add("message", message);
-    sendMessage("send", params, NO_TIMEOUT);
+    sendMessage("send", params);
  }

  @Override
@@ -98,19 +97,13 @@ class JsonPipe extends ChannelOwner implements Transport {
      incoming.add(params.get("message").getAsJsonObject());
    } else if ("closed".equals(event)) {
      isClosed = true;
-      if (params.has("reason")) {
-        String reason = params.get("reason").getAsString();
-        if (reason.trim().length() > 0) {
-          closeReason = reason;
-        }
-      }
      listeners.notify(EventType.CLOSE, this);
    }
  }

  private void checkIfClosed() {
    if (isClosed) {
-      throw new PlaywrightException(closeReason);
+      throw new PlaywrightException("Browser has been closed");
    }
  }
 }
@@ -19,7 +19,6 @@ package com.microsoft.playwright.impl;
 import com.google.gson.JsonObject;
 import com.microsoft.playwright.Keyboard;

-import static com.microsoft.playwright.impl.ChannelOwner.NO_TIMEOUT;
 import static com.microsoft.playwright.impl.Serialization.gson;

 class KeyboardImpl implements Keyboard {
@@ -31,21 +30,25 @@ class KeyboardImpl implements Keyboard {

  @Override
  public void down(String key) {
-    JsonObject params = new JsonObject();
-    params.addProperty("key", key);
-    page.sendMessage("keyboardDown", params, NO_TIMEOUT);
+    page.withLogging("Keyboard.down", () -> {
+      JsonObject params = new JsonObject();
+      params.addProperty("key", key);
+      page.sendMessage("keyboardDown", params);
+    });
  }

  @Override
  public void insertText(String text) {
-    JsonObject params = new JsonObject();
-    params.addProperty("text", text);
-    page.sendMessage("keyboardInsertText", params, NO_TIMEOUT);
+    page.withLogging("Keyboard.insertText", () -> {
+      JsonObject params = new JsonObject();
+      params.addProperty("text", text);
+      page.sendMessage("keyboardInsertText", params);
+    });
  }

  @Override
  public void press(String key, PressOptions options) {
-    pressImpl(key, options);
+    page.withLogging("Keyboard.press", () -> pressImpl(key, options));
  }

  private void pressImpl(String key, PressOptions options) {
@@ -54,12 +57,12 @@ class KeyboardImpl implements Keyboard {
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    params.addProperty("key", key);
-    page.sendMessage("keyboardPress", params, NO_TIMEOUT);
+    page.sendMessage("keyboardPress", params);
  }

    @Override
  public void type(String text, TypeOptions options) {
-    typeImpl(text, options);
+    page.withLogging("Keyboard.type", () -> typeImpl(text, options));
  }

  private void typeImpl(String text, TypeOptions options) {
@@ -68,13 +71,15 @@ class KeyboardImpl implements Keyboard {
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    params.addProperty("text", text);
-    page.sendMessage("keyboardType", params, NO_TIMEOUT);
+    page.sendMessage("keyboardType", params);
  }

  @Override
  public void up(String key) {
-    JsonObject params = new JsonObject();
-    params.addProperty("key", key);
-    page.sendMessage("keyboardUp", params, NO_TIMEOUT);
+    page.withLogging("Keyboard.up", () -> {
+      JsonObject params = new JsonObject();
+      params.addProperty("key", key);
+      page.sendMessage("keyboardUp", params);
+    });
  }
 }
@@ -17,7 +17,6 @@
 package com.microsoft.playwright.impl;

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

 import java.util.*;
 import java.util.function.Consumer;
@@ -47,9 +46,6 @@ class ListenerCollection <EventType> {
  }

  void add(EventType type, Consumer<?> listener) {
-    if (listener == null) {
-      throw new PlaywrightException("Can't add a null listener");
-    }
    List<Consumer<?>> list = listeners.get(type);
    if (list == null) {
      list = new ArrayList<>();
@@ -21,19 +21,14 @@ import com.google.gson.JsonObject;

 import java.nio.file.Path;
 import java.util.List;
-import java.util.regex.Pattern;

 import static com.microsoft.playwright.impl.Serialization.gson;

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

-  JsonArray deviceDescriptors() {
-    return initializer.getAsJsonArray("deviceDescriptors");
-  }
-
  void zip(Path zipFile, JsonArray entries, String stacksId, boolean appendMode, boolean includeSources) {
    JsonObject params = new JsonObject();
    params.addProperty("zipFile", zipFile.toString());
@@ -41,13 +36,13 @@ public class LocalUtils extends ChannelOwner {
    params.addProperty("mode", appendMode ? "append" : "write");
    params.addProperty("stacksId", stacksId);
    params.addProperty("includeSources", includeSources);
-    sendMessage("zip", params, NO_TIMEOUT);
+    sendMessage("zip", params);
  }

  void traceDiscarded(String stacksId) {
    JsonObject params = new JsonObject();
    params.addProperty("stacksId", stacksId);
-    sendMessage("traceDiscarded", params, NO_TIMEOUT);
+    sendMessage("traceDiscarded", params);
  }

  String tracingStarted(String tracesDir, String traceName) {
@@ -56,19 +51,7 @@ public class LocalUtils extends ChannelOwner {
      params.addProperty("tracesDir", "");
    }
    params.addProperty("traceName", traceName);
-    JsonObject json = connection.localUtils().sendMessage("tracingStarted", params, NO_TIMEOUT).getAsJsonObject();
+    JsonObject json = connection.localUtils().sendMessage("tracingStarted", params).getAsJsonObject();
    return json.get("stacksId").getAsString();
  }
-
-  public Pattern globToRegex(String glob, String baseURL, boolean webSocketUrl) {
-    JsonObject params = new JsonObject();
-    params.addProperty("glob", glob);
-    if (baseURL != null) {
-      params.addProperty("baseURL", baseURL);
-    }
-    params.addProperty("webSocketUrl", webSocketUrl);
-    JsonObject json = connection.localUtils().sendMessage("globToRegex", params, NO_TIMEOUT).getAsJsonObject();
-    String regex = json.get("regex").getAsString();
-    return Pattern.compile(regex);
-  }
 }
@@ -18,51 +18,22 @@ package com.microsoft.playwright.impl;

 import com.microsoft.playwright.Locator;
 import com.microsoft.playwright.assertions.LocatorAssertions;
-import com.microsoft.playwright.options.AriaRole;

+import java.lang.reflect.Field;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.regex.Pattern;

 import static com.microsoft.playwright.impl.Serialization.serializeArgument;
 import static com.microsoft.playwright.impl.Utils.convertType;

 public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAssertions {
-  LocatorImpl actualLocator;
-
  public LocatorAssertionsImpl(Locator locator) {
    this(locator, false);
  }

  private LocatorAssertionsImpl(Locator locator, boolean isNot) {
-    super(isNot);
-    this.actualLocator = (LocatorImpl) locator;
-  }
-
-  @Override
-  FrameExpectResult doExpect(String expression, FrameExpectOptions expectOptions, String title) {
-    return actualLocator.expect(expression, expectOptions, title);
-  }
-
-
-  @Override
-  public void containsClass(String classname, ContainsClassOptions options) {
-    ExpectedTextValue expected = new ExpectedTextValue();
-    expected.string = classname;
-    expectImpl("to.contain.class", expected, classname, "Locator expected to contain class", convertType(options, FrameExpectOptions.class), "Assert \"containsClass\"");
-  }
-
-  @Override
-  public void containsClass(List<String> classnames, ContainsClassOptions options) {
-    List<ExpectedTextValue> list = new ArrayList<>();
-    for (String text : classnames) {
-      ExpectedTextValue expected = new ExpectedTextValue();
-      expected.string = text;
-      list.add(expected);
-    }
-    expectImpl("to.contain.class.array", list, classnames, "Locator expected to contain classes", convertType(options, FrameExpectOptions.class), "Assert \"containsClass\"");
+    super((LocatorImpl) locator, isNot);
  }

  @Override
@@ -72,7 +43,7 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
    expected.ignoreCase = shouldIgnoreCase(options);
    expected.matchSubstring = true;
    expected.normalizeWhiteSpace = true;
-    expectImpl("to.have.text", expected, text, "Locator expected to contain text", convertType(options, FrameExpectOptions.class), "Assert \"containsText\"");
+    expectImpl("to.have.text", expected, text, "Locator expected to contain text", convertType(options, FrameExpectOptions.class));
  }

  @Override
@@ -81,7 +52,7 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
    expected.ignoreCase = shouldIgnoreCase(options);
    expected.matchSubstring = true;
    expected.normalizeWhiteSpace = true;
-    expectImpl("to.have.text", expected, pattern, "Locator expected to contain regex", convertType(options, FrameExpectOptions.class), "Assert \"containsText\"");
+    expectImpl("to.have.text", expected, pattern, "Locator expected to contain regex", convertType(options, FrameExpectOptions.class));
  }

  @Override
@@ -95,7 +66,7 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
      expected.normalizeWhiteSpace = true;
      list.add(expected);
    }
-    expectImpl("to.contain.text.array", list, strings, "Locator expected to contain text", convertType(options, FrameExpectOptions.class), "Assert \"containsText\"");
+    expectImpl("to.contain.text.array", list, strings, "Locator expected to contain text", convertType(options, FrameExpectOptions.class));
  }

  @Override
@@ -108,72 +79,19 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
      expected.normalizeWhiteSpace = true;
      list.add(expected);
    }
-    expectImpl("to.contain.text.array", list, patterns, "Locator expected to contain text", convertType(options, FrameExpectOptions.class), "Assert \"containsText\"");
-  }
-
-  @Override
-  public void hasAccessibleDescription(String description, HasAccessibleDescriptionOptions options) {
-    ExpectedTextValue expected = new ExpectedTextValue();
-    expected.string = description;
-    expected.ignoreCase = shouldIgnoreCase(options);
-    expected.normalizeWhiteSpace = true;
-    expectImpl("to.have.accessible.description", expected, description, "Locator expected to have accessible description", convertType(options, FrameExpectOptions.class), "Assert \"hasAccessibleDescription\"");
-  }
-
-  @Override
-  public void hasAccessibleDescription(Pattern pattern, HasAccessibleDescriptionOptions options) {
-    ExpectedTextValue expected = expectedRegex(pattern);
-    expected.ignoreCase = shouldIgnoreCase(options);
-    expected.normalizeWhiteSpace = true;
-    expectImpl("to.have.accessible.description", expected, pattern, "Locator expected to have accessible description", convertType(options, FrameExpectOptions.class), "Assert \"hasAccessibleDescription\"");
-  }
-
-  @Override
-  public void hasAccessibleErrorMessage(String errorMessage, HasAccessibleErrorMessageOptions options) {
-    ExpectedTextValue expected = new ExpectedTextValue();
-    expected.string = errorMessage;
-    expected.ignoreCase = shouldIgnoreCase(options);
-    expected.normalizeWhiteSpace = true;
-    expectImpl("to.have.accessible.error.message", expected, errorMessage, "Locator expected to have accessible error message", convertType(options, FrameExpectOptions.class), "Assert \"hasAccessibleErrorMessage\"");
-  }
-
-  @Override
-  public void hasAccessibleErrorMessage(Pattern pattern, HasAccessibleErrorMessageOptions options) {
-    ExpectedTextValue expected = expectedRegex(pattern);
-    expected.ignoreCase = shouldIgnoreCase(options);
-    expected.normalizeWhiteSpace = true;
-    expectImpl("to.have.accessible.error.message", expected, pattern, "Locator expected to have accessible error message", convertType(options, FrameExpectOptions.class), "Assert \"hasAccessibleErrorMessage\"");
-  }
-
-  @Override
-  public void hasAccessibleName(String name, HasAccessibleNameOptions options) {
-    ExpectedTextValue expected = new ExpectedTextValue();
-    expected.string = name;
-    expected.ignoreCase = shouldIgnoreCase(options);
-    expected.normalizeWhiteSpace = true;
-    expectImpl("to.have.accessible.name", expected, name, "Locator expected to have accessible name", convertType(options, FrameExpectOptions.class), "Assert \"hasAccessibleName\"");
-  }
-
-  @Override
-  public void hasAccessibleName(Pattern pattern, HasAccessibleNameOptions options) {
-    ExpectedTextValue expected = expectedRegex(pattern);
-    expected.ignoreCase = shouldIgnoreCase(options);
-    expected.normalizeWhiteSpace = true;
-    expectImpl("to.have.accessible.name", expected, pattern, "Locator expected to have accessible name", convertType(options, FrameExpectOptions.class), "Assert \"hasAccessibleName\"");
+    expectImpl("to.contain.text.array", list, patterns, "Locator expected to contain text", convertType(options, FrameExpectOptions.class));
  }

  @Override
  public void hasAttribute(String name, String text, HasAttributeOptions options) {
    ExpectedTextValue expected = new ExpectedTextValue();
    expected.string = text;
-    expected.ignoreCase = shouldIgnoreCase(options);
    hasAttribute(name, expected, text, options);
  }

  @Override
  public void hasAttribute(String name, Pattern pattern, HasAttributeOptions options) {
    ExpectedTextValue expected = expectedRegex(pattern);
-    expected.ignoreCase = shouldIgnoreCase(options);
    hasAttribute(name, expected, pattern, options);
  }

@@ -187,20 +105,20 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
    if (expectedValue instanceof Pattern) {
      message += " matching regex";
    }
-    expectImpl("to.have.attribute.value", expectedText, expectedValue, message, commonOptions, "Assert \"hasAttribute\"");
+    expectImpl("to.have.attribute", expectedText, expectedValue, message, commonOptions);
  }

  @Override
  public void hasClass(String text, HasClassOptions options) {
    ExpectedTextValue expected = new ExpectedTextValue();
    expected.string = text;
-    expectImpl("to.have.class", expected, text, "Locator expected to have class", convertType(options, FrameExpectOptions.class), "Assert \"hasClass\"");
+    expectImpl("to.have.class", expected, text, "Locator expected to have class", convertType(options, FrameExpectOptions.class));
  }

  @Override
  public void hasClass(Pattern pattern, HasClassOptions options) {
    ExpectedTextValue expected = expectedRegex(pattern);
-    expectImpl("to.have.class", expected, pattern, "Locator expected to have class matching regex", convertType(options, FrameExpectOptions.class), "Assert \"hasClass\"");
+    expectImpl("to.have.class", expected, pattern, "Locator expected to have class matching regex", convertType(options, FrameExpectOptions.class));
  }

  @Override
@@ -211,7 +129,7 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
      expected.string = text;
      list.add(expected);
    }
-    expectImpl("to.have.class.array", list, strings, "Locator expected to have class", convertType(options, FrameExpectOptions.class), "Assert \"hasClass\"");
+    expectImpl("to.have.class.array", list, strings, "Locator expected to have class", convertType(options, FrameExpectOptions.class));
  }

  @Override
@@ -221,7 +139,7 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
      ExpectedTextValue expected = expectedRegex(pattern);
      list.add(expected);
    }
-    expectImpl("to.have.class.array", list, patterns, "Locator expected to have class matching regex", convertType(options, FrameExpectOptions.class), "Assert \"hasClass\"");
+    expectImpl("to.have.class.array", list, patterns, "Locator expected to have class matching regex", convertType(options, FrameExpectOptions.class));
  }

  @Override
@@ -232,7 +150,7 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
    FrameExpectOptions commonOptions = convertType(options, FrameExpectOptions.class);
    commonOptions.expectedNumber = (double) count;
    List<ExpectedTextValue> expectedText = null;
-    expectImpl("to.have.count", expectedText, count, "Locator expected to have count", commonOptions, "Assert \"hasCount\"");
+    expectImpl("to.have.count", expectedText, count, "Locator expected to have count", commonOptions);
  }

  @Override
@@ -258,20 +176,20 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
    if (expectedValue instanceof Pattern) {
      message += " matching regex";
    }
-    expectImpl("to.have.css", expectedText, expectedValue, message, commonOptions, "Assert \"hasCSS\"");
+    expectImpl("to.have.css", expectedText, expectedValue, message, commonOptions);
  }

  @Override
  public void hasId(String id, HasIdOptions options) {
    ExpectedTextValue expected = new ExpectedTextValue();
    expected.string = id;
-    expectImpl("to.have.id", expected, id, "Locator expected to have ID", convertType(options, FrameExpectOptions.class), "Assert \"hasId\"");
+    expectImpl("to.have.id", expected, id, "Locator expected to have ID", convertType(options, FrameExpectOptions.class));
  }

  @Override
  public void hasId(Pattern pattern, HasIdOptions options) {
    ExpectedTextValue expected = expectedRegex(pattern);
-    expectImpl("to.have.id", expected, pattern, "Locator expected to have ID matching regex", convertType(options, FrameExpectOptions.class), "Assert \"hasId\"");
+    expectImpl("to.have.id", expected, pattern, "Locator expected to have ID matching regex", convertType(options, FrameExpectOptions.class));
  }

  @Override
@@ -283,14 +201,7 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
    commonOptions.expressionArg = name;
    commonOptions.expectedValue = serializeArgument(value);
    List<ExpectedTextValue> list = null;
-    expectImpl("to.have.property", list, value, "Locator expected to have JavaScript property '" + name + "'", commonOptions, "Assert \"hasJSProperty\"");
-  }
-
-  @Override
-  public void hasRole(AriaRole role, HasRoleOptions options) {
-    ExpectedTextValue expected = new ExpectedTextValue();
-    expected.string = role.toString().toLowerCase();
-    expectImpl("to.have.role", expected, expected.string, "Locator expected to have role", convertType(options, FrameExpectOptions.class), "Assert \"hasRole\"");
+    expectImpl("to.have.property", list, value, "Locator expected to have JavaScript property '" + name + "'", commonOptions);
  }

  @Override
@@ -300,7 +211,7 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
    expected.ignoreCase = shouldIgnoreCase(options);
    expected.matchSubstring = false;
    expected.normalizeWhiteSpace = true;
-    expectImpl("to.have.text", expected, text, "Locator expected to have text", convertType(options, FrameExpectOptions.class), "Assert \"hasText\"");
+    expectImpl("to.have.text", expected, text, "Locator expected to have text", convertType(options, FrameExpectOptions.class));
  }

  @Override
@@ -310,7 +221,7 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
    // Just match substring, same as containsText.
    expected.matchSubstring = true;
    expected.normalizeWhiteSpace = true;
-    expectImpl("to.have.text", expected, pattern, "Locator expected to have text matching regex", convertType(options, FrameExpectOptions.class), "Assert \"hasText\"");
+    expectImpl("to.have.text", expected, pattern, "Locator expected to have text matching regex", convertType(options, FrameExpectOptions.class));
  }

  @Override
@@ -324,7 +235,7 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
      expected.normalizeWhiteSpace = true;
      list.add(expected);
    }
-    expectImpl("to.have.text.array", list, strings, "Locator expected to have text", convertType(options, FrameExpectOptions.class), "Assert \"hasText\"");
+    expectImpl("to.have.text.array", list, strings, "Locator expected to have text", convertType(options, FrameExpectOptions.class));
  }

  @Override
@@ -337,20 +248,20 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
      expected.normalizeWhiteSpace = true;
      list.add(expected);
    }
-    expectImpl("to.have.text.array", list, patterns, "Locator expected to have text matching regex", convertType(options, FrameExpectOptions.class), "Assert \"hasText\"");
+    expectImpl("to.have.text.array", list, patterns, "Locator expected to have text matching regex", convertType(options, FrameExpectOptions.class));
  }

  @Override
  public void hasValue(String value, HasValueOptions options) {
    ExpectedTextValue expected = new ExpectedTextValue();
    expected.string = value;
-    expectImpl("to.have.value", expected, value, "Locator expected to have value", convertType(options, FrameExpectOptions.class), "Assert \"hasValue\"");
+    expectImpl("to.have.value", expected, value, "Locator expected to have value", convertType(options, FrameExpectOptions.class));
  }

  @Override
  public void hasValue(Pattern pattern, HasValueOptions options) {
    ExpectedTextValue expected = expectedRegex(pattern);
-    expectImpl("to.have.value", expected, pattern, "Locator expected to have value matching regex", convertType(options, FrameExpectOptions.class), "Assert \"hasValue\"");
+    expectImpl("to.have.value", expected, pattern, "Locator expected to have value matching regex", convertType(options, FrameExpectOptions.class));
  }

  @Override
@@ -361,7 +272,7 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
      expected.string = text;
      list.add(expected);
    }
-    expectImpl("to.have.values", list, values, "Locator expected to have values", convertType(options, FrameExpectOptions.class), "Assert \"hasValues\"");
+    expectImpl("to.have.values", list, values, "Locator expected to have values", convertType(options, FrameExpectOptions.class));
  }

  @Override
@@ -372,50 +283,20 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
      expected.matchSubstring = true;
      list.add(expected);
    }
-    expectImpl("to.have.values", list, patterns, "Locator expected to have values matching regex", convertType(options, FrameExpectOptions.class), "Assert \"hasValues\"");
-  }
-
-  @Override
-  public void matchesAriaSnapshot(String expected, MatchesAriaSnapshotOptions snapshotOptions) {
-    if (snapshotOptions == null) {
-      snapshotOptions = new MatchesAriaSnapshotOptions();
-    }
-    FrameExpectOptions options = convertType(snapshotOptions, FrameExpectOptions.class);
-    options.expectedValue = serializeArgument(expected);
-    expectImpl("to.match.aria", options, expected,"Locator expected to match Aria snapshot", "Assert \"matchesAriaSnapshot\"");
+    expectImpl("to.have.values", list, patterns, "Locator expected to have values matching regex", convertType(options, FrameExpectOptions.class));
  }

  @Override
  public void isChecked(IsCheckedOptions options) {
-    if (options == null) {
-      options = new IsCheckedOptions();
-    }
-
-    Map<String, Boolean> expectedValue = new HashMap<>();
-    if (options.indeterminate != null) {
-      expectedValue.put("indeterminate", options.indeterminate);
-    }
-    if (options.checked != null) {
-      expectedValue.put("checked", options.checked);
-    }
-
-    String expected;
-    if (options.indeterminate != null && options.indeterminate) {
-      expected = "indeterminate";
-    } else {
-      boolean unchecked = options.checked != null && !options.checked;
-      expected = unchecked ? "unchecked" : "checked";
-    }
-
-    String message = "Locator expected to be";
-    FrameExpectOptions expectOptions = convertType(options, FrameExpectOptions.class);
-    expectOptions.expectedValue = serializeArgument(expectedValue);
-    expectImpl("to.be.checked", expectOptions, expected, message, "Assert \"isChecked\"");
+    boolean unchecked = options != null && options.checked != null && !options.checked;
+    String expression = unchecked ? "to.be.unchecked" : "to.be.checked";
+    String message = "Locator expected to be " + (unchecked ? "un" : "") + "checked";
+    expectTrue(expression, message, convertType(options, FrameExpectOptions.class));
  }

  @Override
  public void isDisabled(IsDisabledOptions options) {
-    expectTrue("to.be.disabled", "Locator expected to be disabled", convertType(options, FrameExpectOptions.class), "Assert \"isDisabled\"");
+    expectTrue("to.be.disabled", "Locator expected to be disabled", convertType(options, FrameExpectOptions.class));
  }

  @Override
@@ -423,12 +304,12 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
    FrameExpectOptions frameOptions = convertType(options, FrameExpectOptions.class);
    boolean editable = options == null || options.editable == null || options.editable == true;
    String message = "Locator expected to be " + (editable ? "editable" : "readonly");
-    expectTrue(editable ? "to.be.editable" : "to.be.readonly", message, frameOptions, "Assert \"isEditable\"");
+    expectTrue(editable ? "to.be.editable" : "to.be.readonly", message, frameOptions);
  }

  @Override
  public void isEmpty(IsEmptyOptions options) {
-    expectTrue("to.be.empty", "Locator expected to be empty", convertType(options, FrameExpectOptions.class), "Assert \"isEmpty\"");
+    expectTrue("to.be.empty", "Locator expected to be empty", convertType(options, FrameExpectOptions.class));
  }

  @Override
@@ -436,17 +317,17 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
    FrameExpectOptions frameOptions = convertType(options, FrameExpectOptions.class);
    boolean enabled = options == null || options.enabled == null || options.enabled == true;
    String message = "Locator expected to be " + (enabled ? "enabled" : "disabled");
-    expectTrue(enabled ? "to.be.enabled" : "to.be.disabled", message, frameOptions, "Assert \"isEnabled\"");
+    expectTrue(enabled ? "to.be.enabled" : "to.be.disabled", message, frameOptions);
  }

  @Override
  public void isFocused(IsFocusedOptions options) {
-    expectTrue("to.be.focused", "Locator expected to be focused", convertType(options, FrameExpectOptions.class), "Assert \"isFocused\"");
+    expectTrue("to.be.focused", "Locator expected to be focused", convertType(options, FrameExpectOptions.class));
  }

  @Override
  public void isHidden(IsHiddenOptions options) {
-    expectTrue("to.be.hidden", "Locator expected to be hidden", convertType(options, FrameExpectOptions.class), "Assert \"isHidden\"");
+    expectTrue("to.be.hidden", "Locator expected to be hidden", convertType(options, FrameExpectOptions.class));
  }

  @Override
@@ -455,7 +336,7 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
    if (options != null && options.ratio != null) {
      expectOptions.expectedNumber = options.ratio;
    }
-    expectTrue("to.be.in.viewport", "Locator expected to be in viewport",  expectOptions, "Assert \"isInViewport\"");
+    expectTrue("to.be.in.viewport", "Locator expected to be in viewport",  expectOptions);
  }

  @Override
@@ -463,12 +344,12 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
    FrameExpectOptions frameOptions = convertType(options, FrameExpectOptions.class);
    boolean visible = options == null || options.visible == null || options.visible == true;
    String message = "Locator expected to be " + (visible ? "visible" : "hidden");
-    expectTrue(visible ? "to.be.visible" : "to.be.hidden", message, frameOptions, "Assert \"isVisible\"");
+    expectTrue(visible ? "to.be.visible" : "to.be.hidden", message, frameOptions);
  }

-  private void expectTrue(String expression, String message, FrameExpectOptions options, String title) {
+  private void expectTrue(String expression, String message, FrameExpectOptions options) {
    List<ExpectedTextValue> expectedText = null;
-    expectImpl(expression, expectedText, null, message, options, title);
+    expectImpl(expression, expectedText, null, message, options);
  }

  @Override
@@ -481,6 +362,19 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
    FrameExpectOptions frameOptions = convertType(options, FrameExpectOptions.class);
    boolean attached = options == null || options.attached == null || options.attached == true;
    String message = "Locator expected to be " + (attached ? "attached" : "detached");
-    expectTrue(attached ? "to.be.attached" : "to.be.detached", message, frameOptions, "Assert \"isAttached\"");
+    expectTrue(attached ? "to.be.attached" : "to.be.detached", message, frameOptions);
+  }
+
+  private static Boolean shouldIgnoreCase(Object options) {
+    if (options == null) {
+      return null;
+    }
+    try {
+      Field fromField = options.getClass().getDeclaredField("ignoreCase");
+      Object value = fromField.get(options);
+      return (Boolean) value;
+    } catch (NoSuchFieldException | IllegalAccessException e) {
+      return null;
+    }
  }
 }
@@ -1,45 +1,29 @@
-/*
- * 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.impl;

+import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.microsoft.playwright.*;
 import com.microsoft.playwright.options.*;

+import java.lang.reflect.Field;
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.function.BiFunction;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;

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

 class LocatorImpl implements Locator {
  final FrameImpl frame;
  final String selector;

-  LocatorImpl(FrameImpl frame, String selector, LocatorOptions options) {
-    this(frame, selector, options, null);
-  }
-
-  private LocatorImpl(FrameImpl frame, String selector, LocatorOptions options, Boolean visible) {
+  public LocatorImpl(FrameImpl frame, String selector, LocatorOptions options) {
    this.frame = frame;
    if (options != null) {
      if (options.hasText != null) {
@@ -61,31 +45,30 @@ class LocatorImpl implements Locator {
        selector += " >> internal:has-not=" + gson().toJson(locator.selector);
      }
    }
-    if (visible != null) {
-      selector += " >> visible=" + visible;
-    }
    this.selector = selector;
  }

-  private <R, O> R withElement(BiFunction<ElementHandle, O, R> callback, O options, String title) {
-    return frame.withTitle(title, () -> {
-      ElementHandleOptions handleOptions = convertType(options, ElementHandleOptions.class);
-      // TODO: support deadline based timeout
-      //    Double timeout = null;
-      //    if (handleOptions != null) {
-      //      timeout = handleOptions.timeout;
-      //    }
-      //    timeout = frame.page.timeoutSettings.timeout(timeout);
-      //    long deadline = System.nanoTime() + (long) timeout.doubleValue() * 1_000_000;
-      ElementHandle handle = elementHandle(handleOptions);
-      try {
-        return callback.apply(handle, options);
-      } finally {
-        if (handle != null) {
-          handle.dispose();
-        }
+  private static String escapeWithQuotes(String text) {
+    return gson().toJson(text);
+  }
+
+  private <R, O> R withElement(BiFunction<ElementHandle, O, R> callback, O options) {
+    ElementHandleOptions handleOptions = convertType(options, ElementHandleOptions.class);
+    // TODO: support deadline based timeout
+//    Double timeout = null;
+//    if (handleOptions != null) {
+//      timeout = handleOptions.timeout;
+//    }
+//    timeout = frame.page.timeoutSettings.timeout(timeout);
+//    long deadline = System.nanoTime() + (long) timeout.doubleValue() * 1_000_000;
+    ElementHandle handle = elementHandle(handleOptions);
+    try {
+      return callback.apply(handle, options);
+    } finally {
+      if (handle != null) {
+        handle.dispose();
      }
-    });
+    }
  }

  @Override
@@ -117,30 +100,23 @@ class LocatorImpl implements Locator {
  }

  @Override
-  public String ariaSnapshot(AriaSnapshotOptions options) {
-    if (options == null) {
-      options = new AriaSnapshotOptions();
-    }
-    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    params.addProperty("selector", selector);
-    JsonObject result = frame.sendMessage("ariaSnapshot", params, frame.timeout(options.timeout)).getAsJsonObject();
-    return result.get("snapshot").getAsString();
+  public void blur(BlurOptions options) {
+    frame.withLogging("Locator.blur", () -> blurImpl(options));
  }

-  @Override
-  public void blur(BlurOptions options) {
+  private void blurImpl(BlurOptions options) {
    if (options == null) {
      options = new BlurOptions();
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    params.addProperty("selector", selector);
    params.addProperty("strict", true);
-    frame.sendMessage("blur", params, frame.timeout(options.timeout));
+    frame.sendMessage("blur", params);
  }

  @Override
  public BoundingBox boundingBox(BoundingBoxOptions options) {
-    return withElement((h, o) -> h.boundingBox(), options, "Bounding Box");
+    return withElement((h, o) -> h.boundingBox(), options);
  }

  @Override
@@ -153,7 +129,7 @@ class LocatorImpl implements Locator {

  @Override
  public void clear(ClearOptions options) {
-    frame.withTitle("Clear", () -> fill("", convertType(options, FillOptions.class)));
+    fill("", convertType(options, FillOptions.class));
  }

  @Override
@@ -161,7 +137,7 @@ class LocatorImpl implements Locator {
    if (options == null) {
      options = new ClickOptions();
    }
-    frame.clickImpl(selector, convertType(options, Frame.ClickOptions.class).setStrict(true), options.steps);
+    frame.click(selector, convertType(options, Frame.ClickOptions.class).setStrict(true));
  }

  @Override
@@ -169,38 +145,12 @@ class LocatorImpl implements Locator {
    return frame.queryCount(selector);
  }

-  @Override
-  public Locator describe(String description) {
-    return locator(describeSelector(description));
-  }
-
-  @Override
-  public String description() {
-    // Match internal:describe= at the end of the selector with a JSON string
-    // Pattern matches: >> internal:describe="..." where ... is a JSON-encoded string
-    Pattern pattern = Pattern.compile(" >> internal:describe=(\"(?:[^\"\\\\]|\\\\.)*\")$");
-    Matcher matcher = pattern.matcher(selector);
-
-    if (matcher.find()) {
-      String jsonString = matcher.group(1);
-      try {
-        // Deserialize the JSON string
-        return gson().fromJson(jsonString, String.class);
-      } catch (Exception e) {
-        // If we can't parse it, return null
-        return null;
-      }
-    }
-
-    return null;
-  }
-
  @Override
  public void dblclick(DblclickOptions options) {
    if (options == null) {
      options = new DblclickOptions();
    }
-    frame.dblclickImpl(selector, convertType(options, Frame.DblclickOptions.class).setStrict(true), options.steps);
+    frame.dblclick(selector, convertType(options, Frame.DblclickOptions.class).setStrict(true));
  }

  @Override
@@ -218,7 +168,7 @@ class LocatorImpl implements Locator {
    }
    Frame.DragAndDropOptions frameOptions = convertType(options, Frame.DragAndDropOptions.class);
    frameOptions.setStrict(true);
-    frame.dragAndDropImpl(selector, ((LocatorImpl) target).selector, frameOptions, options.steps);
+    frame.dragAndDrop(selector, ((LocatorImpl) target).selector, frameOptions);
  }

  @Override
@@ -237,14 +187,9 @@ class LocatorImpl implements Locator {
    return frame.querySelectorAll(selector);
  }

-  @Override
-  public FrameLocator contentFrame() {
-    return new FrameLocatorImpl(frame, selector);
-  }
-
  @Override
  public Object evaluate(String expression, Object arg, EvaluateOptions options) {
-    return withElement((h, o) -> h.evaluate(expression, arg), options, "Evaluate");
+    return withElement((h, o) -> h.evaluate(expression, arg), options);
  }

  @Override
@@ -254,7 +199,7 @@ class LocatorImpl implements Locator {

  @Override
  public JSHandle evaluateHandle(String expression, Object arg, EvaluateHandleOptions options) {
-    return withElement((h, o) -> h.evaluateHandle(expression, arg), options, "Evaluate");
+    return withElement((h, o) -> h.evaluateHandle(expression, arg), options);
  }

  @Override
@@ -267,8 +212,7 @@ class LocatorImpl implements Locator {

  @Override
  public Locator filter(FilterOptions options) {
-    Boolean visible = (options == null) ? null : options.visible;
-    return new LocatorImpl(frame, selector, convertType(options, LocatorOptions.class), visible);
+    return new LocatorImpl(frame, selector, convertType(options,LocatorOptions.class));
  }

  @Override
@@ -334,12 +278,12 @@ class LocatorImpl implements Locator {

  @Override
  public Locator getByTestId(String testId) {
-    return locator(getByTestIdSelector(testId, frame.connection.playwright));
+    return locator(getByTestIdSelector(testId));
  }

  @Override
  public Locator getByTestId(Pattern testId) {
-    return locator(getByTestIdSelector(testId, frame.connection.playwright));
+    return locator(getByTestIdSelector(testId));
  }

  @Override
@@ -492,14 +436,9 @@ class LocatorImpl implements Locator {
    frame.press(selector, key, convertType(options, Frame.PressOptions.class).setStrict(true));
  }

-  @Override
-  public void pressSequentially(String text, PressSequentiallyOptions options) {
-    type(text, convertType(options, TypeOptions.class));
-  }
-
  @Override
  public byte[] screenshot(ScreenshotOptions options) {
-    return withElement((h, o) -> h.screenshot(o), convertType(options, ElementHandle.ScreenshotOptions.class), "Screenshot");
+    return withElement((h, o) -> h.screenshot(o), convertType(options, ElementHandle.ScreenshotOptions.class));
  }

  @Override
@@ -507,7 +446,7 @@ class LocatorImpl implements Locator {
    withElement((h, o) -> {
      h.scrollIntoViewIfNeeded(o);
      return null;
-    }, convertType(options, ElementHandle.ScrollIntoViewIfNeededOptions.class), "Scroll into view");
+    }, convertType(options, ElementHandle.ScrollIntoViewIfNeededOptions.class));
  }

  @Override
@@ -563,7 +502,7 @@ class LocatorImpl implements Locator {
    withElement((h, o) -> {
      h.selectText(o);
      return null;
-    }, convertType(options, ElementHandle.SelectTextOptions.class), "Select text");
+    }, convertType(options, ElementHandle.SelectTextOptions.class));
  }

  @Override
@@ -643,35 +582,20 @@ class LocatorImpl implements Locator {
    if (options == null) {
      options = new WaitForOptions();
    }
-    frame.waitForSelectorImpl(selector, convertType(options, Frame.WaitForSelectorOptions.class).setStrict(true), true);
+    waitForImpl(options);
+  }
+
+  private void waitForImpl(WaitForOptions options) {
+    frame.withLogging("Locator.waitFor", () -> frame.waitForSelectorImpl(selector, convertType(options, Frame.WaitForSelectorOptions.class).setStrict(true), true));
  }

  @Override
  public String toString() {
-    String description = description();
-    if (description != null) {
-      return description;
-    }
    return "Locator@" + selector;
  }

-  @Override
-  public boolean equals(Object obj) {
-    if (!(obj instanceof LocatorImpl)) {
-      return false;
-    }
-    LocatorImpl locator = (LocatorImpl) obj;
-    return  frame.equals(locator.frame) && selector.equals(locator.selector);
-  }
-
-  @Override
-  public int hashCode() {
-    return frame.hashCode() ^ selector.hashCode();
-  }
-
-  FrameExpectResult expect(String expression, FrameExpectOptions options, String title) {
-    options.selector = selector;
-    return frame.expect(expression, options, title);
+  FrameExpectResult expect(String expression, FrameExpectOptions options) {
+    return frame.withLogging("Locator.expect", () -> expectImpl(expression, options));
  }

  JsonObject toProtocol() {
@@ -680,4 +604,16 @@ class LocatorImpl implements Locator {
    result.addProperty("selector", selector);
    return result;
  }
+
+  private FrameExpectResult expectImpl(String expression, FrameExpectOptions options) {
+    if (options == null) {
+      options = new FrameExpectOptions();
+    }
+    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
+    params.addProperty("selector", selector);
+    params.addProperty("expression", expression);
+    JsonElement json = frame.sendMessage("expect", params);
+    FrameExpectResult result = gson().fromJson(json, FrameExpectResult.class);
+    return result;
+  }
 }
--- a/Show More
+++ b/Show More