Chromium Code Reviews

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

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 46 matching lines...)
57 Performance::Performance(LocalFrame* frame) 57 Performance::Performance(LocalFrame* frame)
58 : PerformanceBase(toTimeOrigin(frame)) 58 : PerformanceBase(toTimeOrigin(frame))
59 , DOMWindowProperty(frame) 59 , DOMWindowProperty(frame)
60 { 60 {
61 } 61 }
62 62
63 Performance::~Performance() 63 Performance::~Performance()
64 { 64 {
65 } 65 }
66 66
67 ExecutionContext* Performance::executionContext() const 67 ExecutionContext* Performance::getExecutionContext() const
68 { 68 {
69 if (!frame()) 69 if (!frame())
70 return nullptr; 70 return nullptr;
71 return frame()->document(); 71 return frame()->document();
72 } 72 }
73 73
74 MemoryInfo* Performance::memory() 74 MemoryInfo* Performance::memory()
75 { 75 {
76 return MemoryInfo::create(); 76 return MemoryInfo::create();
77 } 77 }
(...skipping 16 matching lines...)
94 94
95 DEFINE_TRACE(Performance) 95 DEFINE_TRACE(Performance)
96 { 96 {
97 visitor->trace(m_navigation); 97 visitor->trace(m_navigation);
98 visitor->trace(m_timing); 98 visitor->trace(m_timing);
99 DOMWindowProperty::trace(visitor); 99 DOMWindowProperty::trace(visitor);
100 PerformanceBase::trace(visitor); 100 PerformanceBase::trace(visitor);
101 } 101 }
102 102
103 } // namespace blink 103 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/timing/Performance.h ('k') | third_party/WebKit/Source/core/timing/PerformanceBase.cpp » ('j') | no next file with comments »

Powered by Google App Engine