48024 2010-10-20 16:29:41 -0700 Composited elements drawn twice when WebView is layer-backed 2010-10-20 18:18:02 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser simon.fraser oldest_to_newest 297109 0 simon.fraser 2010-10-20 16:29:41 -0700 If the WebView is layer backed (via -setWantsLayer:YES), then there are issues with the rendering of composited content. It draws twice. 297111 1 simon.fraser 2010-10-20 16:30:04 -0700 <rdar://problem/7916580> 297118 2 71358 simon.fraser 2010-10-20 16:33:19 -0700 Created attachment 71358 Patch 297150 3 71358 mitz 2010-10-20 17:08:22 -0700 Comment on attachment 71358 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=71358&action=review > WebKit/mac/WebView/WebFrame.mm:532 > +- (BOOL)_showFlattenedCompositingLayers:(CGContextRef)context This name is no good. This method doesn’t show anything. > WebKit/mac/WebView/WebFrame.mm:540 > + if (WKCGContextIsBitmapContext(context)) { Can reverse the test and return early here. 297166 4 71371 simon.fraser 2010-10-20 17:31:11 -0700 Created attachment 71371 Patch 297189 5 simon.fraser 2010-10-20 18:18:02 -0700 http://trac.webkit.org/changeset/70199 71358 2010-10-20 16:33:19 -0700 2010-10-20 17:31:07 -0700 Patch bug-48024-20101020163318.patch text/plain 4974 simon.fraser ZGlmZiAtLWdpdCBhL1dlYktpdC9tYWMvQ2hhbmdlTG9nIGIvV2ViS2l0L21hYy9DaGFuZ2VMb2cK aW5kZXggYzkzMTY5OWI2MzMxMzgyYzAxZWExZjQxMDhhOWZkOGY3MTM2ZTk4MS4uNmFkMGYyMGZl NTVkNjM3YjMxNDZmYWM1ZGMzMTZkZGY3N2E1ZmE2YiAxMDA2NDQKLS0tIGEvV2ViS2l0L21hYy9D aGFuZ2VMb2cKKysrIGIvV2ViS2l0L21hYy9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyOSBAQAogMjAx MC0xMC0yMCAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAorICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb21wb3NpdGVkIGVsZW1l bnRzIGRyYXduIHR3aWNlIHdoZW4gV2ViVmlldyBpcyBsYXllci1iYWNrZWQKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ4MDI0CisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS83OTE2NTgwPgorICAgICAgICAKKyAgICAgICAgV2hlbiBkcmF3aW5nIGNvbnRl bnQgaW4gYSBsYXllci1iYWNrZWQgV2ViVmlldywgV2ViRnJhbWUncyB0ZXN0CisgICAgICAgIGZv ciBkcmF3aW5nIHRvIGEgYml0bWFwIHN1Y2NlZWRlZCwgY2F1c2luZyB1cyB0byBwYWludCBmbGF0 dGVuZWQKKyAgICAgICAgY29tcG9zaXRpbmcgbGF5ZXJzIGludG8gdGhlIHZpZXcuIFRoZXkgd291 bGQgYWxzbyBiZSByZW5kZXJlZAorICAgICAgICBieSB0aGUgbm9ybWFsIGNvbXBvc2l0aW5nIHBh dGgsIHJlc3VsdGluZyBpbiBkb3VibGUgcmVuZGVyaW5nLgorICAgICAgICAKKyAgICAgICAgRml4 IHRoaXMgYnkgZGV0ZWN0aW5nIHdoZW4gdGhlIFdlYkhUTUxWaWV3IGlzIGJlaW5nIGRyYXduIGlu dG8KKyAgICAgICAgYSBsYXllciwgYW5kIGF2b2lkaW5nIGZsYXR0ZW5pbmcgaW4gdGhhdCBjYXNl LgorCisgICAgICAgICogV2ViVmlldy9XZWJGcmFtZS5tbToKKyAgICAgICAgKC1bV2ViRnJhbWUg X3Nob3dGbGF0dGVuZWRDb21wb3NpdGluZ0xheWVyczpdKToKKyAgICAgICAgKC1bV2ViRnJhbWUg X2RyYXdSZWN0OmNvbnRlbnRzT25seTpdKToKKyAgICAgICAgKiBXZWJWaWV3L1dlYkhUTUxWaWV3 Lm1tOgorICAgICAgICAoLVtXZWJIVE1MVmlldyBkcmF3TGF5ZXI6aW5Db250ZXh0Ol0pOgorICAg ICAgICAoLVtXZWJIVE1MVmlldyBfd2ViX2lzRHJhd2luZ0ludG9MYXllcl0pOgorICAgICAgICAq IFdlYlZpZXcvV2ViSFRNTFZpZXdJbnRlcm5hbC5oOgorCisyMDEwLTEwLTIwICBTaW1vbiBGcmFz ZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmlu IEFkbGVyLgogCiAgICAgICAgIFJFR1JFU1NJT04ocjY3NTY4LXI2NzY0Myk6IFNvbWUgSFRNTC9D U1MgcmVuZGVycyB1cHNpZGUgZG93biBhbmQgYmFja3dhcmRzIG9uIExlb3BhcmQKZGlmZiAtLWdp dCBhL1dlYktpdC9tYWMvV2ViVmlldy9XZWJGcmFtZS5tbSBiL1dlYktpdC9tYWMvV2ViVmlldy9X ZWJGcmFtZS5tbQppbmRleCA0MDk5ZTQ2NzA1OGM3YzI0ZDA1MTFiNmExYWZjNzA0MWU3MDU1YjAx Li41NmVlNTVlNGQ5MzE1MzFmOWJmNmQ3NjAxZDJlYjU2OWZiZmJjYTM4IDEwMDY0NAotLS0gYS9X ZWJLaXQvbWFjL1dlYlZpZXcvV2ViRnJhbWUubW0KKysrIGIvV2ViS2l0L21hYy9XZWJWaWV3L1dl YkZyYW1lLm1tCkBAIC01MjksNiArNTI5LDI2IEBAIHN0YXRpYyBpbmxpbmUgV2ViRGF0YVNvdXJj ZSAqZGF0YVNvdXJjZShEb2N1bWVudExvYWRlciogbG9hZGVyKQogICAgIHJldHVybiBbW1tOU1N0 cmluZyBhbGxvY10gaW5pdFdpdGhDaGFyYWN0ZXJzTm9Db3B5OmJ1ZiBsZW5ndGg6bGVuZ3RoIGZy ZWVXaGVuRG9uZTpZRVNdIGF1dG9yZWxlYXNlXTsKIH0KIAorLSAoQk9PTClfc2hvd0ZsYXR0ZW5l ZENvbXBvc2l0aW5nTGF5ZXJzOihDR0NvbnRleHRSZWYpY29udGV4dAoreworICAgIC8vIC1jdXJy ZW50Q29udGV4dERyYXdpbmdUb1NjcmVlbiByZXR1cm5zIFlFUyBmb3IgYml0bWFwIGNvbnRleHRz LgorICAgIEJPT0wgaXNQcmludGluZyA9ICFbTlNHcmFwaGljc0NvbnRleHQgY3VycmVudENvbnRl eHREcmF3aW5nVG9TY3JlZW5dOworICAgIGlmIChpc1ByaW50aW5nKQorICAgICAgICByZXR1cm4g WUVTOworCisgICAgLy8gSWYgd2UncmUgZHJhd2luZyBpbnRvIGEgYml0bWFwLCB3ZSBtaWdodCBi ZSBzbmFwc2hvdHRpbmcsIG9yIGRyYXdpbmcgaW50byBhIGxheWVyLWJhY2tlZCB2aWV3LgorICAg IGlmIChXS0NHQ29udGV4dElzQml0bWFwQ29udGV4dChjb250ZXh0KSkgeworICAgICAgICBpZiAo W2dldFdlYlZpZXcoc2VsZikgX3VzZXNEb2N1bWVudFZpZXdzXSkgeworICAgICAgICAgICAgaWQg ZG9jdW1lbnRWaWV3ID0gW19wcml2YXRlLT53ZWJGcmFtZVZpZXcgZG9jdW1lbnRWaWV3XTsKKyAg ICAgICAgICAgIGlmIChbZG9jdW1lbnRWaWV3IGlzS2luZE9mQ2xhc3M6W1dlYkhUTUxWaWV3IGNs YXNzXV0gJiYgWyhXZWJIVE1MVmlldyAqKWRvY3VtZW50VmlldyBfd2ViX2lzRHJhd2luZ0ludG9M YXllcl0pCisgICAgICAgICAgICAgICAgcmV0dXJuIE5POworICAgICAgICB9CisgICAgICAgIHJl dHVybiBbZ2V0V2ViVmlldyhzZWxmKSBfaW5jbHVkZXNGbGF0dGVuZWRDb21wb3NpdGluZ0xheWVy c1doZW5EcmF3aW5nVG9CaXRtYXBdOworICAgIH0KKworICAgIHJldHVybiBOTzsKK30KKwogLSAo dm9pZClfZHJhd1JlY3Q6KE5TUmVjdClyZWN0IGNvbnRlbnRzT25seTooQk9PTCljb250ZW50c09u bHkKIHsKICAgICBBU1NFUlQoW1tOU0dyYXBoaWNzQ29udGV4dCBjdXJyZW50Q29udGV4dF0gaXNG bGlwcGVkXSk7CkBAIC01NDUsNyArNTY1LDcgQEAgc3RhdGljIGlubGluZSBXZWJEYXRhU291cmNl ICpkYXRhU291cmNlKERvY3VtZW50TG9hZGVyKiBsb2FkZXIpCiAgICAgICAgIGlmIChwYXJlbnRW aWV3KQogICAgICAgICAgICAgc2hvdWxkRmxhdHRlbiA9IHBhcmVudFZpZXctPnBhaW50QmVoYXZp b3IoKSAmIFBhaW50QmVoYXZpb3JGbGF0dGVuQ29tcG9zaXRpbmdMYXllcnM7CiAgICAgfSBlbHNl Ci0gICAgICAgIHNob3VsZEZsYXR0ZW4gPSBXS0NHQ29udGV4dElzQml0bWFwQ29udGV4dChjdHgp ICYmIFtnZXRXZWJWaWV3KHNlbGYpIF9pbmNsdWRlc0ZsYXR0ZW5lZENvbXBvc2l0aW5nTGF5ZXJz V2hlbkRyYXdpbmdUb0JpdG1hcF07CisgICAgICAgIHNob3VsZEZsYXR0ZW4gPSBbc2VsZiBfc2hv d0ZsYXR0ZW5lZENvbXBvc2l0aW5nTGF5ZXJzOmN0eF07CiAKICAgICBQYWludEJlaGF2aW9yIG9s ZEJlaGF2aW9yID0gUGFpbnRCZWhhdmlvck5vcm1hbDsKICAgICBpZiAoc2hvdWxkRmxhdHRlbikg ewpkaWZmIC0tZ2l0IGEvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkhUTUxWaWV3Lm1tIGIvV2ViS2l0 L21hYy9XZWJWaWV3L1dlYkhUTUxWaWV3Lm1tCmluZGV4IDU1NTg3YzQ2NWQwYmI4NTRjMDFjODY3 ODk3M2JlMDJiOWM5OTc3NmQuLmVjMjQ3M2ZjMWI1ODQzMjc3NTg1ODg3ZjhjMmEwZGQzZmM1NDk2 ZjIgMTAwNjQ0Ci0tLSBhL1dlYktpdC9tYWMvV2ViVmlldy9XZWJIVE1MVmlldy5tbQorKysgYi9X ZWJLaXQvbWFjL1dlYlZpZXcvV2ViSFRNTFZpZXcubW0KQEAgLTQ1Niw2ICs0NTYsNyBAQCBzdHJ1 Y3QgV2ViSFRNTFZpZXdJbnRlcnByZXRLZXlFdmVudHNQYXJhbWV0ZXJzIHsKICAgICAKICNpZiBV U0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCiAgICAgTlNWaWV3ICpsYXllckhvc3RpbmdWaWV3 OworICAgIEJPT0wgZHJhd2luZ0ludG9MYXllcjsKICNlbmRpZgogCiAgICAgTlNFdmVudCAqbW91 c2VEb3duRXZlbnQ7IC8vIEtlcHQgYWZ0ZXIgaGFuZGxpbmcgdGhlIGV2ZW50LgpAQCAtNTYzNiw2 ICs1NjM3LDI1IEBAIHN0YXRpYyBDR1BvaW50IGNvcmVHcmFwaGljc1NjcmVlblBvaW50Rm9yQXBw S2l0U2NyZWVuUG9pbnQoTlNQb2ludCBwb2ludCkKICAgICBbX3ByaXZhdGUtPmxheWVySG9zdGlu Z1ZpZXcgc2V0RnJhbWU6bGF5ZXJWaWV3RnJhbWVdOwogfQogI2VuZGlmIC8vIGRlZmluZWQoQlVJ TERJTkdfT05fTEVPUEFSRCkKKworLSAodm9pZClkcmF3TGF5ZXI6KENBTGF5ZXIgKilsYXllciBp bkNvbnRleHQ6KENHQ29udGV4dFJlZiljdHgKK3sKKyAgICBpZiAoX3ByaXZhdGUpIHsKKyAgICAg ICAgQVNTRVJUKCFfcHJpdmF0ZS0+ZHJhd2luZ0ludG9MYXllcik7CisgICAgICAgIF9wcml2YXRl LT5kcmF3aW5nSW50b0xheWVyID0gWUVTOworICAgIH0KKworICAgIFtzdXBlciBkcmF3TGF5ZXI6 bGF5ZXIgaW5Db250ZXh0OmN0eF07CisKKyAgICBpZiAoX3ByaXZhdGUpCisgICAgICAgIF9wcml2 YXRlLT5kcmF3aW5nSW50b0xheWVyID0gTk87Cit9CisKKy0gKEJPT0wpX3dlYl9pc0RyYXdpbmdJ bnRvTGF5ZXIKK3sKKyAgICByZXR1cm4gX3ByaXZhdGUtPmRyYXdpbmdJbnRvTGF5ZXI7Cit9CisK ICNlbmRpZiAvLyBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCiAKIEBlbmQKZGlmZiAtLWdp dCBhL1dlYktpdC9tYWMvV2ViVmlldy9XZWJIVE1MVmlld0ludGVybmFsLmggYi9XZWJLaXQvbWFj L1dlYlZpZXcvV2ViSFRNTFZpZXdJbnRlcm5hbC5oCmluZGV4IDJkOWUyYTk4NGZhOThjYzFmODk3 ZmZjMWYwMjNhMTg3YWU3NDk5MDcuLjA3YTc4MmFiNzdjYzdhY2MyZTBmZTgxMmUxOGNmMmM1YjM2 ZTY1MWMgMTAwNjQ0Ci0tLSBhL1dlYktpdC9tYWMvV2ViVmlldy9XZWJIVE1MVmlld0ludGVybmFs LmgKKysrIGIvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkhUTUxWaWV3SW50ZXJuYWwuaApAQCAtNjYs NiArNjYsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBP U0lUSU5HKQogLSAodm9pZClhdHRhY2hSb290TGF5ZXI6KENBTGF5ZXIqKWxheWVyOwogLSAodm9p ZClkZXRhY2hSb290TGF5ZXI7CistIChCT09MKV93ZWJfaXNEcmF3aW5nSW50b0xheWVyOwogI2Vu ZGlmCiAKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpICYmIGRlZmluZWQoQlVJTERJ TkdfT05fTEVPUEFSRCkK 71371 2010-10-20 17:31:11 -0700 2010-10-20 17:54:21 -0700 Patch bug-48024-20101020173109.patch text/plain 4948 simon.fraser ZGlmZiAtLWdpdCBhL1dlYktpdC9tYWMvQ2hhbmdlTG9nIGIvV2ViS2l0L21hYy9DaGFuZ2VMb2cK aW5kZXggYzkzMTY5OWI2MzMxMzgyYzAxZWExZjQxMDhhOWZkOGY3MTM2ZTk4MS4uNmFkMGYyMGZl NTVkNjM3YjMxNDZmYWM1ZGMzMTZkZGY3N2E1ZmE2YiAxMDA2NDQKLS0tIGEvV2ViS2l0L21hYy9D aGFuZ2VMb2cKKysrIGIvV2ViS2l0L21hYy9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyOSBAQAogMjAx MC0xMC0yMCAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAorICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb21wb3NpdGVkIGVsZW1l bnRzIGRyYXduIHR3aWNlIHdoZW4gV2ViVmlldyBpcyBsYXllci1iYWNrZWQKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ4MDI0CisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS83OTE2NTgwPgorICAgICAgICAKKyAgICAgICAgV2hlbiBkcmF3aW5nIGNvbnRl bnQgaW4gYSBsYXllci1iYWNrZWQgV2ViVmlldywgV2ViRnJhbWUncyB0ZXN0CisgICAgICAgIGZv ciBkcmF3aW5nIHRvIGEgYml0bWFwIHN1Y2NlZWRlZCwgY2F1c2luZyB1cyB0byBwYWludCBmbGF0 dGVuZWQKKyAgICAgICAgY29tcG9zaXRpbmcgbGF5ZXJzIGludG8gdGhlIHZpZXcuIFRoZXkgd291 bGQgYWxzbyBiZSByZW5kZXJlZAorICAgICAgICBieSB0aGUgbm9ybWFsIGNvbXBvc2l0aW5nIHBh dGgsIHJlc3VsdGluZyBpbiBkb3VibGUgcmVuZGVyaW5nLgorICAgICAgICAKKyAgICAgICAgRml4 IHRoaXMgYnkgZGV0ZWN0aW5nIHdoZW4gdGhlIFdlYkhUTUxWaWV3IGlzIGJlaW5nIGRyYXduIGlu dG8KKyAgICAgICAgYSBsYXllciwgYW5kIGF2b2lkaW5nIGZsYXR0ZW5pbmcgaW4gdGhhdCBjYXNl LgorCisgICAgICAgICogV2ViVmlldy9XZWJGcmFtZS5tbToKKyAgICAgICAgKC1bV2ViRnJhbWUg X3Nob3dGbGF0dGVuZWRDb21wb3NpdGluZ0xheWVyczpdKToKKyAgICAgICAgKC1bV2ViRnJhbWUg X2RyYXdSZWN0OmNvbnRlbnRzT25seTpdKToKKyAgICAgICAgKiBXZWJWaWV3L1dlYkhUTUxWaWV3 Lm1tOgorICAgICAgICAoLVtXZWJIVE1MVmlldyBkcmF3TGF5ZXI6aW5Db250ZXh0Ol0pOgorICAg ICAgICAoLVtXZWJIVE1MVmlldyBfd2ViX2lzRHJhd2luZ0ludG9MYXllcl0pOgorICAgICAgICAq IFdlYlZpZXcvV2ViSFRNTFZpZXdJbnRlcm5hbC5oOgorCisyMDEwLTEwLTIwICBTaW1vbiBGcmFz ZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmlu IEFkbGVyLgogCiAgICAgICAgIFJFR1JFU1NJT04ocjY3NTY4LXI2NzY0Myk6IFNvbWUgSFRNTC9D U1MgcmVuZGVycyB1cHNpZGUgZG93biBhbmQgYmFja3dhcmRzIG9uIExlb3BhcmQKZGlmZiAtLWdp dCBhL1dlYktpdC9tYWMvV2ViVmlldy9XZWJGcmFtZS5tbSBiL1dlYktpdC9tYWMvV2ViVmlldy9X ZWJGcmFtZS5tbQppbmRleCA0MDk5ZTQ2NzA1OGM3YzI0ZDA1MTFiNmExYWZjNzA0MWU3MDU1YjAx Li40ZjhjMWJhNTBmNzc3OGE0ZGIwNTQ1MDJiNDRjOTg3NmQzOTZmMGIwIDEwMDY0NAotLS0gYS9X ZWJLaXQvbWFjL1dlYlZpZXcvV2ViRnJhbWUubW0KKysrIGIvV2ViS2l0L21hYy9XZWJWaWV3L1dl YkZyYW1lLm1tCkBAIC01MjksNiArNTI5LDI2IEBAIHN0YXRpYyBpbmxpbmUgV2ViRGF0YVNvdXJj ZSAqZGF0YVNvdXJjZShEb2N1bWVudExvYWRlciogbG9hZGVyKQogICAgIHJldHVybiBbW1tOU1N0 cmluZyBhbGxvY10gaW5pdFdpdGhDaGFyYWN0ZXJzTm9Db3B5OmJ1ZiBsZW5ndGg6bGVuZ3RoIGZy ZWVXaGVuRG9uZTpZRVNdIGF1dG9yZWxlYXNlXTsKIH0KIAorLSAoQk9PTClfc2hvdWxkRmxhdHRl bkNvbXBvc2l0aW5nTGF5ZXJzOihDR0NvbnRleHRSZWYpY29udGV4dAoreworICAgIC8vIC1jdXJy ZW50Q29udGV4dERyYXdpbmdUb1NjcmVlbiByZXR1cm5zIFlFUyBmb3IgYml0bWFwIGNvbnRleHRz LgorICAgIEJPT0wgaXNQcmludGluZyA9ICFbTlNHcmFwaGljc0NvbnRleHQgY3VycmVudENvbnRl eHREcmF3aW5nVG9TY3JlZW5dOworICAgIGlmIChpc1ByaW50aW5nKQorICAgICAgICByZXR1cm4g WUVTOworCisgICAgaWYgKCFXS0NHQ29udGV4dElzQml0bWFwQ29udGV4dChjb250ZXh0KSkKKyAg ICAgICAgcmV0dXJuIE5POworCisgICAgLy8gSWYgd2UncmUgZHJhd2luZyBpbnRvIGEgYml0bWFw LCB3ZSBtaWdodCBiZSBzbmFwc2hvdHRpbmcsIG9yIGRyYXdpbmcgaW50byBhIGxheWVyLWJhY2tl ZCB2aWV3LgorICAgIGlmIChbZ2V0V2ViVmlldyhzZWxmKSBfdXNlc0RvY3VtZW50Vmlld3NdKSB7 CisgICAgICAgIGlkIGRvY3VtZW50VmlldyA9IFtfcHJpdmF0ZS0+d2ViRnJhbWVWaWV3IGRvY3Vt ZW50Vmlld107CisgICAgICAgIGlmIChbZG9jdW1lbnRWaWV3IGlzS2luZE9mQ2xhc3M6W1dlYkhU TUxWaWV3IGNsYXNzXV0gJiYgWyhXZWJIVE1MVmlldyAqKWRvY3VtZW50VmlldyBfd2ViX2lzRHJh d2luZ0ludG9MYXllcl0pCisgICAgICAgICAgICByZXR1cm4gTk87CisgICAgfQorCisgICAgcmV0 dXJuIFtnZXRXZWJWaWV3KHNlbGYpIF9pbmNsdWRlc0ZsYXR0ZW5lZENvbXBvc2l0aW5nTGF5ZXJz V2hlbkRyYXdpbmdUb0JpdG1hcF07Cit9CisKIC0gKHZvaWQpX2RyYXdSZWN0OihOU1JlY3QpcmVj dCBjb250ZW50c09ubHk6KEJPT0wpY29udGVudHNPbmx5CiB7CiAgICAgQVNTRVJUKFtbTlNHcmFw aGljc0NvbnRleHQgY3VycmVudENvbnRleHRdIGlzRmxpcHBlZF0pOwpAQCAtNTQ1LDcgKzU2NSw3 IEBAIHN0YXRpYyBpbmxpbmUgV2ViRGF0YVNvdXJjZSAqZGF0YVNvdXJjZShEb2N1bWVudExvYWRl ciogbG9hZGVyKQogICAgICAgICBpZiAocGFyZW50VmlldykKICAgICAgICAgICAgIHNob3VsZEZs YXR0ZW4gPSBwYXJlbnRWaWV3LT5wYWludEJlaGF2aW9yKCkgJiBQYWludEJlaGF2aW9yRmxhdHRl bkNvbXBvc2l0aW5nTGF5ZXJzOwogICAgIH0gZWxzZQotICAgICAgICBzaG91bGRGbGF0dGVuID0g V0tDR0NvbnRleHRJc0JpdG1hcENvbnRleHQoY3R4KSAmJiBbZ2V0V2ViVmlldyhzZWxmKSBfaW5j bHVkZXNGbGF0dGVuZWRDb21wb3NpdGluZ0xheWVyc1doZW5EcmF3aW5nVG9CaXRtYXBdOworICAg ICAgICBzaG91bGRGbGF0dGVuID0gW3NlbGYgX3Nob3VsZEZsYXR0ZW5Db21wb3NpdGluZ0xheWVy czpjdHhdOwogCiAgICAgUGFpbnRCZWhhdmlvciBvbGRCZWhhdmlvciA9IFBhaW50QmVoYXZpb3JO b3JtYWw7CiAgICAgaWYgKHNob3VsZEZsYXR0ZW4pIHsKZGlmZiAtLWdpdCBhL1dlYktpdC9tYWMv V2ViVmlldy9XZWJIVE1MVmlldy5tbSBiL1dlYktpdC9tYWMvV2ViVmlldy9XZWJIVE1MVmlldy5t bQppbmRleCA1NTU4N2M0NjVkMGJiODU0YzAxYzg2Nzg5NzNiZTAyYjljOTk3NzZkLi5lYzI0NzNm YzFiNTg0MzI3NzU4NTg4N2Y4YzJhMGRkM2ZjNTQ5NmYyIDEwMDY0NAotLS0gYS9XZWJLaXQvbWFj L1dlYlZpZXcvV2ViSFRNTFZpZXcubW0KKysrIGIvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkhUTUxW aWV3Lm1tCkBAIC00NTYsNiArNDU2LDcgQEAgc3RydWN0IFdlYkhUTUxWaWV3SW50ZXJwcmV0S2V5 RXZlbnRzUGFyYW1ldGVycyB7CiAgICAgCiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5H KQogICAgIE5TVmlldyAqbGF5ZXJIb3N0aW5nVmlldzsKKyAgICBCT09MIGRyYXdpbmdJbnRvTGF5 ZXI7CiAjZW5kaWYKIAogICAgIE5TRXZlbnQgKm1vdXNlRG93bkV2ZW50OyAvLyBLZXB0IGFmdGVy IGhhbmRsaW5nIHRoZSBldmVudC4KQEAgLTU2MzYsNiArNTYzNywyNSBAQCBzdGF0aWMgQ0dQb2lu dCBjb3JlR3JhcGhpY3NTY3JlZW5Qb2ludEZvckFwcEtpdFNjcmVlblBvaW50KE5TUG9pbnQgcG9p bnQpCiAgICAgW19wcml2YXRlLT5sYXllckhvc3RpbmdWaWV3IHNldEZyYW1lOmxheWVyVmlld0Zy YW1lXTsKIH0KICNlbmRpZiAvLyBkZWZpbmVkKEJVSUxESU5HX09OX0xFT1BBUkQpCisKKy0gKHZv aWQpZHJhd0xheWVyOihDQUxheWVyICopbGF5ZXIgaW5Db250ZXh0OihDR0NvbnRleHRSZWYpY3R4 Cit7CisgICAgaWYgKF9wcml2YXRlKSB7CisgICAgICAgIEFTU0VSVCghX3ByaXZhdGUtPmRyYXdp bmdJbnRvTGF5ZXIpOworICAgICAgICBfcHJpdmF0ZS0+ZHJhd2luZ0ludG9MYXllciA9IFlFUzsK KyAgICB9CisKKyAgICBbc3VwZXIgZHJhd0xheWVyOmxheWVyIGluQ29udGV4dDpjdHhdOworCisg ICAgaWYgKF9wcml2YXRlKQorICAgICAgICBfcHJpdmF0ZS0+ZHJhd2luZ0ludG9MYXllciA9IE5P OworfQorCistIChCT09MKV93ZWJfaXNEcmF3aW5nSW50b0xheWVyCit7CisgICAgcmV0dXJuIF9w cml2YXRlLT5kcmF3aW5nSW50b0xheWVyOworfQorCiAjZW5kaWYgLy8gVVNFKEFDQ0VMRVJBVEVE X0NPTVBPU0lUSU5HKQogCiBAZW5kCmRpZmYgLS1naXQgYS9XZWJLaXQvbWFjL1dlYlZpZXcvV2Vi SFRNTFZpZXdJbnRlcm5hbC5oIGIvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkhUTUxWaWV3SW50ZXJu YWwuaAppbmRleCAyZDllMmE5ODRmYTk4Y2MxZjg5N2ZmYzFmMDIzYTE4N2FlNzQ5OTA3Li4wN2E3 ODJhYjc3Y2M3YWNjMmUwZmU4MTJlMThjZjJjNWIzNmU2NTFjIDEwMDY0NAotLS0gYS9XZWJLaXQv bWFjL1dlYlZpZXcvV2ViSFRNTFZpZXdJbnRlcm5hbC5oCisrKyBiL1dlYktpdC9tYWMvV2ViVmll dy9XZWJIVE1MVmlld0ludGVybmFsLmgKQEAgLTY2LDYgKzY2LDcgQEAgbmFtZXNwYWNlIFdlYkNv cmUgewogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKIC0gKHZvaWQpYXR0YWNoUm9v dExheWVyOihDQUxheWVyKilsYXllcjsKIC0gKHZvaWQpZGV0YWNoUm9vdExheWVyOworLSAoQk9P TClfd2ViX2lzRHJhd2luZ0ludG9MYXllcjsKICNlbmRpZgogCiAjaWYgVVNFKEFDQ0VMRVJBVEVE X0NPTVBPU0lUSU5HKSAmJiBkZWZpbmVkKEJVSUxESU5HX09OX0xFT1BBUkQpCg==