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

Side by Side Diff: Source/core/timing/Performance.h

Issue 1165383002: Oilpan: Build fix after r196724 (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 6 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 | « no previous file | Source/core/timing/PerformanceBase.h » ('j') | 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 * Copyright (C) 2012 Intel Inc. All rights reserved. 3 * Copyright (C) 2012 Intel Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 25 matching lines...) Expand all
36 #include "core/frame/DOMWindowProperty.h" 36 #include "core/frame/DOMWindowProperty.h"
37 #include "core/timing/MemoryInfo.h" 37 #include "core/timing/MemoryInfo.h"
38 #include "core/timing/PerformanceBase.h" 38 #include "core/timing/PerformanceBase.h"
39 #include "core/timing/PerformanceNavigation.h" 39 #include "core/timing/PerformanceNavigation.h"
40 #include "core/timing/PerformanceTiming.h" 40 #include "core/timing/PerformanceTiming.h"
41 41
42 namespace blink { 42 namespace blink {
43 43
44 class CORE_EXPORT Performance final : public PerformanceBase, public DOMWindowPr operty { 44 class CORE_EXPORT Performance final : public PerformanceBase, public DOMWindowPr operty {
45 DEFINE_WRAPPERTYPEINFO(); 45 DEFINE_WRAPPERTYPEINFO();
46 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(Performance);
46 public: 47 public:
47 static Performance* create(LocalFrame* frame) 48 static Performance* create(LocalFrame* frame)
48 { 49 {
49 return new Performance(frame); 50 return new Performance(frame);
50 } 51 }
51 virtual ~Performance(); 52 virtual ~Performance();
52 53
53 virtual ExecutionContext* executionContext() const override; 54 virtual ExecutionContext* executionContext() const override;
54 55
55 MemoryInfo* memory(); 56 MemoryInfo* memory();
56 PerformanceNavigation* navigation() const; 57 PerformanceNavigation* navigation() const;
57 PerformanceTiming* timing() const override; 58 PerformanceTiming* timing() const override;
58 59
59 DECLARE_VIRTUAL_TRACE(); 60 DECLARE_VIRTUAL_TRACE();
60 61
61 private: 62 private:
62 explicit Performance(LocalFrame*); 63 explicit Performance(LocalFrame*);
63 64
64 mutable Member<PerformanceNavigation> m_navigation; 65 mutable Member<PerformanceNavigation> m_navigation;
65 mutable Member<PerformanceTiming> m_timing; 66 mutable Member<PerformanceTiming> m_timing;
66 67
67 Member<MemoryInfo> m_memoryInfo; 68 Member<MemoryInfo> m_memoryInfo;
68 }; 69 };
69 70
70 } // namespace blink 71 } // namespace blink
71 72
72 #endif // Performance_h 73 #endif // Performance_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/timing/PerformanceBase.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698