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

Side by Side Diff: Source/core/page/DOMWindow.cpp

Issue 19494002: Distinguish actions registered with setTimeout() and setInterval(). (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 5 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, 2008, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 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 1382 matching lines...) Expand 10 before | Expand all | Expand 10 after
1393 1393
1394 FloatRect fr = page->chrome().windowRect(); 1394 FloatRect fr = page->chrome().windowRect();
1395 FloatSize dest = FloatSize(width, height); 1395 FloatSize dest = FloatSize(width, height);
1396 FloatRect update(fr.location(), dest); 1396 FloatRect update(fr.location(), dest);
1397 page->chrome().setWindowRect(adjustWindowRect(page, update)); 1397 page->chrome().setWindowRect(adjustWindowRect(page, update));
1398 } 1398 }
1399 1399
1400 void DOMWindow::clearTimeout(int timeoutID) 1400 void DOMWindow::clearTimeout(int timeoutID)
1401 { 1401 {
1402 if (ScriptExecutionContext* context = scriptExecutionContext()) 1402 if (ScriptExecutionContext* context = scriptExecutionContext())
1403 DOMTimer::removeByID(context, timeoutID); 1403 DOMTimer::removeByIDIfTypeMatches(context, DOMTimer::TimerTypeTimeout, t imeoutID);
1404 } 1404 }
1405 1405
1406 void DOMWindow::clearInterval(int timeoutID) 1406 void DOMWindow::clearInterval(int timeoutID)
1407 { 1407 {
1408 if (ScriptExecutionContext* context = scriptExecutionContext()) 1408 if (ScriptExecutionContext* context = scriptExecutionContext())
1409 DOMTimer::removeByID(context, timeoutID); 1409 DOMTimer::removeByIDIfTypeMatches(context, DOMTimer::TimerTypeInterval, timeoutID);
1410 } 1410 }
1411 1411
1412 static LayoutSize size(HTMLImageElement* image) 1412 static LayoutSize size(HTMLImageElement* image)
1413 { 1413 {
1414 if (CachedImage* cachedImage = image->cachedImage()) 1414 if (CachedImage* cachedImage = image->cachedImage())
1415 return cachedImage->imageSizeForRenderer(image->renderer(), 1.0f); // FI XME: Not sure about this. 1415 return cachedImage->imageSizeForRenderer(image->renderer(), 1.0f); // FI XME: Not sure about this.
1416 return IntSize(); 1416 return IntSize();
1417 } 1417 }
1418 1418
1419 static IntSize size(HTMLVideoElement* video) 1419 static IntSize size(HTMLVideoElement* video)
(...skipping 538 matching lines...) Expand 10 before | Expand all | Expand 10 after
1958 1958
1959 Frame* child = frame->tree()->scopedChild(index); 1959 Frame* child = frame->tree()->scopedChild(index);
1960 if (child) 1960 if (child)
1961 return child->document()->domWindow(); 1961 return child->document()->domWindow();
1962 1962
1963 return 0; 1963 return 0;
1964 } 1964 }
1965 1965
1966 1966
1967 } // namespace WebCore 1967 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698