111975 2013-03-11 04:56:21 -0700 Plugins created during user gestures (or soon after) should not be snapshotted 2013-03-12 11:12:11 -0700 1 1 1 Unclassified WebKit Plug-ins 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 dino dino dglazkov esprehn+autocc jamesr ojan.autocc peter+ews thorton webkit.review.bot oldest_to_newest 852197 0 dino 2013-03-11 04:56:21 -0700 There are many sites which create plugins in response to user actions, such as clicking on a poster frame. We should make sure that we never snapshot in that case. It's not quite so simple though, because sometimes the user action inserts an iframe that loads the plugin, meaning the action and the plugin creation are separate events. The suggested solution is to "bless" all plugins that were created within a few seconds of a user gesture. 852198 1 dino 2013-03-11 04:56:46 -0700 <rdar://problem/13232172> 852300 2 192468 dino 2013-03-11 07:42:52 -0700 Created attachment 192468 Patch 852315 3 192468 webkit.review.bot 2013-03-11 08:08:28 -0700 Comment on attachment 192468 Patch Attachment 192468 did not pass chromium-ews (chromium-xvfb): Output: http://webkit-commit-queue.appspot.com/results/17134207 852331 4 192468 webkit.review.bot 2013-03-11 08:20:55 -0700 Comment on attachment 192468 Patch Attachment 192468 did not pass cr-linux-debug-ews (chromium-xvfb): Output: http://webkit-commit-queue.appspot.com/results/17149143 852344 5 192468 peter+ews 2013-03-11 08:28:55 -0700 Comment on attachment 192468 Patch Attachment 192468 did not pass cr-android-ews (chromium-android): Output: http://webkit-commit-queue.appspot.com/results/17169149 852724 6 192559 dino 2013-03-11 14:22:21 -0700 Created attachment 192559 Patch 852813 7 192559 peter+ews 2013-03-11 15:44:43 -0700 Comment on attachment 192559 Patch Attachment 192559 did not pass cr-android-ews (chromium-android): Output: http://webkit-commit-queue.appspot.com/results/17177331 852815 8 dino 2013-03-11 15:54:52 -0700 Committed r145421: <http://trac.webkit.org/changeset/145421> 852851 9 jamesr 2013-03-11 16:23:41 -0700 (In reply to comment #8) > Committed r145421: <http://trac.webkit.org/changeset/145421> This doesn't compile on any chromium port (and probably others) since it adds a reference to currentTime() without #include'ing <wtf/CurrentTime.h>. The EWS bots all pointed out this compile failure - can I ask why you committed anyway without addressing it? 852852 10 thorton 2013-03-11 16:26:09 -0700 (In reply to comment #9) > (In reply to comment #8) > > Committed r145421: <http://trac.webkit.org/changeset/145421> > > This doesn't compile on any chromium port (and probably others) since it adds a reference to currentTime() without #include'ing <wtf/CurrentTime.h>. The EWS bots all pointed out this compile failure - can I ask why you committed anyway without addressing it? I'm going to guess he thought that the delta between the two patches would fix the build failures on chromium (it didn't). Even now, the second patch hasn't made it through any of the chromium EWS bots, and is green/yellow across the board. 853637 11 dino 2013-03-12 11:12:11 -0700 (In reply to comment #9) > (In reply to comment #8) > > Committed r145421: <http://trac.webkit.org/changeset/145421> > > This doesn't compile on any chromium port (and probably others) since it adds a reference to currentTime() without #include'ing <wtf/CurrentTime.h>. The EWS bots all pointed out this compile failure - can I ask why you committed anyway without addressing it? Sorry, I screwed up badly. As Tim suggested, I thought that the issue was it being included from somewhere that hadn't defined currentTime, but I was too stupid to check that it was included when I moved it to the cpp file :( 192468 2013-03-11 07:42:52 -0700 2013-03-11 14:22:16 -0700 Patch bug-111975-20130312013851.patch text/plain 8704 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1MzIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWQ4NjkwNTU4OTVlZmE5 MGE5YWI4NWNkMjhlZDBiYjA2MzU4MTQzNS4uODgyNTI2NmFhOWIxZGZjMzJhMWU1ZTI3MGFkOTM2 MTJmOWMzODk0NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQyIEBACisyMDEzLTAzLTExICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KKworICAgICAgICBQbHVnaW5zIGNyZWF0ZWQgZHVy aW5nIHVzZXIgZ2VzdHVyZXMgKG9yIHNvb24gYWZ0ZXIpIHNob3VsZCBub3QgYmUgc25hcHNob3R0 ZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMTk3 NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZXJl IGFyZSBzaXRlcyB3aGljaCBjcmVhdGUgcGx1Z2lucyBpbiByZXNwb25zZSB0byB1c2VyIGFjdGlv bnMsIHN1Y2ggYXMgY2xpY2tpbmcKKyAgICAgICAgb24gYW4gaW1hZ2UgdGhhdCBpcyBhY3Rpbmcg bGlrZSBhIHBvc3RlciBmcmFtZS4gSW4gdGhvc2UgY2FzZXMgd2Ugc2hvdWxkIG5ldmVyIHNuYXBz aG90LgorCisgICAgICAgIFRoZXJlIGFyZSBzb21lIG90aGVyIHNpdGVzIHdoaWNoIGFsc28gY3Jl YXRlIHBsdWdpbnMgaW4gcmVzcG9uc2UgdG8gdXNlciBhY3Rpb25zLAorICAgICAgICBidXQgZG9u J3QgbmVjZXNzYXJpbHkgY3JlYXRlIHRoZSBjb250ZW50IHRoZW1zZWx2ZXMuIEluc3RlYWQgdGhl eSBydW4gc29tZSBzY3JpcHQKKyAgICAgICAgdGhhdCBpbmplY3RzIGFuIGlmcmFtZSwgYW5kIHRo ZSBmcmFtZSBsb2FkcyBhIHBsdWdpbi4gSW4gb3JkZXIgdG8gbWFrZSBzdXJlIHdlIGRvbid0Cisg ICAgICAgIHNuYXBzaG90IGluIHRob3NlIGNhc2VzLCB3ZSdyZSBhZGRpbmcgdGhlIGNvbmNlcHQg b2YgYSBibGVzc2VkIHBsdWdpbi4gQW55dGhpbmcgdGhhdAorICAgICAgICBpcyBjcmVhdGVkIHNv b24gYWZ0ZXIgYSAqaGFuZGxlZCogdXNlciBnZXN0dXJlIGlzIG5vdCBzbmFwc2hvdHRlZC4gVG8g ZG8gdGhpcyB3ZQorICAgICAgICBtYXJrIGEgdGltZXN0YW1wIGluIHRoZSBkb2N1bWVudCB3aGVu IHdlJ3ZlIGNhbGxlZCBhbiBldmVudCBsaXN0ZW5lciBmb3IgYSB1c2VyCisgICAgICAgIGdlc3R1 cmUuIFRoZSBwbHVnaW4gZWxlbWVudCB0aGVuIGNvbXBhcmVzIGl0cyBjcmVhdGlvbiB0aW1lIHdp dGggdGhlIG1vc3QgcmVjZW50CisgICAgICAgIHVzZXIgYWN0aW9uIHRpbWUuCisKKyAgICAgICAg KiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OkRvY3VtZW50 KTogSW5pdGlhbGlzZSBuZXcgdGltZXN0YW1wLgorICAgICAgICAqIGRvbS9Eb2N1bWVudC5oOgor ICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6Omxhc3RIYW5kbGVkVXNlckdlc3R1cmVUaW1lc3Rh bXApOiBHZXR0ZXIuCisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6cmVzZXRMYXN0SGFuZGxl ZFVzZXJHZXN0dXJlVGltZXN0YW1wKTogU2V0cyB0aGUgbWVtYmVyIHZhcmlhYmxlCisgICAgICAg ICAgICB0byB0aGUgY3VycmVudCB0aW1lLgorCisgICAgICAgICogZG9tL0V2ZW50VGFyZ2V0LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50VGFyZ2V0OjpmaXJlRXZlbnRMaXN0ZW5lcnMpOiBJ ZiB0aGVyZSB3ZXJlIHNvbWUgZXZlbnQgbGlzdGVuZXJzIGFuZAorICAgICAgICAgICAgd2Ugd2Vy ZSBwcm9jZXNzaW5nIGEgdXNlciBnZXN0dXJlLCB0aGVuIHJlc2V0IHRoZSB0aW1lc3RhbXAgaW4g dGhlIGRvY3VtZW50LgorCisgICAgICAgICogaHRtbC9IVE1MUGx1Z0luSW1hZ2VFbGVtZW50LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxQbHVnSW5JbWFnZUVsZW1lbnQ6OkhUTUxQbHVnSW5J bWFnZUVsZW1lbnQpOiBSZW1lbWJlciBpZiB3ZSB3ZXJlIGNyZWF0ZWQKKyAgICAgICAgICAgIGR1 cmluZyBhIHVzZXIgZ2VzdHVyZS4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxQbHVnSW5JbWFnZUVs ZW1lbnQ6OnN1YmZyYW1lTG9hZGVyV2lsbENyZWF0ZVBsdWdJbik6IFN0YXJ0IHRoZSBwbHVnaW4K KyAgICAgICAgICAgIGlmIHdlIHdlcmUgY3JlYXRlZCBkdXJpbmcgYSB1c2VyIGdlc3R1cmUsIG9y IGlmIHdlIGFyZSBjbG9zZSBlbm91Z2ggaW4gdGltZQorICAgICAgICAgICAgdG8gYSBsaXN0ZW5l ciB0aGF0IGZpcmVkIGluIHJlbGF0aW9uIHRvIGEgdXNlciBnZXN0dXJlLgorICAgICAgICAqIGh0 bWwvSFRNTFBsdWdJbkltYWdlRWxlbWVudC5oOiBOZXcgcHJpdmF0ZSBtZW1iZXIgZmxhZyBpbmRp Y2F0aW5nIGlmIHdlIHdlcmUKKyAgICAgICAgICAgIGluIGEgdXNlciBnZXN0dXJlIHdoZW4gY29u c3RydWN0ZWQuCisKIDIwMTMtMDMtMDkgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBhcHBs ZS5jb20+CiAKICAgICAgICAgVmlkZW8gc2l6ZSBjYWxjdWxhdGVkIGluY29ycmVjdGx5IHdoZW4g UExVR0lOX1BST1hZX0ZPUl9WSURFTwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0Rv Y3VtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKaW5kZXggMjZmMWNk YmRkODE4OTMyOWQ4MGI0MTNkNDllYzc5Njk2MjA3NjQwZi4uNjU2MmJiNjAzMjgxODNiMjVhMjBk ZTdiYzIyYjFiODFmN2NiMGQzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3Vt ZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCkBAIC00NzYsNiAr NDc2LDcgQEAgRG9jdW1lbnQ6OkRvY3VtZW50KEZyYW1lKiBmcmFtZSwgY29uc3QgS1VSTCYgdXJs LCBib29sIGlzWEhUTUwsIGJvb2wgaXNIVE1MKQogICAgICwgbV93cml0ZVJlY3Vyc2lvbklzVG9v RGVlcChmYWxzZSkKICAgICAsIG1fd3JpdGVSZWN1cnNpb25EZXB0aCgwKQogICAgICwgbV93aGVl bEV2ZW50SGFuZGxlckNvdW50KDApCisgICAgLCBtX2xhc3RIYW5kbGVkVXNlckdlc3R1cmVUaW1l c3RhbXAoMCkKICAgICAsIG1fcGVuZGluZ1Rhc2tzVGltZXIodGhpcywgJkRvY3VtZW50OjpwZW5k aW5nVGFza3NUaW1lckZpcmVkKQogICAgICwgbV9zY2hlZHVsZWRUYXNrc0FyZVN1c3BlbmRlZChm YWxzZSkKICAgICAsIG1fdmlzdWFsVXBkYXRlc0FsbG93ZWQodHJ1ZSkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50 LmgKaW5kZXggMWVmMDMzODUwMzdlODMwYjgwNWFkODA0MGJjYzY4YTMwNzlmYTBiZi4uM2Q5YzU4 NTMwMDJhNTVkMzg1ODY4YjYwMjQ1OTdlM2RkYWY0Y2IxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvZG9tL0RvY3VtZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmgK QEAgLTExMDEsNiArMTEwMSw5IEBAIHB1YmxpYzoKICAgICB2b2lkIGRpZEFkZFdoZWVsRXZlbnRI YW5kbGVyKCk7CiAgICAgdm9pZCBkaWRSZW1vdmVXaGVlbEV2ZW50SGFuZGxlcigpOwogCisgICAg ZG91YmxlIGxhc3RIYW5kbGVkVXNlckdlc3R1cmVUaW1lc3RhbXAoKSBjb25zdCB7IHJldHVybiBt X2xhc3RIYW5kbGVkVXNlckdlc3R1cmVUaW1lc3RhbXA7IH0KKyAgICB2b2lkIHJlc2V0TGFzdEhh bmRsZWRVc2VyR2VzdHVyZVRpbWVzdGFtcCgpIHsgbV9sYXN0SGFuZGxlZFVzZXJHZXN0dXJlVGlt ZXN0YW1wID0gY3VycmVudFRpbWUoKTsgfQorCiAjaWYgRU5BQkxFKFRPVUNIX0VWRU5UUykKICAg ICBib29sIGhhc1RvdWNoRXZlbnRIYW5kbGVycygpIGNvbnN0IHsgcmV0dXJuIChtX3RvdWNoRXZl bnRUYXJnZXRzLmdldCgpKSA/IG1fdG91Y2hFdmVudFRhcmdldHMtPnNpemUoKSA6IGZhbHNlOyB9 CiAjZWxzZQpAQCAtMTUxMiw2ICsxNTE1LDggQEAgcHJpdmF0ZToKICAgICBPd25QdHI8VG91Y2hF dmVudFRhcmdldFNldD4gbV90b3VjaEV2ZW50VGFyZ2V0czsKICNlbmRpZgogCisgICAgZG91Ymxl IG1fbGFzdEhhbmRsZWRVc2VyR2VzdHVyZVRpbWVzdGFtcDsKKwogI2lmIEVOQUJMRShSRVFVRVNU X0FOSU1BVElPTl9GUkFNRSkKICAgICBSZWZQdHI8U2NyaXB0ZWRBbmltYXRpb25Db250cm9sbGVy PiBtX3NjcmlwdGVkQW5pbWF0aW9uQ29udHJvbGxlcjsKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvZG9tL0V2ZW50VGFyZ2V0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FdmVu dFRhcmdldC5jcHAKaW5kZXggZDBhZDUyMGQ0NGQxZDhhYzg3ZmVmNzA4NzYzNjU4NTY2ZjZhYzky YS4uYzExZDIwZjEyZGEzZWJkYjYwZGU3OWFhMGE5MDg0OGRmYjUwN2QxNyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvZG9tL0V2ZW50VGFyZ2V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9k b20vRXZlbnRUYXJnZXQuY3BwCkBAIC0yMzIsNiArMjMyLDcgQEAgdm9pZCBFdmVudFRhcmdldDo6 ZmlyZUV2ZW50TGlzdGVuZXJzKEV2ZW50KiBldmVudCwgRXZlbnRUYXJnZXREYXRhKiBkLCBFdmVu dExpc3QKICAgICAvLyBkaXNwYXRjaC4gQ29udmVuaWVudGx5LCBhbGwgbmV3IGV2ZW50IGxpc3Rl bmVycyB3aWxsIGJlIGFkZGVkIGFmdGVyICdlbmQnLAogICAgIC8vIHNvIGl0ZXJhdGluZyB0byAn ZW5kJyBuYXR1cmFsbHkgZXhjbHVkZXMgbmV3IGV2ZW50IGxpc3RlbmVycy4KIAorICAgIGJvb2wg dXNlckV2ZW50V2FzSGFuZGxlZCA9IGZhbHNlOwogICAgIHNpemVfdCBpID0gMDsKICAgICBzaXpl X3QgZW5kID0gZW50cnkuc2l6ZSgpOwogICAgIGlmICghZC0+ZmlyaW5nRXZlbnRJdGVyYXRvcnMp CkBAIC0yNTQsOSArMjU1LDE4IEBAIHZvaWQgRXZlbnRUYXJnZXQ6OmZpcmVFdmVudExpc3RlbmVy cyhFdmVudCogZXZlbnQsIEV2ZW50VGFyZ2V0RGF0YSogZCwgRXZlbnRMaXN0CiAgICAgICAgIC8v IFRvIG1hdGNoIE1vemlsbGEsIHRoZSBBVF9UQVJHRVQgcGhhc2UgZmlyZXMgYm90aCBjYXB0dXJp bmcgYW5kIGJ1YmJsaW5nCiAgICAgICAgIC8vIGV2ZW50IGxpc3RlbmVycywgZXZlbiB0aG91Z2gg dGhhdCB2aW9sYXRlcyBzb21lIHZlcnNpb25zIG9mIHRoZSBET00gc3BlYy4KICAgICAgICAgcmVn aXN0ZXJlZExpc3RlbmVyLmxpc3RlbmVyLT5oYW5kbGVFdmVudChjb250ZXh0LCBldmVudCk7Cisg ICAgICAgIGlmICghdXNlckV2ZW50V2FzSGFuZGxlZCAmJiBTY3JpcHRDb250cm9sbGVyOjpwcm9j ZXNzaW5nVXNlckdlc3R1cmUoKSkKKyAgICAgICAgICAgIHVzZXJFdmVudFdhc0hhbmRsZWQgPSB0 cnVlOwogICAgICAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZEhhbmRsZUV2ZW50KGNv b2tpZSk7CiAgICAgfQogICAgIGQtPmZpcmluZ0V2ZW50SXRlcmF0b3JzLT5yZW1vdmVMYXN0KCk7 CisgICAgaWYgKHVzZXJFdmVudFdhc0hhbmRsZWQpIHsKKyAgICAgICAgU2NyaXB0RXhlY3V0aW9u Q29udGV4dCogY29udGV4dCA9IHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKTsKKyAgICAgICAgaWYg KGNvbnRleHQgJiYgY29udGV4dC0+aXNEb2N1bWVudCgpKSB7CisgICAgICAgICAgICBEb2N1bWVu dCogZG9jdW1lbnQgPSBzdGF0aWNfY2FzdDxEb2N1bWVudCo+KGNvbnRleHQpOworICAgICAgICAg ICAgZG9jdW1lbnQtPnJlc2V0TGFzdEhhbmRsZWRVc2VyR2VzdHVyZVRpbWVzdGFtcCgpOworICAg ICAgICB9CisgICAgfQogfQogCiBjb25zdCBFdmVudExpc3RlbmVyVmVjdG9yJiBFdmVudFRhcmdl dDo6Z2V0RXZlbnRMaXN0ZW5lcnMoY29uc3QgQXRvbWljU3RyaW5nJiBldmVudFR5cGUpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxQbHVnSW5JbWFnZUVsZW1lbnQuY3BwIGIv U291cmNlL1dlYkNvcmUvaHRtbC9IVE1MUGx1Z0luSW1hZ2VFbGVtZW50LmNwcAppbmRleCAwNzE4 ZGYwMWUyNmRlNDk3YmUxY2ZiYTA4NTY0MzE1NTFiYmEyYTcyLi5jY2U1Y2M4YzViM2JhOWZkY2I0 MmFjNzI2YjIzZGU1NWE5MjJmMjFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hU TUxQbHVnSW5JbWFnZUVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFBs dWdJbkltYWdlRWxlbWVudC5jcHAKQEAgLTU4LDYgKzU4LDcgQEAgc3RhdGljIGNvbnN0IGludCBz aXppbmdTbWFsbFdpZHRoVGhyZXNob2xkID0gMjUwOwogc3RhdGljIGNvbnN0IGludCBzaXppbmdN ZWRpdW1XaWR0aFRocmVzaG9sZCA9IDQ1MDsKIHN0YXRpYyBjb25zdCBpbnQgc2l6aW5nTWVkaXVt SGVpZ2h0VGhyZXNob2xkID0gMzAwOwogc3RhdGljIGNvbnN0IGZsb2F0IHNpemluZ0Z1bGxQYWdl QXJlYVJhdGlvVGhyZXNob2xkID0gMC45NjsKK3N0YXRpYyBjb25zdCBmbG9hdCBhdXRvc3RhcnRT b29uQWZ0ZXJVc2VyR2VzdHVyZVRocmVzaG9sZCA9IDUuMDsKIAogLy8gVGhpcyBkZWxheSBzaG91 bGQgbm90IGV4Y2VlZCB0aGUgc25hcHNob3QgZGVsYXkgaW4gUGx1Z2luVmlldy5jcHAKIHN0YXRp YyBjb25zdCBkb3VibGUgc2ltdWxhdGVkTW91c2VDbGlja1RpbWVyRGVsYXkgPSAuNzU7CkBAIC03 Myw2ICs3NCw3IEBAIEhUTUxQbHVnSW5JbWFnZUVsZW1lbnQ6OkhUTUxQbHVnSW5JbWFnZUVsZW1l bnQoY29uc3QgUXVhbGlmaWVkTmFtZSYgdGFnTmFtZSwgRG9jCiAgICAgLCBtX25lZWRzRG9jdW1l bnRBY3RpdmF0aW9uQ2FsbGJhY2tzKGZhbHNlKQogICAgICwgbV9zaW11bGF0ZWRNb3VzZUNsaWNr VGltZXIodGhpcywgJkhUTUxQbHVnSW5JbWFnZUVsZW1lbnQ6OnNpbXVsYXRlZE1vdXNlQ2xpY2tU aW1lckZpcmVkLCBzaW11bGF0ZWRNb3VzZUNsaWNrVGltZXJEZWxheSkKICAgICAsIG1fc3dhcFJl bmRlcmVyVGltZXIodGhpcywgJkhUTUxQbHVnSW5JbWFnZUVsZW1lbnQ6OnN3YXBSZW5kZXJlclRp bWVyRmlyZWQpCisgICAgLCBtX2NyZWF0ZWREdXJpbmdVc2VyR2VzdHVyZShTY3JpcHRDb250cm9s bGVyOjpwcm9jZXNzaW5nVXNlckdlc3R1cmUoKSkKIHsKICAgICBzZXRIYXNDdXN0b21TdHlsZUNh bGxiYWNrcygpOwogfQpAQCAtNDM1LDYgKzQzNywxOSBAQCB2b2lkIEhUTUxQbHVnSW5JbWFnZUVs ZW1lbnQ6OnN1YmZyYW1lTG9hZGVyV2lsbENyZWF0ZVBsdWdJbihjb25zdCBLVVJMJiB1cmwpCiAg ICAgICAgIHJldHVybjsKICAgICB9CiAKKyAgICBpZiAobV9jcmVhdGVkRHVyaW5nVXNlckdlc3R1 cmUpIHsKKyAgICAgICAgTE9HKFBsdWdpbnMsICIlcCBQbHVnLWluIHdhcyBjcmVhdGVkIHdoZW4g cHJvY2Vzc2luZyB1c2VyIGdlc3R1cmUsIHNldCB0byBwbGF5IiwgdGhpcyk7CisgICAgICAgIHJl dHVybjsKKyAgICB9CisKKyAgICBkb3VibGUgbGFzdEtub3duVXNlckdlc3R1cmVUaW1lc3RhbXAg PSBkb2N1bWVudCgpLT5sYXN0SGFuZGxlZFVzZXJHZXN0dXJlVGltZXN0YW1wKCk7CisgICAgaWYg KCFpbk1haW5GcmFtZSAmJiBkb2N1bWVudCgpLT5wYWdlKCktPm1haW5GcmFtZSgpICYmIGRvY3Vt ZW50KCktPnBhZ2UoKS0+bWFpbkZyYW1lKCktPmRvY3VtZW50KCkpCisgICAgICAgIGxhc3RLbm93 blVzZXJHZXN0dXJlVGltZXN0YW1wID0gc3RkOjptYXgobGFzdEtub3duVXNlckdlc3R1cmVUaW1l c3RhbXAsIGRvY3VtZW50KCktPnBhZ2UoKS0+bWFpbkZyYW1lKCktPmRvY3VtZW50KCktPmxhc3RI YW5kbGVkVXNlckdlc3R1cmVUaW1lc3RhbXAoKSk7CisgICAgaWYgKGN1cnJlbnRUaW1lKCkgLSBs YXN0S25vd25Vc2VyR2VzdHVyZVRpbWVzdGFtcCA8IGF1dG9zdGFydFNvb25BZnRlclVzZXJHZXN0 dXJlVGhyZXNob2xkKSB7CisgICAgICAgIExPRyhQbHVnaW5zLCAiJXAgUGx1Zy1pbiB3YXMgY3Jl YXRlZCBzaG9ydGx5IGFmdGVyIGEgdXNlciBnZXN0dXJlLCBzZXQgdG8gcGxheSIsIHRoaXMpOwor ICAgICAgICByZXR1cm47CisgICAgfQorCiAgICAgUmVuZGVyQm94KiByZW5kZXJFbWJlZGRlZE9i amVjdCA9IHRvUmVuZGVyQm94KHJlbmRlcmVyKCkpOwogICAgIExlbmd0aCBzdHlsZVdpZHRoID0g cmVuZGVyRW1iZWRkZWRPYmplY3QtPnN0eWxlKCktPndpZHRoKCk7CiAgICAgTGVuZ3RoIHN0eWxl SGVpZ2h0ID0gcmVuZGVyRW1iZWRkZWRPYmplY3QtPnN0eWxlKCktPmhlaWdodCgpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MUGx1Z0luSW1hZ2VFbGVtZW50LmggYi9Tb3Vy Y2UvV2ViQ29yZS9odG1sL0hUTUxQbHVnSW5JbWFnZUVsZW1lbnQuaAppbmRleCBiNTBkNTNhODNj NDMzNjk4YzY2OGVkOTU2NWI0NjFhMDYyOWZlNzFjLi42YTMzNGU1N2ExZDRhNTBlY2FlMGQ1NWM4 NDIyNzQ4MWQwYjI0YTU2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxQbHVn SW5JbWFnZUVsZW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxQbHVnSW5JbWFn ZUVsZW1lbnQuaApAQCAtMTIyLDYgKzEyMiw3IEBAIHByaXZhdGU6CiAgICAgRGVmZXJyYWJsZU9u ZVNob3RUaW1lcjxIVE1MUGx1Z0luSW1hZ2VFbGVtZW50PiBtX3NpbXVsYXRlZE1vdXNlQ2xpY2tU aW1lcjsKICAgICBUaW1lcjxIVE1MUGx1Z0luSW1hZ2VFbGVtZW50PiBtX3N3YXBSZW5kZXJlclRp bWVyOwogICAgIFJlZlB0cjxJbWFnZT4gbV9zbmFwc2hvdEltYWdlOworICAgIGJvb2wgbV9jcmVh dGVkRHVyaW5nVXNlckdlc3R1cmU7CiB9OwogCiBpbmxpbmUgSFRNTFBsdWdJbkltYWdlRWxlbWVu dCogdG9IVE1MUGx1Z0luSW1hZ2VFbGVtZW50KE5vZGUqIG5vZGUpCg== 192559 2013-03-11 14:22:21 -0700 2013-03-11 15:44:43 -0700 Patch bug-111975-20130312081819.patch text/plain 8969 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1MzIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWQ4NjkwNTU4OTVlZmE5 MGE5YWI4NWNkMjhlZDBiYjA2MzU4MTQzNS4uZTViOTYyY2EwYTdiZTM5ZDg4MzA3NDQyMDIzMWFm NmUxZjM5NTE3YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQyIEBACisyMDEzLTAzLTExICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KKworICAgICAgICBQbHVnaW5zIGNyZWF0ZWQgZHVy aW5nIHVzZXIgZ2VzdHVyZXMgKG9yIHNvb24gYWZ0ZXIpIHNob3VsZCBub3QgYmUgc25hcHNob3R0 ZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMTk3 NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZXJl IGFyZSBzaXRlcyB3aGljaCBjcmVhdGUgcGx1Z2lucyBpbiByZXNwb25zZSB0byB1c2VyIGFjdGlv bnMsIHN1Y2ggYXMgY2xpY2tpbmcKKyAgICAgICAgb24gYW4gaW1hZ2UgdGhhdCBpcyBhY3Rpbmcg bGlrZSBhIHBvc3RlciBmcmFtZS4gSW4gdGhvc2UgY2FzZXMgd2Ugc2hvdWxkIG5ldmVyIHNuYXBz aG90LgorCisgICAgICAgIFRoZXJlIGFyZSBzb21lIG90aGVyIHNpdGVzIHdoaWNoIGFsc28gY3Jl YXRlIHBsdWdpbnMgaW4gcmVzcG9uc2UgdG8gdXNlciBhY3Rpb25zLAorICAgICAgICBidXQgZG9u J3QgbmVjZXNzYXJpbHkgY3JlYXRlIHRoZSBjb250ZW50IHRoZW1zZWx2ZXMuIEluc3RlYWQgdGhl eSBydW4gc29tZSBzY3JpcHQKKyAgICAgICAgdGhhdCBpbmplY3RzIGFuIGlmcmFtZSwgYW5kIHRo ZSBmcmFtZSBsb2FkcyBhIHBsdWdpbi4gSW4gb3JkZXIgdG8gbWFrZSBzdXJlIHdlIGRvbid0Cisg ICAgICAgIHNuYXBzaG90IGluIHRob3NlIGNhc2VzLCB3ZSdyZSBhZGRpbmcgdGhlIGNvbmNlcHQg b2YgYSBibGVzc2VkIHBsdWdpbi4gQW55dGhpbmcgdGhhdAorICAgICAgICBpcyBjcmVhdGVkIHNv b24gYWZ0ZXIgYSAqaGFuZGxlZCogdXNlciBnZXN0dXJlIGlzIG5vdCBzbmFwc2hvdHRlZC4gVG8g ZG8gdGhpcyB3ZQorICAgICAgICBtYXJrIGEgdGltZXN0YW1wIGluIHRoZSBkb2N1bWVudCB3aGVu IHdlJ3ZlIGNhbGxlZCBhbiBldmVudCBsaXN0ZW5lciBmb3IgYSB1c2VyCisgICAgICAgIGdlc3R1 cmUuIFRoZSBwbHVnaW4gZWxlbWVudCB0aGVuIGNvbXBhcmVzIGl0cyBjcmVhdGlvbiB0aW1lIHdp dGggdGhlIG1vc3QgcmVjZW50CisgICAgICAgIHVzZXIgYWN0aW9uIHRpbWUuCisKKyAgICAgICAg KiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OkRvY3VtZW50 KTogSW5pdGlhbGlzZSBuZXcgdGltZXN0YW1wLgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6 OnJlc2V0TGFzdEhhbmRsZWRVc2VyR2VzdHVyZVRpbWVzdGFtcCk6IFNldHMgdGhlIG1lbWJlciB2 YXJpYWJsZQorICAgICAgICAgICAgdG8gdGhlIGN1cnJlbnQgdGltZS4KKyAgICAgICAgKiBkb20v RG9jdW1lbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50OjpsYXN0SGFuZGxlZFVzZXJH ZXN0dXJlVGltZXN0YW1wKTogR2V0dGVyLgorCisgICAgICAgICogZG9tL0V2ZW50VGFyZ2V0LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50VGFyZ2V0OjpmaXJlRXZlbnRMaXN0ZW5lcnMpOiBJ ZiB0aGVyZSB3ZXJlIHNvbWUgZXZlbnQgbGlzdGVuZXJzIGFuZAorICAgICAgICAgICAgd2Ugd2Vy ZSBwcm9jZXNzaW5nIGEgdXNlciBnZXN0dXJlLCB0aGVuIHJlc2V0IHRoZSB0aW1lc3RhbXAgaW4g dGhlIGRvY3VtZW50LgorCisgICAgICAgICogaHRtbC9IVE1MUGx1Z0luSW1hZ2VFbGVtZW50LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxQbHVnSW5JbWFnZUVsZW1lbnQ6OkhUTUxQbHVnSW5J bWFnZUVsZW1lbnQpOiBSZW1lbWJlciBpZiB3ZSB3ZXJlIGNyZWF0ZWQKKyAgICAgICAgICAgIGR1 cmluZyBhIHVzZXIgZ2VzdHVyZS4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxQbHVnSW5JbWFnZUVs ZW1lbnQ6OnN1YmZyYW1lTG9hZGVyV2lsbENyZWF0ZVBsdWdJbik6IFN0YXJ0IHRoZSBwbHVnaW4K KyAgICAgICAgICAgIGlmIHdlIHdlcmUgY3JlYXRlZCBkdXJpbmcgYSB1c2VyIGdlc3R1cmUsIG9y IGlmIHdlIGFyZSBjbG9zZSBlbm91Z2ggaW4gdGltZQorICAgICAgICAgICAgdG8gYSBsaXN0ZW5l ciB0aGF0IGZpcmVkIGluIHJlbGF0aW9uIHRvIGEgdXNlciBnZXN0dXJlLgorICAgICAgICAqIGh0 bWwvSFRNTFBsdWdJbkltYWdlRWxlbWVudC5oOiBOZXcgcHJpdmF0ZSBtZW1iZXIgZmxhZyBpbmRp Y2F0aW5nIGlmIHdlIHdlcmUKKyAgICAgICAgICAgIGluIGEgdXNlciBnZXN0dXJlIHdoZW4gY29u c3RydWN0ZWQuCisKIDIwMTMtMDMtMDkgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBhcHBs ZS5jb20+CiAKICAgICAgICAgVmlkZW8gc2l6ZSBjYWxjdWxhdGVkIGluY29ycmVjdGx5IHdoZW4g UExVR0lOX1BST1hZX0ZPUl9WSURFTwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0Rv Y3VtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKaW5kZXggMjZmMWNk YmRkODE4OTMyOWQ4MGI0MTNkNDllYzc5Njk2MjA3NjQwZi4uOWM2N2U5YjA2MWY0ODk5MjQ3Zjll MDAwZDVhOWFiZDA0MzlkZDUyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3Vt ZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCkBAIC00NzYsNiAr NDc2LDcgQEAgRG9jdW1lbnQ6OkRvY3VtZW50KEZyYW1lKiBmcmFtZSwgY29uc3QgS1VSTCYgdXJs LCBib29sIGlzWEhUTUwsIGJvb2wgaXNIVE1MKQogICAgICwgbV93cml0ZVJlY3Vyc2lvbklzVG9v RGVlcChmYWxzZSkKICAgICAsIG1fd3JpdGVSZWN1cnNpb25EZXB0aCgwKQogICAgICwgbV93aGVl bEV2ZW50SGFuZGxlckNvdW50KDApCisgICAgLCBtX2xhc3RIYW5kbGVkVXNlckdlc3R1cmVUaW1l c3RhbXAoMCkKICAgICAsIG1fcGVuZGluZ1Rhc2tzVGltZXIodGhpcywgJkRvY3VtZW50OjpwZW5k aW5nVGFza3NUaW1lckZpcmVkKQogICAgICwgbV9zY2hlZHVsZWRUYXNrc0FyZVN1c3BlbmRlZChm YWxzZSkKICAgICAsIG1fdmlzdWFsVXBkYXRlc0FsbG93ZWQodHJ1ZSkKQEAgLTU2NzUsNiArNTY3 NiwxMSBAQCB2b2lkIERvY3VtZW50OjpkaWRSZW1vdmVFdmVudFRhcmdldE5vZGUoTm9kZSogaGFu ZGxlcikKIH0KICNlbmRpZgogCit2b2lkIERvY3VtZW50OjpyZXNldExhc3RIYW5kbGVkVXNlckdl c3R1cmVUaW1lc3RhbXAoKQoreworICAgIG1fbGFzdEhhbmRsZWRVc2VyR2VzdHVyZVRpbWVzdGFt cCA9IGN1cnJlbnRUaW1lKCk7Cit9CisKIEhUTUxJRnJhbWVFbGVtZW50KiBEb2N1bWVudDo6c2Vh bWxlc3NQYXJlbnRJRnJhbWUoKSBjb25zdAogewogICAgIGlmICghc2hvdWxkRGlzcGxheVNlYW1s ZXNzbHlXaXRoUGFyZW50KCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1l bnQuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oCmluZGV4IDFlZjAzMzg1MDM3ZTgz MGI4MDVhZDgwNDBiY2M2OGEzMDc5ZmEwYmYuLjMxNjU5YTA0ZjhlYTI2YWM2YjVkNDZiMTdkODdi MjQyZDhkMjE2ODIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oCkBAIC0xMTAxLDYgKzExMDEsOSBAQCBw dWJsaWM6CiAgICAgdm9pZCBkaWRBZGRXaGVlbEV2ZW50SGFuZGxlcigpOwogICAgIHZvaWQgZGlk UmVtb3ZlV2hlZWxFdmVudEhhbmRsZXIoKTsKIAorICAgIGRvdWJsZSBsYXN0SGFuZGxlZFVzZXJH ZXN0dXJlVGltZXN0YW1wKCkgY29uc3QgeyByZXR1cm4gbV9sYXN0SGFuZGxlZFVzZXJHZXN0dXJl VGltZXN0YW1wOyB9CisgICAgdm9pZCByZXNldExhc3RIYW5kbGVkVXNlckdlc3R1cmVUaW1lc3Rh bXAoKTsKKwogI2lmIEVOQUJMRShUT1VDSF9FVkVOVFMpCiAgICAgYm9vbCBoYXNUb3VjaEV2ZW50 SGFuZGxlcnMoKSBjb25zdCB7IHJldHVybiAobV90b3VjaEV2ZW50VGFyZ2V0cy5nZXQoKSkgPyBt X3RvdWNoRXZlbnRUYXJnZXRzLT5zaXplKCkgOiBmYWxzZTsgfQogI2Vsc2UKQEAgLTE1MTIsNiAr MTUxNSw4IEBAIHByaXZhdGU6CiAgICAgT3duUHRyPFRvdWNoRXZlbnRUYXJnZXRTZXQ+IG1fdG91 Y2hFdmVudFRhcmdldHM7CiAjZW5kaWYKIAorICAgIGRvdWJsZSBtX2xhc3RIYW5kbGVkVXNlckdl c3R1cmVUaW1lc3RhbXA7CisKICNpZiBFTkFCTEUoUkVRVUVTVF9BTklNQVRJT05fRlJBTUUpCiAg ICAgUmVmUHRyPFNjcmlwdGVkQW5pbWF0aW9uQ29udHJvbGxlcj4gbV9zY3JpcHRlZEFuaW1hdGlv bkNvbnRyb2xsZXI7CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FdmVu dFRhcmdldC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRXZlbnRUYXJnZXQuY3BwCmluZGV4IGQw YWQ1MjBkNDRkMWQ4YWM4N2ZlZjcwODc2MzY1ODU2NmY2YWM5MmEuLmMxMWQyMGYxMmRhM2ViZGI2 MGRlNzlhYTBhOTA4NDhkZmI1MDdkMTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9F dmVudFRhcmdldC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0V2ZW50VGFyZ2V0LmNwcApA QCAtMjMyLDYgKzIzMiw3IEBAIHZvaWQgRXZlbnRUYXJnZXQ6OmZpcmVFdmVudExpc3RlbmVycyhF dmVudCogZXZlbnQsIEV2ZW50VGFyZ2V0RGF0YSogZCwgRXZlbnRMaXN0CiAgICAgLy8gZGlzcGF0 Y2guIENvbnZlbmllbnRseSwgYWxsIG5ldyBldmVudCBsaXN0ZW5lcnMgd2lsbCBiZSBhZGRlZCBh ZnRlciAnZW5kJywKICAgICAvLyBzbyBpdGVyYXRpbmcgdG8gJ2VuZCcgbmF0dXJhbGx5IGV4Y2x1 ZGVzIG5ldyBldmVudCBsaXN0ZW5lcnMuCiAKKyAgICBib29sIHVzZXJFdmVudFdhc0hhbmRsZWQg PSBmYWxzZTsKICAgICBzaXplX3QgaSA9IDA7CiAgICAgc2l6ZV90IGVuZCA9IGVudHJ5LnNpemUo KTsKICAgICBpZiAoIWQtPmZpcmluZ0V2ZW50SXRlcmF0b3JzKQpAQCAtMjU0LDkgKzI1NSwxOCBA QCB2b2lkIEV2ZW50VGFyZ2V0OjpmaXJlRXZlbnRMaXN0ZW5lcnMoRXZlbnQqIGV2ZW50LCBFdmVu dFRhcmdldERhdGEqIGQsIEV2ZW50TGlzdAogICAgICAgICAvLyBUbyBtYXRjaCBNb3ppbGxhLCB0 aGUgQVRfVEFSR0VUIHBoYXNlIGZpcmVzIGJvdGggY2FwdHVyaW5nIGFuZCBidWJibGluZwogICAg ICAgICAvLyBldmVudCBsaXN0ZW5lcnMsIGV2ZW4gdGhvdWdoIHRoYXQgdmlvbGF0ZXMgc29tZSB2 ZXJzaW9ucyBvZiB0aGUgRE9NIHNwZWMuCiAgICAgICAgIHJlZ2lzdGVyZWRMaXN0ZW5lci5saXN0 ZW5lci0+aGFuZGxlRXZlbnQoY29udGV4dCwgZXZlbnQpOworICAgICAgICBpZiAoIXVzZXJFdmVu dFdhc0hhbmRsZWQgJiYgU2NyaXB0Q29udHJvbGxlcjo6cHJvY2Vzc2luZ1VzZXJHZXN0dXJlKCkp CisgICAgICAgICAgICB1c2VyRXZlbnRXYXNIYW5kbGVkID0gdHJ1ZTsKICAgICAgICAgSW5zcGVj dG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRIYW5kbGVFdmVudChjb29raWUpOwogICAgIH0KICAgICBk LT5maXJpbmdFdmVudEl0ZXJhdG9ycy0+cmVtb3ZlTGFzdCgpOworICAgIGlmICh1c2VyRXZlbnRX YXNIYW5kbGVkKSB7CisgICAgICAgIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNvbnRleHQgPSBz Y3JpcHRFeGVjdXRpb25Db250ZXh0KCk7CisgICAgICAgIGlmIChjb250ZXh0ICYmIGNvbnRleHQt PmlzRG9jdW1lbnQoKSkgeworICAgICAgICAgICAgRG9jdW1lbnQqIGRvY3VtZW50ID0gc3RhdGlj X2Nhc3Q8RG9jdW1lbnQqPihjb250ZXh0KTsKKyAgICAgICAgICAgIGRvY3VtZW50LT5yZXNldExh c3RIYW5kbGVkVXNlckdlc3R1cmVUaW1lc3RhbXAoKTsKKyAgICAgICAgfQorICAgIH0KIH0KIAog Y29uc3QgRXZlbnRMaXN0ZW5lclZlY3RvciYgRXZlbnRUYXJnZXQ6OmdldEV2ZW50TGlzdGVuZXJz KGNvbnN0IEF0b21pY1N0cmluZyYgZXZlbnRUeXBlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaHRtbC9IVE1MUGx1Z0luSW1hZ2VFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwv SFRNTFBsdWdJbkltYWdlRWxlbWVudC5jcHAKaW5kZXggMDcxOGRmMDFlMjZkZTQ5N2JlMWNmYmEw ODU2NDMxNTUxYmJhMmE3Mi4uY2NlNWNjOGM1YjNiYTlmZGNiNDJhYzcyNmIyM2RlNTVhOTIyZjIx YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MUGx1Z0luSW1hZ2VFbGVtZW50 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxQbHVnSW5JbWFnZUVsZW1lbnQuY3Bw CkBAIC01OCw2ICs1OCw3IEBAIHN0YXRpYyBjb25zdCBpbnQgc2l6aW5nU21hbGxXaWR0aFRocmVz aG9sZCA9IDI1MDsKIHN0YXRpYyBjb25zdCBpbnQgc2l6aW5nTWVkaXVtV2lkdGhUaHJlc2hvbGQg PSA0NTA7CiBzdGF0aWMgY29uc3QgaW50IHNpemluZ01lZGl1bUhlaWdodFRocmVzaG9sZCA9IDMw MDsKIHN0YXRpYyBjb25zdCBmbG9hdCBzaXppbmdGdWxsUGFnZUFyZWFSYXRpb1RocmVzaG9sZCA9 IDAuOTY7CitzdGF0aWMgY29uc3QgZmxvYXQgYXV0b3N0YXJ0U29vbkFmdGVyVXNlckdlc3R1cmVU aHJlc2hvbGQgPSA1LjA7CiAKIC8vIFRoaXMgZGVsYXkgc2hvdWxkIG5vdCBleGNlZWQgdGhlIHNu YXBzaG90IGRlbGF5IGluIFBsdWdpblZpZXcuY3BwCiBzdGF0aWMgY29uc3QgZG91YmxlIHNpbXVs YXRlZE1vdXNlQ2xpY2tUaW1lckRlbGF5ID0gLjc1OwpAQCAtNzMsNiArNzQsNyBAQCBIVE1MUGx1 Z0luSW1hZ2VFbGVtZW50OjpIVE1MUGx1Z0luSW1hZ2VFbGVtZW50KGNvbnN0IFF1YWxpZmllZE5h bWUmIHRhZ05hbWUsIERvYwogICAgICwgbV9uZWVkc0RvY3VtZW50QWN0aXZhdGlvbkNhbGxiYWNr cyhmYWxzZSkKICAgICAsIG1fc2ltdWxhdGVkTW91c2VDbGlja1RpbWVyKHRoaXMsICZIVE1MUGx1 Z0luSW1hZ2VFbGVtZW50OjpzaW11bGF0ZWRNb3VzZUNsaWNrVGltZXJGaXJlZCwgc2ltdWxhdGVk TW91c2VDbGlja1RpbWVyRGVsYXkpCiAgICAgLCBtX3N3YXBSZW5kZXJlclRpbWVyKHRoaXMsICZI VE1MUGx1Z0luSW1hZ2VFbGVtZW50Ojpzd2FwUmVuZGVyZXJUaW1lckZpcmVkKQorICAgICwgbV9j cmVhdGVkRHVyaW5nVXNlckdlc3R1cmUoU2NyaXB0Q29udHJvbGxlcjo6cHJvY2Vzc2luZ1VzZXJH ZXN0dXJlKCkpCiB7CiAgICAgc2V0SGFzQ3VzdG9tU3R5bGVDYWxsYmFja3MoKTsKIH0KQEAgLTQz NSw2ICs0MzcsMTkgQEAgdm9pZCBIVE1MUGx1Z0luSW1hZ2VFbGVtZW50OjpzdWJmcmFtZUxvYWRl cldpbGxDcmVhdGVQbHVnSW4oY29uc3QgS1VSTCYgdXJsKQogICAgICAgICByZXR1cm47CiAgICAg fQogCisgICAgaWYgKG1fY3JlYXRlZER1cmluZ1VzZXJHZXN0dXJlKSB7CisgICAgICAgIExPRyhQ bHVnaW5zLCAiJXAgUGx1Zy1pbiB3YXMgY3JlYXRlZCB3aGVuIHByb2Nlc3NpbmcgdXNlciBnZXN0 dXJlLCBzZXQgdG8gcGxheSIsIHRoaXMpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAg ZG91YmxlIGxhc3RLbm93blVzZXJHZXN0dXJlVGltZXN0YW1wID0gZG9jdW1lbnQoKS0+bGFzdEhh bmRsZWRVc2VyR2VzdHVyZVRpbWVzdGFtcCgpOworICAgIGlmICghaW5NYWluRnJhbWUgJiYgZG9j dW1lbnQoKS0+cGFnZSgpLT5tYWluRnJhbWUoKSAmJiBkb2N1bWVudCgpLT5wYWdlKCktPm1haW5G cmFtZSgpLT5kb2N1bWVudCgpKQorICAgICAgICBsYXN0S25vd25Vc2VyR2VzdHVyZVRpbWVzdGFt cCA9IHN0ZDo6bWF4KGxhc3RLbm93blVzZXJHZXN0dXJlVGltZXN0YW1wLCBkb2N1bWVudCgpLT5w YWdlKCktPm1haW5GcmFtZSgpLT5kb2N1bWVudCgpLT5sYXN0SGFuZGxlZFVzZXJHZXN0dXJlVGlt ZXN0YW1wKCkpOworICAgIGlmIChjdXJyZW50VGltZSgpIC0gbGFzdEtub3duVXNlckdlc3R1cmVU aW1lc3RhbXAgPCBhdXRvc3RhcnRTb29uQWZ0ZXJVc2VyR2VzdHVyZVRocmVzaG9sZCkgeworICAg ICAgICBMT0coUGx1Z2lucywgIiVwIFBsdWctaW4gd2FzIGNyZWF0ZWQgc2hvcnRseSBhZnRlciBh IHVzZXIgZ2VzdHVyZSwgc2V0IHRvIHBsYXkiLCB0aGlzKTsKKyAgICAgICAgcmV0dXJuOworICAg IH0KKwogICAgIFJlbmRlckJveCogcmVuZGVyRW1iZWRkZWRPYmplY3QgPSB0b1JlbmRlckJveChy ZW5kZXJlcigpKTsKICAgICBMZW5ndGggc3R5bGVXaWR0aCA9IHJlbmRlckVtYmVkZGVkT2JqZWN0 LT5zdHlsZSgpLT53aWR0aCgpOwogICAgIExlbmd0aCBzdHlsZUhlaWdodCA9IHJlbmRlckVtYmVk ZGVkT2JqZWN0LT5zdHlsZSgpLT5oZWlnaHQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTFBsdWdJbkltYWdlRWxlbWVudC5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1M UGx1Z0luSW1hZ2VFbGVtZW50LmgKaW5kZXggYjUwZDUzYTgzYzQzMzY5OGM2NjhlZDk1NjViNDYx YTA2MjlmZTcxYy4uNmEzMzRlNTdhMWQ0YTUwZWNhZTBkNTVjODQyMjc0ODFkMGIyNGE1NiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MUGx1Z0luSW1hZ2VFbGVtZW50LmgKKysr IGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MUGx1Z0luSW1hZ2VFbGVtZW50LmgKQEAgLTEyMiw2 ICsxMjIsNyBAQCBwcml2YXRlOgogICAgIERlZmVycmFibGVPbmVTaG90VGltZXI8SFRNTFBsdWdJ bkltYWdlRWxlbWVudD4gbV9zaW11bGF0ZWRNb3VzZUNsaWNrVGltZXI7CiAgICAgVGltZXI8SFRN TFBsdWdJbkltYWdlRWxlbWVudD4gbV9zd2FwUmVuZGVyZXJUaW1lcjsKICAgICBSZWZQdHI8SW1h Z2U+IG1fc25hcHNob3RJbWFnZTsKKyAgICBib29sIG1fY3JlYXRlZER1cmluZ1VzZXJHZXN0dXJl OwogfTsKIAogaW5saW5lIEhUTUxQbHVnSW5JbWFnZUVsZW1lbnQqIHRvSFRNTFBsdWdJbkltYWdl RWxlbWVudChOb2RlKiBub2RlKQo=