119365 2013-07-31 17:53:14 -0700 [BlackBerry] Page scrolls when width equals device width and initial scale is greater than 0.92 2013-07-31 19:21:23 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jkjiang jkjiang rwlbuis staikos tonikitoo zimmermann oldest_to_newest 913573 0 jkjiang 2013-07-31 17:53:14 -0700 JIRA 445423. 913582 1 207891 jkjiang 2013-07-31 18:22:56 -0700 Created attachment 207891 Patch 913586 2 207891 rwlbuis 2013-07-31 18:34:59 -0700 Comment on attachment 207891 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=207891&action=review Looks good in general. > Source/WebKit/blackberry/Api/WebPage.cpp:1704 > + float idealContentsHeight = static_cast<float>(this->transformedActualVisibleSize().height()) / devicePixelRatio; Are you sure this-> is needed here? > Source/WebKit/blackberry/Api/WebPage.cpp:1708 > + return false; You could replace the if with a return, and then you don't need the return false; statement. 913590 3 207891 jkjiang 2013-07-31 18:41:43 -0700 Comment on attachment 207891 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=207891&action=review >> Source/WebKit/blackberry/Api/WebPage.cpp:1704 >> + float idealContentsHeight = static_cast<float>(this->transformedActualVisibleSize().height()) / devicePixelRatio; > > Are you sure this-> is needed here? Oops, it's not needed. Previously I was writing something like "transformedActualVisibleSize = this->transformedActualVisibleSize()" and I forgot to remove "this" when I changed the code. I will remove it. >> Source/WebKit/blackberry/Api/WebPage.cpp:1708 >> + return false; > > You could replace the if with a return, and then you don't need the return false; statement. Good idea. Will update. 913602 4 207894 jkjiang 2013-07-31 19:00:31 -0700 Created attachment 207894 Patch 913604 5 207894 rwlbuis 2013-07-31 19:05:03 -0700 Comment on attachment 207894 Patch Excellent! :) 913610 6 jkjiang 2013-07-31 19:21:02 -0700 Committed r153562: <http://trac.webkit.org/changeset/153562> 207891 2013-07-31 18:22:56 -0700 2013-07-31 19:00:26 -0700 Patch bug-119365-20130731212254.patch text/plain 6056 jkjiang U3VidmVyc2lvbiBSZXZpc2lvbjogMTUzNTUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCAxNWE0ZTU1MWY3ZGM0NTM5YTk3MWFlY2MwNDJkZTg4OTI2MjY2ZGQ5Li42ZWIxOGI0MTZi NTE3ZDNkMDI4OWFlZjcwM2JkNzgzZmYyNzZjZTJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwzMiBAQAorMjAxMy0wNy0zMSAgSmFja3kgSmlhbmcgIDx6aGFqaWFu Z0BibGFja2JlcnJ5LmNvbT4KKworICAgICAgICBbQmxhY2tCZXJyeV0gUGFnZSBzY3JvbGxzIHdo ZW4gd2lkdGggZXF1YWxzIGRldmljZSB3aWR0aCBhbmQgaW5pdGlhbCBzY2FsZSBpcyBncmVhdGVy IHRoYW4gMC45MgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTE5MzY1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAg IEludGVybmFsbHkgcmV2aWV3ZWQgYnkgR2VuIE1hayBhbmQgS29ucmFkIFBpYXNjaWsuCisKKyAg ICAgICAgSklSQSA0NDU0MjMKKyAgICAgICAgbGF5b3V0U2l6ZSAoZGV2aWNlU2NyZWVuU2l6ZS9k ZXZpY2VQaXhlbFJhdGlvKSBpcyBGbG9hdFNpemUgYXMgZGV2aWNlUGl4ZWxSYXRpbworICAgICAg ICBpcyBmbG9hdC4gV2UgaGF2ZSB0byByb3VuZCB0aGF0IHRvIEludFNpemUgYXMgU2Nyb2xsVmll dyBuZWVkcyBJbnRTaXplCisgICAgICAgIGZpeGVkTGF5b3V0U2l6ZS4gQmFzZWQgb24gY29udmVy c2lvbiByZXN1bHQsIHpvb21Ub0ZpdFdpZHRoU2NhbGUgd2lsbAorICAgICAgICBoYXJkbHkgZXF1 YWwgdG8gem9vbVRvRml0SGVpZ2h0U2NhbGUgaW4gdGhpcyBjYXNlLiBBbmQgdW5mb3J0dW5hdGVs eQorICAgICAgICB6b29tVG9GaXRIZWlnaHRTY2FsZSBpcyBhIGxpdHRsZSBiaXQgZ3JlYXRlciB0 aGFuIHpvb21Ub0ZpdFdpZHRoU2NhbGUKKyAgICAgICAgaW4gdGhpcyBjYXNlIHNvIHRoYXQgd2Ug aGF2ZSB0byBwaWNrIHVwIHpvb21Ub0ZpdEhlaWdodFNjYWxlIHdoaWNoIG1ha2VzCisgICAgICAg IHRoZSBwYWdlIHNjb2xsYWJsZSBob3Jpem9udGFsbHkuCisgICAgICAgIFRoZSB3YXkgdG8gZml4 IHRoYXQgaXMgdG8gZGVmaW5lIGFuIGFjY3VyYXRlIGNvbnRlbnRzU2l6ZSBhcmVhIHdoaWNoCisg ICAgICAgIHBvdGVudGlhbGx5IGhhcyBmbG9hdCBsYXlvdXRTaXplIHJvdW5kaW5nIGVycm9yIGFu ZCBjYW4gY2F1c2UgdXBleHBlY3RlZAorICAgICAgICBzY3JvbGwgYmFzZWQgb24gdGhlIGlkZWFs IGNvbnRlbnRzU2l6ZSBhcmVhIGZpcnN0LCBhbmQgdGhlbiBkb24ndCBzY3JvbGwKKyAgICAgICAg b25seSBpZiB0aGUgc2NhbGUgaXMgem9vbVRvRml0U2NhbGUgYXMgImNvbnRlbnRzU2l6ZSA+IHZp c2libGVWaWV3cG9ydFNpemUiCisgICAgICAgIHN0aWxsIHdvcmtzIHdlbGwgaWYgdGhlIHNjYWxl IGlzIGxhcmdlciB0aGFuIHpvb21Ub0ZpdFNjYWxlLgorCisgICAgICAgICogQXBpL1dlYlBhZ2Uu Y3BwOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlUHJpdmF0ZTo6aGFzRmxv YXRMYXlvdXRTaXplUm91bmRpbmdFcnJvcik6CisgICAgICAgICogQXBpL1dlYlBhZ2VfcC5oOgor ICAgICAgICAqIFdlYktpdFN1cHBvcnQvV2ViS2l0VGhyZWFkVmlld3BvcnRBY2Nlc3Nvci5jcHA6 CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYktpdFRocmVhZFZpZXdwb3J0QWNjZXNz b3I6OmNhbm5vdFNjcm9sbElmSGFzRmxvYXRMYXlvdXRTaXplUm91bmRpbmdFcnJvcik6CisgICAg ICAgICogV2ViS2l0U3VwcG9ydC9XZWJLaXRUaHJlYWRWaWV3cG9ydEFjY2Vzc29yLmg6CisKIDIw MTMtMDctMjcgIEphY2t5IEppYW5nICA8emhhamlhbmdAYmxhY2tiZXJyeS5jb20+CiAKICAgICAg ICAgUmVwbGFjZSBhbGwgdXNlcyBvZiBHcmFwaGljc0xheWVyOjpjcmVhdGUgZnVuY3Rpb24gd2l0 aCB0aGUgb25lIHRoYXQgdGFrZXMgYSBHcmFwaGljc0xheWVyRmFjdG9yeQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQv YmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAKaW5kZXggZGEzYzRlZWYzYTg1NDYxYmE5YmE0M2E3 NGNlZWMzNWMzZjBiOTBjMC4uMWI5NzcwMGExN2VjMzlhYTg5NmNlNjdjNGM3MmRhMDgzMjFmOTUz YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwCkBAIC0xNjk1LDYg KzE2OTUsMTkgQEAgZG91YmxlIFdlYlBhZ2VQcml2YXRlOjp6b29tVG9GaXRTY2FsZSgpIGNvbnN0 CiAgICAgcmV0dXJuIHN0ZDo6bWluKHpvb21Ub0ZpdFNjYWxlLCBtYXhpbXVtSW1hZ2VEb2N1bWVu dFpvb21Ub0ZpdFNjYWxlKTsKIH0KIAorYm9vbCBXZWJQYWdlUHJpdmF0ZTo6aGFzRmxvYXRMYXlv dXRTaXplUm91bmRpbmdFcnJvcigpIGNvbnN0Cit7CisgICAgaW50IGNvbnRlbnRzV2lkdGggPSBj b250ZW50c1NpemUoKS53aWR0aCgpOworICAgIGludCBjb250ZW50c0hlaWdodCA9IGNvbnRlbnRz U2l6ZSgpLmhlaWdodCgpOworICAgIGZsb2F0IGRldmljZVBpeGVsUmF0aW8gPSBtX3dlYlNldHRp bmdzLT5kZXZpY2VQaXhlbFJhdGlvKCk7CisgICAgZmxvYXQgaWRlYWxDb250ZW50c1dpZHRoID0g c3RhdGljX2Nhc3Q8ZmxvYXQ+KHRoaXMtPnRyYW5zZm9ybWVkQWN0dWFsVmlzaWJsZVNpemUoKS53 aWR0aCgpKSAvIGRldmljZVBpeGVsUmF0aW87CisgICAgZmxvYXQgaWRlYWxDb250ZW50c0hlaWdo dCA9IHN0YXRpY19jYXN0PGZsb2F0Pih0aGlzLT50cmFuc2Zvcm1lZEFjdHVhbFZpc2libGVTaXpl KCkuaGVpZ2h0KCkpIC8gZGV2aWNlUGl4ZWxSYXRpbzsKKyAgICBpZiAoZGV2aWNlUGl4ZWxSYXRp byA+IDEgJiYgY29udGVudHNXaWR0aCA8IGlkZWFsQ29udGVudHNXaWR0aCAmJiAoY29udGVudHNX aWR0aCArIDEpID4gaWRlYWxDb250ZW50c1dpZHRoCisgICAgICAgICYmIGNvbnRlbnRzSGVpZ2h0 IDwgaWRlYWxDb250ZW50c0hlaWdodCAmJiAoY29udGVudHNIZWlnaHQgKyAxKSA+IGlkZWFsQ29u dGVudHNIZWlnaHQpCisgICAgICAgIHJldHVybiB0cnVlOworICAgIHJldHVybiBmYWxzZTsKK30K KwogYm9vbCBXZWJQYWdlUHJpdmF0ZTo6cmVzcGVjdFZpZXdwb3J0KCkgY29uc3QKIHsKICAgICBy ZXR1cm4gbV9mb3JjZVJlc3BlY3RWaWV3cG9ydEFyZ3VtZW50cyB8fCBjb250ZW50c1NpemUoKS53 aWR0aCgpIDw9IG1fdmlydHVhbFZpZXdwb3J0U2l6ZS53aWR0aCgpICsgMTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZV9wLmggYi9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VfcC5oCmluZGV4IGRiOGRjNjAwZTYxNjc3ZWUzZjhiMDRm MTFjODEwMTVkMDI1MjU2YjUuLmY5MWI3NDRlZmViOWU1ODQ3NDRiNWMxZDQxZjA1ZjIyMmExZDVm OTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZV9wLmgK KysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlX3AuaApAQCAtMjQ3LDYg KzI0NywxMiBAQCBwdWJsaWM6CiAgICAgLy8gVmFyaW91cyBzY2FsZSBmYWN0b3JzLgogICAgIGRv dWJsZSBjdXJyZW50U2NhbGUoKSBjb25zdCB7IHJldHVybiBtX3RyYW5zZm9ybWF0aW9uTWF0cml4 LT5tMTEoKTsgfQogICAgIGRvdWJsZSB6b29tVG9GaXRTY2FsZSgpIGNvbnN0OworCisgICAgLy8g V2hlbiBsYXlvdXRTaXplIGlzIHJvdW5kZWQgZnJvbSBGbG9hdFNpemUgdG8gSW50U2l6ZSwgaXQg aGFwcGVucyB0aGF0IGNvbnRlbnRzCisgICAgLy8gY2FuIG5vdCBiZSB6b29tZWQgdG8gZml0IHRo ZSB2aXNpYmxlIHZpZXdwb3J0IGJvdGggaG9yaXpvbnRhbGx5IGFuZCB2ZXJ0aWNhbGx5CisgICAg Ly8gZHVlIHRvIHJvdW5kaW5nIGVycm9yIG9ubHkgYW5kIGNhdXNlcyB1bmV4cGVjdGVkIHNjcm9s bC4KKyAgICBib29sIGhhc0Zsb2F0TGF5b3V0U2l6ZVJvdW5kaW5nRXJyb3IoKSBjb25zdDsKKwog ICAgIGJvb2wgcmVzcGVjdFZpZXdwb3J0KCkgY29uc3Q7CiAgICAgZG91YmxlIGluaXRpYWxTY2Fs ZSgpIGNvbnN0OwogICAgIHZvaWQgc2V0SW5pdGlhbFNjYWxlKGRvdWJsZSBzY2FsZSkgeyBtX2lu aXRpYWxTY2FsZSA9IHNjYWxlOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVy cnkvV2ViS2l0U3VwcG9ydC9XZWJLaXRUaHJlYWRWaWV3cG9ydEFjY2Vzc29yLmNwcCBiL1NvdXJj ZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L1dlYktpdFRocmVhZFZpZXdwb3J0QWNj ZXNzb3IuY3BwCmluZGV4IGQ3YzAxZDQ1YzQ0ODhkMzQwMjI5MTQ4MmJlZDMzODM0OTU5ZDExMzEu LjAyOTU0ZTMxNzMxN2NkM2UyMGVlYTYyNmYxMTkxYmNhYzA3Y2EwMzggMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L1dlYktpdFRocmVhZFZpZXdwb3J0 QWNjZXNzb3IuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0 L1dlYktpdFRocmVhZFZpZXdwb3J0QWNjZXNzb3IuY3BwCkBAIC04OCw1ICs4OCwxNSBAQCBkb3Vi bGUgV2ViS2l0VGhyZWFkVmlld3BvcnRBY2Nlc3Nvcjo6c2NhbGUoKSBjb25zdAogICAgIHJldHVy biBtX3dlYlBhZ2VQcml2YXRlLT5jdXJyZW50U2NhbGUoKTsKIH0KIAorYm9vbCBXZWJLaXRUaHJl YWRWaWV3cG9ydEFjY2Vzc29yOjpjYW5ub3RTY3JvbGxJZkhhc0Zsb2F0TGF5b3V0U2l6ZVJvdW5k aW5nRXJyb3IoKSBjb25zdAoreworICAgIEFTU0VSVChQbGF0Zm9ybTo6d2ViS2l0VGhyZWFkTWVz c2FnZUNsaWVudCgpLT5pc0N1cnJlbnRUaHJlYWQoKSk7CisKKyAgICAvLyBmbG9hdExheW91dFNp emVSb3VuZGluZ0Vycm9yIGNhbiBjYXVzZSBpbmFjY3VyYXRlIHBpeGVsQ29udGVudHNTaXplIGFu ZCByZXN1bHQgaW4KKyAgICAvLyB1bmV4cGVjdGVkIHNjcm9sbCBvbmx5IHdoZW4gdGhlIGN1cnJl bnQgc2NhbGUgaXMgem9vbVRvRml0U2NhbGUuIFdlIGhhdmUgdG8gZXhjbHVkZSB0aGlzIGNhc2Uu CisgICAgcmV0dXJuIG1fd2ViUGFnZVByaXZhdGUtPmhhc0Zsb2F0TGF5b3V0U2l6ZVJvdW5kaW5n RXJyb3IoKQorICAgICAgICAmJiBmYWJzZihtX3dlYlBhZ2VQcml2YXRlLT5jdXJyZW50U2NhbGUo KSAtIG1fd2ViUGFnZVByaXZhdGUtPnpvb21Ub0ZpdFNjYWxlKCkpIDwgRkxUX0VQU0lMT047Cit9 CisKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAogfSAvLyBuYW1lc3BhY2UgQmxhY2tCZXJyeQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvV2ViS2l0VGhy ZWFkVmlld3BvcnRBY2Nlc3Nvci5oIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1 cHBvcnQvV2ViS2l0VGhyZWFkVmlld3BvcnRBY2Nlc3Nvci5oCmluZGV4IGRhNTQ5M2ZkMzI5MzE4 YTg2YWY5NDU2YTk4ODNlYmUxZDM1NTM1ZWIuLmI0OWJhYjE0ZjZhOTU0M2ZjNDA4ZTQzYjg1YmJh MjFhMDY2ODc5ODYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRT dXBwb3J0L1dlYktpdFRocmVhZFZpZXdwb3J0QWNjZXNzb3IuaAorKysgYi9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9XZWJLaXRUaHJlYWRWaWV3cG9ydEFjY2Vzc29yLmgK QEAgLTM2LDYgKzM2LDggQEAgcHVibGljOgogCiAgICAgdmlydHVhbCBkb3VibGUgc2NhbGUoKSBj b25zdDsKIAorICAgIHZpcnR1YWwgYm9vbCBjYW5ub3RTY3JvbGxJZkhhc0Zsb2F0TGF5b3V0U2l6 ZVJvdW5kaW5nRXJyb3IoKSBjb25zdDsKKwogcHJpdmF0ZToKICAgICBQbGF0Zm9ybTo6Vmlld3Bv cnRBY2Nlc3NvciogbV9vcmlnaW5hbEFjY2Vzc29yOwogICAgIFdlYlBhZ2VQcml2YXRlKiBtX3dl YlBhZ2VQcml2YXRlOwo= 207894 2013-07-31 19:00:31 -0700 2013-07-31 19:21:23 -0700 Patch bug-119365-20130731220029.patch text/plain 6006 jkjiang U3VidmVyc2lvbiBSZXZpc2lvbjogMTUzNTUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCAxNWE0ZTU1MWY3ZGM0NTM5YTk3MWFlY2MwNDJkZTg4OTI2MjY2ZGQ5Li42ZWIxOGI0MTZi NTE3ZDNkMDI4OWFlZjcwM2JkNzgzZmYyNzZjZTJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwzMiBAQAorMjAxMy0wNy0zMSAgSmFja3kgSmlhbmcgIDx6aGFqaWFu Z0BibGFja2JlcnJ5LmNvbT4KKworICAgICAgICBbQmxhY2tCZXJyeV0gUGFnZSBzY3JvbGxzIHdo ZW4gd2lkdGggZXF1YWxzIGRldmljZSB3aWR0aCBhbmQgaW5pdGlhbCBzY2FsZSBpcyBncmVhdGVy IHRoYW4gMC45MgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTE5MzY1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAg IEludGVybmFsbHkgcmV2aWV3ZWQgYnkgR2VuIE1hayBhbmQgS29ucmFkIFBpYXNjaWsuCisKKyAg ICAgICAgSklSQSA0NDU0MjMKKyAgICAgICAgbGF5b3V0U2l6ZSAoZGV2aWNlU2NyZWVuU2l6ZS9k ZXZpY2VQaXhlbFJhdGlvKSBpcyBGbG9hdFNpemUgYXMgZGV2aWNlUGl4ZWxSYXRpbworICAgICAg ICBpcyBmbG9hdC4gV2UgaGF2ZSB0byByb3VuZCB0aGF0IHRvIEludFNpemUgYXMgU2Nyb2xsVmll dyBuZWVkcyBJbnRTaXplCisgICAgICAgIGZpeGVkTGF5b3V0U2l6ZS4gQmFzZWQgb24gY29udmVy c2lvbiByZXN1bHQsIHpvb21Ub0ZpdFdpZHRoU2NhbGUgd2lsbAorICAgICAgICBoYXJkbHkgZXF1 YWwgdG8gem9vbVRvRml0SGVpZ2h0U2NhbGUgaW4gdGhpcyBjYXNlLiBBbmQgdW5mb3J0dW5hdGVs eQorICAgICAgICB6b29tVG9GaXRIZWlnaHRTY2FsZSBpcyBhIGxpdHRsZSBiaXQgZ3JlYXRlciB0 aGFuIHpvb21Ub0ZpdFdpZHRoU2NhbGUKKyAgICAgICAgaW4gdGhpcyBjYXNlIHNvIHRoYXQgd2Ug aGF2ZSB0byBwaWNrIHVwIHpvb21Ub0ZpdEhlaWdodFNjYWxlIHdoaWNoIG1ha2VzCisgICAgICAg IHRoZSBwYWdlIHNjb2xsYWJsZSBob3Jpem9udGFsbHkuCisgICAgICAgIFRoZSB3YXkgdG8gZml4 IHRoYXQgaXMgdG8gZGVmaW5lIGFuIGFjY3VyYXRlIGNvbnRlbnRzU2l6ZSBhcmVhIHdoaWNoCisg ICAgICAgIHBvdGVudGlhbGx5IGhhcyBmbG9hdCBsYXlvdXRTaXplIHJvdW5kaW5nIGVycm9yIGFu ZCBjYW4gY2F1c2UgdXBleHBlY3RlZAorICAgICAgICBzY3JvbGwgYmFzZWQgb24gdGhlIGlkZWFs IGNvbnRlbnRzU2l6ZSBhcmVhIGZpcnN0LCBhbmQgdGhlbiBkb24ndCBzY3JvbGwKKyAgICAgICAg b25seSBpZiB0aGUgc2NhbGUgaXMgem9vbVRvRml0U2NhbGUgYXMgImNvbnRlbnRzU2l6ZSA+IHZp c2libGVWaWV3cG9ydFNpemUiCisgICAgICAgIHN0aWxsIHdvcmtzIHdlbGwgaWYgdGhlIHNjYWxl IGlzIGxhcmdlciB0aGFuIHpvb21Ub0ZpdFNjYWxlLgorCisgICAgICAgICogQXBpL1dlYlBhZ2Uu Y3BwOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlUHJpdmF0ZTo6aGFzRmxv YXRMYXlvdXRTaXplUm91bmRpbmdFcnJvcik6CisgICAgICAgICogQXBpL1dlYlBhZ2VfcC5oOgor ICAgICAgICAqIFdlYktpdFN1cHBvcnQvV2ViS2l0VGhyZWFkVmlld3BvcnRBY2Nlc3Nvci5jcHA6 CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYktpdFRocmVhZFZpZXdwb3J0QWNjZXNz b3I6OmNhbm5vdFNjcm9sbElmSGFzRmxvYXRMYXlvdXRTaXplUm91bmRpbmdFcnJvcik6CisgICAg ICAgICogV2ViS2l0U3VwcG9ydC9XZWJLaXRUaHJlYWRWaWV3cG9ydEFjY2Vzc29yLmg6CisKIDIw MTMtMDctMjcgIEphY2t5IEppYW5nICA8emhhamlhbmdAYmxhY2tiZXJyeS5jb20+CiAKICAgICAg ICAgUmVwbGFjZSBhbGwgdXNlcyBvZiBHcmFwaGljc0xheWVyOjpjcmVhdGUgZnVuY3Rpb24gd2l0 aCB0aGUgb25lIHRoYXQgdGFrZXMgYSBHcmFwaGljc0xheWVyRmFjdG9yeQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQv YmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAKaW5kZXggZGEzYzRlZWYzYTg1NDYxYmE5YmE0M2E3 NGNlZWMzNWMzZjBiOTBjMC4uZjk4OWQzYmFkMWRkYWUxMGM0NDU2YzllMTBlZDdiZTk2MmEyODZi ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwCkBAIC0xNjk1LDYg KzE2OTUsMTcgQEAgZG91YmxlIFdlYlBhZ2VQcml2YXRlOjp6b29tVG9GaXRTY2FsZSgpIGNvbnN0 CiAgICAgcmV0dXJuIHN0ZDo6bWluKHpvb21Ub0ZpdFNjYWxlLCBtYXhpbXVtSW1hZ2VEb2N1bWVu dFpvb21Ub0ZpdFNjYWxlKTsKIH0KIAorYm9vbCBXZWJQYWdlUHJpdmF0ZTo6aGFzRmxvYXRMYXlv dXRTaXplUm91bmRpbmdFcnJvcigpIGNvbnN0Cit7CisgICAgaW50IGNvbnRlbnRzV2lkdGggPSBj b250ZW50c1NpemUoKS53aWR0aCgpOworICAgIGludCBjb250ZW50c0hlaWdodCA9IGNvbnRlbnRz U2l6ZSgpLmhlaWdodCgpOworICAgIGZsb2F0IGRldmljZVBpeGVsUmF0aW8gPSBtX3dlYlNldHRp bmdzLT5kZXZpY2VQaXhlbFJhdGlvKCk7CisgICAgZmxvYXQgaWRlYWxDb250ZW50c1dpZHRoID0g c3RhdGljX2Nhc3Q8ZmxvYXQ+KHRyYW5zZm9ybWVkQWN0dWFsVmlzaWJsZVNpemUoKS53aWR0aCgp KSAvIGRldmljZVBpeGVsUmF0aW87CisgICAgZmxvYXQgaWRlYWxDb250ZW50c0hlaWdodCA9IHN0 YXRpY19jYXN0PGZsb2F0Pih0cmFuc2Zvcm1lZEFjdHVhbFZpc2libGVTaXplKCkuaGVpZ2h0KCkp IC8gZGV2aWNlUGl4ZWxSYXRpbzsKKyAgICByZXR1cm4gZGV2aWNlUGl4ZWxSYXRpbyA+IDEgJiYg Y29udGVudHNXaWR0aCA8IGlkZWFsQ29udGVudHNXaWR0aCAmJiAoY29udGVudHNXaWR0aCArIDEp ID4gaWRlYWxDb250ZW50c1dpZHRoCisgICAgICAgICYmIGNvbnRlbnRzSGVpZ2h0IDwgaWRlYWxD b250ZW50c0hlaWdodCAmJiAoY29udGVudHNIZWlnaHQgKyAxKSA+IGlkZWFsQ29udGVudHNIZWln aHQ7Cit9CisKIGJvb2wgV2ViUGFnZVByaXZhdGU6OnJlc3BlY3RWaWV3cG9ydCgpIGNvbnN0CiB7 CiAgICAgcmV0dXJuIG1fZm9yY2VSZXNwZWN0Vmlld3BvcnRBcmd1bWVudHMgfHwgY29udGVudHNT aXplKCkud2lkdGgoKSA8PSBtX3ZpcnR1YWxWaWV3cG9ydFNpemUud2lkdGgoKSArIDE7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VfcC5oIGIvU291cmNl L1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlX3AuaAppbmRleCBkYjhkYzYwMGU2MTY3N2Vl M2Y4YjA0ZjExYzgxMDE1ZDAyNTI1NmI1Li5mOTFiNzQ0ZWZlYjllNTg0NzQ0YjVjMWQ0MWYwNWYy MjJhMWQ1Zjk3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBh Z2VfcC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZV9wLmgKQEAg LTI0Nyw2ICsyNDcsMTIgQEAgcHVibGljOgogICAgIC8vIFZhcmlvdXMgc2NhbGUgZmFjdG9ycy4K ICAgICBkb3VibGUgY3VycmVudFNjYWxlKCkgY29uc3QgeyByZXR1cm4gbV90cmFuc2Zvcm1hdGlv bk1hdHJpeC0+bTExKCk7IH0KICAgICBkb3VibGUgem9vbVRvRml0U2NhbGUoKSBjb25zdDsKKwor ICAgIC8vIFdoZW4gbGF5b3V0U2l6ZSBpcyByb3VuZGVkIGZyb20gRmxvYXRTaXplIHRvIEludFNp emUsIGl0IGhhcHBlbnMgdGhhdCBjb250ZW50cworICAgIC8vIGNhbiBub3QgYmUgem9vbWVkIHRv IGZpdCB0aGUgdmlzaWJsZSB2aWV3cG9ydCBib3RoIGhvcml6b250YWxseSBhbmQgdmVydGljYWxs eQorICAgIC8vIGR1ZSB0byByb3VuZGluZyBlcnJvciBvbmx5IGFuZCBjYXVzZXMgdW5leHBlY3Rl ZCBzY3JvbGwuCisgICAgYm9vbCBoYXNGbG9hdExheW91dFNpemVSb3VuZGluZ0Vycm9yKCkgY29u c3Q7CisKICAgICBib29sIHJlc3BlY3RWaWV3cG9ydCgpIGNvbnN0OwogICAgIGRvdWJsZSBpbml0 aWFsU2NhbGUoKSBjb25zdDsKICAgICB2b2lkIHNldEluaXRpYWxTY2FsZShkb3VibGUgc2NhbGUp IHsgbV9pbml0aWFsU2NhbGUgPSBzY2FsZTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9i bGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvV2ViS2l0VGhyZWFkVmlld3BvcnRBY2Nlc3Nvci5jcHAg Yi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9XZWJLaXRUaHJlYWRWaWV3 cG9ydEFjY2Vzc29yLmNwcAppbmRleCBkN2MwMWQ0NWM0NDg4ZDM0MDIyOTE0ODJiZWQzMzgzNDk1 OWQxMTMxLi4wMjk1NGUzMTczMTdjZDNlMjBlZWE2MjZmMTE5MWJjYWMwN2NhMDM4IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9XZWJLaXRUaHJlYWRW aWV3cG9ydEFjY2Vzc29yLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0 U3VwcG9ydC9XZWJLaXRUaHJlYWRWaWV3cG9ydEFjY2Vzc29yLmNwcApAQCAtODgsNSArODgsMTUg QEAgZG91YmxlIFdlYktpdFRocmVhZFZpZXdwb3J0QWNjZXNzb3I6OnNjYWxlKCkgY29uc3QKICAg ICByZXR1cm4gbV93ZWJQYWdlUHJpdmF0ZS0+Y3VycmVudFNjYWxlKCk7CiB9CiAKK2Jvb2wgV2Vi S2l0VGhyZWFkVmlld3BvcnRBY2Nlc3Nvcjo6Y2Fubm90U2Nyb2xsSWZIYXNGbG9hdExheW91dFNp emVSb3VuZGluZ0Vycm9yKCkgY29uc3QKK3sKKyAgICBBU1NFUlQoUGxhdGZvcm06OndlYktpdFRo cmVhZE1lc3NhZ2VDbGllbnQoKS0+aXNDdXJyZW50VGhyZWFkKCkpOworCisgICAgLy8gZmxvYXRM YXlvdXRTaXplUm91bmRpbmdFcnJvciBjYW4gY2F1c2UgaW5hY2N1cmF0ZSBwaXhlbENvbnRlbnRz U2l6ZSBhbmQgcmVzdWx0IGluCisgICAgLy8gdW5leHBlY3RlZCBzY3JvbGwgb25seSB3aGVuIHRo ZSBjdXJyZW50IHNjYWxlIGlzIHpvb21Ub0ZpdFNjYWxlLiBXZSBoYXZlIHRvIGV4Y2x1ZGUgdGhp cyBjYXNlLgorICAgIHJldHVybiBtX3dlYlBhZ2VQcml2YXRlLT5oYXNGbG9hdExheW91dFNpemVS b3VuZGluZ0Vycm9yKCkKKyAgICAgICAgJiYgZmFic2YobV93ZWJQYWdlUHJpdmF0ZS0+Y3VycmVu dFNjYWxlKCkgLSBtX3dlYlBhZ2VQcml2YXRlLT56b29tVG9GaXRTY2FsZSgpKSA8IEZMVF9FUFNJ TE9OOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKIH0gLy8gbmFtZXNwYWNlIEJsYWNrQmVy cnkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L1dl YktpdFRocmVhZFZpZXdwb3J0QWNjZXNzb3IuaCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9X ZWJLaXRTdXBwb3J0L1dlYktpdFRocmVhZFZpZXdwb3J0QWNjZXNzb3IuaAppbmRleCBkYTU0OTNm ZDMyOTMxOGE4NmFmOTQ1NmE5ODgzZWJlMWQzNTUzNWViLi5iNDliYWIxNGY2YTk1NDNmYzQwOGU0 M2I4NWJiYTIxYTA2Njg3OTg2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkv V2ViS2l0U3VwcG9ydC9XZWJLaXRUaHJlYWRWaWV3cG9ydEFjY2Vzc29yLmgKKysrIGIvU291cmNl L1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvV2ViS2l0VGhyZWFkVmlld3BvcnRBY2Nl c3Nvci5oCkBAIC0zNiw2ICszNiw4IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgZG91YmxlIHNj YWxlKCkgY29uc3Q7CiAKKyAgICB2aXJ0dWFsIGJvb2wgY2Fubm90U2Nyb2xsSWZIYXNGbG9hdExh eW91dFNpemVSb3VuZGluZ0Vycm9yKCkgY29uc3Q7CisKIHByaXZhdGU6CiAgICAgUGxhdGZvcm06 OlZpZXdwb3J0QWNjZXNzb3IqIG1fb3JpZ2luYWxBY2Nlc3NvcjsKICAgICBXZWJQYWdlUHJpdmF0 ZSogbV93ZWJQYWdlUHJpdmF0ZTsK