145022 2015-05-14 15:11:10 -0700 Add a layout mode that scales down the view to try to fit the document 2015-05-14 15:48:14 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton andersca bdakin dino mitz sam simon.fraser oldest_to_newest 1094928 0 thorton 2015-05-14 15:11:10 -0700 Add a layout mode that scales down the view to try to fit the document 1094929 1 253149 thorton 2015-05-14 15:11:38 -0700 Created attachment 253149 Patch 1094931 2 253149 dino 2015-05-14 15:15:25 -0700 Comment on attachment 253149 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=253149&action=review > Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:278 > + const int maximumDocumentWidthForScaling = 1440; > + const float minimumViewScale = 0.1; Aren't these defined elsewhere? > Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:304 > + viewScale = (float)viewWidth / (float)documentWidth; Can documentWidth ever be zero? 1094933 3 thorton 2015-05-14 15:17:54 -0700 (In reply to comment #2) > Comment on attachment 253149 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=253149&action=review > > > Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:278 > > + const int maximumDocumentWidthForScaling = 1440; > > + const float minimumViewScale = 0.1; > > Aren't these defined elsewhere? Not for this mechanism, no. > > Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:304 > > + viewScale = (float)viewWidth / (float)documentWidth; > > Can documentWidth ever be zero? Probably. We should probably not even try to do anything in that case. Will fix. Thanks! 1094941 4 thorton 2015-05-14 15:48:14 -0700 https://trac.webkit.org/changeset/184358 253149 2015-05-14 15:11:38 -0700 2015-05-14 15:15:25 -0700 Patch bug-145022-20150514151014.patch text/plain 22816 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTg0MzA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNWZjODkzMTgxYTQ2ZmQ3 YjJlYzA2MTc3MzY3YzI4MjU2Nzk5OTk2OS4uMzQwY2Y0ZGY4YzQ4NjQ2Yjk3MzJjOTgzZmU5NTk0 YWYzMWIxYzY2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ5IEBACisyMDE1LTA1LTE0ICBUaW1v dGh5IEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgYSBs YXlvdXQgbW9kZSB0aGF0IHNjYWxlcyBkb3duIHRoZSB2aWV3IHRvIHRyeSB0byBmaXQgdGhlIGRv Y3VtZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x NDUwMjIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE5NzkwMzQxPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2hhcmVkL1dlYlBhZ2VDcmVhdGlv blBhcmFtZXRlcnMuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlQ3JlYXRpb25QYXJhbWV0 ZXJzOjplbmNvZGUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJz OjpkZWNvZGUpOgorICAgICAgICAqIFNoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmg6 CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6 OldlYlBhZ2VQcm94eTo6Y3JlYXRpb25QYXJhbWV0ZXJzKToKKyAgICAgICAgKFdlYktpdDo6V2Vi UGFnZVByb3h5OjpzZXRTaG91bGRTY2FsZVZpZXdUb0ZpdERvY3VtZW50KToKKyAgICAgICAgKiBV SVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL0Ry YXdpbmdBcmVhLmg6CisgICAgICAgIChXZWJLaXQ6OkRyYXdpbmdBcmVhOjpzZXRTaG91bGRTY2Fs ZVZpZXdUb0ZpdERvY3VtZW50KToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn ZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OldlYlBhZ2UpOgorICAgICAgICAoV2Vi S2l0OjpXZWJQYWdlOjpzZXRTaG91bGRTY2FsZVZpZXdUb0ZpdERvY3VtZW50KToKKyAgICAgICAg KiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2Vi UGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluOgorICAgICAgICBQbHVtYiBzaG91bGRTY2FsZVZpZXdU b0ZpdERvY3VtZW50IHRocm91Z2ggdG8gdGhlIERyYXdpbmdBcmVhLgorCisgICAgICAgICogVUlQ cm9jZXNzL21hYy9XS1ZpZXdMYXlvdXRTdHJhdGVneS5tbToKKyAgICAgICAgKCtbV0tWaWV3TGF5 b3V0U3RyYXRlZ3kgbGF5b3V0U3RyYXRlZ3lXaXRoUGFnZTp2aWV3Om1vZGU6XSk6CisgICAgICAg ICgtW1dLVmlld0R5bmFtaWNTaXplQ29tcHV0ZWRGcm9tTWluaW11bURvY3VtZW50U2l6ZUxheW91 dFN0cmF0ZWd5IGluaXRXaXRoUGFnZTp2aWV3Om1vZGU6XSk6CisgICAgICAgICgtW1dLVmlld0R5 bmFtaWNTaXplQ29tcHV0ZWRGcm9tTWluaW11bURvY3VtZW50U2l6ZUxheW91dFN0cmF0ZWd5IHVw ZGF0ZUxheW91dF0pOgorICAgICAgICAoLVtXS1ZpZXdEeW5hbWljU2l6ZUNvbXB1dGVkRnJvbU1p bmltdW1Eb2N1bWVudFNpemVMYXlvdXRTdHJhdGVneSB3aWxsQ2hhbmdlTGF5b3V0U3RyYXRlZ3ld KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tMYXlvdXRNb2RlLmg6CisgICAgICAgICog VUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tMYXlvdXRNb2RlLmg6CisgICAgICAgIEFkZCBhIG5ldyBs YXlvdXQgbW9kZSwgd2hpY2gganVzdCB0dXJucyBvbiBzaG91bGRTY2FsZVZpZXdUb0ZpdERvY3Vt ZW50LAorICAgICAgICBhbmQgb3RoZXJ3aXNlIGJlaGF2ZXMgYXMgbm9ybWFsLgorCisgICAgICAg ICogV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5o OgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJh d2luZ0FyZWEubW06CisgICAgICAgIChXZWJLaXQ6OlRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdB cmVhOjpzZXRTaG91bGRTY2FsZVZpZXdUb0ZpdERvY3VtZW50KToKKyAgICAgICAgKFdlYktpdDo6 VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OnNjYWxlVmlld1RvRml0RG9jdW1lbnRJZk5l ZWRlZCk6CisgICAgICAgIChXZWJLaXQ6OlRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjpm bHVzaExheWVycyk6CisgICAgICAgIE9uIGV2ZXJ5IGZsdXNoIHdoZXJlIGVpdGhlciB0aGUgZG9j dW1lbnQgc2l6ZSBvciB2aWV3IHNpemUgaGFzIGNoYW5nZWQsCisgICAgICAgIG9yIGxheW91dCBp cyBvdXRzdGFuZGluZywgZG8gYSBsYXlvdXQgd2l0aCBmaXhlZCBsYXlvdXQgb2ZmIHRvIGRldGVy bWluZQorICAgICAgICB3aGV0aGVyIHRoZSBkb2N1bWVudCBmaXRzIGluc2lkZSB0aGUgdmlldy4g SWYgaXQgZG9lc24ndCwgc2NhbGUgaXQgZG93bgorICAgICAgICB0byBmaXQuIFRoaXMgd2lsbCBy ZXF1aXJlIGFuIGV4dHJhIGxheW91dCBmb3IgZXZlcnkgcmVzaXplIHdoaWxlIGluIHRoZQorICAg ICAgICBzY2FsZWQtZG93biBzdGF0ZSwgYnV0IHRoZXJlIGlzIHBvdGVudGlhbCBmb3IgZnV0dXJl IG9wdGltaXphdGlvbi4KKwogMjAxNS0wNS0xMyAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFw cGxlLmNvbT4KIAogICAgICAgICBbTWFjXSBTYW5kYm94IHZpb2xhdGlvbiByZWFkaW5nIFN1Ym1p dERpYWdJbmZvLmRvbWFpbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQ YWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQYWdl Q3JlYXRpb25QYXJhbWV0ZXJzLmNwcAppbmRleCBmOGMxMThjNjU4MDVmMWNhMWQ3ZjRhMTQ0NWRj ODRjM2M3ZDMxNTUzLi45ZjhlMzQ4MzJjZjJmNzVmZmMyNmY5MTI3OWY3MTFhNDM5MjU3OTZlIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVy cy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRl cnMuY3BwCkBAIC04Myw2ICs4Myw3IEBAIHZvaWQgV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVyczo6 ZW5jb2RlKElQQzo6QXJndW1lbnRFbmNvZGVyJiBlbmNvZGVyKSBjb25zdAogICAgIGVuY29kZXIg PDwgdGV4dEF1dG9zaXppbmdXaWR0aDsKICNlbmRpZgogICAgIGVuY29kZXIgPDwgYXBwbGVNYWls UGFnaW5hdGlvblF1aXJrRW5hYmxlZDsKKyAgICBlbmNvZGVyIDw8IHNob3VsZFNjYWxlVmlld1Rv Rml0RG9jdW1lbnQ7CiB9CiAKIGJvb2wgV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVyczo6ZGVjb2Rl KElQQzo6QXJndW1lbnREZWNvZGVyJiBkZWNvZGVyLCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJz JiBwYXJhbWV0ZXJzKQpAQCAtMTg0LDYgKzE4NSw5IEBAIGJvb2wgV2ViUGFnZUNyZWF0aW9uUGFy YW1ldGVyczo6ZGVjb2RlKElQQzo6QXJndW1lbnREZWNvZGVyJiBkZWNvZGVyLCBXZWJQYWdlQ3Jl CiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShwYXJhbWV0ZXJzLmFwcGxlTWFpbFBhZ2luYXRpb25R dWlya0VuYWJsZWQpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKKyAgICBpZiAoIWRlY29kZXIu ZGVjb2RlKHBhcmFtZXRlcnMuc2hvdWxkU2NhbGVWaWV3VG9GaXREb2N1bWVudCkpCisgICAgICAg IHJldHVybiBmYWxzZTsKKwogICAgIHJldHVybiB0cnVlOwogfQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5oIGIvU291cmNlL1dl YktpdDIvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuaAppbmRleCA2ZmJmN2RkZGY4 MDVjOTE4NmNkMDZjMGU3ZjIxMjZmOWQ4ODI4MzQwLi5mMGVhMTkwZTBlYTQxNWY2MWE0MzQ4MzM5 MGQwMjgwYWY3MmYzYmUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUGFn ZUNyZWF0aW9uUGFyYW1ldGVycy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQYWdl Q3JlYXRpb25QYXJhbWV0ZXJzLmgKQEAgLTEyOSw2ICsxMjksNyBAQCBzdHJ1Y3QgV2ViUGFnZUNy ZWF0aW9uUGFyYW1ldGVycyB7CiAgICAgZmxvYXQgdGV4dEF1dG9zaXppbmdXaWR0aDsKICNlbmRp ZgogICAgIGJvb2wgYXBwbGVNYWlsUGFnaW5hdGlvblF1aXJrRW5hYmxlZDsKKyAgICBib29sIHNo b3VsZFNjYWxlVmlld1RvRml0RG9jdW1lbnQ7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS0xheW91dE1vZGUu aCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS0xheW91dE1vZGUuaAppbmRleCA2 YjZhMjZmZGRlNmI1MWM5YzYwOTM5ZGY1NDNiNDU4ZjdjMDRlZDhmLi42NzI2NmE0YjRkZDAyOWVi YjMyYjNkZWYyMjFlMmI1MmQ1NmQxOWMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL0MvV0tMYXlvdXRNb2RlLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9DL1dLTGF5b3V0TW9kZS5oCkBAIC0zNiw3ICszNiw4IEBAIGVudW0gewogICAgIGtXS0xh eW91dE1vZGVWaWV3U2l6ZSwKICAgICBrV0tMYXlvdXRNb2RlRml4ZWRTaXplLAogICAgIGtXS0xh eW91dE1vZGVEeW5hbWljU2l6ZUNvbXB1dGVkRnJvbVZpZXdTY2FsZSwKLSAgICBrV0tMYXlvdXRN b2RlRHluYW1pY1NpemVXaXRoTWluaW11bVZpZXdTaXplCisgICAga1dLTGF5b3V0TW9kZUR5bmFt aWNTaXplV2l0aE1pbmltdW1WaWV3U2l6ZSwKKyAgICBrV0tMYXlvdXRNb2RlRHluYW1pY1NpemVD b21wdXRlZEZyb21NaW5pbXVtRG9jdW1lbnRTaXplCiB9OwogdHlwZWRlZiB1aW50MzJfdCBXS0xh eW91dE1vZGU7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29j b2EvX1dLTGF5b3V0TW9kZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9f V0tMYXlvdXRNb2RlLmgKaW5kZXggZDljMTU4YmQ2MDIyYTA5NTIzODJiZWYwODNmMDZiYjhhODJj ODM4OC4uNmQxOGU1NGQ1OWMwNWZkM2MzMzVhMzM5NmFjZWYwNDI0ZjFlYjczMSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tMYXlvdXRNb2RlLmgKKysr IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tMYXlvdXRNb2RlLmgKQEAg LTM1LDcgKzM1LDEwIEBAIHR5cGVkZWYgTlNfRU5VTShOU1VJbnRlZ2VyLCBfV0tMYXlvdXRNb2Rl KSB7CiAgICAgX1dLTGF5b3V0TW9kZUR5bmFtaWNTaXplQ29tcHV0ZWRGcm9tVmlld1NjYWxlLAog CiAgICAgLy8gTGF5IG91dCB0aGUgdmlldyBhdCBhIGhldXJpc3RpY2FsbHktZGV0ZXJtaW5lZCBz aXplIGJhc2VkIG9uIHRoZSBtaW5pbXVtIHZpZXcgc2l6ZS4KLSAgICBfV0tMYXlvdXRNb2RlRHlu YW1pY1NpemVXaXRoTWluaW11bVZpZXdTaXplCisgICAgX1dLTGF5b3V0TW9kZUR5bmFtaWNTaXpl V2l0aE1pbmltdW1WaWV3U2l6ZSwKKworICAgIC8vIExheSBvdXQgdGhlIHZpZXcgYXQgYSBoZXVy aXN0aWNhbGx5LWRldGVybWluZWQgc2l6ZSBiYXNlZCBvbiB0aGUgbWluaW11bSBzaXplIG9mIHRo ZSBkb2N1bWVudC4KKyAgICBfV0tMYXlvdXRNb2RlRHluYW1pY1NpemVDb21wdXRlZEZyb21NaW5p bXVtRG9jdW1lbnRTaXplLAogCiB9IFdLX0VOVU1fQVZBSUxBQkxFKFdLX01BQ19UQkEsIFdLX0lP U19UQkEpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVBy b3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4 IDVhOGJjYWJkNzMxZjI3ZmUzNDg0NjFkYmZjYTQ0MTU0NjM0MzUyYjUuLjIwNGUxYWJiZWUxNjQ0 MTMzYWRkNTEzNjlkZGEzNDg4YmQyZTRlYmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuY3BwCkBAIC01MDI0LDYgKzUwMjQsNyBAQCBXZWJQYWdlQ3JlYXRpb25QYXJh bWV0ZXJzIFdlYlBhZ2VQcm94eTo6Y3JlYXRpb25QYXJhbWV0ZXJzKCkKICNlbHNlCiAgICAgcGFy YW1ldGVycy5hcHBsZU1haWxQYWdpbmF0aW9uUXVpcmtFbmFibGVkID0gZmFsc2U7CiAjZW5kaWYK KyAgICBwYXJhbWV0ZXJzLnNob3VsZFNjYWxlVmlld1RvRml0RG9jdW1lbnQgPSBtX3Nob3VsZFNj YWxlVmlld1RvRml0RG9jdW1lbnQ7CiAKICAgICByZXR1cm4gcGFyYW1ldGVyczsKIH0KQEAgLTU4 ODEsNCArNTg4MiwxNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6Y2xlYXJXaGVlbEV2ZW50VGVzdFRy aWdnZXIoKQogICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6Q2xlYXJXaGVl bEV2ZW50VGVzdFRyaWdnZXIoKSwgbV9wYWdlSUQpOwogfQogCit2b2lkIFdlYlBhZ2VQcm94eTo6 c2V0U2hvdWxkU2NhbGVWaWV3VG9GaXREb2N1bWVudChib29sIHNob3VsZFNjYWxlVmlld1RvRml0 RG9jdW1lbnQpCit7CisgICAgaWYgKG1fc2hvdWxkU2NhbGVWaWV3VG9GaXREb2N1bWVudCA9PSBz aG91bGRTY2FsZVZpZXdUb0ZpdERvY3VtZW50KQorICAgICAgICByZXR1cm47CisKKyAgICBtX3No b3VsZFNjYWxlVmlld1RvRml0RG9jdW1lbnQgPSBzaG91bGRTY2FsZVZpZXdUb0ZpdERvY3VtZW50 OworCisgICAgaWYgKCFpc1ZhbGlkKCkpCisgICAgICAgIHJldHVybjsKKworICAgIG1fcHJvY2Vz cy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6U2V0U2hvdWxkU2NhbGVWaWV3VG9GaXREb2N1bWVu dChzaG91bGRTY2FsZVZpZXdUb0ZpdERvY3VtZW50KSwgbV9wYWdlSUQpOworfQorCiB9IC8vIG5h bWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRl eCAyNDJiNDJhNGIzOWIzZjBlNjQ3N2ZlOGM2NTVkNzM2N2Y2ZmJkOWJjLi5mZjlhZjI0NTc4NDAx ZmM1OWIxYjhhZmIxMGU5NTQ4MzFhMmJlNzU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5oCkBAIC02NTUsNiArNjU1LDcgQEAgcHVibGljOgogI2lmIFBMQVRGT1JNKENP Q09BKQogICAgIHZvaWQgc2NhbGVWaWV3QW5kVXBkYXRlR2VvbWV0cnlGZW5jZWQoZG91YmxlIHNj YWxlLCBXZWJDb3JlOjpJbnRTaXplIHZpZXdTaXplLCBzdGQ6OmZ1bmN0aW9uPHZvaWQgKGNvbnN0 IFdlYkNvcmU6Ok1hY2hTZW5kUmlnaHQmLCBDYWxsYmFja0Jhc2U6OkVycm9yKT4pOwogI2VuZGlm CisgICAgdm9pZCBzZXRTaG91bGRTY2FsZVZpZXdUb0ZpdERvY3VtZW50KGJvb2wpOwogCiAgICAg ZmxvYXQgZGV2aWNlU2NhbGVGYWN0b3IoKSBjb25zdDsKICAgICB2b2lkIHNldEludHJpbnNpY0Rl dmljZVNjYWxlRmFjdG9yKGZsb2F0KTsKQEAgLTE3MTAsNyArMTcxMSw5IEBAIHByaXZhdGU6CiAg ICAgYm9vbCBtX21heVN0YXJ0TWVkaWFXaGVuSW5XaW5kb3c7CiAKICAgICBib29sIG1fd2FpdGlu Z0ZvckRpZFVwZGF0ZVZpZXdTdGF0ZTsKLSAgICAgICAgCisKKyAgICBib29sIG1fc2hvdWxkU2Nh bGVWaWV3VG9GaXREb2N1bWVudCB7IGZhbHNlIH07CisKICNpZiBQTEFURk9STShDT0NPQSkKICAg ICBIYXNoTWFwPFN0cmluZywgU3RyaW5nPiBtX3RlbXBvcmFyeVBERkZpbGVzOwogICAgIHN0ZDo6 dW5pcXVlX3B0cjxXZWJDb3JlOjpSdW5Mb29wT2JzZXJ2ZXI+IG1fdmlld1N0YXRlQ2hhbmdlRGlz cGF0Y2hlcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV0tWaWV3 TGF5b3V0U3RyYXRlZ3kubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dLVmlld0xh eW91dFN0cmF0ZWd5Lm1tCmluZGV4IDgwNDcyNTJmMmU4ZmIxOGQxNTU4OWY3NDMxNDBkM2QxYzA5 YjBlYTguLjc2MGVmZjdlMjUyOTQ5MjZlMDQ4OTA0ZTVjOTY0ZTA4MGRhYmMzZGMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV0tWaWV3TGF5b3V0U3RyYXRlZ3kubW0K KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XS1ZpZXdMYXlvdXRTdHJhdGVneS5t bQpAQCAtNTIsNiArNTIsOSBAQCB1c2luZyBuYW1lc3BhY2UgV2ViS2l0OwogfQogQGVuZAogCitA aW50ZXJmYWNlIFdLVmlld0R5bmFtaWNTaXplQ29tcHV0ZWRGcm9tTWluaW11bURvY3VtZW50U2l6 ZUxheW91dFN0cmF0ZWd5IDogV0tWaWV3TGF5b3V0U3RyYXRlZ3kKK0BlbmQKKwogQGltcGxlbWVu dGF0aW9uIFdLVmlld0xheW91dFN0cmF0ZWd5CiAKICsgKGluc3RhbmNldHlwZSlsYXlvdXRTdHJh dGVneVdpdGhQYWdlOihXZWJQYWdlUHJveHkmKXBhZ2UgdmlldzooV0tWaWV3ICopd2tWaWV3IG1v ZGU6KFdLTGF5b3V0TW9kZSltb2RlCkBAIC02OCw2ICs3MSw5IEBAIHVzaW5nIG5hbWVzcGFjZSBX ZWJLaXQ7CiAgICAgY2FzZSBrV0tMYXlvdXRNb2RlRHluYW1pY1NpemVXaXRoTWluaW11bVZpZXdT aXplOgogICAgICAgICBzdHJhdGVneSA9IFtbV0tWaWV3RHluYW1pY1NpemVXaXRoTWluaW11bVZp ZXdTaXplTGF5b3V0U3RyYXRlZ3kgYWxsb2NdIGluaXRXaXRoUGFnZTpwYWdlIHZpZXc6d2tWaWV3 IG1vZGU6bW9kZV07CiAgICAgICAgIGJyZWFrOworICAgIGNhc2Uga1dLTGF5b3V0TW9kZUR5bmFt aWNTaXplQ29tcHV0ZWRGcm9tTWluaW11bURvY3VtZW50U2l6ZToKKyAgICAgICAgc3RyYXRlZ3kg PSBbW1dLVmlld0R5bmFtaWNTaXplQ29tcHV0ZWRGcm9tTWluaW11bURvY3VtZW50U2l6ZUxheW91 dFN0cmF0ZWd5IGFsbG9jXSBpbml0V2l0aFBhZ2U6cGFnZSB2aWV3OndrVmlldyBtb2RlOm1vZGVd OworICAgICAgICBicmVhazsKICAgICBjYXNlIGtXS0xheW91dE1vZGVWaWV3U2l6ZToKICAgICBk ZWZhdWx0OgogICAgICAgICBzdHJhdGVneSA9IFtbV0tWaWV3Vmlld1NpemVMYXlvdXRTdHJhdGVn eSBhbGxvY10gaW5pdFdpdGhQYWdlOnBhZ2Ugdmlldzp3a1ZpZXcgbW9kZTptb2RlXTsKQEAgLTM3 NCw0ICszODAsMjkgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKIAogQGVuZAogCitAaW1wbGVt ZW50YXRpb24gV0tWaWV3RHluYW1pY1NpemVDb21wdXRlZEZyb21NaW5pbXVtRG9jdW1lbnRTaXpl TGF5b3V0U3RyYXRlZ3kKKworLSAoaW5zdGFuY2V0eXBlKWluaXRXaXRoUGFnZTooV2ViUGFnZVBy b3h5JilwYWdlIHZpZXc6KFdLVmlldyAqKXdrVmlldyBtb2RlOihXS0xheW91dE1vZGUpbW9kZQor eworICAgIHNlbGYgPSBbc3VwZXIgaW5pdFdpdGhQYWdlOnBhZ2Ugdmlldzp3a1ZpZXcgbW9kZTpt b2RlXTsKKworICAgIGlmICghc2VsZikKKyAgICAgICAgcmV0dXJuIG5pbDsKKworICAgIF9wYWdl LT5zZXRTaG91bGRTY2FsZVZpZXdUb0ZpdERvY3VtZW50KHRydWUpOworCisgICAgcmV0dXJuIHNl bGY7Cit9CisKKy0gKHZvaWQpdXBkYXRlTGF5b3V0Cit7Cit9CisKKy0gKHZvaWQpd2lsbENoYW5n ZUxheW91dFN0cmF0ZWd5Cit7CisgICAgX3BhZ2UtPnNldFNob3VsZFNjYWxlVmlld1RvRml0RG9j dW1lbnQoZmFsc2UpOworfQorCitAZW5kCisKICNlbmRpZiAvLyBQTEFURk9STShNQUMpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWEuaCBi L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYS5oCmluZGV4IDcy NmM1NzQ5Y2E0MjJiZTEwY2Q2NzBlYmZiY2ZlMDUwMGE5MmI2NTUuLmVmZjQzNDY4YmNlZjcxYTA0 MDUyNzZmNTBkNjcwMTc2ZWRlYWQ4MGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9EcmF3aW5nQXJlYS5oCkBAIC0xMjYsNiArMTI2LDggQEAgcHVibGljOgogCiAg ICAgdmlydHVhbCB2b2lkIGF0dGFjaFZpZXdPdmVybGF5R3JhcGhpY3NMYXllcihXZWJDb3JlOjpG cmFtZSosIFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXIqKSB7IH0KIAorICAgIHZpcnR1YWwgdm9pZCBz ZXRTaG91bGRTY2FsZVZpZXdUb0ZpdERvY3VtZW50KGJvb2wpIHsgfQorCiAjaWYgUExBVEZPUk0o Q09DT0EpCiAgICAgLy8gVXNlZCBieSBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS4KICAg ICB2aXJ0dWFsIHZvaWQgdXBkYXRlR2VvbWV0cnkoY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgdmll d1NpemUsIGNvbnN0IFdlYkNvcmU6OkludFNpemUmIGxheWVyUG9zaXRpb24sIGJvb2wgZmx1c2hT eW5jaHJvbm91c2x5KSB7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9X ZWJQYWdlLmNwcAppbmRleCBkZTRmNGUyYmU3OTdkYmZiYzExMzNiNDE2MTBhYzNlYWVmOWQwOTE4 Li43ZTYwMGRmMzlmYjRhNDgyNjcwNmU1M2E5NzkyYWNkMmE3ODc4MTFjIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKKysrIGIvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCkBAIC0zODEsNiArMzgxLDcg QEAgV2ViUGFnZTo6V2ViUGFnZSh1aW50NjRfdCBwYWdlSUQsIGNvbnN0IFdlYlBhZ2VDcmVhdGlv blBhcmFtZXRlcnMmIHBhcmFtZXRlcnMpCiAKICAgICBtX2RyYXdpbmdBcmVhID0gRHJhd2luZ0Fy ZWE6OmNyZWF0ZSgqdGhpcywgcGFyYW1ldGVycyk7CiAgICAgbV9kcmF3aW5nQXJlYS0+c2V0UGFp bnRpbmdFbmFibGVkKGZhbHNlKTsKKyAgICBtX2RyYXdpbmdBcmVhLT5zZXRTaG91bGRTY2FsZVZp ZXdUb0ZpdERvY3VtZW50KHBhcmFtZXRlcnMuc2hvdWxkU2NhbGVWaWV3VG9GaXREb2N1bWVudCk7 CiAKICNpZiBFTkFCTEUoQVNZTkNfU0NST0xMSU5HKQogICAgIG1fdXNlQXN5bmNTY3JvbGxpbmcg PSBwYXJhbWV0ZXJzLnN0b3JlLmdldEJvb2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6 dGhyZWFkZWRTY3JvbGxpbmdFbmFibGVkS2V5KCkpOwpAQCAtNDk1NCw0ICs0OTU1LDEyIEBAIHZv aWQgV2ViUGFnZTo6Y2xlYXJXaGVlbEV2ZW50VGVzdFRyaWdnZXIoKQogICAgIG1fcGFnZS0+Y2xl YXJUcmlnZ2VyKCk7CiB9CiAKK3ZvaWQgV2ViUGFnZTo6c2V0U2hvdWxkU2NhbGVWaWV3VG9GaXRE b2N1bWVudChib29sIHNob3VsZFNjYWxlVmlld1RvRml0RG9jdW1lbnQpCit7CisgICAgaWYgKCFt X2RyYXdpbmdBcmVhKQorICAgICAgICByZXR1cm47CisKKyAgICBtX2RyYXdpbmdBcmVhLT5zZXRT aG91bGRTY2FsZVZpZXdUb0ZpdERvY3VtZW50KHNob3VsZFNjYWxlVmlld1RvRml0RG9jdW1lbnQp OworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYlBhZ2UvV2ViUGFnZS5oCmluZGV4IDJiZjkxMTk1ZGE3ODdlNWVhZjNlODRkYWUyMTM5YmI3 ZjRmMTI1NzAuLjM5M2YyYzU0NGIwM2U2NTMwZjc3ZGJjYTlmMWQ5Zjk5YTliMDRmZjYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKKysrIGIv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaApAQCAtMTEyOSw2ICsx MTI5LDggQEAgcHJpdmF0ZToKIAogICAgIHZvaWQgY2xlYXJXaGVlbEV2ZW50VGVzdFRyaWdnZXIo KTsKIAorICAgIHZvaWQgc2V0U2hvdWxkU2NhbGVWaWV3VG9GaXREb2N1bWVudChib29sKTsKKwog ICAgIHVpbnQ2NF90IG1fcGFnZUlEOwogCiAgICAgc3RkOjp1bmlxdWVfcHRyPFdlYkNvcmU6OlBh Z2U+IG1fcGFnZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFn ZS9XZWJQYWdlLm1lc3NhZ2VzLmluIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L1dlYlBhZ2UubWVzc2FnZXMuaW4KaW5kZXggZGM0NGY3MjRkYTdhNmQ1YWEyNThlOTQwNGY2ZWM3 ZWFlZjQwMjAzYi4uMzFhNDM2YjNlNjJjNzU4MjhmNjA1YzIwYjk3MmIyZWMwN2I2MWFiYyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2Fn ZXMuaW4KKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVz c2FnZXMuaW4KQEAgLTQzMyw0ICs0MzMsNSBAQCBtZXNzYWdlcyAtPiBXZWJQYWdlIExlZ2FjeVJl Y2VpdmVyIHsKICNlbmRpZgogCiAgICAgQ2xlYXJXaGVlbEV2ZW50VGVzdFRyaWdnZXIoKQorICAg IFNldFNob3VsZFNjYWxlVmlld1RvRml0RG9jdW1lbnQoYm9vbCBzaG91bGRTY2FsZVZpZXdUb0Zp dERvY3VtZW50KQogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQ YWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5oIGIvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5oCmlu ZGV4IDlkNTFmZDhmZGM1ODIxMjY4ODY2MTcwZTgzMmY3NDU2M2M0MGEzMDIuLmJhZWQ1ZjczMzI4 NjhmMjk2MzY5NTQ4M2ZmMjc1M2YzYmY0ZjU0NGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEuaAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1h dGlvbkRyYXdpbmdBcmVhLmgKQEAgLTEwMCw2ICsxMDAsOCBAQCBwcml2YXRlOgogICAgIHZpcnR1 YWwgdm9pZCBzZXRDb2xvclNwYWNlKGNvbnN0IENvbG9yU3BhY2VEYXRhJikgb3ZlcnJpZGU7CiAg ICAgdmlydHVhbCB2b2lkIGFkZEZlbmNlKGNvbnN0IFdlYkNvcmU6Ok1hY2hTZW5kUmlnaHQmKSBv dmVycmlkZTsKIAorICAgIHZpcnR1YWwgdm9pZCBzZXRTaG91bGRTY2FsZVZpZXdUb0ZpdERvY3Vt ZW50KGJvb2wpIG92ZXJyaWRlOworCiAgICAgdmlydHVhbCB2b2lkIGFkanVzdFRyYW5zaWVudFpv b20oZG91YmxlIHNjYWxlLCBXZWJDb3JlOjpGbG9hdFBvaW50IG9yaWdpbikgb3ZlcnJpZGU7CiAg ICAgdmlydHVhbCB2b2lkIGNvbW1pdFRyYW5zaWVudFpvb20oZG91YmxlIHNjYWxlLCBXZWJDb3Jl OjpGbG9hdFBvaW50IG9yaWdpbikgb3ZlcnJpZGU7CiAgICAgdm9pZCBhcHBseVRyYW5zaWVudFpv b21Ub1BhZ2UoZG91YmxlIHNjYWxlLCBXZWJDb3JlOjpGbG9hdFBvaW50IG9yaWdpbik7CkBAIC0x MTgsNiArMTIwLDcgQEAgcHJpdmF0ZToKIAogICAgIHZvaWQgdXBkYXRlSW50cmluc2ljQ29udGVu dFNpemVJZk5lZWRlZCgpOwogICAgIHZvaWQgdXBkYXRlU2Nyb2xsZWRFeHBvc2VkUmVjdCgpOwor ICAgIHZvaWQgc2NhbGVWaWV3VG9GaXREb2N1bWVudElmTmVlZGVkKCk7CiAKICAgICBib29sIG1f bGF5ZXJUcmVlU3RhdGVJc0Zyb3plbjsKICAgICBXZWJDb3JlOjpMYXllckZsdXNoU2NoZWR1bGVy IG1fbGF5ZXJGbHVzaFNjaGVkdWxlcjsKQEAgLTE1MCw2ICsxNTMsMTAgQEAgcHJpdmF0ZToKICAg ICBXZWJDb3JlOjpHcmFwaGljc0xheWVyKiBtX3ZpZXdPdmVybGF5Um9vdExheWVyOwogCiAgICAg VmVjdG9yPHVpbnQ2NF90PiBtX2ZlbmNlQ2FsbGJhY2tzRm9yQWZ0ZXJOZXh0Rmx1c2g7CisgICAg Ym9vbCBtX3Nob3VsZFNjYWxlVmlld1RvRml0RG9jdW1lbnQgeyBmYWxzZSB9OworCisgICAgV2Vi Q29yZTo6SW50U2l6ZSBtX2xhc3RWaWV3U2l6ZUZvclNjYWxlVG9GaXQ7CisgICAgV2ViQ29yZTo6 SW50U2l6ZSBtX2xhc3REb2N1bWVudFNpemVGb3JTY2FsZVRvRml0OwogfTsKIAogfSAvLyBuYW1l c3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tIGIvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbQpp bmRleCAyY2JiYzYxYjFjMjM4YWQ3ZjE4M2Y3ZDY5MGNlZDkyZGYzYWU0Yzk3Li5mODBiOGVjZTlj Y2ZlNDU2YzgzNTEyZTcyM2E2ZmU2YWQyMTE0YTg0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1t CisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5p bWF0aW9uRHJhd2luZ0FyZWEubW0KQEAgLTI2MSw2ICsyNjEsNTQgQEAgdm9pZCBUaWxlZENvcmVB bmltYXRpb25EcmF3aW5nQXJlYTo6dXBkYXRlSW50cmluc2ljQ29udGVudFNpemVJZk5lZWRlZCgp CiAgICAgbV93ZWJQYWdlLnNlbmQoTWVzc2FnZXM6OkRyYXdpbmdBcmVhUHJveHk6OkludHJpbnNp Y0NvbnRlbnRTaXplRGlkQ2hhbmdlKGNvbnRlbnRTaXplKSk7CiB9CiAKK3ZvaWQgVGlsZWRDb3Jl QW5pbWF0aW9uRHJhd2luZ0FyZWE6OnNldFNob3VsZFNjYWxlVmlld1RvRml0RG9jdW1lbnQoYm9v bCBzaG91bGRTY2FsZVZpZXcpCit7CisgICAgaWYgKG1fc2hvdWxkU2NhbGVWaWV3VG9GaXREb2N1 bWVudCA9PSBzaG91bGRTY2FsZVZpZXcpCisgICAgICAgIHJldHVybjsKKworICAgIG1fc2hvdWxk U2NhbGVWaWV3VG9GaXREb2N1bWVudCA9IHNob3VsZFNjYWxlVmlldzsKKyAgICBzY2hlZHVsZUNv bXBvc2l0aW5nTGF5ZXJGbHVzaCgpOworfQorCit2b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdp bmdBcmVhOjpzY2FsZVZpZXdUb0ZpdERvY3VtZW50SWZOZWVkZWQoKQoreworICAgIC8vIEZJWE1F OiBEZWZlciBzY3JvbGxiYXIgZmxhc2hpbmcgdW50aWwgYWZ0ZXIgdGhlIHNlY29uZCBsYXlvdXQu CisKKyAgICBjb25zdCBpbnQgbWF4aW11bURvY3VtZW50V2lkdGhGb3JTY2FsaW5nID0gMTQ0MDsK KyAgICBjb25zdCBmbG9hdCBtaW5pbXVtVmlld1NjYWxlID0gMC4xOworCisgICAgaWYgKCFtX3No b3VsZFNjYWxlVmlld1RvRml0RG9jdW1lbnQpCisgICAgICAgIHJldHVybjsKKworICAgIGlmICgh bV93ZWJQYWdlLm1haW5GcmFtZSgpLT52aWV3KCktPm5lZWRzTGF5b3V0KCkgJiYgbV9sYXN0RG9j dW1lbnRTaXplRm9yU2NhbGVUb0ZpdCA9PSBtX3dlYlBhZ2UubWFpbkZyYW1lVmlldygpLT5yZW5k ZXJWaWV3KCktPnVuc2NhbGVkRG9jdW1lbnRSZWN0KCkuc2l6ZSgpICYmIG1fbGFzdFZpZXdTaXpl Rm9yU2NhbGVUb0ZpdCA9PSBtX3dlYlBhZ2Uuc2l6ZSgpKQorICAgICAgICByZXR1cm47CisKKyAg ICAvLyBMYXkgb3V0IGF0IHRoZSB2aWV3IHNpemUuCisgICAgbV93ZWJQYWdlLnNldFVzZUZpeGVk TGF5b3V0KGZhbHNlKTsKKyAgICBtX3dlYlBhZ2UubGF5b3V0SWZOZWVkZWQoKTsKKworICAgIElu dFNpemUgZG9jdW1lbnRTaXplID0gbV93ZWJQYWdlLm1haW5GcmFtZVZpZXcoKS0+cmVuZGVyVmll dygpLT51bnNjYWxlZERvY3VtZW50UmVjdCgpLnNpemUoKTsKKyAgICBtX2xhc3RWaWV3U2l6ZUZv clNjYWxlVG9GaXQgPSBtX3dlYlBhZ2Uuc2l6ZSgpOworICAgIG1fbGFzdERvY3VtZW50U2l6ZUZv clNjYWxlVG9GaXQgPSBkb2N1bWVudFNpemU7CisKKyAgICBpbnQgZG9jdW1lbnRXaWR0aCA9IGRv Y3VtZW50U2l6ZS53aWR0aCgpOworICAgIGludCB2aWV3V2lkdGggPSBtX3dlYlBhZ2Uuc2l6ZSgp LndpZHRoKCk7CisKKyAgICBmbG9hdCB2aWV3U2NhbGUgPSAxOworCisgICAgLy8gQXZvaWQgc2Nh bGluZyBkb3duIGRvY3VtZW50cyB0aGF0IGRvbid0IGZpdCBpbiBhIGNlcnRhaW4gd2lkdGgsIHRv IGFsbG93CisgICAgLy8gc2l0ZXMgdGhhdCB3YW50IGhvcml6b250YWwgc2Nyb2xsYmFycyB0byBj b250aW51ZSB0byBoYXZlIHRoZW0uCisgICAgaWYgKGRvY3VtZW50V2lkdGggPCBtYXhpbXVtRG9j dW1lbnRXaWR0aEZvclNjYWxpbmcgJiYgdmlld1dpZHRoIDwgZG9jdW1lbnRXaWR0aCkgeworICAg ICAgICAvLyBJZiB0aGUgZG9jdW1lbnQgZG9lc24ndCBmaXQgaW4gdGhlIHZpZXcsIHNjYWxlIGl0 IGRvd24gYnV0IGxheSBvdXQgYXQgdGhlIHZpZXcgc2l6ZS4KKyAgICAgICAgbV93ZWJQYWdlLnNl dFVzZUZpeGVkTGF5b3V0KHRydWUpOworICAgICAgICB2aWV3U2NhbGUgPSAoZmxvYXQpdmlld1dp ZHRoIC8gKGZsb2F0KWRvY3VtZW50V2lkdGg7CisgICAgICAgIHZpZXdTY2FsZSA9IHN0ZDo6bWF4 KHZpZXdTY2FsZSwgbWluaW11bVZpZXdTY2FsZSk7CisgICAgICAgIG1fd2ViUGFnZS5zZXRGaXhl ZExheW91dFNpemUoSW50U2l6ZShjZWlsZihtX3dlYlBhZ2Uuc2l6ZSgpLndpZHRoKCkgLyB2aWV3 U2NhbGUpLCBtX3dlYlBhZ2Uuc2l6ZSgpLmhlaWdodCgpKSk7CisgICAgfQorCisgICAgbV93ZWJQ YWdlLnNjYWxlVmlldyh2aWV3U2NhbGUpOworfQorCiB2b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRy YXdpbmdBcmVhOjpkaXNwYXRjaEFmdGVyRW5zdXJpbmdVcGRhdGVkU2Nyb2xsUG9zaXRpb24oc3Rk OjpmdW5jdGlvbjx2b2lkICgpPiBmdW5jdGlvbikKIHsKICNpZiBFTkFCTEUoQVNZTkNfU0NST0xM SU5HKQpAQCAtMzAyLDYgKzM1MCw4IEBAIGJvb2wgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0Fy ZWE6OmZsdXNoTGF5ZXJzKCkKICAgICBBU1NFUlQoIW1fbGF5ZXJUcmVlU3RhdGVJc0Zyb3plbik7 CiAKICAgICBAYXV0b3JlbGVhc2Vwb29sIHsKKyAgICAgICAgc2NhbGVWaWV3VG9GaXREb2N1bWVu dElmTmVlZGVkKCk7CisKICAgICAgICAgbV93ZWJQYWdlLmxheW91dElmTmVlZGVkKCk7CiAKICAg ICAgICAgdXBkYXRlSW50cmluc2ljQ29udGVudFNpemVJZk5lZWRlZCgpOwpkaWZmIC0tZ2l0IGEv VG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDE4NTk1M2NjYTRjYmQ1Y2Zk MWEyNzFkYWQwNGFiMDZkOTAyNTlhY2MuLmI2YjM1OWNjMzYxOTI2NTg4YWM2MDQzYWU5MDE1MWNj ZDk2ZDc5MzYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxOCBAQAorMjAxNS0wNS0xNCAgVGltb3RoeSBIb3J0b24gIDx0aW1vdGh5 X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIGEgbGF5b3V0IG1vZGUgdGhhdCBzY2Fs ZXMgZG93biB0aGUgdmlldyB0byB0cnkgdG8gZml0IHRoZSBkb2N1bWVudAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ1MDIyCisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS8xOTc5MDM0MT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIE1pbmlCcm93c2VyL21hYy9Ccm93c2VyV2luZG93LnhpYjoKKyAgICAg ICAgKiBNaW5pQnJvd3Nlci9tYWMvQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIuaDoKKyAgICAgICAg KiBNaW5pQnJvd3Nlci9tYWMvV0syQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIubToKKyAgICAgICAg KC1bV0syQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIgdG9nZ2xlU2hyaW5rVG9GaXQ6XSk6CisgICAg ICAgICgtW1dLMkJyb3dzZXJXaW5kb3dDb250cm9sbGVyIHRvZ2dsZVVzZU1pbmltdW1WaWV3U2l6 ZTpdKTogRGVsZXRlZC4KKyAgICAgICAgU3dpdGNoIHRvIF9XS0xheW91dE1vZGVEeW5hbWljU2l6 ZUNvbXB1dGVkRnJvbU1pbmltdW1Eb2N1bWVudFNpemUuCisKIDIwMTUtMDUtMTIgIFJ5b3N1a2Ug Tml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCBidWlsZCBmaXgu CmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9tYWMvQnJvd3NlcldpbmRvdy54aWIgYi9U b29scy9NaW5pQnJvd3Nlci9tYWMvQnJvd3NlcldpbmRvdy54aWIKaW5kZXggYjNhZmM3ODVmMmI4 OTcwMzI4ODRmMzZjOGRmNGZmYjM2ZWMzOWZjNC4uODllZTU3NTU4YjYwMmNlNjkzMzE5NTczMjFj MDc5MTA0NjE5YjY2MyAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvbWFjL0Jyb3dzZXJX aW5kb3cueGliCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL21hYy9Ccm93c2VyV2luZG93LnhpYgpA QCAtMTIsNyArMTIsNiBAQAogICAgICAgICAgICAgICAgIDxvdXRsZXQgcHJvcGVydHk9ImZvcndh cmRCdXR0b24iIGRlc3RpbmF0aW9uPSI0MiIgaWQ9IjQ3Ii8+CiAgICAgICAgICAgICAgICAgPG91 dGxldCBwcm9wZXJ0eT0icHJvZ3Jlc3NJbmRpY2F0b3IiIGRlc3RpbmF0aW9uPSIyMSIgaWQ9IjMz Ii8+CiAgICAgICAgICAgICAgICAgPG91dGxldCBwcm9wZXJ0eT0icmVsb2FkQnV0dG9uIiBkZXN0 aW5hdGlvbj0iMjMiIGlkPSIzNCIvPgotICAgICAgICAgICAgICAgIDxvdXRsZXQgcHJvcGVydHk9 InRvZ2dsZVVzZU1pbmltdW1WaWV3U2l6ZUJ1dHRvbiIgZGVzdGluYXRpb249IjgyIiBpZD0iRlRa LVlLLUFlNSIvPgogICAgICAgICAgICAgICAgIDxvdXRsZXQgcHJvcGVydHk9InRvb2xiYXIiIGRl c3RpbmF0aW9uPSI0OCIgaWQ9IjY3Ii8+CiAgICAgICAgICAgICAgICAgPG91dGxldCBwcm9wZXJ0 eT0idXJsVGV4dCIgZGVzdGluYXRpb249IjEwIiBpZD0iMzIiLz4KICAgICAgICAgICAgICAgICA8 b3V0bGV0IHByb3BlcnR5PSJ3aW5kb3ciIGRlc3RpbmF0aW9uPSIxIiBpZD0iMyIvPgpAQCAtODUs NyArODQsNyBAQAogICAgICAgICAgICAgICAgICAgICAgICAgICAgIDwvY29ubmVjdGlvbnM+CiAg ICAgICAgICAgICAgICAgICAgICAgICA8L2J1dHRvbj4KICAgICAgICAgICAgICAgICAgICAgPC90 b29sYmFySXRlbT4KLSAgICAgICAgICAgICAgICAgICAgPHRvb2xiYXJJdGVtIGltcGxpY2l0SXRl bUlkZW50aWZpZXI9Ijc2RENGMkIwLTFEREUtNDdEMi05MjEyLTcwNUU2RTMxMENDRSIgbGFiZWw9 IlVzZSBNaW5pbXVtIFZpZXcgU2l6ZSIgcGFsZXR0ZUxhYmVsPSJVc2UgTWluaW11bSBWaWV3IFNp emUiIGltYWdlPSJOU0VudGVyRnVsbFNjcmVlblRlbXBsYXRlIiBpZD0iODEiIGN1c3RvbUNsYXNz PSJNQlRvb2xiYXJJdGVtIj4KKyAgICAgICAgICAgICAgICAgICAgPHRvb2xiYXJJdGVtIGltcGxp Y2l0SXRlbUlkZW50aWZpZXI9Ijc2RENGMkIwLTFEREUtNDdEMi05MjEyLTcwNUU2RTMxMENDRSIg bGFiZWw9IlVzZSBTaHJpbmsgVG8gRml0IiBwYWxldHRlTGFiZWw9IlVzZSBTaHJpbmsgVG8gRml0 IiBpbWFnZT0iTlNFbnRlckZ1bGxTY3JlZW5UZW1wbGF0ZSIgaWQ9IjgxIiBjdXN0b21DbGFzcz0i TUJUb29sYmFySXRlbSI+CiAgICAgICAgICAgICAgICAgICAgICAgICA8bmlsIGtleT0idG9vbFRp cCIvPgogICAgICAgICAgICAgICAgICAgICAgICAgPHNpemUga2V5PSJtaW5TaXplIiB3aWR0aD0i MjkiIGhlaWdodD0iMjUiLz4KICAgICAgICAgICAgICAgICAgICAgICAgIDxzaXplIGtleT0ibWF4 U2l6ZSIgd2lkdGg9IjI5IiBoZWlnaHQ9IjI1Ii8+CkBAIC05Niw2ICs5NSw5IEBACiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIDxiZWhhdmlvciBrZXk9ImJlaGF2aW9yIiBwdXNoSW49 IllFUyIgbGlnaHRCeUJhY2tncm91bmQ9IllFUyIgbGlnaHRCeUdyYXk9IllFUyIvPgogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICA8Zm9udCBrZXk9ImZvbnQiIG1ldGFGb250PSJzeXN0 ZW0iLz4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8L2J1dHRvbkNlbGw+CisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgPGNvbm5lY3Rpb25zPgorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICA8YWN0aW9uIHNlbGVjdG9yPSJ0b2dnbGVTaHJpbmtUb0ZpdDoiIHRhcmdldD0i LTIiIGlkPSJncDctVmstS1RJIi8+CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgPC9jb25u ZWN0aW9ucz4KICAgICAgICAgICAgICAgICAgICAgICAgIDwvYnV0dG9uPgogICAgICAgICAgICAg ICAgICAgICAgICAgPGNvbm5lY3Rpb25zPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxh Y3Rpb24gc2VsZWN0b3I9InRvZ2dsZVVzZU1pbmltdW1WaWV3U2l6ZToiIHRhcmdldD0iLTIiIGlk PSJnWkEteVMtN0w0Ii8+CmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9tYWMvQnJvd3Nl cldpbmRvd0NvbnRyb2xsZXIuaCBiL1Rvb2xzL01pbmlCcm93c2VyL21hYy9Ccm93c2VyV2luZG93 Q29udHJvbGxlci5oCmluZGV4IGFkODUwMmZkNjA3ZGQzNDMxNDU3ZGQ0YjIxZmFjNDg2ZTQ0Mzc5 MTcuLjlkM2Y0YWMyMTQ1N2Q3OWMyNWExOTkyZDI4ZDUxYWI2NTBhZDBkMzkgMTAwNjQ0Ci0tLSBh L1Rvb2xzL01pbmlCcm93c2VyL21hYy9Ccm93c2VyV2luZG93Q29udHJvbGxlci5oCisrKyBiL1Rv b2xzL01pbmlCcm93c2VyL21hYy9Ccm93c2VyV2luZG93Q29udHJvbGxlci5oCkBAIC00Nyw3ICs0 Nyw3IEBACiAKIC0gKElCQWN0aW9uKXNldFNjYWxlOihpZClzZW5kZXI7CiAKLS0gKElCQWN0aW9u KXRvZ2dsZVVzZU1pbmltdW1WaWV3U2l6ZTooaWQpc2VuZGVyOworLSAoSUJBY3Rpb24pdG9nZ2xl U2hyaW5rVG9GaXQ6KGlkKXNlbmRlcjsKIAogLSAoSUJBY3Rpb24pZHVtcFNvdXJjZVRvQ29uc29s ZTooaWQpc2VuZGVyOwogLSAoSUJBY3Rpb24pZmluZDooaWQpc2VuZGVyOwpkaWZmIC0tZ2l0IGEv VG9vbHMvTWluaUJyb3dzZXIvbWFjL1dLMUJyb3dzZXJXaW5kb3dDb250cm9sbGVyLm0gYi9Ub29s cy9NaW5pQnJvd3Nlci9tYWMvV0sxQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIubQppbmRleCBkMDVl ZTk1YzNlYmJjYWRmYzQ4MDVkNzdjYThkM2E2OTViNGRhMGUyLi42NTU4NGVhN2MyMTU3MDJmZDFi ZjEzMWRjMTFhYTIyMjU0NDBkNmQ1IDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9tYWMv V0sxQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIubQorKysgYi9Ub29scy9NaW5pQnJvd3Nlci9tYWMv V0sxQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIubQpAQCAtMjI5LDcgKzIyOSw3IEBAIC0gKElCQWN0 aW9uKXRvZ2dsZVpvb21Nb2RlOihpZClzZW5kZXIKICAgICBfem9vbVRleHRPbmx5ID0gIV96b29t VGV4dE9ubHk7CiB9CiAKLS0gKElCQWN0aW9uKXRvZ2dsZVVzZU1pbmltdW1WaWV3U2l6ZTooaWQp c2VuZGVyCistIChJQkFjdGlvbil0b2dnbGVTaHJpbmtUb0ZpdDooaWQpc2VuZGVyCiB7CiAKIH0K ZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL21hYy9XSzJCcm93c2VyV2luZG93Q29udHJv bGxlci5tIGIvVG9vbHMvTWluaUJyb3dzZXIvbWFjL1dLMkJyb3dzZXJXaW5kb3dDb250cm9sbGVy Lm0KaW5kZXggNTNiOTcyMzU3N2ViZGY4M2NlMTBmZDVmNGM2ZjM1ODY1MjNmODA2Ni4uZmZhMmVk YzVkNWU2MDkxMDliNWI5NTMyMmRkN2I1OTBiMWNkNjQ3YyAxMDA2NDQKLS0tIGEvVG9vbHMvTWlu aUJyb3dzZXIvbWFjL1dLMkJyb3dzZXJXaW5kb3dDb250cm9sbGVyLm0KKysrIGIvVG9vbHMvTWlu aUJyb3dzZXIvbWFjL1dLMkJyb3dzZXJXaW5kb3dDb250cm9sbGVyLm0KQEAgLTQ4LDcgKzQ4LDcg QEAgQGltcGxlbWVudGF0aW9uIFdLMkJyb3dzZXJXaW5kb3dDb250cm9sbGVyIHsKICAgICBCT09M IF96b29tVGV4dE9ubHk7CiAgICAgQk9PTCBfaXNQcml2YXRlQnJvd3NpbmdXaW5kb3c7CiAKLSAg ICBCT09MIF91c2VNaW5pbXVtVmlld1NpemU7CisgICAgQk9PTCBfdXNlU2hyaW5rVG9GaXQ7CiB9 CiAKIC0gKHZvaWQpYXdha2VGcm9tTmliCkBAIC0yMzcsMTIgKzIzNywxMSBAQCAtIChCT09MKWNh blJlc2V0Wm9vbQogICAgIHJldHVybiBfem9vbVRleHRPbmx5ID8gKF93ZWJWaWV3Ll90ZXh0Wm9v bUZhY3RvciAhPSAxKSA6IChfd2ViVmlldy5fcGFnZVpvb21GYWN0b3IgIT0gMSk7CiB9CiAKLS0g KElCQWN0aW9uKXRvZ2dsZVVzZU1pbmltdW1WaWV3U2l6ZTooaWQpc2VuZGVyCistIChJQkFjdGlv bil0b2dnbGVTaHJpbmtUb0ZpdDooaWQpc2VuZGVyCiB7Ci0gICAgX3VzZU1pbmltdW1WaWV3U2l6 ZSA9ICFfdXNlTWluaW11bVZpZXdTaXplOwotICAgIHRvZ2dsZVVzZU1pbmltdW1WaWV3U2l6ZUJ1 dHRvbi5pbWFnZSA9IF91c2VNaW5pbXVtVmlld1NpemUgPyBbTlNJbWFnZSBpbWFnZU5hbWVkOkAi TlNFeGl0RnVsbFNjcmVlblRlbXBsYXRlIl0gOiBbTlNJbWFnZSBpbWFnZU5hbWVkOkAiTlNFbnRl ckZ1bGxTY3JlZW5UZW1wbGF0ZSJdOwotICAgIFtfd2ViVmlldyBfc2V0TWluaW11bVZpZXdTaXpl OkNHU2l6ZU1ha2UoMTAyNCwgMCldOwotICAgIFtfd2ViVmlldyBfc2V0TGF5b3V0TW9kZTpfdXNl TWluaW11bVZpZXdTaXplID8gX1dLTGF5b3V0TW9kZUR5bmFtaWNTaXplV2l0aE1pbmltdW1WaWV3 U2l6ZSA6IF9XS0xheW91dE1vZGVWaWV3U2l6ZV07CisgICAgX3VzZVNocmlua1RvRml0ID0gIV91 c2VTaHJpbmtUb0ZpdDsKKyAgICB0b2dnbGVVc2VNaW5pbXVtVmlld1NpemVCdXR0b24uaW1hZ2Ug PSBfdXNlU2hyaW5rVG9GaXQgPyBbTlNJbWFnZSBpbWFnZU5hbWVkOkAiTlNFeGl0RnVsbFNjcmVl blRlbXBsYXRlIl0gOiBbTlNJbWFnZSBpbWFnZU5hbWVkOkAiTlNFbnRlckZ1bGxTY3JlZW5UZW1w bGF0ZSJdOworICAgIFtfd2ViVmlldyBfc2V0TGF5b3V0TW9kZTpfdXNlU2hyaW5rVG9GaXQgPyBf V0tMYXlvdXRNb2RlRHluYW1pY1NpemVDb21wdXRlZEZyb21NaW5pbXVtRG9jdW1lbnRTaXplIDog X1dLTGF5b3V0TW9kZVZpZXdTaXplXTsKIH0KIAogLSAoSUJBY3Rpb24pZHVtcFNvdXJjZVRvQ29u c29sZTooaWQpc2VuZGVyCg==