123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120 |
- 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_blink_no_private_api.patch
- 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..2ec7f04c71824b47de1ddbf1f0e8625d33e833a8 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 {
-
- +#ifndef MAS_BUILD
- extern "C" {
-
- // Kill ring calls. Would be better to use NSKillRing.h, but that's not
- @@ -39,38 +40,53 @@ NSString* _NSYankFromKillRing();
- 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
- diff --git a/third_party/blink/renderer/core/paint/theme_painter_mac.mm b/third_party/blink/renderer/core/paint/theme_painter_mac.mm
- index e965faf9fd8d5ec3572d769421f149907d66c67f..b2d0bbd80994fdf9607009d9e27bf4c3629fe402 100644
- --- a/third_party/blink/renderer/core/paint/theme_painter_mac.mm
- +++ b/third_party/blink/renderer/core/paint/theme_painter_mac.mm
- @@ -41,6 +41,7 @@
-
- // The methods in this file are specific to the Mac OS X platform.
-
- +#ifndef MAS_BUILD
- // Forward declare Mac SPIs.
- extern "C" {
- void _NSDrawCarbonThemeBezel(NSRect frame, BOOL enabled, BOOL flipped);
- @@ -50,6 +51,7 @@ void _NSDrawCarbonThemeListBox(NSRect frame,
- BOOL flipped,
- BOOL always_yes);
- }
- +#endif
-
- namespace blink {
-
- @@ -72,10 +74,12 @@ bool ThemePainterMac::PaintTextField(const Node* node,
- // behavior change while remaining a fragile solution.
- // https://bugs.chromium.org/p/chromium/issues/detail?id=658085#c3
- if (!use_ns_text_field_cell) {
- +#ifndef MAS_BUILD
- _NSDrawCarbonThemeBezel(
- CGRect(r),
- LayoutTheme::IsEnabled(node) && !LayoutTheme::IsReadOnlyControl(node),
- YES);
- +#endif
- return false;
- }
-
- @@ -161,10 +165,12 @@ bool ThemePainterMac::PaintTextArea(const Node* node,
- const PaintInfo& paint_info,
- const IntRect& r) {
- LocalCurrentGraphicsContext local_context(paint_info.context, r);
- +#ifndef MAS_BUILD
- _NSDrawCarbonThemeListBox(
- CGRect(r),
- LayoutTheme::IsEnabled(node) && !LayoutTheme::IsReadOnlyControl(node),
- YES, YES);
- +#endif
- return false;
- }
-
|