150814 2015-11-02 13:30:45 -0800 hasOverflowClip() does not necessarily mean valid layer(). 2015-11-02 15:17:47 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zalan zalan commit-queue esprehn+autocc glenn kondapallykalyan simon.fraser oldest_to_newest 1138671 0 zalan 2015-11-02 13:30:45 -0800 Since requiresLayer() can be overwritten, any renderer subclass can just simply return false even when overflow clip is present. 1138675 1 264621 zalan 2015-11-02 13:38:55 -0800 Created attachment 264621 Patch 1138723 2 264621 commit-queue 2015-11-02 15:17:43 -0800 Comment on attachment 264621 Patch Clearing flags on attachment: 264621 Committed r191915: <http://trac.webkit.org/changeset/191915> 1138724 3 commit-queue 2015-11-02 15:17:47 -0800 All reviewed patches have been landed. Closing bug. 264621 2015-11-02 13:38:55 -0800 2015-11-02 15:17:43 -0800 Patch bug-150814-20151102133759.patch text/plain 8756 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTkxODg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjgwMmY5YTgzYzFmMmQ4 Y2E4MTBiMWE1ZjM1ODBjZWNiNDA0NDMwZS4uZGMwOTBlNjQyNmQyMmJjM2Q0MDM1MzhmNmFiZTBl MTQzMDJiYjQ3MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE1LTExLTAyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgaGFzT3ZlcmZsb3dDbGlwKCkg ZG9lcyBub3QgbmVjZXNzYXJpbHkgbWVhbiB2YWxpZCBsYXllcigpLgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUwODE0CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2VydGFpbiBSZW5kZXJMYXllck1vZGVs T2JqZWN0IGRlcml2ZWQgY2xhc3NlcyBzaW1wbHkgcmV0dXJuIGZhbHNlIGZvciA6OnJlcXVpcmVz TGF5ZXIoKSwgd2hpY2ggbWVhbnMKKyAgICAgICAgdGhhdCB3ZSBlbmQgdXAgbm90IGNyZWF0aW5n IGEgbGF5ZXIgZm9yIHRoZSBvdmVyZmxvdyBjbGlwcGVkIGNvbnRlbnQuICAgCisKKyAgICAgICAg Tm8gY2hhbmdlIGluIGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy QmxvY2suY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OnVwZGF0ZVNjcm9sbElu Zm9BZnRlckxheW91dCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6cGFpbnQpOgor ICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyQm94OjpzdHlsZURpZENoYW5nZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OnNj cm9sbFdpZHRoKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6c2Nyb2xsSGVpZ2h0KToK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6c2Nyb2xsTGVmdCk6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJCb3g6OnNjcm9sbFRvcCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6 OnNldFNjcm9sbExlZnQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94OjpzZXRTY3JvbGxU b3ApOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94OjppbmNsdWRlVmVydGljYWxTY3JvbGxi YXJTaXplKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6aW5jbHVkZUhvcml6b250YWxT Y3JvbGxiYXJTaXplKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6aW50cmluc2ljU2Ny b2xsYmFyTG9naWNhbFdpZHRoKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6dXNlc0Nv bXBvc2l0ZWRTY3JvbGxpbmcpOgorCiAyMDE1LTExLTAyICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5u LmZhYmxldEBjcmYuY2Fub24uZnI+CiAKICAgICAgICAgUmVuYW1lIEpTRE9NV3JhcHBlci5pbXBs IHRvIEpTRE9NV3JhcHBlci53cmFwcGVkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQmxvY2suY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJs b2NrLmNwcAppbmRleCAwN2NjMDNiNTJkNGE1YWY5MzJkOTRhZjJkNmQ1NDY5N2NjYWVmNTJhLi5j NjNiMDUxY2IxOTM4MWZmMzk2Y2JiZDk3MzRkZjEwNjk5Y2NmMDNmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKQEAgLTkwMCwyMyArOTAwLDIyIEBAIHZvaWQgUmVu ZGVyQmxvY2s6OnJlbW92ZUZyb21VcGRhdGVTY3JvbGxJbmZvQWZ0ZXJMYXlvdXRUcmFuc2FjdGlv bigpCiAKIHZvaWQgUmVuZGVyQmxvY2s6OnVwZGF0ZVNjcm9sbEluZm9BZnRlckxheW91dCgpCiB7 Ci0gICAgaWYgKGhhc092ZXJmbG93Q2xpcCgpKSB7Ci0gICAgICAgIGlmIChzdHlsZSgpLmlzRmxp cHBlZEJsb2Nrc1dyaXRpbmdNb2RlKCkpIHsKLSAgICAgICAgICAgIC8vIEZJWE1FOiBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTc5MzcKLSAgICAgICAgICAgIC8vIFdv cmthcm91bmQgZm9yIG5vdy4gV2UgY2Fubm90IGRlbGF5IHRoZSBzY3JvbGwgaW5mbyBmb3Igb3Zl cmZsb3cKLSAgICAgICAgICAgIC8vIGZvciBpdGVtcyB3aXRoIG9wcG9zaXRlIHdyaXRpbmcgZGly ZWN0aW9ucywgYXMgdGhlIGNvbnRlbnRzIG5lZWRzCi0gICAgICAgICAgICAvLyB0byBvdmVyZmxv dyBpbiB0aGF0IGRpcmVjdGlvbgotICAgICAgICAgICAgbGF5ZXIoKS0+dXBkYXRlU2Nyb2xsSW5m b0FmdGVyTGF5b3V0KCk7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLQorICAgIGlm ICghaGFzT3ZlcmZsb3dDbGlwKCkpCisgICAgICAgIHJldHVybjsKKyAgICAKKyAgICAvLyBGSVhN RTogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk3OTM3CisgICAgLy8g V29ya2Fyb3VuZCBmb3Igbm93LiBXZSBjYW5ub3QgZGVsYXkgdGhlIHNjcm9sbCBpbmZvIGZvciBv dmVyZmxvdworICAgIC8vIGZvciBpdGVtcyB3aXRoIG9wcG9zaXRlIHdyaXRpbmcgZGlyZWN0aW9u cywgYXMgdGhlIGNvbnRlbnRzIG5lZWRzCisgICAgLy8gdG8gb3ZlcmZsb3cgaW4gdGhhdCBkaXJl Y3Rpb24KKyAgICBpZiAoIXN0eWxlKCkuaXNGbGlwcGVkQmxvY2tzV3JpdGluZ01vZGUoKSkgewog ICAgICAgICBVcGRhdGVTY3JvbGxJbmZvQWZ0ZXJMYXlvdXRUcmFuc2FjdGlvbiogdHJhbnNhY3Rp b24gPSBjdXJyZW50VXBkYXRlU2Nyb2xsSW5mb0FmdGVyTGF5b3V0VHJhbnNhY3Rpb24oKTsKICAg ICAgICAgaWYgKHRyYW5zYWN0aW9uICYmIHRyYW5zYWN0aW9uLT52aWV3ID09ICZ2aWV3KCkpIHsK ICAgICAgICAgICAgIHRyYW5zYWN0aW9uLT5ibG9ja3MuYWRkKHRoaXMpOwogICAgICAgICAgICAg cmV0dXJuOwogICAgICAgICB9Ci0gICAgICAgIGxheWVyKCktPnVwZGF0ZVNjcm9sbEluZm9BZnRl ckxheW91dCgpOwogICAgIH0KKyAgICBpZiAobGF5ZXIoKSkKKyAgICAgICAgbGF5ZXIoKS0+dXBk YXRlU2Nyb2xsSW5mb0FmdGVyTGF5b3V0KCk7CiB9CiAKIHZvaWQgUmVuZGVyQmxvY2s6OmxheW91 dCgpCkBAIC0xNDIzLDkgKzE0MjIsMTAgQEAgdm9pZCBSZW5kZXJCbG9jazo6cGFpbnQoUGFpbnRJ bmZvJiBwYWludEluZm8sIGNvbnN0IExheW91dFBvaW50JiBwYWludE9mZnNldCkKICAgICAgICAg cG9wQ29udGVudHNDbGlwKHBhaW50SW5mbywgcGhhc2UsIGFkanVzdGVkUGFpbnRPZmZzZXQpOwog CiAgICAgLy8gT3VyIHNjcm9sbGJhciB3aWRnZXRzIHBhaW50IGV4YWN0bHkgd2hlbiB3ZSB0ZWxs IHRoZW0gdG8sIHNvIHRoYXQgdGhleSB3b3JrIHByb3Blcmx5IHdpdGgKLSAgICAvLyB6LWluZGV4 LiAgV2UgcGFpbnQgYWZ0ZXIgd2UgcGFpbnRlZCB0aGUgYmFja2dyb3VuZC9ib3JkZXIsIHNvIHRo YXQgdGhlIHNjcm9sbGJhcnMgd2lsbAorICAgIC8vIHotaW5kZXguIFdlIHBhaW50IGFmdGVyIHdl IHBhaW50ZWQgdGhlIGJhY2tncm91bmQvYm9yZGVyLCBzbyB0aGF0IHRoZSBzY3JvbGxiYXJzIHdp bGwKICAgICAvLyBzaXQgYWJvdmUgdGhlIGJhY2tncm91bmQvYm9yZGVyLgotICAgIGlmICgocGhh c2UgPT0gUGFpbnRQaGFzZUJsb2NrQmFja2dyb3VuZCB8fCBwaGFzZSA9PSBQYWludFBoYXNlQ2hp bGRCbG9ja0JhY2tncm91bmQpICYmIGhhc092ZXJmbG93Q2xpcCgpICYmIHN0eWxlKCkudmlzaWJp bGl0eSgpID09IFZJU0lCTEUgJiYgcGFpbnRJbmZvLnNob3VsZFBhaW50V2l0aGluUm9vdCgqdGhp cykgJiYgIXBhaW50SW5mby5wYWludFJvb3RCYWNrZ3JvdW5kT25seSgpKQorICAgIGlmICgocGhh c2UgPT0gUGFpbnRQaGFzZUJsb2NrQmFja2dyb3VuZCB8fCBwaGFzZSA9PSBQYWludFBoYXNlQ2hp bGRCbG9ja0JhY2tncm91bmQpICYmIGhhc092ZXJmbG93Q2xpcCgpICYmIGxheWVyKCkKKyAgICAg ICAgJiYgc3R5bGUoKS52aXNpYmlsaXR5KCkgPT0gVklTSUJMRSAmJiBwYWludEluZm8uc2hvdWxk UGFpbnRXaXRoaW5Sb290KCp0aGlzKSAmJiAhcGFpbnRJbmZvLnBhaW50Um9vdEJhY2tncm91bmRP bmx5KCkpCiAgICAgICAgIGxheWVyKCktPnBhaW50T3ZlcmZsb3dDb250cm9scyhwYWludEluZm8u Y29udGV4dCgpLCByb3VuZGVkSW50UG9pbnQoYWRqdXN0ZWRQYWludE9mZnNldCksIHNuYXBwZWRJ bnRSZWN0KHBhaW50SW5mby5yZWN0KSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJveC5jcHAKaW5kZXggMDYwNzQzNmUyZmZkZmY4NzBlZWNmNmI4YWE3MGM3MTJmMzk4YWE2NC4u MjVlYjhjMmQ4NjdkM2Q3N2E0ZDRlZWY2ZTk4OTQ4ZDhlMjI3MDEwOSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJveC5jcHAKQEAgLTM1Miw3ICszNTIsNyBAQCB2b2lkIFJlbmRlckJv eDo6c3R5bGVEaWRDaGFuZ2UoU3R5bGVEaWZmZXJlbmNlIGRpZmYsIGNvbnN0IFJlbmRlclN0eWxl KiBvbGRTdHlsZQogCiAgICAgLy8gSWYgb3VyIHpvb20gZmFjdG9yIGNoYW5nZXMgYW5kIHdlIGhh dmUgYSBkZWZpbmVkIHNjcm9sbExlZnQvVG9wLCB3ZSBuZWVkIHRvIGFkanVzdCB0aGF0IHZhbHVl IGludG8gdGhlCiAgICAgLy8gbmV3IHpvb21lZCBjb29yZGluYXRlIHNwYWNlLgotICAgIGlmICho YXNPdmVyZmxvd0NsaXAoKSAmJiBvbGRTdHlsZSAmJiBvbGRTdHlsZS0+ZWZmZWN0aXZlWm9vbSgp ICE9IG5ld1N0eWxlLmVmZmVjdGl2ZVpvb20oKSAmJiBsYXllcigpKSB7CisgICAgaWYgKGhhc092 ZXJmbG93Q2xpcCgpICYmIGxheWVyKCkgJiYgb2xkU3R5bGUgJiYgb2xkU3R5bGUtPmVmZmVjdGl2 ZVpvb20oKSAhPSBuZXdTdHlsZS5lZmZlY3RpdmVab29tKCkpIHsKICAgICAgICAgaWYgKGludCBs ZWZ0ID0gbGF5ZXIoKS0+c2Nyb2xsWE9mZnNldCgpKSB7CiAgICAgICAgICAgICBsZWZ0ID0gKGxl ZnQgLyBvbGRTdHlsZS0+ZWZmZWN0aXZlWm9vbSgpKSAqIG5ld1N0eWxlLmVmZmVjdGl2ZVpvb20o KTsKICAgICAgICAgICAgIGxheWVyKCktPnNjcm9sbFRvWE9mZnNldChsZWZ0KTsKQEAgLTU1Miw3 ICs1NTIsNyBAQCBMYXlvdXRVbml0IFJlbmRlckJveDo6Y2xpZW50SGVpZ2h0KCkgY29uc3QKIAog aW50IFJlbmRlckJveDo6c2Nyb2xsV2lkdGgoKSBjb25zdAogewotICAgIGlmIChoYXNPdmVyZmxv d0NsaXAoKSkKKyAgICBpZiAoaGFzT3ZlcmZsb3dDbGlwKCkgJiYgbGF5ZXIoKSkKICAgICAgICAg cmV0dXJuIGxheWVyKCktPnNjcm9sbFdpZHRoKCk7CiAgICAgLy8gRm9yIG9iamVjdHMgd2l0aCB2 aXNpYmxlIG92ZXJmbG93LCB0aGlzIG1hdGNoZXMgSUUuCiAgICAgLy8gRklYTUU6IE5lZWQgdG8g d29yayByaWdodCB3aXRoIHdyaXRpbmcgbW9kZXMuCkBAIC01NjUsNyArNTY1LDcgQEAgaW50IFJl bmRlckJveDo6c2Nyb2xsV2lkdGgoKSBjb25zdAogCiBpbnQgUmVuZGVyQm94OjpzY3JvbGxIZWln aHQoKSBjb25zdAogewotICAgIGlmIChoYXNPdmVyZmxvd0NsaXAoKSkKKyAgICBpZiAoaGFzT3Zl cmZsb3dDbGlwKCkgJiYgbGF5ZXIoKSkKICAgICAgICAgcmV0dXJuIGxheWVyKCktPnNjcm9sbEhl aWdodCgpOwogICAgIC8vIEZvciBvYmplY3RzIHdpdGggdmlzaWJsZSBvdmVyZmxvdywgdGhpcyBt YXRjaGVzIElFLgogICAgIC8vIEZJWE1FOiBOZWVkIHRvIHdvcmsgcmlnaHQgd2l0aCB3cml0aW5n IG1vZGVzLgpAQCAtNTc1LDEyICs1NzUsMTIgQEAgaW50IFJlbmRlckJveDo6c2Nyb2xsSGVpZ2h0 KCkgY29uc3QKIAogaW50IFJlbmRlckJveDo6c2Nyb2xsTGVmdCgpIGNvbnN0CiB7Ci0gICAgcmV0 dXJuIGhhc092ZXJmbG93Q2xpcCgpID8gbGF5ZXIoKS0+c2Nyb2xsWE9mZnNldCgpIDogMDsKKyAg ICByZXR1cm4gaGFzT3ZlcmZsb3dDbGlwKCkgJiYgbGF5ZXIoKSA/IGxheWVyKCktPnNjcm9sbFhP ZmZzZXQoKSA6IDA7CiB9CiAKIGludCBSZW5kZXJCb3g6OnNjcm9sbFRvcCgpIGNvbnN0CiB7Ci0g ICAgcmV0dXJuIGhhc092ZXJmbG93Q2xpcCgpID8gbGF5ZXIoKS0+c2Nyb2xsWU9mZnNldCgpIDog MDsKKyAgICByZXR1cm4gaGFzT3ZlcmZsb3dDbGlwKCkgJiYgbGF5ZXIoKSA/IGxheWVyKCktPnNj cm9sbFlPZmZzZXQoKSA6IDA7CiB9CiAKIHN0YXRpYyB2b2lkIHNldHVwV2hlZWxFdmVudFRlc3RU cmlnZ2VyKFJlbmRlckxheWVyJiBsYXllciwgRnJhbWUqIGZyYW1lKQpAQCAtNTk3LDE4ICs1OTcs MTggQEAgc3RhdGljIHZvaWQgc2V0dXBXaGVlbEV2ZW50VGVzdFRyaWdnZXIoUmVuZGVyTGF5ZXIm IGxheWVyLCBGcmFtZSogZnJhbWUpCiAKIHZvaWQgUmVuZGVyQm94OjpzZXRTY3JvbGxMZWZ0KGlu dCBuZXdMZWZ0KQogewotICAgIGlmIChoYXNPdmVyZmxvd0NsaXAoKSkgewotICAgICAgICBzZXR1 cFdoZWVsRXZlbnRUZXN0VHJpZ2dlcigqbGF5ZXIoKSwgZG9jdW1lbnQoKS5mcmFtZSgpKTsKLSAg ICAgICAgbGF5ZXIoKS0+c2Nyb2xsVG9YT2Zmc2V0KG5ld0xlZnQsIFJlbmRlckxheWVyOjpTY3Jv bGxPZmZzZXRDbGFtcGVkKTsKLSAgICB9CisgICAgaWYgKCFoYXNPdmVyZmxvd0NsaXAoKSB8fCAh bGF5ZXIoKSkKKyAgICAgICAgcmV0dXJuOworICAgIHNldHVwV2hlZWxFdmVudFRlc3RUcmlnZ2Vy KCpsYXllcigpLCBkb2N1bWVudCgpLmZyYW1lKCkpOworICAgIGxheWVyKCktPnNjcm9sbFRvWE9m ZnNldChuZXdMZWZ0LCBSZW5kZXJMYXllcjo6U2Nyb2xsT2Zmc2V0Q2xhbXBlZCk7CiB9CiAKIHZv aWQgUmVuZGVyQm94OjpzZXRTY3JvbGxUb3AoaW50IG5ld1RvcCkKIHsKLSAgICBpZiAoaGFzT3Zl cmZsb3dDbGlwKCkpIHsKLSAgICAgICAgc2V0dXBXaGVlbEV2ZW50VGVzdFRyaWdnZXIoKmxheWVy KCksIGRvY3VtZW50KCkuZnJhbWUoKSk7Ci0gICAgICAgIGxheWVyKCktPnNjcm9sbFRvWU9mZnNl dChuZXdUb3AsIFJlbmRlckxheWVyOjpTY3JvbGxPZmZzZXRDbGFtcGVkKTsKLSAgICB9CisgICAg aWYgKCFoYXNPdmVyZmxvd0NsaXAoKSB8fCAhbGF5ZXIoKSkKKyAgICAgICAgcmV0dXJuOworICAg IHNldHVwV2hlZWxFdmVudFRlc3RUcmlnZ2VyKCpsYXllcigpLCBkb2N1bWVudCgpLmZyYW1lKCkp OworICAgIGxheWVyKCktPnNjcm9sbFRvWU9mZnNldChuZXdUb3AsIFJlbmRlckxheWVyOjpTY3Jv bGxPZmZzZXRDbGFtcGVkKTsKIH0KIAogdm9pZCBSZW5kZXJCb3g6OmFic29sdXRlUmVjdHMoVmVj dG9yPEludFJlY3Q+JiByZWN0cywgY29uc3QgTGF5b3V0UG9pbnQmIGFjY3VtdWxhdGVkT2Zmc2V0 KSBjb25zdApAQCAtNzYxLDEzICs3NjEsMTMgQEAgYm9vbCBSZW5kZXJCb3g6OmZpeGVkRWxlbWVu dExheXNPdXRSZWxhdGl2ZVRvRnJhbWUoY29uc3QgRnJhbWVWaWV3JiBmcmFtZVZpZXcpIGMKIAog Ym9vbCBSZW5kZXJCb3g6OmluY2x1ZGVWZXJ0aWNhbFNjcm9sbGJhclNpemUoKSBjb25zdAogewot ICAgIHJldHVybiBoYXNPdmVyZmxvd0NsaXAoKSAmJiAhbGF5ZXIoKS0+aGFzT3ZlcmxheVNjcm9s bGJhcnMoKQorICAgIHJldHVybiBoYXNPdmVyZmxvd0NsaXAoKSAmJiBsYXllcigpICYmICFsYXll cigpLT5oYXNPdmVybGF5U2Nyb2xsYmFycygpCiAgICAgICAgICYmIChzdHlsZSgpLm92ZXJmbG93 WSgpID09IE9TQ1JPTEwgfHwgc3R5bGUoKS5vdmVyZmxvd1koKSA9PSBPQVVUTyk7CiB9CiAKIGJv b2wgUmVuZGVyQm94OjppbmNsdWRlSG9yaXpvbnRhbFNjcm9sbGJhclNpemUoKSBjb25zdAogewot ICAgIHJldHVybiBoYXNPdmVyZmxvd0NsaXAoKSAmJiAhbGF5ZXIoKS0+aGFzT3ZlcmxheVNjcm9s bGJhcnMoKQorICAgIHJldHVybiBoYXNPdmVyZmxvd0NsaXAoKSAmJiBsYXllcigpICYmICFsYXll cigpLT5oYXNPdmVybGF5U2Nyb2xsYmFycygpCiAgICAgICAgICYmIChzdHlsZSgpLm92ZXJmbG93 WCgpID09IE9TQ1JPTEwgfHwgc3R5bGUoKS5vdmVyZmxvd1goKSA9PSBPQVVUTyk7CiB9CiAKQEAg LTc4NywxMiArNzg3LDEyIEBAIGludCBSZW5kZXJCb3g6OmludHJpbnNpY1Njcm9sbGJhckxvZ2lj YWxXaWR0aCgpIGNvbnN0CiAgICAgICAgIHJldHVybiAwOwogCiAgICAgaWYgKGlzSG9yaXpvbnRh bFdyaXRpbmdNb2RlKCkgJiYgKHN0eWxlKCkub3ZlcmZsb3dZKCkgPT0gT1NDUk9MTCAmJiAhaGFz VmVydGljYWxTY3JvbGxiYXJXaXRoQXV0b0JlaGF2aW9yKCkpKSB7Ci0gICAgICAgIEFTU0VSVChs YXllcigpLT5oYXNWZXJ0aWNhbFNjcm9sbGJhcigpKTsKKyAgICAgICAgQVNTRVJUKGxheWVyKCkg JiYgbGF5ZXIoKS0+aGFzVmVydGljYWxTY3JvbGxiYXIoKSk7CiAgICAgICAgIHJldHVybiB2ZXJ0 aWNhbFNjcm9sbGJhcldpZHRoKCk7CiAgICAgfQogCiAgICAgaWYgKCFpc0hvcml6b250YWxXcml0 aW5nTW9kZSgpICYmIChzdHlsZSgpLm92ZXJmbG93WCgpID09IE9TQ1JPTEwgJiYgIWhhc0hvcml6 b250YWxTY3JvbGxiYXJXaXRoQXV0b0JlaGF2aW9yKCkpKSB7Ci0gICAgICAgIEFTU0VSVChsYXll cigpLT5oYXNIb3Jpem9udGFsU2Nyb2xsYmFyKCkpOworICAgICAgICBBU1NFUlQobGF5ZXIoKSAm JiBsYXllcigpLT5oYXNIb3Jpem9udGFsU2Nyb2xsYmFyKCkpOwogICAgICAgICByZXR1cm4gaG9y aXpvbnRhbFNjcm9sbGJhckhlaWdodCgpOwogICAgIH0KIAo=