133588 2014-06-06 16:01:35 -0700 GenericCueData elements prematurely removed 2014-06-06 16:19:17 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 bfulgham bfulgham bfulgham webkit-bug-importer oldest_to_newest 1013873 0 bfulgham 2014-06-06 16:01:35 -0700 Now that cues are checked to see if they extend the lifetime of existing cues, we need to make sure that these cues are not removed before they are complete. Currently, the 'resetCueValues' method clears all cues, even if some are still pending. This patch prevents us from prematurely removing cues. 1013874 1 232634 bfulgham 2014-06-06 16:05:18 -0700 Created attachment 232634 Patch 1013876 2 bfulgham 2014-06-06 16:19:17 -0700 Committed r169666: <http://trac.webkit.org/changeset/169666> 232634 2014-06-06 16:05:18 -0700 2014-06-06 16:15:52 -0700 Patch bug-133588-20140606160454.patch text/plain 4987 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2OTY2NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE0LTA2LTA2ICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIEdlbmVyaWNDdWVEYXRhIGVs ZW1lbnRzIHByZW1hdHVyZWx5IHJlbW92ZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEzMzU4OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEFkZCBhICdyZW1vdmVDb21wbGV0ZWRDdWVzJyBtZXRob2QgaW5z dGVhZCBvZiB1c2luZyB0aGUgJ3Jlc2V0Q3VlVmFsdWVzJyBtZXRob2QKKyAgICAgICAgYWZ0ZXIg cHJvY2Vzc2luZyBuZXcgY3Vlcy4gV2UgZG8gbm90IHdhbnQgdG8gcmVzZXQgY3VlIHN0YXRlIGlm IHdlIGhhdmUgcGVuZGluZworICAgICAgICBjdWVzIHRoYXQgYXJlIGJlaW5nIGV4dGVuZGVkIGJ5 IGZ1dHVyZSB1cGRhdGVzIChzdWNoIGFzIHBhaW50LW9uIGN1ZXMpLgorCisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL0luYmFuZFRleHRUcmFja1ByaXZhdGVBVkYuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6SW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRjo6cHJvY2Vzc0N1 ZSk6ICBDYWxsIG5ldyAncmVtb3ZlQ29tcGxldGVkQ3VlcycgbWV0aG9kLgorICAgICAgICAoV2Vi Q29yZTo6SW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRjo6cmVtb3ZlQ29tcGxldGVkQ3Vlcyk6IEFk ZGVkLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9JbmJhbmRUZXh0 VHJhY2tQcml2YXRlQVZGLmg6CisKIDIwMTQtMDYtMDYgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxh cEBhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gU3VwcG9ydCBwYXN0aW5nIEhUTUwKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9JbmJhbmRUZXh0 VHJhY2tQcml2YXRlQVZGLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9hdmZvdW5kYXRpb24vSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRi5jcHAJKHJl dmlzaW9uIDE2OTY0NykKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91 bmRhdGlvbi9JbmJhbmRUZXh0VHJhY2tQcml2YXRlQVZGLmNwcAkod29ya2luZyBjb3B5KQpAQCAt Mzg0LDcgKzM4NCw3IEBAIHZvaWQgSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRjo6cHJvY2Vzc0MK ICAgICAgICAgICAgIGlmIChjdWVEYXRhLT5wb3NpdGlvbigpID49IDAgJiYgY3VlRGF0YS0+c2l6 ZSgpID4gMCkKICAgICAgICAgICAgICAgICBjdWVEYXRhLT5zZXRQb3NpdGlvbihjdWVEYXRhLT5w b3NpdGlvbigpIC0gY3VlRGF0YS0+c2l6ZSgpIC8gMik7CiAgICAgICAgICAgICAKLSAgICAgICAg ICAgIExPRyhNZWRpYSwgIkluYmFuZFRleHRUcmFja1ByaXZhdGVBVkY6OnByb2Nlc3NDdWUoJXAp IC0gY29uc2lkZXJpbmcgY3VlIGZvciB0aW1lID0gJS4yZiwgcG9zaXRpb24gPSAgJS4yZiwgbGlu ZSA9ICAlLjJmIiwgdGhpcywgY3VlRGF0YS0+c3RhcnRUaW1lKCksIGN1ZURhdGEtPnBvc2l0aW9u KCksIGN1ZURhdGEtPmxpbmUoKSk7CisgICAgICAgICAgICBMT0coTWVkaWEsICJJbmJhbmRUZXh0 VHJhY2tQcml2YXRlQVZGOjpwcm9jZXNzQ3VlKCVwKSAtIGNvbnNpZGVyaW5nIGN1ZSAoXCIlc1wi KSBmb3IgdGltZSA9ICUuMmYsIHBvc2l0aW9uID0gICUuMmYsIGxpbmUgPSAgJS4yZiIsIHRoaXMs IGN1ZURhdGEtPmNvbnRlbnQoKS51dGY4KCkuZGF0YSgpLCBjdWVEYXRhLT5zdGFydFRpbWUoKSwg Y3VlRGF0YS0+cG9zaXRpb24oKSwgY3VlRGF0YS0+bGluZSgpKTsKICAgICAgICAgICAgIAogICAg ICAgICAgICAgY3VlRGF0YS0+c2V0U3RhdHVzKEdlbmVyaWNDdWVEYXRhOjpQYXJ0aWFsKTsKICAg ICAgICAgfQpAQCAtNDAyLDcgKzQwMiw3IEBAIHZvaWQgSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFW Rjo6cHJvY2Vzc0MKICAgICAgICAgICAgICAgICAgICAgaWYgKCFhcnJpdmluZ0N1ZS0+ZG9lc0V4 dGVuZEN1ZURhdGEoKmN1ZURhdGEpKQogICAgICAgICAgICAgICAgICAgICAgICAgbm9uRXh0ZW5z aW9uQ3Vlcy5hcHBlbmQoYXJyaXZpbmdDdWUpOwogICAgICAgICAgICAgICAgICAgICBlbHNlCi0g ICAgICAgICAgICAgICAgICAgICAgICBMT0coTWVkaWEsICJJbmJhbmRUZXh0VHJhY2tQcml2YXRl QVZGOjpwcm9jZXNzQ3VlKCVwKSAtIGZvdW5kIGFuIGV4dGVuc2lvbiBjdWUgZm9yIHRpbWUgPSAl LjJmLCBwb3NpdGlvbiA9ICAlLjJmLCBsaW5lID0gICUuMmYiLCB0aGlzLCBhcnJpdmluZ0N1ZS0+ c3RhcnRUaW1lKCksIGFycml2aW5nQ3VlLT5wb3NpdGlvbigpLCBhcnJpdmluZ0N1ZS0+bGluZSgp KTsKKyAgICAgICAgICAgICAgICAgICAgICAgIExPRyhNZWRpYSwgIkluYmFuZFRleHRUcmFja1By aXZhdGVBVkY6OnByb2Nlc3NDdWUoJXApIC0gZm91bmQgYW4gZXh0ZW5zaW9uIGN1ZSAoXCIlc1wi KSBmb3IgdGltZSA9ICUuMmYsIHBvc2l0aW9uID0gICUuMmYsIGxpbmUgPSAgJS4yZiIsIHRoaXMs IGFycml2aW5nQ3VlLT5jb250ZW50KCkudXRmOCgpLmRhdGEoKSwgYXJyaXZpbmdDdWUtPnN0YXJ0 VGltZSgpLCBhcnJpdmluZ0N1ZS0+cG9zaXRpb24oKSwgYXJyaXZpbmdDdWUtPmxpbmUoKSk7CiAg ICAgICAgICAgICAgICAgfQogCiAgICAgICAgICAgICAgICAgYm9vbCBjdXJyZW50Q3VlSXNFeHRl bmRlZCA9IChhcnJpdmluZ0N1ZXMuc2l6ZSgpICE9IG5vbkV4dGVuc2lvbkN1ZXMuc2l6ZSgpKTsK QEAgLTQyNyw3ICs0MjcsNyBAQCB2b2lkIEluYmFuZFRleHRUcmFja1ByaXZhdGVBVkY6OnByb2Nl c3NDCiAgICAgICAgIH0gZWxzZQogICAgICAgICAgICAgTE9HKE1lZGlhLCAiSW5iYW5kVGV4dFRy YWNrUHJpdmF0ZUFWRjo6cHJvY2Vzc0N1ZSBuZWdhdGl2ZSBsZW5ndGggY3VlKHMpIGlnbm9yZWQ6 IHN0YXJ0PSUuMmYsIGVuZD0lLjJmXG4iLCBtX2N1cnJlbnRDdWVTdGFydFRpbWUsIG1fY3VycmVu dEN1ZUVuZFRpbWUpOwogCi0gICAgICAgIHJlc2V0Q3VlVmFsdWVzKCk7CisgICAgICAgIHJlbW92 ZUNvbXBsZXRlZEN1ZXMoKTsKICAgICB9CiAKICAgICBpZiAoYXJyaXZpbmdDdWVzLmlzRW1wdHko KSkKQEAgLTQ2Miw2ICs0NjIsMjcgQEAgdm9pZCBJbmJhbmRUZXh0VHJhY2tQcml2YXRlQVZGOjpk aXNjb25uZQogICAgIG1faW5kZXggPSAwOwogfQogCit2b2lkIEluYmFuZFRleHRUcmFja1ByaXZh dGVBVkY6OnJlbW92ZUNvbXBsZXRlZEN1ZXMoKQoreworICAgIGlmIChjbGllbnQoKSkgeworICAg ICAgICBsb25nIGN1cnJlbnRDdWUgPSBtX2N1ZXMuc2l6ZSgpIC0gMTsKKyAgICAgICAgZm9yICg7 IGN1cnJlbnRDdWUgPiAwOyAtLWN1cnJlbnRDdWUpIHsKKyAgICAgICAgICAgIGlmIChtX2N1ZXNb Y3VycmVudEN1ZV0tPnN0YXR1cygpICE9IEdlbmVyaWNDdWVEYXRhOjpDb21wbGV0ZSkKKyAgICAg ICAgICAgICAgICBjb250aW51ZTsKKworICAgICAgICAgICAgTE9HKE1lZGlhLCAiSW5iYW5kVGV4 dFRyYWNrUHJpdmF0ZUFWRjo6cmVtb3ZlQ29tcGxldGVkQ3VlcyglcCkgLSByZW1vdmluZyBjdWUg KFwiJXNcIikgZm9yIHRpbWUgPSAlLjJmLCBwb3NpdGlvbiA9ICAlLjJmLCBsaW5lID0gICUuMmYi LCB0aGlzLCBtX2N1ZXNbY3VycmVudEN1ZV0tPmNvbnRlbnQoKS51dGY4KCkuZGF0YSgpLCBtX2N1 ZXNbY3VycmVudEN1ZV0tPnN0YXJ0VGltZSgpLCBtX2N1ZXNbY3VycmVudEN1ZV0tPnBvc2l0aW9u KCksIG1fY3Vlc1tjdXJyZW50Q3VlXS0+bGluZSgpKTsKKyAgICAgICAgICAgIGNsaWVudCgpLT5y ZW1vdmVHZW5lcmljQ3VlKHRoaXMsIG1fY3Vlc1tjdXJyZW50Q3VlXS5nZXQoKSk7CisgICAgICAg ICAgICBtX2N1ZXMucmVtb3ZlKGN1cnJlbnRDdWUpOworICAgICAgICB9CisgICAgfQorCisgICAg aWYgKG1fY3Vlcy5pc0VtcHR5KCkpCisgICAgICAgIG1fcGVuZGluZ0N1ZVN0YXR1cyA9IE5vbmU7 CisKKyAgICBtX2N1cnJlbnRDdWVTdGFydFRpbWUgPSAwOworICAgIG1fY3VycmVudEN1ZUVuZFRp bWUgPSAwOworfQorCiB2b2lkIEluYmFuZFRleHRUcmFja1ByaXZhdGVBVkY6OnJlc2V0Q3VlVmFs dWVzKCkKIHsKICAgICBpZiAobV9jdXJyZW50Q3VlRW5kVGltZSAmJiBtX2N1ZXMuc2l6ZSgpKQpJ bmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL0luYmFu ZFRleHRUcmFja1ByaXZhdGVBVkYuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRi5oCShy ZXZpc2lvbiAxNjk2NDcpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZv dW5kYXRpb24vSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRi5oCSh3b3JraW5nIGNvcHkpCkBAIC03 NSw2ICs3NSw3IEBAIHByb3RlY3RlZDoKICAgICBJbmJhbmRUZXh0VHJhY2tQcml2YXRlQVZGKEFW RkluYmFuZFRyYWNrUGFyZW50Kik7CiAKICAgICB2b2lkIHByb2Nlc3NDdWVBdHRyaWJ1dGVzKENG QXR0cmlidXRlZFN0cmluZ1JlZiwgR2VuZXJpY0N1ZURhdGEqKTsKKyAgICB2b2lkIHJlbW92ZUNv bXBsZXRlZEN1ZXMoKTsKIAogICAgIGRvdWJsZSBtX2N1cnJlbnRDdWVTdGFydFRpbWU7CiAgICAg ZG91YmxlIG1fY3VycmVudEN1ZUVuZFRpbWU7Cg==