Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(574)

Unified Diff: ui/base/test/scoped_preferred_scroller_style_legacy_mac.mm

Issue 1664523002: Fix FrameOwnerPropertiesPropagationScrolling on 10.6 after r372906 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/test/scoped_preferred_scroller_style_legacy_mac.mm
diff --git a/ui/base/test/scoped_preferred_scroller_style_legacy_mac.mm b/ui/base/test/scoped_preferred_scroller_style_legacy_mac.mm
index 2b01f9f98475f2fc5fb16204961907bc4ed4d75f..82e9a5b48423d58d11fc5723fcc30c46ad0a3b83 100644
--- a/ui/base/test/scoped_preferred_scroller_style_legacy_mac.mm
+++ b/ui/base/test/scoped_preferred_scroller_style_legacy_mac.mm
@@ -50,6 +50,9 @@ ScopedPreferredScrollerStyleLegacy::ScopedPreferredScrollerStyleLegacy() {
}
ScopedPreferredScrollerStyleLegacy::~ScopedPreferredScrollerStyleLegacy() {
+ if (!swizzler_)
+ return; // Handle 10.6, which wouldn't have swizzled anything.
+
swizzler_.reset();
if ([NSScroller preferredScrollerStyle] != NSScrollerStyleLegacy)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698