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

Side by Side Diff: third_party/WebKit/public/web/WebAXObject.h

Issue 2143323002: Remove WebPrivateOwnPtr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 4 years, 5 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
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 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 WebAXObject_h 31 #ifndef WebAXObject_h
32 #define WebAXObject_h 32 #define WebAXObject_h
33 33
34 #include "../platform/WebCommon.h" 34 #include "../platform/WebCommon.h"
35 #include "../platform/WebPoint.h" 35 #include "../platform/WebPoint.h"
36 #include "../platform/WebPrivateOwnPtr.h"
37 #include "../platform/WebPrivatePtr.h" 36 #include "../platform/WebPrivatePtr.h"
38 #include "../platform/WebVector.h" 37 #include "../platform/WebVector.h"
39 #include "WebAXEnums.h" 38 #include "WebAXEnums.h"
39 #include <memory>
40 40
41 #if BLINK_IMPLEMENTATION 41 #if BLINK_IMPLEMENTATION
42 namespace WTF { template <typename T> class PassRefPtr; } 42 namespace WTF { template <typename T> class PassRefPtr; }
43 #endif 43 #endif
44 44
45 class SkMatrix44; 45 class SkMatrix44;
46 46
47 namespace blink { 47 namespace blink {
48 48
49 class AXObject; 49 class AXObject;
(...skipping 11 matching lines...) Expand all
61 // should be temporarily enabled. If accessibility was enabled globally 61 // should be temporarily enabled. If accessibility was enabled globally
62 // (WebSettings::setAccessibilityEnabled), this will have no effect. 62 // (WebSettings::setAccessibilityEnabled), this will have no effect.
63 class WebScopedAXContext { 63 class WebScopedAXContext {
64 public: 64 public:
65 BLINK_EXPORT WebScopedAXContext(WebDocument& rootDocument); 65 BLINK_EXPORT WebScopedAXContext(WebDocument& rootDocument);
66 BLINK_EXPORT ~WebScopedAXContext(); 66 BLINK_EXPORT ~WebScopedAXContext();
67 67
68 BLINK_EXPORT WebAXObject root() const; 68 BLINK_EXPORT WebAXObject root() const;
69 69
70 private: 70 private:
71 WebPrivateOwnPtr<ScopedAXObjectCache> m_private; 71 std::unique_ptr<ScopedAXObjectCache> m_private;
72 }; 72 };
73 73
74 // A container for passing around a reference to AXObject. 74 // A container for passing around a reference to AXObject.
75 class WebAXObject { 75 class WebAXObject {
76 public: 76 public:
77 ~WebAXObject() { reset(); } 77 ~WebAXObject() { reset(); }
78 78
79 WebAXObject() { } 79 WebAXObject() { }
80 WebAXObject(const WebAXObject& o) { assign(o); } 80 WebAXObject(const WebAXObject& o) { assign(o); }
81 WebAXObject& operator=(const WebAXObject& o) 81 WebAXObject& operator=(const WebAXObject& o)
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 operator AXObject*() const; 324 operator AXObject*() const;
325 #endif 325 #endif
326 326
327 private: 327 private:
328 WebPrivatePtr<AXObject> m_private; 328 WebPrivatePtr<AXObject> m_private;
329 }; 329 };
330 330
331 } // namespace blink 331 } // namespace blink
332 332
333 #endif 333 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698