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

Side by Side Diff: third_party/WebKit/Source/core/frame/LocalDOMWindow.h

Issue 1421783002: Oilpan: fix build after r355581. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: undo more droppage of transition types Created 5 years, 2 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) 2006, 2007, 2009, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2009, 2010 Apple Inc. All rights reserved.
3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
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 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 void documentWasClosed(); 200 void documentWasClosed();
201 void statePopped(PassRefPtr<SerializedScriptValue>); 201 void statePopped(PassRefPtr<SerializedScriptValue>);
202 202
203 // FIXME: This shouldn't be public once LocalDOMWindow becomes ExecutionCont ext. 203 // FIXME: This shouldn't be public once LocalDOMWindow becomes ExecutionCont ext.
204 void clearEventQueue(); 204 void clearEventQueue();
205 205
206 void acceptLanguagesChanged(); 206 void acceptLanguagesChanged();
207 207
208 protected: 208 protected:
209 // EventTarget overrides. 209 // EventTarget overrides.
210 bool addEventListenerInternal(const AtomicString& eventType, PassRefPtr<Even tListener>, const EventListenerOptions&) override; 210 bool addEventListenerInternal(const AtomicString& eventType, PassRefPtrWillB eRawPtr<EventListener>, const EventListenerOptions&) override;
211 bool removeEventListenerInternal(const AtomicString& eventType, PassRefPtr<E ventListener>, const EventListenerOptions&) override; 211 bool removeEventListenerInternal(const AtomicString& eventType, PassRefPtrWi llBeRawPtr<EventListener>, const EventListenerOptions&) override;
212 212
213 private: 213 private:
214 // Rather than simply inheriting LocalFrameLifecycleObserver like most other 214 // Rather than simply inheriting LocalFrameLifecycleObserver like most other
215 // classes, LocalDOMWindow hides its LocalFrameLifecycleObserver with 215 // classes, LocalDOMWindow hides its LocalFrameLifecycleObserver with
216 // composition. This prevents conflicting overloads between DOMWindow, which 216 // composition. This prevents conflicting overloads between DOMWindow, which
217 // has a frame() accessor that returns Frame* for bindings code, and 217 // has a frame() accessor that returns Frame* for bindings code, and
218 // LocalFrameLifecycleObserver, which has a frame() accessor that returns a 218 // LocalFrameLifecycleObserver, which has a frame() accessor that returns a
219 // LocalFrame*. 219 // LocalFrame*.
220 class WindowFrameObserver final : public NoBaseWillBeGarbageCollected<Window FrameObserver>, public LocalFrameLifecycleObserver { 220 class WindowFrameObserver final : public NoBaseWillBeGarbageCollected<Window FrameObserver>, public LocalFrameLifecycleObserver {
221 WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(WindowFrameObserver); 221 WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(WindowFrameObserver);
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 } 291 }
292 292
293 inline String LocalDOMWindow::defaultStatus() const 293 inline String LocalDOMWindow::defaultStatus() const
294 { 294 {
295 return m_defaultStatus; 295 return m_defaultStatus;
296 } 296 }
297 297
298 } // namespace blink 298 } // namespace blink
299 299
300 #endif // LocalDOMWindow_h 300 #endif // LocalDOMWindow_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/events/EventTarget.cpp ('k') | third_party/WebKit/Source/core/svg/SVGElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698