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

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

Issue 462843003: Cleanup namespace usage in public/platform/{Web[P-W]*,linux/*}.h (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 4 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 { 56 {
57 } 57 }
58 58
59 WebSize(int width, int height) 59 WebSize(int width, int height)
60 : width(width) 60 : width(width)
61 , height(height) 61 , height(height)
62 { 62 {
63 } 63 }
64 64
65 #if INSIDE_BLINK 65 #if INSIDE_BLINK
66 WebSize(const blink::IntSize& s) 66 WebSize(const IntSize& s)
67 : width(s.width()) 67 : width(s.width())
68 , height(s.height()) 68 , height(s.height())
69 { 69 {
70 } 70 }
71 71
72 WebSize& operator=(const blink::IntSize& s) 72 WebSize& operator=(const IntSize& s)
73 { 73 {
74 width = s.width(); 74 width = s.width();
75 height = s.height(); 75 height = s.height();
76 return *this; 76 return *this;
77 } 77 }
78 78
79 operator blink::IntSize() const 79 operator IntSize() const
80 { 80 {
81 return blink::IntSize(width, height); 81 return IntSize(width, height);
82 } 82 }
83 #else 83 #else
84 WebSize(const gfx::Size& s) 84 WebSize(const gfx::Size& s)
85 : width(s.width()) 85 : width(s.width())
86 , height(s.height()) 86 , height(s.height())
87 { 87 {
88 } 88 }
89 89
90 WebSize(const gfx::Vector2d& v) 90 WebSize(const gfx::Vector2d& v)
91 : width(v.x()) 91 : width(v.x())
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 } 125 }
126 126
127 inline bool operator!=(const WebSize& a, const WebSize& b) 127 inline bool operator!=(const WebSize& a, const WebSize& b)
128 { 128 {
129 return !(a == b); 129 return !(a == b);
130 } 130 }
131 131
132 } // namespace blink 132 } // namespace blink
133 133
134 #endif 134 #endif
OLDNEW
« no previous file with comments | « public/platform/WebServiceWorkerResponse.h ('k') | public/platform/WebSocketHandshakeRequestInfo.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698