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

fix_expose_decrementcapturercount_in_web_contents_impl.patch 2.4 KB
History Raw

12345678910111213141516171819202122232425262728293031323334353637383940414243444546 
  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 b32e156d3ed18f4753eca9d75a39f3ce990bc93f..0354de2c8e8482475a006a1ec3c2df5db8102d3d 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. @@ -394,6 +394,9 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
    15. 

  15.        const gfx::Size& capture_size,
    16. 

  16.        bool stay_hidden,
    17. 

  17.        bool stay_awake) override WARN_UNUSED_RESULT;
    18. 

  18. +  // Called when the base::ScopedClosureRunner returned by
    19. 

  19. +  // IncrementCapturerCount() is destructed.
    20. 

  20. +  void DecrementCapturerCount(bool stay_hidden, bool stay_awake) override;
    21. 

  21.    bool IsBeingCaptured() override;
    22. 

  22.    bool IsBeingVisiblyCaptured() override;
    23. 

  23.    bool IsAudioMuted() override;
    24. 

  24. @@ -1707,10 +1710,6 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
    25. 

  25.    // shown in the address bar), as opposed to one in for example a Prerender.
    26. 

  26.    bool IsPrimaryFrameTree(const FrameTree& frame_tree) const;
    27. 

  27.  
    28. 

  28. -  // Called when the base::ScopedClosureRunner returned by
    29. 

  29. -  // IncrementCapturerCount() is destructed.
    30. 

  30. -  void DecrementCapturerCount(bool stay_hidden, bool stay_awake);
    31. 

  31. -
    32. 

  32.    // Data for core operation ---------------------------------------------------
    33. 

  33.  
    34. 

  34.    // Delegate for notifying our owner about stuff. Not owned by us.
    35. 

  35. diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
    36. 

  36. index 9d089057f886c7b6b10ded3c2b37f5580f3b67f7..517d5e18e064f23aebd3eed0e6c0a5e41a32c863 100644
    37. 

  37. --- a/content/public/browser/web_contents.h
    38. 

  38. +++ b/content/public/browser/web_contents.h
    39. 

  39. @@ -570,6 +570,7 @@ class WebContents : public PageNavigator,
    40. 

  40.        const gfx::Size& capture_size,
    41. 

  41.        bool stay_hidden,
    42. 

  42.        bool stay_awake) WARN_UNUSED_RESULT = 0;
    43. 

  43. +  virtual void DecrementCapturerCount(bool stay_hidden, bool stay_awake) = 0;
    44. 

  44.  
    45. 

  45.    // Returns true if audio/screenshot/video is being captured by the embedder,
    46. 

  46.    // as indicated by calls to IncrementCapturerCount().
    47.