64538 2011-07-14 10:31:29 -0700 TiledDrawingArea: map the visibleArea rect from page to scaled coordinates. 2011-07-18 06:47:10 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jturcotte jturcotte benjamin jturcotte kenneth oldest_to_newest 437171 0 jturcotte 2011-07-14 10:31:29 -0700 TiledDrawingArea: map the visibleArea rect from page to scaled coordinates. 437178 1 100827 jturcotte 2011-07-14 10:34:39 -0700 Created attachment 100827 Patch 437321 2 100827 kenneth 2011-07-14 14:14:31 -0700 Comment on attachment 100827 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=100827&action=review > Source/WebKit2/UIProcess/TiledDrawingAreaProxy.h:170 > + WebCore::IntRect m_contentsVisibleArea; visibleContentRect is used for this elsewhere, like in FrameView.. maybe we should use the same terminology? 437650 3 100827 benjamin 2011-07-15 03:53:28 -0700 Comment on attachment 100827 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=100827&action=review > Source/WebKit2/ChangeLog:8 > + TiledDrawingAreaProxy expects it's coordinates to be scaled according to it's -> its 437653 4 benjamin 2011-07-15 03:59:25 -0700 (In reply to comment #2) > visibleContentRect is used for this elsewhere, like in FrameView.. maybe we should use the same terminology? +1 :) 437656 5 benjamin 2011-07-15 04:06:01 -0700 I see I introduced the regression here: http://trac.webkit.org/changeset/90750 Maybe mention you fix a regression introduced by r90750 in the Changelog? 437830 6 101003 jturcotte 2011-07-15 11:03:13 -0700 Created attachment 101003 Patch Resubmitting for review after renaming all visibleAreas. Please tell also what you think: visibleContentsRect or visibleContentRect? From what I saw contents is right, but that's not how it's written elsewhere. 437832 7 kenneth 2011-07-15 11:03:41 -0700 WebCore uses visibleContentRect 437833 8 kenneth 2011-07-15 11:04:35 -0700 http://www.english-test.net/forum/ftopic12826.html#36416 <- content vs contents :-) 437834 9 jturcotte 2011-07-15 11:05:25 -0700 (In reply to comment #6) > Created an attachment (id=101003) [details] > Patch > > Resubmitting for review after renaming all visibleAreas. > Please tell also what you think: visibleContentsRect or visibleContentRect? From what I saw contents is right, but that's not how it's written elsewhere. Humm forgot the changelog note for the regression, will update before pushing in any case. 437848 10 101003 benjamin 2011-07-15 11:24:39 -0700 Comment on attachment 101003 Patch Looks good. Sorry about the regression, I totally missed in which coordinate the view is, for some reason I assumed those coordinates were scaled. 438438 11 jturcotte 2011-07-18 06:47:10 -0700 Committed r91180: <http://trac.webkit.org/changeset/91180> 100827 2011-07-14 10:34:39 -0700 2011-07-15 11:03:06 -0700 Patch bug-64538-20110714193437.patch text/plain 5844 jturcotte U3VidmVyc2lvbiBSZXZpc2lvbjogOTA4OTkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBjYzI1YWFjMTNlMzNhYzE3 ZDUwMzhkZjhmNzk2ZDNjYjYwNzMzZGI2Li4wOWNiMjUzM2UxMDg3YmM4ODQzZWFmMTIzMDE5OTU2 ZTc0ODliMjZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDctMTQgIEpvY2Vs eW4gVHVyY290dGUgIDxqb2NlbHluLnR1cmNvdHRlQG5va2lhLmNvbT4KKworICAgICAgICBUaWxl ZERyYXdpbmdBcmVhOiBtYXAgdGhlIHZpc2libGVBcmVhIHJlY3QgZnJvbSBwYWdlIHRvIHNjYWxl ZCBjb29yZGluYXRlcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTY0NTM4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgVGlsZWREcmF3aW5nQXJlYVByb3h5IGV4cGVjdHMgaXQncyBjb29yZGluYXRlcyB0byBi ZSBzY2FsZWQgYWNjb3JkaW5nIHRvCisgICAgICAgIGNvbnRlbnRzU2NhbGUuIFRoaXMgcGF0Y2gg a2VlcCB0aGUgcHVzaGVkIHZpc2libGVBcmVhIGFzIHBhZ2UgY29vcmRpbmF0ZXMKKyAgICAgICAg YW5kIGNvbnZlcnQgaXQgZWFjaCB0aW1lIHRvIHNjYWxlZCBjb29yZGluYXRlcyBpbiBjYXNlIHRo ZSBjb250ZW50cyBzY2FsZSB3YXMKKyAgICAgICAgY2hhbmdlZCBhZnRlcndhcmQuCisKKyAgICAg ICAgKiBVSVByb2Nlc3MvVGlsZWREcmF3aW5nQXJlYVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktp dDo6VGlsZWREcmF3aW5nQXJlYVByb3h5OjppbnZhbGlkYXRlKToKKyAgICAgICAgKFdlYktpdDo6 VGlsZWREcmF3aW5nQXJlYVByb3h5OjpzZXRWaXNpYmxlQXJlYSk6CisgICAgICAgIChXZWJLaXQ6 OlRpbGVkRHJhd2luZ0FyZWFQcm94eTo6Y3JlYXRlVGlsZXMpOgorICAgICAgICAoV2ViS2l0OjpU aWxlZERyYXdpbmdBcmVhUHJveHk6OnZpc2libGVBcmVhKToKKyAgICAgICAgKiBVSVByb2Nlc3Mv VGlsZWREcmF3aW5nQXJlYVByb3h5Lmg6CisKIDIwMTEtMDctMTIgIEpvY2VseW4gVHVyY290dGUg IDxqb2NlbHluLnR1cmNvdHRlQG5va2lhLmNvbT4KIAogICAgICAgICBbUXRdIEFsc28gc3RvcCB0 aGUgc2NhbGUgY29tbWl0IHRpbWVyIHdoZW4gY29tbWl0U2NhbGVDaGFuZ2UgaXMgY2FsbGVkIGV4 cGxpY2l0bHkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvVGlsZWREcmF3 aW5nQXJlYVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9UaWxlZERyYXdpbmdB cmVhUHJveHkuY3BwCmluZGV4IDk4ZmYyNzNiYThhZmIzNTJmMzBjYWQ5YWM5NTc2ZGQyNDc4ODg1 NDguLjU0NmMwZjYwMzNjZmFhOGUxYWExYjE4Zjc3ZTY2YTc5NzE4ZDMzYTAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9UaWxlZERyYXdpbmdBcmVhUHJveHkuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9UaWxlZERyYXdpbmdBcmVhUHJveHkuY3BwCkBAIC0x ODEsNyArMTgxLDcgQEAgdm9pZCBUaWxlZERyYXdpbmdBcmVhUHJveHk6OmludmFsaWRhdGUoY29u c3QgSW50UmVjdCYgY29udGVudHNEaXJ0eVJlY3QpCiAgICAgVGlsZWREcmF3aW5nQXJlYVRpbGU6 OkNvb3JkaW5hdGUgdG9wTGVmdCA9IHRpbGVDb29yZGluYXRlRm9yUG9pbnQoZGlydHlSZWN0Lmxv Y2F0aW9uKCkpOwogICAgIFRpbGVkRHJhd2luZ0FyZWFUaWxlOjpDb29yZGluYXRlIGJvdHRvbVJp Z2h0ID0gdGlsZUNvb3JkaW5hdGVGb3JQb2ludChpbm5lckJvdHRvbVJpZ2h0KGRpcnR5UmVjdCkp OwogCi0gICAgSW50UmVjdCBjb3ZlclJlY3QgPSBjYWxjdWxhdGVDb3ZlclJlY3QobV92aXNpYmxl QXJlYSk7CisgICAgSW50UmVjdCBjb3ZlclJlY3QgPSBjYWxjdWxhdGVDb3ZlclJlY3QodmlzaWJs ZUFyZWEoKSk7CiAKICAgICBWZWN0b3I8VGlsZWREcmF3aW5nQXJlYVRpbGU6OkNvb3JkaW5hdGU+ IHRpbGVzVG9SZW1vdmU7CiAKQEAgLTI5Miw4ICsyOTIsOCBAQCBib29sIFRpbGVkRHJhd2luZ0Fy ZWFQcm94eTo6cGFpbnQoY29uc3QgSW50UmVjdCYgcmVjdCwgUGxhdGZvcm1EcmF3aW5nQ29udGV4 dCBjbwogCiB2b2lkIFRpbGVkRHJhd2luZ0FyZWFQcm94eTo6c2V0VmlzaWJsZUFyZWEoY29uc3Qg V2ViQ29yZTo6SW50UmVjdCYgdmlzaWJsZUFyZWEpCiB7Ci0gICAgaWYgKG1fdmlzaWJsZUFyZWEg IT0gdmlzaWJsZUFyZWEpIHsKLSAgICAgICAgbV92aXNpYmxlQXJlYSA9IHZpc2libGVBcmVhOwor ICAgIGlmIChtX2NvbnRlbnRzVmlzaWJsZUFyZWEgIT0gdmlzaWJsZUFyZWEpIHsKKyAgICAgICAg bV9jb250ZW50c1Zpc2libGVBcmVhID0gdmlzaWJsZUFyZWE7CiAgICAgICAgIHN0YXJ0VGlsZUNy ZWF0aW9uVGltZXIoKTsKICAgICB9CiB9CkBAIC0zNTEsMTQgKzM1MSwxNSBAQCBJbnRSZWN0IFRp bGVkRHJhd2luZ0FyZWFQcm94eTo6Y2FsY3VsYXRlQ292ZXJSZWN0KGNvbnN0IEludFJlY3QmIHZp c2libGVSZWN0KSBjbwogCiB2b2lkIFRpbGVkRHJhd2luZ0FyZWFQcm94eTo6Y3JlYXRlVGlsZXMo KQogewotICAgIGlmIChtX3Zpc2libGVBcmVhLmlzRW1wdHkoKSkKKyAgICBJbnRSZWN0IHZpc2li bGVBcmVhID0gdGhpcy0+dmlzaWJsZUFyZWEoKTsKKyAgICBpZiAodmlzaWJsZUFyZWEuaXNFbXB0 eSgpKQogICAgICAgICByZXR1cm47CiAKICAgICAvLyBSZXNpemUgdGlsZXMgb24gZWRnZXMgaW4g Y2FzZSB0aGUgY29udGVudHMgc2l6ZSBoYXMgY2hhbmdlZC4KICAgICBib29sIGRpZFJlc2l6ZVRp bGVzID0gcmVzaXplRWRnZVRpbGVzKCk7CiAKICAgICAvLyBSZW1vdmUgdGlsZXMgb3V0c2lkZSBv dXQgY3VycmVudCBtYXhpbXVtIGtlZXAgcmVjdC4KLSAgICBkcm9wVGlsZXNPdXRzaWRlUmVjdChj YWxjdWxhdGVLZWVwUmVjdChtX3Zpc2libGVBcmVhKSk7CisgICAgZHJvcFRpbGVzT3V0c2lkZVJl Y3QoY2FsY3VsYXRlS2VlcFJlY3QodmlzaWJsZUFyZWEpKTsKIAogICAgIC8vIFNlYXJjaCBmb3Ig dGhlIHRpbGUgcG9zaXRpb24gY2xvc2VzdCB0byB0aGUgdmlld3BvcnQgY2VudGVyIHRoYXQgZG9l cyBub3QgeWV0IGNvbnRhaW4gYSB0aWxlLgogICAgIC8vIFdoaWNoIHBvc2l0aW9uIGlzIGNvbnNp ZGVyZWQgdGhlIGNsb3Nlc3QgZGVwZW5kcyBvbiB0aGUgdGlsZURpc3RhbmNlIGZ1bmN0aW9uLgpA QCAtMzY2LDEzICszNjcsMTMgQEAgdm9pZCBUaWxlZERyYXdpbmdBcmVhUHJveHk6OmNyZWF0ZVRp bGVzKCkKICAgICBWZWN0b3I8VGlsZWREcmF3aW5nQXJlYVRpbGU6OkNvb3JkaW5hdGU+IHRpbGVz VG9DcmVhdGU7CiAgICAgdW5zaWduZWQgcmVxdWlyZWRUaWxlQ291bnQgPSAwOwogICAgIGJvb2wg aGFzVmlzaWJsZUNoZWNrZXJzID0gZmFsc2U7Ci0gICAgVGlsZWREcmF3aW5nQXJlYVRpbGU6OkNv b3JkaW5hdGUgdG9wTGVmdCA9IHRpbGVDb29yZGluYXRlRm9yUG9pbnQobV92aXNpYmxlQXJlYS5s b2NhdGlvbigpKTsKLSAgICBUaWxlZERyYXdpbmdBcmVhVGlsZTo6Q29vcmRpbmF0ZSBib3R0b21S aWdodCA9IHRpbGVDb29yZGluYXRlRm9yUG9pbnQoaW5uZXJCb3R0b21SaWdodChtX3Zpc2libGVB cmVhKSk7CisgICAgVGlsZWREcmF3aW5nQXJlYVRpbGU6OkNvb3JkaW5hdGUgdG9wTGVmdCA9IHRp bGVDb29yZGluYXRlRm9yUG9pbnQodmlzaWJsZUFyZWEubG9jYXRpb24oKSk7CisgICAgVGlsZWRE cmF3aW5nQXJlYVRpbGU6OkNvb3JkaW5hdGUgYm90dG9tUmlnaHQgPSB0aWxlQ29vcmRpbmF0ZUZv clBvaW50KGlubmVyQm90dG9tUmlnaHQodmlzaWJsZUFyZWEpKTsKICAgICBmb3IgKHVuc2lnbmVk IHlDb29yZGluYXRlID0gdG9wTGVmdC55KCk7IHlDb29yZGluYXRlIDw9IGJvdHRvbVJpZ2h0Lnko KTsgKyt5Q29vcmRpbmF0ZSkgewogICAgICAgICBmb3IgKHVuc2lnbmVkIHhDb29yZGluYXRlID0g dG9wTGVmdC54KCk7IHhDb29yZGluYXRlIDw9IGJvdHRvbVJpZ2h0LngoKTsgKyt4Q29vcmRpbmF0 ZSkgewogICAgICAgICAgICAgVGlsZWREcmF3aW5nQXJlYVRpbGU6OkNvb3JkaW5hdGUgY3VycmVu dENvb3JkaW5hdGUoeENvb3JkaW5hdGUsIHlDb29yZGluYXRlKTsKICAgICAgICAgICAgIC8vIERp c3RhbmNlIGlzIDAgZm9yIGFsbCBjdXJyZW50bHkgdmlzaWJsZSB0aWxlcy4KLSAgICAgICAgICAg IGRvdWJsZSBkaXN0YW5jZSA9IHRpbGVEaXN0YW5jZShtX3Zpc2libGVBcmVhLCBjdXJyZW50Q29v cmRpbmF0ZSk7CisgICAgICAgICAgICBkb3VibGUgZGlzdGFuY2UgPSB0aWxlRGlzdGFuY2Uodmlz aWJsZUFyZWEsIGN1cnJlbnRDb29yZGluYXRlKTsKIAogICAgICAgICAgICAgUmVmUHRyPFRpbGVk RHJhd2luZ0FyZWFUaWxlPiB0aWxlID0gdGlsZUF0KGN1cnJlbnRDb29yZGluYXRlKTsKICAgICAg ICAgICAgIGlmICghZGlzdGFuY2UgJiYgKCF0aWxlIHx8ICF0aWxlLT5pc1JlYWR5VG9QYWludCgp KSkKQEAgLTQ5Niw2ICs0OTcsMTEgQEAgSW50UmVjdCBUaWxlZERyYXdpbmdBcmVhUHJveHk6OmNv bnRlbnRzUmVjdCgpIGNvbnN0CiAgICAgcmV0dXJuIG1hcEZyb21Db250ZW50cyhJbnRSZWN0KElu dFBvaW50KDAsIDApLCBtX3ZpZXdTaXplKSk7CiB9CiAKK0ludFJlY3QgVGlsZWREcmF3aW5nQXJl YVByb3h5Ojp2aXNpYmxlQXJlYSgpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1hcEZyb21Db250ZW50 cyhtX2NvbnRlbnRzVmlzaWJsZUFyZWEpOworfQorCiBJbnRSZWN0IFRpbGVkRHJhd2luZ0FyZWFQ cm94eTo6dGlsZVJlY3RGb3JDb29yZGluYXRlKGNvbnN0IFRpbGVkRHJhd2luZ0FyZWFUaWxlOjpD b29yZGluYXRlJiBjb29yZGluYXRlKSBjb25zdAogewogICAgIEludFJlY3QgcmVjdChjb29yZGlu YXRlLngoKSAqIG1fdGlsZVNpemUud2lkdGgoKSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9UaWxlZERyYXdpbmdBcmVhUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9UaWxlZERyYXdpbmdBcmVhUHJveHkuaAppbmRleCBkMWU4NjBhY2JhMjRlZjlkMWFmMjE2 N2EzNzI1MmU4YmQwZjMwYmE0Li5iYmY3MDk1YjIyOGU0Yjk1ODQyZThkNmI0ZWE4ZDJhZGM3Mzk3 MGMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvVGlsZWREcmF3aW5nQXJl YVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1RpbGVkRHJhd2luZ0FyZWFQ cm94eS5oCkBAIC0xMzUsNiArMTM1LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIHJlbW92ZUFsbFRp bGVzKCk7CiAKICAgICBXZWJDb3JlOjpJbnRSZWN0IGNvbnRlbnRzUmVjdCgpIGNvbnN0OworICAg IFdlYkNvcmU6OkludFJlY3QgdmlzaWJsZUFyZWEoKSBjb25zdDsKIAogICAgIFdlYkNvcmU6Oklu dFJlY3QgY2FsY3VsYXRlS2VlcFJlY3QoY29uc3QgV2ViQ29yZTo6SW50UmVjdCYgdmlzaWJsZVJl Y3QpIGNvbnN0OwogICAgIFdlYkNvcmU6OkludFJlY3QgY2FsY3VsYXRlQ292ZXJSZWN0KGNvbnN0 IFdlYkNvcmU6OkludFJlY3QmIHZpc2libGVSZWN0KSBjb25zdDsKQEAgLTE2Niw3ICsxNjcsNyBA QCBwcml2YXRlOgogICAgIFdlYkNvcmU6OkZsb2F0U2l6ZSBtX2tlZXBBcmVhTXVsdGlwbGllcjsK ICAgICBXZWJDb3JlOjpGbG9hdFNpemUgbV9jb3ZlckFyZWFNdWx0aXBsaWVyOwogCi0gICAgV2Vi Q29yZTo6SW50UmVjdCBtX3Zpc2libGVBcmVhOworICAgIFdlYkNvcmU6OkludFJlY3QgbV9jb250 ZW50c1Zpc2libGVBcmVhOwogICAgIGZsb2F0IG1fY29udGVudHNTY2FsZTsKIAogICAgIGZyaWVu ZCBjbGFzcyBUaWxlZERyYXdpbmdBcmVhVGlsZTsK 101003 2011-07-15 11:03:13 -0700 2011-07-15 11:24:39 -0700 Patch bug-64538-20110715200311.patch text/plain 9587 jturcotte U3VidmVyc2lvbiBSZXZpc2lvbjogOTA4OTkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBjYzI1YWFjMTNlMzNhYzE3 ZDUwMzhkZjhmNzk2ZDNjYjYwNzMzZGI2Li4yYTUyNzdkMWEzMTJlNGE2ZjE0OTBiOGU2ZDFjYmEw NDdiYWIyMzFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTEtMDctMTUgIEpvY2Vs eW4gVHVyY290dGUgIDxqb2NlbHluLnR1cmNvdHRlQG5va2lhLmNvbT4KKworICAgICAgICBUaWxl ZERyYXdpbmdBcmVhOiBtYXAgdGhlIHZpc2libGVBcmVhIHJlY3QgZnJvbSBwYWdlIHRvIHRpbGVz IGNvb3JkaW5hdGVzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NjQ1MzgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBUaWxlZERyYXdpbmdBcmVhUHJveHkgZXhwZWN0cyBpdCdzIGNvb3JkaW5hdGVzIHRvIGJl IHNjYWxlZCBhY2NvcmRpbmcgdG8KKyAgICAgICAgY29udGVudHNTY2FsZS4gVGhpcyBwYXRjaCBr ZWVwIHRoZSBwdXNoZWQgdmlzaWJsZUFyZWEgYXMgcGFnZSBjb29yZGluYXRlcworICAgICAgICBh bmQgY29udmVydCBpdCBlYWNoIHRpbWUgdG8gc2NhbGVkIGNvb3JkaW5hdGVzIGluIGNhc2UgdGhl IGNvbnRlbnRzIHNjYWxlIHdhcworICAgICAgICBjaGFuZ2VkIGFmdGVyd2FyZC4KKyAgICAgICAg QWxzbzoKKyAgICAgICAgLSBSZW5hbWUgdmlzaWJsZUFyZWEgdG8gdmlzaWJsZUNvbnRlbnRSZWN0 CisgICAgICAgIC0gUmVtb3ZlIGFuIHVubmVjZXNzYXJ5IG1hcFRvQ29udGVudHMgaW4gUVRvdWNo V2ViUGFnZVByb3h5OjpzZXRWaXNpYmxlQ29udGVudFJlY3QKKworICAgICAgICAqIFVJUHJvY2Vz cy9BUEkvcXQvcXRvdWNod2VicGFnZS5jcHA6CisgICAgICAgIChRVG91Y2hXZWJQYWdlUHJpdmF0 ZTo6c2V0Vmlld3BvcnRSZWN0KToKKyAgICAgICAgKiBVSVByb2Nlc3MvVGlsZWREcmF3aW5nQXJl YVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6VGlsZWREcmF3aW5nQXJlYVByb3h5OjppbnZh bGlkYXRlKToKKyAgICAgICAgKFdlYktpdDo6VGlsZWREcmF3aW5nQXJlYVByb3h5OjpzZXRWaXNp YmxlQ29udGVudFJlY3QpOgorICAgICAgICAoV2ViS2l0OjpUaWxlZERyYXdpbmdBcmVhUHJveHk6 OmNyZWF0ZVRpbGVzKToKKyAgICAgICAgKFdlYktpdDo6VGlsZWREcmF3aW5nQXJlYVByb3h5Ojp2 aXNpYmxlUmVjdCk6CisgICAgICAgICogVUlQcm9jZXNzL1RpbGVkRHJhd2luZ0FyZWFQcm94eS5o OgorICAgICAgICAqIFVJUHJvY2Vzcy9xdC9xdG91Y2h3ZWJwYWdlcHJveHkuY3BwOgorICAgICAg ICAoUVRvdWNoV2ViUGFnZVByb3h5OjpzZXRWaXNpYmxlQ29udGVudFJlY3QpOgorICAgICAgICAq IFVJUHJvY2Vzcy9xdC9xdG91Y2h3ZWJwYWdlcHJveHkuaDoKKwogMjAxMS0wNy0xMiAgSm9jZWx5 biBUdXJjb3R0ZSAgPGpvY2VseW4udHVyY290dGVAbm9raWEuY29tPgogCiAgICAgICAgIFtRdF0g QWxzbyBzdG9wIHRoZSBzY2FsZSBjb21taXQgdGltZXIgd2hlbiBjb21taXRTY2FsZUNoYW5nZSBp cyBjYWxsZWQgZXhwbGljaXRseS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvcXQvcXRvdWNod2VicGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L3F0L3F0b3VjaHdlYnBhZ2UuY3BwCmluZGV4IGZkZjkwOTdlYTA3YjNjMjE4NTkyNDQzZDVjNDU2 ODk5NTkzZWY5ZjguLjI3N2E3MWU1NWYwMjcwZTFjMjU3NWFhMTE2NjYyMjcxMWJlMzU5OGEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXRvdWNod2VicGFnZS5j cHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xdG91Y2h3ZWJwYWdlLmNw cApAQCAtMTQyLDggKzE0Miw4IEBAIHZvaWQgUVRvdWNoV2ViUGFnZVByaXZhdGU6OnNldFBhZ2Uo UVRvdWNoV2ViUGFnZVByb3h5KiBwYWdlKQogCiB2b2lkIFFUb3VjaFdlYlBhZ2VQcml2YXRlOjpz ZXRWaWV3cG9ydFJlY3QoY29uc3QgUVJlY3RGJiB2aWV3cG9ydFJlY3QpCiB7Ci0gICAgY29uc3Qg UVJlY3RGIHZpc2libGVBcmVhID0gcS0+Ym91bmRpbmdSZWN0KCkuaW50ZXJzZWN0ZWQodmlld3Bv cnRSZWN0KTsKLSAgICBwYWdlLT5zZXRWaXNpYmxlQXJlYSh2aXNpYmxlQXJlYSk7CisgICAgY29u c3QgUVJlY3RGIHZpc2libGVDb250ZW50UmVjdCA9IHEtPmJvdW5kaW5nUmVjdCgpLmludGVyc2Vj dGVkKHZpZXdwb3J0UmVjdCk7CisgICAgcGFnZS0+c2V0VmlzaWJsZUNvbnRlbnRSZWN0KHZpc2li bGVDb250ZW50UmVjdCk7CiB9CiAKICNpbmNsdWRlICJtb2NfcXRvdWNod2VicGFnZS5jcHAiCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvVGlsZWREcmF3aW5nQXJlYVByb3h5 LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9UaWxlZERyYXdpbmdBcmVhUHJveHkuY3Bw CmluZGV4IDk4ZmYyNzNiYThhZmIzNTJmMzBjYWQ5YWM5NTc2ZGQyNDc4ODg1NDguLjI1NGUzOGIx ZGJhMjc4YjUxNDUzMWRjNDE5ZDFjN2U1MjU0OTEyYWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9UaWxlZERyYXdpbmdBcmVhUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9UaWxlZERyYXdpbmdBcmVhUHJveHkuY3BwCkBAIC0xODEsNyArMTgxLDcg QEAgdm9pZCBUaWxlZERyYXdpbmdBcmVhUHJveHk6OmludmFsaWRhdGUoY29uc3QgSW50UmVjdCYg Y29udGVudHNEaXJ0eVJlY3QpCiAgICAgVGlsZWREcmF3aW5nQXJlYVRpbGU6OkNvb3JkaW5hdGUg dG9wTGVmdCA9IHRpbGVDb29yZGluYXRlRm9yUG9pbnQoZGlydHlSZWN0LmxvY2F0aW9uKCkpOwog ICAgIFRpbGVkRHJhd2luZ0FyZWFUaWxlOjpDb29yZGluYXRlIGJvdHRvbVJpZ2h0ID0gdGlsZUNv b3JkaW5hdGVGb3JQb2ludChpbm5lckJvdHRvbVJpZ2h0KGRpcnR5UmVjdCkpOwogCi0gICAgSW50 UmVjdCBjb3ZlclJlY3QgPSBjYWxjdWxhdGVDb3ZlclJlY3QobV92aXNpYmxlQXJlYSk7CisgICAg SW50UmVjdCBjb3ZlclJlY3QgPSBjYWxjdWxhdGVDb3ZlclJlY3QodmlzaWJsZVJlY3QoKSk7CiAK ICAgICBWZWN0b3I8VGlsZWREcmF3aW5nQXJlYVRpbGU6OkNvb3JkaW5hdGU+IHRpbGVzVG9SZW1v dmU7CiAKQEAgLTI5MCwxMCArMjkwLDEwIEBAIGJvb2wgVGlsZWREcmF3aW5nQXJlYVByb3h5Ojpw YWludChjb25zdCBJbnRSZWN0JiByZWN0LCBQbGF0Zm9ybURyYXdpbmdDb250ZXh0IGNvCiAgICAg cmV0dXJuIHRydWU7CiB9CiAKLXZvaWQgVGlsZWREcmF3aW5nQXJlYVByb3h5OjpzZXRWaXNpYmxl QXJlYShjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiB2aXNpYmxlQXJlYSkKK3ZvaWQgVGlsZWREcmF3 aW5nQXJlYVByb3h5OjpzZXRWaXNpYmxlQ29udGVudFJlY3QoY29uc3QgV2ViQ29yZTo6SW50UmVj dCYgdmlzaWJsZUNvbnRlbnRSZWN0KQogewotICAgIGlmIChtX3Zpc2libGVBcmVhICE9IHZpc2li bGVBcmVhKSB7Ci0gICAgICAgIG1fdmlzaWJsZUFyZWEgPSB2aXNpYmxlQXJlYTsKKyAgICBpZiAo bV92aXNpYmxlQ29udGVudFJlY3QgIT0gdmlzaWJsZUNvbnRlbnRSZWN0KSB7CisgICAgICAgIG1f dmlzaWJsZUNvbnRlbnRSZWN0ID0gdmlzaWJsZUNvbnRlbnRSZWN0OwogICAgICAgICBzdGFydFRp bGVDcmVhdGlvblRpbWVyKCk7CiAgICAgfQogfQpAQCAtMzUxLDE0ICszNTEsMTUgQEAgSW50UmVj dCBUaWxlZERyYXdpbmdBcmVhUHJveHk6OmNhbGN1bGF0ZUNvdmVyUmVjdChjb25zdCBJbnRSZWN0 JiB2aXNpYmxlUmVjdCkgY28KIAogdm9pZCBUaWxlZERyYXdpbmdBcmVhUHJveHk6OmNyZWF0ZVRp bGVzKCkKIHsKLSAgICBpZiAobV92aXNpYmxlQXJlYS5pc0VtcHR5KCkpCisgICAgSW50UmVjdCB2 aXNpYmxlUmVjdCA9IHRoaXMtPnZpc2libGVSZWN0KCk7CisgICAgaWYgKHZpc2libGVSZWN0Lmlz RW1wdHkoKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgLy8gUmVzaXplIHRpbGVzIG9uIGVkZ2Vz IGluIGNhc2UgdGhlIGNvbnRlbnRzIHNpemUgaGFzIGNoYW5nZWQuCiAgICAgYm9vbCBkaWRSZXNp emVUaWxlcyA9IHJlc2l6ZUVkZ2VUaWxlcygpOwogCiAgICAgLy8gUmVtb3ZlIHRpbGVzIG91dHNp ZGUgb3V0IGN1cnJlbnQgbWF4aW11bSBrZWVwIHJlY3QuCi0gICAgZHJvcFRpbGVzT3V0c2lkZVJl Y3QoY2FsY3VsYXRlS2VlcFJlY3QobV92aXNpYmxlQXJlYSkpOworICAgIGRyb3BUaWxlc091dHNp ZGVSZWN0KGNhbGN1bGF0ZUtlZXBSZWN0KHZpc2libGVSZWN0KSk7CiAKICAgICAvLyBTZWFyY2gg Zm9yIHRoZSB0aWxlIHBvc2l0aW9uIGNsb3Nlc3QgdG8gdGhlIHZpZXdwb3J0IGNlbnRlciB0aGF0 IGRvZXMgbm90IHlldCBjb250YWluIGEgdGlsZS4KICAgICAvLyBXaGljaCBwb3NpdGlvbiBpcyBj b25zaWRlcmVkIHRoZSBjbG9zZXN0IGRlcGVuZHMgb24gdGhlIHRpbGVEaXN0YW5jZSBmdW5jdGlv bi4KQEAgLTM2NiwxMyArMzY3LDEzIEBAIHZvaWQgVGlsZWREcmF3aW5nQXJlYVByb3h5OjpjcmVh dGVUaWxlcygpCiAgICAgVmVjdG9yPFRpbGVkRHJhd2luZ0FyZWFUaWxlOjpDb29yZGluYXRlPiB0 aWxlc1RvQ3JlYXRlOwogICAgIHVuc2lnbmVkIHJlcXVpcmVkVGlsZUNvdW50ID0gMDsKICAgICBi b29sIGhhc1Zpc2libGVDaGVja2VycyA9IGZhbHNlOwotICAgIFRpbGVkRHJhd2luZ0FyZWFUaWxl OjpDb29yZGluYXRlIHRvcExlZnQgPSB0aWxlQ29vcmRpbmF0ZUZvclBvaW50KG1fdmlzaWJsZUFy ZWEubG9jYXRpb24oKSk7Ci0gICAgVGlsZWREcmF3aW5nQXJlYVRpbGU6OkNvb3JkaW5hdGUgYm90 dG9tUmlnaHQgPSB0aWxlQ29vcmRpbmF0ZUZvclBvaW50KGlubmVyQm90dG9tUmlnaHQobV92aXNp YmxlQXJlYSkpOworICAgIFRpbGVkRHJhd2luZ0FyZWFUaWxlOjpDb29yZGluYXRlIHRvcExlZnQg PSB0aWxlQ29vcmRpbmF0ZUZvclBvaW50KHZpc2libGVSZWN0LmxvY2F0aW9uKCkpOworICAgIFRp bGVkRHJhd2luZ0FyZWFUaWxlOjpDb29yZGluYXRlIGJvdHRvbVJpZ2h0ID0gdGlsZUNvb3JkaW5h dGVGb3JQb2ludChpbm5lckJvdHRvbVJpZ2h0KHZpc2libGVSZWN0KSk7CiAgICAgZm9yICh1bnNp Z25lZCB5Q29vcmRpbmF0ZSA9IHRvcExlZnQueSgpOyB5Q29vcmRpbmF0ZSA8PSBib3R0b21SaWdo dC55KCk7ICsreUNvb3JkaW5hdGUpIHsKICAgICAgICAgZm9yICh1bnNpZ25lZCB4Q29vcmRpbmF0 ZSA9IHRvcExlZnQueCgpOyB4Q29vcmRpbmF0ZSA8PSBib3R0b21SaWdodC54KCk7ICsreENvb3Jk aW5hdGUpIHsKICAgICAgICAgICAgIFRpbGVkRHJhd2luZ0FyZWFUaWxlOjpDb29yZGluYXRlIGN1 cnJlbnRDb29yZGluYXRlKHhDb29yZGluYXRlLCB5Q29vcmRpbmF0ZSk7CiAgICAgICAgICAgICAv LyBEaXN0YW5jZSBpcyAwIGZvciBhbGwgY3VycmVudGx5IHZpc2libGUgdGlsZXMuCi0gICAgICAg ICAgICBkb3VibGUgZGlzdGFuY2UgPSB0aWxlRGlzdGFuY2UobV92aXNpYmxlQXJlYSwgY3VycmVu dENvb3JkaW5hdGUpOworICAgICAgICAgICAgZG91YmxlIGRpc3RhbmNlID0gdGlsZURpc3RhbmNl KHZpc2libGVSZWN0LCBjdXJyZW50Q29vcmRpbmF0ZSk7CiAKICAgICAgICAgICAgIFJlZlB0cjxU aWxlZERyYXdpbmdBcmVhVGlsZT4gdGlsZSA9IHRpbGVBdChjdXJyZW50Q29vcmRpbmF0ZSk7CiAg ICAgICAgICAgICBpZiAoIWRpc3RhbmNlICYmICghdGlsZSB8fCAhdGlsZS0+aXNSZWFkeVRvUGFp bnQoKSkpCkBAIC00OTYsNiArNDk3LDExIEBAIEludFJlY3QgVGlsZWREcmF3aW5nQXJlYVByb3h5 Ojpjb250ZW50c1JlY3QoKSBjb25zdAogICAgIHJldHVybiBtYXBGcm9tQ29udGVudHMoSW50UmVj dChJbnRQb2ludCgwLCAwKSwgbV92aWV3U2l6ZSkpOwogfQogCitJbnRSZWN0IFRpbGVkRHJhd2lu Z0FyZWFQcm94eTo6dmlzaWJsZVJlY3QoKSBjb25zdAoreworICAgIHJldHVybiBtYXBGcm9tQ29u dGVudHMobV92aXNpYmxlQ29udGVudFJlY3QpOworfQorCiBJbnRSZWN0IFRpbGVkRHJhd2luZ0Fy ZWFQcm94eTo6dGlsZVJlY3RGb3JDb29yZGluYXRlKGNvbnN0IFRpbGVkRHJhd2luZ0FyZWFUaWxl OjpDb29yZGluYXRlJiBjb29yZGluYXRlKSBjb25zdAogewogICAgIEludFJlY3QgcmVjdChjb29y ZGluYXRlLngoKSAqIG1fdGlsZVNpemUud2lkdGgoKSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9UaWxlZERyYXdpbmdBcmVhUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9UaWxlZERyYXdpbmdBcmVhUHJveHkuaAppbmRleCBkMWU4NjBhY2JhMjRlZjlkMWFm MjE2N2EzNzI1MmU4YmQwZjMwYmE0Li4xNGRlYjYyYTE0ZDkyMzJmODQzZjIwMTJmNjU2MmYyOTI3 N2Y2NGVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvVGlsZWREcmF3aW5n QXJlYVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1RpbGVkRHJhd2luZ0Fy ZWFQcm94eS5oCkBAIC02Nyw3ICs2Nyw3IEBAIHB1YmxpYzoKICAgICBUaWxlZERyYXdpbmdBcmVh UHJveHkoUGxhdGZvcm1XZWJWaWV3KiwgV2ViUGFnZVByb3h5Kik7CiAgICAgdmlydHVhbCB+VGls ZWREcmF3aW5nQXJlYVByb3h5KCk7CiAKLSAgICB2b2lkIHNldFZpc2libGVBcmVhKGNvbnN0IFdl YkNvcmU6OkludFJlY3QmIHZpc2libGVSZWN0KTsKKyAgICB2b2lkIHNldFZpc2libGVDb250ZW50 UmVjdChjb25zdCBXZWJDb3JlOjpJbnRSZWN0Jik7CiAgICAgZmxvYXQgY29udGVudHNTY2FsZSgp IGNvbnN0IHsgcmV0dXJuIG1fY29udGVudHNTY2FsZTsgfQogICAgIHZvaWQgc2V0Q29udGVudHNT Y2FsZShmbG9hdCk7CiAKQEAgLTEzNSw2ICsxMzUsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgcmVt b3ZlQWxsVGlsZXMoKTsKIAogICAgIFdlYkNvcmU6OkludFJlY3QgY29udGVudHNSZWN0KCkgY29u c3Q7CisgICAgV2ViQ29yZTo6SW50UmVjdCB2aXNpYmxlUmVjdCgpIGNvbnN0OwogCiAgICAgV2Vi Q29yZTo6SW50UmVjdCBjYWxjdWxhdGVLZWVwUmVjdChjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiB2 aXNpYmxlUmVjdCkgY29uc3Q7CiAgICAgV2ViQ29yZTo6SW50UmVjdCBjYWxjdWxhdGVDb3ZlclJl Y3QoY29uc3QgV2ViQ29yZTo6SW50UmVjdCYgdmlzaWJsZVJlY3QpIGNvbnN0OwpAQCAtMTY2LDcg KzE2Nyw3IEBAIHByaXZhdGU6CiAgICAgV2ViQ29yZTo6RmxvYXRTaXplIG1fa2VlcEFyZWFNdWx0 aXBsaWVyOwogICAgIFdlYkNvcmU6OkZsb2F0U2l6ZSBtX2NvdmVyQXJlYU11bHRpcGxpZXI7CiAK LSAgICBXZWJDb3JlOjpJbnRSZWN0IG1fdmlzaWJsZUFyZWE7CisgICAgV2ViQ29yZTo6SW50UmVj dCBtX3Zpc2libGVDb250ZW50UmVjdDsKICAgICBmbG9hdCBtX2NvbnRlbnRzU2NhbGU7CiAKICAg ICBmcmllbmQgY2xhc3MgVGlsZWREcmF3aW5nQXJlYVRpbGU7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvcXQvcXRvdWNod2VicGFnZXByb3h5LmNwcCBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9xdC9xdG91Y2h3ZWJwYWdlcHJveHkuY3BwCmluZGV4IDlmMjM5MjRkZDU5 NmI4YmI0YTNmOWM1MWI2YWI5NWRlMzUwMTFjMjcuLmYyNGU0NDYyYWEzMWNhN2UyYzk0MjEyMDgw NGFkM2ZhZGViN2VmYjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9x dG91Y2h3ZWJwYWdlcHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9x dG91Y2h3ZWJwYWdlcHJveHkuY3BwCkBAIC04NSwxNSArODUsMTQgQEAgYm9vbCBRVG91Y2hXZWJQ YWdlUHJveHk6OmhhbmRsZUV2ZW50KFFFdmVudCogZXYpCiAgICAgcmV0dXJuIFF0V2ViUGFnZVBy b3h5OjpoYW5kbGVFdmVudChldik7CiB9CiAKLXZvaWQgUVRvdWNoV2ViUGFnZVByb3h5OjpzZXRW aXNpYmxlQXJlYShjb25zdCBRUmVjdEYmIHZpc2libGVBcmVhKQordm9pZCBRVG91Y2hXZWJQYWdl UHJveHk6OnNldFZpc2libGVDb250ZW50UmVjdChjb25zdCBRUmVjdEYmIHZpc2libGVDb250ZW50 UmVjdCkKIHsKICAgICBUaWxlZERyYXdpbmdBcmVhUHJveHkqIHRpbGVkRHJhd2luZ0FyZWEgPSBz dGF0aWNfY2FzdDxUaWxlZERyYXdpbmdBcmVhUHJveHkqPihtX3dlYlBhZ2VQcm94eS0+ZHJhd2lu Z0FyZWEoKSk7Ci0gICAgUVJlY3QgYWxpZ25lZFZpc2libGVBcmVhID0gdmlzaWJsZUFyZWEudG9B bGlnbmVkUmVjdCgpOwotICAgIHRpbGVkRHJhd2luZ0FyZWEtPnNldFZpc2libGVBcmVhKGFsaWdu ZWRWaXNpYmxlQXJlYSk7CisgICAgUVJlY3QgYWxpZ25lZFZpc2libGVDb250ZW50UmVjdCA9IHZp c2libGVDb250ZW50UmVjdC50b0FsaWduZWRSZWN0KCk7CisgICAgdGlsZWREcmF3aW5nQXJlYS0+ c2V0VmlzaWJsZUNvbnRlbnRSZWN0KGFsaWduZWRWaXNpYmxlQ29udGVudFJlY3QpOwogCiAgICAg Ly8gRklYTUU6IE9uY2Ugd2Ugc3VwcG9ydCBzdXNwZW5kIGFuZCByZXN1bWUsIHRoaXMgc2hvdWxk IGJlIGRlbGF5ZWQgdW50aWwgdGhlIHBhZ2UgaXMgYWN0aXZlIGlmIHRoZSBwYWdlIGlzIHN1c3Bl bmRlZC4KLSAgICBJbnRSZWN0IGNvbnRlbnRWaXNpYmxlQXJlYSA9IHRpbGVkRHJhd2luZ0FyZWEt Pm1hcFRvQ29udGVudHMoYWxpZ25lZFZpc2libGVBcmVhKTsKLSAgICBtX3dlYlBhZ2VQcm94eS0+ c2V0QWN0dWFsVmlzaWJsZUNvbnRlbnRSZWN0KGNvbnRlbnRWaXNpYmxlQXJlYSk7CisgICAgbV93 ZWJQYWdlUHJveHktPnNldEFjdHVhbFZpc2libGVDb250ZW50UmVjdChhbGlnbmVkVmlzaWJsZUNv bnRlbnRSZWN0KTsKIH0KIAogdm9pZCBRVG91Y2hXZWJQYWdlUHJveHk6OnNldFJlc2l6ZXNUb0Nv bnRlbnRzVXNpbmdMYXlvdXRTaXplKGNvbnN0IFFTaXplJiB0YXJnZXRMYXlvdXRTaXplKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L3F0b3VjaHdlYnBhZ2Vwcm94eS5o IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L3F0b3VjaHdlYnBhZ2Vwcm94eS5oCmluZGV4 IGJhYjU3MjNiZTFmOTY2ODJlOTU2MGM3YjljNzZhMzg0YmIzNjg4NzAuLmExMGE3NTNmMzY3Y2Vk Y2FjMDcxNWY4Y2EzZGQ3ZTA1YTU1NmE2MTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9xdC9xdG91Y2h3ZWJwYWdlcHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvcXQvcXRvdWNod2VicGFnZXByb3h5LmgKQEAgLTM5LDcgKzM5LDcgQEAgcHVibGljOgog CiAgICAgdmlydHVhbCBib29sIGhhbmRsZUV2ZW50KFFFdmVudCopOwogCi0gICAgdm9pZCBzZXRW aXNpYmxlQXJlYShjb25zdCBRUmVjdEYmKTsKKyAgICB2b2lkIHNldFZpc2libGVDb250ZW50UmVj dChjb25zdCBRUmVjdEYmKTsKICAgICB2b2lkIHNldFJlc2l6ZXNUb0NvbnRlbnRzVXNpbmdMYXlv dXRTaXplKGNvbnN0IFFTaXplJiB0YXJnZXRMYXlvdXRTaXplKTsKICAgICB2b2lkIGZpbmRab29t YWJsZUFyZWFGb3JQb2ludChjb25zdCBRUG9pbnQmKTsKICAgICB2b2lkIHNldENvbnRlbnRzU2Nh bGUocXJlYWwpOwo=