Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: de679a181a
Branches Tags
electron
/
patches
/
chromium
/
fix_expose_decrementcapturercount_in_web_contents_impl.patch

fix_expose_decrementcapturercount_in_web_contents_impl.patch 2.1 KB
History Raw

12345678910111213141516171819202122232425262728293031323334353637383940 
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
    2. 

  2. From: Shelley Vohr <[email protected]>
    3. 

  3. Date: Fri, 9 Apr 2021 19:30:01 +0200
    4. 

  4. Subject: fix: expose DecrementCapturerCount in web_contents_impl
    5. 

  5. 

  6. This was made private in https://chromium-review.googlesource.com/c/chromium/src/+/2807829 but
    7. 

  7. we invoke it in order to expose contents.decrementCapturerCount([stayHidden, stayAwake])
    8. 

  8. to users. We should try to upstream this.
    9. 

  9. 

  10. diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
    11. 

  11. index e379c4cf966a96ace1bd692cda31bae032f13acf..b800ca0aa616ae347f93156ccef79032f3ea1608 100644
    12. 

  12. --- a/content/browser/web_contents/web_contents_impl.h
    13. 

  13. +++ b/content/browser/web_contents/web_contents_impl.h
    14. 

  14. @@ -1772,10 +1772,12 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
    15. 

  15.    // outermost frame trees in this WebContents.
    16. 

  16.    std::vector<RenderFrameHostImpl*> GetOutermostMainFrames();
    17. 

  17.  
    18. 

  18. + public:
    19. 

  19.    // Called when the base::ScopedClosureRunner returned by
    20. 

  20.    // IncrementCapturerCount() is destructed.
    21. 

  21. -  void DecrementCapturerCount(bool stay_hidden, bool stay_awake);
    22. 

  22. +  void DecrementCapturerCount(bool stay_hidden, bool stay_awake) override;
    23. 

  23.  
    24. 

  24. + private:
    25. 

  25.    // Calculates the PageVisibilityState for |visibility|, taking the capturing
    26. 

  26.    // state into account.
    27. 

  27.    PageVisibilityState CalculatePageVisibilityState(Visibility visibility) const;
    28. 

  28. diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
    29. 

  29. index 67fb7c487e68af563859e76d4b0f46e44756128a..49189dadc4dba04f789e8b562a11205055231155 100644
    30. 

  30. --- a/content/public/browser/web_contents.h
    31. 

  31. +++ b/content/public/browser/web_contents.h
    32. 

  32. @@ -631,6 +631,8 @@ class WebContents : public PageNavigator,
    33. 

  33.        bool stay_hidden,
    34. 

  34.        bool stay_awake) WARN_UNUSED_RESULT = 0;
    35. 

  35.  
    36. 

  36. +  virtual void DecrementCapturerCount(bool stay_hidden, bool stay_awake) = 0;
    37. 

  37. +
    38. 

  38.    // Getter for the capture handle, which allows a captured application to
    39. 

  39.    // opt-in to exposing information to its capturer(s).
    40. 

  40.    virtual const blink::mojom::CaptureHandleConfig& GetCaptureHandleConfig() = 0;
    41.