108393 2013-01-30 15:41:24 -0800 [BlackBerry] Bing Images viewport causes layout "fun" 2013-01-31 14:00:30 -0800 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jkjiang jkjiang anilsson manyoso mifenton rwlbuis staikos tonikitoo webkit.review.bot yong.li.webkit oldest_to_newest 820712 0 jkjiang 2013-01-30 15:41:24 -0800 PR: 277855 820801 1 185620 jkjiang 2013-01-30 16:44:51 -0800 Created attachment 185620 Patch 821876 2 185844 jkjiang 2013-01-31 13:03:47 -0800 Created attachment 185844 Patch 821884 3 185844 yong.li.webkit 2013-01-31 13:18:51 -0800 Comment on attachment 185844 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=185844&action=review > Source/WebCore/platform/blackberry/PlatformScreenBlackBerry.cpp:51 > +static FloatRect toUserSpace(FloatRect rect, Widget* widget) minor: 1. This function can be inline. 2. the null check for widget can be moved to this function 821894 4 jkjiang 2013-01-31 13:32:58 -0800 (In reply to comment #3) > (From update of attachment 185844 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=185844&action=review > > > Source/WebCore/platform/blackberry/PlatformScreenBlackBerry.cpp:51 > > +static FloatRect toUserSpace(FloatRect rect, Widget* widget) > > minor: 1. This function can be inline. 2. the null check for widget can be moved to this function That function is just to be consistent with chromium port. Discussed with Yong, I can push it and may clean it in the future if we indeed want to do that. 821925 5 jkjiang 2013-01-31 14:00:30 -0800 Committed r141481: <http://trac.webkit.org/changeset/141481> 185620 2013-01-30 16:44:51 -0800 2013-01-31 07:07:44 -0800 Patch bug-108393-20130130194135.patch text/plain 9890 jkjiang U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxMzM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzhjYzdjYmVlYTExYzRl MjA4ZWQ3OWU3ZGU2OTkwYThjNTRlNzVjNi4uNTFlMTFlYTA0NjFjNzZlYWFkY2E0ZWM0YzkwOWIz NzRhYmMzYjNkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDEzLTAxLTMwICBKYWNr eSBKaWFuZyAgPHpoYWppYW5nQHJpbS5jb20+CisKKyAgICAgICAgW0JsYWNrQmVycnldIEJpbmcg SW1hZ2VzIHZpZXdwb3J0IGNhdXNlcyBsYXlvdXQgImZ1biIKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwODM5MworCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorICAgICAgICBJbnRlcm5hbGx5IHJldmlld2VkIGJ5IEFydmlkIE5p bHNzb24uCisKKyAgICAgICAgUFI6IDI3Nzg1NQorICAgICAgICBPbiBiaW5nLmNvbSBpbWFnZSBz ZWFyY2ggcGFnZSwgSlMgZ2VuZXJhdGVkIHN0eWxlcyBmb3IgdGhlIGRpdnMgd2hpY2gKKyAgICAg ICAgY29udGFpbmVkIGltYWdlcyBiYXNlZCBvbiB0aGUgd2luZG93LnNjcmVlbiBhbmQgd2luZG93 LmlubmVyV2lkdGguCisgICAgICAgIFVuZm9ydHVuYXRlbHkgdGhlIHN0eWxlcyBmb3IgdGhlIGRp dnMgd2VyZW4ndCBnb29kIGVub3VnaCBvbiBvdXIgZGV2aWNlCisgICAgICAgIHdoaWNoIHJlc3Vs dGVkIGluIHRocmVlIGltYWdlcyBiZWluZyBvdmVybGFwcGVkIGluIHRoZSBzYW1lIHZpZXdwb3J0 LgorICAgICAgICBPbiBvdXIgcG9ydCwgd2UgY2FsY3VsYXRlIHRoZSBzY3JlZW4gcmVjdCBiYXNl IG9uIHRoZSBwaHlzaWNhbCBzY3JlZW4KKyAgICAgICAgcGl4ZWxzLiBIb3dldmVyLCBpT1MgYW5k IGxhc3Rlc3QgQW5kcm9pZCBDaHJvbWUgcG9ydCBhbHJlYWR5IGNoYW5nZWQgaXQKKyAgICAgICAg dG8gZGVuc2l0eS1pbmRlcGVuZGVudCAobG9naWNhbCkgcGl4ZWxzLiBBbmQgYWxzbyB0byBteSBr bm93bGVkZ2UgdGhhdAorICAgICAgICBzb21lIHdlYnNpdGVzIHdvdWxkIGdlbmVyYXRlIGJhZCBz dHlsZXMgZm9yIHVzIGFzIHdlbGwgdGhyb3VnaAorICAgICAgICBAbWVkaWEgZGV2aWNlLXdpZHRo L2RldmljZS1oZWlnaHQuCisgICAgICAgIFRvIGJlIGNvbnNpc3RlbnQgYW5kIGZpeCBzdWNoIGtp bmRzIG9mIGlzc3Vlcywgd2Ugc2hvdWxkIHVzZQorICAgICAgICBkZW5zaXR5LWluZGVwZW5kZW50 IHBpeGVscyBpbnN0ZWFkIG9mIHBoeXNpY2FsIHNjcmVlbiBwaXhlbHMuIE1haW5seQorICAgICAg ICBwb3J0ZWQgZnJvbSBDaHJvbWUgcG9ydCBjaGFuZ2UgcjEzOTM1Ni4gVGhlIHBhdGNoIHdpbGwg YWZmZWN0CisgICAgICAgIHNjcmVlbi53aWR0aC9oZWlnaHQsIHdpbmRvdy5vdXRlcldpZHRoL291 dGVySGVpZ2h0IGFuZAorICAgICAgICBAbWVkaWEgZGV2aWNlLXdpZHRoL2RldmljZS1oZWlnaHQu CisKKyAgICAgICAgKiBwbGF0Zm9ybS9ibGFja2JlcnJ5L1BsYXRmb3JtU2NyZWVuQmxhY2tCZXJy eS5jcHA6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6OnRvVXNlclNwYWNl KToKKyAgICAgICAgKFdlYkNvcmU6OnNjcmVlbkF2YWlsYWJsZVJlY3QpOgorICAgICAgICAoV2Vi Q29yZTo6c2NyZWVuUmVjdCk6CisKIDIwMTMtMDEtMzAgIEFuZHkgRXN0ZXMgIDxhZXN0ZXNAYXBw bGUuY29tPgogCiAgICAgICAgIENvbnRlbnRGaWx0ZXIgc2hvdWxkIGJlIGEgcmVmLWNvdW50ZWQg Y2xhc3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cgYi9T b3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nCmluZGV4IDdmNGI4NWM0YTA0MTI1NDJi MzJmZGUxZjkxOTNlMDEwYmEyYWQzZWIuLjdkYWI1NDQ1Yzg1YTUwY2UyZDI0MDM2Y2JjMDQzM2Qx MjhmYzRhMWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBA CisyMDEzLTAxLTMwICBKYWNreSBKaWFuZyAgPHpoYWppYW5nQHJpbS5jb20+CisKKyAgICAgICAg W0JsYWNrQmVycnldIEJpbmcgSW1hZ2VzIHZpZXdwb3J0IGNhdXNlcyBsYXlvdXQgImZ1biIKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwODM5MworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICBJbnRlcm5hbGx5IHJl dmlld2VkIGJ5IEFydmlkIE5pbHNzb24uCisKKyAgICAgICAgUFI6IDI3Nzg1NQorICAgICAgICBT ZXQgYXBwbHlQYWdlU2NhbGVGYWN0b3JJbkNvbXBvc2l0b3Igc2V0dHRpbmcgdG8gZmFsc2UgYnkg ZGVmYXVsdC4KKyAgICAgICAgU2NhbGUgZG93biBjaHJvbWUgd2luZG93IHJlY3QgdG8gZGVuc2l0 eS1pbmRlcGVuZGVudCBwaXhlbHMuCisKKyAgICAgICAgKiBBcGkvV2ViUGFnZS5jcHA6CisgICAg ICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2VQcml2YXRlOjpkaWRDaGFuZ2VTZXR0aW5n cyk6CisgICAgICAgICogQXBpL1dlYlNldHRpbmdzLmNwcDoKKyAgICAgICAgKFdlYktpdCk6Cisg ICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlNldHRpbmdzOjpzdGFuZGFyZFNldHRpbmdz KToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6V2ViU2V0dGluZ3M6OmFwcGx5RGV2aWNl U2NhbGVGYWN0b3JJbkNvbXBvc2l0b3IpOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpX ZWJTZXR0aW5nczo6c2V0QXBwbHlQYWdlU2NhbGVGYWN0b3JJbkNvbXBvc2l0b3IpOgorICAgICAg ICAqIEFwaS9XZWJTZXR0aW5ncy5oOgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0Nocm9tZUNs aWVudEJsYWNrQmVycnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2hyb21lQ2xpZW50QmxhY2tC ZXJyeTo6d2luZG93UmVjdCk6CisKIDIwMTMtMDEtMzAgIEVkIEJha2VyICA8ZWRiYWtlckByaW0u Y29tPgogCiAgICAgICAgIFtCbGFja0JlcnJ5XSBTY3JlZW5zaG90IGlzIGNsaXBwZWQgd2hlbiBj b250ZW50IGlzIHNtYWxsZXIgdGhhbiB0aGUgZGVzaW50YXRpb24gc2l6ZQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9QbGF0Zm9ybVNjcmVlbkJsYWNrQmVy cnkuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9QbGF0Zm9ybVNjcmVl bkJsYWNrQmVycnkuY3BwCmluZGV4IGQ1M2FkYWJkOTUzYTQxYjVkYWMwZTRmMTA2YjM4YzE1Yzk4 ZTU2ZDkuLmJjZTZmMWQ4NDY2MGUwYTQ2M2Q1NWIxNjllOGNhNjUwZjYzMjlmMzggMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvUGxhdGZvcm1TY3JlZW5CbGFj a0JlcnJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L1BsYXRm b3JtU2NyZWVuQmxhY2tCZXJyeS5jcHAKQEAgLTEsNSArMSw2IEBACiAvKgogICogQ29weXJpZ2h0 IChDKSAyMDA5LCAyMDEwLCAyMDExIFJlc2VhcmNoIEluIE1vdGlvbiBMaW1pdGVkLiBBbGwgcmln aHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChjKSAyMDA4LCAyMDA5LCBHb29nbGUgSW5jLiBB bGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFRoaXMgbGlicmFyeSBpcyBmcmVlIHNvZnR3YXJl OyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IKICAqIG1vZGlmeSBpdCB1bmRlciB0aGUg dGVybXMgb2YgdGhlIEdOVSBMZXNzZXIgR2VuZXJhbCBQdWJsaWMKQEAgLTIwLDcgKzIxLDExIEBA CiAjaW5jbHVkZSAiUGxhdGZvcm1TY3JlZW4uaCIKIAogI2luY2x1ZGUgIkZsb2F0UmVjdC5oIgor I2luY2x1ZGUgIkZyYW1lLmgiCisjaW5jbHVkZSAiRnJhbWVWaWV3LmgiCiAjaW5jbHVkZSAiTm90 SW1wbGVtZW50ZWQuaCIKKyNpbmNsdWRlICJQYWdlLmgiCisjaW5jbHVkZSAiU2V0dGluZ3MuaCIK ICNpbmNsdWRlICJXaWRnZXQuaCIKIAogI2luY2x1ZGUgPEJsYWNrQmVycnlQbGF0Zm9ybVNjcmVl bi5oPgpAQCAtNDIsMTQgKzQ3LDI1IEBAIGludCBzY3JlZW5EZXB0aChXaWRnZXQqKQogICAgIHJl dHVybiAyNDsKIH0KIAorLy8gVXNlIGxvZ2ljYWwgKGRlbnNpdHktaW5kZXBlbmRlbnQpIHBpeGVs cyBpbnN0ZWFkIG9mIHBoeXNpY2FsIHNjcmVlbiBwaXhlbHMuCitzdGF0aWMgRmxvYXRSZWN0IHRv VXNlclNwYWNlKEZsb2F0UmVjdCByZWN0LCBXaWRnZXQqIHdpZGdldCkKK3sKKyAgICBpZiAod2lk Z2V0LT5pc0ZyYW1lVmlldygpKSB7CisgICAgICAgIFBhZ2UqIHBhZ2UgPSBzdGF0aWNfY2FzdDxG cmFtZVZpZXcqPih3aWRnZXQpLT5mcmFtZSgpLT5wYWdlKCk7CisgICAgICAgIGlmIChwYWdlICYm ICFwYWdlLT5zZXR0aW5ncygpLT5hcHBseURldmljZVNjYWxlRmFjdG9ySW5Db21wb3NpdG9yKCkp CisgICAgICAgICAgICByZWN0LnNjYWxlKDEgLyBwYWdlLT5kZXZpY2VTY2FsZUZhY3RvcigpKTsK KyAgICB9CisgICAgcmV0dXJuIHJlY3Q7Cit9CisKIEZsb2F0UmVjdCBzY3JlZW5BdmFpbGFibGVS ZWN0KFdpZGdldCogd2lkZ2V0KQogewotICAgIHJldHVybiBGbG9hdFJlY3QoRmxvYXRQb2ludCgp LCBGbG9hdFNpemUoSW50U2l6ZShCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6R3JhcGhpY3M6OlNjcmVl bjo6cHJpbWFyeVNjcmVlbigpLT5zaXplKCkpKSk7CisgICAgcmV0dXJuIHRvVXNlclNwYWNlKElu dFJlY3QoSW50UG9pbnQ6Onplcm8oKSwgSW50U2l6ZShCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6R3Jh cGhpY3M6OlNjcmVlbjo6cHJpbWFyeVNjcmVlbigpLT5zaXplKCkpKSwgd2lkZ2V0KTsKIH0KIAog RmxvYXRSZWN0IHNjcmVlblJlY3QoV2lkZ2V0KiB3aWRnZXQpCiB7Ci0gICAgcmV0dXJuIEZsb2F0 UmVjdChGbG9hdFBvaW50KCksIEZsb2F0U2l6ZShJbnRTaXplKEJsYWNrQmVycnk6OlBsYXRmb3Jt OjpHcmFwaGljczo6U2NyZWVuOjpwcmltYXJ5U2NyZWVuKCktPnNpemUoKSkpKTsKKyAgICByZXR1 cm4gdG9Vc2VyU3BhY2UoSW50UmVjdChJbnRQb2ludDo6emVybygpLCBJbnRTaXplKEJsYWNrQmVy cnk6OlBsYXRmb3JtOjpHcmFwaGljczo6U2NyZWVuOjpwcmltYXJ5U2NyZWVuKCktPnNpemUoKSkp LCB3aWRnZXQpOwogfQogCiB2b2lkIHNjcmVlbkNvbG9yUHJvZmlsZShDb2xvclByb2ZpbGUmKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcCBiL1Nv dXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAKaW5kZXggNDNjNjMwOTJjYjBj YmFjOGYzYzk2OTA4M2Q3ODY4ODA4ZGU4OWVmNC4uMGQ0YTIzY2JkMjAyYWQxN2E4ZmY1ZTRlZjlm YTJkODY4YTlhNGI4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9X ZWJQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3Bw CkBAIC02MDAzLDYgKzYwMDMsNyBAQCB2b2lkIFdlYlBhZ2VQcml2YXRlOjpkaWRDaGFuZ2VTZXR0 aW5ncyhXZWJTZXR0aW5ncyogd2ViU2V0dGluZ3MpCiAKICAgICBjb3JlU2V0dGluZ3MtPnNldFNo b3VsZFVzZUNyb3NzT3JpZ2luUHJvdG9jb2xDaGVjayghd2ViU2V0dGluZ3MtPmFsbG93Q3Jvc3NT aXRlUmVxdWVzdHMoKSk7CiAgICAgY29yZVNldHRpbmdzLT5zZXRXZWJTZWN1cml0eUVuYWJsZWQo IXdlYlNldHRpbmdzLT5hbGxvd0Nyb3NzU2l0ZVJlcXVlc3RzKCkpOworICAgIGNvcmVTZXR0aW5n cy0+c2V0QXBwbHlQYWdlU2NhbGVGYWN0b3JJbkNvbXBvc2l0b3Iod2ViU2V0dGluZ3MtPmFwcGx5 RGV2aWNlU2NhbGVGYWN0b3JJbkNvbXBvc2l0b3IoKSk7CiAKICAgICBjb29raWVNYW5hZ2VyKCku c2V0UHJpdmF0ZU1vZGUod2ViU2V0dGluZ3MtPmlzUHJpdmF0ZUJyb3dzaW5nRW5hYmxlZCgpKTsK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJTZXR0aW5ncy5j cHAgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlNldHRpbmdzLmNwcAppbmRleCAw MTRjNjRiMTI4YTIzYTk2OTNhYmQ5ODdiZmYxZmQ4YjI4ZTAyOTViLi43MjM5ZmU4MmFiYWMzOTk3 OGRkZjVkNDg4NzBlM2FkMDNkMGI0NzBmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNr YmVycnkvQXBpL1dlYlNldHRpbmdzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkv QXBpL1dlYlNldHRpbmdzLmNwcApAQCAtMzYsNiArMzYsNyBAQCBuYW1lc3BhY2UgQmxhY2tCZXJy eSB7CiBuYW1lc3BhY2UgV2ViS2l0IHsKIAogREVGSU5FX1NUQVRJQ19MT0NBTChTdHJpbmcsIEJs YWNrQmVycnlBbGxvd0Nyb3NzU2l0ZVJlcXVlc3RzLCAoQVNDSUlMaXRlcmFsKCJCbGFja0JlcnJ5 QWxsb3dDcm9zc1NpdGVSZXF1ZXN0cyIpKSk7CitERUZJTkVfU1RBVElDX0xPQ0FMKFN0cmluZywg QmxhY2tCZXJyeUFwcGx5RGV2aWNlU2NhbGVGYWN0b3JJbkNvbXBvc2l0b3IsIChBU0NJSUxpdGVy YWwoIkJsYWNrQmVycnlBcHBseURldmljZVNjYWxlRmFjdG9ySW5Db21wb3NpdG9yIikpKTsKIERF RklORV9TVEFUSUNfTE9DQUwoU3RyaW5nLCBCbGFja0JlcnJ5QXN5bmNocm9ub3VzU3BlbGxDaGVj a2luZywgKEFTQ0lJTGl0ZXJhbCgiQmxhY2tCZXJyeUFzeW5jaHJvbm91c1NwZWxsQ2hlY2tpbmci KSkpOwogREVGSU5FX1NUQVRJQ19MT0NBTChTdHJpbmcsIEJsYWNrQmVycnlCYWNrZ3JvdW5kQ29s b3IsIChBU0NJSUxpdGVyYWwoIkJsYWNrQmVycnlCYWNrZ3JvdW5kQ29sb3IiKSkpOwogREVGSU5F X1NUQVRJQ19MT0NBTChTdHJpbmcsIEJsYWNrQmVycnlDb29raWVzRW5hYmxlZCwgKEFTQ0lJTGl0 ZXJhbCgiQmxhY2tCZXJyeUNvb2tpZXNFbmFibGVkIikpKTsKQEAgLTE3OSw2ICsxODAsNyBAQCBX ZWJTZXR0aW5ncyogV2ViU2V0dGluZ3M6OnN0YW5kYXJkU2V0dGluZ3MoKQogICAgIHNldHRpbmdz LT5tX3ByaXZhdGUtPnNldEJvb2xlYW4oQmxhY2tCZXJyeUNyZWRlbnRpYWxBdXRvZmlsbEVuYWJs ZWQsIGZhbHNlKTsKICAgICBzZXR0aW5ncy0+bV9wcml2YXRlLT5zZXRCb29sZWFuKEJsYWNrQmVy cnlGb3JtQXV0b2ZpbGxFbmFibGVkLCBmYWxzZSk7CiAgICAgc2V0dGluZ3MtPm1fcHJpdmF0ZS0+ c2V0Qm9vbGVhbihCbGFja0JlcnJ5QXN5bmNocm9ub3VzU3BlbGxDaGVja2luZywgdHJ1ZSk7Cisg ICAgc2V0dGluZ3MtPm1fcHJpdmF0ZS0+c2V0Qm9vbGVhbihCbGFja0JlcnJ5QXBwbHlEZXZpY2VT Y2FsZUZhY3RvckluQ29tcG9zaXRvciwgZmFsc2UpOwogCiAgICAgaWYgKEJsYWNrQmVycnk6OlBs YXRmb3JtOjpEZXZpY2VJbmZvOjppbnN0YW5jZSgpLT5pc01vYmlsZSgpKSB7CiAgICAgICAgIFdl YkNvcmU6OkZsb2F0U2l6ZSBjdXJyZW50UFBJID0gUGxhdGZvcm06OkdyYXBoaWNzOjpTY3JlZW46 OnByaW1hcnlTY3JlZW4oKS0+cGl4ZWxzUGVySW5jaCgtMSk7CkBAIC04NDIsNSArODQ0LDE1IEBA IHZvaWQgV2ViU2V0dGluZ3M6OnNldERldmljZVBpeGVsUmF0aW8oZG91YmxlIHJhdGlvKQogICAg IG1fcHJpdmF0ZS0+c2V0RG91YmxlKEJsYWNrQmVycnlEZXZpY2VQaXhlbFJhdGlvLCByYXRpbyk7 CiB9CiAKK2Jvb2wgV2ViU2V0dGluZ3M6OmFwcGx5RGV2aWNlU2NhbGVGYWN0b3JJbkNvbXBvc2l0 b3IoKSBjb25zdAoreworICAgIHJldHVybiBtX3ByaXZhdGUtPmdldEJvb2xlYW4oQmxhY2tCZXJy eUFwcGx5RGV2aWNlU2NhbGVGYWN0b3JJbkNvbXBvc2l0b3IpOworfQorCit2b2lkIFdlYlNldHRp bmdzOjpzZXRBcHBseVBhZ2VTY2FsZUZhY3RvckluQ29tcG9zaXRvcihib29sIGFwcGx5RGV2aWNl U2NhbGVGYWN0b3JJbkNvbXBvc2l0b3IpCit7CisgICAgbV9wcml2YXRlLT5zZXRCb29sZWFuKEJs YWNrQmVycnlBcHBseURldmljZVNjYWxlRmFjdG9ySW5Db21wb3NpdG9yLCBhcHBseURldmljZVNj YWxlRmFjdG9ySW5Db21wb3NpdG9yKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CiB9IC8v IG5hbWVzcGFjZSBCbGFja0JlcnJ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVy cnkvQXBpL1dlYlNldHRpbmdzLmggYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlNl dHRpbmdzLmgKaW5kZXggYjc1YmM0YjExNTFhMzU4NTM4NDZlMDdkYzE1NmUwMGQ4NWM2OTA4Yi4u NTc4NTlmMWRjZTY3MTRlN2IxYjFkZTE1YzcyZDRiZjE5MDA0ZDg5OSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJTZXR0aW5ncy5oCisrKyBiL1NvdXJjZS9XZWJL aXQvYmxhY2tiZXJyeS9BcGkvV2ViU2V0dGluZ3MuaApAQCAtMjQ0LDYgKzI0NCw5IEBAIHB1Ymxp YzoKICAgICBib29sIGlzQmFja2luZ1N0b3JlRW5hYmxlZCgpIGNvbnN0OwogICAgIHZvaWQgc2V0 QmFja2luZ1N0b3JlRW5hYmxlZChib29sKTsKIAorICAgIGJvb2wgYXBwbHlEZXZpY2VTY2FsZUZh Y3RvckluQ29tcG9zaXRvcigpIGNvbnN0OworICAgIHZvaWQgc2V0QXBwbHlQYWdlU2NhbGVGYWN0 b3JJbkNvbXBvc2l0b3IoYm9vbCk7CisKIHByaXZhdGU6CiAgICAgV2ViU2V0dGluZ3NQcml2YXRl KiBtX3ByaXZhdGU7CiAgICAgV2ViU2V0dGluZ3MoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRCbGFja0JlcnJ5LmNwcCBi L1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRCbGFj a0JlcnJ5LmNwcAppbmRleCBiMTk5YTFlNDQ5ODNlZjRiMzM5ODI3Nzk5YmQyMjNmOWQyMzcwMWFl Li4xMDg0N2UyZjQ2YjRiYzMwYjJlMzU0NWNiZWRlNGFhNTljNjk2MzUxIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50QmxhY2tC ZXJyeS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0No cm9tZUNsaWVudEJsYWNrQmVycnkuY3BwCkBAIC01NCw2ICs1NCw3IEBACiAjaW5jbHVkZSAiU1ZH Wm9vbUFuZFBhbi5oIgogI2luY2x1ZGUgIlNlYXJjaFBvcHVwTWVudUJsYWNrQmVycnkuaCIKICNp bmNsdWRlICJTZWN1cml0eU9yaWdpbi5oIgorI2luY2x1ZGUgIlNldHRpbmdzLmgiCiAjaW5jbHVk ZSAiU2hhcmVkUG9pbnRlci5oIgogI2luY2x1ZGUgIlZpZXdwb3J0QXJndW1lbnRzLmgiCiAjaW5j bHVkZSAiV2ViUGFnZS5oIgpAQCAtMTY1LDcgKzE2NiwxMSBAQCBGbG9hdFJlY3QgQ2hyb21lQ2xp ZW50QmxhY2tCZXJyeTo6d2luZG93UmVjdCgpCiAgICAgaWYgKFdpbmRvdyogd2luZG93ID0gbV93 ZWJQYWdlUHJpdmF0ZS0+bV9jbGllbnQtPndpbmRvdygpKQogICAgICAgICB3aW5kb3dTaXplID0g d2luZG93LT53aW5kb3dTaXplKCk7CiAKLSAgICByZXR1cm4gRmxvYXRSZWN0KDAsIDAsIHdpbmRv d1NpemUud2lkdGgoKSwgd2luZG93U2l6ZS5oZWlnaHQoKSk7CisgICAgLy8gVXNlIGxvZ2ljYWwg KGRlbnNpdHktaW5kZXBlbmRlbnQpIHBpeGVscyBpbnN0ZWFkIG9mIHBoeXNpY2FsIHNjcmVlbiBw aXhlbHMuCisgICAgRmxvYXRSZWN0IHJlY3QgPSBGbG9hdFJlY3QoMCwgMCwgd2luZG93U2l6ZS53 aWR0aCgpLCB3aW5kb3dTaXplLmhlaWdodCgpKTsKKyAgICBpZiAoIW1fd2ViUGFnZVByaXZhdGUt Pm1fcGFnZS0+c2V0dGluZ3MoKS0+YXBwbHlEZXZpY2VTY2FsZUZhY3RvckluQ29tcG9zaXRvcigp KQorICAgICAgICByZWN0LnNjYWxlKDEgLyBtX3dlYlBhZ2VQcml2YXRlLT5tX3BhZ2UtPmRldmlj ZVNjYWxlRmFjdG9yKCkpOworICAgIHJldHVybiByZWN0OwogfQogCiBGbG9hdFJlY3QgQ2hyb21l Q2xpZW50QmxhY2tCZXJyeTo6cGFnZVJlY3QoKQo= 185844 2013-01-31 13:03:47 -0800 2013-01-31 13:18:51 -0800 Patch bug-108393-20130131160030.patch text/plain 10066 jkjiang U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxMzM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzhjYzdjYmVlYTExYzRl MjA4ZWQ3OWU3ZGU2OTkwYThjNTRlNzVjNi4uOGZjOWY4MjRmZDZhNzk3OWEzZjJhMTllNjJiNTQ2 MjJkNzAwNmYzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDEzLTAxLTMxICBKYWNr eSBKaWFuZyAgPHpoYWppYW5nQHJpbS5jb20+CisKKyAgICAgICAgW0JsYWNrQmVycnldIEJpbmcg SW1hZ2VzIHZpZXdwb3J0IGNhdXNlcyBsYXlvdXQgImZ1biIKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwODM5MworCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorICAgICAgICBJbnRlcm5hbGx5IHJldmlld2VkIGJ5IEFydmlkIE5p bHNzb24gYW5kIHBhcnRpYWxseSByZXZpZXdlZCBieSBLb25yYWQgUGlhc2Npay4KKworICAgICAg ICBQUjogMjc3ODU1CisgICAgICAgIE9uIGJpbmcuY29tIGltYWdlIHNlYXJjaCBwYWdlLCBKUyBn ZW5lcmF0ZWQgc3R5bGVzIGZvciB0aGUgZGl2cyB3aGljaAorICAgICAgICBjb250YWluZWQgaW1h Z2VzIGJhc2VkIG9uIHRoZSB3aW5kb3cuc2NyZWVuIGFuZCB3aW5kb3cuaW5uZXJXaWR0aC4KKyAg ICAgICAgVW5mb3J0dW5hdGVseSB0aGUgc3R5bGVzIGZvciB0aGUgZGl2cyB3ZXJlbid0IGdvb2Qg ZW5vdWdoIG9uIG91ciBkZXZpY2UKKyAgICAgICAgd2hpY2ggcmVzdWx0ZWQgaW4gdGhyZWUgaW1h Z2VzIGJlaW5nIG92ZXJsYXBwZWQgaW4gdGhlIHNhbWUgdmlld3BvcnQuCisgICAgICAgIE9uIG91 ciBwb3J0LCB3ZSBjYWxjdWxhdGUgdGhlIHNjcmVlbiByZWN0IGJhc2Ugb24gdGhlIHBoeXNpY2Fs IHNjcmVlbgorICAgICAgICBwaXhlbHMuIEhvd2V2ZXIsIGlPUyBhbmQgbGFzdGVzdCBBbmRyb2lk IENocm9tZSBwb3J0IGFscmVhZHkgY2hhbmdlZCBpdAorICAgICAgICB0byBkZW5zaXR5LWluZGVw ZW5kZW50IChsb2dpY2FsKSBwaXhlbHMuIEFuZCBhbHNvIHRvIG15IGtub3dsZWRnZSB0aGF0Cisg ICAgICAgIHNvbWUgd2Vic2l0ZXMgd291bGQgZ2VuZXJhdGUgYmFkIHN0eWxlcyBmb3IgdXMgYXMg d2VsbCB0aHJvdWdoCisgICAgICAgIEBtZWRpYSBkZXZpY2Utd2lkdGgvZGV2aWNlLWhlaWdodC4K KyAgICAgICAgVG8gYmUgY29uc2lzdGVudCBhbmQgZml4IHN1Y2gga2luZHMgb2YgaXNzdWVzLCB3 ZSBzaG91bGQgdXNlCisgICAgICAgIGRlbnNpdHktaW5kZXBlbmRlbnQgcGl4ZWxzIGluc3RlYWQg b2YgcGh5c2ljYWwgc2NyZWVuIHBpeGVscy4gTWFpbmx5CisgICAgICAgIHBvcnRlZCBmcm9tIENo cm9tZSBwb3J0IGNoYW5nZSByMTM5MzU2LiBUaGUgcGF0Y2ggd2lsbCBhZmZlY3QKKyAgICAgICAg c2NyZWVuLndpZHRoL2hlaWdodCwgd2luZG93Lm91dGVyV2lkdGgvb3V0ZXJIZWlnaHQgYW5kCisg ICAgICAgIEBtZWRpYSBkZXZpY2Utd2lkdGgvZGV2aWNlLWhlaWdodC4KKworICAgICAgICAqIHBs YXRmb3JtL2JsYWNrYmVycnkvUGxhdGZvcm1TY3JlZW5CbGFja0JlcnJ5LmNwcDoKKyAgICAgICAg KFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6dG9Vc2VyU3BhY2UpOgorICAgICAgICAoV2Vi Q29yZTo6c2NyZWVuQXZhaWxhYmxlUmVjdCk6CisgICAgICAgIChXZWJDb3JlOjpzY3JlZW5SZWN0 KToKKwogMjAxMy0wMS0zMCAgQW5keSBFc3RlcyAgPGFlc3Rlc0BhcHBsZS5jb20+CiAKICAgICAg ICAgQ29udGVudEZpbHRlciBzaG91bGQgYmUgYSByZWYtY291bnRlZCBjbGFzcwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvYmxh Y2tiZXJyeS9DaGFuZ2VMb2cKaW5kZXggN2Y0Yjg1YzRhMDQxMjU0MmIzMmZkZTFmOTE5M2UwMTBi YTJhZDNlYi4uNTkzNTY5NjcyNjE0NDgwYTAxZjY4NDQ1YTg2Yjg1MWIwYmYwNjA2ZiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi S2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTMtMDEtMzEgIEph Y2t5IEppYW5nICA8emhhamlhbmdAcmltLmNvbT4KKworICAgICAgICBbQmxhY2tCZXJyeV0gQmlu ZyBJbWFnZXMgdmlld3BvcnQgY2F1c2VzIGxheW91dCAiZnVuIgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA4MzkzCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIEludGVybmFsbHkgcmV2aWV3ZWQgYnkgQXJ2aWQg Tmlsc3NvbiBhbmQgcGFydGlhbGx5IHJldmlld2VkIGJ5IEtvbnJhZCBQaWFzY2lrLgorCisgICAg ICAgIFBSOiAyNzc4NTUKKyAgICAgICAgU2V0IGFwcGx5UGFnZVNjYWxlRmFjdG9ySW5Db21wb3Np dG9yIHNldHR0aW5nIHRvIGZhbHNlIGJ5IGRlZmF1bHQuCisgICAgICAgIFNjYWxlIGRvd24gY2hy b21lIHdpbmRvdyByZWN0IHRvIGRlbnNpdHktaW5kZXBlbmRlbnQgcGl4ZWxzLgorCisgICAgICAg ICogQXBpL1dlYlBhZ2UuY3BwOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdl UHJpdmF0ZTo6ZGlkQ2hhbmdlU2V0dGluZ3MpOgorICAgICAgICAqIEFwaS9XZWJTZXR0aW5ncy5j cHA6CisgICAgICAgIChXZWJLaXQpOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJT ZXR0aW5nczo6c3RhbmRhcmRTZXR0aW5ncyk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6 OldlYlNldHRpbmdzOjphcHBseURldmljZVNjYWxlRmFjdG9ySW5Db21wb3NpdG9yKToKKyAgICAg ICAgKEJsYWNrQmVycnk6OldlYktpdDo6V2ViU2V0dGluZ3M6OnNldEFwcGx5UGFnZVNjYWxlRmFj dG9ySW5Db21wb3NpdG9yKToKKyAgICAgICAgKiBBcGkvV2ViU2V0dGluZ3MuaDoKKyAgICAgICAg KiBXZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRCbGFja0JlcnJ5LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkNocm9tZUNsaWVudEJsYWNrQmVycnk6OndpbmRvd1JlY3QpOgorCiAyMDEzLTAxLTMw ICBFZCBCYWtlciAgPGVkYmFrZXJAcmltLmNvbT4KIAogICAgICAgICBbQmxhY2tCZXJyeV0gU2Ny ZWVuc2hvdCBpcyBjbGlwcGVkIHdoZW4gY29udGVudCBpcyBzbWFsbGVyIHRoYW4gdGhlIGRlc2lu dGF0aW9uIHNpemUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVy cnkvUGxhdGZvcm1TY3JlZW5CbGFja0JlcnJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2JsYWNrYmVycnkvUGxhdGZvcm1TY3JlZW5CbGFja0JlcnJ5LmNwcAppbmRleCBkNTNhZGFiZDk1 M2E0MWI1ZGFjMGU0ZjEwNmIzOGMxNWM5OGU1NmQ5Li44NDQ0MzhmOTJmY2FiYmI4ZmVhODQ0ZWFk MzBmZGJlOGExMTk4YmRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ibGFj a2JlcnJ5L1BsYXRmb3JtU2NyZWVuQmxhY2tCZXJyeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vYmxhY2tiZXJyeS9QbGF0Zm9ybVNjcmVlbkJsYWNrQmVycnkuY3BwCkBAIC0xLDUg KzEsNiBAQAogLyoKICAqIENvcHlyaWdodCAoQykgMjAwOSwgMjAxMCwgMjAxMSBSZXNlYXJjaCBJ biBNb3Rpb24gTGltaXRlZC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoYykg MjAwOCwgMjAwOSwgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBUaGlz IGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29y CiAgKiBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgTGVzc2VyIEdlbmVyYWwg UHVibGljCkBAIC0yMCw3ICsyMSwxMSBAQAogI2luY2x1ZGUgIlBsYXRmb3JtU2NyZWVuLmgiCiAK ICNpbmNsdWRlICJGbG9hdFJlY3QuaCIKKyNpbmNsdWRlICJGcmFtZS5oIgorI2luY2x1ZGUgIkZy YW1lVmlldy5oIgogI2luY2x1ZGUgIk5vdEltcGxlbWVudGVkLmgiCisjaW5jbHVkZSAiUGFnZS5o IgorI2luY2x1ZGUgIlNldHRpbmdzLmgiCiAjaW5jbHVkZSAiV2lkZ2V0LmgiCiAKICNpbmNsdWRl IDxCbGFja0JlcnJ5UGxhdGZvcm1TY3JlZW4uaD4KQEAgLTQyLDE0ICs0NywyOSBAQCBpbnQgc2Ny ZWVuRGVwdGgoV2lkZ2V0KikKICAgICByZXR1cm4gMjQ7CiB9CiAKKy8vIFVzZSBsb2dpY2FsIChk ZW5zaXR5LWluZGVwZW5kZW50KSBwaXhlbHMgaW5zdGVhZCBvZiBwaHlzaWNhbCBzY3JlZW4gcGl4 ZWxzLgorc3RhdGljIEZsb2F0UmVjdCB0b1VzZXJTcGFjZShGbG9hdFJlY3QgcmVjdCwgV2lkZ2V0 KiB3aWRnZXQpCit7CisgICAgaWYgKHdpZGdldC0+aXNGcmFtZVZpZXcoKSkgeworICAgICAgICBQ YWdlKiBwYWdlID0gc3RhdGljX2Nhc3Q8RnJhbWVWaWV3Kj4od2lkZ2V0KS0+ZnJhbWUoKS0+cGFn ZSgpOworICAgICAgICBpZiAocGFnZSAmJiAhcGFnZS0+c2V0dGluZ3MoKS0+YXBwbHlEZXZpY2VT Y2FsZUZhY3RvckluQ29tcG9zaXRvcigpKQorICAgICAgICAgICAgcmVjdC5zY2FsZSgxIC8gcGFn ZS0+ZGV2aWNlU2NhbGVGYWN0b3IoKSk7CisgICAgfQorICAgIHJldHVybiByZWN0OworfQorCiBG bG9hdFJlY3Qgc2NyZWVuQXZhaWxhYmxlUmVjdChXaWRnZXQqIHdpZGdldCkKIHsKLSAgICByZXR1 cm4gRmxvYXRSZWN0KEZsb2F0UG9pbnQoKSwgRmxvYXRTaXplKEludFNpemUoQmxhY2tCZXJyeTo6 UGxhdGZvcm06OkdyYXBoaWNzOjpTY3JlZW46OnByaW1hcnlTY3JlZW4oKS0+c2l6ZSgpKSkpOwor ICAgIGlmICghd2lkZ2V0KQorICAgICAgICByZXR1cm4gRmxvYXRSZWN0KCk7CisgICAgcmV0dXJu IHRvVXNlclNwYWNlKEludFJlY3QoSW50UG9pbnQ6Onplcm8oKSwgSW50U2l6ZShCbGFja0JlcnJ5 OjpQbGF0Zm9ybTo6R3JhcGhpY3M6OlNjcmVlbjo6cHJpbWFyeVNjcmVlbigpLT5zaXplKCkpKSwg d2lkZ2V0KTsKIH0KIAogRmxvYXRSZWN0IHNjcmVlblJlY3QoV2lkZ2V0KiB3aWRnZXQpCiB7Ci0g ICAgcmV0dXJuIEZsb2F0UmVjdChGbG9hdFBvaW50KCksIEZsb2F0U2l6ZShJbnRTaXplKEJsYWNr QmVycnk6OlBsYXRmb3JtOjpHcmFwaGljczo6U2NyZWVuOjpwcmltYXJ5U2NyZWVuKCktPnNpemUo KSkpKTsKKyAgICBpZiAoIXdpZGdldCkKKyAgICAgICAgcmV0dXJuIEZsb2F0UmVjdCgpOworICAg IHJldHVybiB0b1VzZXJTcGFjZShJbnRSZWN0KEludFBvaW50Ojp6ZXJvKCksIEludFNpemUoQmxh Y2tCZXJyeTo6UGxhdGZvcm06OkdyYXBoaWNzOjpTY3JlZW46OnByaW1hcnlTY3JlZW4oKS0+c2l6 ZSgpKSksIHdpZGdldCk7CiB9CiAKIHZvaWQgc2NyZWVuQ29sb3JQcm9maWxlKENvbG9yUHJvZmls ZSYpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3Bw IGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcAppbmRleCA0M2M2MzA5 MmNiMGNiYWM4ZjNjOTY5MDgzZDc4Njg4MDhkZTg5ZWY0Li4wZDRhMjNjYmQyMDJhZDE3YThmZjVl NGVmOWZhMmQ4NjhhOWE0YjgwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkv QXBpL1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFn ZS5jcHAKQEAgLTYwMDMsNiArNjAwMyw3IEBAIHZvaWQgV2ViUGFnZVByaXZhdGU6OmRpZENoYW5n ZVNldHRpbmdzKFdlYlNldHRpbmdzKiB3ZWJTZXR0aW5ncykKIAogICAgIGNvcmVTZXR0aW5ncy0+ c2V0U2hvdWxkVXNlQ3Jvc3NPcmlnaW5Qcm90b2NvbENoZWNrKCF3ZWJTZXR0aW5ncy0+YWxsb3dD cm9zc1NpdGVSZXF1ZXN0cygpKTsKICAgICBjb3JlU2V0dGluZ3MtPnNldFdlYlNlY3VyaXR5RW5h YmxlZCghd2ViU2V0dGluZ3MtPmFsbG93Q3Jvc3NTaXRlUmVxdWVzdHMoKSk7CisgICAgY29yZVNl dHRpbmdzLT5zZXRBcHBseVBhZ2VTY2FsZUZhY3RvckluQ29tcG9zaXRvcih3ZWJTZXR0aW5ncy0+ YXBwbHlEZXZpY2VTY2FsZUZhY3RvckluQ29tcG9zaXRvcigpKTsKIAogICAgIGNvb2tpZU1hbmFn ZXIoKS5zZXRQcml2YXRlTW9kZSh3ZWJTZXR0aW5ncy0+aXNQcml2YXRlQnJvd3NpbmdFbmFibGVk KCkpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlNldHRp bmdzLmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViU2V0dGluZ3MuY3BwCmlu ZGV4IDAxNGM2NGIxMjhhMjNhOTY5M2FiZDk4N2JmZjFmZDhiMjhlMDI5NWIuLjcyMzlmZTgyYWJh YzM5OTc4ZGRmNWQ0ODg3MGUzYWQwM2QwYjQ3MGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv YmxhY2tiZXJyeS9BcGkvV2ViU2V0dGluZ3MuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2ti ZXJyeS9BcGkvV2ViU2V0dGluZ3MuY3BwCkBAIC0zNiw2ICszNiw3IEBAIG5hbWVzcGFjZSBCbGFj a0JlcnJ5IHsKIG5hbWVzcGFjZSBXZWJLaXQgewogCiBERUZJTkVfU1RBVElDX0xPQ0FMKFN0cmlu ZywgQmxhY2tCZXJyeUFsbG93Q3Jvc3NTaXRlUmVxdWVzdHMsIChBU0NJSUxpdGVyYWwoIkJsYWNr QmVycnlBbGxvd0Nyb3NzU2l0ZVJlcXVlc3RzIikpKTsKK0RFRklORV9TVEFUSUNfTE9DQUwoU3Ry aW5nLCBCbGFja0JlcnJ5QXBwbHlEZXZpY2VTY2FsZUZhY3RvckluQ29tcG9zaXRvciwgKEFTQ0lJ TGl0ZXJhbCgiQmxhY2tCZXJyeUFwcGx5RGV2aWNlU2NhbGVGYWN0b3JJbkNvbXBvc2l0b3IiKSkp OwogREVGSU5FX1NUQVRJQ19MT0NBTChTdHJpbmcsIEJsYWNrQmVycnlBc3luY2hyb25vdXNTcGVs bENoZWNraW5nLCAoQVNDSUlMaXRlcmFsKCJCbGFja0JlcnJ5QXN5bmNocm9ub3VzU3BlbGxDaGVj a2luZyIpKSk7CiBERUZJTkVfU1RBVElDX0xPQ0FMKFN0cmluZywgQmxhY2tCZXJyeUJhY2tncm91 bmRDb2xvciwgKEFTQ0lJTGl0ZXJhbCgiQmxhY2tCZXJyeUJhY2tncm91bmRDb2xvciIpKSk7CiBE RUZJTkVfU1RBVElDX0xPQ0FMKFN0cmluZywgQmxhY2tCZXJyeUNvb2tpZXNFbmFibGVkLCAoQVND SUlMaXRlcmFsKCJCbGFja0JlcnJ5Q29va2llc0VuYWJsZWQiKSkpOwpAQCAtMTc5LDYgKzE4MCw3 IEBAIFdlYlNldHRpbmdzKiBXZWJTZXR0aW5nczo6c3RhbmRhcmRTZXR0aW5ncygpCiAgICAgc2V0 dGluZ3MtPm1fcHJpdmF0ZS0+c2V0Qm9vbGVhbihCbGFja0JlcnJ5Q3JlZGVudGlhbEF1dG9maWxs RW5hYmxlZCwgZmFsc2UpOwogICAgIHNldHRpbmdzLT5tX3ByaXZhdGUtPnNldEJvb2xlYW4oQmxh Y2tCZXJyeUZvcm1BdXRvZmlsbEVuYWJsZWQsIGZhbHNlKTsKICAgICBzZXR0aW5ncy0+bV9wcml2 YXRlLT5zZXRCb29sZWFuKEJsYWNrQmVycnlBc3luY2hyb25vdXNTcGVsbENoZWNraW5nLCB0cnVl KTsKKyAgICBzZXR0aW5ncy0+bV9wcml2YXRlLT5zZXRCb29sZWFuKEJsYWNrQmVycnlBcHBseURl dmljZVNjYWxlRmFjdG9ySW5Db21wb3NpdG9yLCBmYWxzZSk7CiAKICAgICBpZiAoQmxhY2tCZXJy eTo6UGxhdGZvcm06OkRldmljZUluZm86Omluc3RhbmNlKCktPmlzTW9iaWxlKCkpIHsKICAgICAg ICAgV2ViQ29yZTo6RmxvYXRTaXplIGN1cnJlbnRQUEkgPSBQbGF0Zm9ybTo6R3JhcGhpY3M6OlNj cmVlbjo6cHJpbWFyeVNjcmVlbigpLT5waXhlbHNQZXJJbmNoKC0xKTsKQEAgLTg0Miw1ICs4NDQs MTUgQEAgdm9pZCBXZWJTZXR0aW5nczo6c2V0RGV2aWNlUGl4ZWxSYXRpbyhkb3VibGUgcmF0aW8p CiAgICAgbV9wcml2YXRlLT5zZXREb3VibGUoQmxhY2tCZXJyeURldmljZVBpeGVsUmF0aW8sIHJh dGlvKTsKIH0KIAorYm9vbCBXZWJTZXR0aW5nczo6YXBwbHlEZXZpY2VTY2FsZUZhY3RvckluQ29t cG9zaXRvcigpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1fcHJpdmF0ZS0+Z2V0Qm9vbGVhbihCbGFj a0JlcnJ5QXBwbHlEZXZpY2VTY2FsZUZhY3RvckluQ29tcG9zaXRvcik7Cit9CisKK3ZvaWQgV2Vi U2V0dGluZ3M6OnNldEFwcGx5UGFnZVNjYWxlRmFjdG9ySW5Db21wb3NpdG9yKGJvb2wgYXBwbHlE ZXZpY2VTY2FsZUZhY3RvckluQ29tcG9zaXRvcikKK3sKKyAgICBtX3ByaXZhdGUtPnNldEJvb2xl YW4oQmxhY2tCZXJyeUFwcGx5RGV2aWNlU2NhbGVGYWN0b3JJbkNvbXBvc2l0b3IsIGFwcGx5RGV2 aWNlU2NhbGVGYWN0b3JJbkNvbXBvc2l0b3IpOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQK IH0gLy8gbmFtZXNwYWNlIEJsYWNrQmVycnkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxh Y2tiZXJyeS9BcGkvV2ViU2V0dGluZ3MuaCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkv V2ViU2V0dGluZ3MuaAppbmRleCBiNzViYzRiMTE1MWEzNTg1Mzg0NmUwN2RjMTU2ZTAwZDg1YzY5 MDhiLi41Nzg1OWYxZGNlNjcxNGU3YjFiMWRlMTVjNzJkNGJmMTkwMDRkODk5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlNldHRpbmdzLmgKKysrIGIvU291cmNl L1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJTZXR0aW5ncy5oCkBAIC0yNDQsNiArMjQ0LDkgQEAg cHVibGljOgogICAgIGJvb2wgaXNCYWNraW5nU3RvcmVFbmFibGVkKCkgY29uc3Q7CiAgICAgdm9p ZCBzZXRCYWNraW5nU3RvcmVFbmFibGVkKGJvb2wpOwogCisgICAgYm9vbCBhcHBseURldmljZVNj YWxlRmFjdG9ySW5Db21wb3NpdG9yKCkgY29uc3Q7CisgICAgdm9pZCBzZXRBcHBseVBhZ2VTY2Fs ZUZhY3RvckluQ29tcG9zaXRvcihib29sKTsKKwogcHJpdmF0ZToKICAgICBXZWJTZXR0aW5nc1By aXZhdGUqIG1fcHJpdmF0ZTsKICAgICBXZWJTZXR0aW5ncygpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEJsYWNrQmVycnku Y3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVu dEJsYWNrQmVycnkuY3BwCmluZGV4IGIxOTlhMWU0NDk4M2VmNGIzMzk4Mjc3OTliZDIyM2Y5ZDIz NzAxYWUuLjEwODQ3ZTJmNDZiNGJjMzBiMmUzNTQ1Y2JlZGU0YWE1OWM2OTYzNTEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRC bGFja0JlcnJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBv cnQvQ2hyb21lQ2xpZW50QmxhY2tCZXJyeS5jcHAKQEAgLTU0LDYgKzU0LDcgQEAKICNpbmNsdWRl ICJTVkdab29tQW5kUGFuLmgiCiAjaW5jbHVkZSAiU2VhcmNoUG9wdXBNZW51QmxhY2tCZXJyeS5o IgogI2luY2x1ZGUgIlNlY3VyaXR5T3JpZ2luLmgiCisjaW5jbHVkZSAiU2V0dGluZ3MuaCIKICNp bmNsdWRlICJTaGFyZWRQb2ludGVyLmgiCiAjaW5jbHVkZSAiVmlld3BvcnRBcmd1bWVudHMuaCIK ICNpbmNsdWRlICJXZWJQYWdlLmgiCkBAIC0xNjUsNyArMTY2LDExIEBAIEZsb2F0UmVjdCBDaHJv bWVDbGllbnRCbGFja0JlcnJ5Ojp3aW5kb3dSZWN0KCkKICAgICBpZiAoV2luZG93KiB3aW5kb3cg PSBtX3dlYlBhZ2VQcml2YXRlLT5tX2NsaWVudC0+d2luZG93KCkpCiAgICAgICAgIHdpbmRvd1Np emUgPSB3aW5kb3ctPndpbmRvd1NpemUoKTsKIAotICAgIHJldHVybiBGbG9hdFJlY3QoMCwgMCwg d2luZG93U2l6ZS53aWR0aCgpLCB3aW5kb3dTaXplLmhlaWdodCgpKTsKKyAgICAvLyBVc2UgbG9n aWNhbCAoZGVuc2l0eS1pbmRlcGVuZGVudCkgcGl4ZWxzIGluc3RlYWQgb2YgcGh5c2ljYWwgc2Ny ZWVuIHBpeGVscy4KKyAgICBGbG9hdFJlY3QgcmVjdCA9IEZsb2F0UmVjdCgwLCAwLCB3aW5kb3dT aXplLndpZHRoKCksIHdpbmRvd1NpemUuaGVpZ2h0KCkpOworICAgIGlmICghbV93ZWJQYWdlUHJp dmF0ZS0+bV9wYWdlLT5zZXR0aW5ncygpLT5hcHBseURldmljZVNjYWxlRmFjdG9ySW5Db21wb3Np dG9yKCkpCisgICAgICAgIHJlY3Quc2NhbGUoMSAvIG1fd2ViUGFnZVByaXZhdGUtPm1fcGFnZS0+ ZGV2aWNlU2NhbGVGYWN0b3IoKSk7CisgICAgcmV0dXJuIHJlY3Q7CiB9CiAKIEZsb2F0UmVjdCBD aHJvbWVDbGllbnRCbGFja0JlcnJ5OjpwYWdlUmVjdCgpCg==