1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374 |
- From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
- From: Cheng Zhao <[email protected]>
- Date: Thu, 20 Sep 2018 17:48:49 -0700
- Subject: mas: avoid private APIs in blink
- Guard usages in chromium code of private Mac APIs by MAS_BUILD, so they can
- be excluded for people who want to submit their apps to the Mac App store.
- diff --git a/third_party/blink/renderer/core/editing/kill_ring_mac.mm b/third_party/blink/renderer/core/editing/kill_ring_mac.mm
- index 94afefcee81b87c05bf9b1199d90d3d4b5ea84a6..78e4e0fe20e0fdfeab18b28fe208d5aa38eb0bd1 100644
- --- a/third_party/blink/renderer/core/editing/kill_ring_mac.mm
- +++ b/third_party/blink/renderer/core/editing/kill_ring_mac.mm
- @@ -27,6 +27,7 @@
-
- namespace blink {
-
- +#if !IS_MAS_BUILD()
- extern "C" {
-
- // Kill ring calls. Would be better to use NSKillRing.h, but that's not
- @@ -39,38 +40,53 @@
- void _NSNewKillRingSequence();
- void _NSSetKillRingToYankedState();
- }
- +#endif
-
- static void InitializeKillRingIfNeeded() {
- static bool initialized_kill_ring = false;
- if (!initialized_kill_ring) {
- initialized_kill_ring = true;
- +#if !IS_MAS_BUILD()
- _NSInitializeKillRing();
- +#endif
- }
- }
-
- void KillRing::Append(const String& string) {
- InitializeKillRingIfNeeded();
- +#if !IS_MAS_BUILD()
- _NSAppendToKillRing(string);
- +#endif
- }
-
- void KillRing::Prepend(const String& string) {
- InitializeKillRingIfNeeded();
- +#if !IS_MAS_BUILD()
- _NSPrependToKillRing(string);
- +#endif
- }
-
- String KillRing::Yank() {
- InitializeKillRingIfNeeded();
- +#if !IS_MAS_BUILD()
- return _NSYankFromKillRing();
- +#else
- + return "";
- +#endif
- }
-
- void KillRing::StartNewSequence() {
- InitializeKillRingIfNeeded();
- +#if !IS_MAS_BUILD()
- _NSNewKillRingSequence();
- +#endif
- }
-
- void KillRing::SetToYankedState() {
- InitializeKillRingIfNeeded();
- +#if !IS_MAS_BUILD()
- _NSSetKillRingToYankedState();
- +#endif
- }
-
- } // namespace blink
|