| Index: third_party/WebKit/Source/platform/Supplementable.h
|
| diff --git a/third_party/WebKit/Source/platform/Supplementable.h b/third_party/WebKit/Source/platform/Supplementable.h
|
| index 6ec435c81fc6819439cea6f3aaec688efd660573..ad7fd69462ed823a352cf70f65ca62d37f2ccb08 100644
|
| --- a/third_party/WebKit/Source/platform/Supplementable.h
|
| +++ b/third_party/WebKit/Source/platform/Supplementable.h
|
| @@ -99,31 +99,33 @@ class Supplement : public GarbageCollectedMixin {
|
| // All Supplement objects should be instantiated with m_host.
|
| Supplement() {}
|
|
|
| - explicit Supplement(T& host) : m_host(&host) {}
|
| + explicit Supplement(T& supplementable) : m_supplementable(&supplementable) {}
|
|
|
| // Supplementable and its supplements live and die together.
|
| - // Thus host() should never return null (if the default constructor
|
| + // Thus supplementable() should never return null (if the default constructor
|
| // is completely removed).
|
| - T* host() const { return m_host; }
|
| + T* supplementable() const { return m_supplementable; }
|
|
|
| - static void provideTo(Supplementable<T>& host,
|
| + static void provideTo(Supplementable<T>& supplementable,
|
| const char* key,
|
| Supplement<T>* supplement) {
|
| - host.provideSupplement(key, supplement);
|
| + supplementable.provideSupplement(key, supplement);
|
| }
|
|
|
| - static Supplement<T>* from(Supplementable<T>& host, const char* key) {
|
| - return host.requireSupplement(key);
|
| + static Supplement<T>* from(Supplementable<T>& supplementable,
|
| + const char* key) {
|
| + return supplementable.requireSupplement(key);
|
| }
|
|
|
| - static Supplement<T>* from(Supplementable<T>* host, const char* key) {
|
| - return host ? host->requireSupplement(key) : 0;
|
| + static Supplement<T>* from(Supplementable<T>* supplementable,
|
| + const char* key) {
|
| + return supplementable ? supplementable->requireSupplement(key) : 0;
|
| }
|
|
|
| - DEFINE_INLINE_VIRTUAL_TRACE() { visitor->trace(m_host); }
|
| + DEFINE_INLINE_VIRTUAL_TRACE() { visitor->trace(m_supplementable); }
|
|
|
| private:
|
| - Member<T> m_host;
|
| + Member<T> m_supplementable;
|
| };
|
|
|
| // Supplementable<T> inherits from GarbageCollectedMixin virtually
|
|
|