119827 2013-08-14 17:01:34 -0700 Allow primary plug-in detection to run more than once if necessary 2013-08-14 17:44:03 -0700 1 1 1 Unclassified WebKit Plug-ins 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 dino dino thorton webkit-bug-importer oldest_to_newest 917350 0 dino 2013-08-14 17:01:34 -0700 We occasionally see cases where the primary plug-in detection runs before the plugins have been added to the page, especially if they do so in response to a load event. Tweak the algorithm so that it can run an arbitrary number of times if it fails. 917351 1 dino 2013-08-14 17:02:15 -0700 <rdar://problem/14680740> 917352 2 webkit-bug-importer 2013-08-14 17:02:49 -0700 <rdar://problem/14741980> 917354 3 208775 dino 2013-08-14 17:07:33 -0700 Created attachment 208775 Patch 917359 4 208775 thorton 2013-08-14 17:32:17 -0700 Comment on attachment 208775 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=208775&action=review > Source/WebKit2/WebProcess/WebPage/WebPage.h:863 > + bool m_hasSeenPlugin; I'm pretty sure you need to reset this more often than you do. 917361 5 208775 thorton 2013-08-14 17:35:58 -0700 Comment on attachment 208775 Patch r=me with the change you mentioned on IRC to address the above comment 917363 6 dino 2013-08-14 17:40:08 -0700 Change on irc was to add this to resetPrimarySnapshottedPlugIn m_numberOfPrimarySnapshotDetectionAttempts = 0; m_hasSeenPlugin = false; 917367 7 dino 2013-08-14 17:44:03 -0700 Committed r154085: <http://trac.webkit.org/changeset/154085> 208775 2013-08-14 17:07:33 -0700 2013-08-14 17:35:58 -0700 Patch bug-119827-20130815100731.patch text/plain 5869 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMTU0MDc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMzMyMWYwYzNiMTk5MjAw MjQ5OWVjY2MzMmU3NGQ4MzkzMDM3ZTkyNS4uODgwYmY2YmI2ODdhNGQxZGI0NmQ3Y2U1Y2FhOGIz ZGVkMWE0MzhlNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI3IEBACiAyMDEzLTA4LTE0ICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KIAorICAgICAgICA8aHR0cHM6Ly93ZWJraXQub3Jn L2IvMTE5ODI3PiBBbGxvdyBwcmltYXJ5IHBsdWctaW4gZGV0ZWN0aW9uIHRvIHJ1biBtb3JlIHRo YW4gb25jZSBpZiBuZWNlc3NhcnkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBXZSBvY2Nhc2lvbmFsbHkgc2VlIGNhc2VzIHdoZXJlIHRoZSBwcmltYXJ5 IHBsdWctaW4gZGV0ZWN0aW9uIHJ1bnMgYmVmb3JlIHRoZSBwbHVnaW5zIGhhdmUgYmVlbiBhZGRl ZAorICAgICAgICB0byB0aGUgcGFnZSwgZXNwZWNpYWxseSBpZiB0aGV5IGRvIHNvIGluIHJlc3Bv bnNlIHRvIGEgbG9hZCBldmVudC4gVHdlYWsgdGhlIGFsZ29yaXRobSBzbyB0aGF0IGl0IGNhbgor ICAgICAgICBydW4gYW4gYXJiaXRyYXJ5IG51bWJlciBvZiB0aW1lcyBpZiBpdCBmYWlscy4KKwor ICAgICAgICBXaGlsZSBoZXJlLCBhbHNvIGhhdmUgdGhlIGRldGVjdGlvbiBydW4gaWYgdGhlcmUg aGFzIGV2ZXIgYmVlbiBhIHBsdWdpbiBpbiB0aGUgcGFnZSBhcyBvcHBvc2VkIHRvIGFueQorICAg ICAgICBjdXJyZW50IHZpZXdzLiBXZSBtYXkgaGF2ZSBzbmFwc2hvdHRlZCBhIHBsdWdpbiBieSBu b3cgYW5kIGRlbGV0ZWQgaXRzIHZpZXcuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2Uv V2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OldlYlBhZ2UpOiBpbml0aWFs aXNlIG5ldyBtZW1iZXJzLgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjphZGRQbHVnaW5WaWV3 KTogTWFyayB0aGF0IHdlJ3ZlIHNlZW4gYSBwbHVnaW4uCisgICAgICAgIChXZWJLaXQ6OldlYlBh Z2U6OmRldGVybWluZVByaW1hcnlTbmFwc2hvdHRlZFBsdWdJbik6IEV4aXQgZWFybHkgaWYgd2Un dmUgbmV2ZXIKKyAgICAgICAgc2VlbiBhIHBsdWdpbiwgcmF0aGVyIHRoYW4gaWYgd2UgZG9uJ3Qg aGF2ZSBhbnkgYWN0aXZlIHZpZXdzLiBBbHNvLCBpZiB3ZSBkaWRuJ3QgZmluZCBhbnl0aGluZyBz ZXQKKyAgICAgICAgYSB0aW1lciB0byBydW4gYWdhaW4gKG1heGltdW0gb2YgdHdvIGF0dGVtcHRz IGF0IHRoZSBtb21lbnQpLgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmg6 IE5ldyBtZW1iZXJzIC0gbV9udW1iZXJPZlByaW1hcnlTbmFwc2hvdERldGVjdGlvbkF0dGVtcHRz CisgICAgICAgIGFuZCBtX2hhc1NlZW5QbHVnaW4uCisKKzIwMTMtMDgtMTQgIERlYW4gSmFja3Nv biAgPGRpbm9AYXBwbGUuY29tPgorCiAgICAgICAgIDxodHRwczovL3dlYmtpdC5vcmcvYi8xMTk4 MjA+IEFkZCBwbHVnaW5WaWV3LXJlbGF0ZWQgbG9nZ2luZyB0byBXZWJQYWdlCiAKICAgICAgICAg UmV2aWV3ZWQgYnkgVGltIEhvcnRvbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi UGFnZS9XZWJQYWdlLmNwcAppbmRleCA4ZGQ0ZTE1NDYzZWE1YjRhNzU5YzhiODAyNDQ4ZmU0OWNl YzRjZjljLi4zZTNkMTJjNjJjYzExOWVjNzU5NjA1NWMwYmJmODE2ZmNlOTdjMGZiIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKKysrIGIv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCkBAIC0yMjYsNiAr MjI2LDcgQEAgUGFzc1JlZlB0cjxXZWJQYWdlPiBXZWJQYWdlOjpjcmVhdGUodWludDY0X3QgcGFn ZUlELCBjb25zdCBXZWJQYWdlQ3JlYXRpb25QYXJhbWUKIAogV2ViUGFnZTo6V2ViUGFnZSh1aW50 NjRfdCBwYWdlSUQsIGNvbnN0IFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMmIHBhcmFtZXRlcnMp CiAgICAgOiBtX3ZpZXdTaXplKHBhcmFtZXRlcnMudmlld1NpemUpCisgICAgLCBtX2hhc1NlZW5Q bHVnaW4oZmFsc2UpCiAgICAgLCBtX3VzZUZpeGVkTGF5b3V0KGZhbHNlKQogICAgICwgbV9kcmF3 c0JhY2tncm91bmQodHJ1ZSkKICAgICAsIG1fZHJhd3NUcmFuc3BhcmVudEJhY2tncm91bmQoZmFs c2UpCkBAIC0yNDAsNiArMjQxLDcgQEAgV2ViUGFnZTo6V2ViUGFnZSh1aW50NjRfdCBwYWdlSUQs IGNvbnN0IFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMmIHBhcmFtZXRlcnMpCiAjaWYgRU5BQkxF KFBSSU1BUllfU05BUFNIT1RURURfUExVR0lOX0hFVVJJU1RJQykKICAgICAsIG1fcmVhZHlUb0Zp bmRQcmltYXJ5U25hcHNob3R0ZWRQbHVnaW4oZmFsc2UpCiAgICAgLCBtX2RpZEZpbmRQcmltYXJ5 U25hcHNob3R0ZWRQbHVnaW4oZmFsc2UpCisgICAgLCBtX251bWJlck9mUHJpbWFyeVNuYXBzaG90 RGV0ZWN0aW9uQXR0ZW1wdHMoMCkKICAgICAsIG1fZGV0ZXJtaW5lUHJpbWFyeVNuYXBzaG90dGVk UGx1Z0luVGltZXIoUnVuTG9vcDo6bWFpbigpLCB0aGlzLCAmV2ViUGFnZTo6ZGV0ZXJtaW5lUHJp bWFyeVNuYXBzaG90dGVkUGx1Z0luVGltZXJGaXJlZCkKICNlbmRpZgogI2lmIFBMQVRGT1JNKE1B QykKQEAgLTMwNjYsNiArMzA2OCw3IEBAIHZvaWQgV2ViUGFnZTo6YWRkUGx1Z2luVmlldyhQbHVn aW5WaWV3KiBwbHVnaW5WaWV3KQogICAgIEFTU0VSVCghbV9wbHVnaW5WaWV3cy5jb250YWlucyhw bHVnaW5WaWV3KSk7CiAKICAgICBtX3BsdWdpblZpZXdzLmFkZChwbHVnaW5WaWV3KTsKKyAgICBt X2hhc1NlZW5QbHVnaW4gPSB0cnVlOwogI2lmIEVOQUJMRShQUklNQVJZX1NOQVBTSE9UVEVEX1BM VUdJTl9IRVVSSVNUSUMpCiAgICAgTE9HKFBsdWdpbnMsICJQcmltYXJ5IFBsdWctSW4gRGV0ZWN0 aW9uOiB0cmlnZ2VyaW5nIGRldGVjdGlvbiBmcm9tIGFkZFBsdWdpblZpZXcoJXApIiwgcGx1Z2lu Vmlldyk7CiAgICAgbV9kZXRlcm1pbmVQcmltYXJ5U25hcHNob3R0ZWRQbHVnSW5UaW1lci5zdGFy dE9uZVNob3QoMCk7CkBAIC00MDM4LDYgKzQwNDEsOCBAQCBzdGF0aWMgaW50IHByaW1hcnlTbmFw c2hvdHRlZFBsdWdJblNlYXJjaEdhcCA9IDIwMDsKIHN0YXRpYyBmbG9hdCBwcmltYXJ5U25hcHNo b3R0ZWRQbHVnSW5TZWFyY2hCdWNrZXRTaXplID0gMS4xOwogc3RhdGljIGludCBwcmltYXJ5U25h cHNob3R0ZWRQbHVnSW5NaW5pbXVtV2lkdGggPSA0MDA7CiBzdGF0aWMgaW50IHByaW1hcnlTbmFw c2hvdHRlZFBsdWdJbk1pbmltdW1IZWlnaHQgPSAzMDA7CitzdGF0aWMgdW5zaWduZWQgbWF4UHJp bWFyeVNuYXBzaG90dGVkUGx1Z0luRGV0ZWN0aW9uQXR0ZW1wdHMgPSAyOworc3RhdGljIGludCBk ZWZlcnJlZFByaW1hcnlTbmFwc2hvdHRlZFBsdWdJbkRldGVjdGlvbkRlbGF5ID0gMzsKIAogI2lm IEVOQUJMRShQUklNQVJZX1NOQVBTSE9UVEVEX1BMVUdJTl9IRVVSSVNUSUMpCiB2b2lkIFdlYlBh Z2U6OmRldGVybWluZVByaW1hcnlTbmFwc2hvdHRlZFBsdWdJblRpbWVyRmlyZWQoKQpAQCAtNDA2 Myw4ICs0MDY4LDggQEAgdm9pZCBXZWJQYWdlOjpkZXRlcm1pbmVQcmltYXJ5U25hcHNob3R0ZWRQ bHVnSW4oKQogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgaWYgKG1fcGx1Z2luVmlld3Mu aXNFbXB0eSgpKSB7Ci0gICAgICAgIExPRyhQbHVnaW5zLCAiUHJpbWFyeSBQbHVnLUluIERldGVj dGlvbjogZXhpdGluZyAtIG5vIHBsdWdpbiB2aWV3cy4iKTsKKyAgICBpZiAoIW1faGFzU2VlblBs dWdpbikgeworICAgICAgICBMT0coUGx1Z2lucywgIlByaW1hcnkgUGx1Zy1JbiBEZXRlY3Rpb246 IGV4aXRpbmcgLSB3ZSBuZXZlciBzYXcgYSBwbHVnLWluIGdldCBhZGRlZCB0byB0aGUgcGFnZS4i KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtNDA3Myw2ICs0MDc4LDggQEAgdm9pZCBX ZWJQYWdlOjpkZXRlcm1pbmVQcmltYXJ5U25hcHNob3R0ZWRQbHVnSW4oKQogICAgICAgICByZXR1 cm47CiAgICAgfQogCisgICAgKyttX251bWJlck9mUHJpbWFyeVNuYXBzaG90RGV0ZWN0aW9uQXR0 ZW1wdHM7CisKICAgICBSZW5kZXJWaWV3KiByZW5kZXJWaWV3ID0gY29yZVBhZ2UoKS0+bWFpbkZy YW1lKCktPnZpZXcoKS0+cmVuZGVyVmlldygpOwogCiAgICAgSW50UmVjdCBzZWFyY2hSZWN0ID0g SW50UmVjdChJbnRQb2ludCgpLCBjb3JlUGFnZSgpLT5tYWluRnJhbWUoKS0+dmlldygpLT5jb250 ZW50c1NpemUoKSk7CkBAIC00MTI4LDYgKzQxMzUsMTAgQEAgdm9pZCBXZWJQYWdlOjpkZXRlcm1p bmVQcmltYXJ5U25hcHNob3R0ZWRQbHVnSW4oKQogCiAgICAgaWYgKCFjYW5kaWRhdGVQbHVnSW4p IHsKICAgICAgICAgTE9HKFBsdWdpbnMsICJQcmltYXJ5IFBsdWctSW4gRGV0ZWN0aW9uOiBmYWls IC0gZGlkIG5vdCBmaW5kIGEgY2FuZGlkYXRlIHBsdWctaW4uIik7CisgICAgICAgIGlmIChtX251 bWJlck9mUHJpbWFyeVNuYXBzaG90RGV0ZWN0aW9uQXR0ZW1wdHMgPCBtYXhQcmltYXJ5U25hcHNo b3R0ZWRQbHVnSW5EZXRlY3Rpb25BdHRlbXB0cykgeworICAgICAgICAgICAgTE9HKFBsdWdpbnMs ICJQcmltYXJ5IFBsdWctSW4gRGV0ZWN0aW9uOiB3aWxsIGF0dGVtcHQgYWdhaW4gaW4gJWRzLiIs IGRlZmVycmVkUHJpbWFyeVNuYXBzaG90dGVkUGx1Z0luRGV0ZWN0aW9uRGVsYXkpOworICAgICAg ICAgICAgbV9kZXRlcm1pbmVQcmltYXJ5U25hcHNob3R0ZWRQbHVnSW5UaW1lci5zdGFydE9uZVNo b3QoZGVmZXJyZWRQcmltYXJ5U25hcHNob3R0ZWRQbHVnSW5EZXRlY3Rpb25EZWxheSk7CisgICAg ICAgIH0KICAgICAgICAgcmV0dXJuOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9XZWJQYWdlLmgKaW5kZXggMWRjMTI0OTlhNDMyNzhiNGUyYjhjZDZjYjIwOTE4 ZThiOTJkN2NlMS4uNGIzYTVjZmQ3YWIzYjg5OTIxMTdjNWZkMTZlYzEwNjU3OTdiZDAwNSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCkBAIC04NjAsNiAr ODYwLDcgQEAgcHJpdmF0ZToKICAgICBPd25QdHI8RHJhd2luZ0FyZWE+IG1fZHJhd2luZ0FyZWE7 CiAKICAgICBIYXNoU2V0PFBsdWdpblZpZXcqPiBtX3BsdWdpblZpZXdzOworICAgIGJvb2wgbV9o YXNTZWVuUGx1Z2luOwogCiAgICAgSGFzaE1hcDx1aW50NjRfdCwgUmVmUHRyPFdlYkNvcmU6OlRl eHRDaGVja2luZ1JlcXVlc3Q+PiBtX3BlbmRpbmdUZXh0Q2hlY2tpbmdSZXF1ZXN0TWFwOwogCkBA IC04ODYsNiArODg3LDcgQEAgcHJpdmF0ZToKICNpZiBFTkFCTEUoUFJJTUFSWV9TTkFQU0hPVFRF RF9QTFVHSU5fSEVVUklTVElDKQogICAgIGJvb2wgbV9yZWFkeVRvRmluZFByaW1hcnlTbmFwc2hv dHRlZFBsdWdpbjsKICAgICBib29sIG1fZGlkRmluZFByaW1hcnlTbmFwc2hvdHRlZFBsdWdpbjsK KyAgICB1bnNpZ25lZCBtX251bWJlck9mUHJpbWFyeVNuYXBzaG90RGV0ZWN0aW9uQXR0ZW1wdHM7 CiAgICAgU3RyaW5nIG1fcHJpbWFyeVBsdWdJblBhZ2VPcmlnaW47CiAgICAgU3RyaW5nIG1fcHJp bWFyeVBsdWdJbk9yaWdpbjsKICAgICBTdHJpbmcgbV9wcmltYXJ5UGx1Z0luTWltZVR5cGU7Cg==