BASELINE: Update Chromium to 68.0.3440.125

Change-Id: I23f19369e01f688e496f5bf179abb521ad73874f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 3 insertions, 14 deletions

diff --git a/chromium/third_party/blink/renderer/core/layout/layout_theme_mac.mm b/chromium/third_party/blink/renderer/core/layout/layout_theme_mac.mm
index 79f3c20dbe6..d2d26f07ab9 100644
--- a/chromium/third_party/blink/renderer/core/layout/layout_theme_mac.mm
+++ b/chromium/third_party/blink/renderer/core/layout/layout_theme_mac.mm
@@ -31,6 +31,7 @@
 #import "third_party/blink/renderer/core/layout/layout_view.h"
 #import "third_party/blink/renderer/core/style/shadow_list.h"
 #import "third_party/blink/renderer/platform/data_resource_helper.h"
+#import "third_party/blink/renderer/platform/fonts/string_truncator.h"
 #import "third_party/blink/renderer/platform/graphics/bitmap_image.h"
 #import "third_party/blink/renderer/platform/layout_test_support.h"
 #import "third_party/blink/renderer/platform/mac/color_mac.h"
@@ -39,7 +40,6 @@
 #import "third_party/blink/renderer/platform/mac/web_core_ns_cell_extras.h"
 #import "third_party/blink/renderer/platform/runtime_enabled_features.h"
 #import "third_party/blink/renderer/platform/text/platform_locale.h"
-#import "third_party/blink/renderer/platform/text/string_truncator.h"
 #import "third_party/blink/renderer/platform/theme.h"
 
 // The methods in this file are specific to the Mac OS X platform.
@@ -265,13 +265,6 @@ void LayoutThemeMac::SystemFont(CSSValueID system_font_id,
   font_family = FontFamilyNames::system_ui;
 }
 
-bool LayoutThemeMac::NeedsHackForTextControlWithFontFamily(
-    const AtomicString& family) const {
-  // This hack is only applied on OSX 10.9.
-  // https://code.google.com/p/chromium/issues/detail?id=515989#c8
-  return IsOS10_9() && family == FontFamilyNames::system_ui;
-}
-
 static RGBA32 ConvertNSColorToColor(NSColor* color) {
   NSColor* color_in_color_space = ColorInColorSpace(color);
   if (color_in_color_space) {
@@ -494,10 +487,6 @@ bool LayoutThemeMac::IsControlStyled(const ComputedStyle& style) const {
       return true;
     if (!style.Height().IsIntrinsicOrAuto())
       return true;
-    // NSPopUpButtonCell on macOS 10.9 doesn't support
-    // NSUserInterfaceLayoutDirectionRightToLeft.
-    if (IsOS10_9() && style.Direction() == TextDirection::kRtl)
-      return true;
   }
   // Some other cells don't work well when scaled.
   if (style.EffectiveZoom() != 1) {
@@ -770,7 +759,7 @@ int LayoutThemeMac::PopupInternalPaddingStart(
   return 0;
 }
 
-int LayoutThemeMac::PopupInternalPaddingEnd(const PlatformChromeClient*,
+int LayoutThemeMac::PopupInternalPaddingEnd(const ChromeClient*,
                                             const ComputedStyle& style) const {
   if (style.Appearance() == kMenulistPart)
     return PopupButtonPadding(
@@ -981,7 +970,7 @@ NSSearchFieldCell* LayoutThemeMac::Search() const {
     // this is achieved by calling |setCenteredLook| with NO. In OS10.11 and
     // later, instead call |setPlaceholderString| with an empty string.
     // See https://crbug.com/752362.
-    if (IsOS10_9() || IsOS10_10()) {
+    if (IsOS10_10()) {
       SEL sel = @selector(setCenteredLook:);
       if ([search_.Get() respondsToSelector:sel]) {
         BOOL bool_value = NO;