diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000..92683c27e2
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,160 @@
+# editorconfig.org
+# Mostly based on https://github.com/dotnet/corefx/blob/master/.editorconfig
+# References
+# https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference?view=vs-2017
+# https://kent-boogaart.com/blog/editorconfig-reference-for-c-developers
+
+# top-most EditorConfig file
+root = true
+
+# Default settings:
+# A newline ending every file
+# Use 4 spaces as indentation
+[*]
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+charset = utf-8
+end_of_line = crlf
+trim_trailing_whitespace = true
+
+# Powershell files (build.ps1)
+[*.ps1]
+charset = utf-8-bom
+
+# Xml config files
+[*.{props,targets,config,nuspec,manifest}]
+indent_size = 2
+
+# Javascript Files
+[*.js]
+curly_bracket_next_line = true
+indent_brace_style = Allman
+
+# C++ Files
+[*.{cpp,h,in}]
+curly_bracket_next_line = true
+indent_brace_style = Allman
+
+[*.cs]
+# Capitalization styles
+dotnet_naming_style.constant_field_case_style.capitalization = pascal_case
+dotnet_naming_style.property_case_style.capitalization = pascal_case
+dotnet_naming_style.static_field_case_style.capitalization = pascal_case
+dotnet_naming_style.private_internal_field_case_style.capitalization = camel_case
+
+# New line preferences
+csharp_new_line_before_open_brace = all
+csharp_new_line_before_else = true
+csharp_new_line_before_catch = true
+csharp_new_line_before_finally = true
+csharp_new_line_before_members_in_object_initializers = true
+csharp_new_line_before_members_in_anonymous_types = true
+csharp_new_line_between_query_expression_clauses = true
+
+# Indentation preferences
+csharp_indent_block_contents = true
+csharp_indent_braces = false
+csharp_indent_case_contents = true
+csharp_indent_case_contents_when_block = false
+csharp_indent_switch_labels = true
+csharp_indent_labels = one_less_than_current
+
+# this.
+dotnet_style_qualification_for_field = false : suggestion
+dotnet_style_qualification_for_property = false : suggestion
+dotnet_style_qualification_for_method = false : suggestion
+dotnet_style_qualification_for_event = false : suggestion
+
+# Prefer using var
+csharp_style_var_for_built_in_types = true : none
+csharp_style_var_when_type_is_apparent = true : suggestion
+csharp_style_var_elsewhere = true : suggestion
+
+# use language keywords instead of BCL types
+dotnet_style_predefined_type_for_locals_parameters_members = true : suggestion
+dotnet_style_predefined_type_for_member_access = true : suggestion
+
+# Constant fields
+dotnet_naming_rule.constant_field_style.severity = error
+dotnet_naming_rule.constant_field_style.symbols = constant_field_target
+dotnet_naming_rule.constant_field_style.style = constant_field_case_style
+
+dotnet_naming_symbols.constant_field_target.applicable_kinds = field
+dotnet_naming_symbols.constant_field_target.required_modifiers = const
+
+# Properties
+dotnet_naming_rule.property_style.severity = error
+dotnet_naming_rule.property_style.symbols = property_target
+dotnet_naming_rule.property_style.style = property_case_style
+
+dotnet_naming_symbols.property_target.applicable_kinds = property
+dotnet_naming_symbols.property_target.required_modifiers = *
+
+# Static fields
+dotnet_naming_rule.static_field_style.severity = error
+dotnet_naming_rule.static_field_style.symbols = static_field_target
+dotnet_naming_rule.static_field_style.style = static_field_case_style
+
+dotnet_naming_symbols.static_field_target.applicable_kinds = field
+dotnet_naming_symbols.static_field_target.required_modifiers = static
+
+# Private and internal fields
+dotnet_naming_rule.private_internal_field_style.severity = error
+dotnet_naming_rule.private_internal_field_style.symbols = private_internal_field_target
+dotnet_naming_rule.private_internal_field_style.style = private_internal_field_case_style
+
+dotnet_naming_symbols.private_internal_field_target.applicable_kinds = field
+dotnet_naming_symbols.private_internal_field_target.applicable_accessibilities = private, internal
+
+# Code style defaults
+dotnet_sort_system_directives_first = true
+csharp_preserve_single_line_blocks = true
+csharp_prefer_braces = true
+csharp_preserve_single_line_statements = false
+dotnet_style_prefer_auto_properties = true : suggestion
+
+# Expression-level preferences
+dotnet_style_object_initializer = true : suggestion
+dotnet_style_collection_initializer = true : suggestion
+dotnet_style_explicit_tuple_names = false : suggestion
+dotnet_style_coalesce_expression = false : suggestion
+dotnet_style_null_propagation = false : suggestion
+
+# Expression-bodied members
+csharp_style_expression_bodied_methods = false : none
+csharp_style_expression_bodied_constructors = false : none
+csharp_style_expression_bodied_operators = false : none
+csharp_style_expression_bodied_properties = false : none
+csharp_style_expression_bodied_indexers = false : none
+csharp_style_expression_bodied_accessors = false : none
+
+# Space preferences
+csharp_space_after_cast = false
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_after_comma = true
+csharp_space_after_dot = false
+csharp_space_after_keywords_in_control_flow_statements = true
+csharp_space_after_semicolon_in_for_statement = true
+csharp_space_around_binary_operators = before_and_after
+csharp_space_around_declaration_statements = do_not_ignore
+csharp_space_before_colon_in_inheritance_clause = true
+csharp_space_before_comma = false
+csharp_space_before_dot = false
+csharp_space_before_open_square_brackets = false
+csharp_space_before_semicolon_in_for_statement = false
+csharp_space_between_empty_square_brackets = false
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+csharp_space_between_method_declaration_name_and_open_parenthesis = false
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+csharp_space_between_parentheses = false
+csharp_space_between_square_brackets = false
+
+# Modifier order
+csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async : error
+
+# CA2247: Argument passed to TaskCompletionSource constructor should be TaskCreationOptions enum instead of TaskContinuationOptions enum
+dotnet_diagnostic.CA2247.severity = error
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 0000000000..b55aeeadbe
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,13 @@
+# These are supported funding model platforms
+
+#github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+#patreon: # Replace with a single Patreon username
+#open_collective: # Replace with a single Open Collective username
+#ko_fi: # Replace with a single Ko-fi username
+#tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+#community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+#custom: # Replace with a single custom sponsorship URL
+
+github: amaitland
+#patreon: alexmaitland
+custom: https://paypal.me/AlexMaitland
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 0000000000..61d10684a4
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,155 @@
+name: Bug Report
+description: Create a report for a reproducible bug
+labels: []
+body:
+ - type: markdown
+ attributes:
+ value: |
+ Please only open an issue if you have a **BUG** to report. for questions/assistance use [Discussions](https://github.com/cefsharp/CefSharp/discussions). If you are new to the project then please review the following:
+ 1. [General Usage guide](https://github.com/cefsharp/CefSharp/wiki/General-Usage) includes examples and details of many common questions.
+ 2. [Frequently Asked Questions](https://github.com/cefsharp/CefSharp/wiki/Frequently-asked-questions), lots of useful information there, specially if your having trouble deploying to a different machine.
+ 3. GitHub has a fantastic search feature, it'll search through past issues/code. Use the Search box at the top of this page).
+ 4. You can see all the `CefSharp` tagged issues on [Stackoverflow](http://stackoverflow.com/questions/tagged/cefsharp), lots of questions/answers.
+ - type: checkboxes
+ attributes:
+ label: Is there an existing issue for this?
+ description: Please search to see if an issue already exists for the bug you encountered.
+ options:
+ - label: I have searched both open/closed issues, no issue already exists.
+ required: true
+ - type: input
+ id: cefsharp-version
+ attributes:
+ label: CefSharp Version
+ description: What version are you using? Please only open an issue if you can reproduce the problem with version 145.0.260 or later.
+ placeholder: 145.0.260
+ validations:
+ required: true
+ - type: dropdown
+ id: operating-system
+ attributes:
+ label: Operating System
+ multiple: false
+ options:
+ - Windows 10
+ - Windows 11
+ - Windows Server 2016
+ - Windows Server 2019
+ - Windows Server 2022
+ - Windows Server 2025
+ validations:
+ required: true
+ - type: dropdown
+ id: architecture
+ attributes:
+ label: Architecture
+ multiple: false
+ options:
+ - x64
+ - x86
+ - arm64
+ - AnyCPU
+ validations:
+ required: true
+ - type: input
+ id: dotnet-version
+ attributes:
+ label: .Net Version
+ description: |
+ What .Net version are you using?
+ placeholder: e.g. .Net 4.8 or .Net 6.0
+ validations:
+ required: true
+ - type: dropdown
+ id: cefsharp-implementation
+ attributes:
+ label: Implementation
+ multiple: false
+ options:
+ - WinForms
+ - WPF
+ - WPF HwndHost
+ - OffScreen
+ validations:
+ required: true
+ - type: textarea
+ id: repro-steps
+ attributes:
+ label: Reproduction Steps
+ description: |
+ Please include minimal steps to reproduce the problem. E.g.: the smallest possible code snippet; or a small example project here on GitHub, with steps to run it. Include text/code as text rather than screenshots (so it shows up in searches and can copy/paste).
+ Does the problem reproduce using the [MinimalExample](https://github.com/cefsharp/CefSharp.MinimalExample)? You can fork the MinimalExample and use this as a base for your example.
+ placeholder: Minimal Reproduction
+ validations:
+ required: true
+ - type: textarea
+ id: expected-behavior
+ attributes:
+ label: Expected behavior
+ description: |
+ Provide a description of the expected behavior.
+ placeholder: Expected behavior
+ validations:
+ required: true
+ - type: textarea
+ id: actual-behavior
+ attributes:
+ label: Actual behavior
+ description: |
+ Provide a description of the actual behavior observed. If applicable please include any error messages, exception or stacktraces.
+ placeholder: Actual behavior
+ validations:
+ required: true
+ - type: textarea
+ id: regression
+ attributes:
+ label: Regression?
+ description: |
+ Did this work in a previous build or release of CefSharp? If you can try a previous release or build to find out, that can help us narrow down the problem. If you don't know, that's OK.
+ placeholder: Regression?
+ validations:
+ required: false
+ - type: textarea
+ id: known-workarounds
+ attributes:
+ label: Known Workarounds
+ description: |
+ Please provide a description of any known workarounds.
+ placeholder: Known Workarounds
+ validations:
+ required: false
+ - type: markdown
+ attributes:
+ value: |
+ To help determine where the problem needs to be fixed please download and test using the `CEF Sample Application(cefclient)`.
+ 1. Download for [x86](https://cef-builds.spotifycdn.com/cef_binary_146.0.7%2Bga6b143f%2Bchromium-146.0.7680.165_windows32_client.tar.bz2) or [x64](https://cef-builds.spotifycdn.com/cef_binary_146.0.7%2Bga6b143f%2Bchromium-146.0.7680.165_windows64_client.tar.bz2) or [arm64](https://cef-builds.spotifycdn.com/cef_binary_146.0.7%2Bga6b143f%2Bchromium-146.0.7680.165_windowsarm64_client.tar.bz2).
+ 2. Extract tar.bz2 file
+ 3. Execute cefclient.exe using the **command line args below**:
+
+ For WPF/OffScreen `cefclient.exe --multi-threaded-message-loop --no-sandbox --off-screen-rendering-enabled --enable-gpu`
+ For WinForms `cefclient.exe --multi-threaded-message-loop --no-sandbox --use-alloy-style`
+ - type: dropdown
+ id: cefclient-testing
+ attributes:
+ label: Does this problem also occur in the CEF Sample Application
+ multiple: false
+ options:
+ - 'Yes using WPF/OffScreen command line args'
+ - 'Yes using WinForms command line args'
+ - 'No'
+ - Not Tested
+ description: |
+ If you can reproduce the problem with `cefclient` then please report the issue on [CEF Issue Tracker](https://github.com/chromiumembedded/cef/issues) (Make sure you search before opening an issue). If you open an issue here it will most likely be closed as `upstream` as the bug needs to be fixed in `CEF`.
+ validations:
+ required: true
+ - type: textarea
+ id: other-info
+ attributes:
+ label: Other information
+ description: |
+ If you are seeing a crash in `libcef.dll` then please download `libcef.dll.pdb` and place it next to `libcef.dll` to obtain a detailed stack trace, see [FAQ](https://github.com/cefsharp/CefSharp/wiki/Trouble-Shooting#loading-native-symbols-for-easier-diagnosis) for details.
+ Does the cef log provide any relevant information? (By default there should be a debug.log file in your bin directory)
+ Any other background information that's relevant? Are you doing something out of the ordinary? 3rd party controls?
+ placeholder: Other information
+ validations:
+ required: false
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000000..800264224b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,9 @@
+# https://help.github.com/en/github/building-a-strong-community/configuring-issue-templates-for-your-repository#configuring-the-template-chooser
+blank_issues_enabled: false
+contact_links:
+ - name: stackoverflow
+ url: http://stackoverflow.com/questions/tagged/cefsharp
+ about: Please ask and answer questions here.
+ - name: Chromium Embedded Framework(CEF) Forum
+ url: https://magpcss.org/ceforum/index.php
+ about: Please ask your non CefSharp specific CEF questions here
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000000..d643b03239
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,31 @@
+---
+name: Feature request
+about: Suggest an idea for this project, please don't use this template to ask questions, thank you.
+title: Feature Request - My Feature
+labels: feature-request
+assignees: ''
+
+---
+
+Please ask your questions under the Discussions section here on GitHub
+- https://github.com/cefsharp/CefSharp/discussions
+
+---
+
+`CefSharp` is a wrapper around the [Chromium Embedded Framework](https://github.com/chromiumembedded/cef) in a lot of cases a feature must be added to `CEF` first before it can be used in `CefSharp`. `CEF` has its own `Feature Request Forum` at https://magpcss.org/ceforum/viewforum.php?f=7
+
+---
+
+**Describe the solution you'd like**
+A clear and concise description of the feature you are proposing
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
+
+**Checklist:**
+- [ ] I have reviewed the [CEF API](https://magpcss.org/ceforum/apidocs3/index-all.html) and have confirmed the feature I'm requesting is possible.
+- [ ] The Feature I'm requesting is an improvement to Async Javascript Binding (No new feature are being added to the Sync Javascript binding)
+- [ ] An open `PR` exists on the [CEF Pull Requests](https://github.com/chromiumembedded/cef/pulls) and I'd like to propose this feature is added to `CefSharp` when/if it's merged.
diff --git a/.github/config.yml b/.github/config.yml
new file mode 100644
index 0000000000..eb54eb44bd
--- /dev/null
+++ b/.github/config.yml
@@ -0,0 +1,16 @@
+# Comment to be posted to on first time issues
+newIssueWelcomeComment: >
+ Welcome! We prefer to keep this issue track just for bug reports. If you have a question or need help with something I'd ask that you self close this issue and have a read over https://github.com/cefsharp/CefSharp/blob/master/ISSUE_TEMPLATE.md it contains
+ background information, details on where to ask your questions [Gitter](https://gitter.im/cefsharp/CefSharp) or [StackOverflow](https://stackoverflow.com/questions/tagged/cefsharp)) should be used.
+
+
+ If you're reporting a bug, you **must** complete the bug report template see https://github.com/cefsharp/CefSharp/blob/master/ISSUE_TEMPLATE.md#bug-report.
+ Please make sure you provide enough detail that **someone else** can reproduce the issue you are experiencing.
+
+
+ It's also important to remember that `CefSharp` is just a wrapper around the `Chromium Embedded Framework(CEF)`, a lot of questions people
+ have aren't actually `CefSharp` specific, they're generic to `CEF` and for those `CEF` has it's own support forum at http://magpcss.org/ceforum/index.php and issue tracker at https://github.com/chromiumembedded/cef/issues
+
+
+
+
diff --git a/.github/no-response.yml b/.github/no-response.yml
new file mode 100644
index 0000000000..cd5f107372
--- /dev/null
+++ b/.github/no-response.yml
@@ -0,0 +1,15 @@
+# Configuration for probot-no-response - https://github.com/probot/no-response
+
+# Number of days of inactivity before an Issue is closed for lack of response
+daysUntilClose: 14
+
+# Label requiring a response
+responseRequiredLabel: more-details-needed-from-op
+
+# Comment to post when closing an Issue for lack of response. Set to `false` to disable
+closeComment: >
+ This issue has been automatically closed because there has been no response
+ to our request for more information from the original author. With only the
+ information that is currently in the issue, we don't have enough information
+ to take action. Please reach out if you have or find the answers we need so
+ that we can investigate further.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 0000000000..c2d7925c5e
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,32 @@
+**Fixes:** [issue-number]
+
+
+**Summary:** [summary of the change and which issue is fixed here]
+ - e.g. I have added a new feature to the Javascript Binding implementation
+
+**Changes:** [specify the structures changed]
+ - e.g. I have modified the Javascript Binding Implementation
+ - Added support for Async binding to return Task
+ - Added new QUnit Test cases
+
+**How Has This Been Tested?**
+
+
+
+
+**Screenshots (if appropriate):**
+
+**Types of changes**
+
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to change)
+- [ ] Updated documentation
+
+**Checklist:**
+
+- [ ] Tested the code(if applicable)
+- [ ] Commented my code
+- [ ] Changed the documentation(if applicable)
+- [ ] New files have a license disclaimer
+- [ ] The formatting is consistent with the project (project supports .editorconfig)
diff --git a/.github/support.yml b/.github/support.yml
new file mode 100644
index 0000000000..0ee8bc127f
--- /dev/null
+++ b/.github/support.yml
@@ -0,0 +1,27 @@
+# Configuration for Support Requests - https://github.com/dessant/support-requests
+
+# Label used to mark issues as support requests
+supportLabel: support
+
+# Comment to post on issues marked as support requests, `{issue-author}` is an
+# optional placeholder. Set to `false` to disable
+supportComment: >
+ :wave: @{issue-author}, we use the issue tracker exclusively for bug reports
+ and feature requests. However, this issue appears to be a support request.
+ Please use our support channels to get help with the project.
+
+ If you have a question, ask it on [StackOverflow](http://stackoverflow.com/questions/tagged/cefsharp) or use [ceforum](http://magpcss.org/ceforum/) (for questions specific to `CEF`).
+
+ If you are new to `CefSharp` then we suggest you read https://github.com/cefsharp/CefSharp/wiki/General-Usage
+
+ If you feel this was closed in error then you **must** edit your original issue and complete the [Bug Report Template](https://github.com/cefsharp/CefSharp/blob/master/.github/ISSUE_TEMPLATE/bug_report.md#bug-report)
+ then post a comment asking for a review.
+
+# Close issues marked as support requests
+close: true
+
+# Lock issues marked as support requests
+lock: false
+
+# Assign `off-topic` as the reason for locking. Set to `false` to disable
+setLockReason: false
diff --git a/.github/workflows/codeql-analysis.yml.bak b/.github/workflows/codeql-analysis.yml.bak
new file mode 100644
index 0000000000..e66bab1453
--- /dev/null
+++ b/.github/workflows/codeql-analysis.yml.bak
@@ -0,0 +1,62 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+name: "CodeQL"
+
+on:
+ push:
+ branches: [master]
+ pull_request:
+ # The branches below must be a subset of the branches above
+ branches: [master]
+ schedule:
+ - cron: '0 4 * * 5'
+
+jobs:
+ analyze:
+ name: Analyze
+ runs-on: windows-latest
+
+ strategy:
+ fail-fast: true
+ matrix:
+ # Override automatic language detection by changing the below list
+ # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
+ language: ['csharp']
+ # Learn more...
+ # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
+
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v2
+
+ # Initializes the CodeQL tools for scanning.
+ - name: Initialize CodeQL
+ uses: github/codeql-action/init@v1
+ with:
+ languages: ${{ matrix.language }}
+ # If you wish to specify custom queries, you can do so here or in a config file.
+ # By default, queries listed here will override any specified in a config file.
+ # Prefix the list here with "+" to use these queries and those in the config file.
+ # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+ # Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
+ # If this step fails, then you should remove it and run the build manually (see below)
+ - name: Autobuild
+ uses: github/codeql-action/autobuild@v1
+
+ # ℹ️ Command-line programs to run using the OS shell.
+ # 📚 https://git.io/JvXDl
+
+ # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+ # and modify them (or add more) to build your code if your project
+ # uses a compiled language
+
+ #- run: |
+ # make bootstrap
+ # make release
+
+ - name: Perform CodeQL Analysis
+ uses: github/codeql-action/analyze@v1
diff --git a/.gitignore b/.gitignore
index 0665ff910b..e92d3bb6b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,6 @@
*.exe.config
*.exp
*.ipch
-*.manifest
*.metagen
*.ncb
*.nupkg
@@ -17,12 +16,17 @@
*.swp
*.user
*.xml
+*.VC.opendb
+*.VC.db
_ReSharper*
bin/
+bin.netcore/
obj/
+obj.netcore/
packages/
Debug/
+Release/
CefSharp/app.aps
debug.log
CefSharp.BrowserSubprocess/Release
@@ -35,3 +39,6 @@ CefSharp.BrowserSubprocess.lib
Win32/Release
x64/Release
Win32/Release
+.vs/
+/Help
+/tools
diff --git a/.nuget/packages.config b/.nuget/packages.config
deleted file mode 100644
index 19acf452e8..0000000000
--- a/.nuget/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/.vsconfig b/.vsconfig
new file mode 100644
index 0000000000..9c22b175de
--- /dev/null
+++ b/.vsconfig
@@ -0,0 +1,33 @@
+{
+ "version": "1.0",
+ "components": [
+ "Microsoft.VisualStudio.Component.CoreEditor",
+ "Microsoft.VisualStudio.Workload.CoreEditor",
+ "Microsoft.VisualStudio.Component.NuGet",
+ "Microsoft.Net.Component.4.7.2.TargetingPack",
+ "Microsoft.VisualStudio.Component.Roslyn.Compiler",
+ "Microsoft.VisualStudio.Component.Roslyn.LanguageServices",
+ "Microsoft.Net.ComponentGroup.DevelopmentPrerequisites",
+ "Microsoft.Component.MSBuild",
+ "Microsoft.VisualStudio.Component.ManagedDesktop.Core",
+ "Microsoft.Net.Component.4.6.2.TargetingPack",
+ "Microsoft.VisualStudio.Component.IntelliCode",
+ "Microsoft.Net.ComponentGroup.TargetingPacks.Common",
+ "Microsoft.VisualStudio.Component.Debugger.JustInTime",
+ "Microsoft.VisualStudio.Component.VC.CoreIde",
+ "Microsoft.VisualStudio.Component.Windows10SDK",
+ "Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
+ "Microsoft.VisualStudio.Component.VC.Tools.ARM64",
+ "Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites",
+ "Microsoft.ComponentGroup.Blend",
+ "Microsoft.VisualStudio.Workload.ManagedDesktop",
+ "Microsoft.VisualStudio.Component.VC.Redist.14.Latest",
+ "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core",
+ "Microsoft.VisualStudio.Component.VC.CLI.Support",
+ "Microsoft.VisualStudio.Component.Windows10SDK.19041",
+ "Microsoft.VisualStudio.Workload.NativeDesktop",
+ "Microsoft.NetCore.Component.DevelopmentTools",
+ "Microsoft.NetCore.Component.Runtime.6.0",
+ "Microsoft.NetCore.Component.SDK"
+ ]
+}
\ No newline at end of file
diff --git a/Build.bat b/Build.bat
new file mode 100644
index 0000000000..b1edbcf23b
--- /dev/null
+++ b/Build.bat
@@ -0,0 +1,3 @@
+SET ThisScriptsDirectory=%~dp0
+SET PowerShellScriptPath=%ThisScriptsDirectory%Build.ps1
+PowerShell -NoProfile -ExecutionPolicy Bypass -Command "& {Start-Process PowerShell -ArgumentList '-NoProfile -ExecutionPolicy Bypass -File ""%PowerShellScriptPath%""' -Verb RunAs}";
\ No newline at end of file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 45f554bec3..281ae9dda1 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,10 +1,100 @@
-##CefSharp Project Contribution Guide
+## CefSharp Project Contribution Guide
Thanks for your interest in contributing to the project! Please follow these simple guidelines:
### General
-- **Please read the full contents of [the FAQ](https://github.com/cefsharp/CefSharp/wiki/Frequently-asked-questions) before submitting an issue, or posting to the Google Group. It's quite likely your question has already been answered before.** If something is unclear in the FAQ, of course feel free to ask; the idea is just to reduce the level of "noise" we have to go through, reading the same questions over and over again.
-- If you are unsure if something is a "bug" or a "feature", discuss it with the Google Group first. Don't cross-post: if you create an issue, and all the information is contained there, that's perfectly enough. There's no reason to also post it to the group; it just creates "line noise". The project maintainers are very busy people like you and me, and things will sometimes take a few weeks (or in worst case, more) to answer. If you are in a rush - do your very best to investigate the problem thoroughly; if possible, fix the bug yourself and submit a pull request.
+- Please use [](https://gitter.im/cefsharp/CefSharp?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) as your first point of call for basic/simple questions.
+- When creating an issue please use the issue template provided.
+- **Please read the full contents of [the FAQ](https://github.com/cefsharp/CefSharp/wiki/Frequently-asked-questions) before submitting an issue**. Also searching the `GitHub` project is a **must**. It's quite likely your question has already been answered before. If something is unclear in the FAQ, of course feel free to ask; the idea is just to reduce the level of "noise" we have to go through, reading the same questions over and over again.
+- Please make sure to **test out the current version** of `CefSharp` to see whether the problem you are encountering still exists.
+- Don't cross-post: if you create an issue, and all the information is contained there, that's enough. There's no reason to also post it to Stackoverflow; it just creates "line noise". The project maintainers are very busy people like you and me, and things will sometimes take a few weeks (or in worst case, more) to answer. If you are in a rush - do your very best to investigate the problem thoroughly; if possible, fix the bug yourself and submit a pull request.
- Before creating a GitHub issue or pull request, try looking through the list & issue archives to make sure the issue at hand hasn't been raised before. [Google](http://www.google.com) can also be helpful: just typing "cefsharp appdomain" for example (when trying to see whether AppDomain support has been discussed before) will often give you helpful results.
+- We do appreciate cultural/languages differences, that being said **never** demand that someone help you, this is not a commercial application with paid support! Please and thank you go a long way.
+- This is a volunteer project, we give of our time freely and we ask for you to do the same. Contributions can be simple like updating/adding new entries in the [FAQ](https://github.com/cefsharp/CefSharp/wiki/Frequently-asked-questions), creating new pages in the [WIKI](https://github.com/cefsharp/CefSharp/wiki), updating the examples. (Anyone with a `GitHub` account can edit the `WIKI`)
+
+### `CefSharp` vs `Chromium Embedded Framework(CEF)`
+
+`CefSharp` simply takes the building blocks provided by the [Chromium Embedded Framework(CEF)](https://github.com/chromiumembedded/cef) and provides a usable '.Net' implementation.
+The upstream [`CEF` forum](http://magpcss.org/ceforum/) is a valuable resource, if your issues seems fairly low level, then please conduct some research before posting.
+
+It maybe helpful to run the `cefclient` application and compare output with `CefSharp`. The `WinForms` and `WPF` versions use two different rendering modes, `WPF` uses Offscreen Rendering (`OSR`). `OffScreen` also uses `OSR` mode.
+
+ - Download and run the `CEF Sample Application(cefclient)`:
+ - Download for [x86](https://cef-builds.spotifycdn.com/cef_binary_146.0.7%2Bga6b143f%2Bchromium-146.0.7680.165_windows32_client.tar.bz2) or [x64](https://cef-builds.spotifycdn.com/cef_binary_146.0.7%2Bga6b143f%2Bchromium-146.0.7680.165_windows64_client.tar.bz2) or [arm64](https://cef-builds.spotifycdn.com/cef_binary_146.0.7%2Bga6b143f%2Bchromium-146.0.7680.165_windowsarm64_client.tar.bz2).
+ - Extract and run cefclient.exe
+ - If you are using WPF/OffScreen run
+ ```
+ cefclient.exe --multi-threaded-message-loop --no-sandbox --off-screen-rendering-enabled --enable-gpu
+ ```
+ - If you are using WinForms run
+ ```
+ cefclient.exe --multi-threaded-message-loop --no-sandbox --use-alloy-style
+ ```
+ - **MAKE SURE TO TEST WITH THE COMMAND LINE ARGS LISTED ABOVE**
+ - If you can reproduce the problem with `cefclient` then you'll need to report the bug on https://github.com/chromiumembedded/cef there is no point opening an issue here. (Make sure you search before opening an issue)
+
+### What should I include when creating an `Issue`?
+
+When creating an issue please use the provided by report template (the field will be pre-populated).
+
+A bug is a _demonstrable problem_ that is caused by the code in the repository. Ideally each issue is a useful resource for references purposes (Don't take offence if someone edits your description).
+
+Your bug report should **always follow this template**:
+
+- **What is the expected output? What do you see instead?**
+- **What steps will reproduce the problem?**
+- **Are you using `WinForms`, `WPF` or `OffScreen`?**
+- **What version of the product are you using? On what operating system? x86 or x64?**
+ - What version are you using? Nuget? CI Nuget? build from a branch? If so which branch?
+ - Win10/11, etc?
+- **Please provide any additional information below.**
+ - A stack trace if available, any Exception information.
+ - Does the cef log provide any relevant information? (By default there should be a debug.log file in your bin directory)
+- Any other background information that's relevant? Are you doing something out of the ordinary? 3rd party controls?
+- **Does this problem also occur in the `CEF Sample Application` from https://cef-builds.spotifycdn.com/index.html?**
+
+Your bug report should include **what you were doing** in the software when you encountered it, **what you were expecting** to happen and **what happened instead**.
+
+**BE AWARE THAT BUG REPORTS MUST PROVIDE ALL OF THE INFORMATION STATED ABOVE!**
+
+#### Help us help you
+
+1. Asking the same questions over and over again is **Wasting our time**, search open/closed issues to see if your issue has already been addressed.
+2. Having to constantly query users to gather information is **very frustrating**! Use the bug template provided above.
+3. We have **very** limited active contributors so please spend as much time looking into your own problem as possible, the more you help yourself, the quicker things will get fixed.
+4. Please don't hijack issues, if your problem is distinct then please create a unique issue (after searching previous issues).
+5. Good bug reports are extremely helpful. The more information you provide, the more likely your issue will be resolved.
+6. Good bug reports shouldn't leave others needing to chase you up for more information. Be sure to include the
+details of your environment.
+7. 'Ask Don't Tell' : Ask how to achieve something, **don't say it's broken** just because you haven't got it working yet!
+8. **Isolate the problem** — ideally create a reproducible example.
+9. **Include a screencast if relevant** - Is your issue about a design or front end feature or bug? The most helpful thing in the world is if we can *see* what you're talking about. Use [LICEcap](http://www.cockos.com/licecap/) to quickly and easily record a short screencast (24fps) and save it as an animated gif! Embed it directly into your GitHub issue.
+10. When including code limit to small chunks, large blocks post as a [Gist](http://gist.github.com/) or similar
+11. Please no links to binaries, e.g. zip files, either contribute your example as a github project, a gist or another public code sharing service.
+
+### Change Requests
+
+Change requests cover both architectural and functional changes to how `CefSharp` works. If you have an idea for a refactor, or an improvement to a feature, etc - please be sure to:
+
+1. **Use the GitHub search** and check someone else didn't get there first
+2. Take a moment to think about the best way to make a case for, and explain what you're thinking as it's up to you to convince the project's leaders the change is worthwhile. Some questions to consider are:
+ - Is it really one idea or is it many?
+ - What problem are you solving?
+ - Why is what you are suggesting better than what's already there?
+
+### Pull Requests/Feature Branches
+
+Pull requests are **awesome**. If you're looking to raise a `PR` for something which doesn't have an open issue, please think carefully about raising an issue which your PR can close, especially if you're fixing a bug. This makes it more likely that there will be enough information available for your PR to be properly tested and merged.
+
+- Please limit your changes to a logical grouping, keeping changesets small increases the likelihood they will be merged
+- If you then want to make subsequent changes, it's actually best to not do them before the feature is merged. Please wait for feedback/review before progressing. This greatly improves our ability to review your changes and dramatically increases the likelihood they will be merged in a timely fashion.
+- If you wish to keep progressing on your work, please maintain a feature branch independent of the branch referenced by your pull request. From your WIP branch you can selectively merge in changes to the PR branch as required.
+- In general, it's much better to be "too granular" with PR's that contain "change-the-world"-kind of changes, which usually tend to lag behind a lot longer before getting merged (if they ever will...).
+- Small (really, minimalistic) commits. Each individual commit only adds one specific thing. The basic approach to achieving this is to read your commit message. Do you feel the need to add multiple lines? Then you're doing too much at the same time.
+- Keep the first line of commit message short (max 50 characters), then a blank line, then a full description if needed. Good example:
+
+ > Run tests in the default appdomain
+ >
+ > Due to limitations of VC++ we must run our tests in the default appdomain, it's possible to use xunit for testing. Re-add CefSharp.Test.csproj to solution Add some very basic unit tests using xunit, DisableTestParallelization, Set xunit.appDomain to denied in app.config to disable using appdomains (https://xunit.github.io/docs/configuring-with-xml.html) Add xunit vs test running packages, using 2.2.0 version as 2.3.0 was throwing an exception similar to https://github.com/xunit/xunit/issues/1514 TODO: Take a look at https://github.com/NuGet/NuGetGallery/tree/master/tests/NuGetGallery.Facts for some ideas on structuring xunit tests (look at implementing Theory)
### Coding Style
- **Please** follow existing coding style when submitting pull requests.
@@ -14,9 +104,3 @@ Thanks for your interest in contributing to the project! Please follow these sim
- Please don't add #Regions to the code
- When adding new files, please prepend the standard license disclaimer (just copy and paste from another source file)
- Do your best to follow these guidelines but don't be afraid to make mistakes when trying to apply them. We are all novices in the beginning.
-
-### Pull Requests/Feature Branches
-- Please limit your changes to a logical grouping, keeping changesets small increases the likelihood they will be merged
-- If you then want to make subsequent changes, it's actually best to not do them before the feature is merged. Please wait for feedback/review before progressing. This greatly improves our ability to review your changes and dramatically increases the likelihood they will be merged in a timely fashion.
-- If you wish to keep progressing on your work, please maintain a feature branch independent of the branch referenced by your pull request. From your WIP branch you can selectively merge in changes to the PR branch as required.
-- In general, it's much better to be "too granular" with PR's that contain "change-the-world"-kind of changes, which usually tend to lag behind a lot longer before getting merged (if they ever will...).
diff --git a/CefSharp.AfterBuild.targets b/CefSharp.AfterBuild.targets
new file mode 100644
index 0000000000..f26ed0b382
--- /dev/null
+++ b/CefSharp.AfterBuild.targets
@@ -0,0 +1,57 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ locales\%(RecursiveDir)%(FileName)%(Extension)
+ PreserveNewest
+ Included
+ false
+ true
+
+
+
+
+
+
+ locales\%(RecursiveDir)%(FileName)%(Extension)
+ PreserveNewest
+ Included
+ false
+ true
+
+
+
+
+
+
+ locales\%(RecursiveDir)%(FileName)%(Extension)
+ PreserveNewest
+ Included
+ false
+ true
+
+
+
+
+
diff --git a/CefSharp.BrowserSubprocess.Core/Assembly.manifest b/CefSharp.BrowserSubprocess.Core/Assembly.manifest
new file mode 100644
index 0000000000..01c92358c2
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/Assembly.manifest
@@ -0,0 +1,3 @@
+
+
+
\ No newline at end of file
diff --git a/CefSharp.BrowserSubprocess.Core/AssemblyInfo.cpp b/CefSharp.BrowserSubprocess.Core/AssemblyInfo.cpp
new file mode 100644
index 0000000000..1aee0545dc
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/AssemblyInfo.cpp
@@ -0,0 +1,24 @@
+#include "Stdafx.h"
+
+using namespace System;
+using namespace System::Reflection;
+using namespace System::Runtime::CompilerServices;
+using namespace System::Runtime::InteropServices;
+using namespace System::Security::Permissions;
+using namespace CefSharp;
+
+//[assembly:AssemblyTitle("CefSharpBrowserSubprocess.Core")];
+//[assembly:AssemblyCompany(AssemblyInfo::AssemblyCompany)];
+//[assembly:AssemblyProduct(AssemblyInfo::AssemblyProduct)];
+//[assembly:AssemblyCopyright(AssemblyInfo::AssemblyCopyright)];
+
+[assembly:AssemblyVersion(AssemblyInfo::AssemblyVersion)];
+[assembly:ComVisible(AssemblyInfo::ComVisible)];
+[assembly:CLSCompliant(AssemblyInfo::ClsCompliant)];
+
+[assembly:AssemblyDescription("")];
+[assembly:AssemblyConfiguration("")];
+[assembly:AssemblyTrademark("")];
+[assembly:AssemblyCulture("")];
+
+[assembly:InternalsVisibleTo(AssemblyInfo::CefSharpBrowserSubprocessProject)];
diff --git a/CefSharp.BrowserSubprocess.Core/Async/JavascriptAsyncMethodCallback.cpp b/CefSharp.BrowserSubprocess.Core/Async/JavascriptAsyncMethodCallback.cpp
new file mode 100644
index 0000000000..b7c6b55967
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/Async/JavascriptAsyncMethodCallback.cpp
@@ -0,0 +1,49 @@
+// Copyright © 2015 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+#include "stdafx.h"
+#include "JavascriptAsyncMethodCallback.h"
+
+namespace CefSharp
+{
+ namespace BrowserSubprocess
+ {
+ namespace Async
+ {
+ void JavascriptAsyncMethodCallback::Success(const CefRefPtr& result)
+ {
+ if (_resolve.get() && _context.get() && _context->Enter())
+ {
+ try
+ {
+ CefV8ValueList args;
+ args.push_back(result);
+ _resolve->ExecuteFunction(nullptr, args);
+ }
+ finally
+ {
+ _context->Exit();
+ }
+ }
+ }
+
+ void JavascriptAsyncMethodCallback::Fail(const CefString& exception)
+ {
+ if (_reject.get() && _context.get() && _context->Enter())
+ {
+ try
+ {
+ CefV8ValueList args;
+ args.push_back(CefV8Value::CreateString(exception));
+ _reject->ExecuteFunction(nullptr, args);
+ }
+ finally
+ {
+ _context->Exit();
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/CefSharp.BrowserSubprocess.Core/Async/JavascriptAsyncMethodCallback.h b/CefSharp.BrowserSubprocess.Core/Async/JavascriptAsyncMethodCallback.h
new file mode 100644
index 0000000000..27411d722b
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/Async/JavascriptAsyncMethodCallback.h
@@ -0,0 +1,47 @@
+// Copyright © 2015 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+#pragma once
+
+#include "include/cef_v8.h"
+
+namespace CefSharp
+{
+ namespace BrowserSubprocess
+ {
+ namespace Async
+ {
+ private ref class JavascriptAsyncMethodCallback
+ {
+ private:
+ MCefRefPtr _context;
+ MCefRefPtr _resolve;
+ MCefRefPtr _reject;
+
+ public:
+ JavascriptAsyncMethodCallback(CefRefPtr context, CefRefPtr resolve, CefRefPtr reject)
+ :_context(context), _resolve(resolve.get()), _reject(reject.get())
+ {
+
+ }
+
+ !JavascriptAsyncMethodCallback()
+ {
+ _resolve = nullptr;
+ _reject = nullptr;
+ _context = nullptr;
+ }
+
+ ~JavascriptAsyncMethodCallback()
+ {
+ this->!JavascriptAsyncMethodCallback();
+ }
+
+ void Success(const CefRefPtr& result);
+
+ void Fail(const CefString& exception);
+ };
+ }
+ }
+}
diff --git a/CefSharp.BrowserSubprocess.Core/Async/JavascriptAsyncMethodHandler.cpp b/CefSharp.BrowserSubprocess.Core/Async/JavascriptAsyncMethodHandler.cpp
new file mode 100644
index 0000000000..71628d738f
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/Async/JavascriptAsyncMethodHandler.cpp
@@ -0,0 +1,74 @@
+// Copyright © 2015 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+#include "stdafx.h"
+#include "JavascriptAsyncMethodHandler.h"
+#include "../CefSharp.Core.Runtime/Internals/Messaging/Messages.h"
+#include "../CefSharp.Core.Runtime/Internals/Serialization/Primitives.h"
+#include "Serialization/V8Serialization.h"
+#include "CefAppUnmanagedWrapper.h"
+
+using namespace CefSharp::Internals::Messaging;
+using namespace CefSharp::Internals::Serialization;
+using namespace CefSharp::BrowserSubprocess::Serialization;
+
+namespace CefSharp
+{
+ namespace BrowserSubprocess
+ {
+ namespace Async
+ {
+ bool JavascriptAsyncMethodHandler::Execute(const CefString& name, CefRefPtr object, const CefV8ValueList& arguments, CefRefPtr& retval, CefString& exception)
+ {
+ auto context = CefV8Context::GetCurrentContext();
+ auto frame = context->GetFrame();
+
+ CefRefPtr promiseData;
+ CefRefPtr promiseException;
+ //this will create a promise and give us the reject/resolve functions {p: Promise, res: resolve(), rej: reject()}
+ if (!context->Eval(CefAppUnmanagedWrapper::kPromiseCreatorScript, CefString(), 0, promiseData, promiseException))
+ {
+ LOG(WARNING) << "JavascriptAsyncMethodHandler::Execute promiseData returned exception: " + promiseException->GetMessage().ToString();
+
+ exception = promiseException->GetMessage();
+
+ return true;
+ }
+
+ //when refreshing the browser this is sometimes null, in this case return true and log message
+ //https://github.com/cefsharp/CefSharp/pull/2446
+ if (promiseData == nullptr)
+ {
+ LOG(WARNING) << "JavascriptAsyncMethodHandler::Execute promiseData returned nullptr";
+
+ return true;
+ }
+
+ retval = promiseData->GetValue("p");
+
+ auto resolve = promiseData->GetValue("res");
+ auto reject = promiseData->GetValue("rej");
+ auto callback = gcnew JavascriptAsyncMethodCallback(context, resolve, reject);
+ auto callbackId = _methodCallbackSave->Invoke(callback);
+
+ auto request = CefProcessMessage::Create(kJavascriptAsyncMethodCallRequest);
+ auto argList = request->GetArgumentList();
+ auto params = CefListValue::Create();
+ for (size_t i = 0; i < arguments.size(); i++)
+ {
+ SerializeV8Object(arguments[i], params, i, _callbackRegistry);
+ }
+
+ SetInt64(argList, 0, _objectId);
+ SetInt64(argList, 1, callbackId);
+ argList->SetString(2, name);
+ argList->SetList(3, params);
+
+ frame->SendProcessMessage(CefProcessId::PID_BROWSER, request);
+
+ return true;
+ }
+ }
+ }
+}
diff --git a/CefSharp.BrowserSubprocess.Core/Async/JavascriptAsyncMethodHandler.h b/CefSharp.BrowserSubprocess.Core/Async/JavascriptAsyncMethodHandler.h
new file mode 100644
index 0000000000..aa315f69c9
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/Async/JavascriptAsyncMethodHandler.h
@@ -0,0 +1,45 @@
+// Copyright © 2015 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+#pragma once
+
+#include "include/cef_v8.h"
+#include "JavascriptCallbackRegistry.h"
+#include "JavascriptAsyncMethodCallback.h"
+
+namespace CefSharp
+{
+ namespace BrowserSubprocess
+ {
+ namespace Async
+ {
+ private class JavascriptAsyncMethodHandler : public virtual CefV8Handler
+ {
+ private:
+ gcroot _callbackRegistry;
+ gcroot^> _methodCallbackSave;
+ int64_t _objectId;
+
+ public:
+ JavascriptAsyncMethodHandler(int64_t objectId, JavascriptCallbackRegistry^ callbackRegistry, Func^ methodCallbackSave)
+ :_callbackRegistry(callbackRegistry), _objectId(objectId), _methodCallbackSave(methodCallbackSave)
+ {
+
+ }
+
+ virtual bool Execute(const CefString& name, CefRefPtr object, const CefV8ValueList& arguments, CefRefPtr& retval, CefString& exception);
+
+ ~JavascriptAsyncMethodHandler()
+ {
+ // The callback registry is a shared instance among all method handlers (async & sync).
+ // It's lifecycle is managed in the JavascriptRootObjectWrapper.
+ _callbackRegistry = nullptr;
+ _methodCallbackSave = nullptr;
+ }
+
+ IMPLEMENT_REFCOUNTINGM(JavascriptAsyncMethodHandler);
+ };
+ }
+ }
+}
diff --git a/CefSharp.BrowserSubprocess.Core/Async/JavascriptAsyncMethodWrapper.cpp b/CefSharp.BrowserSubprocess.Core/Async/JavascriptAsyncMethodWrapper.cpp
new file mode 100644
index 0000000000..9d60fc2cfd
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/Async/JavascriptAsyncMethodWrapper.cpp
@@ -0,0 +1,24 @@
+// Copyright © 2015 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+#include "stdafx.h"
+#include "JavascriptCallbackRegistry.h"
+#include "JavascriptAsyncMethodWrapper.h"
+
+namespace CefSharp
+{
+ namespace BrowserSubprocess
+ {
+ namespace Async
+ {
+ void JavascriptAsyncMethodWrapper::Bind(JavascriptMethod^ method, const CefRefPtr& value)
+ {
+ auto methodName = StringUtils::ToNative(method->JavascriptName);
+ auto v8Function = CefV8Value::CreateFunction(methodName, _javascriptMethodHandler.get());
+
+ value->SetValue(methodName, v8Function, V8_PROPERTY_ATTRIBUTE_NONE);
+ }
+ }
+ }
+}
diff --git a/CefSharp.BrowserSubprocess.Core/Async/JavascriptAsyncMethodWrapper.h b/CefSharp.BrowserSubprocess.Core/Async/JavascriptAsyncMethodWrapper.h
new file mode 100644
index 0000000000..876aa52026
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/Async/JavascriptAsyncMethodWrapper.h
@@ -0,0 +1,32 @@
+// Copyright © 2015 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+#pragma once
+
+#include "JavascriptAsyncMethodHandler.h"
+#include "JavascriptCallbackRegistry.h"
+
+namespace CefSharp
+{
+ namespace BrowserSubprocess
+ {
+ namespace Async
+ {
+ private ref class JavascriptAsyncMethodWrapper
+ {
+ private:
+ MCefRefPtr _javascriptMethodHandler;
+
+ public:
+ JavascriptAsyncMethodWrapper(int64_t ownerId, JavascriptCallbackRegistry^ callbackRegistry, Func^ methodCallbackSave)
+ : _javascriptMethodHandler(new JavascriptAsyncMethodHandler(ownerId, callbackRegistry, methodCallbackSave))
+ {
+
+ }
+
+ void Bind(JavascriptMethod^ method, const CefRefPtr& value);
+ };
+ }
+ }
+}
diff --git a/CefSharp.BrowserSubprocess.Core/Async/JavascriptAsyncObjectWrapper.cpp b/CefSharp.BrowserSubprocess.Core/Async/JavascriptAsyncObjectWrapper.cpp
new file mode 100644
index 0000000000..401b85a643
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/Async/JavascriptAsyncObjectWrapper.cpp
@@ -0,0 +1,35 @@
+// Copyright © 2015 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+#include "stdafx.h"
+#include "JavascriptCallbackRegistry.h"
+#include "JavascriptAsyncObjectWrapper.h"
+#include "JavascriptAsyncMethodWrapper.h"
+
+using namespace System::Linq;
+
+namespace CefSharp
+{
+ namespace BrowserSubprocess
+ {
+ namespace Async
+ {
+ void JavascriptAsyncObjectWrapper::Bind(JavascriptObject^ object, const CefRefPtr &value)
+ {
+ //V8Value that represents this javascript object - only one per complex type, no accessor
+ auto javascriptObject = CefV8Value::CreateObject(nullptr, nullptr);
+ auto objectName = StringUtils::ToNative(object->JavascriptName);
+ value->SetValue(objectName, javascriptObject, V8_PROPERTY_ATTRIBUTE_NONE);
+
+ for each (JavascriptMethod^ method in Enumerable::OfType(object->Methods))
+ {
+ auto wrappedMethod = gcnew JavascriptAsyncMethodWrapper(object->Id, _callbackRegistry, _methodCallbackSave);
+ wrappedMethod->Bind(method, javascriptObject);
+
+ _wrappedMethods->Add(wrappedMethod);
+ }
+ }
+ }
+ }
+}
diff --git a/CefSharp.BrowserSubprocess.Core/Async/JavascriptAsyncObjectWrapper.h b/CefSharp.BrowserSubprocess.Core/Async/JavascriptAsyncObjectWrapper.h
new file mode 100644
index 0000000000..f42ac60e42
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/Async/JavascriptAsyncObjectWrapper.h
@@ -0,0 +1,45 @@
+// Copyright © 2015 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+#pragma once
+
+#include "JavascriptAsyncMethodCallback.h"
+#include "JavascriptCallbackRegistry.h"
+#include "JavascriptAsyncMethodWrapper.h"
+
+namespace CefSharp
+{
+ namespace BrowserSubprocess
+ {
+ namespace Async
+ {
+ private ref class JavascriptAsyncObjectWrapper
+ {
+ private:
+ initonly List^ _wrappedMethods;
+ Func^ _methodCallbackSave;
+ JavascriptCallbackRegistry^ _callbackRegistry;
+
+ public:
+ JavascriptAsyncObjectWrapper(JavascriptCallbackRegistry^ callbackRegistry, Func^ saveMethod)
+ : _wrappedMethods(gcnew List()), _methodCallbackSave(saveMethod), _callbackRegistry(callbackRegistry)
+ {
+
+ }
+
+ ~JavascriptAsyncObjectWrapper()
+ {
+ _callbackRegistry = nullptr;
+ _methodCallbackSave = nullptr;
+ for each (JavascriptAsyncMethodWrapper^ var in _wrappedMethods)
+ {
+ delete var;
+ }
+ }
+
+ void Bind(JavascriptObject^ object, const CefRefPtr &value);
+ };
+ }
+ }
+}
diff --git a/CefSharp.BrowserSubprocess.Core/BindObjectAsyncHandler.h b/CefSharp.BrowserSubprocess.Core/BindObjectAsyncHandler.h
new file mode 100644
index 0000000000..1a99952071
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/BindObjectAsyncHandler.h
@@ -0,0 +1,317 @@
+// Copyright © 2019 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+#pragma once
+
+#include "include/cef_v8.h"
+#include "RegisterBoundObjectRegistry.h"
+#include "..\CefSharp.Core.Runtime\Internals\Messaging\Messages.h"
+#include "..\CefSharp.Core.Runtime\Internals\Serialization\Primitives.h"
+
+using namespace System;
+using namespace CefSharp::Internals::Messaging;
+using namespace CefSharp::Internals::Serialization;
+using namespace CefSharp::BrowserSubprocess;
+
+namespace CefSharp
+{
+ namespace BrowserSubprocess
+ {
+ const CefString kBindObjectAsync = CefString("BindObjectAsync");
+ const CefString kBindObjectAsyncCamelCase = CefString("bindObjectAsync");
+
+ private class BindObjectAsyncHandler : public CefV8Handler
+ {
+ private:
+ gcroot _callbackRegistry;
+ gcroot^> _javascriptObjects;
+ gcroot _javascriptRootObjectWrapper;
+
+ public:
+ BindObjectAsyncHandler(RegisterBoundObjectRegistry^ callbackRegistery, Dictionary^ javascriptObjects, JavascriptRootObjectWrapper^ javascriptRootObjectWrapper)
+ {
+ _callbackRegistry = callbackRegistery;
+ _javascriptObjects = javascriptObjects;
+ _javascriptRootObjectWrapper = javascriptRootObjectWrapper;
+ }
+
+ ~BindObjectAsyncHandler()
+ {
+ _callbackRegistry = nullptr;
+ _javascriptObjects = nullptr;
+ _javascriptRootObjectWrapper = nullptr;
+ }
+
+ bool Execute(const CefString& name, CefRefPtr object, const CefV8ValueList& arguments, CefRefPtr& retval, CefString& exception) override
+ {
+ auto context = CefV8Context::GetCurrentContext();
+
+ if (context.get() && context->Enter())
+ {
+ try
+ {
+ auto params = CefListValue::Create();
+ //We need to store a seperate index into our params as
+ //there are instances we skip over already cached objects
+ //and end up with empty strings in the list.
+ //e.g. first object is already bound/cached, we previously
+ //second object isn't we end up with a list of "", "secondObject"
+ int paramsIndex = 0;
+
+ auto boundObjectRequired = false;
+ auto notifyIfAlreadyBound = false;
+ auto ignoreCache = false;
+ auto cachedObjects = gcnew List();
+ //TODO: Create object to represent this information
+ auto objectNamesWithBoundStatus = gcnew List^>();
+ auto objectCount = 0;
+
+ if (arguments.size() > 0)
+ {
+ objectCount = (int)arguments.size();
+
+ //If first argument is an object, we'll see if it contains config values
+ if (arguments[0]->IsObject())
+ {
+ //Upper and camelcase options are supported
+ notifyIfAlreadyBound = GetV8BoolValue(arguments[0], "NotifyIfAlreadyBound", "notifyIfAlreadyBound");
+ ignoreCache = GetV8BoolValue(arguments[0], "IgnoreCache", "ignoreCache");
+
+ //If we have a config object then we remove that from the count
+ objectCount = objectCount - 1;
+ }
+
+ auto global = context->GetGlobal();
+
+ //Loop through all arguments and ignore anything that's not a string
+ for (size_t i = 0; i < arguments.size(); i++)
+ {
+ //Validate arg as being a string
+ if (arguments[i]->IsString())
+ {
+ auto objectName = arguments[i]->GetStringValue();
+ auto managedObjectName = StringUtils::ToClr(objectName);
+ auto alreadyBound = global->HasValue(objectName);
+ auto cached = false;
+
+ //Check if the object has already been bound
+ if (alreadyBound)
+ {
+ cached = _javascriptObjects->ContainsKey(managedObjectName);
+ }
+ else
+ {
+ //If no matching object found then we'll add the object name to the list
+ boundObjectRequired = true;
+ params->SetString(paramsIndex++, objectName);
+
+ JavascriptObject^ obj;
+ if (_javascriptObjects->TryGetValue(managedObjectName, obj))
+ {
+ cachedObjects->Add(obj);
+
+ cached = true;
+ }
+ }
+
+ objectNamesWithBoundStatus->Add(Tuple::Create(managedObjectName, alreadyBound, cached));
+ }
+ }
+ }
+ else
+ {
+ //No objects names were specified so we default to makeing the request
+ boundObjectRequired = true;
+ }
+
+ auto frame = context->GetFrame();
+
+ if (frame.get() && frame->IsValid())
+ {
+ if (boundObjectRequired || ignoreCache)
+ {
+ //If the number of cached objects matches the number of args
+ //(we have a cached copy of all requested objects)
+ //then we'll immediately bind the cached objects
+ //If objectCount and cachedObject count are both 0 then we'll
+ //send the kJavascriptRootObjectRequest message
+ //https://github.com/cefsharp/CefSharp/issues/3470
+ if (objectCount > 0 && cachedObjects->Count == objectCount && ignoreCache == false)
+ {
+ if (Object::ReferenceEquals(_javascriptRootObjectWrapper, nullptr))
+ {
+ exception = "BindObjectAsyncHandler::Execute - _javascriptRootObjectWrapper null, unable to bind objects";
+
+ return true;
+ }
+
+ auto browser = context->GetBrowser();
+
+ JavascriptRootObjectWrapper^ rootObject = _javascriptRootObjectWrapper;
+
+ //Cached objects only contains a list of objects not already bound
+ rootObject->Bind(cachedObjects, context->GetGlobal());
+
+ //Objects already bound or ignore cache
+ CefRefPtr promiseResolve;
+ CefRefPtr promiseException;
+
+ auto promiseResolveScript = StringUtils::ToNative("Promise.resolve({Success:true, Count:" + cachedObjects->Count + ", Message:'OK'});");
+
+ if (context->Eval(promiseResolveScript, CefString(), 0, promiseResolve, promiseException))
+ {
+ retval = promiseResolve;
+ }
+ else
+ {
+ exception = promiseException->GetMessage();
+
+ return true;
+ }
+
+ NotifyObjectBound(frame, objectNamesWithBoundStatus);
+ }
+ else
+ {
+ CefRefPtr promiseData;
+ CefRefPtr promiseException;
+ //this will create a promise and give us the reject/resolve functions {p: Promise, res: resolve(), rej: reject()}
+ if (!context->Eval(CefAppUnmanagedWrapper::kPromiseCreatorScript, CefString(), 0, promiseData, promiseException))
+ {
+ exception = promiseException->GetMessage();
+
+ return true;
+ }
+
+ //when refreshing the browser this is sometimes null, in this case return true and log message
+ //https://github.com/cefsharp/CefSharp/pull/2446
+ if (promiseData == nullptr)
+ {
+ LOG(WARNING) << "BindObjectAsyncHandler::Execute promiseData returned nullptr";
+
+ return true;
+ }
+
+ //return the promose
+ retval = promiseData->GetValue("p");
+
+ //References to the promise resolve and reject methods
+ auto resolve = promiseData->GetValue("res");
+ auto reject = promiseData->GetValue("rej");
+
+ auto callback = gcnew JavascriptAsyncMethodCallback(context, resolve, reject);
+
+ auto request = CefProcessMessage::Create(kJavascriptRootObjectRequest);
+ auto argList = request->GetArgumentList();
+
+ //Obtain a callbackId then send off the Request for objects
+ auto callbackId = _callbackRegistry->SaveMethodCallback(callback);
+
+ SetInt64(argList, 0, callbackId);
+ argList->SetList(1, params);
+
+ frame->SendProcessMessage(CefProcessId::PID_BROWSER, request);
+ }
+ }
+ else
+ {
+ //Objects already bound or ignore cache
+ CefRefPtr promiseResolve;
+ CefRefPtr promiseException;
+
+ auto promiseResolveScript = CefString("Promise.resolve({Success:false, Count:0, Message:'Object(s) already bound'});");
+
+ if (context->Eval(promiseResolveScript, CefString(), 0, promiseResolve, promiseException))
+ {
+ retval = promiseResolve;
+
+ if (notifyIfAlreadyBound)
+ {
+ NotifyObjectBound(frame, objectNamesWithBoundStatus);
+ }
+ }
+ else
+ {
+ exception = promiseException->GetMessage();
+ }
+ }
+ }
+ else
+ {
+ exception = "BindObjectAsyncHandler::Execute - Frame is invalid.";
+ }
+ }
+ finally
+ {
+ context->Exit();
+ }
+ }
+ else
+ {
+ exception = "BindObjectAsyncHandler::Execute - Unable to Get or Enter Context";
+ }
+
+
+ return true;
+ }
+
+ private:
+ void NotifyObjectBound(const CefRefPtr frame, List^>^ objectNamesWithBoundStatus)
+ {
+ //Send message notifying Browser Process of which objects were bound
+ //We do this after the objects have been created in the V8Context to gurantee
+ //they are accessible.
+ auto msg = CefProcessMessage::Create(kJavascriptObjectsBoundInJavascript);
+ auto args = msg->GetArgumentList();
+
+ auto boundObjects = CefListValue::Create();
+ auto index = 0;
+
+ for each (auto obj in objectNamesWithBoundStatus)
+ {
+ auto dict = CefDictionaryValue::Create();
+
+ auto name = obj->Item1;
+ auto alreadyBound = obj->Item2;
+ auto isCached = obj->Item3;
+ dict->SetString("Name", StringUtils::ToNative(name));
+ dict->SetBool("IsCached", isCached);
+ dict->SetBool("AlreadyBound", alreadyBound);
+
+ boundObjects->SetDictionary(index++, dict);
+ }
+
+ args->SetList(0, boundObjects);
+
+ frame->SendProcessMessage(CefProcessId::PID_BROWSER, msg);
+ }
+
+ bool GetV8BoolValue(const CefRefPtr val, const CefString key, const CefString camelCaseKey)
+ {
+ if (val->HasValue(key))
+ {
+ auto obj = val->GetValue(key);
+ if (obj->IsBool())
+ {
+ return obj->GetBoolValue();
+ }
+ }
+
+ if (val->HasValue(camelCaseKey))
+ {
+ auto obj = val->GetValue(camelCaseKey);
+ if (obj->IsBool())
+ {
+ return obj->GetBoolValue();
+ }
+ }
+
+ return false;
+ }
+
+ IMPLEMENT_REFCOUNTINGM(BindObjectAsyncHandler);
+ };
+ }
+}
+
diff --git a/CefSharp.BrowserSubprocess.Core/BrowserSubprocessExecutable.h b/CefSharp.BrowserSubprocess.Core/BrowserSubprocessExecutable.h
new file mode 100644
index 0000000000..f4f9ca45be
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/BrowserSubprocessExecutable.h
@@ -0,0 +1,165 @@
+// Copyright © 2019 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+#pragma once
+
+#include "Stdafx.h"
+
+#include "SubProcess.h"
+
+using namespace System;
+using namespace CefSharp::Internals;
+
+namespace CefSharp
+{
+ namespace BrowserSubprocess
+ {
+ ///
+ /// BrowserSubprocessExecutable provides the fundimental browser process handling for
+ /// CefSharp.BrowserSubprocess.exe and can be used to self host the BrowserSubProcess in your
+ /// existing application (preferred approach for .Net Core).
+ ///
+ public ref class BrowserSubprocessExecutable
+ {
+ public:
+ BrowserSubprocessExecutable()
+ {
+
+ }
+
+#ifdef NETCOREAPP
+ ///
+ /// This function should be called from the application entry point function (typically Program.Main)
+ /// to execute a secondary process e.g. gpu, renderer, utility
+ /// This overload is specifically used for .Net Core. For hosting your own BrowserSubProcess
+ /// it's preferable to use the Main method provided by this class.
+ ///
+ ///
+ /// If called for the browser process (identified by no "type" command-line value) it will return immediately
+ /// with a value of -1. If called for a recognized secondary process it will block until the process should exit
+ /// and then return the process exit code.
+ /// ^ args)
+ {
+ auto subProcess = gcnew BrowserSubprocessExecutable();
+ return subProcess->Main(args, nullptr);
+ }
+#endif
+
+ ///
+ /// This function should be called from the application entry point function (typically Program.Main)
+ /// to execute a secondary process e.g. gpu, renderer, utility
+ /// This overload is specifically used for .Net Core. For hosting your own BrowserSubProcess
+ /// it's preferable to use the Main method provided by this class.
+ /// - Obtains the command line args via a call to Environment::GetCommandLineArgs
+ ///
+ ///
+ /// If called for the browser process (identified by no "type" command-line value) it will return immediately
+ /// with a value of -1. If called for a recognized secondary process it will block until the process should exit
+ /// and then return the process exit code.
+ /// Main(args, nullptr);
+ }
+
+ ///
+ /// This function should be called from the application entry point function (typically Program.Main)
+ /// to execute a secondary process e.g. gpu, renderer, utility
+ /// It can be used to run secondary processes (BrowserSubProcess) from your main applications executable
+ /// or from a separate executable specified by the CefSettings.BrowserSubprocessPath value.
+ /// CefSharp defaults to using the latter approach, a default implementation (CefSharp.BrowserSubProcess.exe) is
+ /// supplied, see https://github.com/cefsharp/CefSharp/wiki/General-Usage#processes for more details.
+ ///
+ /// command line args
+ ///
+ /// If called for the browser process (identified by no "type" command-line value) it will return immediately
+ /// with a value of -1. If called for a recognized secondary process it will block until the process should exit
+ /// and then return the process exit code.
+ /// ^ args)
+ {
+ return Main(args, nullptr);
+ }
+
+ ///
+ /// This function should be called from the application entry point function (typically Program.Main)
+ /// to execute a secondary process e.g. gpu, renderer, utility
+ /// It can be used to run secondary processes (BrowserSubProcess) from your main applications executable
+ /// or from a separate executable specified by the CefSettings.BrowserSubprocessPath value.
+ /// CefSharp defaults to using the latter approach, a default implementation (CefSharp.BrowserSubProcess.exe) is
+ /// supplied, see https://github.com/cefsharp/CefSharp/wiki/General-Usage#processes for more details.
+ ///
+ /// command line args
+ /// An option IRenderProcessHandler implementation, use null if no handler is required
+ ///
+ /// If called for the browser process (identified by no "type" command-line value) it will return immediately
+ /// with a value of -1. If called for a recognized secondary process it will block until the process should exit
+ /// and then return the process exit code.
+ ///
+ int Main(IEnumerable^ args, IRenderProcessHandler^ handler)
+ {
+ auto type = CommandLineArgsParser::GetArgumentValue(args, CefSharpArguments::SubProcessTypeArgument);
+
+ if (String::IsNullOrEmpty(type))
+ {
+ //If --type param missing from command line CEF/Chromium assums
+ //this is the main process (as all subprocesses must have a type param).
+ //Return -1 to indicate this behaviour.
+ return -1;
+ }
+
+ auto parentProcessId = -1;
+
+ // The Crashpad Handler doesn't have any HostProcessIdArgument, so we must not try to
+ // parse it lest we want an ArgumentNullException.
+ if (type == "crashpad-handler")
+ {
+ //Lower the shutdown priority so the browser process is shutdown first (Issue #3155)
+ //The system terminates the process without displaying a retry dialog box for the user.
+ //Crashpad is lower than other sub processes so it can still monitor process exit crashes.
+ SetProcessShutdownParameters(0x100, SHUTDOWN_NORETRY);
+ }
+ else
+ {
+ //Lower the shutdown priority so the browser process is shutdown first (Issue #3155)
+ //The system terminates the process without displaying a retry dialog box for the user.
+ SetProcessShutdownParameters(0x200, SHUTDOWN_NORETRY);
+
+ parentProcessId = int::Parse(CommandLineArgsParser::GetArgumentValue(args, CefSharpArguments::HostProcessIdArgument));
+ if (CommandLineArgsParser::HasArgument(args, CefSharpArguments::ExitIfParentProcessClosed))
+ {
+ ParentProcessMonitor::StartMonitorTask(parentProcessId);
+ }
+ }
+
+ // Use our custom subProcess provides features like EvaluateJavascript
+ if (type == "renderer")
+ {
+ auto subProcess = GetSubprocess(args, parentProcessId, handler);
+
+ try
+ {
+ return subProcess->Run();
+ }
+ finally
+ {
+ delete subProcess;
+ }
+ }
+
+ return SubProcess::ExecuteProcess(args);
+ }
+
+ protected:
+ virtual SubProcess^ GetSubprocess(IEnumerable^ args, int parentProcessId, IRenderProcessHandler^ handler)
+ {
+ return gcnew SubProcess(handler, args);
+ }
+ };
+ }
+}
diff --git a/CefSharp.BrowserSubprocess.Core/Cef.h b/CefSharp.BrowserSubprocess.Core/Cef.h
new file mode 100644
index 0000000000..61187e8762
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/Cef.h
@@ -0,0 +1,34 @@
+// Copyright © 2020 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+#pragma once
+
+#include "Stdafx.h"
+#include "include\cef_v8.h"
+
+namespace CefSharp
+{
+ namespace BrowserSubprocess
+ {
+ ///
+ /// Global CEF methods are exposed through this class. e.g. CefRegisterExtension maps to Cef.RegisterExtension
+ /// Only methods relevant to the Render Process are included in this class.
+ /// CEF API Doc https://magpcss.org/ceforum/apidocs3/projects/(default)/(_globals).html
+ /// This class cannot be inherited.
+ ///
+ public ref class Cef sealed
+ {
+ public:
+ ///
+ /// Register a new V8 extension with the specified JavaScript extension code.
+ ///
+ /// name
+ /// JavaScript code
+ static void RegisterExtension(String^ name, String^ javascriptCode)
+ {
+ CefRegisterExtension(StringUtils::ToNative(name), StringUtils::ToNative(javascriptCode), nullptr);
+ }
+ };
+ }
+}
diff --git a/CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.cpp b/CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.cpp
new file mode 100644
index 0000000000..05ec2fbefc
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.cpp
@@ -0,0 +1,827 @@
+// Copyright © 2014 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+#pragma once
+
+#include "Stdafx.h"
+
+#include "CefBrowserWrapper.h"
+#include "CefAppUnmanagedWrapper.h"
+#include "RegisterBoundObjectHandler.h"
+#include "BindObjectAsyncHandler.h"
+#include "JavascriptPostMessageHandler.h"
+#include "JavascriptRootObjectWrapper.h"
+#include "JavascriptPromiseHandler.h"
+#include "JavascriptPromiseResolverCatch.h"
+#include "JavascriptPromiseResolverThen.h"
+#include "Async\JavascriptAsyncMethodCallback.h"
+#include "Serialization\V8Serialization.h"
+#include "Serialization\JsObjectsSerialization.h"
+#include "Wrapper\V8Context.h"
+#include "Wrapper\Frame.h"
+#include "Wrapper\Browser.h"
+#include "..\CefSharp.Core.Runtime\Internals\Messaging\Messages.h"
+#include "..\CefSharp.Core.Runtime\Internals\Serialization\Primitives.h"
+#include
+
+using namespace System;
+using namespace System::Diagnostics;
+using namespace System::Collections::Generic;
+using namespace CefSharp::BrowserSubprocess::Serialization;
+using namespace CefSharp::Internals::Messaging;
+using namespace CefSharp::Internals::Serialization;
+
+namespace CefSharp
+{
+ namespace BrowserSubprocess
+ {
+ const CefString CefAppUnmanagedWrapper::kPromiseCreatorScript = ""
+ "(function()"
+ "{"
+ " var result = {};"
+ " var promise = new Promise(function(resolve, reject) {"
+ " result.res = resolve; result.rej = reject;"
+ " });"
+ " result.p = promise;"
+ " return result;"
+ "})();";
+
+ const CefString kRenderProcessId = CefString("RenderProcessId");
+ const CefString kRenderProcessIdCamelCase = CefString("renderProcessId");
+
+ CefRefPtr CefAppUnmanagedWrapper::GetRenderProcessHandler()
+ {
+ return this;
+ };
+
+ // CefRenderProcessHandler
+ void CefAppUnmanagedWrapper::OnBrowserCreated(CefRefPtr browser, CefRefPtr extraInfo)
+ {
+ auto wrapper = gcnew CefBrowserWrapper(browser);
+ _onBrowserCreated->Invoke(wrapper);
+
+ //Multiple CefBrowserWrappers created when opening popups
+ auto browserId = browser->GetIdentifier();
+ _browserWrappers->TryAdd(browserId, wrapper);
+
+ static gcroot^> factory =
+ gcnew Func(CefAppUnmanagedWrapper::JavascriptBindingSettingsFactory);
+
+ auto javascriptBindingSettings = _browserJavascriptBindingSettings->GetOrAdd(browserId, factory);
+
+ if (!extraInfo.get())
+ {
+ return;
+ }
+
+ //For the main browser only we check LegacyBindingEnabled and
+ //load the objects. Popups don't send this information and checking
+ //will override the _legacyBindingEnabled field
+ if (!browser->IsPopup())
+ {
+ javascriptBindingSettings->LegacyBindingEnabled = extraInfo->GetBool("LegacyBindingEnabled");
+
+ if (javascriptBindingSettings->LegacyBindingEnabled)
+ {
+ auto objects = extraInfo->GetList("LegacyBindingObjects");
+ if (objects.get() && objects->IsValid())
+ {
+ auto javascriptObjects = DeserializeJsObjects(objects, 0);
+
+ for each (JavascriptObject ^ obj in Enumerable::OfType(javascriptObjects))
+ {
+ //Using LegacyBinding with multiple ChromiumWebBrowser instances that share the same
+ //render process and using LegacyBinding will cause problems for the limited caching implementation
+ //that exists at the moment, for now we'll remove an object if already exists, same behaviour
+ //as the new binding method.
+ //TODO: This should be removed when https://github.com/cefsharp/CefSharp/issues/2306
+ //Is complete as objects will be stored at the browser level
+ if (_javascriptObjects->ContainsKey(obj->JavascriptName))
+ {
+ _javascriptObjects->Remove(obj->JavascriptName);
+ }
+ _javascriptObjects->Add(obj->JavascriptName, obj);
+ }
+ }
+ }
+ }
+
+ if (extraInfo->HasKey("JavascriptBindingApiEnabled"))
+ {
+ javascriptBindingSettings->JavascriptBindingApiEnabled = extraInfo->GetBool("JavascriptBindingApiEnabled");
+ }
+
+ if (extraInfo->HasKey("JavascriptBindingApiHasAllowOrigins"))
+ {
+ javascriptBindingSettings->JavascriptBindingApiHasAllowOrigins = extraInfo->GetBool("JavascriptBindingApiHasAllowOrigins");
+
+ if (javascriptBindingSettings->JavascriptBindingApiHasAllowOrigins)
+ {
+ auto allowOrigins = extraInfo->GetList("JavascriptBindingApiAllowOrigins");
+ if (allowOrigins.get() && allowOrigins->IsValid())
+ {
+ javascriptBindingSettings->JavascriptBindingApiAllowOrigins = allowOrigins->Copy();
+ }
+ }
+ }
+
+ if (extraInfo->HasKey("JsBindingPropertyName") || extraInfo->HasKey("JsBindingPropertyNameCamelCase"))
+ {
+ //TODO: Create constant for these and legacy binding strings above
+ javascriptBindingSettings->JavascriptBindingPropertyName = StringUtils::ToClr(extraInfo->GetString("JsBindingPropertyName"));
+ javascriptBindingSettings->JavascriptBindingPropertyNameCamelCase = StringUtils::ToClr(extraInfo->GetString("JsBindingPropertyNameCamelCase"));
+ }
+ }
+
+ void CefAppUnmanagedWrapper::OnBrowserDestroyed(CefRefPtr browser)
+ {
+ CefBrowserWrapper^ wrapper;
+ if (_browserWrappers->TryRemove(browser->GetIdentifier(), wrapper))
+ {
+ _onBrowserDestroyed->Invoke(wrapper);
+ delete wrapper;
+ }
+
+ // Don't remove javascript settings because cef is unreliable in calling OnBrowserCreated/OnBrowserDestroyed consistently:
+ // https://github.com/cefsharp/CefSharp/issues/5228
+ };
+
+ void CefAppUnmanagedWrapper::OnContextCreated(CefRefPtr browser, CefRefPtr frame, CefRefPtr context)
+ {
+ if (!Object::ReferenceEquals(_handler, nullptr))
+ {
+ Browser browserWrapper(browser);
+ Frame frameWrapper(frame);
+ V8Context contextWrapper(context);
+
+ _handler->OnContextCreated(% browserWrapper, % frameWrapper, % contextWrapper);
+ }
+
+ //Skip additional contexts (DevTools, extensions) to avoid
+ //double binding and duplicate calls to IRenderProcessMessageHandler.OnContextCreated
+ //https://github.com/chromiumembedded/cef/issues/3867
+ bool isSameContext = frame->GetV8Context()->IsSame(context);
+ if (!isSameContext)
+ return;
+
+ JavascriptBindingSettings^ javascriptBindingSettings = nullptr;
+ _browserJavascriptBindingSettings->TryGetValue(browser->GetIdentifier(), javascriptBindingSettings);
+
+ if (!Object::ReferenceEquals(javascriptBindingSettings, nullptr))
+ {
+ auto rootObject = GetJsRootObjectWrapper(browser->GetIdentifier(), frame->GetIdentifier());
+
+ if (javascriptBindingSettings->LegacyBindingEnabled)
+ {
+ if (_javascriptObjects->Count > 0 && rootObject != nullptr)
+ {
+ rootObject->Bind(_javascriptObjects->Values, context->GetGlobal());
+ }
+ }
+
+ if (IsJavascriptBindingApiAllowed(javascriptBindingSettings, frame))
+ {
+ //TODO: Look at adding some sort of javascript mapping layer to reduce the code duplication
+ auto global = context->GetGlobal();
+ auto processId = System::Diagnostics::Process::GetCurrentProcess()->Id;
+
+ //TODO: JSB: Split functions into their own classes
+ //Browser wrapper is only used for BindObjectAsync
+ auto bindObjAsyncFunction = CefV8Value::CreateFunction(kBindObjectAsync, new BindObjectAsyncHandler(_registerBoundObjectRegistry, _javascriptObjects, rootObject));
+ auto unBindObjFunction = CefV8Value::CreateFunction(kDeleteBoundObject, new RegisterBoundObjectHandler(_javascriptObjects));
+ auto removeObjectFromCacheFunction = CefV8Value::CreateFunction(kRemoveObjectFromCache, new RegisterBoundObjectHandler(_javascriptObjects));
+ auto isObjectCachedFunction = CefV8Value::CreateFunction(kIsObjectCached, new RegisterBoundObjectHandler(_javascriptObjects));
+ auto postMessageFunction = CefV8Value::CreateFunction(kPostMessage, new JavascriptPostMessageHandler(rootObject == nullptr ? nullptr : rootObject->CallbackRegistry));
+ auto promiseHandlerFunction = CefV8Value::CreateFunction(kSendEvalScriptResponse, new JavascriptPromiseHandler());
+
+ //By default We'll support both CefSharp and cefSharp, for those who prefer the JS style
+ auto createCefSharpObj = !String::IsNullOrEmpty(javascriptBindingSettings->JavascriptBindingPropertyName);
+ auto createCefSharpObjCamelCase = !String::IsNullOrEmpty(javascriptBindingSettings->JavascriptBindingPropertyNameCamelCase);
+
+ if (createCefSharpObj)
+ {
+ auto cefSharpObj = CefV8Value::CreateObject(nullptr, nullptr);
+ cefSharpObj->SetValue(kBindObjectAsync, bindObjAsyncFunction, CefV8Value::PropertyAttribute::V8_PROPERTY_ATTRIBUTE_NONE);
+ cefSharpObj->SetValue(kDeleteBoundObject, unBindObjFunction, CefV8Value::PropertyAttribute::V8_PROPERTY_ATTRIBUTE_NONE);
+ cefSharpObj->SetValue(kRemoveObjectFromCache, removeObjectFromCacheFunction, CefV8Value::PropertyAttribute::V8_PROPERTY_ATTRIBUTE_NONE);
+ cefSharpObj->SetValue(kIsObjectCached, isObjectCachedFunction, CefV8Value::PropertyAttribute::V8_PROPERTY_ATTRIBUTE_NONE);
+ cefSharpObj->SetValue(kPostMessage, postMessageFunction, CefV8Value::PropertyAttribute::V8_PROPERTY_ATTRIBUTE_NONE);
+ cefSharpObj->SetValue(kSendEvalScriptResponse, promiseHandlerFunction, CefV8Value::PropertyAttribute::V8_PROPERTY_ATTRIBUTE_NONE);
+ cefSharpObj->SetValue(kRenderProcessId, CefV8Value::CreateInt(processId), CefV8Value::PropertyAttribute::V8_PROPERTY_ATTRIBUTE_NONE);
+
+ global->SetValue(StringUtils::ToNative(javascriptBindingSettings->JavascriptBindingPropertyName), cefSharpObj, CefV8Value::PropertyAttribute::V8_PROPERTY_ATTRIBUTE_READONLY);
+ }
+
+ if (createCefSharpObjCamelCase)
+ {
+ auto cefSharpObjCamelCase = CefV8Value::CreateObject(nullptr, nullptr);
+ cefSharpObjCamelCase->SetValue(kBindObjectAsyncCamelCase, bindObjAsyncFunction, CefV8Value::PropertyAttribute::V8_PROPERTY_ATTRIBUTE_NONE);
+ cefSharpObjCamelCase->SetValue(kDeleteBoundObjectCamelCase, unBindObjFunction, CefV8Value::PropertyAttribute::V8_PROPERTY_ATTRIBUTE_NONE);
+ cefSharpObjCamelCase->SetValue(kRemoveObjectFromCacheCamelCase, removeObjectFromCacheFunction, CefV8Value::PropertyAttribute::V8_PROPERTY_ATTRIBUTE_NONE);
+ cefSharpObjCamelCase->SetValue(kIsObjectCachedCamelCase, isObjectCachedFunction, CefV8Value::PropertyAttribute::V8_PROPERTY_ATTRIBUTE_NONE);
+ cefSharpObjCamelCase->SetValue(kPostMessageCamelCase, postMessageFunction, CefV8Value::PropertyAttribute::V8_PROPERTY_ATTRIBUTE_NONE);
+ cefSharpObjCamelCase->SetValue(kSendEvalScriptResponseCamelCase, promiseHandlerFunction, CefV8Value::PropertyAttribute::V8_PROPERTY_ATTRIBUTE_NONE);
+ cefSharpObjCamelCase->SetValue(kRenderProcessIdCamelCase, CefV8Value::CreateInt(processId), CefV8Value::PropertyAttribute::V8_PROPERTY_ATTRIBUTE_NONE);
+
+ global->SetValue(StringUtils::ToNative(javascriptBindingSettings->JavascriptBindingPropertyNameCamelCase), cefSharpObjCamelCase, CefV8Value::PropertyAttribute::V8_PROPERTY_ATTRIBUTE_READONLY);
+ }
+ }
+ }
+
+ //Send a message to the browser processing signaling that OnContextCreated has been called
+ //only param is the FrameId. Previous sent only for main frame, now sent for all frames
+ //Message sent after legacy objects have been bound and the CefSharp bind async helper methods
+ //have been created
+ auto contextCreatedMessage = CefProcessMessage::Create(kOnContextCreatedRequest);
+
+ frame->SendProcessMessage(CefProcessId::PID_BROWSER, contextCreatedMessage);
+ };
+
+ void CefAppUnmanagedWrapper::OnContextReleased(CefRefPtr browser, CefRefPtr frame, CefRefPtr context)
+ {
+ if (!Object::ReferenceEquals(_handler, nullptr))
+ {
+ Browser browserWrapper(browser);
+ Frame frameWrapper(frame);
+ V8Context contextWrapper(context);
+
+ _handler->OnContextReleased(% browserWrapper, % frameWrapper, % contextWrapper);
+ }
+
+ auto contextReleasedMessage = CefProcessMessage::Create(kOnContextReleasedRequest);
+
+ frame->SendProcessMessage(CefProcessId::PID_BROWSER, contextReleasedMessage);
+
+ auto rootObjectWrappers = _jsRootObjectWrappersByFrameId;
+
+ //If we no longer have a _jsRootObjectWrappersByFrameId reference then there's nothing we can do
+ if (Object::ReferenceEquals(rootObjectWrappers, nullptr))
+ {
+ return;
+ }
+
+ JavascriptRootObjectWrapper^ wrapper;
+ if (rootObjectWrappers->TryRemove(StringUtils::ToClr(frame->GetIdentifier()), wrapper))
+ {
+ delete wrapper;
+ }
+ };
+
+ void CefAppUnmanagedWrapper::OnFocusedNodeChanged(CefRefPtr browser, CefRefPtr frame, CefRefPtr node)
+ {
+ if (!_focusedNodeChangedEnabled)
+ {
+ return;
+ }
+
+ auto focusedNodeChangedMessage = CefProcessMessage::Create(kOnFocusedNodeChanged);
+ auto list = focusedNodeChangedMessage->GetArgumentList();
+
+ // The node will be empty if an element loses focus but another one
+ // doesn't gain focus. Only transfer information if the node is an
+ // element.
+ if (node != nullptr && node->IsElement())
+ {
+ // True when a node exists, false if it doesn't.
+ list->SetBool(0, true);
+
+ // Store the tag name.
+ list->SetString(1, node->GetElementTagName());
+
+ // Transfer the attributes in a Dictionary.
+ auto attributes = CefDictionaryValue::Create();
+ CefDOMNode::AttributeMap attributeMap;
+ node->GetElementAttributes(attributeMap);
+ for (auto iter : attributeMap)
+ {
+ attributes->SetString(iter.first, iter.second);
+ }
+
+ list->SetDictionary(2, attributes);
+ }
+ else
+ {
+ list->SetBool(0, false);
+ }
+
+ frame->SendProcessMessage(CefProcessId::PID_BROWSER, focusedNodeChangedMessage);
+ }
+
+ void CefAppUnmanagedWrapper::OnUncaughtException(CefRefPtr browser, CefRefPtr frame, CefRefPtr context, CefRefPtr exception, CefRefPtr stackTrace)
+ {
+ auto uncaughtExceptionMessage = CefProcessMessage::Create(kOnUncaughtException);
+ auto list = uncaughtExceptionMessage->GetArgumentList();
+
+ list->SetString(0, exception->GetMessage());
+
+ auto frames = CefListValue::Create();
+ for (auto i = 0; i < stackTrace->GetFrameCount(); i++)
+ {
+ auto stackTraceFrame = CefListValue::Create();
+ auto frameArg = stackTrace->GetFrame(i);
+
+ stackTraceFrame->SetString(0, frameArg->GetFunctionName());
+ stackTraceFrame->SetInt(1, frameArg->GetLineNumber());
+ stackTraceFrame->SetInt(2, frameArg->GetColumn());
+ stackTraceFrame->SetString(3, frameArg->GetScriptNameOrSourceURL());
+
+ frames->SetList(i, stackTraceFrame);
+ }
+
+ list->SetList(1, frames);
+
+ frame->SendProcessMessage(CefProcessId::PID_BROWSER, uncaughtExceptionMessage);
+ }
+
+ JavascriptRootObjectWrapper^ CefAppUnmanagedWrapper::GetJsRootObjectWrapper(int browserId, const CefString& frameId)
+ {
+ auto rootObjectWrappers = _jsRootObjectWrappersByFrameId;
+
+ if (Object::ReferenceEquals(rootObjectWrappers, nullptr))
+ {
+ return nullptr;
+ }
+
+ auto frameIdClr = StringUtils::ToClr(frameId);
+
+ JavascriptRootObjectWrapper^ rootObject;
+ if (!rootObjectWrappers->TryGetValue(frameIdClr, rootObject))
+ {
+#ifdef NETCOREAPP
+ rootObject = gcnew JavascriptRootObjectWrapper();
+#else
+ auto browserWrapper = FindBrowserWrapper(browserId);
+
+ rootObject = gcnew JavascriptRootObjectWrapper(browserWrapper == nullptr ? nullptr : browserWrapper->BrowserProcess);
+#endif
+ rootObjectWrappers->TryAdd(frameIdClr, rootObject);
+ }
+
+ return rootObject;
+ }
+
+ bool CefAppUnmanagedWrapper::IsJavascriptBindingApiAllowed(JavascriptBindingSettings^ javascriptBindingSettings, CefRefPtr frame)
+ {
+ if (javascriptBindingSettings == nullptr)
+ {
+ return false;
+ }
+
+ if (!javascriptBindingSettings->JavascriptBindingApiEnabled)
+ {
+ return false;
+ }
+
+ if (!javascriptBindingSettings->JavascriptBindingApiHasAllowOrigins)
+ {
+ return true;
+ }
+
+ auto allowOrigins = javascriptBindingSettings->JavascriptBindingApiAllowOrigins;
+ if (!allowOrigins.get())
+ {
+ return false;
+ }
+
+ auto frameUrl = frame->GetURL();
+
+ CefURLParts frameUrlParts;
+
+ if (CefParseURL(frameUrl, frameUrlParts))
+ {
+ auto originStr = frameUrlParts.origin.str;
+ auto originLen = frameUrlParts.origin.length;
+
+ if (originLen > 0 && originStr[originLen - 1] == L'/')
+ {
+ originLen--;
+ }
+
+ auto frameUrlOrigin = CefString(originStr, originLen);
+
+ auto size = static_cast(allowOrigins->GetSize());
+
+ for (int i = 0; i < size; i++)
+ {
+ auto origin = allowOrigins->GetString(i);
+
+ if (_wcsicmp(frameUrlOrigin.ToWString().c_str(), origin.ToWString().c_str()) == 0)
+ {
+ return true;
+ }
+ }
+ }
+
+ return false;
+ }
+
+ CefBrowserWrapper^ CefAppUnmanagedWrapper::FindBrowserWrapper(int browserId)
+ {
+ CefBrowserWrapper^ wrapper = nullptr;
+
+ _browserWrappers->TryGetValue(browserId, wrapper);
+
+ if (wrapper == nullptr)
+ {
+ //TODO: Find the syntax for delcaring the native string directly
+ LOG(ERROR) << StringUtils::ToNative("Failed to identify BrowserWrapper in OnContextCreated BrowserId:" + browserId).ToString();
+ }
+
+ return wrapper;
+ }
+
+ bool CefAppUnmanagedWrapper::OnProcessMessageReceived(CefRefPtr browser, CefRefPtr frame, CefProcessId sourceProcessId, CefRefPtr message)
+ {
+ auto handled = false;
+ auto name = message->GetName();
+ auto argList = message->GetArgumentList();
+
+ //these messages are roughly handled the same way
+ if (name == kEvaluateJavascriptRequest || name == kJavascriptCallbackRequest)
+ {
+ bool sendResponse = true;
+ bool success = false;
+ CefRefPtr result;
+ CefString errorMessage;
+ CefRefPtr response;
+
+ if (name == kEvaluateJavascriptRequest)
+ {
+ response = CefProcessMessage::Create(kEvaluateJavascriptResponse);
+ }
+ else
+ {
+ response = CefProcessMessage::Create(kJavascriptCallbackResponse);
+ }
+
+ //both messages have callbackId stored at index 0
+ auto frameId = StringUtils::ToClr(frame->GetIdentifier());
+ int64_t callbackId = GetInt64(argList, 0);
+
+ //NOTE: In the rare case when when OnContextCreated hasn't been called we need to manually create the rootObjectWrapper
+ //It appears that OnContextCreated is only called for pages that have javascript on them, which makes sense
+ //as without javascript there is no need for a context.
+ JavascriptRootObjectWrapper^ rootObjectWrapper = GetJsRootObjectWrapper(browser->GetIdentifier(), frame->GetIdentifier());
+
+ if (name == kEvaluateJavascriptRequest)
+ {
+ auto script = argList->GetString(1);
+ auto scriptUrl = argList->GetString(2);
+ auto startLine = argList->GetInt(3);
+
+ if (frame.get() && frame->IsValid())
+ {
+ auto context = frame->GetV8Context();
+
+ if (context.get() && context->Enter())
+ {
+ try
+ {
+ CefRefPtr exception;
+ success = context->Eval(script, scriptUrl, startLine, result, exception);
+
+ //we need to do this here to be able to store the v8context
+ if (success)
+ {
+ //If the response is a string of CefSharpDefEvalScriptRes then
+ //we don't send the response, we'll let that happen when the promise has completed.
+ if (result->IsString() && result->GetStringValue() == "CefSharpDefEvalScriptRes")
+ {
+ sendResponse = false;
+ }
+ else if (result->IsPromise())
+ {
+ sendResponse = false;
+
+ auto promiseThen = result->GetValue("then");
+ auto promiseCatch = result->GetValue("catch");
+
+ auto promiseThenFunc = CefV8Value::CreateFunction("promiseResolverThen", new JavascriptPromiseResolverThen(callbackId, false));
+ auto promiseCatchFunc = CefV8Value::CreateFunction("promiseResolverCatch", new JavascriptPromiseResolverCatch(callbackId, false));
+
+ CefV8ValueList promiseThenArgs;
+ promiseThenArgs.push_back(promiseThenFunc);
+ promiseThen->ExecuteFunction(result, promiseThenArgs);
+
+ CefV8ValueList promiseCatchArgs;
+ promiseCatchArgs.push_back(promiseCatchFunc);
+ promiseCatch->ExecuteFunction(result, promiseCatchArgs);
+ }
+ else
+ {
+ auto callbackRegistry = rootObjectWrapper == nullptr ? nullptr : rootObjectWrapper->CallbackRegistry;
+
+ if (callbackRegistry == nullptr)
+ {
+ errorMessage = StringUtils::ToNative("The callback registry for Frame " + frameId + " is no longer available.");
+ }
+ else
+ {
+ auto responseArgList = response->GetArgumentList();
+ SerializeV8Object(result, responseArgList, 2, callbackRegistry);
+ }
+ }
+ }
+ else
+ {
+ errorMessage = StringUtils::CreateExceptionString(exception);
+ }
+ }
+ finally
+ {
+ context->Exit();
+ }
+ }
+ else
+ {
+ errorMessage = "Unable to Enter Context";
+ }
+ }
+ else
+ {
+ errorMessage = StringUtils::ToNative("Frame " + frameId + " is no longer available, most likely the Frame has been Disposed or Removed.");
+ }
+ }
+ else
+ {
+ auto callbackRegistry = rootObjectWrapper == nullptr ? nullptr : rootObjectWrapper->CallbackRegistry;
+ if (callbackRegistry == nullptr)
+ {
+ errorMessage = StringUtils::ToNative("The callback registry for Frame " + frameId + " is no longer available, most likely the Frame has been Disposed.");
+ }
+ else
+ {
+ auto jsCallbackId = GetInt64(argList, 1);
+
+ auto callbackWrapper = callbackRegistry->FindWrapper(jsCallbackId);
+ if (callbackWrapper == nullptr)
+ {
+ errorMessage = StringUtils::ToNative("Unable to find JavascriptCallback with Id " + jsCallbackId + " for Frame " + frameId);
+ }
+ else
+ {
+ auto context = callbackWrapper->GetContext();
+ auto value = callbackWrapper->GetValue();
+
+ if (context.get() && context->Enter())
+ {
+ try
+ {
+ auto parameterList = argList->GetList(2);
+ CefV8ValueList params;
+
+ //Needs to be called within the context as for Dictionary (mapped to struct)
+ //a V8Object will be created
+ for (CefV8ValueList::size_type i = 0; i < parameterList->GetSize(); i++)
+ {
+ params.push_back(DeserializeV8Object(parameterList, static_cast(i)));
+ }
+
+ result = value->ExecuteFunction(nullptr, params);
+ success = result.get() != nullptr;
+
+ //we need to do this here to be able to store the v8context
+ if (success)
+ {
+ //If the response is a string of CefSharpDefEvalScriptRes then
+ //we don't send the response, we'll let that happen when the promise has completed.
+ if (result->IsString() && result->GetStringValue() == "CefSharpDefEvalScriptRes")
+ {
+ sendResponse = false;
+ }
+ else if (result->IsPromise())
+ {
+ sendResponse = false;
+
+ auto promiseThen = result->GetValue("then");
+ auto promiseCatch = result->GetValue("catch");
+
+ auto promiseThenFunc = CefV8Value::CreateFunction("promiseResolverThen", new JavascriptPromiseResolverThen(callbackId, true));
+ auto promiseCatchFunc = CefV8Value::CreateFunction("promiseResolverCatch", new JavascriptPromiseResolverCatch(callbackId, true));
+
+ CefV8ValueList promiseThenArgs;
+ promiseThenArgs.push_back(promiseThenFunc);
+ promiseThen->ExecuteFunction(result, promiseThenArgs);
+
+ CefV8ValueList promiseCatchArgs;
+ promiseCatchArgs.push_back(promiseCatchFunc);
+ promiseCatch->ExecuteFunction(result, promiseCatchArgs);
+ }
+ else
+ {
+ auto responseArgList = response->GetArgumentList();
+ SerializeV8Object(result, responseArgList, 2, callbackRegistry);
+ }
+ }
+ else
+ {
+ auto exception = value->GetException();
+ errorMessage = StringUtils::CreateExceptionString(exception);
+ }
+ }
+ finally
+ {
+ context->Exit();
+ }
+ }
+ else
+ {
+ errorMessage = "Unable to Enter Context";
+ }
+ }
+ }
+ }
+
+ if (sendResponse)
+ {
+ auto responseArgList = response->GetArgumentList();
+ responseArgList->SetBool(0, success);
+ SetInt64(responseArgList, 1, callbackId);
+ if (!success)
+ {
+ responseArgList->SetString(2, errorMessage);
+ }
+ frame->SendProcessMessage(sourceProcessId, response);
+ }
+
+ handled = true;
+ }
+ else if (name == kJavascriptCallbackDestroyRequest)
+ {
+ if (frame.get() && frame->IsValid())
+ {
+ auto jsCallbackId = GetInt64(argList, 0);
+ JavascriptRootObjectWrapper^ rootObjectWrapper;
+ _jsRootObjectWrappersByFrameId->TryGetValue(StringUtils::ToClr(frame->GetIdentifier()), rootObjectWrapper);
+ if (rootObjectWrapper != nullptr && rootObjectWrapper->CallbackRegistry != nullptr)
+ {
+ rootObjectWrapper->CallbackRegistry->Deregister(jsCallbackId);
+ }
+ }
+
+ handled = true;
+ }
+ else if (name == kJavascriptRootObjectResponse)
+ {
+ if (browser.get() && frame.get() && frame->IsValid())
+ {
+ auto callbackId = GetInt64(argList, 0);
+ auto javascriptObjects = DeserializeJsObjects(argList, 1);
+
+ //Caching of JavascriptObjects
+ //TODO: JSB Should caching be configurable? On a per object basis?
+ for each (JavascriptObject ^ obj in Enumerable::OfType(javascriptObjects))
+ {
+ if (_javascriptObjects->ContainsKey(obj->JavascriptName))
+ {
+ _javascriptObjects->Remove(obj->JavascriptName);
+ }
+ _javascriptObjects->Add(obj->JavascriptName, obj);
+ }
+
+ auto rootObject = GetJsRootObjectWrapper(browser->GetIdentifier(), frame->GetIdentifier());
+
+ if (rootObject == nullptr)
+ {
+ return false;
+ }
+
+ auto context = frame->GetV8Context();
+
+ if (context.get() && context->Enter())
+ {
+ JavascriptAsyncMethodCallback^ callback;
+
+ try
+ {
+ rootObject->Bind(javascriptObjects, context->GetGlobal());
+
+ if (_registerBoundObjectRegistry->TryGetAndRemoveMethodCallback(callbackId, callback))
+ {
+ //Response object has no Accessor or Interceptor
+ auto response = CefV8Value::CreateObject(nullptr, nullptr);
+
+ response->SetValue("Count", CefV8Value::CreateInt(javascriptObjects->Count), CefV8Value::PropertyAttribute::V8_PROPERTY_ATTRIBUTE_READONLY);
+
+ if (javascriptObjects->Count > 0)
+ {
+ //TODO: JSB Should we include a list of successfully bound object names?
+ response->SetValue("Success", CefV8Value::CreateBool(true), CefV8Value::PropertyAttribute::V8_PROPERTY_ATTRIBUTE_READONLY);
+ response->SetValue("Message", CefV8Value::CreateString("OK"), CefV8Value::PropertyAttribute::V8_PROPERTY_ATTRIBUTE_READONLY);
+ callback->Success(response);
+ }
+ else
+ {
+ response->SetValue("Success", CefV8Value::CreateBool(false), CefV8Value::PropertyAttribute::V8_PROPERTY_ATTRIBUTE_READONLY);
+ response->SetValue("Message", CefV8Value::CreateString("Zero objects bounds"), CefV8Value::PropertyAttribute::V8_PROPERTY_ATTRIBUTE_READONLY);
+ callback->Success(response);
+ }
+
+ //Send message notifying Browser Process of which objects were bound
+ //We do this after the objects have been created in the V8Context to gurantee
+ //they are accessible.
+ auto msg = CefProcessMessage::Create(kJavascriptObjectsBoundInJavascript);
+ auto args = msg->GetArgumentList();
+
+ auto boundObjects = CefListValue::Create();
+
+ auto i = 0;
+
+ for each (auto jsObject in javascriptObjects)
+ {
+ auto dict = CefDictionaryValue::Create();
+ auto objectName = jsObject->JavascriptName;
+ dict->SetString("Name", StringUtils::ToNative(objectName));
+ dict->SetBool("IsCached", false);
+ dict->SetBool("AlreadyBound", false);
+
+ boundObjects->SetDictionary(i++, dict);
+ }
+
+ args->SetList(0, boundObjects);
+
+ frame->SendProcessMessage(CefProcessId::PID_BROWSER, msg);
+ }
+ }
+ finally
+ {
+ context->Exit();
+
+ delete callback;
+ }
+ }
+ }
+ else
+ {
+ LOG(INFO) << "CefAppUnmanagedWrapper Frame Invalid";
+ }
+
+ handled = true;
+ }
+ else if (name == kJavascriptAsyncMethodCallResponse)
+ {
+ if (frame.get() && frame->IsValid())
+ {
+ auto frameId = StringUtils::ToClr(frame->GetIdentifier());
+ auto callbackId = GetInt64(argList, 0);
+
+ JavascriptRootObjectWrapper^ rootObjectWrapper;
+ _jsRootObjectWrappersByFrameId->TryGetValue(frameId, rootObjectWrapper);
+
+ if (rootObjectWrapper != nullptr)
+ {
+ JavascriptAsyncMethodCallback^ callback;
+ if (rootObjectWrapper->TryGetAndRemoveMethodCallback(callbackId, callback))
+ {
+ try
+ {
+ auto context = frame->GetV8Context();
+
+ if (context.get() && context->Enter())
+ {
+ try
+ {
+ auto success = argList->GetBool(1);
+ if (success)
+ {
+ callback->Success(DeserializeV8Object(argList, 2));
+ }
+ else
+ {
+ callback->Fail(argList->GetString(2));
+ }
+ }
+ finally
+ {
+ context->Exit();
+ }
+ }
+ else
+ {
+ callback->Fail("Unable to Enter Context");
+ }
+ }
+ finally
+ {
+ //dispose
+ delete callback;
+ }
+ }
+ }
+ }
+ handled = true;
+ }
+
+ return handled;
+ };
+
+ void CefAppUnmanagedWrapper::OnWebKitInitialized()
+ {
+ if (!Object::ReferenceEquals(_handler, nullptr))
+ {
+ _handler->OnWebKitInitialized();
+ }
+ }
+ }
+}
diff --git a/CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.h b/CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.h
new file mode 100644
index 0000000000..a6d90755d1
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.h
@@ -0,0 +1,114 @@
+// Copyright © 2014 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+#pragma once
+
+#include "Stdafx.h"
+#include "include/cef_base.h"
+
+#include "SubProcessApp.h"
+#include "CefBrowserWrapper.h"
+#include "JavascriptBindingSettings.h"
+#include "RegisterBoundObjectRegistry.h"
+
+using namespace System::Collections::Generic;
+using namespace CefSharp::RenderProcess;
+
+namespace CefSharp
+{
+ namespace BrowserSubprocess
+ {
+ // This class is the native subprocess level CEF object wrapper.
+ private class CefAppUnmanagedWrapper : SubProcessApp, CefRenderProcessHandler
+ {
+ private:
+ gcroot _handler;
+ gcroot^> _onBrowserCreated;
+ gcroot^> _onBrowserDestroyed;
+ gcroot^> _browserWrappers;
+ gcroot^> _browserJavascriptBindingSettings;
+ gcroot^> _jsRootObjectWrappersByFrameId;
+ bool _focusedNodeChangedEnabled;
+
+ // The serialized registered object data waiting to be used.
+ gcroot^> _javascriptObjects;
+
+ gcroot _registerBoundObjectRegistry;
+
+ static bool IsJavascriptBindingApiAllowed(JavascriptBindingSettings^ javascriptBindingSettings, CefRefPtr frame);
+
+ static JavascriptBindingSettings^ JavascriptBindingSettingsFactory(int _)
+ {
+ return gcnew JavascriptBindingSettings();
+ }
+
+ public:
+ static const CefString kPromiseCreatorScript;
+
+ CefAppUnmanagedWrapper(IRenderProcessHandler^ handler, List^ schemes, bool enableFocusedNodeChanged, Action^ onBrowserCreated, Action^ onBrowserDestroyed) : SubProcessApp(schemes)
+ {
+ _handler = handler;
+ _onBrowserCreated = onBrowserCreated;
+ _onBrowserDestroyed = onBrowserDestroyed;
+ _browserWrappers = gcnew ConcurrentDictionary();
+ _browserJavascriptBindingSettings = gcnew ConcurrentDictionary();
+ _jsRootObjectWrappersByFrameId = gcnew ConcurrentDictionary();
+ _focusedNodeChangedEnabled = enableFocusedNodeChanged;
+ _javascriptObjects = gcnew Dictionary();
+ _registerBoundObjectRegistry = gcnew RegisterBoundObjectRegistry();
+ }
+
+ ~CefAppUnmanagedWrapper()
+ {
+ if (!Object::ReferenceEquals(_browserWrappers, nullptr))
+ {
+ for each (CefBrowserWrapper ^ browser in _browserWrappers->Values)
+ {
+ delete browser;
+ }
+
+ _browserWrappers = nullptr;
+ }
+
+ if (!Object::ReferenceEquals(_browserJavascriptBindingSettings, nullptr))
+ {
+ for each (JavascriptBindingSettings ^ javascriptBindingSettings in _browserJavascriptBindingSettings->Values)
+ {
+ delete javascriptBindingSettings;
+ }
+
+ _browserJavascriptBindingSettings = nullptr;
+ }
+
+ if (!Object::ReferenceEquals(_jsRootObjectWrappersByFrameId, nullptr))
+ {
+ for each (JavascriptRootObjectWrapper^ rootObject in _jsRootObjectWrappersByFrameId->Values)
+ {
+ delete rootObject;
+ }
+
+ _jsRootObjectWrappersByFrameId = nullptr;
+ }
+
+ delete _onBrowserCreated;
+ delete _onBrowserDestroyed;
+ }
+
+ CefBrowserWrapper^ FindBrowserWrapper(int browserId);
+ JavascriptRootObjectWrapper^ GetJsRootObjectWrapper(int browserId, const CefString& frameId);
+
+ virtual DECL CefRefPtr GetRenderProcessHandler() override;
+ virtual DECL void OnBrowserCreated(CefRefPtr browser, CefRefPtr extraInfo) override;
+ virtual DECL void OnBrowserDestroyed(CefRefPtr browser) override;
+ virtual DECL void OnContextCreated(CefRefPtr browser, CefRefPtr frame, CefRefPtr context) override;
+ virtual DECL void OnContextReleased(CefRefPtr browser, CefRefPtr frame, CefRefPtr context) override;
+ virtual DECL bool OnProcessMessageReceived(CefRefPtr browser, CefRefPtr frame, CefProcessId sourceProcessId, CefRefPtr message) override;
+ virtual DECL void OnWebKitInitialized() override;
+ virtual DECL void OnFocusedNodeChanged(CefRefPtr browser, CefRefPtr frame, CefRefPtr node) override;
+ virtual DECL void OnUncaughtException(CefRefPtr browser, CefRefPtr frame, CefRefPtr context, CefRefPtr exception, CefRefPtr stackTrace) override;
+
+ IMPLEMENT_REFCOUNTINGM(CefAppUnmanagedWrapper);
+ };
+ }
+}
diff --git a/CefSharp.BrowserSubprocess.Core/CefBrowserWrapper.h b/CefSharp.BrowserSubprocess.Core/CefBrowserWrapper.h
new file mode 100644
index 0000000000..934725eaeb
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/CefBrowserWrapper.h
@@ -0,0 +1,61 @@
+// Copyright © 2013 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+#pragma once
+
+#include "include/cef_browser.h"
+#include "include/cef_v8.h"
+
+#include "TypeUtils.h"
+#include "Stdafx.h"
+#include "JavascriptRootObjectWrapper.h"
+
+using namespace CefSharp::BrowserSubprocess::Async;
+#ifndef NETCOREAPP
+using namespace System::ServiceModel;
+#endif
+using namespace System::Threading;
+using namespace System::Threading::Tasks;
+
+namespace CefSharp
+{
+ namespace BrowserSubprocess
+ {
+ // "Master class" for wrapping everything that the Cef Subprocess needs
+ // for ONE CefBrowser.
+ public ref class CefBrowserWrapper
+ {
+ private:
+ MCefRefPtr _cefBrowser;
+
+ public:
+ CefBrowserWrapper(const CefRefPtr &cefBrowser)
+ {
+ _cefBrowser = cefBrowser.get();
+ BrowserId = cefBrowser->GetIdentifier();
+ IsPopup = cefBrowser->IsPopup();
+ }
+
+ !CefBrowserWrapper()
+ {
+ _cefBrowser = nullptr;
+ }
+
+ ~CefBrowserWrapper()
+ {
+ this->!CefBrowserWrapper();
+ }
+
+ property int BrowserId;
+ property bool IsPopup;
+
+#ifndef NETCOREAPP
+ // This allows us to create the WCF proxies back to our parent process.
+ property ChannelFactory^ ChannelFactory;
+ // The WCF proxy to the parent process.
+ property IBrowserProcess^ BrowserProcess;
+#endif
+ };
+ }
+}
diff --git a/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.netcore.filters b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.netcore.filters
new file mode 100644
index 0000000000..adeeecfd00
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.netcore.filters
@@ -0,0 +1,200 @@
+
+
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+ {93995380-89BD-4b04-88EB-625FBE52EBFB}
+ h;hpp;hxx;hm;inl;inc;xsd
+
+
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.netcore.vcxproj b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.netcore.vcxproj
new file mode 100644
index 0000000000..78021a1d08
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.netcore.vcxproj
@@ -0,0 +1,351 @@
+
+
+
+
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ Debug
+ arm64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+ Release
+ arm64
+
+
+
+ 16.0
+ {6C4BB501-2F8E-48AC-9AB5-8CFB2D74185C}
+ CefSharp.BrowserSubprocess.Core
+ CefSharpBrowserSubprocessCore
+ NetCoreCProj
+ net6.0
+ 10.0
+ 10.0.10240.0
+
+
+
+
+ DynamicLibrary
+ true
+ NetCore
+ Unicode
+
+
+ DynamicLibrary
+ true
+ NetCore
+ Unicode
+
+
+ DynamicLibrary
+ true
+ NetCore
+ Unicode
+
+
+ DynamicLibrary
+ false
+ NetCore
+ Unicode
+
+
+ DynamicLibrary
+ false
+ NetCore
+ Unicode
+
+
+ DynamicLibrary
+ false
+ NetCore
+ Unicode
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ ..\CefSharp.snk
+ true
+ bin.netcore\$(Platform)\$(Configuration)\
+ obj.netcore\$(Platform)\$(Configuration)\
+ $(SolutionDir)packages\$(CefSdkVer)\CEF;$(SourcePath)
+
+
+ true
+ ..\CefSharp.snk
+ true
+ bin.netcore\$(Platform)\$(Configuration)\
+ obj.netcore\$(Platform)\$(Configuration)\
+ $(SolutionDir)packages\$(CefSdkVer)\CEF;$(SourcePath)
+
+
+ true
+ ..\CefSharp.snk
+ true
+ bin.netcore\$(Platform)\$(Configuration)\
+ obj.netcore\$(Platform)\$(Configuration)\
+ $(SolutionDir)packages\$(CefSdkVer)\CEF;$(SourcePath)
+
+
+ false
+ ..\CefSharp.snk
+ bin.netcore\$(Platform)\$(Configuration)\
+ obj.netcore\$(Platform)\$(Configuration)\
+ $(SolutionDir)packages\$(CefSdkVer)\CEF;$(SourcePath)
+
+
+ false
+ ..\CefSharp.snk
+ bin.netcore\$(Platform)\$(Configuration)\
+ obj.netcore\$(Platform)\$(Configuration)\
+ $(SolutionDir)packages\$(CefSdkVer)\CEF;$(SourcePath)
+
+
+ false
+ ..\CefSharp.snk
+ bin.netcore\$(Platform)\$(Configuration)\
+ obj.netcore\$(Platform)\$(Configuration)\
+ $(SolutionDir)packages\$(CefSdkVer)\CEF;$(SourcePath)
+
+
+
+ Level3
+ $(SolutionDir)packages\$(CefSdkVer)\CEF;%(AdditionalIncludeDirectories);$(ProjectDir)
+ Disabled
+ _DEBUG;EXPORT;NETCOREAPP;%(PreprocessorDefinitions)
+ Use
+ true
+ true
+ stdcpp20
+ CompileAsCpp
+
+
+ true
+ libcef.lib;libcef_dll_wrapper.lib;User32.lib
+ $(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration);$(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration)\VS$(VisualStudioProductVersion);
+ /ignore:4099 %(AdditionalOptions)
+
+
+ Assembly.manifest
+
+
+
+
+ Level3
+ $(SolutionDir)packages\$(CefSdkVer)\CEF;%(AdditionalIncludeDirectories);$(ProjectDir)
+ Disabled
+ _DEBUG;EXPORT;NETCOREAPP;%(PreprocessorDefinitions)
+ Use
+ true
+ stdcpp20
+ CompileAsCpp
+
+
+ true
+ libcef.lib;libcef_dll_wrapper.lib;User32.lib
+ $(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration);$(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration)\VS$(VisualStudioProductVersion);
+ /ignore:4099 %(AdditionalOptions)
+
+
+ Assembly.manifest
+
+
+
+
+ Level3
+ $(SolutionDir)packages\$(CefSdkVer)\CEF;%(AdditionalIncludeDirectories);$(ProjectDir)
+ Disabled
+ _DEBUG;EXPORT;NETCOREAPP;%(PreprocessorDefinitions)
+ Use
+ true
+ stdcpp20
+ CompileAsCpp
+
+
+ true
+ libcef.lib;libcef_dll_wrapper.lib;User32.lib
+ $(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration);$(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration)\VS$(VisualStudioProductVersion);
+ /ignore:4099 %(AdditionalOptions)
+
+
+ Assembly.manifest
+
+
+
+
+ Level3
+ $(SolutionDir)packages\$(CefSdkVer)\CEF;%(AdditionalIncludeDirectories);$(ProjectDir)
+ NDEBUG;EXPORT;NETCOREAPP;%(PreprocessorDefinitions)
+ Use
+ true
+ true
+ stdcpp20
+ CompileAsCpp
+
+
+ true
+ libcef.lib;libcef_dll_wrapper.lib
+ $(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration);$(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration)\VS$(VisualStudioProductVersion)
+
+
+ Assembly.manifest
+
+
+
+
+ Level3
+ $(SolutionDir)packages\$(CefSdkVer)\CEF;%(AdditionalIncludeDirectories);$(ProjectDir)
+ NDEBUG;EXPORT;NETCOREAPP;%(PreprocessorDefinitions)
+ Use
+ true
+ stdcpp20
+ CompileAsCpp
+
+
+ true
+ libcef.lib;libcef_dll_wrapper.lib
+ $(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration);$(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration)\VS$(VisualStudioProductVersion)
+
+
+ Assembly.manifest
+
+
+
+
+ Level3
+ $(SolutionDir)packages\$(CefSdkVer)\CEF;%(AdditionalIncludeDirectories);$(ProjectDir)
+ NDEBUG;EXPORT;NETCOREAPP;%(PreprocessorDefinitions)
+ Use
+ true
+ stdcpp20
+ CompileAsCpp
+
+
+ true
+ libcef.lib;libcef_dll_wrapper.lib
+ $(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration);$(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration)\VS$(VisualStudioProductVersion)
+
+
+ Assembly.manifest
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Create
+ Create
+ Create
+ Create
+ Create
+ Create
+
+
+
+
+
+
+ {39E385AD-DC5C-451E-B061-09AF3EE038EB}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj
new file mode 100644
index 0000000000..547f08538d
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj
@@ -0,0 +1,271 @@
+
+
+
+
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ {6C4BB501-2F8E-48AC-9AB5-8CFB2D74185C}
+ ManagedCProj
+ CefSharpBrowserSubprocessCore
+ v4.6.2
+ 10.0
+
+
+
+
+ DynamicLibrary
+ true
+ true
+ Unicode
+
+
+ DynamicLibrary
+ true
+ true
+ Unicode
+
+
+ DynamicLibrary
+ false
+ true
+ Unicode
+
+
+ DynamicLibrary
+ false
+ true
+ Unicode
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ ..\CefSharp.snk
+ true
+ bin\$(Platform)\$(Configuration)\
+ obj\$(Platform)\$(Configuration)\
+ $(SolutionDir)packages\$(CefSdkVer)\CEF;$(SourcePath)
+
+
+ true
+ ..\CefSharp.snk
+ true
+ bin\$(Platform)\$(Configuration)\
+ obj\$(Platform)\$(Configuration)\
+ $(SolutionDir)packages\$(CefSdkVer)\CEF;$(SourcePath)
+
+
+ false
+ ..\CefSharp.snk
+ bin\$(Platform)\$(Configuration)\
+ obj\$(Platform)\$(Configuration)\
+ $(SolutionDir)packages\$(CefSdkVer)\CEF;$(SourcePath)
+
+
+ false
+ ..\CefSharp.snk
+ bin\$(Platform)\$(Configuration)\
+ obj\$(Platform)\$(Configuration)\
+ $(SolutionDir)packages\$(CefSdkVer)\CEF;$(SourcePath)
+
+
+
+ Level3
+ $(SolutionDir)packages\$(CefSdkVer)\CEF;%(AdditionalIncludeDirectories);$(ProjectDir)
+ Disabled
+ WIN32;_DEBUG;EXPORT;%(PreprocessorDefinitions)
+ Use
+ true
+ true
+ stdcpp20
+ CompileAsCpp
+
+
+ true
+ libcef.lib;libcef_dll_wrapper.lib;User32.lib
+ $(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration);$(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration)\VS$(VisualStudioProductVersion);
+ /ignore:4099 %(AdditionalOptions)
+
+
+
+
+ Level3
+ $(SolutionDir)packages\$(CefSdkVer)\CEF;%(AdditionalIncludeDirectories);$(ProjectDir)
+ Disabled
+ WIN32;_DEBUG;EXPORT;%(PreprocessorDefinitions)
+ Use
+ true
+ stdcpp20
+ CompileAsCpp
+
+
+ true
+ libcef.lib;libcef_dll_wrapper.lib;User32.lib
+ $(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration);$(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration)\VS$(VisualStudioProductVersion);
+ /ignore:4099 %(AdditionalOptions)
+
+
+
+
+ Level3
+ $(SolutionDir)packages\$(CefSdkVer)\CEF;%(AdditionalIncludeDirectories);$(ProjectDir)
+ WIN32;NDEBUG;EXPORT;%(PreprocessorDefinitions)
+ Use
+ true
+ true
+ stdcpp20
+ CompileAsCpp
+
+
+ true
+ libcef.lib;libcef_dll_wrapper.lib
+ $(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration);$(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration)\VS$(VisualStudioProductVersion)
+
+
+
+
+ Level3
+ $(SolutionDir)packages\$(CefSdkVer)\CEF;%(AdditionalIncludeDirectories);$(ProjectDir)
+ WIN32;NDEBUG;EXPORT;%(PreprocessorDefinitions)
+ Use
+ true
+ stdcpp20
+ CompileAsCpp
+
+
+ true
+ libcef.lib;libcef_dll_wrapper.lib
+ $(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration);$(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration)\VS$(VisualStudioProductVersion)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Create
+ Create
+ Create
+ Create
+
+
+
+
+
+
+ {a55848cc-10e7-40cb-addb-04740b16dd43}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj.filters b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj.filters
new file mode 100644
index 0000000000..8b695aad3e
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj.filters
@@ -0,0 +1,212 @@
+
+
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+ {93995380-89BD-4b04-88EB-625FBE52EBFB}
+ h;hpp;hxx;hm;inl;inc;xsd
+
+
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Source Files
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/CefSharp.BrowserSubprocess.Core/JavascriptBindingSettings.h b/CefSharp.BrowserSubprocess.Core/JavascriptBindingSettings.h
new file mode 100644
index 0000000000..a30dd30de0
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/JavascriptBindingSettings.h
@@ -0,0 +1,55 @@
+// Copyright © 2013 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+#pragma once
+
+#include "include/cef_v8.h"
+
+#include "Stdafx.h"
+
+namespace CefSharp
+{
+ namespace BrowserSubprocess
+ {
+ private ref class JavascriptBindingSettings
+ {
+ private:
+ MCefRefPtr _javascriptBindingApiAllowOrigins;
+
+ public:
+ JavascriptBindingSettings()
+ {
+ LegacyBindingEnabled = false;
+ JavascriptBindingApiEnabled = true;
+ JavascriptBindingPropertyName = "CefSharp";
+ JavascriptBindingPropertyNameCamelCase = "cefSharp";
+ JavascriptBindingApiHasAllowOrigins = false;
+ JavascriptBindingApiAllowOrigins = nullptr;
+ }
+
+ !JavascriptBindingSettings()
+ {
+ _javascriptBindingApiAllowOrigins = nullptr;
+ }
+
+ ~JavascriptBindingSettings()
+ {
+ this->!JavascriptBindingSettings();
+ }
+
+ property bool LegacyBindingEnabled;
+ property bool JavascriptBindingApiEnabled;
+
+ property String^ JavascriptBindingPropertyName;
+ property String^ JavascriptBindingPropertyNameCamelCase;
+
+ property bool JavascriptBindingApiHasAllowOrigins;
+ property CefRefPtr JavascriptBindingApiAllowOrigins
+ {
+ CefRefPtr get() { return _javascriptBindingApiAllowOrigins.get(); }
+ void set(CefRefPtr value) { _javascriptBindingApiAllowOrigins = value.get(); }
+ }
+ };
+ }
+}
diff --git a/CefSharp.BrowserSubprocess.Core/JavascriptCallbackRegistry.cpp b/CefSharp.BrowserSubprocess.Core/JavascriptCallbackRegistry.cpp
new file mode 100644
index 0000000000..a9389a9ca9
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/JavascriptCallbackRegistry.cpp
@@ -0,0 +1,46 @@
+// Copyright © 2015 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+#include "stdafx.h"
+#include "JavascriptCallbackRegistry.h"
+
+using namespace System::Threading;
+using namespace CefSharp::BrowserSubprocess;
+
+namespace CefSharp
+{
+ namespace BrowserSubprocess
+ {
+ JavascriptCallback^ JavascriptCallbackRegistry::Register(const CefRefPtr& context, const CefRefPtr& value)
+ {
+ Int64 newId = Interlocked::Increment(_lastId);
+ JavascriptCallbackWrapper^ wrapper = gcnew JavascriptCallbackWrapper(value, context);
+ _callbacks->TryAdd(newId, wrapper);
+
+
+ auto result = gcnew JavascriptCallback();
+ result->Id = newId;
+ result->BrowserId = context->GetBrowser()->GetIdentifier();
+ result->FrameId = StringUtils::ToClr(context->GetFrame()->GetIdentifier());
+ return result;
+ }
+
+ JavascriptCallbackWrapper^ JavascriptCallbackRegistry::FindWrapper(int64_t id)
+ {
+ JavascriptCallbackWrapper^ callback;
+ _callbacks->TryGetValue(id, callback);
+ return callback;
+ }
+
+ void JavascriptCallbackRegistry::Deregister(Int64 id)
+ {
+ JavascriptCallbackWrapper^ callback;
+ if (_callbacks->TryRemove(id, callback))
+ {
+ delete callback;
+ }
+ }
+
+ }
+}
diff --git a/CefSharp.BrowserSubprocess.Core/JavascriptCallbackRegistry.h b/CefSharp.BrowserSubprocess.Core/JavascriptCallbackRegistry.h
new file mode 100644
index 0000000000..b2872055a9
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/JavascriptCallbackRegistry.h
@@ -0,0 +1,53 @@
+// Copyright © 2015 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+#pragma once
+
+#include "JavascriptCallbackWrapper.h"
+
+using namespace System::Collections::Concurrent;
+using namespace CefSharp::BrowserSubprocess;
+
+namespace CefSharp
+{
+ namespace BrowserSubprocess
+ {
+ private ref class JavascriptCallbackRegistry
+ {
+ private:
+ //Only access through Interlocked::Increment - used to generate unique callback Id's
+ //Is static so ids are unique to this process, which is required until #1984 is implemented
+ //and callbacks are disposed of properly between contexts
+ static Int64 _lastId;
+ ConcurrentDictionary^ _callbacks;
+
+ internal:
+ JavascriptCallbackWrapper^ FindWrapper(int64_t id);
+
+ public:
+ JavascriptCallbackRegistry()
+ {
+ _callbacks = gcnew ConcurrentDictionary();
+ }
+
+ ~JavascriptCallbackRegistry()
+ {
+ if (_callbacks != nullptr)
+ {
+ for each (JavascriptCallbackWrapper^ callback in _callbacks->Values)
+ {
+ delete callback;
+ }
+ _callbacks->Clear();
+ _callbacks = nullptr;
+ }
+ }
+
+ JavascriptCallback^ Register(const CefRefPtr& context, const CefRefPtr& value);
+
+ void Deregister(Int64 id);
+ };
+ }
+}
+
diff --git a/CefSharp.BrowserSubprocess.Core/JavascriptCallbackWrapper.h b/CefSharp.BrowserSubprocess.Core/JavascriptCallbackWrapper.h
new file mode 100644
index 0000000000..ac2072825f
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/JavascriptCallbackWrapper.h
@@ -0,0 +1,48 @@
+// Copyright © 2015 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+#pragma once
+
+#include "include\cef_v8.h"
+
+namespace CefSharp
+{
+ namespace BrowserSubprocess
+ {
+ private ref class JavascriptCallbackWrapper
+ {
+ private:
+ MCefRefPtr _value;
+ MCefRefPtr _context;
+
+ internal:
+ CefRefPtr GetValue()
+ {
+ return _value.get();
+ }
+
+ CefRefPtr GetContext()
+ {
+ return _context.get();
+ }
+
+ public:
+ JavascriptCallbackWrapper(CefRefPtr value, CefRefPtr context)
+ : _value(value), _context(context)
+ {
+ }
+
+ !JavascriptCallbackWrapper()
+ {
+ _value = nullptr;
+ _context = nullptr;
+ }
+
+ ~JavascriptCallbackWrapper()
+ {
+ this->!JavascriptCallbackWrapper();
+ }
+ };
+ }
+}
diff --git a/CefSharp.BrowserSubprocess.Core/JavascriptMethodHandler.cpp b/CefSharp.BrowserSubprocess.Core/JavascriptMethodHandler.cpp
new file mode 100644
index 0000000000..24267876dd
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/JavascriptMethodHandler.cpp
@@ -0,0 +1,80 @@
+// Copyright © 2015 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+#include "Stdafx.h"
+#include "TypeUtils.h"
+#include "JavascriptMethodHandler.h"
+
+namespace CefSharp
+{
+ namespace BrowserSubprocess
+ {
+ bool JavascriptMethodHandler::Execute(const CefString& name, CefRefPtr object, const CefV8ValueList& arguments, CefRefPtr& retval, CefString& exception)
+ {
+ auto size = static_cast(arguments.size());
+ auto parameter = gcnew array(size);
+
+ for (int i = 0; i < size; i++)
+ {
+ parameter[i] = TypeUtils::ConvertFromCef(arguments[i], _callbackRegistry);
+ }
+
+ try
+ {
+ auto response = _method->Invoke(parameter);
+
+ retval = ConvertToCefObject(response->Result);
+ if (!response->Success)
+ {
+ exception = StringUtils::ToNative(response->Message);
+ }
+ }
+ catch (Exception^ ex)
+ {
+ exception = StringUtils::ToNative(ex->ToString());
+ }
+
+ //NOTE: Return true otherwise exception is ignored
+ return true;
+ }
+
+ CefRefPtr JavascriptMethodHandler::ConvertToCefObject(Object^ obj)
+ {
+ if (obj == nullptr)
+ {
+ return CefV8Value::CreateNull();
+ }
+
+ auto type = obj->GetType();
+
+ if (type == JavascriptObject::typeid)
+ {
+ JavascriptObject^ javascriptObject = (JavascriptObject^)obj;
+ CefRefPtr cefObject = CefV8Value::CreateObject(nullptr, nullptr);
+
+ for (int i = 0; i < javascriptObject->Properties->Count; i++)
+ {
+ auto prop = javascriptObject->Properties[i];
+
+ if (prop->IsComplexType)
+ {
+ auto v8Value = ConvertToCefObject(prop->JsObject);
+
+ cefObject->SetValue(StringUtils::ToNative(prop->JavascriptName), v8Value, CefV8Value::PropertyAttribute::V8_PROPERTY_ATTRIBUTE_NONE);
+ }
+ else
+ {
+ auto v8Value = TypeUtils::ConvertToCef(prop->PropertyValue, nullptr);
+
+ cefObject->SetValue(StringUtils::ToNative(prop->JavascriptName), v8Value, CefV8Value::PropertyAttribute::V8_PROPERTY_ATTRIBUTE_NONE);
+ }
+ }
+
+ return cefObject;
+ }
+
+ return TypeUtils::ConvertToCef(obj, nullptr);
+ }
+ }
+}
diff --git a/CefSharp.BrowserSubprocess.Core/JavascriptMethodHandler.h b/CefSharp.BrowserSubprocess.Core/JavascriptMethodHandler.h
new file mode 100644
index 0000000000..36ee2c31e8
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/JavascriptMethodHandler.h
@@ -0,0 +1,44 @@
+// Copyright © 2014 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+#pragma once
+
+#include "include/cef_v8.h"
+#include "JavascriptCallbackRegistry.h"
+
+using namespace CefSharp::Internals::Wcf;
+
+namespace CefSharp
+{
+ namespace BrowserSubprocess
+ {
+ private class JavascriptMethodHandler : public CefV8Handler
+ {
+ private:
+ gcroot^, BrowserProcessResponse^>^> _method;
+ gcroot _callbackRegistry;
+
+ public:
+ JavascriptMethodHandler(Func^, BrowserProcessResponse^>^ method, JavascriptCallbackRegistry^ callbackRegistry)
+ {
+ _method = method;
+ _callbackRegistry = callbackRegistry;
+ }
+
+ ~JavascriptMethodHandler()
+ {
+ delete _method;
+ // The callback registry is a shared instance among all method handlers (async & sync).
+ // It's lifecycle is managed in the JavascriptRootObjectWrapper.
+ _callbackRegistry = nullptr;
+ }
+
+ virtual bool Execute(const CefString& name, CefRefPtr object, const CefV8ValueList& arguments, CefRefPtr& retval, CefString& exception) override;
+
+ CefRefPtr ConvertToCefObject(Object^ obj);
+
+ IMPLEMENT_REFCOUNTINGM(JavascriptMethodHandler);
+ };
+ }
+}
diff --git a/CefSharp.BrowserSubprocess.Core/JavascriptMethodWrapper.cpp b/CefSharp.BrowserSubprocess.Core/JavascriptMethodWrapper.cpp
new file mode 100644
index 0000000000..ab8feed45d
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/JavascriptMethodWrapper.cpp
@@ -0,0 +1,29 @@
+// Copyright © 2014 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+#pragma once
+
+#include "Stdafx.h"
+
+#include "JavascriptMethodWrapper.h"
+
+namespace CefSharp
+{
+ namespace BrowserSubprocess
+ {
+ void JavascriptMethodWrapper::Bind(JavascriptMethod^ javascriptMethod, const CefRefPtr& v8Value)
+ {
+ _javascriptMethodName = javascriptMethod->JavascriptName;
+ auto methodName = StringUtils::ToNative(javascriptMethod->JavascriptName);
+ auto v8Function = CefV8Value::CreateFunction(methodName, _javascriptMethodHandler.get());
+
+ v8Value->SetValue(methodName, v8Function, V8_PROPERTY_ATTRIBUTE_NONE);
+ };
+
+ BrowserProcessResponse^ JavascriptMethodWrapper::Execute(array^ parameters)
+ {
+ return _browserProcess->CallMethod(_ownerId, _javascriptMethodName, parameters);
+ }
+ }
+}
diff --git a/CefSharp.BrowserSubprocess.Core/JavascriptMethodWrapper.h b/CefSharp.BrowserSubprocess.Core/JavascriptMethodWrapper.h
new file mode 100644
index 0000000000..ebf980b8cc
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/JavascriptMethodWrapper.h
@@ -0,0 +1,51 @@
+// Copyright © 2014 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+#pragma once
+
+#include "Stdafx.h"
+#include "include/cef_v8.h"
+
+#include "JavascriptMethodHandler.h"
+
+using namespace System::Runtime::Serialization;
+using namespace CefSharp::Internals::Wcf;
+
+namespace CefSharp
+{
+ namespace BrowserSubprocess
+ {
+ private ref class JavascriptMethodWrapper
+ {
+ private:
+ MCefRefPtr _javascriptMethodHandler;
+ int64_t _ownerId;
+ String^ _javascriptMethodName;
+ IBrowserProcess^ _browserProcess;
+
+ public:
+ JavascriptMethodWrapper(int64_t ownerId, IBrowserProcess^ browserProcess, JavascriptCallbackRegistry^ callbackRegistry)
+ {
+ _ownerId = ownerId;
+ _browserProcess = browserProcess;
+ _javascriptMethodHandler = new JavascriptMethodHandler(gcnew Func^, BrowserProcessResponse^>(this, &JavascriptMethodWrapper::Execute), callbackRegistry);
+ }
+
+ !JavascriptMethodWrapper()
+ {
+ _javascriptMethodHandler = nullptr;
+ }
+
+ ~JavascriptMethodWrapper()
+ {
+ this->!JavascriptMethodWrapper();
+
+ _browserProcess = nullptr;
+ }
+
+ void Bind(JavascriptMethod^ javascriptMethod, const CefRefPtr& v8Value);
+ BrowserProcessResponse^ Execute(array^ parameters);
+ };
+ }
+}
diff --git a/CefSharp.BrowserSubprocess.Core/JavascriptObjectWrapper.cpp b/CefSharp.BrowserSubprocess.Core/JavascriptObjectWrapper.cpp
new file mode 100644
index 0000000000..afb2926dd8
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/JavascriptObjectWrapper.cpp
@@ -0,0 +1,57 @@
+// Copyright © 2014 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+#pragma once
+
+#include "Stdafx.h"
+
+#include "JavascriptObjectWrapper.h"
+
+namespace CefSharp
+{
+ namespace BrowserSubprocess
+ {
+ void JavascriptObjectWrapper::Bind(JavascriptObject^ object, const CefRefPtr& v8Value, JavascriptCallbackRegistry^ callbackRegistry)
+ {
+ _objectId = object->Id;
+
+ //Create property handler for get and set of Properties of this object
+ _jsPropertyHandler = new JavascriptPropertyHandler(
+ gcnew Func(this, &JavascriptObjectWrapper::GetProperty),
+ gcnew Func(this, &JavascriptObjectWrapper::SetProperty)
+ );
+
+ //V8Value that represents this javascript object - only one per complex type
+ auto javascriptObject = CefV8Value::CreateObject(_jsPropertyHandler.get(), nullptr);
+ auto objectName = StringUtils::ToNative(object->JavascriptName);
+ v8Value->SetValue(objectName, javascriptObject, V8_PROPERTY_ATTRIBUTE_NONE);
+
+ for each (JavascriptMethod ^ method in Enumerable::OfType(object->Methods))
+ {
+ auto wrappedMethod = gcnew JavascriptMethodWrapper(object->Id, _browserProcess, callbackRegistry);
+ wrappedMethod->Bind(method, javascriptObject);
+
+ _wrappedMethods->Add(wrappedMethod);
+ }
+
+ for each (JavascriptProperty ^ prop in Enumerable::OfType(object->Properties))
+ {
+ auto wrappedproperty = gcnew JavascriptPropertyWrapper(object->Id, _browserProcess);
+ wrappedproperty->Bind(prop, javascriptObject, callbackRegistry);
+
+ _wrappedProperties->Add(wrappedproperty);
+ }
+ }
+
+ BrowserProcessResponse^ JavascriptObjectWrapper::GetProperty(String^ memberName)
+ {
+ return _browserProcess->GetProperty(_objectId, memberName);
+ };
+
+ BrowserProcessResponse^ JavascriptObjectWrapper::SetProperty(String^ memberName, Object^ value)
+ {
+ return _browserProcess->SetProperty(_objectId, memberName, value);
+ };
+ }
+}
diff --git a/CefSharp.BrowserSubprocess.Core/JavascriptObjectWrapper.h b/CefSharp.BrowserSubprocess.Core/JavascriptObjectWrapper.h
new file mode 100644
index 0000000000..28eebd3b55
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/JavascriptObjectWrapper.h
@@ -0,0 +1,64 @@
+// Copyright © 2014 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+#pragma once
+
+#include "Stdafx.h"
+#include "include/cef_v8.h"
+
+#include "JavascriptMethodWrapper.h"
+#include "JavascriptPropertyWrapper.h"
+#include "JavascriptPropertyHandler.h"
+
+using namespace System::Runtime::Serialization;
+using namespace System::Linq;
+using namespace System::Collections::Generic;
+
+namespace CefSharp
+{
+ namespace BrowserSubprocess
+ {
+ private ref class JavascriptObjectWrapper
+ {
+ private:
+ List^ _wrappedMethods;
+ List^ _wrappedProperties;
+ IBrowserProcess^ _browserProcess;
+ MCefRefPtr _jsPropertyHandler;
+ int64_t _objectId;
+
+ public:
+ JavascriptObjectWrapper(IBrowserProcess^ browserProcess)
+ {
+ _browserProcess = browserProcess;
+
+ _wrappedMethods = gcnew List();
+ _wrappedProperties = gcnew List();
+ }
+
+ !JavascriptObjectWrapper()
+ {
+ _jsPropertyHandler = nullptr;
+ }
+
+ ~JavascriptObjectWrapper()
+ {
+ this->!JavascriptObjectWrapper();
+
+ for each (JavascriptMethodWrapper ^ var in _wrappedMethods)
+ {
+ delete var;
+ }
+ for each (JavascriptPropertyWrapper ^ var in _wrappedProperties)
+ {
+ delete var;
+ }
+ }
+
+ void Bind(JavascriptObject^ object, const CefRefPtr& v8Value, JavascriptCallbackRegistry^ callbackRegistry);
+ BrowserProcessResponse^ GetProperty(String^ memberName);
+ BrowserProcessResponse^ SetProperty(String^ memberName, Object^ value);
+ };
+ }
+}
diff --git a/CefSharp.BrowserSubprocess.Core/JavascriptPostMessageHandler.h b/CefSharp.BrowserSubprocess.Core/JavascriptPostMessageHandler.h
new file mode 100644
index 0000000000..9274c0ad8b
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/JavascriptPostMessageHandler.h
@@ -0,0 +1,94 @@
+// Copyright © 2019 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+#pragma once
+
+#include "include/cef_v8.h"
+#include "..\CefSharp.Core.Runtime\Internals\Messaging\Messages.h"
+#include "..\CefSharp.Core.Runtime\Internals\Serialization\Primitives.h"
+#include "Serialization\V8Serialization.h"
+
+using namespace System;
+using namespace CefSharp::Internals::Messaging;
+using namespace CefSharp::BrowserSubprocess::Serialization;
+
+namespace CefSharp
+{
+ namespace BrowserSubprocess
+ {
+ const CefString kPostMessage = CefString("PostMessage");
+ const CefString kPostMessageCamelCase = CefString("postMessage");
+
+ private class JavascriptPostMessageHandler : public CefV8Handler
+ {
+ private:
+ gcroot _javascriptCallbackRegistry;
+
+ public:
+ JavascriptPostMessageHandler(JavascriptCallbackRegistry^ javascriptCallbackRegistry)
+ {
+ _javascriptCallbackRegistry = javascriptCallbackRegistry;
+ }
+
+ bool Execute(const CefString& name, CefRefPtr object, const CefV8ValueList& arguments, CefRefPtr& retval, CefString& exception) override
+ {
+ if (arguments.size() == 0 || arguments.size() > 1)
+ {
+ //TODO: Improve error message
+ exception = "Only a single param is accepted";
+
+ return true;
+ }
+
+ auto context = CefV8Context::GetCurrentContext();
+ if (context.get())
+ {
+ auto frame = context->GetFrame();
+
+ if (frame.get() && frame->IsValid() && context->Enter())
+ {
+ try
+ {
+ auto global = context->GetGlobal();
+
+ auto request = CefProcessMessage::Create(kJavascriptMessageReceived);
+ auto argList = request->GetArgumentList();
+
+ auto params = CefListValue::Create();
+ SerializeV8Object(arguments[0], params, 0, _javascriptCallbackRegistry);
+
+ //We're only interested in the first param
+ if (params->GetSize() > 0)
+ {
+ argList->SetValue(0, params->GetValue(0));
+ }
+
+ frame->SendProcessMessage(CefProcessId::PID_BROWSER, request);
+
+ retval = CefV8Value::CreateNull();
+ }
+ finally
+ {
+ context->Exit();
+ }
+ }
+ else
+ {
+ exception = "Unable to Enter Context";
+ }
+ }
+ else
+ {
+ exception = "Unable to get current context";
+ }
+
+ return true;
+ }
+
+ IMPLEMENT_REFCOUNTINGM(JavascriptPostMessageHandler);
+ };
+ }
+}
+
+
diff --git a/CefSharp.BrowserSubprocess.Core/JavascriptPromiseHandler.h b/CefSharp.BrowserSubprocess.Core/JavascriptPromiseHandler.h
new file mode 100644
index 0000000000..24b7bcd8a3
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/JavascriptPromiseHandler.h
@@ -0,0 +1,89 @@
+// Copyright © 2020 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+#pragma once
+
+#include "include/cef_v8.h"
+#include "..\CefSharp.Core.Runtime\Internals\Messaging\Messages.h"
+#include "..\CefSharp.Core.Runtime\Internals\Serialization\Primitives.h"
+#include "Serialization\V8Serialization.h"
+
+using namespace System;
+using namespace CefSharp::Internals::Messaging;
+using namespace CefSharp::BrowserSubprocess::Serialization;
+
+namespace CefSharp
+{
+ namespace BrowserSubprocess
+ {
+ const CefString kSendEvalScriptResponse = CefString("SendEvalScriptResponse");
+ const CefString kSendEvalScriptResponseCamelCase = CefString("sendEvalScriptResponse");
+
+ private class JavascriptPromiseHandler : public CefV8Handler
+ {
+ public:
+
+ virtual bool Execute(const CefString& name,
+ CefRefPtr object,
+ const CefV8ValueList& arguments,
+ CefRefPtr& retval,
+ CefString& exception)
+ {
+ if (arguments.size() < 2)
+ {
+ //TODO: Improve error message
+ exception = "Must specify a callback Id and then/catch.";
+
+ return true;
+ }
+
+ auto callbackId = arguments[0]->GetIntValue();
+
+ if (callbackId == 0)
+ {
+ exception = "Invalid callback Id";
+
+ return true;
+ }
+
+ auto success = arguments[1]->GetBoolValue();
+ auto javascriptCallback = arguments.size() < 4 ? false : arguments[3]->GetBoolValue();
+
+ auto response = CefProcessMessage::Create(javascriptCallback ? kJavascriptCallbackResponse : kEvaluateJavascriptResponse);
+
+ auto responseArgList = response->GetArgumentList();
+ //Success
+ responseArgList->SetBool(0, success);
+ //Callback Id
+ SetInt64(responseArgList, 1, callbackId);
+ if (exception == "")
+ {
+ if (success)
+ {
+ SerializeV8Object(arguments[2], responseArgList, 2, nullptr);
+ }
+ else
+ {
+ auto reason = arguments[2];
+ responseArgList->SetString(2, reason->GetStringValue());
+ }
+ }
+ else
+ {
+ responseArgList->SetString(2, exception);
+ }
+
+ auto context = CefV8Context::GetCurrentContext();
+
+ auto frame = context->GetFrame();
+
+ frame->SendProcessMessage(CefProcessId::PID_BROWSER, response);
+
+ return false;
+ }
+
+ IMPLEMENT_REFCOUNTINGM(JavascriptPromiseHandler);
+ };
+ }
+}
diff --git a/CefSharp.BrowserSubprocess.Core/JavascriptPromiseResolverCatch.h b/CefSharp.BrowserSubprocess.Core/JavascriptPromiseResolverCatch.h
new file mode 100644
index 0000000000..68fccd20e0
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/JavascriptPromiseResolverCatch.h
@@ -0,0 +1,71 @@
+// Copyright © 2022 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+#pragma once
+
+#include "include/cef_v8.h"
+
+using namespace System;
+
+namespace CefSharp
+{
+ namespace BrowserSubprocess
+ {
+ private class JavascriptPromiseResolverCatch : public CefV8Handler
+ {
+ int64_t _callbackId;
+ bool _isJsCallback;
+
+ public:
+ JavascriptPromiseResolverCatch(int64_t callbackId, bool isJsCallback) : _callbackId(callbackId), _isJsCallback(isJsCallback)
+ {
+
+ }
+
+ virtual bool Execute(const CefString& name,
+ CefRefPtr object,
+ const CefV8ValueList& arguments,
+ CefRefPtr& retval,
+ CefString& exception)
+ {
+ auto context = CefV8Context::GetCurrentContext();
+
+ auto reason = arguments[0];
+ CefString reasonString;
+
+ if (reason->IsString())
+ {
+ reasonString = reason->GetStringValue();
+ }
+ else
+ {
+ //Convert value to String
+ auto strFunc = context->GetGlobal()->GetValue("String");
+ CefV8ValueList args;
+ args.push_back(reason);
+ auto strVal = strFunc->ExecuteFunction(nullptr, args);
+
+ reasonString = strVal->GetStringValue();
+ }
+
+ auto response = CefProcessMessage::Create(_isJsCallback ? kJavascriptCallbackResponse : kEvaluateJavascriptResponse);
+ auto responseArgList = response->GetArgumentList();
+
+ //Success
+ responseArgList->SetBool(0, false);
+ //Callback Id
+ SetInt64(responseArgList, 1, _callbackId);
+ responseArgList->SetString(2, reasonString);
+
+ auto frame = context->GetFrame();
+
+ frame->SendProcessMessage(CefProcessId::PID_BROWSER, response);
+
+ return true;
+ }
+
+ IMPLEMENT_REFCOUNTINGM(JavascriptPromiseResolverCatch);
+ };
+ }
+}
diff --git a/CefSharp.BrowserSubprocess.Core/JavascriptPromiseResolverThen.h b/CefSharp.BrowserSubprocess.Core/JavascriptPromiseResolverThen.h
new file mode 100644
index 0000000000..49bc984129
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/JavascriptPromiseResolverThen.h
@@ -0,0 +1,59 @@
+// Copyright © 2022 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+#pragma once
+
+#include "include/cef_v8.h"
+#include "..\CefSharp.Core.Runtime\Internals\Messaging\Messages.h"
+#include "..\CefSharp.Core.Runtime\Internals\Serialization\Primitives.h"
+#include "Serialization\V8Serialization.h"
+
+using namespace System;
+using namespace CefSharp::Internals::Messaging;
+using namespace CefSharp::BrowserSubprocess::Serialization;
+
+namespace CefSharp
+{
+ namespace BrowserSubprocess
+ {
+ private class JavascriptPromiseResolverThen : public CefV8Handler
+ {
+ int64_t _callbackId;
+ bool _isJsCallback;
+
+ public:
+ JavascriptPromiseResolverThen(int64_t callbackId, bool isJsCallback) : _callbackId(callbackId), _isJsCallback(isJsCallback)
+ {
+
+ }
+
+ virtual bool Execute(const CefString& name,
+ CefRefPtr object,
+ const CefV8ValueList& arguments,
+ CefRefPtr& retval,
+ CefString& exception)
+ {
+ auto response = CefProcessMessage::Create(_isJsCallback ? kJavascriptCallbackResponse : kEvaluateJavascriptResponse);
+
+ auto responseArgList = response->GetArgumentList();
+
+ //Success
+ responseArgList->SetBool(0, true);
+ //Callback Id
+ SetInt64(responseArgList, 1, _callbackId);
+ SerializeV8Object(arguments[0], responseArgList, 2, nullptr);
+
+ auto context = CefV8Context::GetCurrentContext();
+
+ auto frame = context->GetFrame();
+
+ frame->SendProcessMessage(CefProcessId::PID_BROWSER, response);
+
+ return true;
+ }
+
+ IMPLEMENT_REFCOUNTINGM(JavascriptPromiseResolverThen);
+ };
+ }
+}
diff --git a/CefSharp.BrowserSubprocess.Core/JavascriptPropertyHandler.h b/CefSharp.BrowserSubprocess.Core/JavascriptPropertyHandler.h
new file mode 100644
index 0000000000..1de2931d6c
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/JavascriptPropertyHandler.h
@@ -0,0 +1,68 @@
+// Copyright © 2014 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+#pragma once
+
+#include "Stdafx.h"
+
+#include "include/cef_v8.h"
+#include "TypeUtils.h"
+
+namespace CefSharp
+{
+ namespace BrowserSubprocess
+ {
+ private class JavascriptPropertyHandler : public CefV8Accessor
+ {
+ gcroot^> _getter;
+ gcroot^> _setter;
+
+ public:
+ JavascriptPropertyHandler(Func^ getter, Func^ setter)
+ {
+ _getter = getter;
+ _setter = setter;
+ }
+
+ ~JavascriptPropertyHandler()
+ {
+ delete _getter;
+ delete _setter;
+ }
+
+
+ virtual bool Get(const CefString& name, const CefRefPtr object, CefRefPtr& retval,
+ CefString& exception) override
+ {
+ //System::Diagnostics::Debugger::Break();
+ auto propertyName = StringUtils::ToClr(name);
+ auto response = _getter->Invoke(propertyName);
+ retval = TypeUtils::ConvertToCef(response->Result, nullptr);
+ if (!response->Success)
+ {
+ exception = StringUtils::ToNative(response->Message);
+ }
+ //NOTE: Return true otherwise exception is ignored
+ return true;
+ }
+
+ virtual bool Set(const CefString& name, const CefRefPtr object, const CefRefPtr value,
+ CefString& exception) override
+ {
+ //System::Diagnostics::Debugger::Break();
+ auto propertyName = StringUtils::ToClr(name);
+ auto managedValue = TypeUtils::ConvertFromCef(value, nullptr);
+ auto response = _setter->Invoke(propertyName, managedValue);
+ if (!response->Success)
+ {
+ exception = StringUtils::ToNative(response->Message);
+ }
+ //NOTE: Return true otherwise exception is ignored
+ return true;
+ }
+
+ IMPLEMENT_REFCOUNTINGM(JavascriptPropertyHandler);
+ };
+ }
+}
diff --git a/CefSharp.BrowserSubprocess.Core/JavascriptPropertyWrapper.cpp b/CefSharp.BrowserSubprocess.Core/JavascriptPropertyWrapper.cpp
new file mode 100644
index 0000000000..63ec03618d
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/JavascriptPropertyWrapper.cpp
@@ -0,0 +1,38 @@
+// Copyright © 2014 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+#pragma once
+
+#include "Stdafx.h"
+
+#include "JavascriptPropertyWrapper.h"
+#include "JavascriptObjectWrapper.h"
+
+using namespace System;
+
+namespace CefSharp
+{
+ namespace BrowserSubprocess
+ {
+ void JavascriptPropertyWrapper::Bind(JavascriptProperty^ javascriptProperty, const CefRefPtr& v8Value, JavascriptCallbackRegistry^ callbackRegistry)
+ {
+ auto propertyName = StringUtils::ToNative(javascriptProperty->JavascriptName);
+ auto clrPropertyName = javascriptProperty->JavascriptName;
+
+ if (javascriptProperty->IsComplexType)
+ {
+ auto javascriptObjectWrapper = gcnew JavascriptObjectWrapper(_browserProcess);
+ javascriptObjectWrapper->Bind(javascriptProperty->JsObject, v8Value, callbackRegistry);
+
+ _javascriptObjectWrapper = javascriptObjectWrapper;
+ }
+ else
+ {
+ auto propertyAttribute = javascriptProperty->IsReadOnly ? V8_PROPERTY_ATTRIBUTE_READONLY : V8_PROPERTY_ATTRIBUTE_NONE;
+
+ v8Value->SetValue(propertyName, propertyAttribute);
+ }
+ };
+ }
+}
diff --git a/CefSharp.BrowserSubprocess.Core/JavascriptPropertyWrapper.h b/CefSharp.BrowserSubprocess.Core/JavascriptPropertyWrapper.h
new file mode 100644
index 0000000000..d0ac14ae18
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/JavascriptPropertyWrapper.h
@@ -0,0 +1,45 @@
+// Copyright © 2014 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+#pragma once
+
+#include "Stdafx.h"
+#include "include/cef_v8.h"
+#include "JavascriptCallbackRegistry.h"
+
+using namespace CefSharp::Internals::Wcf;
+
+namespace CefSharp
+{
+ namespace BrowserSubprocess
+ {
+ private ref class JavascriptPropertyWrapper
+ {
+ private:
+ int64_t _ownerId;
+ IBrowserProcess^ _browserProcess;
+ //TODO: Strongly type this variable - currently trying to include JavascriptObjectWrapper.h creates a circular reference, so won't compile
+ Object^ _javascriptObjectWrapper;
+
+ public:
+ JavascriptPropertyWrapper(int64_t ownerId, IBrowserProcess^ browserProcess)
+ {
+ _ownerId = ownerId;
+ _browserProcess = browserProcess;
+ _javascriptObjectWrapper = nullptr;
+ }
+
+ ~JavascriptPropertyWrapper()
+ {
+ if (_javascriptObjectWrapper != nullptr)
+ {
+ delete _javascriptObjectWrapper;
+ _javascriptObjectWrapper = nullptr;
+ }
+ }
+
+ void Bind(JavascriptProperty^ javascriptProperty, const CefRefPtr& v8Value, JavascriptCallbackRegistry^ callbackRegistry);
+ };
+ }
+}
diff --git a/CefSharp.BrowserSubprocess.Core/JavascriptRootObjectWrapper.cpp b/CefSharp.BrowserSubprocess.Core/JavascriptRootObjectWrapper.cpp
new file mode 100644
index 0000000000..6e49c59df4
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/JavascriptRootObjectWrapper.cpp
@@ -0,0 +1,74 @@
+// Copyright © 2014 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+#pragma once
+
+#include "Stdafx.h"
+#include "JavascriptRootObjectWrapper.h"
+#include "CefAppUnmanagedWrapper.h"
+
+using namespace System::Threading;
+
+namespace CefSharp
+{
+ namespace BrowserSubprocess
+ {
+ void JavascriptRootObjectWrapper::Bind(ICollection^ objects, const CefRefPtr& v8Value)
+ {
+ if (objects->Count > 0)
+ {
+ auto saveMethod = gcnew Func(this, &JavascriptRootObjectWrapper::SaveMethodCallback);
+
+ for each (JavascriptObject ^ obj in Enumerable::OfType(objects))
+ {
+ if (obj->IsAsync)
+ {
+ auto wrapperObject = gcnew JavascriptAsyncObjectWrapper(_callbackRegistry, saveMethod);
+ wrapperObject->Bind(obj, v8Value);
+
+ _wrappedAsyncObjects->Add(wrapperObject);
+ }
+#ifndef NETCOREAPP
+ else
+ {
+ if (_browserProcess == nullptr)
+ {
+ LOG(ERROR) << StringUtils::ToNative("IBrowserProcess is null, unable to bind object " + obj->JavascriptName).ToString();
+
+ continue;
+ }
+
+ auto wrapperObject = gcnew JavascriptObjectWrapper(_browserProcess);
+ wrapperObject->Bind(obj, v8Value, _callbackRegistry);
+
+ _wrappedObjects->Add(wrapperObject);
+ }
+#endif
+ }
+ }
+ }
+
+ JavascriptCallbackRegistry^ JavascriptRootObjectWrapper::CallbackRegistry::get()
+ {
+ return _callbackRegistry;
+ }
+
+ int64_t JavascriptRootObjectWrapper::SaveMethodCallback(JavascriptAsyncMethodCallback^ callback)
+ {
+ auto callbackId = Interlocked::Increment(_lastCallback);
+ _methodCallbacks->Add(callbackId, callback);
+ return callbackId;
+ }
+
+ bool JavascriptRootObjectWrapper::TryGetAndRemoveMethodCallback(int64_t id, JavascriptAsyncMethodCallback^% callback)
+ {
+ bool result = false;
+ if (result = _methodCallbacks->TryGetValue(id, callback))
+ {
+ _methodCallbacks->Remove(id);
+ }
+ return result;
+ }
+ }
+}
diff --git a/CefSharp.BrowserSubprocess.Core/JavascriptRootObjectWrapper.h b/CefSharp.BrowserSubprocess.Core/JavascriptRootObjectWrapper.h
new file mode 100644
index 0000000000..ae2add0112
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/JavascriptRootObjectWrapper.h
@@ -0,0 +1,110 @@
+// Copyright © 2014 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+#pragma once
+
+#include "include/cef_v8.h"
+#include "JavascriptCallbackRegistry.h"
+#ifndef NETCOREAPP
+#include "JavascriptObjectWrapper.h"
+#endif
+#include "Async/JavascriptAsyncObjectWrapper.h"
+
+using namespace System::Runtime::Serialization;
+using namespace System::Linq;
+using namespace System::Collections::Generic;
+
+using namespace CefSharp::BrowserSubprocess::Async;
+#ifndef NETCOREAPP
+using namespace CefSharp::Internals::Wcf;
+#endif
+
+namespace CefSharp
+{
+ namespace BrowserSubprocess
+ {
+ // This wraps the transmitted registered objects
+ // by binding the meta-data to V8 JavaScript objects
+ // and installing callbacks for changes to those
+ // objects.
+ private ref class JavascriptRootObjectWrapper
+ {
+ private:
+ //Only access through Interlocked::Increment - used to generate unique callback Id's
+ //Is static so ids are unique to this process https://github.com/cefsharp/CefSharp/issues/2792
+ static int64_t _lastCallback;
+
+#ifndef NETCOREAPP
+ initonly List^ _wrappedObjects;
+#endif
+ initonly List^ _wrappedAsyncObjects;
+ initonly Dictionary^ _methodCallbacks;
+#ifndef NETCOREAPP
+ IBrowserProcess^ _browserProcess;
+#endif
+ // The entire set of possible JavaScript functions to
+ // call directly into.
+ JavascriptCallbackRegistry^ _callbackRegistry;
+
+ int64_t SaveMethodCallback(JavascriptAsyncMethodCallback^ callback);
+
+ internal:
+ property JavascriptCallbackRegistry^ CallbackRegistry
+ {
+ JavascriptCallbackRegistry^ get();
+ }
+
+ public:
+#ifdef NETCOREAPP
+ JavascriptRootObjectWrapper()
+#else
+ JavascriptRootObjectWrapper(IBrowserProcess^ browserProcess)
+#endif
+ {
+#ifndef NETCOREAPP
+ _browserProcess = browserProcess;
+ _wrappedObjects = gcnew List();
+#endif
+ _wrappedAsyncObjects = gcnew List();
+ _callbackRegistry = gcnew JavascriptCallbackRegistry();
+ _methodCallbacks = gcnew Dictionary();
+ }
+
+ ~JavascriptRootObjectWrapper()
+ {
+ if (_callbackRegistry != nullptr)
+ {
+ delete _callbackRegistry;
+ _callbackRegistry = nullptr;
+ }
+
+#ifndef NETCOREAPP
+ for each (JavascriptObjectWrapper ^ var in _wrappedObjects)
+ {
+ delete var;
+ }
+ _wrappedObjects->Clear();
+
+#endif
+
+ for each (JavascriptAsyncObjectWrapper ^ var in _wrappedAsyncObjects)
+ {
+ delete var;
+ }
+ _wrappedAsyncObjects->Clear();
+
+ for each (JavascriptAsyncMethodCallback ^ var in _methodCallbacks->Values)
+ {
+ delete var;
+ }
+ _methodCallbacks->Clear();
+ }
+
+ bool TryGetAndRemoveMethodCallback(int64_t id, JavascriptAsyncMethodCallback^% callback);
+
+ void Bind(ICollection^ objects, const CefRefPtr& v8Value);
+ };
+ }
+}
+
diff --git a/CefSharp.BrowserSubprocess.Core/RegisterBoundObjectHandler.h b/CefSharp.BrowserSubprocess.Core/RegisterBoundObjectHandler.h
new file mode 100644
index 0000000000..525bf19538
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/RegisterBoundObjectHandler.h
@@ -0,0 +1,129 @@
+// Copyright © 2018 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+#pragma once
+
+#include "include/cef_v8.h"
+#include "RegisterBoundObjectRegistry.h"
+#include "..\CefSharp.Core.Runtime\Internals\Messaging\Messages.h"
+#include "..\CefSharp.Core.Runtime\Internals\Serialization\Primitives.h"
+
+using namespace System;
+using namespace CefSharp::Internals::Messaging;
+using namespace CefSharp::Internals::Serialization;
+
+namespace CefSharp
+{
+ namespace BrowserSubprocess
+ {
+ const CefString kIsObjectCached = CefString("IsObjectCached");
+ const CefString kIsObjectCachedCamelCase = CefString("isObjectCached");
+ const CefString kRemoveObjectFromCache = CefString("RemoveObjectFromCache");
+ const CefString kRemoveObjectFromCacheCamelCase = CefString("removeObjectFromCache");
+ const CefString kDeleteBoundObject = CefString("DeleteBoundObject");
+ const CefString kDeleteBoundObjectCamelCase = CefString("deleteBoundObject");
+
+ private class RegisterBoundObjectHandler : public CefV8Handler
+ {
+ private:
+ gcroot^> _javascriptObjects;
+
+ public:
+ RegisterBoundObjectHandler(Dictionary^ javascriptObjects)
+ {
+ _javascriptObjects = javascriptObjects;
+ }
+
+ bool Execute(const CefString& name, CefRefPtr object, const CefV8ValueList& arguments, CefRefPtr& retval, CefString& exception) override
+ {
+ auto context = CefV8Context::GetCurrentContext();
+ if (context.get())
+ {
+ if (context.get() && context->Enter())
+ {
+ try
+ {
+ if (name == kIsObjectCached || name == kIsObjectCachedCamelCase)
+ {
+ if (arguments.size() == 0 || arguments.size() > 1)
+ {
+ //TODO: Improve error message
+ exception = "Must specify the name of a single bound object to check the cache for";
+
+ return true;
+ }
+
+ auto objectName = arguments[0]->GetStringValue();
+ auto managedObjectName = StringUtils::ToClr(objectName);
+
+ //Check to see if the object name is within the cache
+ retval = CefV8Value::CreateBool(_javascriptObjects->ContainsKey(managedObjectName));
+ }
+ else if (name == kRemoveObjectFromCache || name == kRemoveObjectFromCacheCamelCase)
+ {
+ if (arguments.size() == 0 || arguments.size() > 1)
+ {
+ //TODO: Improve error message
+ exception = "Must specify the name of a single bound object to remove from cache";
+
+ return true;
+ }
+
+ auto objectName = arguments[0]->GetStringValue();
+ auto managedObjectName = StringUtils::ToClr(objectName);
+
+ if (_javascriptObjects->ContainsKey(managedObjectName))
+ {
+ //Remove object from cache
+ retval = CefV8Value::CreateBool(_javascriptObjects->Remove(managedObjectName));
+ }
+ else
+ {
+ retval = CefV8Value::CreateBool(false);
+ }
+ }
+ //TODO: Better name for this function
+ else if (name == kDeleteBoundObject || name == kDeleteBoundObjectCamelCase)
+ {
+ if (arguments.size() == 0 || arguments.size() > 1)
+ {
+ //TODO: Improve error message
+ exception = "Must specify the name of a bound object to unbind, one object at a time.";
+
+ return true;
+ }
+
+ auto objectName = arguments[0]->GetStringValue();
+
+ auto global = context->GetGlobal();
+
+ auto success = global->DeleteValue(objectName);
+
+ retval = CefV8Value::CreateBool(success);
+ }
+ }
+ finally
+ {
+ context->Exit();
+ }
+ }
+ else
+ {
+ exception = "Unable to Enter Context";
+ }
+ }
+ else
+ {
+ exception = "Unable to get current context";
+ }
+
+
+ return true;
+ }
+
+ IMPLEMENT_REFCOUNTINGM(RegisterBoundObjectHandler);
+ };
+ }
+}
+
diff --git a/CefSharp.BrowserSubprocess.Core/RegisterBoundObjectRegistry.h b/CefSharp.BrowserSubprocess.Core/RegisterBoundObjectRegistry.h
new file mode 100644
index 0000000000..7dd5aaae47
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/RegisterBoundObjectRegistry.h
@@ -0,0 +1,64 @@
+// Copyright © 2018 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+#pragma once
+
+#include "include/cef_v8.h"
+
+#include "Async/JavascriptAsyncMethodCallback.h"
+
+using namespace System::Runtime::Serialization;
+using namespace System::Linq;
+using namespace System::Threading;
+using namespace System::Collections::Generic;
+using namespace CefSharp::BrowserSubprocess::Async;
+
+namespace CefSharp
+{
+ namespace BrowserSubprocess
+ {
+ //TODO: JSB Fix naming of this class, it's pretty horrible currently
+ private ref class RegisterBoundObjectRegistry
+ {
+ private:
+ //Only access through Interlocked::Increment - used to generate unique callback Id's
+ //Is static so ids are unique to this process https://github.com/cefsharp/CefSharp/issues/2792
+ static int64_t _lastCallback;
+
+ initonly Dictionary^ _methodCallbacks;
+
+ public:
+ RegisterBoundObjectRegistry()
+ {
+ _methodCallbacks = gcnew Dictionary();
+ }
+
+ ~RegisterBoundObjectRegistry()
+ {
+ for each (JavascriptAsyncMethodCallback ^ var in _methodCallbacks->Values)
+ {
+ delete var;
+ }
+ _methodCallbacks->Clear();
+ }
+
+ int64_t SaveMethodCallback(JavascriptAsyncMethodCallback^ callback)
+ {
+ auto callbackId = Interlocked::Increment(_lastCallback);
+ _methodCallbacks->Add(callbackId, callback);
+ return callbackId;
+ }
+
+ bool TryGetAndRemoveMethodCallback(int64_t id, JavascriptAsyncMethodCallback^% callback)
+ {
+ bool result = false;
+ if (result = _methodCallbacks->TryGetValue(id, callback))
+ {
+ _methodCallbacks->Remove(id);
+ }
+ return result;
+ }
+ };
+ }
+}
diff --git a/CefSharp.BrowserSubprocess.Core/Resource.aps b/CefSharp.BrowserSubprocess.Core/Resource.aps
new file mode 100644
index 0000000000..dd98ab7192
Binary files /dev/null and b/CefSharp.BrowserSubprocess.Core/Resource.aps differ
diff --git a/CefSharp.BrowserSubprocess.Core/Resource.rc b/CefSharp.BrowserSubprocess.Core/Resource.rc
new file mode 100644
index 0000000000..023e5b8c2f
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/Resource.rc
@@ -0,0 +1,31 @@
+#pragma code_page(65001)
+
+1 VERSIONINFO
+ FILEVERSION 151,3,160
+ PRODUCTVERSION 151,3,160
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904b0"
+ BEGIN
+ VALUE "FileDescription", "CefSharp.BrowserSubprocess.Core"
+ VALUE "FileVersion", "151.3.160"
+ VALUE "LegalCopyright", "Copyright © 2023 The CefSharp Authors"
+ VALUE "ProductName", "CefSharp"
+ VALUE "ProductVersion", "151.3.160"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
diff --git a/CefSharp.BrowserSubprocess.Core/Serialization/JsObjectsSerialization.cpp b/CefSharp.BrowserSubprocess.Core/Serialization/JsObjectsSerialization.cpp
new file mode 100644
index 0000000000..15ff56d672
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/Serialization/JsObjectsSerialization.cpp
@@ -0,0 +1,84 @@
+// Copyright © 2015 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+#include "stdafx.h"
+#include "JsObjectsSerialization.h"
+#include "../CefSharp.Core.Runtime/Internals/Serialization/Primitives.h"
+#include "../CefSharp.Core.Runtime/Internals/Serialization/ObjectsSerialization.h"
+
+using namespace CefSharp::Internals::Serialization;
+
+namespace CefSharp
+{
+ namespace BrowserSubprocess
+ {
+ namespace Serialization
+ {
+ JavascriptObject^ DeserializeJsObject(const CefRefPtr& rootList, int index)
+ {
+ if (rootList->GetType(index) == VTYPE_INVALID ||
+ rootList->GetType(index) == VTYPE_NULL)
+ {
+ return nullptr;
+ }
+
+ auto list = rootList->GetList(index);
+ auto jsObject = gcnew JavascriptObject();
+ jsObject->Id = GetInt64(list, 0);
+ jsObject->Name = StringUtils::ToClr(list->GetString(1));
+ jsObject->JavascriptName = StringUtils::ToClr(list->GetString(2));
+ jsObject->IsAsync = list->GetBool(3);
+
+ auto methodList = list->GetList(4);
+ auto methodCount = methodList->GetInt(0);
+ auto k = 1;
+ for (auto j = 0; j < methodCount; j++)
+ {
+ auto jsMethod = gcnew JavascriptMethod();
+
+ jsMethod->Id = GetInt64(methodList, k++);
+ jsMethod->ManagedName = StringUtils::ToClr(methodList->GetString(k++));
+ jsMethod->JavascriptName = StringUtils::ToClr(methodList->GetString(k++));
+ jsMethod->ParameterCount = methodList->GetInt(k++);
+
+ jsObject->Methods->Add(jsMethod);
+ }
+
+ auto propertyList = list->GetList(5);
+ auto propertyCount = propertyList->GetInt(0);
+ k = 1;
+ for (auto j = 0; j < propertyCount; j++)
+ {
+ auto jsProperty = gcnew JavascriptProperty();
+
+ jsProperty->Id = GetInt64(propertyList, k++);
+ jsProperty->ManagedName = StringUtils::ToClr(propertyList->GetString(k++));
+ jsProperty->JavascriptName = StringUtils::ToClr(propertyList->GetString(k++));
+ jsProperty->IsComplexType = propertyList->GetBool(k++);
+ jsProperty->IsReadOnly = propertyList->GetBool(k++);
+
+ jsProperty->JsObject = DeserializeJsObject(propertyList, k++);
+ jsProperty->PropertyValue = DeserializeObject(propertyList, k++, nullptr);
+
+ jsObject->Properties->Add(jsProperty);
+ }
+ return jsObject;
+ }
+
+ List^ DeserializeJsObjects(const CefRefPtr& list, int index)
+ {
+ auto result = gcnew List();
+ auto subList = list->GetList(index);
+ auto size = static_cast(subList->GetSize());
+
+ for (int i = 0; i < size; i++)
+ {
+ result->Add(DeserializeJsObject(subList, i));
+ }
+
+ return result;
+ }
+ }
+ }
+}
diff --git a/CefSharp.BrowserSubprocess.Core/Serialization/JsObjectsSerialization.h b/CefSharp.BrowserSubprocess.Core/Serialization/JsObjectsSerialization.h
new file mode 100644
index 0000000000..8e643091cc
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/Serialization/JsObjectsSerialization.h
@@ -0,0 +1,19 @@
+// Copyright © 2015 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+#pragma once
+
+#include "include/cef_values.h"
+
+namespace CefSharp
+{
+ namespace BrowserSubprocess
+ {
+ namespace Serialization
+ {
+ JavascriptObject^ DeserializeJsObject(const CefRefPtr& list, int index);
+ List^ DeserializeJsObjects(const CefRefPtr& list, int index);
+ }
+ }
+}
diff --git a/CefSharp.BrowserSubprocess.Core/Serialization/V8Serialization.cpp b/CefSharp.BrowserSubprocess.Core/Serialization/V8Serialization.cpp
new file mode 100644
index 0000000000..307ef0b0d4
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/Serialization/V8Serialization.cpp
@@ -0,0 +1,207 @@
+// Copyright © 2015 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+#include "Stdafx.h"
+#include "V8Serialization.h"
+#include "JavascriptCallbackRegistry.h"
+#include "../CefSharp.Core.Runtime/Internals/Serialization/Primitives.h"
+
+#include
+
+using namespace std;
+using namespace CefSharp::Internals::Serialization;
+
+namespace CefSharp
+{
+ namespace BrowserSubprocess
+ {
+ namespace Serialization
+ {
+ typedef deque> value_deque;
+
+ template
+ void SerializeV8Object(const CefRefPtr &obj, const CefRefPtr& list, const TIndex& index, JavascriptCallbackRegistry^ callbackRegistry, value_deque &seen)
+ {
+ for (value_deque::const_iterator it = seen.begin(); it != seen.end(); ++it)
+ {
+ if (obj->IsSame(*it))
+ {
+ throw exception("Cycle found");
+ }
+ }
+ seen.push_back(obj);
+
+ if (obj->IsNull() || obj->IsUndefined())
+ {
+ list->SetNull(index);
+ }
+ else if (obj->IsBool())
+ {
+ list->SetBool(index, obj->GetBoolValue());
+ }
+ else if (obj->IsInt())
+ {
+ // CEF doesn't differentiate between UINT and INT
+ // so we have to do some additional bounds checking
+ // To make sure the correct value is returned
+ // CEF IPC doesn't support UINT so we can only
+ // support int and double.
+ // https://github.com/cefsharp/CefSharp/issues/3858
+ auto dValue = obj->GetDoubleValue();
+
+ if (dValue < INT_MIN || dValue > INT_MAX)
+ {
+ list->SetDouble(index, dValue);
+ }
+ else
+ {
+ list->SetInt(index, obj->GetIntValue());
+ }
+ }
+ else if (obj->IsDouble())
+ {
+ list->SetDouble(index, obj->GetDoubleValue());
+ }
+ else if (obj->IsString())
+ {
+ list->SetString(index, obj->GetStringValue());
+ }
+ else if (obj->IsDate())
+ {
+ SetCefTime(list, index, obj->GetDateValue().val);
+ }
+ else if (obj->IsArrayBuffer())
+ {
+ SetArrayBuffer(list, index, obj->GetArrayBufferByteLength(), obj->GetArrayBufferData());
+ }
+ else if (obj->IsArray())
+ {
+ int arrLength = obj->GetArrayLength();
+ auto array = CefListValue::Create();
+ if (arrLength > 0)
+ {
+ for (int i = 0; i < arrLength; i++)
+ {
+ SerializeV8Object(obj->GetValue(i), array, i, callbackRegistry, seen);
+ }
+ }
+
+ list->SetList(index, array);
+ }
+ else if (obj->IsFunction())
+ {
+ auto context = CefV8Context::GetCurrentContext();
+ auto jsCallback = callbackRegistry->Register(context, obj);
+ SetJsCallback(list, index, jsCallback);
+ }
+ else if (obj->IsObject())
+ {
+ std::vector keys;
+ if (obj->GetKeys(keys) && keys.size() > 0)
+ {
+ auto result = CefDictionaryValue::Create();
+ for (size_t i = 0; i < keys.size(); i++)
+ {
+ auto p_keyStr = StringUtils::ToClr(keys[i].ToString());
+ if ((obj->HasValue(keys[i])) && (!p_keyStr->StartsWith("__")))
+ {
+ SerializeV8Object(obj->GetValue(keys[i]), result, keys[i], callbackRegistry, seen);
+ }
+ }
+ list->SetDictionary(index, result);
+ }
+ }
+ else
+ {
+ list->SetNull(index);
+ }
+ seen.pop_back();
+ }
+
+ template
+ void SerializeV8Object(const CefRefPtr &obj, const CefRefPtr& list, const TIndex& index, JavascriptCallbackRegistry^ callbackRegistry)
+ {
+ try
+ {
+ value_deque seen;
+ SerializeV8Object(obj, list, index, callbackRegistry, seen);
+ }
+ catch (const exception&)
+ {
+ list->SetNull(index);
+ }
+ }
+
+ template
+ CefRefPtr DeserializeV8Object(const CefRefPtr& list, const TIndex& index)
+ {
+ auto type = list->GetType(index);
+
+ if (type == VTYPE_BOOL)
+ {
+ return CefV8Value::CreateBool(list->GetBool(index));
+ }
+
+ if (type == VTYPE_INT)
+ {
+ return CefV8Value::CreateInt(list->GetInt(index));
+ }
+
+ if (type == VTYPE_DOUBLE)
+ {
+ return CefV8Value::CreateDouble(list->GetDouble(index));
+ }
+
+ if (type == VTYPE_STRING)
+ {
+ return CefV8Value::CreateString(list->GetString(index));
+ }
+
+ if (IsCefTime(list, index))
+ {
+ auto time = GetCefTime(list, index);
+ return CefV8Value::CreateDate(time);
+ }
+
+ if (type == VTYPE_LIST)
+ {
+ auto subList = list->GetList(index);
+ auto size = static_cast(subList->GetSize());
+ auto result = CefV8Value::CreateArray(size);
+ for (int i = 0; i < size; i++)
+ {
+ result->SetValue(i, DeserializeV8Object(subList, i));
+ }
+
+ return result;
+ }
+
+ if (type == VTYPE_DICTIONARY)
+ {
+ auto subDict = list->GetDictionary(index);
+ auto size = subDict->GetSize();
+ std::vector keys;
+ subDict->GetKeys(keys);
+ auto result = CefV8Value::CreateObject(nullptr, nullptr);
+ for (size_t i = 0; i < size; i++)
+ {
+ result->SetValue(keys[i], DeserializeV8Object(subDict, keys[i]), V8_PROPERTY_ATTRIBUTE_NONE);
+ }
+
+ return result;
+ }
+
+ return CefV8Value::CreateNull();
+ }
+
+ template void SerializeV8Object(const CefRefPtr &value, const CefRefPtr& list, const int& index, JavascriptCallbackRegistry^ callbackRegistry);
+ template void SerializeV8Object(const CefRefPtr &value, const CefRefPtr& list, const size_t& index, JavascriptCallbackRegistry^ callbackRegistry);
+ template void SerializeV8Object(const CefRefPtr &value, const CefRefPtr& list, const CefString& index, JavascriptCallbackRegistry^ callbackRegistry);
+ template void SerializeV8Object(const CefRefPtr &value, const CefRefPtr& list, const size_t& index, JavascriptCallbackRegistry^ callbackRegistry, value_deque &visited);
+ template void SerializeV8Object(const CefRefPtr &value, const CefRefPtr& list, const CefString& index, JavascriptCallbackRegistry^ callbackRegistry, value_deque &visited);
+ template CefRefPtr DeserializeV8Object(const CefRefPtr& list, const int& index);
+ template CefRefPtr DeserializeV8Object(const CefRefPtr& list, const CefString& index);
+ }
+ }
+}
diff --git a/CefSharp.BrowserSubprocess.Core/Serialization/V8Serialization.h b/CefSharp.BrowserSubprocess.Core/Serialization/V8Serialization.h
new file mode 100644
index 0000000000..9c0bc4c6b8
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/Serialization/V8Serialization.h
@@ -0,0 +1,30 @@
+// Copyright © 2015 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+#pragma once
+
+#include "include/cef_v8.h"
+#include "JavascriptCallbackRegistry.h"
+
+using namespace CefSharp::Internals;
+
+namespace CefSharp
+{
+ namespace BrowserSubprocess
+ {
+ namespace Serialization
+ {
+ //Functions to serialize/deserialize data sent to/received from the browser process.
+
+ //Serializes a V8 structure into a given index of a CefListValue or CefDictionaryValue
+ //JavascriptCallbackRegistry should be passed to save V8Values with function types
+ template
+ void SerializeV8Object(const CefRefPtr &value, const CefRefPtr& list, const TIndex& index, JavascriptCallbackRegistry^ callbackRegistry);
+
+ //Deserializes data from a given index of a CefListValue or a CefDictionaryValue
+ template
+ CefRefPtr DeserializeV8Object(const CefRefPtr& list, const TIndex& index);
+ }
+ }
+}
diff --git a/CefSharp.BrowserSubprocess.Core/Stdafx.cpp b/CefSharp.BrowserSubprocess.Core/Stdafx.cpp
new file mode 100644
index 0000000000..232e9db3be
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/Stdafx.cpp
@@ -0,0 +1,3 @@
+#pragma once
+
+#include "Stdafx.h"
diff --git a/CefSharp.BrowserSubprocess.Core/Stdafx.h b/CefSharp.BrowserSubprocess.Core/Stdafx.h
new file mode 100644
index 0000000000..263c6361ea
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/Stdafx.h
@@ -0,0 +1,26 @@
+// Copyright © 2014 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+#pragma once
+
+#ifdef EXPORT
+#define DECL __declspec(dllexport)
+#else
+#define DECL __declspec(dllimport)
+#endif
+
+#define NOMINMAX
+
+#include
+
+#include
+
+#include ".\..\CefSharp.Core.Runtime\Internals\CefRefCountManaged.h"
+#include ".\..\CefSharp.Core.Runtime\Internals\MCefRefPtr.h"
+#include ".\..\CefSharp.Core.Runtime\Internals\StringUtils.h"
+#include "vcclr_local.h"
+
+using namespace System;
+using namespace CefSharp;
+using namespace CefSharp::Internals;
diff --git a/CefSharp.BrowserSubprocess.Core/SubProcess.h b/CefSharp.BrowserSubprocess.Core/SubProcess.h
new file mode 100644
index 0000000000..8f988f561b
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/SubProcess.h
@@ -0,0 +1,84 @@
+// Copyright © 2016 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+#pragma once
+
+#include "Stdafx.h"
+#include "include/cef_app.h"
+
+#include "SubProcessApp.h"
+#include "CefBrowserWrapper.h"
+#include "CefAppUnmanagedWrapper.h"
+#include "Cef.h"
+
+using namespace System::Collections::Generic;
+using namespace System::Linq;
+using namespace CefSharp::Internals;
+using namespace CefSharp::RenderProcess;
+
+namespace CefSharp
+{
+ namespace BrowserSubprocess
+ {
+ // Wrap CefAppUnmangedWrapper in a nice managed wrapper
+ public ref class SubProcess
+ {
+ private:
+ MCefRefPtr _cefApp;
+
+ public:
+ SubProcess(IRenderProcessHandler^ handler, IEnumerable^ args)
+ {
+ auto onBrowserCreated = gcnew Action(this, &SubProcess::OnBrowserCreated);
+ auto onBrowserDestroyed = gcnew Action(this, &SubProcess::OnBrowserDestroyed);
+ auto schemes = CefCustomScheme::ParseCommandLineArguments(args);
+ auto enableFocusedNodeChanged = CommandLineArgsParser::HasArgument(args, CefSharpArguments::FocusedNodeChangedEnabledArgument);
+
+ _cefApp = new CefAppUnmanagedWrapper(handler, schemes, enableFocusedNodeChanged, onBrowserCreated, onBrowserDestroyed);
+ }
+
+ !SubProcess()
+ {
+ _cefApp = nullptr;
+ }
+
+ ~SubProcess()
+ {
+ this->!SubProcess();
+ }
+
+ int Run()
+ {
+ auto hInstance = Process::GetCurrentProcess()->Handle;
+
+ CefMainArgs cefMainArgs((HINSTANCE)hInstance.ToPointer());
+
+ return CefExecuteProcess(cefMainArgs, (CefApp*)_cefApp.get(), nullptr);
+ }
+
+ virtual void OnBrowserCreated(CefBrowserWrapper^ cefBrowserWrapper)
+ {
+
+ }
+
+ virtual void OnBrowserDestroyed(CefBrowserWrapper^ cefBrowserWrapper)
+ {
+
+ }
+
+ static int ExecuteProcess(IEnumerable^ args)
+ {
+ auto hInstance = Process::GetCurrentProcess()->Handle;
+
+ CefMainArgs cefMainArgs((HINSTANCE)hInstance.ToPointer());
+
+ auto schemes = CefCustomScheme::ParseCommandLineArguments(args);
+
+ CefRefPtr app = new SubProcessApp(schemes);
+
+ return CefExecuteProcess(cefMainArgs, app, nullptr);
+ }
+ };
+ }
+}
diff --git a/CefSharp.BrowserSubprocess.Core/SubProcessApp.h b/CefSharp.BrowserSubprocess.Core/SubProcessApp.h
new file mode 100644
index 0000000000..b3e4c9be75
--- /dev/null
+++ b/CefSharp.BrowserSubprocess.Core/SubProcessApp.h
@@ -0,0 +1,50 @@
+// Copyright © 2019 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+#pragma once
+
+#include "Stdafx.h"
+#include "include/cef_app.h"
+
+using namespace System::Collections::Generic;
+
+namespace CefSharp
+{
+ namespace BrowserSubprocess
+ {
+ // CefApp implementation that's common across all subprocess types
+ public class SubProcessApp : public CefApp
+ {
+ private:
+ gcroot^> _schemes;
+
+ public:
+ SubProcessApp(List