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

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

Issue 200723002: Use new is*Element() helper functions more in web/ code (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Use same assertion as in operator->() Created 6 years, 9 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
« 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) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 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 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 226
227 template<typename U> 227 template<typename U>
228 WebPrivatePtr<T>& operator=(const U& ptr) 228 WebPrivatePtr<T>& operator=(const U& ptr)
229 { 229 {
230 storage().assign(ptr); 230 storage().assign(ptr);
231 return *this; 231 return *this;
232 } 232 }
233 233
234 T* get() const { return storage().get(); } 234 T* get() const { return storage().get(); }
235 235
236 T& operator*() const
237 {
238 ASSERT(m_storage);
239 return *get();
240 }
241
236 T* operator->() const 242 T* operator->() const
237 { 243 {
238 ASSERT(m_storage); 244 ASSERT(m_storage);
239 return get(); 245 return get();
240 } 246 }
241 #endif 247 #endif
242 248
243 private: 249 private:
244 #if INSIDE_BLINK 250 #if INSIDE_BLINK
245 PtrStorage<T>& storage() { return PtrStorage<T>::fromSlot(&m_storage); } 251 PtrStorage<T>& storage() { return PtrStorage<T>::fromSlot(&m_storage); }
(...skipping 10 matching lines...) Expand all
256 // Disable the copy constructor; classes that contain a WebPrivatePtr 262 // Disable the copy constructor; classes that contain a WebPrivatePtr
257 // should implement their copy constructor using assign(). 263 // should implement their copy constructor using assign().
258 WebPrivatePtr(const WebPrivatePtr<T>&); 264 WebPrivatePtr(const WebPrivatePtr<T>&);
259 265
260 void* m_storage; 266 void* m_storage;
261 }; 267 };
262 268
263 } // namespace blink 269 } // namespace blink
264 270
265 #endif 271 #endif
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