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

Side by Side Diff: public/platform/WebFloatSize.h

Issue 27009003: Fixes for compilation of Blink on VS2013 (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 2 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 unified diff | Download patch
« no previous file with comments | « Source/wtf/dtoa.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 15 matching lines...) Expand all
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #ifndef WebFloatSize_h 31 #ifndef WebFloatSize_h
32 #define WebFloatSize_h 32 #define WebFloatSize_h
33 33
34 #include "WebCommon.h" 34 #include "WebCommon.h"
35 35
36 #include <algorithm>
37
36 #if BLINK_IMPLEMENTATION 38 #if BLINK_IMPLEMENTATION
37 #include "platform/geometry/FloatSize.h" 39 #include "platform/geometry/FloatSize.h"
38 #else 40 #else
39 #include <cmath> 41 #include <cmath>
40 #include <ui/gfx/size_f.h> 42 #include <ui/gfx/size_f.h>
41 #include <ui/gfx/vector2d_f.h> 43 #include <ui/gfx/vector2d_f.h>
42 #endif 44 #endif
43 45
44 namespace WebKit { 46 namespace WebKit {
45 47
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 } 126 }
125 127
126 inline bool operator!=(const WebFloatSize& a, const WebFloatSize& b) 128 inline bool operator!=(const WebFloatSize& a, const WebFloatSize& b)
127 { 129 {
128 return !(a == b); 130 return !(a == b);
129 } 131 }
130 132
131 } // namespace WebKit 133 } // namespace WebKit
132 134
133 #endif 135 #endif
OLDNEW
« no previous file with comments | « Source/wtf/dtoa.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698