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

Side by Side Diff: Source/web/mac/WebScrollbarTheme.mm

Issue 814673002: replace COMPILE_ASSERT with static_assert in web/ (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebase on master Created 6 years 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 unified diff | Download patch
« no previous file with comments | « Source/web/WebViewImpl.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 22 matching lines...) Expand all
33 33
34 #import <AppKit/AppKit.h> 34 #import <AppKit/AppKit.h>
35 35
36 #include "platform/mac/NSScrollerImpDetails.h" 36 #include "platform/mac/NSScrollerImpDetails.h"
37 #include "platform/scroll/ScrollbarThemeMacCommon.h" 37 #include "platform/scroll/ScrollbarThemeMacCommon.h"
38 38
39 using namespace blink; 39 using namespace blink;
40 40
41 namespace blink { 41 namespace blink {
42 42
43 COMPILE_ASSERT(ScrollerStyleLegacy == NSScrollerStyleLegacy, ScrollerStyle_Legac y_must_be_equal); 43 static_assert(ScrollerStyleLegacy == NSScrollerStyleLegacy, "ScrollerStyleLegacy must match NSScrollerStyleLegacy");
44 COMPILE_ASSERT(ScrollerStyleOverlay == NSScrollerStyleOverlay, ScrollerStyle_Ove rlay_must_be_equal); 44 static_assert(ScrollerStyleOverlay == NSScrollerStyleOverlay, "ScrollerStyleOver lay must match NSScrollerStyleOverlay");
45 45
46 void WebScrollbarTheme::updateScrollbars( 46 void WebScrollbarTheme::updateScrollbars(
47 float initialButtonDelay, float autoscrollButtonDelay, 47 float initialButtonDelay, float autoscrollButtonDelay,
48 ScrollerStyle preferredScrollerStyle, bool redraw) 48 ScrollerStyle preferredScrollerStyle, bool redraw)
49 { 49 {
50 ScrollbarTheme* theme = ScrollbarTheme::theme(); 50 ScrollbarTheme* theme = ScrollbarTheme::theme();
51 if (theme->isMockTheme()) 51 if (theme->isMockTheme())
52 return; 52 return;
53 53
54 static_cast<ScrollbarThemeMacCommon*>(ScrollbarTheme::theme())->preferencesC hanged( 54 static_cast<ScrollbarThemeMacCommon*>(ScrollbarTheme::theme())->preferencesC hanged(
55 initialButtonDelay, autoscrollButtonDelay, preferredScrollerStyle, redra w); 55 initialButtonDelay, autoscrollButtonDelay, preferredScrollerStyle, redra w);
56 } 56 }
57 57
58 } // namespace blink 58 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/WebViewImpl.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698