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

Side by Side Diff: third_party/WebKit/Source/core/frame/PageScaleConstraints.h

Issue 1406923009: Rename DISALLOW_ALLOCATION and ALLOW_ONLY_INLINE_ALLOCATION (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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
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 20 matching lines...) Expand all
31 #ifndef PageScaleConstraints_h 31 #ifndef PageScaleConstraints_h
32 #define PageScaleConstraints_h 32 #define PageScaleConstraints_h
33 33
34 #include "core/CoreExport.h" 34 #include "core/CoreExport.h"
35 #include "platform/geometry/FloatSize.h" 35 #include "platform/geometry/FloatSize.h"
36 #include "wtf/Allocator.h" 36 #include "wtf/Allocator.h"
37 37
38 namespace blink { 38 namespace blink {
39 39
40 struct CORE_EXPORT PageScaleConstraints { 40 struct CORE_EXPORT PageScaleConstraints {
41 DISALLOW_ALLOCATION(); 41 DISALLOW_NEW();
42 FloatSize layoutSize; 42 FloatSize layoutSize;
43 43
44 float initialScale; 44 float initialScale;
45 float minimumScale; 45 float minimumScale;
46 float maximumScale; 46 float maximumScale;
47 47
48 PageScaleConstraints(); 48 PageScaleConstraints();
49 PageScaleConstraints(float initial, float minimum, float maximum); 49 PageScaleConstraints(float initial, float minimum, float maximum);
50 50
51 void overrideWith(const PageScaleConstraints& other); 51 void overrideWith(const PageScaleConstraints& other);
52 float clampToConstraints(float pageScaleFactor) const; 52 float clampToConstraints(float pageScaleFactor) const;
53 void clampAll(); 53 void clampAll();
54 void fitToContentsWidth(float contentsWidth, int viewWidthNotIncludingScroll bars); 54 void fitToContentsWidth(float contentsWidth, int viewWidthNotIncludingScroll bars);
55 void resolveAutoInitialScale(); 55 void resolveAutoInitialScale();
56 56
57 bool operator==(const PageScaleConstraints& other) const; 57 bool operator==(const PageScaleConstraints& other) const;
58 }; 58 };
59 59
60 } // namespace blink 60 } // namespace blink
61 61
62 #endif // PageScaleConstraints_h 62 #endif // PageScaleConstraints_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/OriginsUsingFeatures.h ('k') | third_party/WebKit/Source/core/frame/SettingsDelegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698