127611 2014-01-25 00:07:41 -0800 [cg] Look in the PNG dictionary for image duration information 2014-01-25 13:19:42 -0800 1 1 1 Unclassified WebKit Images 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton commit-queue sam simon.fraser oldest_to_newest 971911 0 thorton 2014-01-25 00:07:41 -0800 We should look in the PNG properties dict for frame duration data. <rdar://problem/15408643> 971919 1 222196 thorton 2014-01-25 00:46:59 -0800 Created attachment 222196 patch 972022 2 222196 commit-queue 2014-01-25 13:19:40 -0800 Comment on attachment 222196 patch Clearing flags on attachment: 222196 Committed r162778: <http://trac.webkit.org/changeset/162778> 972023 3 commit-queue 2014-01-25 13:19:42 -0800 All reviewed patches have been landed. Closing bug. 222196 2014-01-25 00:46:59 -0800 2014-01-25 13:19:40 -0800 patch png.diff text/plain 6856 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1YzRmYzRmLi5mYzZlNmI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMg QEAKKzIwMTQtMDEtMjUgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgW2NnXSBMb29rIGluIHRoZSBQTkcgZGljdGlvbmFyeSBmb3IgaW1hZ2UgZHVyYXRp b24gaW5mb3JtYXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEyNzYxMQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTU0MDg2NDM+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2Ugc2hvdWxkIGxvb2sg aW4gdGhlIFBORyBwcm9wZXJ0aWVzIGRpY3Rpb25hcnkgZm9yIGZyYW1lIGR1cmF0aW9uIGFuZCBs b29wIGNvdW50IGRhdGEuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jZy9JbWFnZVNv dXJjZUNHLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlU291cmNlOjpyZXBldGl0aW9uQ291 bnQpOgorICAgICAgICBNdXNoIHJlcGV0aXRpb25Db3VudCBhIGJpdCBtb3JlIHRvIG1ha2UgaXQg ZWFzaWVyIHRvIHJlYWQgKGVhcmx5IHJldHVybnMsIGV0Yy4pCisgICAgICAgIEFsc28sIGxvb2sg aW4gdGhlIFBORyBwcm9wZXJ0aWVzIGRpY3Rpb25hcnkgZm9yIGEgbG9vcCBjb3VudC4KKworICAg ICAgICAoV2ViQ29yZTo6SW1hZ2VTb3VyY2U6OmZyYW1lRHVyYXRpb25BdEluZGV4KToKKyAgICAg ICAgTG9vayBpbiB0aGUgUE5HIHByb3BlcnRpZXMgZGljdGlvbmFyeSBmb3IgZGVsYXkgdGltZS4K KyAgICAgICAgR2V0IHJpZCBvZiBXZWJDb3JlQ0dJbWFnZVByb3BlcnR5R0lGVW5jbGFtcGVkRGVs YXlUaW1lOyBpdCBoYXNuJ3QKKyAgICAgICAgYmVlbiBuZWVkZWQgc2luY2UgU25vdyBMZW9wYXJk LgorCiAyMDE0LTAxLTIzICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAK ICAgICAgICAgTW92ZSBKYXZhU2NyaXB0Q2FsbEZyYW1lIGFuZCBTY3JpcHREZWJ1Z1NlcnZlciBp bnRvIEphdmFTY3JpcHRDb3JlIGZvciBpbnNwZWN0b3IKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0ltYWdlU291cmNlQ0cuY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2cvSW1hZ2VTb3VyY2VDRy5jcHAKaW5kZXggYmY0NTMzNi4u YmM5OTIyOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2cv SW1hZ2VTb3VyY2VDRy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2cvSW1hZ2VTb3VyY2VDRy5jcHAKQEAgLTQ2LDE0ICs0NiwxMyBAQAogCiBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAKK2NvbnN0IENGU3RyaW5nUmVmIFdlYkNvcmVDR0ltYWdlUHJvcGVydHlBUE5HVW5j bGFtcGVkRGVsYXlUaW1lID0gQ0ZTVFIoIlVuY2xhbXBlZERlbGF5VGltZSIpOworY29uc3QgQ0ZT dHJpbmdSZWYgV2ViQ29yZUNHSW1hZ2VQcm9wZXJ0eUFQTkdEZWxheVRpbWUgPSBDRlNUUigiRGVs YXlUaW1lIik7Citjb25zdCBDRlN0cmluZ1JlZiBXZWJDb3JlQ0dJbWFnZVByb3BlcnR5QVBOR0xv b3BDb3VudCA9IENGU1RSKCJMb29wQ291bnQiKTsKKwogY29uc3QgQ0ZTdHJpbmdSZWYga0NHSW1h Z2VTb3VyY2VTaG91bGRQcmVmZXJSR0IzMiA9IENGU1RSKCJrQ0dJbWFnZVNvdXJjZVNob3VsZFBy ZWZlclJHQjMyIik7CiBjb25zdCBDRlN0cmluZ1JlZiBrQ0dJbWFnZVNvdXJjZVNraXBNZXRhZGF0 YSA9IENGU1RSKCJrQ0dJbWFnZVNvdXJjZVNraXBNZXRhZGF0YSIpOwogCi0vLyBrQ0dJbWFnZVBy b3BlcnR5R0lGVW5jbGFtcGVkRGVsYXlUaW1lIGlzIGF2YWlsYWJsZSBpbiB0aGUgSW1hZ2VJTyBm cmFtZXdvcmsgaGVhZGVycyBvbiBzb21lIHZlcnNpb25zCi0vLyBvZiBTbm93TGVvcGFyZC4gSXQn cyBub3QgcG9zc2libGUgdG8gZGV0ZWN0IHdoZXRoZXIgdGhlIGNvbnN0YW50IGlzIGF2YWlsYWJs ZSBzbyB3ZSBkZWZpbmUgb3VyIG93biBoZXJlCi0vLyB0aGF0IHdvbid0IGNvbmZsaWN0IHdpdGgg SW1hZ2VJTydzIHZlcnNpb24gd2hlbiBpdCBpcyBhdmFpbGFibGUuCi1jb25zdCBDRlN0cmluZ1Jl ZiBXZWJDb3JlQ0dJbWFnZVByb3BlcnR5R0lGVW5jbGFtcGVkRGVsYXlUaW1lID0gQ0ZTVFIoIlVu Y2xhbXBlZERlbGF5VGltZSIpOwotCiAjaWYgUExBVEZPUk0oSU9TKQogYm9vbCBJbWFnZVNvdXJj ZTo6c19hY2NlbGVyYXRlZEltYWdlRGVjb2Rpbmc7CiAjZW5kaWYKQEAgLTM0NSwyNiArMzQ0LDQx IEBAIHNpemVfdCBJbWFnZVNvdXJjZTo6Ynl0ZXNEZWNvZGVkVG9EZXRlcm1pbmVQcm9wZXJ0aWVz KCkgY29uc3QKICAgICAKIGludCBJbWFnZVNvdXJjZTo6cmVwZXRpdGlvbkNvdW50KCkKIHsKLSAg ICBpbnQgcmVzdWx0ID0gY0FuaW1hdGlvbkxvb3BPbmNlOyAvLyBObyBwcm9wZXJ0eSBtZWFucyBs b29wIG9uY2UuCiAgICAgaWYgKCFpbml0aWFsaXplZCgpKQotICAgICAgICByZXR1cm4gcmVzdWx0 OworICAgICAgICByZXR1cm4gY0FuaW1hdGlvbkxvb3BPbmNlOwogCiAgICAgUmV0YWluUHRyPENG RGljdGlvbmFyeVJlZj4gcHJvcGVydGllcyA9IGFkb3B0Q0YoQ0dJbWFnZVNvdXJjZUNvcHlQcm9w ZXJ0aWVzKG1fZGVjb2RlciwgaW1hZ2VTb3VyY2VPcHRpb25zKFNraXBNZXRhZGF0YSkpKTsKLSAg ICBpZiAocHJvcGVydGllcykgewotICAgICAgICBDRkRpY3Rpb25hcnlSZWYgZ2lmUHJvcGVydGll cyA9IChDRkRpY3Rpb25hcnlSZWYpQ0ZEaWN0aW9uYXJ5R2V0VmFsdWUocHJvcGVydGllcy5nZXQo KSwga0NHSW1hZ2VQcm9wZXJ0eUdJRkRpY3Rpb25hcnkpOwotICAgICAgICBpZiAoZ2lmUHJvcGVy dGllcykgewotICAgICAgICAgICAgQ0ZOdW1iZXJSZWYgbnVtID0gKENGTnVtYmVyUmVmKUNGRGlj dGlvbmFyeUdldFZhbHVlKGdpZlByb3BlcnRpZXMsIGtDR0ltYWdlUHJvcGVydHlHSUZMb29wQ291 bnQpOwotICAgICAgICAgICAgaWYgKG51bSkgewotICAgICAgICAgICAgICAgIC8vIEEgcHJvcGVy dHkgd2l0aCB2YWx1ZSAwIG1lYW5zIGxvb3AgZm9yZXZlci4KLSAgICAgICAgICAgICAgICBDRk51 bWJlckdldFZhbHVlKG51bSwga0NGTnVtYmVySW50VHlwZSwgJnJlc3VsdCk7Ci0gICAgICAgICAg ICAgICAgaWYgKCFyZXN1bHQpCi0gICAgICAgICAgICAgICAgICAgIHJlc3VsdCA9IGNBbmltYXRp b25Mb29wSW5maW5pdGU7Ci0gICAgICAgICAgICB9Ci0gICAgICAgIH0gZWxzZQotICAgICAgICAg ICAgcmVzdWx0ID0gY0FuaW1hdGlvbk5vbmU7IC8vIFR1cm5zIG91dCB3ZSdyZSBub3QgYSBHSUYg YWZ0ZXIgYWxsLCBzbyB3ZSBkb24ndCBhbmltYXRlLgorICAgIGlmICghcHJvcGVydGllcykKKyAg ICAgICAgcmV0dXJuIGNBbmltYXRpb25Mb29wT25jZTsKKworICAgIENGRGljdGlvbmFyeVJlZiBn aWZQcm9wZXJ0aWVzID0gKENGRGljdGlvbmFyeVJlZilDRkRpY3Rpb25hcnlHZXRWYWx1ZShwcm9w ZXJ0aWVzLmdldCgpLCBrQ0dJbWFnZVByb3BlcnR5R0lGRGljdGlvbmFyeSk7CisgICAgaWYgKGdp ZlByb3BlcnRpZXMpIHsKKyAgICAgICAgQ0ZOdW1iZXJSZWYgbnVtID0gKENGTnVtYmVyUmVmKUNG RGljdGlvbmFyeUdldFZhbHVlKGdpZlByb3BlcnRpZXMsIGtDR0ltYWdlUHJvcGVydHlHSUZMb29w Q291bnQpOworCisgICAgICAgIC8vIE5vIHByb3BlcnR5IG1lYW5zIGxvb3Agb25jZS4KKyAgICAg ICAgaWYgKCFudW0pCisgICAgICAgICAgICByZXR1cm4gY0FuaW1hdGlvbkxvb3BPbmNlOworCisg ICAgICAgIGludCBsb29wQ291bnQ7CisgICAgICAgIENGTnVtYmVyR2V0VmFsdWUobnVtLCBrQ0ZO dW1iZXJJbnRUeXBlLCAmbG9vcENvdW50KTsKKworICAgICAgICAvLyBBIHByb3BlcnR5IHdpdGgg dmFsdWUgMCBtZWFucyBsb29wIGZvcmV2ZXIuCisgICAgICAgIHJldHVybiBsb29wQ291bnQgPyBs b29wQ291bnQgOiBjQW5pbWF0aW9uTG9vcEluZmluaXRlOwogICAgIH0KLSAgICAKLSAgICByZXR1 cm4gcmVzdWx0OworCisgICAgQ0ZEaWN0aW9uYXJ5UmVmIHBuZ1Byb3BlcnRpZXMgPSAoQ0ZEaWN0 aW9uYXJ5UmVmKUNGRGljdGlvbmFyeUdldFZhbHVlKHByb3BlcnRpZXMuZ2V0KCksIGtDR0ltYWdl UHJvcGVydHlQTkdEaWN0aW9uYXJ5KTsKKyAgICBpZiAocG5nUHJvcGVydGllcykgeworICAgICAg ICBDRk51bWJlclJlZiBudW0gPSAoQ0ZOdW1iZXJSZWYpQ0ZEaWN0aW9uYXJ5R2V0VmFsdWUocG5n UHJvcGVydGllcywgV2ViQ29yZUNHSW1hZ2VQcm9wZXJ0eUFQTkdMb29wQ291bnQpOworICAgICAg ICBpZiAoIW51bSkKKyAgICAgICAgICAgIHJldHVybiBjQW5pbWF0aW9uTG9vcE9uY2U7CisKKyAg ICAgICAgaW50IGxvb3BDb3VudDsKKyAgICAgICAgQ0ZOdW1iZXJHZXRWYWx1ZShudW0sIGtDRk51 bWJlckludFR5cGUsICZsb29wQ291bnQpOworICAgICAgICByZXR1cm4gbG9vcENvdW50ID8gbG9v cENvdW50IDogY0FuaW1hdGlvbkxvb3BJbmZpbml0ZTsKKyAgICB9CisKKyAgICAvLyBUdXJucyBv dXQgd2UncmUgbm90IGFuIGFuaW1hdGVkIGltYWdlIGFmdGVyIGFsbCwgc28gd2UgZG9uJ3QgYW5p bWF0ZS4KKyAgICByZXR1cm4gY0FuaW1hdGlvbk5vbmU7CiB9CiAKIHNpemVfdCBJbWFnZVNvdXJj ZTo6ZnJhbWVDb3VudCgpIGNvbnN0CkBAIC00NTEsMTYgKzQ2NSwyNCBAQCBmbG9hdCBJbWFnZVNv dXJjZTo6ZnJhbWVEdXJhdGlvbkF0SW5kZXgoc2l6ZV90IGluZGV4KQogICAgIGZsb2F0IGR1cmF0 aW9uID0gMDsKICAgICBSZXRhaW5QdHI8Q0ZEaWN0aW9uYXJ5UmVmPiBwcm9wZXJ0aWVzID0gYWRv cHRDRihDR0ltYWdlU291cmNlQ29weVByb3BlcnRpZXNBdEluZGV4KG1fZGVjb2RlciwgaW5kZXgs IGltYWdlU291cmNlT3B0aW9ucyhTa2lwTWV0YWRhdGEpKSk7CiAgICAgaWYgKHByb3BlcnRpZXMp IHsKLSAgICAgICAgQ0ZEaWN0aW9uYXJ5UmVmIHR5cGVQcm9wZXJ0aWVzID0gKENGRGljdGlvbmFy eVJlZilDRkRpY3Rpb25hcnlHZXRWYWx1ZShwcm9wZXJ0aWVzLmdldCgpLCBrQ0dJbWFnZVByb3Bl cnR5R0lGRGljdGlvbmFyeSk7Ci0gICAgICAgIGlmICh0eXBlUHJvcGVydGllcykgewotICAgICAg ICAgICAgaWYgKENGTnVtYmVyUmVmIG51bSA9IChDRk51bWJlclJlZilDRkRpY3Rpb25hcnlHZXRW YWx1ZSh0eXBlUHJvcGVydGllcywgV2ViQ29yZUNHSW1hZ2VQcm9wZXJ0eUdJRlVuY2xhbXBlZERl bGF5VGltZSkpIHsKKyAgICAgICAgQ0ZEaWN0aW9uYXJ5UmVmIGdpZlByb3BlcnRpZXMgPSAoQ0ZE aWN0aW9uYXJ5UmVmKUNGRGljdGlvbmFyeUdldFZhbHVlKHByb3BlcnRpZXMuZ2V0KCksIGtDR0lt YWdlUHJvcGVydHlHSUZEaWN0aW9uYXJ5KTsKKyAgICAgICAgaWYgKGdpZlByb3BlcnRpZXMpIHsK KyAgICAgICAgICAgIGlmIChDRk51bWJlclJlZiBudW0gPSAoQ0ZOdW1iZXJSZWYpQ0ZEaWN0aW9u YXJ5R2V0VmFsdWUoZ2lmUHJvcGVydGllcywga0NHSW1hZ2VQcm9wZXJ0eUdJRlVuY2xhbXBlZERl bGF5VGltZSkpIHsKICAgICAgICAgICAgICAgICAvLyBVc2UgdGhlIHVuY2xhbXBlZCBmcmFtZSBk ZWxheSBpZiBpdCBleGlzdHMuCiAgICAgICAgICAgICAgICAgQ0ZOdW1iZXJHZXRWYWx1ZShudW0s IGtDRk51bWJlckZsb2F0VHlwZSwgJmR1cmF0aW9uKTsKLSAgICAgICAgICAgIH0gZWxzZSBpZiAo Q0ZOdW1iZXJSZWYgbnVtID0gKENGTnVtYmVyUmVmKUNGRGljdGlvbmFyeUdldFZhbHVlKHR5cGVQ cm9wZXJ0aWVzLCBrQ0dJbWFnZVByb3BlcnR5R0lGRGVsYXlUaW1lKSkgeworICAgICAgICAgICAg fSBlbHNlIGlmIChDRk51bWJlclJlZiBudW0gPSAoQ0ZOdW1iZXJSZWYpQ0ZEaWN0aW9uYXJ5R2V0 VmFsdWUoZ2lmUHJvcGVydGllcywga0NHSW1hZ2VQcm9wZXJ0eUdJRkRlbGF5VGltZSkpIHsKICAg ICAgICAgICAgICAgICAvLyBGYWxsIGJhY2sgdG8gdGhlIGNsYW1wZWQgZnJhbWUgZGVsYXkgaWYg dGhlIHVuY2xhbXBlZCBmcmFtZSBkZWxheSBkb2VzIG5vdCBleGlzdC4KICAgICAgICAgICAgICAg ICBDRk51bWJlckdldFZhbHVlKG51bSwga0NGTnVtYmVyRmxvYXRUeXBlLCAmZHVyYXRpb24pOwog ICAgICAgICAgICAgfQogICAgICAgICB9CisKKyAgICAgICAgQ0ZEaWN0aW9uYXJ5UmVmIHBuZ1By b3BlcnRpZXMgPSAoQ0ZEaWN0aW9uYXJ5UmVmKUNGRGljdGlvbmFyeUdldFZhbHVlKHByb3BlcnRp ZXMuZ2V0KCksIGtDR0ltYWdlUHJvcGVydHlQTkdEaWN0aW9uYXJ5KTsKKyAgICAgICAgaWYgKHBu Z1Byb3BlcnRpZXMpIHsKKyAgICAgICAgICAgIGlmIChDRk51bWJlclJlZiBudW0gPSAoQ0ZOdW1i ZXJSZWYpQ0ZEaWN0aW9uYXJ5R2V0VmFsdWUocG5nUHJvcGVydGllcywgV2ViQ29yZUNHSW1hZ2VQ cm9wZXJ0eUFQTkdVbmNsYW1wZWREZWxheVRpbWUpKQorICAgICAgICAgICAgICAgIENGTnVtYmVy R2V0VmFsdWUobnVtLCBrQ0ZOdW1iZXJGbG9hdFR5cGUsICZkdXJhdGlvbik7CisgICAgICAgICAg ICBlbHNlIGlmIChDRk51bWJlclJlZiBudW0gPSAoQ0ZOdW1iZXJSZWYpQ0ZEaWN0aW9uYXJ5R2V0 VmFsdWUocG5nUHJvcGVydGllcywgV2ViQ29yZUNHSW1hZ2VQcm9wZXJ0eUFQTkdEZWxheVRpbWUp KQorICAgICAgICAgICAgICAgIENGTnVtYmVyR2V0VmFsdWUobnVtLCBrQ0ZOdW1iZXJGbG9hdFR5 cGUsICZkdXJhdGlvbik7CisgICAgICAgIH0KICAgICB9CiAKICAgICAvLyBNYW55IGFubm95aW5n IGFkcyBzcGVjaWZ5IGEgMCBkdXJhdGlvbiB0byBtYWtlIGFuIGltYWdlIGZsYXNoIGFzIHF1aWNr bHkgYXMgcG9zc2libGUuCg==