Google Git
Sign in
chromium / chromium / src / d092ccd5cf..aca9ff5295 / .
diff --git a/DEPS b/DEPS
index bcce914..6aa4a6e 100644
--- a/DEPS
+++ b/DEPS

@@ -40,11 +40,11 @@
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling Skia
   # and whatever else without interference from each other.
-  'skia_revision': 'b712089b93fadf3f3b560e9b21803f4c7626c94e',
+  'skia_revision': 'e22a6a29e2e5664ee907f1abccf615a900cbcfad',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling V8
   # and whatever else without interference from each other.
-  'v8_revision': 'fe9bb7e6e251159852770160cfb21dad3cf03523',
+  'v8_revision': '9583190fb645f2bf2ce124d1babfd61a87a39415',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling swarming_client
   # and whatever else without interference from each other.

diff --git a/chrome/browser/notifications/notification_platform_bridge_mac.mm b/chrome/browser/notifications/notification_platform_bridge_mac.mm
index 410eed0..b3357a6c 100644
--- a/chrome/browser/notifications/notification_platform_bridge_mac.mm
+++ b/chrome/browser/notifications/notification_platform_bridge_mac.mm

@@ -183,7 +183,13 @@
   [builder
       setTitle:base::SysUTF16ToNSString(CreateNotificationTitle(notification))];
 
-  [builder setContextMessage:base::SysUTF16ToNSString(notification.message())];
+  base::string16 context_message =
+      notification.items().empty()
+          ? notification.message()
+          : (notification.items().at(0).title + base::UTF8ToUTF16(" - ") +
+             notification.items().at(0).message);
+
+  [builder setContextMessage:base::SysUTF16ToNSString(context_message)];
 
   bool requires_attribution =
       notification.context_message().empty() &&

diff --git a/third_party/WebKit/Source/core/frame/FrameView.cpp b/third_party/WebKit/Source/core/frame/FrameView.cpp
index 93253db..f0ebc36 100644
--- a/third_party/WebKit/Source/core/frame/FrameView.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp

@@ -384,6 +384,8 @@
   if (owner_element && owner_element->OwnedWidget() == this)
     owner_element->SetWidget(nullptr);
 
+  ClearPrintContext();
+
 #if DCHECK_IS_ON()
   has_been_disposed_ = true;
 #endif

diff --git a/third_party/WebKit/Source/core/paint/TextPainter.cpp b/third_party/WebKit/Source/core/paint/TextPainter.cpp
index 27e9bba2..7df200b 100644
--- a/third_party/WebKit/Source/core/paint/TextPainter.cpp
+++ b/third_party/WebKit/Source/core/paint/TextPainter.cpp

@@ -157,7 +157,8 @@
     text_style.shadow = style.TextShadow();
 
     // Adjust text color when printing with a white background.
-    DCHECK(line_layout_item.GetDocument().Printing() == is_printing);
+    DCHECK(line_layout_item.GetDocument().Printing() == is_printing ||
+           RuntimeEnabledFeatures::printBrowserEnabled());
     bool force_background_to_white =
         BoxPainter::ShouldForceWhiteBackgroundForPrintEconomy(
             style, line_layout_item.GetDocument());

diff --git a/third_party/WebKit/Source/platform/RuntimeEnabledFeatures.json5 b/third_party/WebKit/Source/platform/RuntimeEnabledFeatures.json5
index 08cafca31..d4e77ffd 100644
--- a/third_party/WebKit/Source/platform/RuntimeEnabledFeatures.json5
+++ b/third_party/WebKit/Source/platform/RuntimeEnabledFeatures.json5

@@ -881,7 +881,6 @@
     },
     {
       name: "SlimmingPaintV2",
-      implied_by: ["PrintBrowser"],
     },
     {
       name: "smil",