114226 2013-04-08 17:18:33 -0700 Don't try to remove a non-existent snapshot 2013-04-08 19:42:28 -0700 1 1 1 Unclassified WebKit Plug-ins 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 dino dino esprehn+autocc ojan.autocc thorton webkit-bug-importer webkit-ews webkit.review.bot oldest_to_newest 871288 0 dino 2013-04-08 17:18:33 -0700 We should not fire the remove snapshot timer if there was never a snapshot to remove. 871290 1 webkit-bug-importer 2013-04-08 17:18:57 -0700 <rdar://problem/13604480> 871297 2 196975 dino 2013-04-08 17:21:45 -0700 Created attachment 196975 Patch 871312 3 196975 webkit-ews 2013-04-08 17:44:14 -0700 Comment on attachment 196975 Patch Attachment 196975 did not pass qt-ews (qt): Output: http://webkit-commit-queue.appspot.com/results/17672003 871314 4 196975 darin 2013-04-08 17:45:33 -0700 Comment on attachment 196975 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=196975&action=review > Source/WebCore/html/HTMLPlugInImageElement.cpp:96 > + DisplayState previousDisplayState = displayState(); This line of code needs to be inside the same #if as the code below; #if PLATFORM(MAC), although I wish that was not the way we guarded this feature! Please fix that before landing. 871320 5 196975 webkit-ews 2013-04-08 17:55:57 -0700 Comment on attachment 196975 Patch Attachment 196975 did not pass qt-wk2-ews (qt): Output: http://webkit-commit-queue.appspot.com/results/17638017 871346 6 196975 eflews.bot 2013-04-08 18:19:09 -0700 Comment on attachment 196975 Patch Attachment 196975 did not pass efl-ews (efl): Output: http://webkit-commit-queue.appspot.com/results/17641012 871374 7 196975 dino 2013-04-08 19:27:17 -0700 Comment on attachment 196975 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=196975&action=review >> Source/WebCore/html/HTMLPlugInImageElement.cpp:96 >> + DisplayState previousDisplayState = displayState(); > > This line of code needs to be inside the same #if as the code below; #if PLATFORM(MAC), although I wish that was not the way we guarded this feature! Please fix that before landing. It's worse. I can't just move it because we've already updated the state by then. I'll need to put in another #if :( And yes, this feature guarding is horrible. Since MAC is the only place that is doing the crossfade at the moment, this is an implied connection between WebKit2 and WebCore. I guess it would be better as a Setting. 871377 8 196975 dino 2013-04-08 19:29:57 -0700 Comment on attachment 196975 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=196975&action=review >>> Source/WebCore/html/HTMLPlugInImageElement.cpp:96 >>> + DisplayState previousDisplayState = displayState(); >> >> This line of code needs to be inside the same #if as the code below; #if PLATFORM(MAC), although I wish that was not the way we guarded this feature! Please fix that before landing. > > It's worse. I can't just move it because we've already updated the state by then. I'll need to put in another #if :( > > And yes, this feature guarding is horrible. Since MAC is the only place that is doing the crossfade at the moment, this is an implied connection between WebKit2 and WebCore. I guess it would be better as a Setting. I rewrote the method to but the call to super at the end. 871379 9 196981 dino 2013-04-08 19:34:31 -0700 Created attachment 196981 Build test (with review modifications) 871382 10 dino 2013-04-08 19:42:28 -0700 Committed r147977: <http://trac.webkit.org/changeset/147977> 196975 2013-04-08 17:21:45 -0700 2013-04-08 19:29:56 -0700 Patch bug-114226-20130409102127.patch text/plain 2523 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ3OTYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWE5YzNkMmI3MjI1ZjZh MzhmYTQzMTNiOTI4OTQ0M2VkOWVkMDdmYi4uZWE3OTgxMWMyZGVkYTA5MWFkMmM5NjEwMDc2M2M1 YzkxOTZkZDViYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEzLTA0LTA4ICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KKworICAgICAgICBEb24ndCB0cnkgdG8gcmVtb3Zl IGEgbm9uLWV4aXN0ZW50IHNuYXBzaG90CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMTQyMjYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzEzNjA0NDgw PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIGRv bid0IG5lZWQgdG8gdHJpZ2dlciB0aGUgdGltZXIgdG8gcmVtb3ZlIGEgc25hcHNob3QKKyAgICAg ICAgaWYgdGhlcmUgd2FzIG5ldmVyIGEgc25hcHNob3QgZGlzcGxheWVkLgorCisgICAgICAgICog aHRtbC9IVE1MUGx1Z0luSW1hZ2VFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxQ bHVnSW5JbWFnZUVsZW1lbnQ6OnNldERpc3BsYXlTdGF0ZSk6IERldGVjdCBpZiB3ZSdyZSBtb3Zp bmcgZnJvbSB0aGUgRGlzcGxheWluZ1NuYXBzaG90IHN0YXRlLgorICAgICAgICAoV2ViQ29yZTo6 SFRNTFBsdWdJbkltYWdlRWxlbWVudDo6cmVtb3ZlU25hcHNob3RUaW1lckZpcmVkKTogR3VhcmQg YWdhaW5zdCBhIG1pc3NpbmcgcmVuZGVyZXIuCisKIDIwMTMtMDQtMDggIFRpYW5jaGVuZyBKaWFu ZyAgPHRpamlhbmdAcmltLmNvbT4KIAogICAgICAgICBbQmxhY2tCZXJyeV0gQ2xlYW4gdXAgcmVu ZGVyIHRoZW1lIGNvZGUuIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MUGx1 Z0luSW1hZ2VFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFBsdWdJbkltYWdl RWxlbWVudC5jcHAKaW5kZXggN2JiNmY1Yzc5MGU4MTVhNWViYzg4NGIzMDBiM2M3MjRjOWJlZGI2 OS4uMDk4ODI2ZTFjZmFkN2VkZjJiNGIzODY1NmQ2NzViNjU0OTBkYzdkZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaHRtbC9IVE1MUGx1Z0luSW1hZ2VFbGVtZW50LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9odG1sL0hUTUxQbHVnSW5JbWFnZUVsZW1lbnQuY3BwCkBAIC05Myw2ICs5Myw3 IEBAIEhUTUxQbHVnSW5JbWFnZUVsZW1lbnQ6On5IVE1MUGx1Z0luSW1hZ2VFbGVtZW50KCkKIAog dm9pZCBIVE1MUGx1Z0luSW1hZ2VFbGVtZW50OjpzZXREaXNwbGF5U3RhdGUoRGlzcGxheVN0YXRl IHN0YXRlKQogeworICAgIERpc3BsYXlTdGF0ZSBwcmV2aW91c0Rpc3BsYXlTdGF0ZSA9IGRpc3Bs YXlTdGF0ZSgpOwogICAgIEhUTUxQbHVnSW5FbGVtZW50OjpzZXREaXNwbGF5U3RhdGUoc3RhdGUp OwogICAgIGlmIChkaXNwbGF5U3RhdGUoKSA9PSBEaXNwbGF5aW5nU25hcHNob3QpCiAgICAgICAg IG1fc3dhcFJlbmRlcmVyVGltZXIuc3RhcnRPbmVTaG90KDApOwpAQCAtMTAwLDcgKzEwMSw4IEBA IHZvaWQgSFRNTFBsdWdJbkltYWdlRWxlbWVudDo6c2V0RGlzcGxheVN0YXRlKERpc3BsYXlTdGF0 ZSBzdGF0ZSkKICNpZiBQTEFURk9STShNQUMpCiAgICAgaWYgKGRpc3BsYXlTdGF0ZSgpID09IFJl c3RhcnRpbmdXaXRoUGVuZGluZ01vdXNlQ2xpY2sgfHwgZGlzcGxheVN0YXRlKCkgPT0gUmVzdGFy dGluZykgewogICAgICAgICBtX3Jlc3RhcnRlZFBsdWdpbiA9IHRydWU7Ci0gICAgICAgIG1fcmVt b3ZlU25hcHNob3RUaW1lci5zdGFydE9uZVNob3QocmVtb3ZlU25hcHNob3RUaW1lckRlbGF5KTsK KyAgICAgICAgaWYgKHByZXZpb3VzRGlzcGxheVN0YXRlID09IERpc3BsYXlpbmdTbmFwc2hvdCkK KyAgICAgICAgICAgIG1fcmVtb3ZlU25hcHNob3RUaW1lci5zdGFydE9uZVNob3QocmVtb3ZlU25h cHNob3RUaW1lckRlbGF5KTsKICAgICB9CiAjZW5kaWYKIH0KQEAgLTQxNSw3ICs0MTcsOCBAQCB2 b2lkIEhUTUxQbHVnSW5JbWFnZUVsZW1lbnQ6OnJlbW92ZVNuYXBzaG90VGltZXJGaXJlZChUaW1l cjxIVE1MUGx1Z0luSW1hZ2VFbGVtZQogewogICAgIG1fc25hcHNob3RJbWFnZSA9IG51bGxwdHI7 CiAgICAgbV9yZXN0YXJ0ZWRQbHVnaW4gPSBmYWxzZTsKLSAgICByZW5kZXJlcigpLT5yZXBhaW50 KCk7CisgICAgaWYgKHJlbmRlcmVyKCkpCisgICAgICAgIHJlbmRlcmVyKCktPnJlcGFpbnQoKTsK IH0KIAogc3RhdGljIHZvaWQgYWRkUGx1Z0luc0Zyb21Ob2RlTGlzdE1hdGNoaW5nUGx1Z0luT3Jp Z2luKEhUTUxQbHVnSW5JbWFnZUVsZW1lbnRMaXN0JiBwbHVnSW5MaXN0LCBQYXNzUmVmUHRyPE5v ZGVMaXN0PiBjb2xsZWN0aW9uLCBjb25zdCBTdHJpbmcmIHBsdWdJbk9yaWdpbiwgY29uc3QgU3Ry aW5nJiBtaW1lVHlwZSkK 196981 2013-04-08 19:34:31 -0700 2013-04-08 19:35:05 -0700 Build test (with review modifications) bug-114226-20130409123413.patch text/plain 2669 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ3OTYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWE5YzNkMmI3MjI1ZjZh MzhmYTQzMTNiOTI4OTQ0M2VkOWVkMDdmYi4uZWE3OTgxMWMyZGVkYTA5MWFkMmM5NjEwMDc2M2M1 YzkxOTZkZDViYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEzLTA0LTA4ICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KKworICAgICAgICBEb24ndCB0cnkgdG8gcmVtb3Zl IGEgbm9uLWV4aXN0ZW50IHNuYXBzaG90CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMTQyMjYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzEzNjA0NDgw PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIGRv bid0IG5lZWQgdG8gdHJpZ2dlciB0aGUgdGltZXIgdG8gcmVtb3ZlIGEgc25hcHNob3QKKyAgICAg ICAgaWYgdGhlcmUgd2FzIG5ldmVyIGEgc25hcHNob3QgZGlzcGxheWVkLgorCisgICAgICAgICog aHRtbC9IVE1MUGx1Z0luSW1hZ2VFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxQ bHVnSW5JbWFnZUVsZW1lbnQ6OnNldERpc3BsYXlTdGF0ZSk6IERldGVjdCBpZiB3ZSdyZSBtb3Zp bmcgZnJvbSB0aGUgRGlzcGxheWluZ1NuYXBzaG90IHN0YXRlLgorICAgICAgICAoV2ViQ29yZTo6 SFRNTFBsdWdJbkltYWdlRWxlbWVudDo6cmVtb3ZlU25hcHNob3RUaW1lckZpcmVkKTogR3VhcmQg YWdhaW5zdCBhIG1pc3NpbmcgcmVuZGVyZXIuCisKIDIwMTMtMDQtMDggIFRpYW5jaGVuZyBKaWFu ZyAgPHRpamlhbmdAcmltLmNvbT4KIAogICAgICAgICBbQmxhY2tCZXJyeV0gQ2xlYW4gdXAgcmVu ZGVyIHRoZW1lIGNvZGUuIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MUGx1 Z0luSW1hZ2VFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFBsdWdJbkltYWdl RWxlbWVudC5jcHAKaW5kZXggN2JiNmY1Yzc5MGU4MTVhNWViYzg4NGIzMDBiM2M3MjRjOWJlZGI2 OS4uNGU4ZWViMGU2NDE0YTc5ZmU4OTU4M2QxZGMzYzAwYWRhYjgzZjk3NSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaHRtbC9IVE1MUGx1Z0luSW1hZ2VFbGVtZW50LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9odG1sL0hUTUxQbHVnSW5JbWFnZUVsZW1lbnQuY3BwCkBAIC05MywxNiArOTMs MTggQEAgSFRNTFBsdWdJbkltYWdlRWxlbWVudDo6fkhUTUxQbHVnSW5JbWFnZUVsZW1lbnQoKQog CiB2b2lkIEhUTUxQbHVnSW5JbWFnZUVsZW1lbnQ6OnNldERpc3BsYXlTdGF0ZShEaXNwbGF5U3Rh dGUgc3RhdGUpCiB7Ci0gICAgSFRNTFBsdWdJbkVsZW1lbnQ6OnNldERpc3BsYXlTdGF0ZShzdGF0 ZSk7Ci0gICAgaWYgKGRpc3BsYXlTdGF0ZSgpID09IERpc3BsYXlpbmdTbmFwc2hvdCkKLSAgICAg ICAgbV9zd2FwUmVuZGVyZXJUaW1lci5zdGFydE9uZVNob3QoMCk7Ci0KICNpZiBQTEFURk9STShN QUMpCi0gICAgaWYgKGRpc3BsYXlTdGF0ZSgpID09IFJlc3RhcnRpbmdXaXRoUGVuZGluZ01vdXNl Q2xpY2sgfHwgZGlzcGxheVN0YXRlKCkgPT0gUmVzdGFydGluZykgeworICAgIGlmIChzdGF0ZSA9 PSBSZXN0YXJ0aW5nV2l0aFBlbmRpbmdNb3VzZUNsaWNrIHx8IHN0YXRlID09IFJlc3RhcnRpbmcp IHsKICAgICAgICAgbV9yZXN0YXJ0ZWRQbHVnaW4gPSB0cnVlOwotICAgICAgICBtX3JlbW92ZVNu YXBzaG90VGltZXIuc3RhcnRPbmVTaG90KHJlbW92ZVNuYXBzaG90VGltZXJEZWxheSk7CisgICAg ICAgIGlmIChkaXNwbGF5U3RhdGUoKSA9PSBEaXNwbGF5aW5nU25hcHNob3QpCisgICAgICAgICAg ICBtX3JlbW92ZVNuYXBzaG90VGltZXIuc3RhcnRPbmVTaG90KHJlbW92ZVNuYXBzaG90VGltZXJE ZWxheSk7CiAgICAgfQogI2VuZGlmCisKKyAgICBIVE1MUGx1Z0luRWxlbWVudDo6c2V0RGlzcGxh eVN0YXRlKHN0YXRlKTsKKworICAgIGlmIChzdGF0ZSA9PSBEaXNwbGF5aW5nU25hcHNob3QpCisg ICAgICAgIG1fc3dhcFJlbmRlcmVyVGltZXIuc3RhcnRPbmVTaG90KDApOwogfQogCiBSZW5kZXJF bWJlZGRlZE9iamVjdCogSFRNTFBsdWdJbkltYWdlRWxlbWVudDo6cmVuZGVyRW1iZWRkZWRPYmpl Y3QoKSBjb25zdApAQCAtNDE1LDcgKzQxNyw4IEBAIHZvaWQgSFRNTFBsdWdJbkltYWdlRWxlbWVu dDo6cmVtb3ZlU25hcHNob3RUaW1lckZpcmVkKFRpbWVyPEhUTUxQbHVnSW5JbWFnZUVsZW1lCiB7 CiAgICAgbV9zbmFwc2hvdEltYWdlID0gbnVsbHB0cjsKICAgICBtX3Jlc3RhcnRlZFBsdWdpbiA9 IGZhbHNlOwotICAgIHJlbmRlcmVyKCktPnJlcGFpbnQoKTsKKyAgICBpZiAocmVuZGVyZXIoKSkK KyAgICAgICAgcmVuZGVyZXIoKS0+cmVwYWludCgpOwogfQogCiBzdGF0aWMgdm9pZCBhZGRQbHVn SW5zRnJvbU5vZGVMaXN0TWF0Y2hpbmdQbHVnSW5PcmlnaW4oSFRNTFBsdWdJbkltYWdlRWxlbWVu dExpc3QmIHBsdWdJbkxpc3QsIFBhc3NSZWZQdHI8Tm9kZUxpc3Q+IGNvbGxlY3Rpb24sIGNvbnN0 IFN0cmluZyYgcGx1Z0luT3JpZ2luLCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlKQo=