Chromium Code Reviews

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

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-modules: rebase-fixes Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
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 33 matching lines...)
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 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(Performance);
47 public: 47 public:
48 static Performance* create(LocalFrame* frame) 48 static Performance* create(LocalFrame* frame)
49 { 49 {
50 return new Performance(frame); 50 return new Performance(frame);
51 } 51 }
52 ~Performance() override; 52 ~Performance() override;
53 53
54 ExecutionContext* executionContext() const override; 54 ExecutionContext* getExecutionContext() const override;
55 55
56 MemoryInfo* memory(); 56 MemoryInfo* memory();
57 PerformanceNavigation* navigation() const; 57 PerformanceNavigation* navigation() const;
58 PerformanceTiming* timing() const override; 58 PerformanceTiming* timing() const override;
59 59
60 DECLARE_VIRTUAL_TRACE(); 60 DECLARE_VIRTUAL_TRACE();
61 61
62 private: 62 private:
63 explicit Performance(LocalFrame*); 63 explicit Performance(LocalFrame*);
64 64
65 mutable Member<PerformanceNavigation> m_navigation; 65 mutable Member<PerformanceNavigation> m_navigation;
66 mutable Member<PerformanceTiming> m_timing; 66 mutable Member<PerformanceTiming> m_timing;
67 }; 67 };
68 68
69 } // namespace blink 69 } // namespace blink
70 70
71 #endif // Performance_h 71 #endif // Performance_h
OLDNEW

Powered by Google App Engine