Merge pull request #1683 from pandamicro/v1.5

More secured Scheduler with target id assert
This commit is contained in:
Jare Guo
2017-05-27 11:29:36 +08:00
committed by GitHub
2 changed files with 38 additions and 30 deletions
+8 -7
View File
@@ -49,16 +49,17 @@ if (CC_DEV) {
"1403": "Sorry, cc.audioEngine.willPlayMusic is removed.", //willPlayMusicError
"1404": "cc.spriteFrameCache is removed, please use cc.loader to load and cache sprite frames of atlas format.",
//Scheduler: 1500
"1500": "CCSheduler#scheduleCallback. Callback already scheduled. Updating interval from:%s to %s", //scheduleCallbackForTarget
"1501": "cc.scheduler.scheduleCallbackForTarget(): callback_fn should be non-null.", //scheduleCallbackForTarget_2
"1502": "cc.scheduler.scheduleCallbackForTarget(): target should be non-null.", //scheduleCallbackForTarget_3
"1503": "cc.Scheduler.pauseTarget():target should be non-null", //pauseTarget
"1504": "cc.Scheduler.resumeTarget():target should be non-null", //resumeTarget
"1505": "cc.Scheduler.isTargetPaused():target should be non-null", //isTargetPaused
"1500": "cc.Scheduler#schedule: Callback already scheduled. Updating interval from:%s to %s", //scheduleCallbackForTarget
"1501": "cc.Scheduler#scheduleCallbackForTarget(): callback_fn should be non-null.", //scheduleCallbackForTarget_2
"1502": "cc.Scheduler#scheduleCallbackForTarget(): target should be non-null.", //scheduleCallbackForTarget_3
"1503": "cc.Scheduler#pauseTarget():target should be non-null", //pauseTarget
"1504": "cc.Scheduler#resumeTarget():target should be non-null", //resumeTarget
"1505": "cc.Scheduler#isTargetPaused():target should be non-null", //isTargetPaused
"1506": "warning: you CANNOT change update priority in scheduled function", //_schedulePerFrame
"1507": "CCScheduler#scheduleSelector. Selector already scheduled. Updating interval from: %.4f to %.4f", //schedule
"1507": "cc.Scheduler#scheduleSelector: Selector already scheduled. Updating interval from: %.4f to %.4f", //schedule
"1508": "Argument callback must not be empty", //isScheduled
"1509": "Argument target must be non-nullptr", //isScheduled
"1510": "cc.Scheduler: Illegal target which doesn't have uuid or instanceId",
//Node: 1600
"1600": "getZOrder is deprecated. Please use getLocalZOrder instead.", //getZOrder
"1601": "setZOrder is deprecated. Please use setLocalZOrder instead.", //setZOrder
+30 -23
View File
@@ -543,8 +543,8 @@ cc.Scheduler = cc._Class.extend({
cc.assertID(target, 1502);
var instanceId = getTargetId(target);
cc.assertID(instanceId, 1510);
var element = this._hashForTimers[instanceId];
if (!element) {
// Is this the 1st element ? Then set the pause level to all the callback_fns of this target
element = HashTimerEntry.get(null, target, 0, null, null, paused);
@@ -588,7 +588,9 @@ cc.Scheduler = cc._Class.extend({
* @param {Function} updateFunc
*/
scheduleUpdate: function(target, priority, paused, updateFunc) {
var hashElement = this._hashForUpdates[getTargetId(target)];
var targetId = getTargetId(target);
cc.assertID(targetId, 1510);
var hashElement = this._hashForUpdates[targetId];
if (hashElement && hashElement.entry){
// check if priority has changed
if (hashElement.entry.priority !== priority){
@@ -623,7 +625,7 @@ cc.Scheduler = cc._Class.extend({
}
//update hash entry for quick access
this._hashForUpdates[getTargetId(target)] = HashUpdateEntry.get(ppList, listElement, target, null);
this._hashForUpdates[targetId] = HashUpdateEntry.get(ppList, listElement, target, null);
},
/**
@@ -643,8 +645,10 @@ cc.Scheduler = cc._Class.extend({
// explicity handle nil arguments when removing an object
if (!target || !callback)
return;
var targetId = getTargetId(target);
cc.assertID(targetId, 1510);
var self = this, element = self._hashForTimers[getTargetId(target)];
var self = this, element = self._hashForTimers[targetId];
if (element) {
var timers = element.timers;
for(var i = 0, li = timers.length; i < li; i++){
@@ -682,9 +686,10 @@ cc.Scheduler = cc._Class.extend({
unscheduleUpdate: function (target) {
if (!target)
return;
var targetId = getTargetId(target);
cc.assertID(targetId, 1510);
var element = this._hashForUpdates[getTargetId(target)];
var element = this._hashForUpdates[targetId];
if (element) {
if (this._updateHashLocked) {
element.entry.markedForDeletion = true;
@@ -707,10 +712,11 @@ cc.Scheduler = cc._Class.extend({
if (!target){
return;
}
var targetId = getTargetId(target);
cc.assertID(targetId, 1510);
// Custom Selectors
var element = this._hashForTimers[getTargetId(target)];
var element = this._hashForTimers[targetId];
if (element) {
var timers = element.timers;
if (timers.indexOf(element.currentTimer) > -1 &&
@@ -813,9 +819,10 @@ cc.Scheduler = cc._Class.extend({
//selector, target
cc.assertID(callback, 1508);
cc.assertID(target, 1509);
var instanceId = getTargetId(target);
var element = this._hashForTimers[instanceId];
var targetId = getTargetId(target);
cc.assertID(targetId, 1510);
var element = this._hashForTimers[targetId];
if (!element) {
return false;
@@ -942,19 +949,19 @@ cc.Scheduler = cc._Class.extend({
* @param {Object} target
*/
pauseTarget: function (target) {
cc.assertID(target, 1503);
var targetId = getTargetId(target);
cc.assertID(targetId, 1510);
//customer selectors
var self = this,
instanceId = getTargetId(target),
element = self._hashForTimers[instanceId];
element = self._hashForTimers[targetId];
if (element) {
element.paused = true;
}
//update callback
var elementUpdate = self._hashForUpdates[instanceId];
var elementUpdate = self._hashForUpdates[targetId];
if (elementUpdate) {
elementUpdate.entry.paused = true;
}
@@ -973,20 +980,20 @@ cc.Scheduler = cc._Class.extend({
* @param {Object} target
*/
resumeTarget: function (target) {
cc.assertID(target, 1504);
var targetId = getTargetId(target);
cc.assertID(targetId, 1510);
// custom selectors
var self = this,
instanceId = getTargetId(target),
element = self._hashForTimers[instanceId];
element = self._hashForTimers[targetId];
if (element) {
element.paused = false;
}
//update callback
var elementUpdate = self._hashForUpdates[instanceId];
var elementUpdate = self._hashForUpdates[targetId];
if (elementUpdate) {
elementUpdate.entry.paused = false;
@@ -1001,16 +1008,16 @@ cc.Scheduler = cc._Class.extend({
* @return {Boolean}
*/
isTargetPaused: function (target) {
cc.assertID(target, 1505);
var targetId = getTargetId(target);
cc.assertID(targetId, 1510);
// Custom selectors
var instanceId = getTargetId(target),
element = this._hashForTimers[instanceId];
var element = this._hashForTimers[targetId];
if (element) {
return element.paused;
}
var elementUpdate = this._hashForUpdates[instanceId];
var elementUpdate = this._hashForUpdates[targetId];
if (elementUpdate) {
return elementUpdate.entry.paused;
}