119394 2013-08-01 05:49:45 -0700 Frame flattening: Change the logic on whether resize event needs to be dispatched. 2013-08-02 01:57:16 -0700 1 1 1 Unclassified WebKit Frames 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Enhancement --- 1 zalan zalan commit-queue esprehn+autocc glenn kondapallykalyan simon.fraser webkit-bug-importer yongjun_zhang oldest_to_newest 913718 0 zalan 2013-08-01 05:49:45 -0700 Remove the recently added m_resizeEventAllowed and simply go with frameFlatteningEnabled() check. 913723 1 207920 zalan 2013-08-01 06:03:05 -0700 Created attachment 207920 Patch 913752 2 207920 simon.fraser 2013-08-01 08:46:39 -0700 Comment on attachment 207920 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=207920&action=review > Source/WebCore/page/FrameView.h:539 > + bool supportsFrameFlattening() const; It's not clear what this means; does it apply only to this frame, or to this platform? 913753 3 zalan 2013-08-01 08:49:54 -0700 (In reply to comment #2) > (From update of attachment 207920 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=207920&action=review > > > Source/WebCore/page/FrameView.h:539 > > + bool supportsFrameFlattening() const; > > It's not clear what this means; does it apply only to this frame, or to this platform? Indeed. I'll fix that before landing. Thanks! 914046 4 207990 zalan 2013-08-02 01:02:56 -0700 Created attachment 207990 Patch for landing 914047 5 207990 zalan 2013-08-02 01:04:11 -0700 Comment on attachment 207990 Patch for landing missing testcase 914051 6 207991 zalan 2013-08-02 01:08:42 -0700 Created attachment 207991 Patch for landing 914063 7 207991 commit-queue 2013-08-02 01:57:12 -0700 Comment on attachment 207991 Patch for landing Clearing flags on attachment: 207991 Committed r153640: <http://trac.webkit.org/changeset/153640> 914064 8 commit-queue 2013-08-02 01:57:16 -0700 All reviewed patches have been landed. Closing bug. 207920 2013-08-01 06:03:05 -0700 2013-08-02 01:02:45 -0700 Patch bug-119394-20130801160302.patch text/plain 11097 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTUzNTIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjUxNmZiMWE1YjE2ZGU5 Y2ZkZmJkN2QyYzFiNGFiZTkzZDEwMDdiNS4uM2U4NzI4MGM0YjViNWVkZmQ3YjFjNmU4MTEyYTI5 NjhkMWE4MzU2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEzLTA4LTAxICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgRnJhbWUgZmxhdHRlbmluZzog Q2hhbmdlIHRoZSBsb2dpYyBvbiB3aGV0aGVyIHJlc2l6ZSBldmVudCBuZWVkcyB0byBiZSBkaXNw YXRjaGVkLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTE5Mzk0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg aHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvMTQ5Mjg3IGNoYW5nZWQgdGhlIGxvZ2lj IHNvIHRoYXQgcmVzaXplIGV2ZW50cyBhcmUKKyAgICAgICAgc2VudCBvdXQgZnJvbSBGcmFtZVZp ZXc6OnNldEZyYW1lUmVjdCgpIHRvby4gQ2hlY2tpbmcgd2hldGhlciBmcmFtZSBmbGF0dGVuaW5n IGlzIAorICAgICAgICBlbmFibGVkIGlzIHN1ZmZpY2llbnQgZW5vdWdoIHRvIGVuc3VyZSB0aGF0 IG5vIGV4dHJhIHJlc2l6ZSBldmVudHMgYXJlIGRpc3BhdGNoZWQuCisKKyAgICAgICAgVGVzdDog ZmFzdC9mcmFtZXMvZmxhdHRlbmluZy9pZnJhbWUtZmxhdHRlbmluZy1yZXNpemUtZXZlbnQtY291 bnQuaHRtbAorCisgICAgICAgICogcGFnZS9GcmFtZVZpZXcuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6RnJhbWVWaWV3OjpGcmFtZVZpZXcpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3Ojpz ZXRGcmFtZVJlY3QpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpmcmFtZUZsYXR0ZW5p bmdFbmFibGVkKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6c3VwcG9ydHNGcmFtZUZs YXR0ZW5pbmcpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3Ojphdm9pZFNjcm9sbGJhckNy ZWF0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6Y2FsY3VsYXRlU2Nyb2xsYmFy TW9kZXNGb3JMYXlvdXQpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpsYXlvdXQpOgor ICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3Ojppc0luQ2hpbGRGcmFtZVdpdGhGcmFtZUZsYXR0 ZW5pbmcpOgorICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3Lmg6CisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlckZyYW1lQmFzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGcmFtZUJhc2U6 OmxheW91dFdpdGhGbGF0dGVuaW5nKToKKwogMjAxMy0wNy0zMSAgR3J6ZWdvcnogQ3phamtvd3Nr aSAgPGcuY3phamtvd3NraUBzYW1zdW5nLmNvbT4KIAogICAgICAgICBSZW1vdmUgZ3Vlc3Nlc1Zl Y3RvciBwYXJhbSBmcm9tIGlzVW5ncmFtbWF0aWNhbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGFnZS9GcmFtZVZpZXcuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3Bw CmluZGV4IGMzZDJmYTU3ZTM5NTllZDU1ZDlhNjMwNzZjZDFjMzgwMmU2YTJlYTkuLjIyZTM3N2Fj MjRkNGFjYWMwOWFiODYyZWE4OTVlNmU5ZTEyZTVmYWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmll dy5jcHAKQEAgLTIwNCw3ICsyMDQsNiBAQCBGcmFtZVZpZXc6OkZyYW1lVmlldyhGcmFtZSogZnJh bWUpCiAjZW5kaWYKICAgICAsIG1fdmlzdWFsVXBkYXRlc0FsbG93ZWRCeUNsaWVudCh0cnVlKQog ICAgICwgbV9zY3JvbGxQaW5uaW5nQmVoYXZpb3IoRG9Ob3RQaW4pCi0gICAgLCBtX3Jlc2l6ZUV2 ZW50QWxsb3dlZCh0cnVlKQogewogICAgIGluaXQoKTsKIApAQCAtNDgyLDcgKzQ4MSw3IEBAIHZv aWQgRnJhbWVWaWV3OjpzZXRGcmFtZVJlY3QoY29uc3QgSW50UmVjdCYgbmV3UmVjdCkKICAgICB9 CiAjZW5kaWYKIAotICAgIGlmIChtX3Jlc2l6ZUV2ZW50QWxsb3dlZCkKKyAgICBpZiAoIWZyYW1l RmxhdHRlbmluZ0VuYWJsZWQoKSkKICAgICAgICAgc2VuZFJlc2l6ZUV2ZW50SWZOZWVkZWQoKTsK IH0KIApAQCAtNTA5LDE5ICs1MDgsMjMgQEAgdm9pZCBGcmFtZVZpZXc6OnNldE1hcmdpbkhlaWdo dChMYXlvdXRVbml0IGgpCiAgICAgbV9tYXJnaW5zLnNldEhlaWdodChoKTsKIH0KIAotc3RhdGlj IGJvb2wgZnJhbWVGbGF0dGVuaW5nRW5hYmxlZChGcmFtZSogZnJhbWUpCitib29sIEZyYW1lVmll dzo6ZnJhbWVGbGF0dGVuaW5nRW5hYmxlZCgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIGZyYW1lICYm IGZyYW1lLT5zZXR0aW5ncygpICYmIGZyYW1lLT5zZXR0aW5ncygpLT5mcmFtZUZsYXR0ZW5pbmdF bmFibGVkKCk7CisgICAgU2V0dGluZ3MqIHNldHRpbmdzID0gZnJhbWUoKSA/IGZyYW1lKCktPnNl dHRpbmdzKCkgOiAwOworICAgIGlmICghc2V0dGluZ3MpCisgICAgICAgIHJldHVybiBmYWxzZTsK KworICAgIHJldHVybiBzZXR0aW5ncy0+ZnJhbWVGbGF0dGVuaW5nRW5hYmxlZCgpOwogfQogCi1z dGF0aWMgYm9vbCBzdXBwb3J0c0ZyYW1lRmxhdHRlbmluZyhGcmFtZSogZnJhbWUpCitib29sIEZy YW1lVmlldzo6c3VwcG9ydHNGcmFtZUZsYXR0ZW5pbmcoKSBjb25zdAogewotICAgIGlmICghZnJh bWUpCisgICAgSFRNTEZyYW1lT3duZXJFbGVtZW50KiBvd25lciA9IGZyYW1lKCkgPyBmcmFtZSgp LT5vd25lckVsZW1lbnQoKSA6IDA7CisgICAgaWYgKCFvd25lcikKICAgICAgICAgcmV0dXJuIGZh bHNlOwogCiAgICAgLy8gRnJhbWUgZmxhdHRlbmluZyBpcyB2YWxpZCBvbmx5IGZvciA8ZnJhbWU+ IGFuZCA8aWZyYW1lPi4KLSAgICBIVE1MRnJhbWVPd25lckVsZW1lbnQqIG93bmVyID0gZnJhbWUt Pm93bmVyRWxlbWVudCgpOwotICAgIHJldHVybiBvd25lciAmJiAob3duZXItPmhhc1RhZ05hbWUo ZnJhbWVUYWcpIHx8IG93bmVyLT5oYXNUYWdOYW1lKGlmcmFtZVRhZykpOworICAgIHJldHVybiBv d25lci0+aGFzVGFnTmFtZShmcmFtZVRhZykgfHwgb3duZXItPmhhc1RhZ05hbWUoaWZyYW1lVGFn KTsKIH0KIAogYm9vbCBGcmFtZVZpZXc6OmF2b2lkU2Nyb2xsYmFyQ3JlYXRpb24oKSBjb25zdApA QCAtNTMxLDggKzUzNCw3IEBAIGJvb2wgRnJhbWVWaWV3Ojphdm9pZFNjcm9sbGJhckNyZWF0aW9u KCkgY29uc3QKICAgICAvLyB3aXRoIGZyYW1lIGZsYXR0ZW5pbmcgbm8gc3ViZnJhbWUgY2FuIGhh dmUgc2Nyb2xsYmFycwogICAgIC8vIGJ1dCB3ZSBhbHNvIGNhbm5vdCB0dXJuIHNjcm9sbGJhcnMg b2ZmIGFzIHdlIGRldGVybWluZQogICAgIC8vIG91ciBmbGF0dGVuaW5nIHBvbGljeSB1c2luZyB0 aGF0LgotCi0gICAgcmV0dXJuIGZyYW1lRmxhdHRlbmluZ0VuYWJsZWQoZnJhbWUoKSkgJiYgc3Vw cG9ydHNGcmFtZUZsYXR0ZW5pbmcoZnJhbWUoKSk7CisgICAgcmV0dXJuIGZyYW1lRmxhdHRlbmlu Z0VuYWJsZWQoKSAmJiBzdXBwb3J0c0ZyYW1lRmxhdHRlbmluZygpOwogfQogCiB2b2lkIEZyYW1l Vmlldzo6c2V0Q2FuSGF2ZVNjcm9sbGJhcnMoYm9vbCBjYW5IYXZlU2Nyb2xsYmFycykKQEAgLTc0 Myw3ICs3NDUsNyBAQCB2b2lkIEZyYW1lVmlldzo6Y2FsY3VsYXRlU2Nyb2xsYmFyTW9kZXNGb3JM YXlvdXQoU2Nyb2xsYmFyTW9kZSYgaE1vZGUsIFNjcm9sbGJhcgogICAgICAgICBSZW5kZXJPYmpl Y3QqIHJvb3RSZW5kZXJlciA9IGRvY3VtZW50RWxlbWVudCA/IGRvY3VtZW50RWxlbWVudC0+cmVu ZGVyZXIoKSA6IDA7CiAgICAgICAgIE5vZGUqIGJvZHkgPSBkb2N1bWVudC0+Ym9keSgpOwogICAg ICAgICBpZiAoYm9keSAmJiBib2R5LT5yZW5kZXJlcigpKSB7Ci0gICAgICAgICAgICBpZiAoYm9k eS0+aGFzVGFnTmFtZShmcmFtZXNldFRhZykgJiYgIWZyYW1lRmxhdHRlbmluZ0VuYWJsZWQoZnJh bWUoKSkpIHsKKyAgICAgICAgICAgIGlmIChib2R5LT5oYXNUYWdOYW1lKGZyYW1lc2V0VGFnKSAm JiAhZnJhbWVGbGF0dGVuaW5nRW5hYmxlZCgpKSB7CiAgICAgICAgICAgICAgICAgdk1vZGUgPSBT Y3JvbGxiYXJBbHdheXNPZmY7CiAgICAgICAgICAgICAgICAgaE1vZGUgPSBTY3JvbGxiYXJBbHdh eXNPZmY7CiAgICAgICAgICAgICB9IGVsc2UgaWYgKGJvZHktPmhhc1RhZ05hbWUoYm9keVRhZykp IHsKQEAgLTEyMzMsNyArMTIzNSw3IEBAIHZvaWQgRnJhbWVWaWV3OjpsYXlvdXQoYm9vbCBhbGxv d1N1YnRyZWUpCiAgICAgICAgICAgICBEb2N1bWVudCogZG9jdW1lbnQgPSBtX2ZyYW1lLT5kb2N1 bWVudCgpOwogICAgICAgICAgICAgTm9kZSogYm9keSA9IGRvY3VtZW50LT5ib2R5KCk7CiAgICAg ICAgICAgICBpZiAoYm9keSAmJiBib2R5LT5yZW5kZXJlcigpKSB7Ci0gICAgICAgICAgICAgICAg aWYgKGJvZHktPmhhc1RhZ05hbWUoZnJhbWVzZXRUYWcpICYmICFmcmFtZUZsYXR0ZW5pbmdFbmFi bGVkKGZyYW1lKCkpKSB7CisgICAgICAgICAgICAgICAgaWYgKGJvZHktPmhhc1RhZ05hbWUoZnJh bWVzZXRUYWcpICYmICFmcmFtZUZsYXR0ZW5pbmdFbmFibGVkKCkpIHsKICAgICAgICAgICAgICAg ICAgICAgYm9keS0+cmVuZGVyZXIoKS0+c2V0Q2hpbGROZWVkc0xheW91dCh0cnVlKTsKICAgICAg ICAgICAgICAgICB9IGVsc2UgaWYgKGJvZHktPmhhc1RhZ05hbWUoYm9keVRhZykpIHsKICAgICAg ICAgICAgICAgICAgICAgaWYgKCFtX2ZpcnN0TGF5b3V0ICYmIG1fc2l6ZS5oZWlnaHQoKSAhPSBs YXlvdXRIZWlnaHQoKSAmJiBib2R5LT5yZW5kZXJlcigpLT5lbmNsb3NpbmdCb3goKS0+c3RyZXRj aGVzVG9WaWV3cG9ydCgpKQpAQCAtMzQ2Miw3ICszNDY0LDcgQEAgYm9vbCBGcmFtZVZpZXc6Omlz SW5DaGlsZEZyYW1lV2l0aEZyYW1lRmxhdHRlbmluZygpIGNvbnN0CiAgICAgICAgICAgICByZXR1 cm4gdHJ1ZTsKICAgICB9CiAKLSAgICBpZiAoIWZyYW1lRmxhdHRlbmluZ0VuYWJsZWQoZnJhbWUo KSkpCisgICAgaWYgKCFmcmFtZUZsYXR0ZW5pbmdFbmFibGVkKCkpCiAgICAgICAgIHJldHVybiBm YWxzZTsKIAogICAgIGlmIChtX2ZyYW1lLT5vd25lckVsZW1lbnQoKS0+aGFzVGFnTmFtZShmcmFt ZVRhZykpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaAppbmRleCA0MzFiMjkzYTAzM2MwMjI1YjAzYzBk NzQ5ZjJlYWU0ODllOGIwYTU2Li5kMmI3MDYwZDk2ZWViOGJlZWNiODc2OTA2MjU0NGU3MmZlNmIx YmE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgKQEAgLTQzOSw5ICs0MzksNiBAQCBwdWJsaWM6 CiAgICAgCiAgICAgdm9pZCBzZXRTY3JvbGxQaW5uaW5nQmVoYXZpb3IoU2Nyb2xsUGlubmluZ0Jl aGF2aW9yKTsKIAotICAgIHZvaWQgc2V0UmVzaXplRXZlbnRBbGxvd2VkKGJvb2wgcmVzaXplRXZl bnRBbGxvd2VkKSB7IG1fcmVzaXplRXZlbnRBbGxvd2VkID0gcmVzaXplRXZlbnRBbGxvd2VkOyB9 Ci0gICAgYm9vbCByZXNpemVFdmVudEFsbG93ZWQoKSBjb25zdCB7IHJldHVybiBtX3Jlc2l6ZUV2 ZW50QWxsb3dlZDsgfQotCiBwcm90ZWN0ZWQ6CiAgICAgdmlydHVhbCBib29sIHNjcm9sbENvbnRl bnRzRmFzdFBhdGgoY29uc3QgSW50U2l6ZSYgc2Nyb2xsRGVsdGEsIGNvbnN0IEludFJlY3QmIHJl Y3RUb1Njcm9sbCwgY29uc3QgSW50UmVjdCYgY2xpcFJlY3QpOwogICAgIHZpcnR1YWwgdm9pZCBz Y3JvbGxDb250ZW50c1Nsb3dQYXRoKGNvbnN0IEludFJlY3QmIHVwZGF0ZVJlY3QpOwpAQCAtNTM4 LDYgKzUzNSw4IEBAIHByaXZhdGU6CiAgICAgRnJhbWVWaWV3KiBwYXJlbnRGcmFtZVZpZXcoKSBj b25zdDsKIAogICAgIGJvb2wgZG9MYXlvdXRXaXRoRnJhbWVGbGF0dGVuaW5nKGJvb2wgYWxsb3dT dWJ0cmVlKTsKKyAgICBib29sIGZyYW1lRmxhdHRlbmluZ0VuYWJsZWQoKSBjb25zdDsKKyAgICBi b29sIHN1cHBvcnRzRnJhbWVGbGF0dGVuaW5nKCkgY29uc3Q7CiAKICAgICBib29sIHF1YWxpZmll c0FzVmlzdWFsbHlOb25FbXB0eSgpIGNvbnN0OwogCkBAIC02NzQsNyArNjczLDYgQEAgcHJpdmF0 ZToKICAgICBib29sIG1fdmlzdWFsVXBkYXRlc0FsbG93ZWRCeUNsaWVudDsKICAgICAKICAgICBT Y3JvbGxQaW5uaW5nQmVoYXZpb3IgbV9zY3JvbGxQaW5uaW5nQmVoYXZpb3I7Ci0gICAgYm9vbCBt X3Jlc2l6ZUV2ZW50QWxsb3dlZDsKIH07CiAKIGlubGluZSB2b2lkIEZyYW1lVmlldzo6aW5jcmVt ZW50VmlzdWFsbHlOb25FbXB0eUNoYXJhY3RlckNvdW50KHVuc2lnbmVkIGNvdW50KQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZyYW1lQmFzZS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRnJhbWVCYXNlLmNwcAppbmRleCBiNTVjYjc5MjAx ODM0OGUyMWFmMjc4MTkzOWJiMjg4ODE3YjMxNzUxLi45NGMwOTAwMmNkZmVlMTY4MTkzNWU3NWEz NzBhNmQ2ZDRmOTFjMGM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyRnJhbWVCYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRnJh bWVCYXNlLmNwcApAQCAtNjUsOCArNjUsNiBAQCB2b2lkIFJlbmRlckZyYW1lQmFzZTo6bGF5b3V0 V2l0aEZsYXR0ZW5pbmcoYm9vbCBoYXNGaXhlZFdpZHRoLCBib29sIGhhc0ZpeGVkSGVpZwogICAg ICAgICByZXR1cm47CiAgICAgfQogCi0gICAgY2hpbGRGcmFtZVZpZXctPnNldFJlc2l6ZUV2ZW50 QWxsb3dlZChmYWxzZSk7Ci0KICAgICAvLyBuZWVkIHRvIHVwZGF0ZSB0byBjYWxjdWxhdGUgbWlu L21heCBjb3JyZWN0bHkKICAgICB1cGRhdGVXaWRnZXRQb3NpdGlvbigpOwogCkBAIC05NSw3ICs5 Myw2IEBAIHZvaWQgUmVuZGVyRnJhbWVCYXNlOjpsYXlvdXRXaXRoRmxhdHRlbmluZyhib29sIGhh c0ZpeGVkV2lkdGgsIGJvb2wgaGFzRml4ZWRIZWlnCiAgICAgICAgIHNldFdpZHRoKG1heDxMYXlv dXRVbml0Pih3aWR0aCgpLCBjaGlsZEZyYW1lVmlldy0+Y29udGVudHNXaWR0aCgpICsgaEJvcmRl cikpOwogCiAgICAgdXBkYXRlV2lkZ2V0UG9zaXRpb24oKTsKLSAgICBjaGlsZEZyYW1lVmlldy0+ c2V0UmVzaXplRXZlbnRBbGxvd2VkKHRydWUpOwogCiAgICAgQVNTRVJUKCFjaGlsZEZyYW1lVmll dy0+bGF5b3V0UGVuZGluZygpKTsKICAgICBBU1NFUlQoIWNoaWxkUm9vdC0+bmVlZHNMYXlvdXQo KSk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKaW5kZXggZTMyYTRjYTUwMmViOWVhZjljMWE2ZjkwOWVhM2EyNzcxZjkwMzA1NS4uNDg2 YWE1NDc3YjE4ZTE5MjZmYTQ4Y2NjMDljOWI3MzkxZGEwOWMzOSAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4 IEBACisyMDEzLTA4LTAxICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAg ICAgRnJhbWUgZmxhdHRlbmluZzogQ2hhbmdlIHRoZSBsb2dpYyBvbiB3aGV0aGVyIHJlc2l6ZSBl dmVudCBuZWVkcyB0byBiZSBkaXNwYXRjaGVkLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE5Mzk0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgaHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvMTQ5 Mjg3IGNoYW5nZWQgdGhlIGxvZ2ljIHNvIHRoYXQgcmVzaXplIGV2ZW50cyBhcmUKKyAgICAgICAg c2VudCBvdXQgZnJvbSBGcmFtZVZpZXc6OnNldEZyYW1lUmVjdCgpIHRvby4gQ2hlY2tpbmcgd2hl dGhlciBmcmFtZSBmbGF0dGVuaW5nIGlzIAorICAgICAgICBlbmFibGVkIGlzIHN1ZmZpY2llbnQg ZW5vdWdoIHRvIGVuc3VyZSB0aGF0IG5vIGV4dHJhIHJlc2l6ZSBldmVudHMgYXJlIGRpc3BhdGNo ZWQuCisKKyAgICAgICAgKiBmYXN0L2ZyYW1lcy9mbGF0dGVuaW5nL2lmcmFtZS1mbGF0dGVuaW5n LXJlc2l6ZS1ldmVudC1jb3VudC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3Qv ZnJhbWVzL2ZsYXR0ZW5pbmcvaWZyYW1lLWZsYXR0ZW5pbmctcmVzaXplLWV2ZW50LWNvdW50Lmh0 bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3QvZnJhbWVzL2ZsYXR0ZW5pbmcvcmVzb3VyY2VzL2lm cmFtZS10by1yZXNpemUuaHRtbDogQWRkZWQuCisKIDIwMTMtMDctMzAgIFRpbSBIb3J0b24gIDx0 aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgREhUTUwgZHJhZyBjYW4gcmVzdWx0 IGluIGEgbnVsbC1kZXJlZiB1bmRlciBXZWJEcmFnQ2xpZW50OjpzdGFydERyYWcKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2Zhc3QvZnJhbWVzL2ZsYXR0ZW5pbmcvaWZyYW1lLWZsYXR0ZW5pbmct cmVzaXplLWV2ZW50LWNvdW50LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvZnJhbWVz L2ZsYXR0ZW5pbmcvaWZyYW1lLWZsYXR0ZW5pbmctcmVzaXplLWV2ZW50LWNvdW50LWV4cGVjdGVk LnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwLi40OGI1NDhkZWNlZTg5NzNhMjNkMzQ5NzRiY2I2NGNkODA5NjM3NmQx Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9mcmFtZXMvZmxhdHRlbmluZy9p ZnJhbWUtZmxhdHRlbmluZy1yZXNpemUtZXZlbnQtY291bnQtZXhwZWN0ZWQudHh0CkBAIC0wLDAg KzEsNSBAQAorVGhpcyB0ZXN0cyB0aGUgbnVtYmVyIG9mIHJlc2l6ZSBldmVudHMgZGlzcGF0Y2hl ZCB0byBKYXZhU2NyaXB0LgorCitQQVNTCisKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFz dC9mcmFtZXMvZmxhdHRlbmluZy9pZnJhbWUtZmxhdHRlbmluZy1yZXNpemUtZXZlbnQtY291bnQu aHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvZnJhbWVzL2ZsYXR0ZW5pbmcvaWZyYW1lLWZsYXR0ZW5p bmctcmVzaXplLWV2ZW50LWNvdW50Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYWQwY2QwMmZiMWFkNzVkOWU4 YzgzZGQ0NWNkYmRhNDQyMTM5MDE3NQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zh c3QvZnJhbWVzL2ZsYXR0ZW5pbmcvaWZyYW1lLWZsYXR0ZW5pbmctcmVzaXplLWV2ZW50LWNvdW50 Lmh0bWwKQEAgLTAsMCArMSwyMSBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgor PHNjcmlwdD4KKyAgZnVuY3Rpb24gc3RhcnQoKSB7CisgICAgaWYgKHdpbmRvdy5pbnRlcm5hbHMp CisgICAgICBpbnRlcm5hbHMuc2V0dGluZ3Muc2V0RnJhbWVGbGF0dGVuaW5nRW5hYmxlZCh0cnVl KTsKKyAgICAgIAorICAgIGlmICh3aW5kb3cudGVzdFJ1bm5lcikgeworICAgICAgdGVzdFJ1bm5l ci5kdW1wQXNUZXh0KCk7CisgICAgICB0ZXN0UnVubmVyLndhaXRVbnRpbERvbmUoKTsKKyAgICB9 CisgIH0KKzwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+CisgIDxwPlRoaXMgdGVzdHMgdGhlIG51 bWJlciBvZiByZXNpemUgZXZlbnRzIGRpc3BhdGNoZWQgdG8gSmF2YVNjcmlwdC48L3A+CisgIDxw IGlkPSdyZXN1bHQnPjwvcD4KKyAgPGlmcmFtZSBvbmxvYWQ9J3N0YXJ0KCk7JyBmcmFtZWJvcmRl cj0wOyBzcmM9J3Jlc291cmNlcy9pZnJhbWUtdG8tcmVzaXplLmh0bWwnPgorPC9ib2R5PgorPC9o dG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9mcmFtZXMvZmxhdHRlbmluZy9yZXNv dXJjZXMvaWZyYW1lLXRvLXJlc2l6ZS5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9mcmFtZXMvZmxh dHRlbmluZy9yZXNvdXJjZXMvaWZyYW1lLXRvLXJlc2l6ZS5odG1sCm5ldyBmaWxlIG1vZGUgMTAw NjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjE4YzIy NjI1NjVmNDk2NDE3OWViZDhmNDgyOTdmOTJjOWI4YWRiNTUKLS0tIC9kZXYvbnVsbAorKysgYi9M YXlvdXRUZXN0cy9mYXN0L2ZyYW1lcy9mbGF0dGVuaW5nL3Jlc291cmNlcy9pZnJhbWUtdG8tcmVz aXplLmh0bWwKQEAgLTAsMCArMSwzNyBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFk PgorICA8c2NyaXB0PgorICB2YXIgcmVzaXplRXZlbnRDb3VudGVyID0gMDsKKyAgdmFyIHJlc2l6 ZUNvdW50ZXIgPSAwOworICAKKyAgd2luZG93Lm9ucmVzaXplID0gZnVuY3Rpb24oZXZlbnQpIHsK KyAgICByZXNpemVFdmVudENvdW50ZXIrKzsKKyAgfQorCisgIGZ1bmN0aW9uIGdldFJhbmRvbUFy Yml0cmFyeShtaW4sIG1heCkgeworICAgIHJldHVybiBNYXRoLnJhbmRvbSgpICogKG1heCAtIG1p bikgKyBtaW47CisgIH0KKworICBmdW5jdGlvbiByZXNpemVNZSgpIHsKKyAgICBkb2N1bWVudC5n ZXRFbGVtZW50QnlJZCgnY29udGVudFRvUmVzaXplJykuc3R5bGUuaGVpZ2h0ID0gZ2V0UmFuZG9t QXJiaXRyYXJ5KDUwLCA1MDApICsgJ3B4JzsKKyAgICBkb2N1bWVudC5ib2R5Lm9mZnNldEhlaWdo dDsKKyAgCisgICAgaWYgKCsrcmVzaXplQ291bnRlciA8IDEwMCkKKyAgICAgIHNldFRpbWVvdXQo J3Jlc2l6ZU1lKCk7JywgMCk7CisgICAgZWxzZSB7CisgICAgICBwYXJlbnQuZG9jdW1lbnQuZ2V0 RWxlbWVudEJ5SWQoJ3Jlc3VsdCcpLmlubmVySFRNTCA9IHJlc2l6ZUV2ZW50Q291bnRlciA+IDEw MCA/ICJGQUlMRUQuIFRvbyBtYW55IHJlc2l6ZSBldmVudHMiIDogIlBBU1MiOworICAgICAgaWYg KHdpbmRvdy50ZXN0UnVubmVyKQorICAgICAgICB0ZXN0UnVubmVyLm5vdGlmeURvbmUoKTsKKyAg ICB9CisgIH0KKyAgCisgIGZ1bmN0aW9uIHN0YXJ0KCkgeworICAgcmVzaXplTWUoKTsKKyAgfQor PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keSBvbmxvYWQ9J3N0YXJ0KCknPgorICAgIDxwIGlkPSdj b250ZW50VG9SZXNpemUnPjwvcD4KKzwvYm9keT4KKzwvaHRtbD4K 207990 2013-08-02 01:02:56 -0700 2013-08-02 01:07:30 -0700 Patch for landing bug-119394-20130802110254.patch text/plain 8504 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTUzNTIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjUxNmZiMWE1YjE2ZGU5 Y2ZkZmJkN2QyYzFiNGFiZTkzZDEwMDdiNS4uYTZjY2NmMDMwY2QzYWU5YjNkNDZiMDIxOWNiZTBi ZWFhMWNiOTRkMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEzLTA4LTAxICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgRnJhbWUgZmxhdHRlbmluZzog Q2hhbmdlIHRoZSBsb2dpYyBvbiB3aGV0aGVyIHJlc2l6ZSBldmVudCBuZWVkcyB0byBiZSBkaXNw YXRjaGVkLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTE5Mzk0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gRnJhc2VyLgorCisgICAgICAgIGh0 dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzE0OTI4NyBjaGFuZ2VkIHRoZSBsb2dpYyBz byB0aGF0IHJlc2l6ZSBldmVudHMgYXJlCisgICAgICAgIHNlbnQgb3V0IGZyb20gRnJhbWVWaWV3 OjpzZXRGcmFtZVJlY3QoKSB0b28uIENoZWNraW5nIHdoZXRoZXIgZnJhbWUgZmxhdHRlbmluZyBp cworICAgICAgICBlbmFibGVkIGlzIHN1ZmZpY2llbnQgZW5vdWdoIHRvIGVuc3VyZSB0aGF0IG5v IGV4dHJhIHJlc2l6ZSBldmVudHMgYXJlIGRpc3BhdGNoZWQuCisKKyAgICAgICAgVGVzdDogZmFz dC9mcmFtZXMvZmxhdHRlbmluZy9pZnJhbWUtZmxhdHRlbmluZy1yZXNpemUtZXZlbnQtY291bnQu aHRtbAorCisgICAgICAgICogcGFnZS9GcmFtZVZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 RnJhbWVWaWV3OjpGcmFtZVZpZXcpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpzZXRG cmFtZVJlY3QpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpmcmFtZUZsYXR0ZW5pbmdF bmFibGVkKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6c3VwcG9ydHNGcmFtZUZsYXR0 ZW5pbmcpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3Ojphdm9pZFNjcm9sbGJhckNyZWF0 aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6Y2FsY3VsYXRlU2Nyb2xsYmFyTW9k ZXNGb3JMYXlvdXQpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpsYXlvdXQpOgorICAg ICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3Ojppc0luQ2hpbGRGcmFtZVdpdGhGcmFtZUZsYXR0ZW5p bmcpOgorICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3Lmg6CisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckZyYW1lQmFzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGcmFtZUJhc2U6Omxh eW91dFdpdGhGbGF0dGVuaW5nKToKKwogMjAxMy0wNy0zMSAgR3J6ZWdvcnogQ3phamtvd3NraSAg PGcuY3phamtvd3NraUBzYW1zdW5nLmNvbT4KIAogICAgICAgICBSZW1vdmUgZ3Vlc3Nlc1ZlY3Rv ciBwYXJhbSBmcm9tIGlzVW5ncmFtbWF0aWNhbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGFnZS9GcmFtZVZpZXcuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCmlu ZGV4IGMzZDJmYTU3ZTM5NTllZDU1ZDlhNjMwNzZjZDFjMzgwMmU2YTJlYTkuLjFkN2Q2MGNlN2Qy ZTkzZWQ4ZDhiYWI4OWQ3ODA4YmEyOGU5OTk0NTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvRnJhbWVWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5j cHAKQEAgLTIwNCw3ICsyMDQsNiBAQCBGcmFtZVZpZXc6OkZyYW1lVmlldyhGcmFtZSogZnJhbWUp CiAjZW5kaWYKICAgICAsIG1fdmlzdWFsVXBkYXRlc0FsbG93ZWRCeUNsaWVudCh0cnVlKQogICAg ICwgbV9zY3JvbGxQaW5uaW5nQmVoYXZpb3IoRG9Ob3RQaW4pCi0gICAgLCBtX3Jlc2l6ZUV2ZW50 QWxsb3dlZCh0cnVlKQogewogICAgIGluaXQoKTsKIApAQCAtNDgyLDcgKzQ4MSw3IEBAIHZvaWQg RnJhbWVWaWV3OjpzZXRGcmFtZVJlY3QoY29uc3QgSW50UmVjdCYgbmV3UmVjdCkKICAgICB9CiAj ZW5kaWYKIAotICAgIGlmIChtX3Jlc2l6ZUV2ZW50QWxsb3dlZCkKKyAgICBpZiAoIWZyYW1lRmxh dHRlbmluZ0VuYWJsZWQoKSkKICAgICAgICAgc2VuZFJlc2l6ZUV2ZW50SWZOZWVkZWQoKTsKIH0K IApAQCAtNTA5LDMwICs1MDgsMzUgQEAgdm9pZCBGcmFtZVZpZXc6OnNldE1hcmdpbkhlaWdodChM YXlvdXRVbml0IGgpCiAgICAgbV9tYXJnaW5zLnNldEhlaWdodChoKTsKIH0KIAotc3RhdGljIGJv b2wgZnJhbWVGbGF0dGVuaW5nRW5hYmxlZChGcmFtZSogZnJhbWUpCitib29sIEZyYW1lVmlldzo6 ZnJhbWVGbGF0dGVuaW5nRW5hYmxlZCgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIGZyYW1lICYmIGZy YW1lLT5zZXR0aW5ncygpICYmIGZyYW1lLT5zZXR0aW5ncygpLT5mcmFtZUZsYXR0ZW5pbmdFbmFi bGVkKCk7CisgICAgU2V0dGluZ3MqIHNldHRpbmdzID0gZnJhbWUoKSA/IGZyYW1lKCktPnNldHRp bmdzKCkgOiAwOworICAgIGlmICghc2V0dGluZ3MpCisgICAgICAgIHJldHVybiBmYWxzZTsKKwor ICAgIHJldHVybiBzZXR0aW5ncy0+ZnJhbWVGbGF0dGVuaW5nRW5hYmxlZCgpOwogfQogCi1zdGF0 aWMgYm9vbCBzdXBwb3J0c0ZyYW1lRmxhdHRlbmluZyhGcmFtZSogZnJhbWUpCitib29sIEZyYW1l Vmlldzo6aXNGcmFtZUZsYXR0ZW5pbmdWYWxpZEZvclRoaXNGcmFtZSgpIGNvbnN0CiB7Ci0gICAg aWYgKCFmcmFtZSkKKyAgICBpZiAoIWZyYW1lRmxhdHRlbmluZ0VuYWJsZWQoKSkKKyAgICAgICAg cmV0dXJuIGZhbHNlOworCisgICAgSFRNTEZyYW1lT3duZXJFbGVtZW50KiBvd25lciA9IGZyYW1l KCkgPyBmcmFtZSgpLT5vd25lckVsZW1lbnQoKSA6IDA7CisgICAgaWYgKCFvd25lcikKICAgICAg ICAgcmV0dXJuIGZhbHNlOwogCiAgICAgLy8gRnJhbWUgZmxhdHRlbmluZyBpcyB2YWxpZCBvbmx5 IGZvciA8ZnJhbWU+IGFuZCA8aWZyYW1lPi4KLSAgICBIVE1MRnJhbWVPd25lckVsZW1lbnQqIG93 bmVyID0gZnJhbWUtPm93bmVyRWxlbWVudCgpOwotICAgIHJldHVybiBvd25lciAmJiAob3duZXIt Pmhhc1RhZ05hbWUoZnJhbWVUYWcpIHx8IG93bmVyLT5oYXNUYWdOYW1lKGlmcmFtZVRhZykpOwor ICAgIHJldHVybiBvd25lci0+aGFzVGFnTmFtZShmcmFtZVRhZykgfHwgb3duZXItPmhhc1RhZ05h bWUoaWZyYW1lVGFnKTsKIH0KIAogYm9vbCBGcmFtZVZpZXc6OmF2b2lkU2Nyb2xsYmFyQ3JlYXRp b24oKSBjb25zdAogewogICAgIEFTU0VSVChtX2ZyYW1lKTsKLQogICAgIC8vIHdpdGggZnJhbWUg ZmxhdHRlbmluZyBubyBzdWJmcmFtZSBjYW4gaGF2ZSBzY3JvbGxiYXJzCiAgICAgLy8gYnV0IHdl IGFsc28gY2Fubm90IHR1cm4gc2Nyb2xsYmFycyBvZmYgYXMgd2UgZGV0ZXJtaW5lCiAgICAgLy8g b3VyIGZsYXR0ZW5pbmcgcG9saWN5IHVzaW5nIHRoYXQuCi0KLSAgICByZXR1cm4gZnJhbWVGbGF0 dGVuaW5nRW5hYmxlZChmcmFtZSgpKSAmJiBzdXBwb3J0c0ZyYW1lRmxhdHRlbmluZyhmcmFtZSgp KTsKKyAgICByZXR1cm4gaXNGcmFtZUZsYXR0ZW5pbmdWYWxpZEZvclRoaXNGcmFtZSgpOwogfQog CiB2b2lkIEZyYW1lVmlldzo6c2V0Q2FuSGF2ZVNjcm9sbGJhcnMoYm9vbCBjYW5IYXZlU2Nyb2xs YmFycykKQEAgLTc0Myw3ICs3NDcsNyBAQCB2b2lkIEZyYW1lVmlldzo6Y2FsY3VsYXRlU2Nyb2xs YmFyTW9kZXNGb3JMYXlvdXQoU2Nyb2xsYmFyTW9kZSYgaE1vZGUsIFNjcm9sbGJhcgogICAgICAg ICBSZW5kZXJPYmplY3QqIHJvb3RSZW5kZXJlciA9IGRvY3VtZW50RWxlbWVudCA/IGRvY3VtZW50 RWxlbWVudC0+cmVuZGVyZXIoKSA6IDA7CiAgICAgICAgIE5vZGUqIGJvZHkgPSBkb2N1bWVudC0+ Ym9keSgpOwogICAgICAgICBpZiAoYm9keSAmJiBib2R5LT5yZW5kZXJlcigpKSB7Ci0gICAgICAg ICAgICBpZiAoYm9keS0+aGFzVGFnTmFtZShmcmFtZXNldFRhZykgJiYgIWZyYW1lRmxhdHRlbmlu Z0VuYWJsZWQoZnJhbWUoKSkpIHsKKyAgICAgICAgICAgIGlmIChib2R5LT5oYXNUYWdOYW1lKGZy YW1lc2V0VGFnKSAmJiAhZnJhbWVGbGF0dGVuaW5nRW5hYmxlZCgpKSB7CiAgICAgICAgICAgICAg ICAgdk1vZGUgPSBTY3JvbGxiYXJBbHdheXNPZmY7CiAgICAgICAgICAgICAgICAgaE1vZGUgPSBT Y3JvbGxiYXJBbHdheXNPZmY7CiAgICAgICAgICAgICB9IGVsc2UgaWYgKGJvZHktPmhhc1RhZ05h bWUoYm9keVRhZykpIHsKQEAgLTEyMzMsNyArMTIzNyw3IEBAIHZvaWQgRnJhbWVWaWV3OjpsYXlv dXQoYm9vbCBhbGxvd1N1YnRyZWUpCiAgICAgICAgICAgICBEb2N1bWVudCogZG9jdW1lbnQgPSBt X2ZyYW1lLT5kb2N1bWVudCgpOwogICAgICAgICAgICAgTm9kZSogYm9keSA9IGRvY3VtZW50LT5i b2R5KCk7CiAgICAgICAgICAgICBpZiAoYm9keSAmJiBib2R5LT5yZW5kZXJlcigpKSB7Ci0gICAg ICAgICAgICAgICAgaWYgKGJvZHktPmhhc1RhZ05hbWUoZnJhbWVzZXRUYWcpICYmICFmcmFtZUZs YXR0ZW5pbmdFbmFibGVkKGZyYW1lKCkpKSB7CisgICAgICAgICAgICAgICAgaWYgKGJvZHktPmhh c1RhZ05hbWUoZnJhbWVzZXRUYWcpICYmICFmcmFtZUZsYXR0ZW5pbmdFbmFibGVkKCkpIHsKICAg ICAgICAgICAgICAgICAgICAgYm9keS0+cmVuZGVyZXIoKS0+c2V0Q2hpbGROZWVkc0xheW91dCh0 cnVlKTsKICAgICAgICAgICAgICAgICB9IGVsc2UgaWYgKGJvZHktPmhhc1RhZ05hbWUoYm9keVRh ZykpIHsKICAgICAgICAgICAgICAgICAgICAgaWYgKCFtX2ZpcnN0TGF5b3V0ICYmIG1fc2l6ZS5o ZWlnaHQoKSAhPSBsYXlvdXRIZWlnaHQoKSAmJiBib2R5LT5yZW5kZXJlcigpLT5lbmNsb3NpbmdC b3goKS0+c3RyZXRjaGVzVG9WaWV3cG9ydCgpKQpAQCAtMzQ2Miw3ICszNDY2LDcgQEAgYm9vbCBG cmFtZVZpZXc6OmlzSW5DaGlsZEZyYW1lV2l0aEZyYW1lRmxhdHRlbmluZygpIGNvbnN0CiAgICAg ICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAKLSAgICBpZiAoIWZyYW1lRmxhdHRlbmluZ0Vu YWJsZWQoZnJhbWUoKSkpCisgICAgaWYgKCFmcmFtZUZsYXR0ZW5pbmdFbmFibGVkKCkpCiAgICAg ICAgIHJldHVybiBmYWxzZTsKIAogICAgIGlmIChtX2ZyYW1lLT5vd25lckVsZW1lbnQoKS0+aGFz VGFnTmFtZShmcmFtZVRhZykpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1l Vmlldy5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaAppbmRleCA0MzFiMjkzYTAz M2MwMjI1YjAzYzBkNzQ5ZjJlYWU0ODllOGIwYTU2Li42MDQwYzliYzczNjkyMjBmZmZmMjY4MzVi MjViNDA4NDkwMDk3MDU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmll dy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgKQEAgLTQzOSw5ICs0Mzks NiBAQCBwdWJsaWM6CiAgICAgCiAgICAgdm9pZCBzZXRTY3JvbGxQaW5uaW5nQmVoYXZpb3IoU2Ny b2xsUGlubmluZ0JlaGF2aW9yKTsKIAotICAgIHZvaWQgc2V0UmVzaXplRXZlbnRBbGxvd2VkKGJv b2wgcmVzaXplRXZlbnRBbGxvd2VkKSB7IG1fcmVzaXplRXZlbnRBbGxvd2VkID0gcmVzaXplRXZl bnRBbGxvd2VkOyB9Ci0gICAgYm9vbCByZXNpemVFdmVudEFsbG93ZWQoKSBjb25zdCB7IHJldHVy biBtX3Jlc2l6ZUV2ZW50QWxsb3dlZDsgfQotCiBwcm90ZWN0ZWQ6CiAgICAgdmlydHVhbCBib29s IHNjcm9sbENvbnRlbnRzRmFzdFBhdGgoY29uc3QgSW50U2l6ZSYgc2Nyb2xsRGVsdGEsIGNvbnN0 IEludFJlY3QmIHJlY3RUb1Njcm9sbCwgY29uc3QgSW50UmVjdCYgY2xpcFJlY3QpOwogICAgIHZp cnR1YWwgdm9pZCBzY3JvbGxDb250ZW50c1Nsb3dQYXRoKGNvbnN0IEludFJlY3QmIHVwZGF0ZVJl Y3QpOwpAQCAtNTM4LDYgKzUzNSw4IEBAIHByaXZhdGU6CiAgICAgRnJhbWVWaWV3KiBwYXJlbnRG cmFtZVZpZXcoKSBjb25zdDsKIAogICAgIGJvb2wgZG9MYXlvdXRXaXRoRnJhbWVGbGF0dGVuaW5n KGJvb2wgYWxsb3dTdWJ0cmVlKTsKKyAgICBib29sIGZyYW1lRmxhdHRlbmluZ0VuYWJsZWQoKSBj b25zdDsKKyAgICBib29sIGlzRnJhbWVGbGF0dGVuaW5nVmFsaWRGb3JUaGlzRnJhbWUoKSBjb25z dDsKIAogICAgIGJvb2wgcXVhbGlmaWVzQXNWaXN1YWxseU5vbkVtcHR5KCkgY29uc3Q7CiAKQEAg LTY3NCw3ICs2NzMsNiBAQCBwcml2YXRlOgogICAgIGJvb2wgbV92aXN1YWxVcGRhdGVzQWxsb3dl ZEJ5Q2xpZW50OwogICAgIAogICAgIFNjcm9sbFBpbm5pbmdCZWhhdmlvciBtX3Njcm9sbFBpbm5p bmdCZWhhdmlvcjsKLSAgICBib29sIG1fcmVzaXplRXZlbnRBbGxvd2VkOwogfTsKIAogaW5saW5l IHZvaWQgRnJhbWVWaWV3OjppbmNyZW1lbnRWaXN1YWxseU5vbkVtcHR5Q2hhcmFjdGVyQ291bnQo dW5zaWduZWQgY291bnQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyRnJhbWVCYXNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGcmFtZUJh c2UuY3BwCmluZGV4IGI1NWNiNzkyMDE4MzQ4ZTIxYWYyNzgxOTM5YmIyODg4MTdiMzE3NTEuLjk0 YzA5MDAyY2RmZWUxNjgxOTM1ZTc1YTM3MGE2ZDZkNGY5MWMwYzcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGcmFtZUJhc2UuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJGcmFtZUJhc2UuY3BwCkBAIC02NSw4ICs2NSw2IEBAIHZvaWQg UmVuZGVyRnJhbWVCYXNlOjpsYXlvdXRXaXRoRmxhdHRlbmluZyhib29sIGhhc0ZpeGVkV2lkdGgs IGJvb2wgaGFzRml4ZWRIZWlnCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBjaGlsZEZy YW1lVmlldy0+c2V0UmVzaXplRXZlbnRBbGxvd2VkKGZhbHNlKTsKLQogICAgIC8vIG5lZWQgdG8g dXBkYXRlIHRvIGNhbGN1bGF0ZSBtaW4vbWF4IGNvcnJlY3RseQogICAgIHVwZGF0ZVdpZGdldFBv c2l0aW9uKCk7CiAKQEAgLTk1LDcgKzkzLDYgQEAgdm9pZCBSZW5kZXJGcmFtZUJhc2U6OmxheW91 dFdpdGhGbGF0dGVuaW5nKGJvb2wgaGFzRml4ZWRXaWR0aCwgYm9vbCBoYXNGaXhlZEhlaWcKICAg ICAgICAgc2V0V2lkdGgobWF4PExheW91dFVuaXQ+KHdpZHRoKCksIGNoaWxkRnJhbWVWaWV3LT5j b250ZW50c1dpZHRoKCkgKyBoQm9yZGVyKSk7CiAKICAgICB1cGRhdGVXaWRnZXRQb3NpdGlvbigp OwotICAgIGNoaWxkRnJhbWVWaWV3LT5zZXRSZXNpemVFdmVudEFsbG93ZWQodHJ1ZSk7CiAKICAg ICBBU1NFUlQoIWNoaWxkRnJhbWVWaWV3LT5sYXlvdXRQZW5kaW5nKCkpOwogICAgIEFTU0VSVCgh Y2hpbGRSb290LT5uZWVkc0xheW91dCgpKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBlMzJhNGNhNTAyZWI5ZWFmOWMxYTZm OTA5ZWEzYTI3NzFmOTAzMDU1Li5kZmQ2MzMxMjQ0YzI1ZWEwNmI4MjFjYTRmOTk3Zjk2ZjMyZWNl MjliIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTMtMDgtMDEgIFphbGFuIEJ1anRhcyAgPHph bGFuQGFwcGxlLmNvbT4KKworICAgICAgICBGcmFtZSBmbGF0dGVuaW5nOiBDaGFuZ2UgdGhlIGxv Z2ljIG9uIHdoZXRoZXIgcmVzaXplIGV2ZW50IG5lZWRzIHRvIGJlIGRpc3BhdGNoZWQuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTkzOTQKKworICAg ICAgICBSZXZpZXdlZCBieSBTaW1vbiBGcmFzZXIuCisKKyAgICAgICAgaHR0cDovL3RyYWMud2Vi a2l0Lm9yZy9jaGFuZ2VzZXQvMTQ5Mjg3IGNoYW5nZWQgdGhlIGxvZ2ljIHNvIHRoYXQgcmVzaXpl IGV2ZW50cyBhcmUKKyAgICAgICAgc2VudCBvdXQgZnJvbSBGcmFtZVZpZXc6OnNldEZyYW1lUmVj dCgpIHRvby4gQ2hlY2tpbmcgd2hldGhlciBmcmFtZSBmbGF0dGVuaW5nIGlzCisgICAgICAgIGVu YWJsZWQgaXMgc3VmZmljaWVudCBlbm91Z2ggdG8gZW5zdXJlIHRoYXQgbm8gZXh0cmEgcmVzaXpl IGV2ZW50cyBhcmUgZGlzcGF0Y2hlZC4KKworICAgICAgICAqIGZhc3QvZnJhbWVzL2ZsYXR0ZW5p bmcvaWZyYW1lLWZsYXR0ZW5pbmctcmVzaXplLWV2ZW50LWNvdW50LWV4cGVjdGVkLnR4dDogQWRk ZWQuCisgICAgICAgICogZmFzdC9mcmFtZXMvZmxhdHRlbmluZy9pZnJhbWUtZmxhdHRlbmluZy1y ZXNpemUtZXZlbnQtY291bnQuaHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC9mcmFtZXMvZmxh dHRlbmluZy9yZXNvdXJjZXMvaWZyYW1lLXRvLXJlc2l6ZS5odG1sOiBBZGRlZC4KKwogMjAxMy0w Ny0zMCAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBE SFRNTCBkcmFnIGNhbiByZXN1bHQgaW4gYSBudWxsLWRlcmVmIHVuZGVyIFdlYkRyYWdDbGllbnQ6 OnN0YXJ0RHJhZwo= 207991 2013-08-02 01:08:42 -0700 2013-08-02 01:57:12 -0700 Patch for landing bug-119394-20130802110839.patch text/plain 11078 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTUzNTIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjUxNmZiMWE1YjE2ZGU5 Y2ZkZmJkN2QyYzFiNGFiZTkzZDEwMDdiNS4uYTZjY2NmMDMwY2QzYWU5YjNkNDZiMDIxOWNiZTBi ZWFhMWNiOTRkMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEzLTA4LTAxICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgRnJhbWUgZmxhdHRlbmluZzog Q2hhbmdlIHRoZSBsb2dpYyBvbiB3aGV0aGVyIHJlc2l6ZSBldmVudCBuZWVkcyB0byBiZSBkaXNw YXRjaGVkLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTE5Mzk0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gRnJhc2VyLgorCisgICAgICAgIGh0 dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzE0OTI4NyBjaGFuZ2VkIHRoZSBsb2dpYyBz byB0aGF0IHJlc2l6ZSBldmVudHMgYXJlCisgICAgICAgIHNlbnQgb3V0IGZyb20gRnJhbWVWaWV3 OjpzZXRGcmFtZVJlY3QoKSB0b28uIENoZWNraW5nIHdoZXRoZXIgZnJhbWUgZmxhdHRlbmluZyBp cworICAgICAgICBlbmFibGVkIGlzIHN1ZmZpY2llbnQgZW5vdWdoIHRvIGVuc3VyZSB0aGF0IG5v IGV4dHJhIHJlc2l6ZSBldmVudHMgYXJlIGRpc3BhdGNoZWQuCisKKyAgICAgICAgVGVzdDogZmFz dC9mcmFtZXMvZmxhdHRlbmluZy9pZnJhbWUtZmxhdHRlbmluZy1yZXNpemUtZXZlbnQtY291bnQu aHRtbAorCisgICAgICAgICogcGFnZS9GcmFtZVZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 RnJhbWVWaWV3OjpGcmFtZVZpZXcpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpzZXRG cmFtZVJlY3QpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpmcmFtZUZsYXR0ZW5pbmdF bmFibGVkKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6c3VwcG9ydHNGcmFtZUZsYXR0 ZW5pbmcpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3Ojphdm9pZFNjcm9sbGJhckNyZWF0 aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6Y2FsY3VsYXRlU2Nyb2xsYmFyTW9k ZXNGb3JMYXlvdXQpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpsYXlvdXQpOgorICAg ICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3Ojppc0luQ2hpbGRGcmFtZVdpdGhGcmFtZUZsYXR0ZW5p bmcpOgorICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3Lmg6CisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckZyYW1lQmFzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGcmFtZUJhc2U6Omxh eW91dFdpdGhGbGF0dGVuaW5nKToKKwogMjAxMy0wNy0zMSAgR3J6ZWdvcnogQ3phamtvd3NraSAg PGcuY3phamtvd3NraUBzYW1zdW5nLmNvbT4KIAogICAgICAgICBSZW1vdmUgZ3Vlc3Nlc1ZlY3Rv ciBwYXJhbSBmcm9tIGlzVW5ncmFtbWF0aWNhbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGFnZS9GcmFtZVZpZXcuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCmlu ZGV4IGMzZDJmYTU3ZTM5NTllZDU1ZDlhNjMwNzZjZDFjMzgwMmU2YTJlYTkuLjFkN2Q2MGNlN2Qy ZTkzZWQ4ZDhiYWI4OWQ3ODA4YmEyOGU5OTk0NTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvRnJhbWVWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5j cHAKQEAgLTIwNCw3ICsyMDQsNiBAQCBGcmFtZVZpZXc6OkZyYW1lVmlldyhGcmFtZSogZnJhbWUp CiAjZW5kaWYKICAgICAsIG1fdmlzdWFsVXBkYXRlc0FsbG93ZWRCeUNsaWVudCh0cnVlKQogICAg ICwgbV9zY3JvbGxQaW5uaW5nQmVoYXZpb3IoRG9Ob3RQaW4pCi0gICAgLCBtX3Jlc2l6ZUV2ZW50 QWxsb3dlZCh0cnVlKQogewogICAgIGluaXQoKTsKIApAQCAtNDgyLDcgKzQ4MSw3IEBAIHZvaWQg RnJhbWVWaWV3OjpzZXRGcmFtZVJlY3QoY29uc3QgSW50UmVjdCYgbmV3UmVjdCkKICAgICB9CiAj ZW5kaWYKIAotICAgIGlmIChtX3Jlc2l6ZUV2ZW50QWxsb3dlZCkKKyAgICBpZiAoIWZyYW1lRmxh dHRlbmluZ0VuYWJsZWQoKSkKICAgICAgICAgc2VuZFJlc2l6ZUV2ZW50SWZOZWVkZWQoKTsKIH0K IApAQCAtNTA5LDMwICs1MDgsMzUgQEAgdm9pZCBGcmFtZVZpZXc6OnNldE1hcmdpbkhlaWdodChM YXlvdXRVbml0IGgpCiAgICAgbV9tYXJnaW5zLnNldEhlaWdodChoKTsKIH0KIAotc3RhdGljIGJv b2wgZnJhbWVGbGF0dGVuaW5nRW5hYmxlZChGcmFtZSogZnJhbWUpCitib29sIEZyYW1lVmlldzo6 ZnJhbWVGbGF0dGVuaW5nRW5hYmxlZCgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIGZyYW1lICYmIGZy YW1lLT5zZXR0aW5ncygpICYmIGZyYW1lLT5zZXR0aW5ncygpLT5mcmFtZUZsYXR0ZW5pbmdFbmFi bGVkKCk7CisgICAgU2V0dGluZ3MqIHNldHRpbmdzID0gZnJhbWUoKSA/IGZyYW1lKCktPnNldHRp bmdzKCkgOiAwOworICAgIGlmICghc2V0dGluZ3MpCisgICAgICAgIHJldHVybiBmYWxzZTsKKwor ICAgIHJldHVybiBzZXR0aW5ncy0+ZnJhbWVGbGF0dGVuaW5nRW5hYmxlZCgpOwogfQogCi1zdGF0 aWMgYm9vbCBzdXBwb3J0c0ZyYW1lRmxhdHRlbmluZyhGcmFtZSogZnJhbWUpCitib29sIEZyYW1l Vmlldzo6aXNGcmFtZUZsYXR0ZW5pbmdWYWxpZEZvclRoaXNGcmFtZSgpIGNvbnN0CiB7Ci0gICAg aWYgKCFmcmFtZSkKKyAgICBpZiAoIWZyYW1lRmxhdHRlbmluZ0VuYWJsZWQoKSkKKyAgICAgICAg cmV0dXJuIGZhbHNlOworCisgICAgSFRNTEZyYW1lT3duZXJFbGVtZW50KiBvd25lciA9IGZyYW1l KCkgPyBmcmFtZSgpLT5vd25lckVsZW1lbnQoKSA6IDA7CisgICAgaWYgKCFvd25lcikKICAgICAg ICAgcmV0dXJuIGZhbHNlOwogCiAgICAgLy8gRnJhbWUgZmxhdHRlbmluZyBpcyB2YWxpZCBvbmx5 IGZvciA8ZnJhbWU+IGFuZCA8aWZyYW1lPi4KLSAgICBIVE1MRnJhbWVPd25lckVsZW1lbnQqIG93 bmVyID0gZnJhbWUtPm93bmVyRWxlbWVudCgpOwotICAgIHJldHVybiBvd25lciAmJiAob3duZXIt Pmhhc1RhZ05hbWUoZnJhbWVUYWcpIHx8IG93bmVyLT5oYXNUYWdOYW1lKGlmcmFtZVRhZykpOwor ICAgIHJldHVybiBvd25lci0+aGFzVGFnTmFtZShmcmFtZVRhZykgfHwgb3duZXItPmhhc1RhZ05h bWUoaWZyYW1lVGFnKTsKIH0KIAogYm9vbCBGcmFtZVZpZXc6OmF2b2lkU2Nyb2xsYmFyQ3JlYXRp b24oKSBjb25zdAogewogICAgIEFTU0VSVChtX2ZyYW1lKTsKLQogICAgIC8vIHdpdGggZnJhbWUg ZmxhdHRlbmluZyBubyBzdWJmcmFtZSBjYW4gaGF2ZSBzY3JvbGxiYXJzCiAgICAgLy8gYnV0IHdl IGFsc28gY2Fubm90IHR1cm4gc2Nyb2xsYmFycyBvZmYgYXMgd2UgZGV0ZXJtaW5lCiAgICAgLy8g b3VyIGZsYXR0ZW5pbmcgcG9saWN5IHVzaW5nIHRoYXQuCi0KLSAgICByZXR1cm4gZnJhbWVGbGF0 dGVuaW5nRW5hYmxlZChmcmFtZSgpKSAmJiBzdXBwb3J0c0ZyYW1lRmxhdHRlbmluZyhmcmFtZSgp KTsKKyAgICByZXR1cm4gaXNGcmFtZUZsYXR0ZW5pbmdWYWxpZEZvclRoaXNGcmFtZSgpOwogfQog CiB2b2lkIEZyYW1lVmlldzo6c2V0Q2FuSGF2ZVNjcm9sbGJhcnMoYm9vbCBjYW5IYXZlU2Nyb2xs YmFycykKQEAgLTc0Myw3ICs3NDcsNyBAQCB2b2lkIEZyYW1lVmlldzo6Y2FsY3VsYXRlU2Nyb2xs YmFyTW9kZXNGb3JMYXlvdXQoU2Nyb2xsYmFyTW9kZSYgaE1vZGUsIFNjcm9sbGJhcgogICAgICAg ICBSZW5kZXJPYmplY3QqIHJvb3RSZW5kZXJlciA9IGRvY3VtZW50RWxlbWVudCA/IGRvY3VtZW50 RWxlbWVudC0+cmVuZGVyZXIoKSA6IDA7CiAgICAgICAgIE5vZGUqIGJvZHkgPSBkb2N1bWVudC0+ Ym9keSgpOwogICAgICAgICBpZiAoYm9keSAmJiBib2R5LT5yZW5kZXJlcigpKSB7Ci0gICAgICAg ICAgICBpZiAoYm9keS0+aGFzVGFnTmFtZShmcmFtZXNldFRhZykgJiYgIWZyYW1lRmxhdHRlbmlu Z0VuYWJsZWQoZnJhbWUoKSkpIHsKKyAgICAgICAgICAgIGlmIChib2R5LT5oYXNUYWdOYW1lKGZy YW1lc2V0VGFnKSAmJiAhZnJhbWVGbGF0dGVuaW5nRW5hYmxlZCgpKSB7CiAgICAgICAgICAgICAg ICAgdk1vZGUgPSBTY3JvbGxiYXJBbHdheXNPZmY7CiAgICAgICAgICAgICAgICAgaE1vZGUgPSBT Y3JvbGxiYXJBbHdheXNPZmY7CiAgICAgICAgICAgICB9IGVsc2UgaWYgKGJvZHktPmhhc1RhZ05h bWUoYm9keVRhZykpIHsKQEAgLTEyMzMsNyArMTIzNyw3IEBAIHZvaWQgRnJhbWVWaWV3OjpsYXlv dXQoYm9vbCBhbGxvd1N1YnRyZWUpCiAgICAgICAgICAgICBEb2N1bWVudCogZG9jdW1lbnQgPSBt X2ZyYW1lLT5kb2N1bWVudCgpOwogICAgICAgICAgICAgTm9kZSogYm9keSA9IGRvY3VtZW50LT5i b2R5KCk7CiAgICAgICAgICAgICBpZiAoYm9keSAmJiBib2R5LT5yZW5kZXJlcigpKSB7Ci0gICAg ICAgICAgICAgICAgaWYgKGJvZHktPmhhc1RhZ05hbWUoZnJhbWVzZXRUYWcpICYmICFmcmFtZUZs YXR0ZW5pbmdFbmFibGVkKGZyYW1lKCkpKSB7CisgICAgICAgICAgICAgICAgaWYgKGJvZHktPmhh c1RhZ05hbWUoZnJhbWVzZXRUYWcpICYmICFmcmFtZUZsYXR0ZW5pbmdFbmFibGVkKCkpIHsKICAg ICAgICAgICAgICAgICAgICAgYm9keS0+cmVuZGVyZXIoKS0+c2V0Q2hpbGROZWVkc0xheW91dCh0 cnVlKTsKICAgICAgICAgICAgICAgICB9IGVsc2UgaWYgKGJvZHktPmhhc1RhZ05hbWUoYm9keVRh ZykpIHsKICAgICAgICAgICAgICAgICAgICAgaWYgKCFtX2ZpcnN0TGF5b3V0ICYmIG1fc2l6ZS5o ZWlnaHQoKSAhPSBsYXlvdXRIZWlnaHQoKSAmJiBib2R5LT5yZW5kZXJlcigpLT5lbmNsb3NpbmdC b3goKS0+c3RyZXRjaGVzVG9WaWV3cG9ydCgpKQpAQCAtMzQ2Miw3ICszNDY2LDcgQEAgYm9vbCBG cmFtZVZpZXc6OmlzSW5DaGlsZEZyYW1lV2l0aEZyYW1lRmxhdHRlbmluZygpIGNvbnN0CiAgICAg ICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAKLSAgICBpZiAoIWZyYW1lRmxhdHRlbmluZ0Vu YWJsZWQoZnJhbWUoKSkpCisgICAgaWYgKCFmcmFtZUZsYXR0ZW5pbmdFbmFibGVkKCkpCiAgICAg ICAgIHJldHVybiBmYWxzZTsKIAogICAgIGlmIChtX2ZyYW1lLT5vd25lckVsZW1lbnQoKS0+aGFz VGFnTmFtZShmcmFtZVRhZykpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1l Vmlldy5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaAppbmRleCA0MzFiMjkzYTAz M2MwMjI1YjAzYzBkNzQ5ZjJlYWU0ODllOGIwYTU2Li42MDQwYzliYzczNjkyMjBmZmZmMjY4MzVi MjViNDA4NDkwMDk3MDU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmll dy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgKQEAgLTQzOSw5ICs0Mzks NiBAQCBwdWJsaWM6CiAgICAgCiAgICAgdm9pZCBzZXRTY3JvbGxQaW5uaW5nQmVoYXZpb3IoU2Ny b2xsUGlubmluZ0JlaGF2aW9yKTsKIAotICAgIHZvaWQgc2V0UmVzaXplRXZlbnRBbGxvd2VkKGJv b2wgcmVzaXplRXZlbnRBbGxvd2VkKSB7IG1fcmVzaXplRXZlbnRBbGxvd2VkID0gcmVzaXplRXZl bnRBbGxvd2VkOyB9Ci0gICAgYm9vbCByZXNpemVFdmVudEFsbG93ZWQoKSBjb25zdCB7IHJldHVy biBtX3Jlc2l6ZUV2ZW50QWxsb3dlZDsgfQotCiBwcm90ZWN0ZWQ6CiAgICAgdmlydHVhbCBib29s IHNjcm9sbENvbnRlbnRzRmFzdFBhdGgoY29uc3QgSW50U2l6ZSYgc2Nyb2xsRGVsdGEsIGNvbnN0 IEludFJlY3QmIHJlY3RUb1Njcm9sbCwgY29uc3QgSW50UmVjdCYgY2xpcFJlY3QpOwogICAgIHZp cnR1YWwgdm9pZCBzY3JvbGxDb250ZW50c1Nsb3dQYXRoKGNvbnN0IEludFJlY3QmIHVwZGF0ZVJl Y3QpOwpAQCAtNTM4LDYgKzUzNSw4IEBAIHByaXZhdGU6CiAgICAgRnJhbWVWaWV3KiBwYXJlbnRG cmFtZVZpZXcoKSBjb25zdDsKIAogICAgIGJvb2wgZG9MYXlvdXRXaXRoRnJhbWVGbGF0dGVuaW5n KGJvb2wgYWxsb3dTdWJ0cmVlKTsKKyAgICBib29sIGZyYW1lRmxhdHRlbmluZ0VuYWJsZWQoKSBj b25zdDsKKyAgICBib29sIGlzRnJhbWVGbGF0dGVuaW5nVmFsaWRGb3JUaGlzRnJhbWUoKSBjb25z dDsKIAogICAgIGJvb2wgcXVhbGlmaWVzQXNWaXN1YWxseU5vbkVtcHR5KCkgY29uc3Q7CiAKQEAg LTY3NCw3ICs2NzMsNiBAQCBwcml2YXRlOgogICAgIGJvb2wgbV92aXN1YWxVcGRhdGVzQWxsb3dl ZEJ5Q2xpZW50OwogICAgIAogICAgIFNjcm9sbFBpbm5pbmdCZWhhdmlvciBtX3Njcm9sbFBpbm5p bmdCZWhhdmlvcjsKLSAgICBib29sIG1fcmVzaXplRXZlbnRBbGxvd2VkOwogfTsKIAogaW5saW5l IHZvaWQgRnJhbWVWaWV3OjppbmNyZW1lbnRWaXN1YWxseU5vbkVtcHR5Q2hhcmFjdGVyQ291bnQo dW5zaWduZWQgY291bnQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyRnJhbWVCYXNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGcmFtZUJh c2UuY3BwCmluZGV4IGI1NWNiNzkyMDE4MzQ4ZTIxYWYyNzgxOTM5YmIyODg4MTdiMzE3NTEuLjk0 YzA5MDAyY2RmZWUxNjgxOTM1ZTc1YTM3MGE2ZDZkNGY5MWMwYzcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGcmFtZUJhc2UuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJGcmFtZUJhc2UuY3BwCkBAIC02NSw4ICs2NSw2IEBAIHZvaWQg UmVuZGVyRnJhbWVCYXNlOjpsYXlvdXRXaXRoRmxhdHRlbmluZyhib29sIGhhc0ZpeGVkV2lkdGgs IGJvb2wgaGFzRml4ZWRIZWlnCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBjaGlsZEZy YW1lVmlldy0+c2V0UmVzaXplRXZlbnRBbGxvd2VkKGZhbHNlKTsKLQogICAgIC8vIG5lZWQgdG8g dXBkYXRlIHRvIGNhbGN1bGF0ZSBtaW4vbWF4IGNvcnJlY3RseQogICAgIHVwZGF0ZVdpZGdldFBv c2l0aW9uKCk7CiAKQEAgLTk1LDcgKzkzLDYgQEAgdm9pZCBSZW5kZXJGcmFtZUJhc2U6OmxheW91 dFdpdGhGbGF0dGVuaW5nKGJvb2wgaGFzRml4ZWRXaWR0aCwgYm9vbCBoYXNGaXhlZEhlaWcKICAg ICAgICAgc2V0V2lkdGgobWF4PExheW91dFVuaXQ+KHdpZHRoKCksIGNoaWxkRnJhbWVWaWV3LT5j b250ZW50c1dpZHRoKCkgKyBoQm9yZGVyKSk7CiAKICAgICB1cGRhdGVXaWRnZXRQb3NpdGlvbigp OwotICAgIGNoaWxkRnJhbWVWaWV3LT5zZXRSZXNpemVFdmVudEFsbG93ZWQodHJ1ZSk7CiAKICAg ICBBU1NFUlQoIWNoaWxkRnJhbWVWaWV3LT5sYXlvdXRQZW5kaW5nKCkpOwogICAgIEFTU0VSVCgh Y2hpbGRSb290LT5uZWVkc0xheW91dCgpKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBlMzJhNGNhNTAyZWI5ZWFmOWMxYTZm OTA5ZWEzYTI3NzFmOTAzMDU1Li5kZmQ2MzMxMjQ0YzI1ZWEwNmI4MjFjYTRmOTk3Zjk2ZjMyZWNl MjliIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTMtMDgtMDEgIFphbGFuIEJ1anRhcyAgPHph bGFuQGFwcGxlLmNvbT4KKworICAgICAgICBGcmFtZSBmbGF0dGVuaW5nOiBDaGFuZ2UgdGhlIGxv Z2ljIG9uIHdoZXRoZXIgcmVzaXplIGV2ZW50IG5lZWRzIHRvIGJlIGRpc3BhdGNoZWQuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTkzOTQKKworICAg ICAgICBSZXZpZXdlZCBieSBTaW1vbiBGcmFzZXIuCisKKyAgICAgICAgaHR0cDovL3RyYWMud2Vi a2l0Lm9yZy9jaGFuZ2VzZXQvMTQ5Mjg3IGNoYW5nZWQgdGhlIGxvZ2ljIHNvIHRoYXQgcmVzaXpl IGV2ZW50cyBhcmUKKyAgICAgICAgc2VudCBvdXQgZnJvbSBGcmFtZVZpZXc6OnNldEZyYW1lUmVj dCgpIHRvby4gQ2hlY2tpbmcgd2hldGhlciBmcmFtZSBmbGF0dGVuaW5nIGlzCisgICAgICAgIGVu YWJsZWQgaXMgc3VmZmljaWVudCBlbm91Z2ggdG8gZW5zdXJlIHRoYXQgbm8gZXh0cmEgcmVzaXpl IGV2ZW50cyBhcmUgZGlzcGF0Y2hlZC4KKworICAgICAgICAqIGZhc3QvZnJhbWVzL2ZsYXR0ZW5p bmcvaWZyYW1lLWZsYXR0ZW5pbmctcmVzaXplLWV2ZW50LWNvdW50LWV4cGVjdGVkLnR4dDogQWRk ZWQuCisgICAgICAgICogZmFzdC9mcmFtZXMvZmxhdHRlbmluZy9pZnJhbWUtZmxhdHRlbmluZy1y ZXNpemUtZXZlbnQtY291bnQuaHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC9mcmFtZXMvZmxh dHRlbmluZy9yZXNvdXJjZXMvaWZyYW1lLXRvLXJlc2l6ZS5odG1sOiBBZGRlZC4KKwogMjAxMy0w Ny0zMCAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBE SFRNTCBkcmFnIGNhbiByZXN1bHQgaW4gYSBudWxsLWRlcmVmIHVuZGVyIFdlYkRyYWdDbGllbnQ6 OnN0YXJ0RHJhZwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9mcmFtZXMvZmxhdHRlbmlu Zy9pZnJhbWUtZmxhdHRlbmluZy1yZXNpemUtZXZlbnQtY291bnQtZXhwZWN0ZWQudHh0IGIvTGF5 b3V0VGVzdHMvZmFzdC9mcmFtZXMvZmxhdHRlbmluZy9pZnJhbWUtZmxhdHRlbmluZy1yZXNpemUt ZXZlbnQtY291bnQtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjQ4YjU0OGRlY2VlODk3M2EyM2Qz NDk3NGJjYjY0Y2Q4MDk2Mzc2ZDEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0 L2ZyYW1lcy9mbGF0dGVuaW5nL2lmcmFtZS1mbGF0dGVuaW5nLXJlc2l6ZS1ldmVudC1jb3VudC1l eHBlY3RlZC50eHQKQEAgLTAsMCArMSw1IEBACitUaGlzIHRlc3RzIHRoZSBudW1iZXIgb2YgcmVz aXplIGV2ZW50cyBkaXNwYXRjaGVkIHRvIEphdmFTY3JpcHQuCisKK1BBU1MKKworCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9mYXN0L2ZyYW1lcy9mbGF0dGVuaW5nL2lmcmFtZS1mbGF0dGVuaW5n LXJlc2l6ZS1ldmVudC1jb3VudC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9mcmFtZXMvZmxhdHRl bmluZy9pZnJhbWUtZmxhdHRlbmluZy1yZXNpemUtZXZlbnQtY291bnQuaHRtbApuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw Li5hZDBjZDAyZmIxYWQ3NWQ5ZThjODNkZDQ1Y2RiZGE0NDIxMzkwMTc1Ci0tLSAvZGV2L251bGwK KysrIGIvTGF5b3V0VGVzdHMvZmFzdC9mcmFtZXMvZmxhdHRlbmluZy9pZnJhbWUtZmxhdHRlbmlu Zy1yZXNpemUtZXZlbnQtY291bnQuaHRtbApAQCAtMCwwICsxLDIxIEBACis8IURPQ1RZUEUgaHRt bD4KKzxodG1sPgorPGhlYWQ+Cis8c2NyaXB0PgorICBmdW5jdGlvbiBzdGFydCgpIHsKKyAgICBp ZiAod2luZG93LmludGVybmFscykKKyAgICAgIGludGVybmFscy5zZXR0aW5ncy5zZXRGcmFtZUZs YXR0ZW5pbmdFbmFibGVkKHRydWUpOworICAgICAgCisgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVy KSB7CisgICAgICB0ZXN0UnVubmVyLmR1bXBBc1RleHQoKTsKKyAgICAgIHRlc3RSdW5uZXIud2Fp dFVudGlsRG9uZSgpOworICAgIH0KKyAgfQorPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKyAg PHA+VGhpcyB0ZXN0cyB0aGUgbnVtYmVyIG9mIHJlc2l6ZSBldmVudHMgZGlzcGF0Y2hlZCB0byBK YXZhU2NyaXB0LjwvcD4KKyAgPHAgaWQ9J3Jlc3VsdCc+PC9wPgorICA8aWZyYW1lIG9ubG9hZD0n c3RhcnQoKTsnIGZyYW1lYm9yZGVyPTA7IHNyYz0ncmVzb3VyY2VzL2lmcmFtZS10by1yZXNpemUu aHRtbCc+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Zy YW1lcy9mbGF0dGVuaW5nL3Jlc291cmNlcy9pZnJhbWUtdG8tcmVzaXplLmh0bWwgYi9MYXlvdXRU ZXN0cy9mYXN0L2ZyYW1lcy9mbGF0dGVuaW5nL3Jlc291cmNlcy9pZnJhbWUtdG8tcmVzaXplLmh0 bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMC4uMWRlYWE3OWZhMzk4NmM3OGU1Y2ZhNTBhMmE1M2E4MmRhNTBlYzQxYwot LS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZnJhbWVzL2ZsYXR0ZW5pbmcvcmVz b3VyY2VzL2lmcmFtZS10by1yZXNpemUuaHRtbApAQCAtMCwwICsxLDM0IEBACis8IURPQ1RZUEUg aHRtbD4KKzxodG1sPgorPGhlYWQ+CisgIDxzY3JpcHQ+CisgIHZhciByZXNpemVFdmVudENvdW50 ZXIgPSAwOworICB2YXIgcmVzaXplQ291bnRlciA9IDA7CisgIAorICB3aW5kb3cub25yZXNpemUg PSBmdW5jdGlvbihldmVudCkgeworICAgIHJlc2l6ZUV2ZW50Q291bnRlcisrOworICB9CisKKyAg ZnVuY3Rpb24gZ2V0UmFuZG9tQXJiaXRyYXJ5KG1pbiwgbWF4KSB7CisgICAgcmV0dXJuIE1hdGgu cmFuZG9tKCkgKiAobWF4IC0gbWluKSArIG1pbjsKKyAgfQorCisgIGZ1bmN0aW9uIHJlc2l6ZU1l KCkgeworICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdjb250ZW50VG9SZXNpemUnKS5zdHls ZS5oZWlnaHQgPSBnZXRSYW5kb21BcmJpdHJhcnkoNTAsIDUwMCkgKyAncHgnOworICAgIGRvY3Vt ZW50LmJvZHkub2Zmc2V0SGVpZ2h0OworICAKKyAgICBpZiAoKytyZXNpemVDb3VudGVyIDwgMTAw KQorICAgICAgc2V0VGltZW91dCgncmVzaXplTWUoKTsnLCAwKTsKKyAgICBlbHNlIHsKKyAgICAg IHBhcmVudC5kb2N1bWVudC5nZXRFbGVtZW50QnlJZCgncmVzdWx0JykuaW5uZXJIVE1MID0gcmVz aXplRXZlbnRDb3VudGVyID4gMTAwID8gIkZBSUxFRC4gVG9vIG1hbnkgcmVzaXplIGV2ZW50cyIg OiAiUEFTUyI7CisgICAgICBpZiAod2luZG93LnRlc3RSdW5uZXIpCisgICAgICAgIHRlc3RSdW5u ZXIubm90aWZ5RG9uZSgpOworICAgIH0KKyAgfQorICAKKzwvc2NyaXB0PgorPC9oZWFkPgorPGJv ZHkgb25sb2FkPSdyZXNpemVNZSgpOyc+CisgICAgPHAgaWQ9J2NvbnRlbnRUb1Jlc2l6ZSc+PC9w PgorPC9ib2R5PgorPC9odG1sPgo=