mas_blink_no_private_api.patch 1.9 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
  2. From: Cheng Zhao <[email protected]>
  3. Date: Thu, 20 Sep 2018 17:48:49 -0700
  4. Subject: mas: avoid private APIs in blink
  5. Guard usages in chromium code of private Mac APIs by MAS_BUILD, so they can
  6. be excluded for people who want to submit their apps to the Mac App store.
  7. diff --git a/third_party/blink/renderer/core/editing/kill_ring_mac.mm b/third_party/blink/renderer/core/editing/kill_ring_mac.mm
  8. index 94afefcee81b87c05bf9b1199d90d3d4b5ea84a6..78e4e0fe20e0fdfeab18b28fe208d5aa38eb0bd1 100644
  9. --- a/third_party/blink/renderer/core/editing/kill_ring_mac.mm
  10. +++ b/third_party/blink/renderer/core/editing/kill_ring_mac.mm
  11. @@ -27,6 +27,7 @@
  12. namespace blink {
  13. +#if !IS_MAS_BUILD()
  14. extern "C" {
  15. // Kill ring calls. Would be better to use NSKillRing.h, but that's not
  16. @@ -39,38 +40,53 @@
  17. void _NSNewKillRingSequence();
  18. void _NSSetKillRingToYankedState();
  19. }
  20. +#endif
  21. static void InitializeKillRingIfNeeded() {
  22. static bool initialized_kill_ring = false;
  23. if (!initialized_kill_ring) {
  24. initialized_kill_ring = true;
  25. +#if !IS_MAS_BUILD()
  26. _NSInitializeKillRing();
  27. +#endif
  28. }
  29. }
  30. void KillRing::Append(const String& string) {
  31. InitializeKillRingIfNeeded();
  32. +#if !IS_MAS_BUILD()
  33. _NSAppendToKillRing(string);
  34. +#endif
  35. }
  36. void KillRing::Prepend(const String& string) {
  37. InitializeKillRingIfNeeded();
  38. +#if !IS_MAS_BUILD()
  39. _NSPrependToKillRing(string);
  40. +#endif
  41. }
  42. String KillRing::Yank() {
  43. InitializeKillRingIfNeeded();
  44. +#if !IS_MAS_BUILD()
  45. return _NSYankFromKillRing();
  46. +#else
  47. + return "";
  48. +#endif
  49. }
  50. void KillRing::StartNewSequence() {
  51. InitializeKillRingIfNeeded();
  52. +#if !IS_MAS_BUILD()
  53. _NSNewKillRingSequence();
  54. +#endif
  55. }
  56. void KillRing::SetToYankedState() {
  57. InitializeKillRingIfNeeded();
  58. +#if !IS_MAS_BUILD()
  59. _NSSetKillRingToYankedState();
  60. +#endif
  61. }
  62. } // namespace blink