2018-10-24 18:24:11 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2018-09-21 00:30:26 +00:00
|
|
|
From: Cheng Zhao <zcbenz@gmail.com>
|
|
|
|
Date: Thu, 20 Sep 2018 17:48:49 -0700
|
2021-05-19 18:20:12 +00:00
|
|
|
Subject: mas: avoid private APIs in blink
|
2018-09-21 00:30:26 +00:00
|
|
|
|
|
|
|
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
|
2018-10-24 18:24:11 +00:00
|
|
|
index 94afefcee81b87c05bf9b1199d90d3d4b5ea84a6..2ec7f04c71824b47de1ddbf1f0e8625d33e833a8 100644
|
2018-09-21 00:30:26 +00:00
|
|
|
--- a/third_party/blink/renderer/core/editing/kill_ring_mac.mm
|
|
|
|
+++ b/third_party/blink/renderer/core/editing/kill_ring_mac.mm
|
2018-09-14 05:02:16 +00:00
|
|
|
@@ -27,6 +27,7 @@
|
|
|
|
|
|
|
|
namespace blink {
|
|
|
|
|
|
|
|
+#ifndef MAS_BUILD
|
|
|
|
extern "C" {
|
|
|
|
|
|
|
|
// Kill ring calls. Would be better to use NSKillRing.h, but that's not
|
2020-08-10 15:23:21 +00:00
|
|
|
@@ -39,38 +40,53 @@
|
2018-09-14 05:02:16 +00:00
|
|
|
void _NSNewKillRingSequence();
|
|
|
|
void _NSSetKillRingToYankedState();
|
|
|
|
}
|
|
|
|
+#endif
|
|
|
|
|
|
|
|
static void InitializeKillRingIfNeeded() {
|
|
|
|
static bool initialized_kill_ring = false;
|
|
|
|
if (!initialized_kill_ring) {
|
|
|
|
initialized_kill_ring = true;
|
|
|
|
+#ifndef MAS_BUILD
|
|
|
|
_NSInitializeKillRing();
|
|
|
|
+#endif
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void KillRing::Append(const String& string) {
|
|
|
|
InitializeKillRingIfNeeded();
|
|
|
|
+#ifndef MAS_BUILD
|
|
|
|
_NSAppendToKillRing(string);
|
|
|
|
+#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
void KillRing::Prepend(const String& string) {
|
|
|
|
InitializeKillRingIfNeeded();
|
|
|
|
+#ifndef MAS_BUILD
|
|
|
|
_NSPrependToKillRing(string);
|
|
|
|
+#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
String KillRing::Yank() {
|
|
|
|
InitializeKillRingIfNeeded();
|
|
|
|
+#ifndef MAS_BUILD
|
|
|
|
return _NSYankFromKillRing();
|
|
|
|
+#else
|
|
|
|
+ return "";
|
|
|
|
+#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
void KillRing::StartNewSequence() {
|
|
|
|
InitializeKillRingIfNeeded();
|
|
|
|
+#ifndef MAS_BUILD
|
|
|
|
_NSNewKillRingSequence();
|
|
|
|
+#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
void KillRing::SetToYankedState() {
|
|
|
|
InitializeKillRingIfNeeded();
|
|
|
|
+#ifndef MAS_BUILD
|
|
|
|
_NSSetKillRingToYankedState();
|
|
|
|
+#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
} // namespace blink
|