147242 2015-07-23 16:11:13 -0700 [Win] Support High DPI drawing with CACFLayers 2015-12-22 10:57:16 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=146335 P2 Normal --- 146335 1 bfulgham bfulgham bfulgham simon.fraser oldest_to_newest 1111808 0 bfulgham 2015-07-23 16:11:13 -0700 This is a follow-up to Bug 146335, which added support for High DPI use in our non-accelerated drawing paths. The Windows platform doesn't allow a single device scaling factor to be applied to individual windows. Instead, high DPI state is handled by working with larger pixel surfaces at higher DPIs, and performing scaling calculations to control widget size, positioning, etc. Yuck! This patch applies the proper scaling at various phases of our CACFLayer sizing and positioning. 1111810 1 bfulgham 2015-07-23 16:12:10 -0700 Note: Just like with Bug 146335, these scaling calculations are all done at 1x, unless the WebKit client opts into a high DPI state. Currently, testing is just to make sure no regressions to existing 1x drawing on Windows (and all drawing on other platforms) are not affected. 1143721 2 265975 bfulgham 2015-11-20 11:49:50 -0800 Created attachment 265975 Patch 1143726 3 265975 thorton 2015-11-20 12:11:06 -0800 Comment on attachment 265975 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=265975&action=review > Source/WebCore/platform/graphics/ca/win/WKCACFViewLayerTreeHost.cpp:128 > + CACFLayerSetContentsScale(layer->platformLayer(), scaleFactor); Does the base layer actually have contents? Why do we have to set contentsScale? 1143727 4 265975 simon.fraser 2015-11-20 12:11:40 -0800 Comment on attachment 265975 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=265975&action=review > Source/WebCore/ChangeLog:15 > + operations are don properly. don > Source/WebCore/platform/graphics/ca/win/PlatformCALayerWinInternal.cpp:230 > +#if HAVE(CACFLAYER_SETCONTENTSSCALE) > + float scaleFactor = CACFLayerGetContentsScale(owner()->platformLayer()); > + CACFLayerSetContentsScale(layer.platformLayer(), scaleFactor); > +#endif This is confusing; I'm not sure how owner()->platformLayer() and layer.platformLayer() are different. Why isn't this handled via GraphicsLayerCA::deviceOrPageScaleFactorChanged() as it is for other platforms? 1143743 5 265975 bfulgham 2015-11-20 12:32:27 -0800 Comment on attachment 265975 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=265975&action=review >> Source/WebCore/platform/graphics/ca/win/PlatformCALayerWinInternal.cpp:230 >> +#endif > > This is confusing; I'm not sure how owner()->platformLayer() and layer.platformLayer() are different. > > Why isn't this handled via GraphicsLayerCA::deviceOrPageScaleFactorChanged() as it is for other platforms? Hmmmmm. I'll investigate before moving forward. 1143778 6 bfulgham 2015-11-20 13:26:07 -0800 (In reply to comment #3) > Comment on attachment 265975 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=265975&action=review > > > Source/WebCore/platform/graphics/ca/win/WKCACFViewLayerTreeHost.cpp:128 > > + CACFLayerSetContentsScale(layer->platformLayer(), scaleFactor); > > Does the base layer actually have contents? Why do we have to set > contentsScale? According to the CA engineer who did the Windows work, this is needed for some arcane Windows-related reason. 1143779 7 265987 bfulgham 2015-11-20 13:26:58 -0800 Created attachment 265987 Patch v2 (Ignore) 1143780 8 bfulgham 2015-11-20 13:28:11 -0800 (In reply to comment #5) > Comment on attachment 265975 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=265975&action=review > > >> Source/WebCore/platform/graphics/ca/win/PlatformCALayerWinInternal.cpp:230 > >> +#endif > > > > This is confusing; I'm not sure how owner()->platformLayer() and layer.platformLayer() are different. > > > > Why isn't this handled via GraphicsLayerCA::deviceOrPageScaleFactorChanged() as it is for other platforms? > > Hmmmmm. I'll investigate before moving forward. It looks like this isn't needed. In fact, I wasn't even being consistent, as the other places where CACFLayerInsertSublayer was being called did not have the scaling factor change included. 1143782 9 265989 bfulgham 2015-11-20 13:30:11 -0800 Created attachment 265989 Patch 1143831 10 bfulgham 2015-11-20 14:35:03 -0800 Committed r192700: <http://trac.webkit.org/changeset/192700> 265975 2015-11-20 11:49:50 -0800 2015-11-20 13:26:55 -0800 Patch bug-147242-20151120120804.patch text/plain 3028 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5MjY4OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE1LTExLTIwICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtXaW5dIFN1cHBvcnQgSGln aCBEUEkgZHJhd2luZyB3aXRoIENBQ0ZMYXllcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NzI0MgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTk4 NjE5OTI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9jYS93aW4vUGxhdGZvcm1DQUxheWVyV2luSW50ZXJuYWwuY3Bw OgorICAgICAgICAoUGxhdGZvcm1DQUxheWVyV2luSW50ZXJuYWw6Omluc2VydFN1YmxheWVyKTog U2V0IG5ldyBzdWJsYXllciBjb250ZW50cyBzY2FsZSB0byBtYXRjaAorICAgICAgICB0aGF0IG9m IHRoZSBuZXcgcGFyZW50IGxheWVyLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhL3dp bi9XS0NBQ0ZWaWV3TGF5ZXJUcmVlSG9zdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXS0NBQ0ZW aWV3TGF5ZXJUcmVlSG9zdDo6aW5pdGlhbGl6ZUNvbnRleHQpOiBTZXQgY29ycmVjdCBjb250ZW50 IHNjYWxlIGZhY3RvcgorICAgICAgICBmb3IgY3VycmVudCBzY3JlZW4sIGFuZCBhcHBseSBhbiBh cHByb3ByaWF0ZSBiYXNlIHRyYW5zZm9ybSB0byB0aGUgQ0FDRkxheWVyIHNvIGRyYXdpbmcKKyAg ICAgICAgb3BlcmF0aW9ucyBhcmUgZG9uIHByb3Blcmx5LgorCiAyMDE1LTExLTIwICBaYWxhbiBC dWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgU2ltcGxlIGxpbmUgbGF5b3V0OiBB ZGQgdGV4dC1pbmRlbnQgc3VwcG9ydC4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2NhL3dpbi9QbGF0Zm9ybUNBTGF5ZXJXaW5JbnRlcm5hbC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Evd2luL1BsYXRmb3JtQ0FMYXll cldpbkludGVybmFsLmNwcAkocmV2aXNpb24gMTkyNjg4KQorKysgU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2Evd2luL1BsYXRmb3JtQ0FMYXllcldpbkludGVybmFsLmNwcAkod29y a2luZyBjb3B5KQpAQCAtMjIzLDYgKzIyMywxMiBAQCB2b2lkIFBsYXRmb3JtQ0FMYXllcldpbklu dGVybmFsOjppbnNlcnRTCiAKICAgICBsYXllci5yZW1vdmVGcm9tU3VwZXJsYXllcigpOwogICAg IENBQ0ZMYXllckluc2VydFN1YmxheWVyKG93bmVyKCktPnBsYXRmb3JtTGF5ZXIoKSwgbGF5ZXIu cGxhdGZvcm1MYXllcigpLCBpbmRleCk7CisKKyNpZiBIQVZFKENBQ0ZMQVlFUl9TRVRDT05URU5U U1NDQUxFKQorICAgIGZsb2F0IHNjYWxlRmFjdG9yID0gQ0FDRkxheWVyR2V0Q29udGVudHNTY2Fs ZShvd25lcigpLT5wbGF0Zm9ybUxheWVyKCkpOworICAgIENBQ0ZMYXllclNldENvbnRlbnRzU2Nh bGUobGF5ZXIucGxhdGZvcm1MYXllcigpLCBzY2FsZUZhY3Rvcik7CisjZW5kaWYKKwogICAgIG93 bmVyKCktPnNldE5lZWRzQ29tbWl0KCk7CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2NhL3dpbi9XS0NBQ0ZWaWV3TGF5ZXJUcmVlSG9zdC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Evd2luL1dLQ0FDRlZpZXdM YXllclRyZWVIb3N0LmNwcAkocmV2aXNpb24gMTkyNjg4KQorKysgU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2Evd2luL1dLQ0FDRlZpZXdMYXllclRyZWVIb3N0LmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMjYsOCArMjYsMTAgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRl ICJXS0NBQ0ZWaWV3TGF5ZXJUcmVlSG9zdC5oIgogCisjaW5jbHVkZSAiR0RJVXRpbGl0aWVzLmgi CiAjaW5jbHVkZSAiUGxhdGZvcm1DQUxheWVyLmgiCiAjaW5jbHVkZSAiU29mdExpbmtpbmcuaCIK KyNpbmNsdWRlIDxRdWFydHpDb3JlL0NBQ0ZMYXllci5oPgogI2luY2x1ZGUgPHd0Zi9DdXJyZW50 VGltZS5oPgogI2luY2x1ZGUgPHd0Zi9NYWluVGhyZWFkLmg+CiAKQEAgLTEyMCw2ICsxMjIsMTIg QEAgdm9pZCBXS0NBQ0ZWaWV3TGF5ZXJUcmVlSG9zdDo6Y29udGV4dERpZAogCiB2b2lkIFdLQ0FD RlZpZXdMYXllclRyZWVIb3N0Ojppbml0aWFsaXplQ29udGV4dCh2b2lkKiB1c2VyRGF0YSwgUGxh dGZvcm1DQUxheWVyKiBsYXllcikKIHsKKyNpZiBIQVZFKENBQ0ZMQVlFUl9TRVRDT05URU5UU1ND QUxFKQorICAgIGZsb2F0IHNjYWxlRmFjdG9yID0gZGV2aWNlU2NhbGVGYWN0b3JGb3JXaW5kb3co bnVsbHB0cik7CisgICAgQ0FDRkxheWVyU2V0VHJhbnNmb3JtKGxheWVyLT5wbGF0Zm9ybUxheWVy KCksIENBVHJhbnNmb3JtM0RNYWtlU2NhbGUoc2NhbGVGYWN0b3IsIHNjYWxlRmFjdG9yLCAxKSk7 CisgICAgQ0FDRkxheWVyU2V0Q29udGVudHNTY2FsZShsYXllci0+cGxhdGZvcm1MYXllcigpLCBz Y2FsZUZhY3Rvcik7CisjZW5kaWYKKwogICAgIFdLQ0FDRlZpZXdTZXRDb250ZXh0VXNlckRhdGEo bV92aWV3LmdldCgpLCB1c2VyRGF0YSk7CiAgICAgV0tDQUNGVmlld1NldExheWVyKG1fdmlldy5n ZXQoKSwgbGF5ZXItPnBsYXRmb3JtTGF5ZXIoKSk7CiAgICAgV0tDQUNGVmlld1NldENvbnRleHRE aWRDaGFuZ2VDYWxsYmFjayhtX3ZpZXcuZ2V0KCksIGNvbnRleHREaWRDaGFuZ2VDYWxsYmFjaywg dGhpcyk7Cg== 265987 2015-11-20 13:26:58 -0800 2015-11-20 13:30:09 -0800 Patch v2 (Ignore) bug-147242-20151120134511.patch text/plain 2694 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5MjY4OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDE1LTExLTIwICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtXaW5dIFN1cHBvcnQgSGln aCBEUEkgZHJhd2luZyB3aXRoIENBQ0ZMYXllcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NzI0MgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTk4 NjE5OTI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9jYS93aW4vV0tDQUNGVmlld0xheWVyVHJlZUhvc3QuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6V0tDQUNGVmlld0xheWVyVHJlZUhvc3Q6OmluaXRpYWxpemVDb250 ZXh0KTogU2V0IGNvcnJlY3QgY29udGVudCBzY2FsZSBmYWN0b3IKKyAgICAgICAgZm9yIGN1cnJl bnQgc2NyZWVuLCBhbmQgYXBwbHkgYW4gYXBwcm9wcmlhdGUgYmFzZSB0cmFuc2Zvcm0gdG8gdGhl IENBQ0ZMYXllciBzbyBkcmF3aW5nCisgICAgICAgIG9wZXJhdGlvbnMgYXJlIGRvbmUgcHJvcGVy bHkuCisKIDIwMTUtMTEtMjAgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAg ICAgICBTaW1wbGUgbGluZSBsYXlvdXQ6IEFkZCB0ZXh0LWluZGVudCBzdXBwb3J0LgpJbmRleDog U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Evd2luL1BsYXRmb3JtQ0FBbmltYXRp b25XaW4uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2NhL3dpbi9QbGF0Zm9ybUNBQW5pbWF0aW9uV2luLmNwcAkocmV2aXNpb24gMTkyNjg4KQorKysg U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Evd2luL1BsYXRmb3JtQ0FBbmltYXRp b25XaW4uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMzgsNyArMjM4LDcgQEAgQ0ZUaW1lSW50ZXJ2 YWwgUGxhdGZvcm1DQUFuaW1hdGlvbldpbjo6ZAogCiB2b2lkIFBsYXRmb3JtQ0FBbmltYXRpb25X aW46OnNldER1cmF0aW9uKENGVGltZUludGVydmFsIHZhbHVlKQogewotICAgIENBQ0ZBbmltYXRp b25TZXREdXJhdGlvbihtX2FuaW1hdGlvbi5nZXQoKSwgdmFsdWUpOworICAgIENBQ0ZBbmltYXRp b25TZXREdXJhdGlvbihtX2FuaW1hdGlvbi5nZXQoKSwgMiAqIHZhbHVlKTsKIH0KIAogZmxvYXQg UGxhdGZvcm1DQUFuaW1hdGlvbldpbjo6c3BlZWQoKSBjb25zdApJbmRleDogU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Evd2luL1dLQ0FDRlZpZXdMYXllclRyZWVIb3N0LmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS93aW4vV0tD QUNGVmlld0xheWVyVHJlZUhvc3QuY3BwCShyZXZpc2lvbiAxOTI2ODgpCisrKyBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS93aW4vV0tDQUNGVmlld0xheWVyVHJlZUhvc3QuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0yNiw4ICsyNiwxMCBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgog I2luY2x1ZGUgIldLQ0FDRlZpZXdMYXllclRyZWVIb3N0LmgiCiAKKyNpbmNsdWRlICJHRElVdGls aXRpZXMuaCIKICNpbmNsdWRlICJQbGF0Zm9ybUNBTGF5ZXIuaCIKICNpbmNsdWRlICJTb2Z0TGlu a2luZy5oIgorI2luY2x1ZGUgPFF1YXJ0ekNvcmUvQ0FDRkxheWVyLmg+CiAjaW5jbHVkZSA8d3Rm L0N1cnJlbnRUaW1lLmg+CiAjaW5jbHVkZSA8d3RmL01haW5UaHJlYWQuaD4KIApAQCAtMTIwLDYg KzEyMiwxMiBAQCB2b2lkIFdLQ0FDRlZpZXdMYXllclRyZWVIb3N0Ojpjb250ZXh0RGlkCiAKIHZv aWQgV0tDQUNGVmlld0xheWVyVHJlZUhvc3Q6OmluaXRpYWxpemVDb250ZXh0KHZvaWQqIHVzZXJE YXRhLCBQbGF0Zm9ybUNBTGF5ZXIqIGxheWVyKQogeworI2lmIEhBVkUoQ0FDRkxBWUVSX1NFVENP TlRFTlRTU0NBTEUpCisgICAgZmxvYXQgc2NhbGVGYWN0b3IgPSBkZXZpY2VTY2FsZUZhY3RvckZv cldpbmRvdyhudWxscHRyKTsKKyAgICBDQUNGTGF5ZXJTZXRUcmFuc2Zvcm0obGF5ZXItPnBsYXRm b3JtTGF5ZXIoKSwgQ0FUcmFuc2Zvcm0zRE1ha2VTY2FsZShzY2FsZUZhY3Rvciwgc2NhbGVGYWN0 b3IsIDEpKTsKKyAgICBDQUNGTGF5ZXJTZXRDb250ZW50c1NjYWxlKGxheWVyLT5wbGF0Zm9ybUxh eWVyKCksIHNjYWxlRmFjdG9yKTsKKyNlbmRpZgorCiAgICAgV0tDQUNGVmlld1NldENvbnRleHRV c2VyRGF0YShtX3ZpZXcuZ2V0KCksIHVzZXJEYXRhKTsKICAgICBXS0NBQ0ZWaWV3U2V0TGF5ZXIo bV92aWV3LmdldCgpLCBsYXllci0+cGxhdGZvcm1MYXllcigpKTsKICAgICBXS0NBQ0ZWaWV3U2V0 Q29udGV4dERpZENoYW5nZUNhbGxiYWNrKG1fdmlldy5nZXQoKSwgY29udGV4dERpZENoYW5nZUNh bGxiYWNrLCB0aGlzKTsK 265989 2015-11-20 13:30:11 -0800 2015-11-20 13:36:37 -0800 Patch bug-147242-20151120134824.patch text/plain 2079 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5MjY4OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDE1LTExLTIwICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtXaW5dIFN1cHBvcnQgSGln aCBEUEkgZHJhd2luZyB3aXRoIENBQ0ZMYXllcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NzI0MgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTk4 NjE5OTI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9jYS93aW4vV0tDQUNGVmlld0xheWVyVHJlZUhvc3QuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6V0tDQUNGVmlld0xheWVyVHJlZUhvc3Q6OmluaXRpYWxpemVDb250 ZXh0KTogU2V0IGNvcnJlY3QgY29udGVudCBzY2FsZSBmYWN0b3IKKyAgICAgICAgZm9yIGN1cnJl bnQgc2NyZWVuLCBhbmQgYXBwbHkgYW4gYXBwcm9wcmlhdGUgYmFzZSB0cmFuc2Zvcm0gdG8gdGhl IENBQ0ZMYXllciBzbyBkcmF3aW5nCisgICAgICAgIG9wZXJhdGlvbnMgYXJlIGRvbmUgcHJvcGVy bHkuCisKIDIwMTUtMTEtMjAgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAg ICAgICBTaW1wbGUgbGluZSBsYXlvdXQ6IEFkZCB0ZXh0LWluZGVudCBzdXBwb3J0LgpJbmRleDog U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Evd2luL1dLQ0FDRlZpZXdMYXllclRy ZWVIb3N0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jYS93aW4vV0tDQUNGVmlld0xheWVyVHJlZUhvc3QuY3BwCShyZXZpc2lvbiAxOTI2ODgpCisr KyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS93aW4vV0tDQUNGVmlld0xheWVy VHJlZUhvc3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNiw4ICsyNiwxMCBAQAogI2luY2x1ZGUg ImNvbmZpZy5oIgogI2luY2x1ZGUgIldLQ0FDRlZpZXdMYXllclRyZWVIb3N0LmgiCiAKKyNpbmNs dWRlICJHRElVdGlsaXRpZXMuaCIKICNpbmNsdWRlICJQbGF0Zm9ybUNBTGF5ZXIuaCIKICNpbmNs dWRlICJTb2Z0TGlua2luZy5oIgorI2luY2x1ZGUgPFF1YXJ0ekNvcmUvQ0FDRkxheWVyLmg+CiAj aW5jbHVkZSA8d3RmL0N1cnJlbnRUaW1lLmg+CiAjaW5jbHVkZSA8d3RmL01haW5UaHJlYWQuaD4K IApAQCAtMTIwLDYgKzEyMiwxMiBAQCB2b2lkIFdLQ0FDRlZpZXdMYXllclRyZWVIb3N0Ojpjb250 ZXh0RGlkCiAKIHZvaWQgV0tDQUNGVmlld0xheWVyVHJlZUhvc3Q6OmluaXRpYWxpemVDb250ZXh0 KHZvaWQqIHVzZXJEYXRhLCBQbGF0Zm9ybUNBTGF5ZXIqIGxheWVyKQogeworI2lmIEhBVkUoQ0FD RkxBWUVSX1NFVENPTlRFTlRTU0NBTEUpCisgICAgZmxvYXQgc2NhbGVGYWN0b3IgPSBkZXZpY2VT Y2FsZUZhY3RvckZvcldpbmRvdyhudWxscHRyKTsKKyAgICBDQUNGTGF5ZXJTZXRUcmFuc2Zvcm0o bGF5ZXItPnBsYXRmb3JtTGF5ZXIoKSwgQ0FUcmFuc2Zvcm0zRE1ha2VTY2FsZShzY2FsZUZhY3Rv ciwgc2NhbGVGYWN0b3IsIDEpKTsKKyAgICBDQUNGTGF5ZXJTZXRDb250ZW50c1NjYWxlKGxheWVy LT5wbGF0Zm9ybUxheWVyKCksIHNjYWxlRmFjdG9yKTsKKyNlbmRpZgorCiAgICAgV0tDQUNGVmll d1NldENvbnRleHRVc2VyRGF0YShtX3ZpZXcuZ2V0KCksIHVzZXJEYXRhKTsKICAgICBXS0NBQ0ZW aWV3U2V0TGF5ZXIobV92aWV3LmdldCgpLCBsYXllci0+cGxhdGZvcm1MYXllcigpKTsKICAgICBX S0NBQ0ZWaWV3U2V0Q29udGV4dERpZENoYW5nZUNhbGxiYWNrKG1fdmlldy5nZXQoKSwgY29udGV4 dERpZENoYW5nZUNhbGxiYWNrLCB0aGlzKTsK