97222 2012-09-20 08:37:28 -0700 [Qt] PageViewportController: Consolidate positionRangeForViewportAtScale and boundPosition 2012-09-25 10:28:09 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jturcotte jturcotte abecsi hausmann kenneth webkit.review.bot oldest_to_newest 724548 0 jturcotte 2012-09-20 08:37:28 -0700 [Qt] PageViewportController: Consolidate positionRangeForViewportAtScale and boundPosition 724566 1 164931 jturcotte 2012-09-20 09:23:51 -0700 Created attachment 164931 Patch 727701 2 165626 jturcotte 2012-09-25 09:21:42 -0700 Created attachment 165626 Patch Patch for landing 727775 3 165626 webkit.review.bot 2012-09-25 10:28:06 -0700 Comment on attachment 165626 Patch Clearing flags on attachment: 165626 Committed r129526: <http://trac.webkit.org/changeset/129526> 727776 4 webkit.review.bot 2012-09-25 10:28:09 -0700 All reviewed patches have been landed. Closing bug. 164931 2012-09-20 09:23:51 -0700 2012-09-25 09:21:39 -0700 Patch bug-97222-20120920182315.patch text/plain 10640 jturcotte U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4OTg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMDM2NzA5ZmJiZGNkNTMx Mjc5NjZlOGFiM2Y0ODY2MGNiMGE4NjEyOC4uMzA1MzdiNWZkMGQxM2Y5NGUzODA2NzgwZDZjNTFl M2RmMzk5NzNiNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMwIEBACiAyMDEyLTA5LTIwICBKb2Nl bHluIFR1cmNvdHRlICA8am9jZWx5bi50dXJjb3R0ZUBkaWdpYS5jb20+CiAKKyAgICAgICAgW1F0 XSBQYWdlVmlld3BvcnRDb250cm9sbGVyOiBDb25zb2xpZGF0ZSBwb3NpdGlvblJhbmdlRm9yVmll d3BvcnRBdFNjYWxlIGFuZCBib3VuZFBvc2l0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NzIyMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFRob3NlIG1ldGhvZHMgYXJlIHVzZWQgdG9nZXRoZXIgZXZl cnl3aGVyZSwgbWVyZ2UgdGhlbSBpbnRvIGEgc2luZ2xlCisgICAgICAgIGNsYW1wVmlld3BvcnRU b0NvbnRlbnRzIG1ldGhvZC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9QYWdlVmlld3BvcnRDb250 cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UGFnZVZpZXdwb3J0Q29udHJvbGxlcjo6aW5u ZXJCb3VuZGVkVmlld3BvcnRTY2FsZSk6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VWaWV3cG9ydENv bnRyb2xsZXI6Om91dGVyQm91bmRlZFZpZXdwb3J0U2NhbGUpOgorICAgICAgICAoV2ViS2l0OjpQ YWdlVmlld3BvcnRDb250cm9sbGVyOjpjbGFtcFZpZXdwb3J0VG9Db250ZW50cyk6CisgICAgICAg IChXZWJLaXQpOgorICAgICAgICAoV2ViS2l0OjpQYWdlVmlld3BvcnRDb250cm9sbGVyOjpwYWdl RGlkUmVxdWVzdFNjcm9sbCk6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VWaWV3cG9ydENvbnRyb2xs ZXI6OnN5bmNWaXNpYmxlQ29udGVudHMpOgorICAgICAgICAqIFVJUHJvY2Vzcy9QYWdlVmlld3Bv cnRDb250cm9sbGVyLmg6CisgICAgICAgIChQYWdlVmlld3BvcnRDb250cm9sbGVyKToKKyAgICAg ICAgKFdlYktpdCk6CisgICAgICAgICogVUlQcm9jZXNzL3F0L1BhZ2VWaWV3cG9ydENvbnRyb2xs ZXJDbGllbnRRdC5jcHA6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VWaWV3cG9ydENvbnRyb2xsZXJD bGllbnRRdDo6Zm9jdXNFZGl0YWJsZUFyZWEpOgorICAgICAgICAoV2ViS2l0OjpQYWdlVmlld3Bv cnRDb250cm9sbGVyQ2xpZW50UXQ6Onpvb21Ub0FyZWFHZXN0dXJlRW5kZWQpOgorICAgICAgICAo V2ViS2l0OjpQYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50UXQ6Om5lYXJlc3RWYWxpZFZpc2li bGVDb250ZW50c1JlY3QpOgorCisyMDEyLTA5LTIwICBKb2NlbHluIFR1cmNvdHRlICA8am9jZWx5 bi50dXJjb3R0ZUBkaWdpYS5jb20+CisKICAgICAgICAgW1F0XSBVbmlmeSB0aGUgUGFnZVZpZXdw b3J0Q29udHJvbGxlcjwtPkNsaWVudCBpbnRlcmZhY2UgcmVnYXJkaW5nIHBvc2l0aW9ucwogICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTcyMjAKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BhZ2VWaWV3cG9ydENvbnRyb2xsZXIu Y3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BhZ2VWaWV3cG9ydENvbnRyb2xsZXIuY3Bw CmluZGV4IDU0NmRlZGUwZTdiYjExYjVkNzMyYTM5NGY1YjJhMmIwYTVlNmFmOWIuLjEyMDFmODRk MzA2NGE1NjE0NjFlNDViZmYzNmZkNWZmZGMxN2M0ZGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9QYWdlVmlld3BvcnRDb250cm9sbGVyLmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvUGFnZVZpZXdwb3J0Q29udHJvbGxlci5jcHAKQEAgLTMyLDIxICszMiwx MSBAQCB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLXN0 YXRpYyBpbmxpbmUgZmxvYXQgYm91bmQoZmxvYXQgbWluLCBmbG9hdCB2YWx1ZSwgZmxvYXQgbWF4 KQotewotICAgIHJldHVybiBjbGFtcFRvPGZsb2F0Pih2YWx1ZSwgbWluLCBtYXgpOwotfQotCiBi b29sIGZ1enp5Q29tcGFyZShmbG9hdCBhLCBmbG9hdCBiLCBmbG9hdCBlcHNpbG9uKQogewogICAg IHJldHVybiBzdGQ6OmFicyhhIC0gYikgPCBlcHNpbG9uOwogfQogCi1GbG9hdFBvaW50IGJvdW5k UG9zaXRpb24oY29uc3QgRmxvYXRQb2ludCBtaW5Qb3NpdGlvbiwgY29uc3QgRmxvYXRQb2ludCYg cG9zaXRpb24sIGNvbnN0IEZsb2F0UG9pbnQmIG1heFBvc2l0aW9uKQotewotICAgIHJldHVybiBG bG9hdFBvaW50KGJvdW5kKG1pblBvc2l0aW9uLngoKSwgcG9zaXRpb24ueCgpLCBtYXhQb3NpdGlv bi54KCkpLCBib3VuZChtaW5Qb3NpdGlvbi55KCksIHBvc2l0aW9uLnkoKSwgbWF4UG9zaXRpb24u eSgpKSk7Ci19Ci0KIFZpZXdwb3J0VXBkYXRlRGVmZXJyZXI6OlZpZXdwb3J0VXBkYXRlRGVmZXJy ZXIoUGFnZVZpZXdwb3J0Q29udHJvbGxlciogUGFnZVZpZXdwb3J0Q29udHJvbGxlciwgU3VzcGVu ZENvbnRlbnRGbGFnIHN1c3BlbmRDb250ZW50RmxhZykKICAgICA6IG1fY29udHJvbGxlcihQYWdl Vmlld3BvcnRDb250cm9sbGVyKQogewpAQCAtOTMsNyArODMsNyBAQCBQYWdlVmlld3BvcnRDb250 cm9sbGVyOjpQYWdlVmlld3BvcnRDb250cm9sbGVyKFdlYktpdDo6V2ViUGFnZVByb3h5KiBwcm94 eSwgUGFnZQogCiBmbG9hdCBQYWdlVmlld3BvcnRDb250cm9sbGVyOjppbm5lckJvdW5kZWRWaWV3 cG9ydFNjYWxlKGZsb2F0IHZpZXdwb3J0U2NhbGUpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIGJvdW5k KHRvVmlld3BvcnRTY2FsZShtX21pbmltdW1TY2FsZVRvRml0KSwgdmlld3BvcnRTY2FsZSwgdG9W aWV3cG9ydFNjYWxlKG1fcmF3QXR0cmlidXRlcy5tYXhpbXVtU2NhbGUpKTsKKyAgICByZXR1cm4g Y2xhbXBUbyh2aWV3cG9ydFNjYWxlLCB0b1ZpZXdwb3J0U2NhbGUobV9taW5pbXVtU2NhbGVUb0Zp dCksIHRvVmlld3BvcnRTY2FsZShtX3Jhd0F0dHJpYnV0ZXMubWF4aW11bVNjYWxlKSk7CiB9CiAK IGZsb2F0IFBhZ2VWaWV3cG9ydENvbnRyb2xsZXI6Om91dGVyQm91bmRlZFZpZXdwb3J0U2NhbGUo ZmxvYXQgdmlld3BvcnRTY2FsZSkgY29uc3QKQEAgLTEwMiwxMSArOTIsMTkgQEAgZmxvYXQgUGFn ZVZpZXdwb3J0Q29udHJvbGxlcjo6b3V0ZXJCb3VuZGVkVmlld3BvcnRTY2FsZShmbG9hdCB2aWV3 cG9ydFNjYWxlKSBjb24KICAgICAgICAgLy8gQm91bmRlZCBieSBbMC4xLCAxMC4wXSBsaWtlIHRo ZSB2aWV3cG9ydCBtZXRhIGNvZGUgaW4gV2ViQ29yZS4KICAgICAgICAgZmxvYXQgaGFyZE1pbiA9 IHRvVmlld3BvcnRTY2FsZShzdGQ6Om1heDxmbG9hdD4oMC4xLCAwLjUgKiBtX21pbmltdW1TY2Fs ZVRvRml0KSk7CiAgICAgICAgIGZsb2F0IGhhcmRNYXggPSB0b1ZpZXdwb3J0U2NhbGUoc3RkOjpt aW48ZmxvYXQ+KDEwLCAyICogbV9yYXdBdHRyaWJ1dGVzLm1heGltdW1TY2FsZSkpOwotICAgICAg ICByZXR1cm4gYm91bmQoaGFyZE1pbiwgdmlld3BvcnRTY2FsZSwgaGFyZE1heCk7CisgICAgICAg IHJldHVybiBjbGFtcFRvKHZpZXdwb3J0U2NhbGUsIGhhcmRNaW4sIGhhcmRNYXgpOwogICAgIH0K ICAgICByZXR1cm4gaW5uZXJCb3VuZGVkVmlld3BvcnRTY2FsZSh2aWV3cG9ydFNjYWxlKTsKIH0K IAorRmxvYXRQb2ludCBQYWdlVmlld3BvcnRDb250cm9sbGVyOjpjbGFtcFZpZXdwb3J0VG9Db250 ZW50cyhjb25zdCBXZWJDb3JlOjpGbG9hdFBvaW50JiB2aWV3cG9ydFBvcywgZmxvYXQgdmlld3Bv cnRTY2FsZSkKK3sKKyAgICBjb25zdCBmbG9hdCBob3Jpem9udGFsUmFuZ2UgPSBzdGQ6Om1heCgw LmYsIG1fY29udGVudHNTaXplLndpZHRoKCkgLSBtX3ZpZXdwb3J0U2l6ZS53aWR0aCgpIC8gdmll d3BvcnRTY2FsZSk7CisgICAgY29uc3QgZmxvYXQgdmVydGljYWxSYW5nZSA9IHN0ZDo6bWF4KDAu ZiwgbV9jb250ZW50c1NpemUuaGVpZ2h0KCkgLSBtX3ZpZXdwb3J0U2l6ZS5oZWlnaHQoKSAvIHZp ZXdwb3J0U2NhbGUpOworCisgICAgcmV0dXJuIEZsb2F0UG9pbnQoY2xhbXBUbyh2aWV3cG9ydFBv cy54KCksIDAuZiwgaG9yaXpvbnRhbFJhbmdlKSwgY2xhbXBUbyh2aWV3cG9ydFBvcy55KCksIDAu ZiwgdmVydGljYWxSYW5nZSkpOworfQorCiB2b2lkIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXI6OmRp ZENoYW5nZUNvbnRlbnRzU2l6ZShjb25zdCBJbnRTaXplJiBuZXdTaXplKQogewogICAgIGlmICht X3ZpZXdwb3J0U2l6ZS5pc0VtcHR5KCkgfHwgbmV3U2l6ZS5pc0VtcHR5KCkpCkBAIC0xMjQsMTAg KzEyMiw3IEBAIHZvaWQgUGFnZVZpZXdwb3J0Q29udHJvbGxlcjo6cGFnZURpZFJlcXVlc3RTY3Jv bGwoY29uc3QgSW50UG9pbnQmIGNzc1Bvc2l0aW9uKQogICAgIGlmIChtX2FjdGl2ZURlZmVycmVy Q291bnQpCiAgICAgICAgIHJldHVybjsKIAotICAgIEZsb2F0UmVjdCBlbmRQb3NSYW5nZSA9IHBv c2l0aW9uUmFuZ2VGb3JWaWV3cG9ydEF0U2NhbGUobV9lZmZlY3RpdmVTY2FsZSk7Ci0gICAgRmxv YXRQb2ludCBlbmRQb3NpdGlvbiA9IGJvdW5kUG9zaXRpb24oZW5kUG9zUmFuZ2UubWluWE1pbllD b3JuZXIoKSwgY3NzUG9zaXRpb24sIGVuZFBvc1JhbmdlLm1heFhNYXhZQ29ybmVyKCkpOwotCi0g ICAgbV9jbGllbnQtPnNldFZpZXdwb3J0UG9zaXRpb24oZW5kUG9zaXRpb24pOworICAgIG1fY2xp ZW50LT5zZXRWaWV3cG9ydFBvc2l0aW9uKGNsYW1wVmlld3BvcnRUb0NvbnRlbnRzKGNzc1Bvc2l0 aW9uLCBtX2VmZmVjdGl2ZVNjYWxlKSk7CiB9CiAKIHZvaWQgUGFnZVZpZXdwb3J0Q29udHJvbGxl cjo6ZGlkQ2hhbmdlVmlld3BvcnRTaXplKGNvbnN0IEZsb2F0U2l6ZSYgbmV3U2l6ZSkKQEAgLTE1 NywxMCArMTUyLDcgQEAgdm9pZCBQYWdlVmlld3BvcnRDb250cm9sbGVyOjpzeW5jVmlzaWJsZUNv bnRlbnRzKGNvbnN0IEZsb2F0UG9pbnQmIHRyYWplY3RvcnlWZWMKICAgICBpZiAoIWRyYXdpbmdB cmVhIHx8IG1fdmlld3BvcnRTaXplLmlzRW1wdHkoKSB8fCBtX2NvbnRlbnRzU2l6ZS5pc0VtcHR5 KCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIEZsb2F0UmVjdCBlbmRQb3NSYW5nZSA9IHBvc2l0 aW9uUmFuZ2VGb3JWaWV3cG9ydEF0U2NhbGUobV9lZmZlY3RpdmVTY2FsZSk7Ci0gICAgRmxvYXRQ b2ludCBlbmRQb3NpdGlvbiA9IGJvdW5kUG9zaXRpb24oZW5kUG9zUmFuZ2UubWluWE1pbllDb3Ju ZXIoKSwgbV92aWV3cG9ydFBvcywgZW5kUG9zUmFuZ2UubWF4WE1heFlDb3JuZXIoKSk7Ci0KLSAg ICBGbG9hdFJlY3QgdmlzaWJsZUNvbnRlbnRzUmVjdChlbmRQb3NpdGlvbiwgbV92aWV3cG9ydFNp emUgLyBtX2VmZmVjdGl2ZVNjYWxlKTsKKyAgICBGbG9hdFJlY3QgdmlzaWJsZUNvbnRlbnRzUmVj dChjbGFtcFZpZXdwb3J0VG9Db250ZW50cyhtX3ZpZXdwb3J0UG9zLCBtX2VmZmVjdGl2ZVNjYWxl KSwgbV92aWV3cG9ydFNpemUgLyBtX2VmZmVjdGl2ZVNjYWxlKTsKICAgICB2aXNpYmxlQ29udGVu dHNSZWN0LmludGVyc2VjdChGbG9hdFJlY3QoRmxvYXRQb2ludDo6emVybygpLCBtX2NvbnRlbnRz U2l6ZSkpOwogICAgIGRyYXdpbmdBcmVhLT5zZXRWaXNpYmxlQ29udGVudHNSZWN0KHZpc2libGVD b250ZW50c1JlY3QsIG1fZWZmZWN0aXZlU2NhbGUsIHRyYWplY3RvcnlWZWN0b3IpOwogCkBAIC0y MjEsMTIgKzIxMyw0IEBAIHZvaWQgUGFnZVZpZXdwb3J0Q29udHJvbGxlcjo6dXBkYXRlTWluaW11 bVNjYWxlVG9GaXQoKQogICAgIH0KIH0KIAotRmxvYXRSZWN0IFBhZ2VWaWV3cG9ydENvbnRyb2xs ZXI6OnBvc2l0aW9uUmFuZ2VGb3JWaWV3cG9ydEF0U2NhbGUoZmxvYXQgdmlld3BvcnRTY2FsZSkg Y29uc3QKLXsKLSAgICBjb25zdCBmbG9hdCBob3Jpem9udGFsUmFuZ2UgPSBtX2NvbnRlbnRzU2l6 ZS53aWR0aCgpIC0gbV92aWV3cG9ydFNpemUud2lkdGgoKSAvIHZpZXdwb3J0U2NhbGU7Ci0gICAg Y29uc3QgZmxvYXQgdmVydGljYWxSYW5nZSA9IG1fY29udGVudHNTaXplLmhlaWdodCgpIC0gbV92 aWV3cG9ydFNpemUuaGVpZ2h0KCkgLyB2aWV3cG9ydFNjYWxlOwotCi0gICAgcmV0dXJuIEZsb2F0 UmVjdCgwLCAwLCBob3Jpem9udGFsUmFuZ2UsIHZlcnRpY2FsUmFuZ2UpOwotfQotCiB9IC8vIG5h bWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdl Vmlld3BvcnRDb250cm9sbGVyLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZVZpZXdw b3J0Q29udHJvbGxlci5oCmluZGV4IDBkZDRlMGE4OGQxZmQwZWIyYTRmODI5YmU5ZjE2ZmIyNDVi ZDRiNWEuLjJlMWVlM2JlNzc2MWQ5ZTQ2NGI4NzhmYmVhMDNjYzE3OGE1N2I3Y2MgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlVmlld3BvcnRDb250cm9sbGVyLmgKKysr IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BhZ2VWaWV3cG9ydENvbnRyb2xsZXIuaApAQCAt NzQsMTAgKzc0LDkgQEAgcHVibGljOgogICAgIHZvaWQgc3VzcGVuZENvbnRlbnQoKTsKICAgICB2 b2lkIHJlc3VtZUNvbnRlbnQoKTsKIAotICAgIFdlYkNvcmU6OkZsb2F0UmVjdCBwb3NpdGlvblJh bmdlRm9yVmlld3BvcnRBdFNjYWxlKGZsb2F0IHZpZXdwb3J0U2NhbGUpIGNvbnN0OwotCiAgICAg ZmxvYXQgaW5uZXJCb3VuZGVkVmlld3BvcnRTY2FsZShmbG9hdCkgY29uc3Q7CiAgICAgZmxvYXQg b3V0ZXJCb3VuZGVkVmlld3BvcnRTY2FsZShmbG9hdCkgY29uc3Q7CisgICAgV2ViQ29yZTo6Rmxv YXRQb2ludCBjbGFtcFZpZXdwb3J0VG9Db250ZW50cyhjb25zdCBXZWJDb3JlOjpGbG9hdFBvaW50 JiB2aWV3cG9ydFBvcywgZmxvYXQgdmlld3BvcnRTY2FsZSk7CiAKICAgICBib29sIGhhc1N1c3Bl bmRlZENvbnRlbnQoKSBjb25zdCB7IHJldHVybiBtX2hhc1N1c3BlbmRlZENvbnRlbnQ7IH0KICAg ICBib29sIGhhZFVzZXJJbnRlcmFjdGlvbigpIGNvbnN0IHsgcmV0dXJuIG1faGFkVXNlckludGVy YWN0aW9uOyB9CkBAIC0xMjcsNyArMTI2LDYgQEAgcHJpdmF0ZToKIH07CiAKIGJvb2wgZnV6enlD b21wYXJlKGZsb2F0LCBmbG9hdCwgZmxvYXQgZXBzaWxvbik7Ci1XZWJDb3JlOjpGbG9hdFBvaW50 IGJvdW5kUG9zaXRpb24oY29uc3QgV2ViQ29yZTo6RmxvYXRQb2ludCBtaW5Qb3NpdGlvbiwgY29u c3QgV2ViQ29yZTo6RmxvYXRQb2ludCYgcG9zaXRpb24sIGNvbnN0IFdlYkNvcmU6OkZsb2F0UG9p bnQmIG1heFBvc2l0aW9uKTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9QYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50 UXQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1BhZ2VWaWV3cG9ydENvbnRyb2xs ZXJDbGllbnRRdC5jcHAKaW5kZXggNTdlYjA4YzdmNDBhOWM3YTAwYjFkYzc3Mjg5MDk0ZDFmZjVl ZGQyNC4uNmE5MzM0MWJiNzdjYTNiYjllY2JjYTg1NzY1MzJmNTE4OWMxZGY4NiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1BhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGll bnRRdC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1BhZ2VWaWV3cG9ydENv bnRyb2xsZXJDbGllbnRRdC5jcHAKQEAgLTIwNywxMCArMjA3LDcgQEAgdm9pZCBQYWdlVmlld3Bv cnRDb250cm9sbGVyQ2xpZW50UXQ6OmZvY3VzRWRpdGFibGVBcmVhKGNvbnN0IFFSZWN0RiYgY2Fy ZXRBcmVhLAogICAgIGNvbnN0IFFQb2ludEYgdmlld3BvcnRIb3RzcG90ID0gUVBvaW50Rih4LCAv KiBGSVhNRTogdmlzaWJsZUNlbnRlciAqLyB2aWV3cG9ydFJlY3QuY2VudGVyKCkueSgpKTsKIAog ICAgIFFQb2ludEYgZW5kUG9zaXRpb24gPSBob3RzcG90IC0gdmlld3BvcnRIb3RzcG90IC8gdGFy Z2V0U2NhbGU7Ci0gICAgUVJlY3RGIGVuZFBvc1JhbmdlID0gbV9jb250cm9sbGVyLT5wb3NpdGlv blJhbmdlRm9yVmlld3BvcnRBdFNjYWxlKHRhcmdldFNjYWxlKTsKLQotICAgIGVuZFBvc2l0aW9u ID0gYm91bmRQb3NpdGlvbihlbmRQb3NSYW5nZS50b3BMZWZ0KCksIGVuZFBvc2l0aW9uLCBlbmRQ b3NSYW5nZS5ib3R0b21SaWdodCgpKTsKLQorICAgIGVuZFBvc2l0aW9uID0gbV9jb250cm9sbGVy LT5jbGFtcFZpZXdwb3J0VG9Db250ZW50cyhlbmRQb3NpdGlvbiwgdGFyZ2V0U2NhbGUpOwogICAg IFFSZWN0RiBlbmRWaXNpYmxlQ29udGVudFJlY3QoZW5kUG9zaXRpb24sIHZpZXdwb3J0UmVjdC5z aXplKCkgLyB0YXJnZXRTY2FsZSk7CiAKICAgICBhbmltYXRlQ29udGVudFJlY3RWaXNpYmxlKGVu ZFZpc2libGVDb250ZW50UmVjdCk7CkBAIC0yNDQsMTAgKzI0MSw3IEBAIHZvaWQgUGFnZVZpZXdw b3J0Q29udHJvbGxlckNsaWVudFF0Ojp6b29tVG9BcmVhR2VzdHVyZUVuZGVkKGNvbnN0IFFQb2lu dEYmIHRvdWNoCiAgICAgY29uc3QgUVBvaW50RiB2aWV3cG9ydEhvdHNwb3QgPSB2aWV3cG9ydFJl Y3QuY2VudGVyKCk7CiAKICAgICBRUG9pbnRGIGVuZFBvc2l0aW9uID0gaG90c3BvdCAtIHZpZXdw b3J0SG90c3BvdCAvIHRhcmdldFNjYWxlOwotCi0gICAgUVJlY3RGIGVuZFBvc1JhbmdlID0gbV9j b250cm9sbGVyLT5wb3NpdGlvblJhbmdlRm9yVmlld3BvcnRBdFNjYWxlKHRhcmdldFNjYWxlKTsK LSAgICBlbmRQb3NpdGlvbiA9IGJvdW5kUG9zaXRpb24oZW5kUG9zUmFuZ2UudG9wTGVmdCgpLCBl bmRQb3NpdGlvbiwgZW5kUG9zUmFuZ2UuYm90dG9tUmlnaHQoKSk7Ci0KKyAgICBlbmRQb3NpdGlv biA9IG1fY29udHJvbGxlci0+Y2xhbXBWaWV3cG9ydFRvQ29udGVudHMoZW5kUG9zaXRpb24sIHRh cmdldFNjYWxlKTsKICAgICBRUmVjdEYgZW5kVmlzaWJsZUNvbnRlbnRSZWN0KGVuZFBvc2l0aW9u LCB2aWV3cG9ydFJlY3Quc2l6ZSgpIC8gdGFyZ2V0U2NhbGUpOwogCiAgICAgZW51bSB7IFpvb21J biwgWm9vbUJhY2ssIFpvb21PdXQsIE5vWm9vbSB9IHpvb21BY3Rpb24gPSBab29tSW47CkBAIC0y ODAsMTEgKzI3NCwxMCBAQCB2b2lkIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRRdDo6em9v bVRvQXJlYUdlc3R1cmVFbmRlZChjb25zdCBRUG9pbnRGJiB0b3VjaAogICAgIGNhc2UgWm9vbUJh Y2s6IHsKICAgICAgICAgU2NhbGVTdGFja0l0ZW0gbGFzdFNjYWxlID0gbV9zY2FsZVN0YWNrLnRh a2VMYXN0KCk7CiAgICAgICAgIHRhcmdldFNjYWxlID0gbGFzdFNjYWxlLnNjYWxlOwotICAgICAg ICAvLyBSZWNhbGN1bGF0ZSBlbmRQb3NpdGlvbiBhbmQgYm91bmQgaXQgYWNjb3JkaW5nIHRvIG5l dyBzY2FsZS4KKyAgICAgICAgLy8gUmVjYWxjdWxhdGUgZW5kUG9zaXRpb24gYW5kIGNsYW1wIGl0 IGFjY29yZGluZyB0byB0aGUgbmV3IHNjYWxlLgogICAgICAgICBlbmRQb3NpdGlvbi5zZXRZKGhv dHNwb3QueSgpIC0gdmlld3BvcnRIb3RzcG90LnkoKSAvIHRhcmdldFNjYWxlKTsKICAgICAgICAg ZW5kUG9zaXRpb24uc2V0WChsYXN0U2NhbGUueFBvc2l0aW9uKTsKLSAgICAgICAgZW5kUG9zUmFu Z2UgPSBtX2NvbnRyb2xsZXItPnBvc2l0aW9uUmFuZ2VGb3JWaWV3cG9ydEF0U2NhbGUodGFyZ2V0 U2NhbGUpOwotICAgICAgICBlbmRQb3NpdGlvbiA9IGJvdW5kUG9zaXRpb24oZW5kUG9zUmFuZ2Uu dG9wTGVmdCgpLCBlbmRQb3NpdGlvbiwgZW5kUG9zUmFuZ2UuYm90dG9tUmlnaHQoKSk7CisgICAg ICAgIGVuZFBvc2l0aW9uID0gbV9jb250cm9sbGVyLT5jbGFtcFZpZXdwb3J0VG9Db250ZW50cyhl bmRQb3NpdGlvbiwgdGFyZ2V0U2NhbGUpOwogICAgICAgICBlbmRWaXNpYmxlQ29udGVudFJlY3Qg PSBRUmVjdEYoZW5kUG9zaXRpb24sIHZpZXdwb3J0UmVjdC5zaXplKCkgLyB0YXJnZXRTY2FsZSk7 CiAgICAgICAgIGJyZWFrOwogICAgIH0KQEAgLTMxMCw5ICszMDMsNyBAQCBRUmVjdEYgUGFnZVZp ZXdwb3J0Q29udHJvbGxlckNsaWVudFF0OjpuZWFyZXN0VmFsaWRWaXNpYmxlQ29udGVudHNSZWN0 KCkgY29uc3QKICAgICAvLyBLZWVwIHRoZSBjZW50ZXIgYXQgdGhlIHBvc2l0aW9uIG9mIHRoZSBv bGQgY2VudGVyLCBhbmQgc3Vic3RyYWN0IHZpZXdwb3J0SG90c3BvdCAvIHRhcmdldFNjYWxlIHRv IGdldCB0aGUgdG9wIGxlZnQgcG9zaXRpb24uCiAgICAgUVBvaW50RiBlbmRQb3NpdGlvbiA9IG1f dmlld3BvcnRJdGVtLT5tYXBUb1dlYkNvbnRlbnQodmlld3BvcnRIb3RzcG90KSAtIHZpZXdwb3J0 SG90c3BvdCAvIHRhcmdldFNjYWxlOwogCi0gICAgRmxvYXRSZWN0IGVuZFBvc1JhbmdlID0gbV9j b250cm9sbGVyLT5wb3NpdGlvblJhbmdlRm9yVmlld3BvcnRBdFNjYWxlKHRhcmdldFNjYWxlKTsK LSAgICBlbmRQb3NpdGlvbiA9IGJvdW5kUG9zaXRpb24oZW5kUG9zUmFuZ2UubWluWE1pbllDb3Ju ZXIoKSwgZW5kUG9zaXRpb24sIGVuZFBvc1JhbmdlLm1heFhNYXhZQ29ybmVyKCkpOwotCisgICAg ZW5kUG9zaXRpb24gPSBtX2NvbnRyb2xsZXItPmNsYW1wVmlld3BvcnRUb0NvbnRlbnRzKGVuZFBv c2l0aW9uLCB0YXJnZXRTY2FsZSk7CiAgICAgcmV0dXJuIFFSZWN0RihlbmRQb3NpdGlvbiwgdmll d3BvcnRSZWN0LnNpemUoKSAvIHRhcmdldFNjYWxlKTsKIH0KIAo= 165626 2012-09-25 09:21:42 -0700 2012-09-25 10:28:06 -0700 Patch bug-97222-20120925182102.patch text/plain 10778 jturcotte U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5NTEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZjQ0ZjE4YmJhODg1N2Zl YmEzMGZlOTFmNWVhNWFkM2U4ZDk2YzRiYi4uYTUwYTdhNGNjZjI4MDdmYTY3ODA5OGUyMjFiNDUx MDIxMzBkOGUxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMwIEBACiAyMDEyLTA5LTIwICBKb2Nl bHluIFR1cmNvdHRlICA8am9jZWx5bi50dXJjb3R0ZUBkaWdpYS5jb20+CiAKKyAgICAgICAgW1F0 XSBQYWdlVmlld3BvcnRDb250cm9sbGVyOiBDb25zb2xpZGF0ZSBwb3NpdGlvblJhbmdlRm9yVmll d3BvcnRBdFNjYWxlIGFuZCBib3VuZFBvc2l0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NzIyMgorCisgICAgICAgIFJldmlld2VkIGJ5IEtlbm5l dGggUm9oZGUgQ2hyaXN0aWFuc2VuLgorCisgICAgICAgIFRob3NlIG1ldGhvZHMgYXJlIHVzZWQg dG9nZXRoZXIgZXZlcnl3aGVyZSwgbWVyZ2UgdGhlbSBpbnRvIGEgc2luZ2xlCisgICAgICAgIGNs YW1wVmlld3BvcnRUb0NvbnRlbnRzIG1ldGhvZC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9QYWdl Vmlld3BvcnRDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UGFnZVZpZXdwb3J0Q29u dHJvbGxlcjo6aW5uZXJCb3VuZGVkVmlld3BvcnRTY2FsZSk6CisgICAgICAgIChXZWJLaXQ6OlBh Z2VWaWV3cG9ydENvbnRyb2xsZXI6Om91dGVyQm91bmRlZFZpZXdwb3J0U2NhbGUpOgorICAgICAg ICAoV2ViS2l0OjpQYWdlVmlld3BvcnRDb250cm9sbGVyOjpjbGFtcFZpZXdwb3J0VG9Db250ZW50 cyk6CisgICAgICAgIChXZWJLaXQpOgorICAgICAgICAoV2ViS2l0OjpQYWdlVmlld3BvcnRDb250 cm9sbGVyOjpwYWdlRGlkUmVxdWVzdFNjcm9sbCk6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VWaWV3 cG9ydENvbnRyb2xsZXI6OnN5bmNWaXNpYmxlQ29udGVudHMpOgorICAgICAgICAqIFVJUHJvY2Vz cy9QYWdlVmlld3BvcnRDb250cm9sbGVyLmg6CisgICAgICAgIChQYWdlVmlld3BvcnRDb250cm9s bGVyKToKKyAgICAgICAgKFdlYktpdCk6CisgICAgICAgICogVUlQcm9jZXNzL3F0L1BhZ2VWaWV3 cG9ydENvbnRyb2xsZXJDbGllbnRRdC5jcHA6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VWaWV3cG9y dENvbnRyb2xsZXJDbGllbnRRdDo6Zm9jdXNFZGl0YWJsZUFyZWEpOgorICAgICAgICAoV2ViS2l0 OjpQYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50UXQ6Onpvb21Ub0FyZWFHZXN0dXJlRW5kZWQp OgorICAgICAgICAoV2ViS2l0OjpQYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50UXQ6Om5lYXJl c3RWYWxpZFZpc2libGVDb250ZW50c1JlY3QpOgorCisyMDEyLTA5LTIwICBKb2NlbHluIFR1cmNv dHRlICA8am9jZWx5bi50dXJjb3R0ZUBkaWdpYS5jb20+CisKICAgICAgICAgW1F0XSBVbmlmeSB0 aGUgUGFnZVZpZXdwb3J0Q29udHJvbGxlcjwtPkNsaWVudCBpbnRlcmZhY2UgcmVnYXJkaW5nIHBv c2l0aW9ucwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 OTcyMjAKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BhZ2VWaWV3cG9y dENvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BhZ2VWaWV3cG9ydENv bnRyb2xsZXIuY3BwCmluZGV4IDBhZTVkMmZjNjc3MzRkZWQyOWU3ZjA3OWRmYTRiYTU1NzU1NTFm YmQuLmU0MjAwNmExNGMwZjE3MDYzNDE0NTgxZDhmMThkYzYyMjg4ZGI2YWYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlVmlld3BvcnRDb250cm9sbGVyLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZVZpZXdwb3J0Q29udHJvbGxlci5jcHAKQEAg LTMyLDIxICszMiwxMSBAQCB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogbmFtZXNwYWNlIFdl YktpdCB7CiAKLXN0YXRpYyBpbmxpbmUgZmxvYXQgYm91bmQoZmxvYXQgbWluLCBmbG9hdCB2YWx1 ZSwgZmxvYXQgbWF4KQotewotICAgIHJldHVybiBjbGFtcFRvPGZsb2F0Pih2YWx1ZSwgbWluLCBt YXgpOwotfQotCiBib29sIGZ1enp5Q29tcGFyZShmbG9hdCBhLCBmbG9hdCBiLCBmbG9hdCBlcHNp bG9uKQogewogICAgIHJldHVybiBzdGQ6OmFicyhhIC0gYikgPCBlcHNpbG9uOwogfQogCi1GbG9h dFBvaW50IGJvdW5kUG9zaXRpb24oY29uc3QgRmxvYXRQb2ludCBtaW5Qb3NpdGlvbiwgY29uc3Qg RmxvYXRQb2ludCYgcG9zaXRpb24sIGNvbnN0IEZsb2F0UG9pbnQmIG1heFBvc2l0aW9uKQotewot ICAgIHJldHVybiBGbG9hdFBvaW50KGJvdW5kKG1pblBvc2l0aW9uLngoKSwgcG9zaXRpb24ueCgp LCBtYXhQb3NpdGlvbi54KCkpLCBib3VuZChtaW5Qb3NpdGlvbi55KCksIHBvc2l0aW9uLnkoKSwg bWF4UG9zaXRpb24ueSgpKSk7Ci19Ci0KIFZpZXdwb3J0VXBkYXRlRGVmZXJyZXI6OlZpZXdwb3J0 VXBkYXRlRGVmZXJyZXIoUGFnZVZpZXdwb3J0Q29udHJvbGxlciogUGFnZVZpZXdwb3J0Q29udHJv bGxlciwgU3VzcGVuZENvbnRlbnRGbGFnIHN1c3BlbmRDb250ZW50RmxhZykKICAgICA6IG1fY29u dHJvbGxlcihQYWdlVmlld3BvcnRDb250cm9sbGVyKQogewpAQCAtOTIsNyArODIsNyBAQCBQYWdl Vmlld3BvcnRDb250cm9sbGVyOjpQYWdlVmlld3BvcnRDb250cm9sbGVyKFdlYktpdDo6V2ViUGFn ZVByb3h5KiBwcm94eSwgUGFnZQogCiBmbG9hdCBQYWdlVmlld3BvcnRDb250cm9sbGVyOjppbm5l ckJvdW5kZWRWaWV3cG9ydFNjYWxlKGZsb2F0IHZpZXdwb3J0U2NhbGUpIGNvbnN0CiB7Ci0gICAg cmV0dXJuIGJvdW5kKHRvVmlld3BvcnRTY2FsZShtX21pbmltdW1TY2FsZVRvRml0KSwgdmlld3Bv cnRTY2FsZSwgdG9WaWV3cG9ydFNjYWxlKG1fcmF3QXR0cmlidXRlcy5tYXhpbXVtU2NhbGUpKTsK KyAgICByZXR1cm4gY2xhbXBUbyh2aWV3cG9ydFNjYWxlLCB0b1ZpZXdwb3J0U2NhbGUobV9taW5p bXVtU2NhbGVUb0ZpdCksIHRvVmlld3BvcnRTY2FsZShtX3Jhd0F0dHJpYnV0ZXMubWF4aW11bVNj YWxlKSk7CiB9CiAKIGZsb2F0IFBhZ2VWaWV3cG9ydENvbnRyb2xsZXI6Om91dGVyQm91bmRlZFZp ZXdwb3J0U2NhbGUoZmxvYXQgdmlld3BvcnRTY2FsZSkgY29uc3QKQEAgLTEwMSw3ICs5MSw3IEBA IGZsb2F0IFBhZ2VWaWV3cG9ydENvbnRyb2xsZXI6Om91dGVyQm91bmRlZFZpZXdwb3J0U2NhbGUo ZmxvYXQgdmlld3BvcnRTY2FsZSkgY29uCiAgICAgICAgIC8vIEJvdW5kZWQgYnkgWzAuMSwgMTAu MF0gbGlrZSB0aGUgdmlld3BvcnQgbWV0YSBjb2RlIGluIFdlYkNvcmUuCiAgICAgICAgIGZsb2F0 IGhhcmRNaW4gPSB0b1ZpZXdwb3J0U2NhbGUoc3RkOjptYXg8ZmxvYXQ+KDAuMSwgMC41ICogbV9t aW5pbXVtU2NhbGVUb0ZpdCkpOwogICAgICAgICBmbG9hdCBoYXJkTWF4ID0gdG9WaWV3cG9ydFNj YWxlKHN0ZDo6bWluPGZsb2F0PigxMCwgMiAqIG1fcmF3QXR0cmlidXRlcy5tYXhpbXVtU2NhbGUp KTsKLSAgICAgICAgcmV0dXJuIGJvdW5kKGhhcmRNaW4sIHZpZXdwb3J0U2NhbGUsIGhhcmRNYXgp OworICAgICAgICByZXR1cm4gY2xhbXBUbyh2aWV3cG9ydFNjYWxlLCBoYXJkTWluLCBoYXJkTWF4 KTsKICAgICB9CiAgICAgcmV0dXJuIGlubmVyQm91bmRlZFZpZXdwb3J0U2NhbGUodmlld3BvcnRT Y2FsZSk7CiB9CkBAIC0xMTEsNiArMTAxLDE0IEBAIGZsb2F0IFBhZ2VWaWV3cG9ydENvbnRyb2xs ZXI6OmRldmljZVBpeGVsUmF0aW8oKSBjb25zdAogICAgIHJldHVybiBtX3dlYlBhZ2VQcm94eS0+ ZGV2aWNlU2NhbGVGYWN0b3IoKTsKIH0KIAorRmxvYXRQb2ludCBQYWdlVmlld3BvcnRDb250cm9s bGVyOjpjbGFtcFZpZXdwb3J0VG9Db250ZW50cyhjb25zdCBXZWJDb3JlOjpGbG9hdFBvaW50JiB2 aWV3cG9ydFBvcywgZmxvYXQgdmlld3BvcnRTY2FsZSkKK3sKKyAgICBjb25zdCBmbG9hdCBob3Jp em9udGFsUmFuZ2UgPSBzdGQ6Om1heCgwLmYsIG1fY29udGVudHNTaXplLndpZHRoKCkgLSBtX3Zp ZXdwb3J0U2l6ZS53aWR0aCgpIC8gdmlld3BvcnRTY2FsZSk7CisgICAgY29uc3QgZmxvYXQgdmVy dGljYWxSYW5nZSA9IHN0ZDo6bWF4KDAuZiwgbV9jb250ZW50c1NpemUuaGVpZ2h0KCkgLSBtX3Zp ZXdwb3J0U2l6ZS5oZWlnaHQoKSAvIHZpZXdwb3J0U2NhbGUpOworCisgICAgcmV0dXJuIEZsb2F0 UG9pbnQoY2xhbXBUbyh2aWV3cG9ydFBvcy54KCksIDAuZiwgaG9yaXpvbnRhbFJhbmdlKSwgY2xh bXBUbyh2aWV3cG9ydFBvcy55KCksIDAuZiwgdmVydGljYWxSYW5nZSkpOworfQorCiB2b2lkIFBh Z2VWaWV3cG9ydENvbnRyb2xsZXI6OmRpZENoYW5nZUNvbnRlbnRzU2l6ZShjb25zdCBJbnRTaXpl JiBuZXdTaXplKQogewogICAgIGlmIChtX3ZpZXdwb3J0U2l6ZS5pc0VtcHR5KCkgfHwgbmV3U2l6 ZS5pc0VtcHR5KCkpCkBAIC0xMjgsMTAgKzEyNiw3IEBAIHZvaWQgUGFnZVZpZXdwb3J0Q29udHJv bGxlcjo6cGFnZURpZFJlcXVlc3RTY3JvbGwoY29uc3QgSW50UG9pbnQmIGNzc1Bvc2l0aW9uKQog ICAgIGlmIChtX2FjdGl2ZURlZmVycmVyQ291bnQpCiAgICAgICAgIHJldHVybjsKIAotICAgIEZs b2F0UmVjdCBlbmRQb3NSYW5nZSA9IHBvc2l0aW9uUmFuZ2VGb3JWaWV3cG9ydEF0U2NhbGUobV9l ZmZlY3RpdmVTY2FsZSk7Ci0gICAgRmxvYXRQb2ludCBlbmRQb3NpdGlvbiA9IGJvdW5kUG9zaXRp b24oZW5kUG9zUmFuZ2UubWluWE1pbllDb3JuZXIoKSwgY3NzUG9zaXRpb24sIGVuZFBvc1Jhbmdl Lm1heFhNYXhZQ29ybmVyKCkpOwotCi0gICAgbV9jbGllbnQtPnNldFZpZXdwb3J0UG9zaXRpb24o ZW5kUG9zaXRpb24pOworICAgIG1fY2xpZW50LT5zZXRWaWV3cG9ydFBvc2l0aW9uKGNsYW1wVmll d3BvcnRUb0NvbnRlbnRzKGNzc1Bvc2l0aW9uLCBtX2VmZmVjdGl2ZVNjYWxlKSk7CiB9CiAKIHZv aWQgUGFnZVZpZXdwb3J0Q29udHJvbGxlcjo6ZGlkQ2hhbmdlVmlld3BvcnRTaXplKGNvbnN0IEZs b2F0U2l6ZSYgbmV3U2l6ZSkKQEAgLTE2MSwxMCArMTU2LDcgQEAgdm9pZCBQYWdlVmlld3BvcnRD b250cm9sbGVyOjpzeW5jVmlzaWJsZUNvbnRlbnRzKGNvbnN0IEZsb2F0UG9pbnQmIHRyYWplY3Rv cnlWZWMKICAgICBpZiAoIWRyYXdpbmdBcmVhIHx8IG1fdmlld3BvcnRTaXplLmlzRW1wdHkoKSB8 fCBtX2NvbnRlbnRzU2l6ZS5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIEZsb2F0 UmVjdCBlbmRQb3NSYW5nZSA9IHBvc2l0aW9uUmFuZ2VGb3JWaWV3cG9ydEF0U2NhbGUobV9lZmZl Y3RpdmVTY2FsZSk7Ci0gICAgRmxvYXRQb2ludCBlbmRQb3NpdGlvbiA9IGJvdW5kUG9zaXRpb24o ZW5kUG9zUmFuZ2UubWluWE1pbllDb3JuZXIoKSwgbV92aWV3cG9ydFBvcywgZW5kUG9zUmFuZ2Uu bWF4WE1heFlDb3JuZXIoKSk7Ci0KLSAgICBGbG9hdFJlY3QgdmlzaWJsZUNvbnRlbnRzUmVjdChl bmRQb3NpdGlvbiwgbV92aWV3cG9ydFNpemUgLyBtX2VmZmVjdGl2ZVNjYWxlKTsKKyAgICBGbG9h dFJlY3QgdmlzaWJsZUNvbnRlbnRzUmVjdChjbGFtcFZpZXdwb3J0VG9Db250ZW50cyhtX3ZpZXdw b3J0UG9zLCBtX2VmZmVjdGl2ZVNjYWxlKSwgbV92aWV3cG9ydFNpemUgLyBtX2VmZmVjdGl2ZVNj YWxlKTsKICAgICB2aXNpYmxlQ29udGVudHNSZWN0LmludGVyc2VjdChGbG9hdFJlY3QoRmxvYXRQ b2ludDo6emVybygpLCBtX2NvbnRlbnRzU2l6ZSkpOwogICAgIGRyYXdpbmdBcmVhLT5zZXRWaXNp YmxlQ29udGVudHNSZWN0KHZpc2libGVDb250ZW50c1JlY3QsIG1fZWZmZWN0aXZlU2NhbGUsIHRy YWplY3RvcnlWZWN0b3IpOwogCkBAIC0yMjUsMTIgKzIxNyw0IEBAIHZvaWQgUGFnZVZpZXdwb3J0 Q29udHJvbGxlcjo6dXBkYXRlTWluaW11bVNjYWxlVG9GaXQoKQogICAgIH0KIH0KIAotRmxvYXRS ZWN0IFBhZ2VWaWV3cG9ydENvbnRyb2xsZXI6OnBvc2l0aW9uUmFuZ2VGb3JWaWV3cG9ydEF0U2Nh bGUoZmxvYXQgdmlld3BvcnRTY2FsZSkgY29uc3QKLXsKLSAgICBjb25zdCBmbG9hdCBob3Jpem9u dGFsUmFuZ2UgPSBtX2NvbnRlbnRzU2l6ZS53aWR0aCgpIC0gbV92aWV3cG9ydFNpemUud2lkdGgo KSAvIHZpZXdwb3J0U2NhbGU7Ci0gICAgY29uc3QgZmxvYXQgdmVydGljYWxSYW5nZSA9IG1fY29u dGVudHNTaXplLmhlaWdodCgpIC0gbV92aWV3cG9ydFNpemUuaGVpZ2h0KCkgLyB2aWV3cG9ydFNj YWxlOwotCi0gICAgcmV0dXJuIEZsb2F0UmVjdCgwLCAwLCBob3Jpem9udGFsUmFuZ2UsIHZlcnRp Y2FsUmFuZ2UpOwotfQotCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlVmlld3BvcnRDb250cm9sbGVyLmggYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvUGFnZVZpZXdwb3J0Q29udHJvbGxlci5oCmluZGV4IGQ3ZmIzYTA4MDk5 YTVjNjU3MjZmYjU3NDY1NTlhZGM4YjAxMjNhZWEuLmFjYmIyMmE1OGRkYjI1MDUzMjdmY2E0Yjll NTU4Njg2Yjg1MjYwNTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdl Vmlld3BvcnRDb250cm9sbGVyLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BhZ2VW aWV3cG9ydENvbnRyb2xsZXIuaApAQCAtNzQsMTAgKzc0LDkgQEAgcHVibGljOgogICAgIHZvaWQg c3VzcGVuZENvbnRlbnQoKTsKICAgICB2b2lkIHJlc3VtZUNvbnRlbnQoKTsKIAotICAgIFdlYkNv cmU6OkZsb2F0UmVjdCBwb3NpdGlvblJhbmdlRm9yVmlld3BvcnRBdFNjYWxlKGZsb2F0IHZpZXdw b3J0U2NhbGUpIGNvbnN0OwotCiAgICAgZmxvYXQgaW5uZXJCb3VuZGVkVmlld3BvcnRTY2FsZShm bG9hdCkgY29uc3Q7CiAgICAgZmxvYXQgb3V0ZXJCb3VuZGVkVmlld3BvcnRTY2FsZShmbG9hdCkg Y29uc3Q7CisgICAgV2ViQ29yZTo6RmxvYXRQb2ludCBjbGFtcFZpZXdwb3J0VG9Db250ZW50cyhj b25zdCBXZWJDb3JlOjpGbG9hdFBvaW50JiB2aWV3cG9ydFBvcywgZmxvYXQgdmlld3BvcnRTY2Fs ZSk7CiAKICAgICBib29sIGhhc1N1c3BlbmRlZENvbnRlbnQoKSBjb25zdCB7IHJldHVybiBtX2hh c1N1c3BlbmRlZENvbnRlbnQ7IH0KICAgICBib29sIGhhZFVzZXJJbnRlcmFjdGlvbigpIGNvbnN0 IHsgcmV0dXJuIG1faGFkVXNlckludGVyYWN0aW9uOyB9CkBAIC0xMjcsNyArMTI2LDYgQEAgcHJp dmF0ZToKIH07CiAKIGJvb2wgZnV6enlDb21wYXJlKGZsb2F0LCBmbG9hdCwgZmxvYXQgZXBzaWxv bik7Ci1XZWJDb3JlOjpGbG9hdFBvaW50IGJvdW5kUG9zaXRpb24oY29uc3QgV2ViQ29yZTo6Rmxv YXRQb2ludCBtaW5Qb3NpdGlvbiwgY29uc3QgV2ViQ29yZTo6RmxvYXRQb2ludCYgcG9zaXRpb24s IGNvbnN0IFdlYkNvcmU6OkZsb2F0UG9pbnQmIG1heFBvc2l0aW9uKTsKIAogfSAvLyBuYW1lc3Bh Y2UgV2ViS2l0CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9QYWdl Vmlld3BvcnRDb250cm9sbGVyQ2xpZW50UXQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L3F0L1BhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRRdC5jcHAKaW5kZXggM2I5ZjY2NmUwMmMw NDJhMTEwNTE2ODc3MjUzMjNlZjhkMGYwYjcyMi4uOWUyNTMxZjU3MTU5OGVhZTQyZDc5YzE3Y2Q0 ZjFmYjFiMmEzYTNjYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1Bh Z2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRRdC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL3F0L1BhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRRdC5jcHAKQEAgLTIwNywxMCAr MjA3LDcgQEAgdm9pZCBQYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50UXQ6OmZvY3VzRWRpdGFi bGVBcmVhKGNvbnN0IFFSZWN0RiYgY2FyZXRBcmVhLAogICAgIGNvbnN0IFFQb2ludEYgdmlld3Bv cnRIb3RzcG90ID0gUVBvaW50Rih4LCAvKiBGSVhNRTogdmlzaWJsZUNlbnRlciAqLyB2aWV3cG9y dFJlY3QuY2VudGVyKCkueSgpKTsKIAogICAgIFFQb2ludEYgZW5kUG9zaXRpb24gPSBob3RzcG90 IC0gdmlld3BvcnRIb3RzcG90IC8gdGFyZ2V0U2NhbGU7Ci0gICAgUVJlY3RGIGVuZFBvc1Jhbmdl ID0gbV9jb250cm9sbGVyLT5wb3NpdGlvblJhbmdlRm9yVmlld3BvcnRBdFNjYWxlKHRhcmdldFNj YWxlKTsKLQotICAgIGVuZFBvc2l0aW9uID0gYm91bmRQb3NpdGlvbihlbmRQb3NSYW5nZS50b3BM ZWZ0KCksIGVuZFBvc2l0aW9uLCBlbmRQb3NSYW5nZS5ib3R0b21SaWdodCgpKTsKLQorICAgIGVu ZFBvc2l0aW9uID0gbV9jb250cm9sbGVyLT5jbGFtcFZpZXdwb3J0VG9Db250ZW50cyhlbmRQb3Np dGlvbiwgdGFyZ2V0U2NhbGUpOwogICAgIFFSZWN0RiBlbmRWaXNpYmxlQ29udGVudFJlY3QoZW5k UG9zaXRpb24sIHZpZXdwb3J0UmVjdC5zaXplKCkgLyB0YXJnZXRTY2FsZSk7CiAKICAgICBhbmlt YXRlQ29udGVudFJlY3RWaXNpYmxlKGVuZFZpc2libGVDb250ZW50UmVjdCk7CkBAIC0yNDQsMTAg KzI0MSw3IEBAIHZvaWQgUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudFF0Ojp6b29tVG9BcmVh R2VzdHVyZUVuZGVkKGNvbnN0IFFQb2ludEYmIHRvdWNoCiAgICAgY29uc3QgUVBvaW50RiB2aWV3 cG9ydEhvdHNwb3QgPSB2aWV3cG9ydFJlY3QuY2VudGVyKCk7CiAKICAgICBRUG9pbnRGIGVuZFBv c2l0aW9uID0gaG90c3BvdCAtIHZpZXdwb3J0SG90c3BvdCAvIHRhcmdldFNjYWxlOwotCi0gICAg UVJlY3RGIGVuZFBvc1JhbmdlID0gbV9jb250cm9sbGVyLT5wb3NpdGlvblJhbmdlRm9yVmlld3Bv cnRBdFNjYWxlKHRhcmdldFNjYWxlKTsKLSAgICBlbmRQb3NpdGlvbiA9IGJvdW5kUG9zaXRpb24o ZW5kUG9zUmFuZ2UudG9wTGVmdCgpLCBlbmRQb3NpdGlvbiwgZW5kUG9zUmFuZ2UuYm90dG9tUmln aHQoKSk7Ci0KKyAgICBlbmRQb3NpdGlvbiA9IG1fY29udHJvbGxlci0+Y2xhbXBWaWV3cG9ydFRv Q29udGVudHMoZW5kUG9zaXRpb24sIHRhcmdldFNjYWxlKTsKICAgICBRUmVjdEYgZW5kVmlzaWJs ZUNvbnRlbnRSZWN0KGVuZFBvc2l0aW9uLCB2aWV3cG9ydFJlY3Quc2l6ZSgpIC8gdGFyZ2V0U2Nh bGUpOwogCiAgICAgZW51bSB7IFpvb21JbiwgWm9vbUJhY2ssIFpvb21PdXQsIE5vWm9vbSB9IHpv b21BY3Rpb24gPSBab29tSW47CkBAIC0yODAsMTEgKzI3NCwxMCBAQCB2b2lkIFBhZ2VWaWV3cG9y dENvbnRyb2xsZXJDbGllbnRRdDo6em9vbVRvQXJlYUdlc3R1cmVFbmRlZChjb25zdCBRUG9pbnRG JiB0b3VjaAogICAgIGNhc2UgWm9vbUJhY2s6IHsKICAgICAgICAgU2NhbGVTdGFja0l0ZW0gbGFz dFNjYWxlID0gbV9zY2FsZVN0YWNrLnRha2VMYXN0KCk7CiAgICAgICAgIHRhcmdldFNjYWxlID0g bGFzdFNjYWxlLnNjYWxlOwotICAgICAgICAvLyBSZWNhbGN1bGF0ZSBlbmRQb3NpdGlvbiBhbmQg Ym91bmQgaXQgYWNjb3JkaW5nIHRvIG5ldyBzY2FsZS4KKyAgICAgICAgLy8gUmVjYWxjdWxhdGUg ZW5kUG9zaXRpb24gYW5kIGNsYW1wIGl0IGFjY29yZGluZyB0byB0aGUgbmV3IHNjYWxlLgogICAg ICAgICBlbmRQb3NpdGlvbi5zZXRZKGhvdHNwb3QueSgpIC0gdmlld3BvcnRIb3RzcG90LnkoKSAv IHRhcmdldFNjYWxlKTsKICAgICAgICAgZW5kUG9zaXRpb24uc2V0WChsYXN0U2NhbGUueFBvc2l0 aW9uKTsKLSAgICAgICAgZW5kUG9zUmFuZ2UgPSBtX2NvbnRyb2xsZXItPnBvc2l0aW9uUmFuZ2VG b3JWaWV3cG9ydEF0U2NhbGUodGFyZ2V0U2NhbGUpOwotICAgICAgICBlbmRQb3NpdGlvbiA9IGJv dW5kUG9zaXRpb24oZW5kUG9zUmFuZ2UudG9wTGVmdCgpLCBlbmRQb3NpdGlvbiwgZW5kUG9zUmFu Z2UuYm90dG9tUmlnaHQoKSk7CisgICAgICAgIGVuZFBvc2l0aW9uID0gbV9jb250cm9sbGVyLT5j bGFtcFZpZXdwb3J0VG9Db250ZW50cyhlbmRQb3NpdGlvbiwgdGFyZ2V0U2NhbGUpOwogICAgICAg ICBlbmRWaXNpYmxlQ29udGVudFJlY3QgPSBRUmVjdEYoZW5kUG9zaXRpb24sIHZpZXdwb3J0UmVj dC5zaXplKCkgLyB0YXJnZXRTY2FsZSk7CiAgICAgICAgIGJyZWFrOwogICAgIH0KQEAgLTMxMCw5 ICszMDMsNyBAQCBRUmVjdEYgUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudFF0OjpuZWFyZXN0 VmFsaWRWaXNpYmxlQ29udGVudHNSZWN0KCkgY29uc3QKICAgICAvLyBLZWVwIHRoZSBjZW50ZXIg YXQgdGhlIHBvc2l0aW9uIG9mIHRoZSBvbGQgY2VudGVyLCBhbmQgc3Vic3RyYWN0IHZpZXdwb3J0 SG90c3BvdCAvIHRhcmdldFNjYWxlIHRvIGdldCB0aGUgdG9wIGxlZnQgcG9zaXRpb24uCiAgICAg UVBvaW50RiBlbmRQb3NpdGlvbiA9IG1fdmlld3BvcnRJdGVtLT5tYXBUb1dlYkNvbnRlbnQodmll d3BvcnRIb3RzcG90KSAtIHZpZXdwb3J0SG90c3BvdCAvIHRhcmdldFNjYWxlOwogCi0gICAgRmxv YXRSZWN0IGVuZFBvc1JhbmdlID0gbV9jb250cm9sbGVyLT5wb3NpdGlvblJhbmdlRm9yVmlld3Bv cnRBdFNjYWxlKHRhcmdldFNjYWxlKTsKLSAgICBlbmRQb3NpdGlvbiA9IGJvdW5kUG9zaXRpb24o ZW5kUG9zUmFuZ2UubWluWE1pbllDb3JuZXIoKSwgZW5kUG9zaXRpb24sIGVuZFBvc1JhbmdlLm1h eFhNYXhZQ29ybmVyKCkpOwotCisgICAgZW5kUG9zaXRpb24gPSBtX2NvbnRyb2xsZXItPmNsYW1w Vmlld3BvcnRUb0NvbnRlbnRzKGVuZFBvc2l0aW9uLCB0YXJnZXRTY2FsZSk7CiAgICAgcmV0dXJu IFFSZWN0RihlbmRQb3NpdGlvbiwgdmlld3BvcnRSZWN0LnNpemUoKSAvIHRhcmdldFNjYWxlKTsK IH0KIAo=