75601 2012-01-04 21:42:01 -0800 [Chromium] ImageDocument should have a viewport width equal to the image's instrinsic width 2013-04-12 07:55:41 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED WONTFIX P2 Normal --- 70559 1 fsamuel fsamuel aelias epenner fishd johnme klobag rjkroege schenney oldest_to_newest 529996 0 fsamuel 2012-01-04 21:42:01 -0800 [Chromium] ImageDocument should have a viewport width equal to the image's instrinsic width 529997 1 121213 fsamuel 2012-01-04 21:42:20 -0800 Created attachment 121213 Patch 529998 2 fsamuel 2012-01-04 21:43:45 -0800 This is not the final version of the patch, I plan to move some of this code to ChromeClientImpl but I thought I'd upload a working version now to see if this is along the lines of what people wanted. Thanks. 530024 3 121213 klobag 2012-01-04 23:14:50 -0800 Comment on attachment 121213 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=121213&action=review > Source/WebCore/html/ImageDocument.cpp:211 > + rootElement->appendChild(body, ec); Any reason change this? > Source/WebCore/html/ImageDocument.cpp:299 > + viewport->setAttribute(contentAttr, String::format("width=%d", imageSize.width())); Shouldn't metatag be the child of <head>? Should we make sure that this is only added once? 530289 4 121213 fsamuel 2012-01-05 08:02:49 -0800 Comment on attachment 121213 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=121213&action=review >> Source/WebCore/html/ImageDocument.cpp:299 >> + viewport->setAttribute(contentAttr, String::format("width=%d", imageSize.width())); > > Shouldn't metatag be the child of <head>? > > Should we make sure that this is only added once? imageUpdated seems to be guarded by m_imageSizeIsKnown and so this should be called only once but I'm not 100% sure. I've uploaded an updated patch that moves this code to ChromeClientImpl. Also, this works, so I'm not sure what the value is of adding a head tag to an internal document type? The functionality would not change. 530290 5 121279 fsamuel 2012-01-05 08:03:11 -0800 Created attachment 121279 Patch 530406 6 fsamuel 2012-01-05 10:35:46 -0800 I'm not sure who to get to review this patch. Added fishd. 530832 7 epenner 2012-01-05 17:31:46 -0800 Can you briefly explain why we want the viewport to be the size of the image rather than resizing the image? It seems that for small images you would want to use width=device-width, in order for the image to be shown at the same size across devices, while not zooming in too much on very small images. Also, what is the purpose of some code being in Chrome/ChromeClient instead of directly in ImageDocument.cpp? Is this for implementing chrome specific behavior? 562124 8 johnme 2012-02-22 10:36:55 -0800 (In reply to comment #7) > Can you briefly explain why we want the viewport to be the size of the image rather than resizing the image? It seems that for small images you would want to use width=device-width, in order for the image to be shown at the same size across devices, while not zooming in too much on very small images. Yeah, width=device-width does make more sense for small images. A simple way to get the desired behavior (large images fit to width, but small ones are shown at devicePixelRatio) would be: <meta name="viewport" content="width=device-width"> ... <img src="..." style="max-width: 100%;"> This should still allow you to pinch-zoom in on large images; unfortunately double-tapping on the image probably won't do anything useful (for example Chrome for Android fits the double-tapped block to the screen width, which would have no effect). I can't think of a sensible double-tap behavior that would fix this either, so we might need to special-case double-tapping on ImageDocument :| 616457 9 121279 eric 2012-05-04 11:27:49 -0700 Comment on attachment 121279 Patch How do we test this? 874726 10 schenney 2013-04-12 07:55:41 -0700 https://code.google.com/p/chromium/issues/detail?id=230830 121213 2012-01-04 21:42:20 -0800 2012-01-05 08:03:08 -0800 Patch bug-75601-20120105004218.patch text/plain 4183 fsamuel U3VidmVyc2lvbiBSZXZpc2lvbjogMTA0MDQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzBjYTAyZmRkM2M3Nzdh Mjk3YTZkY2MzMTQzN2QwZThiM2U0NGM0My4uMTlhYWFiODcxMzQxYjhmN2UwMWM4MGQxNTc5ZTg1 ZGNiNjUxZTE1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTAxLTA0ICBGYWR5 IFNhbXVlbCAgPGZzYW11ZWxAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtDaHJvbWl1bV0gSW1h Z2VEb2N1bWVudCBzaG91bGQgaGF2ZSBhIHZpZXdwb3J0IHdpZHRoIGVxdWFsIHRvIHRoZSBpbWFn ZSdzIGluc3RyaW5zaWMgd2lkdGgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTc1NjAxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKworICAgICAgICAqIGh0bWwvSW1hZ2VEb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpJbWFnZURvY3VtZW50OjpJbWFnZURvY3VtZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkltYWdl RG9jdW1lbnQ6OmNyZWF0ZURvY3VtZW50U3RydWN0dXJlKToKKyAgICAgICAgKFdlYkNvcmU6Oklt YWdlRG9jdW1lbnQ6OmltYWdlVXBkYXRlZCk6CisgICAgICAgICogaHRtbC9JbWFnZURvY3VtZW50 Lmg6CisKIDIwMTItMDEtMDQgIElnb3IgT2xpdmVpcmEgIDxpZ29yLm9saXZlaXJhQG9wZW5ib3Nz YS5vcmc+CiAKICAgICAgICAgU2hhcmUgZnJhY3Rpb25hbCB0aW1lIGNvZGUgYmV0d2VlbiBBbmlt YXRpb25CYXNlIGFuZCBLZXlmcmFtZUFuaW1hdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaHRtbC9JbWFnZURvY3VtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSW1hZ2VEb2N1 bWVudC5jcHAKaW5kZXggZDRhNzNkMzgxNGNiMWQxNmYxODI3MWJlNzA4ODNiNDZmMGYzZjQ3Yy4u Y2FjNTFiOTU1ZDQ0ZWE1NzQ3YTU5ZmYxNDc3MDQ0MjVkMGJkYmQ1ZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaHRtbC9JbWFnZURvY3VtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9o dG1sL0ltYWdlRG9jdW1lbnQuY3BwCkBAIC0xNzYsNiArMTc2LDcgQEAgdm9pZCBJbWFnZURvY3Vt ZW50UGFyc2VyOjpmaW5pc2goKQogSW1hZ2VEb2N1bWVudDo6SW1hZ2VEb2N1bWVudChGcmFtZSog ZnJhbWUsIGNvbnN0IEtVUkwmIHVybCkKICAgICA6IEhUTUxEb2N1bWVudChmcmFtZSwgdXJsKQog ICAgICwgbV9pbWFnZUVsZW1lbnQoMCkKKyAgICAsIG1fcm9vdEVsZW1lbnQoMCkKICAgICAsIG1f aW1hZ2VTaXplSXNLbm93bihmYWxzZSkKICAgICAsIG1fZGlkU2hyaW5rSW1hZ2UoZmFsc2UpCiAg ICAgLCBtX3Nob3VsZFNocmlua0ltYWdlKHNob3VsZFNocmlua1RvRml0KCkpCkBAIC0yMDAsMTkg KzIwMSwxNyBAQCB2b2lkIEltYWdlRG9jdW1lbnQ6OmNyZWF0ZURvY3VtZW50U3RydWN0dXJlKCkK ICAgICBpZiAoZnJhbWUoKSAmJiBmcmFtZSgpLT5sb2FkZXIoKSkKICAgICAgICAgZnJhbWUoKS0+ bG9hZGVyKCktPmRpc3BhdGNoRG9jdW1lbnRFbGVtZW50QXZhaWxhYmxlKCk7CiAgICAgCi0gICAg UmVmUHRyPEVsZW1lbnQ+IGJvZHkgPSBEb2N1bWVudDo6Y3JlYXRlRWxlbWVudChib2R5VGFnLCBm YWxzZSk7Ci0gICAgYm9keS0+c2V0QXR0cmlidXRlKHN0eWxlQXR0ciwgIm1hcmdpbjogMHB4OyIp OwotICAgIAotICAgIHJvb3RFbGVtZW50LT5hcHBlbmRDaGlsZChib2R5LCBlYyk7Ci0gICAgCiAg ICAgUmVmUHRyPEltYWdlRG9jdW1lbnRFbGVtZW50PiBpbWFnZUVsZW1lbnQgPSBJbWFnZURvY3Vt ZW50RWxlbWVudDo6Y3JlYXRlKHRoaXMpOwotICAgIAogICAgIGltYWdlRWxlbWVudC0+c2V0QXR0 cmlidXRlKHN0eWxlQXR0ciwgIi13ZWJraXQtdXNlci1zZWxlY3Q6IG5vbmUiKTsgICAgICAgIAog ICAgIGltYWdlRWxlbWVudC0+c2V0TG9hZE1hbnVhbGx5KHRydWUpOwogICAgIGltYWdlRWxlbWVu dC0+c2V0U3JjKHVybCgpLnN0cmluZygpKTsKICAgICAKLSAgICBib2R5LT5hcHBlbmRDaGlsZChp bWFnZUVsZW1lbnQsIGVjKTsKKyAgICBSZWZQdHI8RWxlbWVudD4gYm9keSA9IERvY3VtZW50Ojpj cmVhdGVFbGVtZW50KGJvZHlUYWcsIGZhbHNlKTsKKyAgICBib2R5LT5zZXRBdHRyaWJ1dGUoc3R5 bGVBdHRyLCAibWFyZ2luOiAwcHg7Iik7CisgICAgcm9vdEVsZW1lbnQtPmFwcGVuZENoaWxkKGJv ZHksIGVjKTsKICAgICAKKyAgICBib2R5LT5hcHBlbmRDaGlsZChpbWFnZUVsZW1lbnQsIGVjKTsK KwogICAgIGlmIChzaG91bGRTaHJpbmtUb0ZpdCgpKSB7CiAgICAgICAgIC8vIEFkZCBldmVudCBs aXN0ZW5lcnMKICAgICAgICAgUmVmUHRyPEV2ZW50TGlzdGVuZXI+IGxpc3RlbmVyID0gSW1hZ2VF dmVudExpc3RlbmVyOjpjcmVhdGUodGhpcyk7CkBAIC0yMjEsNiArMjIwLDcgQEAgdm9pZCBJbWFn ZURvY3VtZW50OjpjcmVhdGVEb2N1bWVudFN0cnVjdHVyZSgpCiAgICAgICAgIGltYWdlRWxlbWVu dC0+YWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCBsaXN0ZW5lci5yZWxlYXNlKCksIGZhbHNlKTsK ICAgICB9CiAKKyAgICBtX3Jvb3RFbGVtZW50ID0gcm9vdEVsZW1lbnQuZ2V0KCk7CiAgICAgbV9p bWFnZUVsZW1lbnQgPSBpbWFnZUVsZW1lbnQuZ2V0KCk7CiB9CiAKQEAgLTI4MywxMyArMjgzLDIx IEBAIHZvaWQgSW1hZ2VEb2N1bWVudDo6aW1hZ2VDbGlja2VkKGludCB4LCBpbnQgeSkKIHZvaWQg SW1hZ2VEb2N1bWVudDo6aW1hZ2VVcGRhdGVkKCkKIHsKICAgICBBU1NFUlQobV9pbWFnZUVsZW1l bnQpOworICAgIEFTU0VSVChtX3Jvb3RFbGVtZW50KTsKICAgICAKICAgICBpZiAobV9pbWFnZVNp emVJc0tub3duKQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAobV9pbWFnZUVsZW1lbnQtPmNh Y2hlZEltYWdlKCktPmltYWdlU2l6ZUZvclJlbmRlcmVyKG1faW1hZ2VFbGVtZW50LT5yZW5kZXJl cigpLCBwYWdlWm9vbUZhY3Rvcih0aGlzKSkuaXNFbXB0eSgpKQorICAgIExheW91dFNpemUgaW1h Z2VTaXplID0gbV9pbWFnZUVsZW1lbnQtPmNhY2hlZEltYWdlKCktPmltYWdlU2l6ZUZvclJlbmRl cmVyKG1faW1hZ2VFbGVtZW50LT5yZW5kZXJlcigpLCBwYWdlWm9vbUZhY3Rvcih0aGlzKSk7Cisg ICAgaWYgKGltYWdlU2l6ZS5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybjsKLSAgICAKKworICAg IEV4Y2VwdGlvbkNvZGUgZWM7CisgICAgUmVmUHRyPEVsZW1lbnQ+IHZpZXdwb3J0ID0gRG9jdW1l bnQ6OmNyZWF0ZUVsZW1lbnQobWV0YVRhZywgZmFsc2UpOworICAgIHZpZXdwb3J0LT5zZXRBdHRy aWJ1dGUobmFtZUF0dHIsICJ2aWV3cG9ydCIpOworICAgIC8vIE1ha2UgdGhlIHZpZXdwb3J0IHdp ZHRoIGVxdWFsIHRvIHRoZSBpbnRyaW5zaWMgd2lkdGggb2YgdGhlIGltYWdlLgorICAgIHZpZXdw b3J0LT5zZXRBdHRyaWJ1dGUoY29udGVudEF0dHIsIFN0cmluZzo6Zm9ybWF0KCJ3aWR0aD0lZCIs IGltYWdlU2l6ZS53aWR0aCgpKSk7CisgICAgbV9yb290RWxlbWVudC0+YXBwZW5kQ2hpbGQodmll d3BvcnQsIGVjKTsKICAgICBtX2ltYWdlU2l6ZUlzS25vd24gPSB0cnVlOwogICAgIAogICAgIGlm IChzaG91bGRTaHJpbmtUb0ZpdCgpKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1s L0ltYWdlRG9jdW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSW1hZ2VEb2N1bWVudC5oCmlu ZGV4IGZhZjkyMDcwZmY0MDI1NDg5NDZlN2E2ODAxNWVlMTI0MTRjODIyMjMuLjA0YTRkMzhlZGJl NTk3MmRiZWRkMDA5MzkzN2RlYTc5YmY1ZmQwNTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2h0bWwvSW1hZ2VEb2N1bWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSW1hZ2VEb2N1 bWVudC5oCkBAIC02MSw2ICs2MSw4IEBAIHByaXZhdGU6CiAgICAgZmxvYXQgc2NhbGUoKSBjb25z dDsKICAgICAKICAgICBJbWFnZURvY3VtZW50RWxlbWVudCogbV9pbWFnZUVsZW1lbnQ7CisKKyAg ICBFbGVtZW50KiBtX3Jvb3RFbGVtZW50OwogICAgIAogICAgIC8vIFdoZXRoZXIgZW5vdWdoIG9m IHRoZSBpbWFnZSBoYXMgYmVlbiBsb2FkZWQgdG8gZGV0ZXJtaW5lIGl0cyBzaXplCiAgICAgYm9v bCBtX2ltYWdlU2l6ZUlzS25vd247Cg== 121279 2012-01-05 08:03:11 -0800 2012-05-04 11:27:49 -0700 Patch bug-75601-20120105110310.patch text/plain 9391 fsamuel U3VidmVyc2lvbiBSZXZpc2lvbjogMTA0MDQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzBjYTAyZmRkM2M3Nzdh Mjk3YTZkY2MzMTQzN2QwZThiM2U0NGM0My4uZjI1NWRjZDk4MzFjOWVlNDAyZTFiMDE1ZGZlZDEw ZDNhNzk0MWI2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTAxLTA1ICBGYWR5 IFNhbXVlbCAgPGZzYW11ZWxAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtDaHJvbWl1bV0gSW1h Z2VEb2N1bWVudCBzaG91bGQgaGF2ZSBhIHZpZXdwb3J0IHdpZHRoIGVxdWFsIHRvIHRoZSBpbWFn ZSdzIGluc3RyaW5zaWMgd2lkdGgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTc1NjAxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKworICAgICAgICAqIGh0bWwvSW1hZ2VEb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpJbWFnZURvY3VtZW50OjpJbWFnZURvY3VtZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkltYWdl RG9jdW1lbnQ6OmNyZWF0ZURvY3VtZW50U3RydWN0dXJlKToKKyAgICAgICAgKFdlYkNvcmU6Oklt YWdlRG9jdW1lbnQ6OmltYWdlVXBkYXRlZCk6CisgICAgICAgICogaHRtbC9JbWFnZURvY3VtZW50 Lmg6CisgICAgICAgICogcGFnZS9DaHJvbWUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2hyb21l OjpkaXNwYXRjaEltYWdlRG9jdW1lbnRJbWFnZVVwZGF0ZWQpOgorICAgICAgICAqIHBhZ2UvQ2hy b21lLmg6CisgICAgICAgICogcGFnZS9DaHJvbWVDbGllbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6 OkNocm9tZUNsaWVudDo6ZGlzcGF0Y2hJbWFnZURvY3VtZW50SW1hZ2VVcGRhdGVkKToKKwogMjAx Mi0wMS0wNCAgSWdvciBPbGl2ZWlyYSAgPGlnb3Iub2xpdmVpcmFAb3BlbmJvc3NhLm9yZz4KIAog ICAgICAgICBTaGFyZSBmcmFjdGlvbmFsIHRpbWUgY29kZSBiZXR3ZWVuIEFuaW1hdGlvbkJhc2Ug YW5kIEtleWZyYW1lQW5pbWF0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IDRiNGRj NGQ2M2ExNTk4N2NhMzY5NGJjMDc1YzdmNWIwMjMxZDM3NTMuLjkzZTY5YjE2Y2QyYmFhMDVlMDVi NGRhZTQ2NmVhMDcwMDg1NDZmOWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTQgQEAKKzIwMTItMDEtMDUgIEZhZHkgU2FtdWVsICA8ZnNhbXVlbEBjaHJvbWl1bS5vcmc+ CisKKyAgICAgICAgW0Nocm9taXVtXSBJbWFnZURvY3VtZW50IHNob3VsZCBoYXZlIGEgdmlld3Bv cnQgd2lkdGggZXF1YWwgdG8gdGhlIGltYWdlJ3MgaW5zdHJpbnNpYyB3aWR0aAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzU2MDEKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHNyYy9DaHJvbWVDbGllbnRJ bXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6Q2hyb21lQ2xpZW50SW1wbDo6ZGlzcGF0Y2hJbWFn ZURvY3VtZW50SW1hZ2VVcGRhdGVkKToKKyAgICAgICAgKiBzcmMvQ2hyb21lQ2xpZW50SW1wbC5o OgorCiAyMDEyLTAxLTAzICBWYW5nZWxpcyBLb2trZXZpcyAgPHZhbmdlbGlzQGNocm9taXVtLm9y Zz4KIAogICAgICAgICBbY2hyb21pdW1dIEJ5cGFzcyB0aGUgc2hhZG93IHRleHR1cmUgY29weSBm b3IgYWNjZWxlcmF0ZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSW1hZ2VEb2N1 bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0ltYWdlRG9jdW1lbnQuY3BwCmluZGV4IGQ0 YTczZDM4MTRjYjFkMTZmMTgyNzFiZTcwODgzYjQ2ZjBmM2Y0N2MuLjNjZmVhYmNlMDNkMTM0NWMx ZjEwYTVlY2I2YmIyZDQzYmFkMGExYWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwv SW1hZ2VEb2N1bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9JbWFnZURvY3VtZW50 LmNwcApAQCAtMjYsNiArMjYsNyBAQAogI2luY2x1ZGUgIkltYWdlRG9jdW1lbnQuaCIKIAogI2lu Y2x1ZGUgIkNhY2hlZEltYWdlLmgiCisjaW5jbHVkZSAiQ2hyb21lLmgiCiAjaW5jbHVkZSAiRG9j dW1lbnRMb2FkZXIuaCIKICNpbmNsdWRlICJFdmVudExpc3RlbmVyLmgiCiAjaW5jbHVkZSAiRXZl bnROYW1lcy5oIgpAQCAtMTc2LDYgKzE3Nyw3IEBAIHZvaWQgSW1hZ2VEb2N1bWVudFBhcnNlcjo6 ZmluaXNoKCkKIEltYWdlRG9jdW1lbnQ6OkltYWdlRG9jdW1lbnQoRnJhbWUqIGZyYW1lLCBjb25z dCBLVVJMJiB1cmwpCiAgICAgOiBIVE1MRG9jdW1lbnQoZnJhbWUsIHVybCkKICAgICAsIG1faW1h Z2VFbGVtZW50KDApCisgICAgLCBtX3Jvb3RFbGVtZW50KDApCiAgICAgLCBtX2ltYWdlU2l6ZUlz S25vd24oZmFsc2UpCiAgICAgLCBtX2RpZFNocmlua0ltYWdlKGZhbHNlKQogICAgICwgbV9zaG91 bGRTaHJpbmtJbWFnZShzaG91bGRTaHJpbmtUb0ZpdCgpKQpAQCAtMjAyLDE3ICsyMDQsMTYgQEAg dm9pZCBJbWFnZURvY3VtZW50OjpjcmVhdGVEb2N1bWVudFN0cnVjdHVyZSgpCiAgICAgCiAgICAg UmVmUHRyPEVsZW1lbnQ+IGJvZHkgPSBEb2N1bWVudDo6Y3JlYXRlRWxlbWVudChib2R5VGFnLCBm YWxzZSk7CiAgICAgYm9keS0+c2V0QXR0cmlidXRlKHN0eWxlQXR0ciwgIm1hcmdpbjogMHB4OyIp OwotICAgIAorCiAgICAgcm9vdEVsZW1lbnQtPmFwcGVuZENoaWxkKGJvZHksIGVjKTsKLSAgICAK KwogICAgIFJlZlB0cjxJbWFnZURvY3VtZW50RWxlbWVudD4gaW1hZ2VFbGVtZW50ID0gSW1hZ2VE b2N1bWVudEVsZW1lbnQ6OmNyZWF0ZSh0aGlzKTsKLSAgICAKICAgICBpbWFnZUVsZW1lbnQtPnNl dEF0dHJpYnV0ZShzdHlsZUF0dHIsICItd2Via2l0LXVzZXItc2VsZWN0OiBub25lIik7ICAgICAg ICAKICAgICBpbWFnZUVsZW1lbnQtPnNldExvYWRNYW51YWxseSh0cnVlKTsKICAgICBpbWFnZUVs ZW1lbnQtPnNldFNyYyh1cmwoKS5zdHJpbmcoKSk7CiAgICAgCiAgICAgYm9keS0+YXBwZW5kQ2hp bGQoaW1hZ2VFbGVtZW50LCBlYyk7Ci0gICAgCisKICAgICBpZiAoc2hvdWxkU2hyaW5rVG9GaXQo KSkgewogICAgICAgICAvLyBBZGQgZXZlbnQgbGlzdGVuZXJzCiAgICAgICAgIFJlZlB0cjxFdmVu dExpc3RlbmVyPiBsaXN0ZW5lciA9IEltYWdlRXZlbnRMaXN0ZW5lcjo6Y3JlYXRlKHRoaXMpOwpA QCAtMjIxLDYgKzIyMiw3IEBAIHZvaWQgSW1hZ2VEb2N1bWVudDo6Y3JlYXRlRG9jdW1lbnRTdHJ1 Y3R1cmUoKQogICAgICAgICBpbWFnZUVsZW1lbnQtPmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwg bGlzdGVuZXIucmVsZWFzZSgpLCBmYWxzZSk7CiAgICAgfQogCisgICAgbV9yb290RWxlbWVudCA9 IHJvb3RFbGVtZW50LmdldCgpOwogICAgIG1faW1hZ2VFbGVtZW50ID0gaW1hZ2VFbGVtZW50Lmdl dCgpOwogfQogCkBAIC0yODMsMTMgKzI4NSwxNyBAQCB2b2lkIEltYWdlRG9jdW1lbnQ6OmltYWdl Q2xpY2tlZChpbnQgeCwgaW50IHkpCiB2b2lkIEltYWdlRG9jdW1lbnQ6OmltYWdlVXBkYXRlZCgp CiB7CiAgICAgQVNTRVJUKG1faW1hZ2VFbGVtZW50KTsKKyAgICBBU1NFUlQobV9yb290RWxlbWVu dCk7CiAgICAgCiAgICAgaWYgKG1faW1hZ2VTaXplSXNLbm93bikKICAgICAgICAgcmV0dXJuOwog Ci0gICAgaWYgKG1faW1hZ2VFbGVtZW50LT5jYWNoZWRJbWFnZSgpLT5pbWFnZVNpemVGb3JSZW5k ZXJlcihtX2ltYWdlRWxlbWVudC0+cmVuZGVyZXIoKSwgcGFnZVpvb21GYWN0b3IodGhpcykpLmlz RW1wdHkoKSkKKyAgICBMYXlvdXRTaXplIGltYWdlU2l6ZSA9IG1faW1hZ2VFbGVtZW50LT5jYWNo ZWRJbWFnZSgpLT5pbWFnZVNpemVGb3JSZW5kZXJlcihtX2ltYWdlRWxlbWVudC0+cmVuZGVyZXIo KSwgcGFnZVpvb21GYWN0b3IodGhpcykpOworICAgIGlmIChpbWFnZVNpemUuaXNFbXB0eSgpKQog ICAgICAgICByZXR1cm47Ci0gICAgCisKKyAgICBBU1NFUlQoZnJhbWUoKSAmJiBmcmFtZSgpLT5w YWdlKCkpOworICAgIGZyYW1lKCktPnBhZ2UoKS0+Y2hyb21lKCktPmRpc3BhdGNoSW1hZ2VEb2N1 bWVudEltYWdlVXBkYXRlZCh0aGlzLCBtX3Jvb3RFbGVtZW50LCBpbWFnZVNpemUud2lkdGgoKSwg aW1hZ2VTaXplLmhlaWdodCgpKTsKICAgICBtX2ltYWdlU2l6ZUlzS25vd24gPSB0cnVlOwogICAg IAogICAgIGlmIChzaG91bGRTaHJpbmtUb0ZpdCgpKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9odG1sL0ltYWdlRG9jdW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSW1hZ2VEb2N1 bWVudC5oCmluZGV4IGZhZjkyMDcwZmY0MDI1NDg5NDZlN2E2ODAxNWVlMTI0MTRjODIyMjMuLjA0 YTRkMzhlZGJlNTk3MmRiZWRkMDA5MzkzN2RlYTc5YmY1ZmQwNTggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2h0bWwvSW1hZ2VEb2N1bWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwv SW1hZ2VEb2N1bWVudC5oCkBAIC02MSw2ICs2MSw4IEBAIHByaXZhdGU6CiAgICAgZmxvYXQgc2Nh bGUoKSBjb25zdDsKICAgICAKICAgICBJbWFnZURvY3VtZW50RWxlbWVudCogbV9pbWFnZUVsZW1l bnQ7CisKKyAgICBFbGVtZW50KiBtX3Jvb3RFbGVtZW50OwogICAgIAogICAgIC8vIFdoZXRoZXIg ZW5vdWdoIG9mIHRoZSBpbWFnZSBoYXMgYmVlbiBsb2FkZWQgdG8gZGV0ZXJtaW5lIGl0cyBzaXpl CiAgICAgYm9vbCBtX2ltYWdlU2l6ZUlzS25vd247CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL0Nocm9tZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0Nocm9tZS5jcHAKaW5kZXgg OGMzYjAzMjY0Nzk0YjZjZDRiOGQxYjUzOTkzNTBiYmFjMzY3YzMwZS4uMGUyZGFkODM1MWM3YzIw YjU5NGMwZjUwZmYxZDBiZWNkMGIzMGQzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFn ZS9DaHJvbWUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ2hyb21lLmNwcApAQCAtNTks NiArNTksOCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiB1c2luZyBuYW1lc3BhY2UgSFRNTE5hbWVz OwogdXNpbmcgbmFtZXNwYWNlIHN0ZDsKIAorY2xhc3MgRWxlbWVudDsKKwogQ2hyb21lOjpDaHJv bWUoUGFnZSogcGFnZSwgQ2hyb21lQ2xpZW50KiBjbGllbnQpCiAgICAgOiBtX3BhZ2UocGFnZSkK ICAgICAsIG1fY2xpZW50KGNsaWVudCkKQEAgLTQ3OSw2ICs0ODEsMTEgQEAgdm9pZCBDaHJvbWU6 OmxvYWRJY29uRm9yRmlsZXMoY29uc3QgVmVjdG9yPFN0cmluZz4mIGZpbGVuYW1lcywgRmlsZUlj b25Mb2FkZXIqIGwKICAgICBtX2NsaWVudC0+bG9hZEljb25Gb3JGaWxlcyhmaWxlbmFtZXMsIGxv YWRlcik7CiB9CiAKK3ZvaWQgQ2hyb21lOjpkaXNwYXRjaEltYWdlRG9jdW1lbnRJbWFnZVVwZGF0 ZWQoRG9jdW1lbnQqIGltYWdlRG9jdW1lbnQsIEVsZW1lbnQqIHJvb3RFbGVtZW50LCBpbnQgaW1h Z2VXaWR0aCwgaW50IGltYWdlSGVpZ2h0KQoreworICAgIG1fY2xpZW50LT5kaXNwYXRjaEltYWdl RG9jdW1lbnRJbWFnZVVwZGF0ZWQoaW1hZ2VEb2N1bWVudCwgcm9vdEVsZW1lbnQsIGltYWdlV2lk dGgsIGltYWdlSGVpZ2h0KTsKK30KKwogdm9pZCBDaHJvbWU6OmRpc3BhdGNoVmlld3BvcnRQcm9w ZXJ0aWVzRGlkQ2hhbmdlKGNvbnN0IFZpZXdwb3J0QXJndW1lbnRzJiBhcmd1bWVudHMpIGNvbnN0 CiB7CiAgICAgbV9jbGllbnQtPmRpc3BhdGNoVmlld3BvcnRQcm9wZXJ0aWVzRGlkQ2hhbmdlKGFy Z3VtZW50cyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0Nocm9tZS5oIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9DaHJvbWUuaAppbmRleCBkNWIzOWJmZTI0NTNjYWEzMTNkNzBhNmFj Mzg1M2E0ZTRiYjA2N2I2Li5iYWNlNmYzNWUxN2FiMTE1NTQ0OGUzYzcyOGU3MzZlY2QwYjFiYzcz IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0Nocm9tZS5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvQ2hyb21lLmgKQEAgLTQwLDYgKzQwLDggQEAgbmFtZXNwYWNlIFdlYkNvcmUg ewogICAgIGNsYXNzIENvbG9yQ2hvb3NlcjsKICAgICBjbGFzcyBDb2xvckNob29zZXJDbGllbnQ7 CiAjZW5kaWYKKyAgICBjbGFzcyBEb2N1bWVudDsKKyAgICBjbGFzcyBFbGVtZW50OwogICAgIGNs YXNzIEZpbGVDaG9vc2VyOwogICAgIGNsYXNzIEZpbGVJY29uTG9hZGVyOwogICAgIGNsYXNzIEZs b2F0UmVjdDsKQEAgLTE2NCw2ICsxNjYsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAg IHZvaWQgZW51bWVyYXRlQ2hvc2VuRGlyZWN0b3J5KEZpbGVDaG9vc2VyKik7CiAjZW5kaWYKIAor ICAgICAgICB2b2lkIGRpc3BhdGNoSW1hZ2VEb2N1bWVudEltYWdlVXBkYXRlZChEb2N1bWVudCog aW1hZ2VEb2N1bWVudCwgRWxlbWVudCogcm9vdEVsZW1lbnQsIGludCBpbWFnZVdpZHRoLCBpbnQg aW1hZ2VIZWlnaHQpOwogICAgICAgICB2b2lkIGRpc3BhdGNoVmlld3BvcnRQcm9wZXJ0aWVzRGlk Q2hhbmdlKGNvbnN0IFZpZXdwb3J0QXJndW1lbnRzJikgY29uc3Q7CiAKICAgICAgICAgYm9vbCBy ZXF1aXJlc0Z1bGxzY3JlZW5Gb3JWaWRlb1BsYXliYWNrKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wYWdlL0Nocm9tZUNsaWVudC5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9DaHJvbWVD bGllbnQuaAppbmRleCAwYmM4NjNiZDhjN2E0YTcxYTQ4MzdiMzFiMDM0NjY1MTk4YmEzMGQ5Li41 OTgwZDUwMjIxZDk4ZTRmZWVlZjEyNzJlYjNjYWU0YjI3YzE0ZGMxIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL0Nocm9tZUNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv Q2hyb21lQ2xpZW50LmgKQEAgLTE2MSw2ICsxNjEsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAj ZW5kaWYKICAgICAgICAgLy8gRW5kIG1ldGhvZHMgdXNlZCBieSBIb3N0V2luZG93LgogCisgICAg ICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaEltYWdlRG9jdW1lbnRJbWFnZVVwZGF0ZWQoRG9jdW1l bnQqIGltYWdlRG9jdW1lbnQsIEVsZW1lbnQqIHJvb3RFbGVtZW50LCBpbnQgaW1hZ2VXaWR0aCwg aW50IGltYWdlSGVpZ2h0KSB7IH0KICAgICAgICAgdmlydHVhbCB2b2lkIGRpc3BhdGNoVmlld3Bv cnRQcm9wZXJ0aWVzRGlkQ2hhbmdlKGNvbnN0IFZpZXdwb3J0QXJndW1lbnRzJikgY29uc3QgeyB9 CiAKICAgICAgICAgdmlydHVhbCB2b2lkIGNvbnRlbnRzU2l6ZUNoYW5nZWQoRnJhbWUqLCBjb25z dCBJbnRTaXplJikgY29uc3QgPSAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9zcmMvQ2hyb21lQ2xpZW50SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9D aHJvbWVDbGllbnRJbXBsLmNwcAppbmRleCA1ZjI4NTFiYjU4NzdjOWZmNzQyNmQ3YThjMWU1ZDEz ODY0ZmEwMmNmLi42ZjNlZjNhMTE4MmI4NDJhZDRiODE5NGQxZjM4MTI2NjczOTgzMjc0IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9DaHJvbWVDbGllbnRJbXBsLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9DaHJvbWVDbGllbnRJbXBsLmNwcApAQCAt NjIyLDYgKzYyMiwxOCBAQCB2b2lkIENocm9tZUNsaWVudEltcGw6OnNldFRvb2xUaXAoY29uc3Qg U3RyaW5nJiB0b29sdGlwVGV4dCwgVGV4dERpcmVjdGlvbiBkaXIpCiAgICAgICAgIHRvb2x0aXBU ZXh0LCB0ZXh0RGlyZWN0aW9uKTsKIH0KIAordm9pZCBDaHJvbWVDbGllbnRJbXBsOjpkaXNwYXRj aEltYWdlRG9jdW1lbnRJbWFnZVVwZGF0ZWQoRG9jdW1lbnQqIGltYWdlRG9jdW1lbnQsIEVsZW1l bnQqIHJvb3RFbGVtZW50LCBpbnQgaW1hZ2VXaWR0aCwgaW50IGltYWdlSGVpZ2h0KQoreworI2lm IEVOQUJMRShWSUVXUE9SVCkKKyAgICBFeGNlcHRpb25Db2RlIGVjOworICAgIFJlZlB0cjxFbGVt ZW50PiB2aWV3cG9ydCA9IGltYWdlRG9jdW1lbnQtPmNyZWF0ZUVsZW1lbnQoSFRNTE5hbWVzOjpt ZXRhVGFnLCBmYWxzZSk7CisgICAgdmlld3BvcnQtPnNldEF0dHJpYnV0ZShIVE1MTmFtZXM6Om5h bWVBdHRyLCAidmlld3BvcnQiKTsKKyAgICAvLyBNYWtlIHRoZSB2aWV3cG9ydCB3aWR0aCBlcXVh bCB0byB0aGUgaW50cmluc2ljIHdpZHRoIG9mIHRoZSBpbWFnZS4KKyAgICB2aWV3cG9ydC0+c2V0 QXR0cmlidXRlKEhUTUxOYW1lczo6Y29udGVudEF0dHIsIFN0cmluZzo6Zm9ybWF0KCJ3aWR0aD0l ZCIsIGltYWdlV2lkdGgpKTsKKyAgICByb290RWxlbWVudC0+YXBwZW5kQ2hpbGQodmlld3BvcnQs IGVjKTsKKyNlbmRpZgorfQorCiB2b2lkIENocm9tZUNsaWVudEltcGw6OmRpc3BhdGNoVmlld3Bv cnRQcm9wZXJ0aWVzRGlkQ2hhbmdlKGNvbnN0IFZpZXdwb3J0QXJndW1lbnRzJiBhcmd1bWVudHMp IGNvbnN0CiB7CiAjaWYgRU5BQkxFKFZJRVdQT1JUKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9jaHJvbWl1bS9zcmMvQ2hyb21lQ2xpZW50SW1wbC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9zcmMvQ2hyb21lQ2xpZW50SW1wbC5oCmluZGV4IDIxMTNlYzFhZjRmODFkN2QxOWJlY2E2NTE4 NzMyMzIxNzdhYzQ3ZGQuLmViOGY4MmVjMTQ5OWZlNDA2NjUwYmZhNmZhYTU3MjAyMDIyYmNlN2Ig MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0Nocm9tZUNsaWVudEltcGwu aAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9DaHJvbWVDbGllbnRJbXBsLmgKQEAg LTEyOSw2ICsxMjksNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIG1vdXNlRGlkTW92ZU92 ZXJFbGVtZW50KAogICAgICAgICBjb25zdCBXZWJDb3JlOjpIaXRUZXN0UmVzdWx0JiByZXN1bHQs IHVuc2lnbmVkIG1vZGlmaWVyRmxhZ3MpOwogICAgIHZpcnR1YWwgdm9pZCBzZXRUb29sVGlwKGNv bnN0IFdURjo6U3RyaW5nJiB0b29sdGlwVGV4dCwgV2ViQ29yZTo6VGV4dERpcmVjdGlvbik7Cisg ICAgdmlydHVhbCB2b2lkIGRpc3BhdGNoSW1hZ2VEb2N1bWVudEltYWdlVXBkYXRlZChXZWJDb3Jl OjpEb2N1bWVudCogaW1hZ2VEb2N1bWVudCwgV2ViQ29yZTo6RWxlbWVudCogcm9vdEVsZW1lbnQs IGludCBpbWFnZVdpZHRoLCBpbnQgaW1hZ2VIZWlnaHQpOwogICAgIHZpcnR1YWwgdm9pZCBkaXNw YXRjaFZpZXdwb3J0UHJvcGVydGllc0RpZENoYW5nZShjb25zdCBXZWJDb3JlOjpWaWV3cG9ydEFy Z3VtZW50cyYpIGNvbnN0OwogICAgIHZpcnR1YWwgdm9pZCBwcmludChXZWJDb3JlOjpGcmFtZSop OwogICAgIHZpcnR1YWwgdm9pZCBleGNlZWRlZERhdGFiYXNlUXVvdGEoCg==