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

Side by Side Diff: Source/WebCore/bindings/js/JSRequestAnimationFrameCallbackCustom.cpp

Issue 10391049: Merge 116319 - Unreviewed, rolling out r115525. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/
Patch Set: Created 8 years, 7 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/WebCore.exp.in ('k') | Source/WebCore/dom/Document.h » ('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) 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2011 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 15 matching lines...) Expand all
26 #include "config.h" 26 #include "config.h"
27 27
28 #if ENABLE(REQUEST_ANIMATION_FRAME) 28 #if ENABLE(REQUEST_ANIMATION_FRAME)
29 29
30 #include "JSRequestAnimationFrameCallback.h" 30 #include "JSRequestAnimationFrameCallback.h"
31 31
32 using namespace JSC; 32 using namespace JSC;
33 33
34 namespace WebCore { 34 namespace WebCore {
35 35
36 bool JSRequestAnimationFrameCallback::handleEvent(double highResNowMs) 36 bool JSRequestAnimationFrameCallback::handleEvent(DOMTimeStamp time)
37 { 37 {
38 if (!canInvokeCallback()) 38 if (!canInvokeCallback())
39 return true; 39 return true;
40 40
41 RefPtr<JSRequestAnimationFrameCallback> protect(this); 41 RefPtr<JSRequestAnimationFrameCallback> protect(this);
42 42
43 JSLock lock(SilenceAssertionsOnly); 43 JSLock lock(SilenceAssertionsOnly);
44 44
45 MarkedArgumentBuffer args; 45 MarkedArgumentBuffer args;
46 args.append(jsNumber(highResNowMs)); 46 args.append(jsNumber(time));
47 47
48 bool raisedException = false; 48 bool raisedException = false;
49 m_data->invokeCallback(args, &raisedException); 49 m_data->invokeCallback(args, &raisedException);
50 return !raisedException; 50 return !raisedException;
51 } 51 }
52 52
53 } 53 }
54 54
55 #endif 55 #endif
OLDNEW
« no previous file with comments | « Source/WebCore/WebCore.exp.in ('k') | Source/WebCore/dom/Document.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698