gh-obsproject/obs-browser
Watch
1
0
Fork
You've already forked obs-browser
 0
Code Issues 37 Pull requests 13 Releases 15 Wiki Activity

Remove ExecuteOnBrowser wrapper on destroy #181

Closed
zavitax wants to merge 1 commit from destroy_browser into master
pull from: destroy_browser
merge into: gh-obsproject:master
Conversation 2 Commits 1 Files changed 2 +19 -22
zavitax commented 2019-10-27 04:44:51 -05:00 (Migrated from github.com)

Description

Remove ExecuteOnBrowser() wrapper from BrowserSource::DestroyBrowser().

Motivation and Context

Under certain conditions, when browser source scene items are removed
in a loop, CEF UI thread may hang waiting for previous invocations of
ExecuteOnBrowser() to complete resulting in a deadlock.

Since CefBrowserHost::WasHidden() and CefBrowserHost::CloseBrowser()
are not required to be called on a certain thread, removing
ExecuteOnBrowser() altogether preserves the functionality, eliminates
the deadlock and simplifies the code.

How Has This Been Tested?

  • Remove single browser source
  • Remove multiple browser sources
  • Change scene collection
  • Hide/showbrowser source with "Shutdown when hidden" checked
  • Exit program

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • Code cleanup (non-breaking change which makes code smaller or more readable)

Checklist:

  • My code has been run through clang-format.
  • I have read the contributing document.
  • My code is not on the master branch.
  • The code has been tested.
  • All commit messages are properly formatted and commits squashed where appropriate.
### Description Remove `ExecuteOnBrowser()` wrapper from `BrowserSource::DestroyBrowser()`. ### Motivation and Context Under certain conditions, when browser source scene items are removed in a loop, CEF UI thread may hang waiting for previous invocations of ExecuteOnBrowser() to complete resulting in a deadlock. Since CefBrowserHost::WasHidden() and CefBrowserHost::CloseBrowser() are not required to be called on a certain thread, removing ExecuteOnBrowser() altogether preserves the functionality, eliminates the deadlock and simplifies the code. ### How Has This Been Tested? - Remove single browser source - Remove multiple browser sources - Change scene collection - Hide/showbrowser source with "Shutdown when hidden" checked - Exit program ### Types of changes - Bug fix (non-breaking change which fixes an issue) - Code cleanup (non-breaking change which makes code smaller or more readable) ### Checklist: <!--- Go over all the following points, and put an `x` in all the boxes that apply. --> <!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> - [x] My code has been run through [clang-format](https://github.com/obsproject/obs-studio/blob/master/.clang-format). - [x] I have read the [**contributing** document](https://github.com/obsproject/obs-studio/blob/master/CONTRIBUTING.rst). - [x] My code is not on the master branch. - [x] The code has been tested. - [x] All commit messages are properly formatted and commits squashed where appropriate.
PatTheMav commented 2025-11-07 08:46:03 -06:00 (Migrated from github.com)

@WizardCM Can probably be closed with #506 merged.

@WizardCM Can probably be closed with #506 merged.
RytoEX commented 2025-11-07 15:56:37 -06:00 (Migrated from github.com)

Closing per above.

Closing per above.

Pull request closed

This pull request cannot be reopened because the branch was deleted.
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
area/accessibility
Improves accessibility of the program

  
area/dependency
Issue is in external library or dependency, not OBS itself

  
Confirmed

   
Crash Report

   
Delayed
Merging has been delayed due to an issue

  
Design Issue
There is an issue with incorporating this pull request's design. It may take some time to finalize.

  
Duplicate

   
Feedback required
Issue does not contain enough information or is missing the template

  
Good first issue
New to contributing to OBS? Start here!

  
kind/bug
Categorizes issue or PR as related to a bug.

  
kind/cleanup
Non-breaking change which makes code smaller or more readable

  
kind/enhancement
Enhancements are not bugs or new features but can improve usability or performance.

  
platform/linux

   
platform/macos

   
platform/windows

   
priority/high
This is an important PR

  
Question

   
Request for Comments
More feedback & discussion is requested

  
Seeking Other Contributors
This PR needs help from any other developers who are willing to give a crack at this code

  
Seeking Testers

   
Won't Fix / By Design
No labels
area/accessibility
area/dependency
Confirmed
Crash Report
Delayed
Design Issue
Duplicate
Feedback required
Good first issue
kind/bug
kind/cleanup
kind/enhancement
platform/linux
platform/macos
platform/windows
priority/high
Question
Request for Comments
Seeking Other Contributors
Seeking Testers
Won't Fix / By Design
Milestone
Clear milestone
No items
No milestone
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
gh-obsproject/obs-browser!181
No description provided.