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

Side by Side Diff: Source/WebCore/page/DOMWindow.h

Issue 11876026: Merge 139509 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/
Patch Set: Created 7 years, 11 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
« no previous file with comments | « Source/WebCore/dom/ScriptedAnimationController.cpp ('k') | Source/WebCore/page/DOMWindow.cpp » ('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) 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 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 257
258 // Timers 258 // Timers
259 int setTimeout(PassOwnPtr<ScheduledAction>, int timeout, ExceptionCode&) ; 259 int setTimeout(PassOwnPtr<ScheduledAction>, int timeout, ExceptionCode&) ;
260 void clearTimeout(int timeoutId); 260 void clearTimeout(int timeoutId);
261 int setInterval(PassOwnPtr<ScheduledAction>, int timeout, ExceptionCode& ); 261 int setInterval(PassOwnPtr<ScheduledAction>, int timeout, ExceptionCode& );
262 void clearInterval(int timeoutId); 262 void clearInterval(int timeoutId);
263 263
264 // WebKit animation extensions 264 // WebKit animation extensions
265 #if ENABLE(REQUEST_ANIMATION_FRAME) 265 #if ENABLE(REQUEST_ANIMATION_FRAME)
266 int requestAnimationFrame(PassRefPtr<RequestAnimationFrameCallback>); 266 int requestAnimationFrame(PassRefPtr<RequestAnimationFrameCallback>);
267 int webkitRequestAnimationFrame(PassRefPtr<RequestAnimationFrameCallback >);
267 void cancelAnimationFrame(int id); 268 void cancelAnimationFrame(int id);
268 #endif 269 #endif
269 270
270 // Events 271 // Events
271 // EventTarget API 272 // EventTarget API
272 virtual bool addEventListener(const AtomicString& eventType, PassRefPtr< EventListener>, bool useCapture); 273 virtual bool addEventListener(const AtomicString& eventType, PassRefPtr< EventListener>, bool useCapture);
273 virtual bool removeEventListener(const AtomicString& eventType, EventLis tener*, bool useCapture); 274 virtual bool removeEventListener(const AtomicString& eventType, EventLis tener*, bool useCapture);
274 virtual void removeAllEventListeners(); 275 virtual void removeAllEventListeners();
275 276
276 using EventTarget::dispatchEvent; 277 using EventTarget::dispatchEvent;
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
465 } 466 }
466 467
467 inline String DOMWindow::defaultStatus() const 468 inline String DOMWindow::defaultStatus() const
468 { 469 {
469 return m_defaultStatus; 470 return m_defaultStatus;
470 } 471 }
471 472
472 } // namespace WebCore 473 } // namespace WebCore
473 474
474 #endif // DOMWindow_h 475 #endif // DOMWindow_h
OLDNEW
« no previous file with comments | « Source/WebCore/dom/ScriptedAnimationController.cpp ('k') | Source/WebCore/page/DOMWindow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698