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

Side by Side Diff: third_party/WebKit/Source/core/dom/ViewportDescription.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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
7 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 7 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
8 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 8 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
9 * Copyright (C) 2012-2013 Intel Corporation. All rights reserved. 9 * Copyright (C) 2012-2013 Intel Corporation. All rights reserved.
10 * 10 *
(...skipping 21 matching lines...) Expand all
32 #include "core/frame/PageScaleConstraints.h" 32 #include "core/frame/PageScaleConstraints.h"
33 #include "platform/Length.h" 33 #include "platform/Length.h"
34 #include "platform/geometry/FloatSize.h" 34 #include "platform/geometry/FloatSize.h"
35 #include "wtf/Allocator.h" 35 #include "wtf/Allocator.h"
36 36
37 namespace blink { 37 namespace blink {
38 38
39 class LocalFrame; 39 class LocalFrame;
40 40
41 struct CORE_EXPORT ViewportDescription { 41 struct CORE_EXPORT ViewportDescription {
42 DISALLOW_ALLOCATION(); 42 DISALLOW_NEW();
43 43
44 enum Type { 44 enum Type {
45 // These are ordered in increasing importance. 45 // These are ordered in increasing importance.
46 UserAgentStyleSheet, 46 UserAgentStyleSheet,
47 HandheldFriendlyMeta, 47 HandheldFriendlyMeta,
48 MobileOptimizedMeta, 48 MobileOptimizedMeta,
49 ViewportMeta, 49 ViewportMeta,
50 AuthorStyleSheet 50 AuthorStyleSheet
51 } type; 51 } type;
52 52
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 void reportMobilePageStats(const LocalFrame*) const; 134 void reportMobilePageStats(const LocalFrame*) const;
135 135
136 private: 136 private:
137 enum Direction { Horizontal, Vertical }; 137 enum Direction { Horizontal, Vertical };
138 static float resolveViewportLength(const Length&, const FloatSize& initialVi ewportSize, Direction); 138 static float resolveViewportLength(const Length&, const FloatSize& initialVi ewportSize, Direction);
139 }; 139 };
140 140
141 } // namespace blink 141 } // namespace blink
142 142
143 #endif // ViewportDescription_h 143 #endif // ViewportDescription_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698