78009 2012-02-07 11:39:30 -0800 [Qt] Fetch the visible rect from LayerTreeHost instead of keeping a copy in each layer. 2012-02-09 06:41:18 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jturcotte jturcotte kenneth menard noam webkit.review.bot zoltan oldest_to_newest 551182 0 jturcotte 2012-02-07 11:39:30 -0800 [Qt] Fetch the visible rect from LayerTreeHost instead of keeping a copy in each layer. 551185 1 125888 jturcotte 2012-02-07 11:41:10 -0800 Created attachment 125888 Patch 551501 2 125888 noam 2012-02-07 15:55:05 -0800 Comment on attachment 125888 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=125888&action=review LGTM with nitpicks > Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.cpp:495 > + if (m_mainBackingStore && m_mainBackingStore->contentsScale() != scale) { <nitpick> can be nicer with an early return. > Source/WebKit2/WebProcess/WebPage/qt/LayerTreeHostQt.cpp:431 > + for (HashSet<WebCore::WebGraphicsLayer*>::iterator iter = m_registeredLayers.begin(); iter != end; ++iter) { it instead of iter 553120 3 jturcotte 2012-02-09 06:41:18 -0800 Committed r107237: <http://trac.webkit.org/changeset/107237> 125888 2012-02-07 11:41:10 -0800 2012-02-07 15:55:05 -0800 Patch bug-78009-20120207203632.patch text/plain 8500 jturcotte U3VidmVyc2lvbiBSZXZpc2lvbjogMTA2ODAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggM2Y0ZjE3MGM1Zjc4ZTUy ODM2MTAyMzE2ZGQxM2ViNzQ0NTQ2MGFhZi4uZGIyYWFmNzM0NmE5ZmU0MDQ1ZmM2MWRkY2YxZTll OWUzMGMxOGQyOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMxIEBACiAyMDEyLTAyLTA3ICBKb2Nl bHluIFR1cmNvdHRlICA8am9jZWx5bi50dXJjb3R0ZUBub2tpYS5jb20+CiAKKyAgICAgICAgW1F0 XSBGZXRjaCB0aGUgdmlzaWJsZSByZWN0IGZyb20gTGF5ZXJUcmVlSG9zdCBpbnN0ZWFkIG9mIGtl ZXBpbmcgYSBjb3B5IGluIGVhY2ggbGF5ZXIuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD03ODAwOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFNpbmNlIFdlYkdyYXBoaWNzTGF5ZXJzIGFyZSBub3cgYWNjZXNz ZWQgZGlyZWN0bHkgZnJvbSBMYXllclRyZWVIb3N0LCB0aGV5IGRvbid0CisgICAgICAgIG5lZWQg dG8ga2VlcCB0aGUgdmlzaWJsZSByZWN0IHRvIHBhc3MgaXQgZG93biB0aGVpciBjaGlsZCBsYXll cnMgYW55bW9yZS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViR3Jh cGhpY3NMYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXZWJHcmFwaGljc0xheWVyOjpzZXRD b250ZW50c1NjYWxlKToKKyAgICAgICAgKFdlYkNvcmU6OldlYkdyYXBoaWNzTGF5ZXI6OnRpbGVk QmFja2luZ1N0b3JlVmlzaWJsZVJlY3QpOgorICAgICAgICAoV2ViQ29yZTo6V2ViR3JhcGhpY3NM YXllcjo6YWRqdXN0VmlzaWJsZVJlY3QpOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgICog V2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJHcmFwaGljc0xheWVyLmg6CisgICAgICAgIChX ZWJHcmFwaGljc0xheWVyQ2xpZW50KToKKyAgICAgICAgKFdlYkdyYXBoaWNzTGF5ZXIpOgorICAg ICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9xdC9MYXllclRyZWVIb3N0UXQuY3BwOgorICAgICAg ICAoV2ViS2l0OjpMYXllclRyZWVIb3N0UXQ6OnJlZ2lzdGVyTGF5ZXIpOgorICAgICAgICAoV2Vi S2l0OjpMYXllclRyZWVIb3N0UXQ6OnZpc2libGVDb250ZW50c1JlY3QpOgorICAgICAgICAoV2Vi S2l0KToKKyAgICAgICAgKFdlYktpdDo6TGF5ZXJUcmVlSG9zdFF0OjpzZXRWaXNpYmxlQ29udGVu dFJlY3RBbmRTY2FsZSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL3F0L0xheWVyVHJl ZUhvc3RRdC5oOgorICAgICAgICAoTGF5ZXJUcmVlSG9zdFF0KToKKworMjAxMi0wMi0wNyAgSm9j ZWx5biBUdXJjb3R0ZSAgPGpvY2VseW4udHVyY290dGVAbm9raWEuY29tPgorCiAgICAgICAgIFtR dF0gQ29udHJvbCB0aGUgbGlmZXRpbWUgb2YgVGlsZWRCYWNraW5nU3RvcmVzIGluIFdlYkdyYXBo aWNzTGF5ZXIuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD03ODAwNQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVT dXBwb3J0L1dlYkdyYXBoaWNzTGF5ZXIuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJDb3JlU3VwcG9ydC9XZWJHcmFwaGljc0xheWVyLmNwcAppbmRleCBkNmU1ODBhMjU1NzE4YWU4 YzcwNTNhZTNhZGI1ZGIyZDJjYzNiZjExLi45NWM1ZjA1NjFhMmMyMTVmZDdkNzk4NDU2YjNkMjNj ZjBjZDE0OTcxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVT dXBwb3J0L1dlYkdyYXBoaWNzTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViQ29yZVN1cHBvcnQvV2ViR3JhcGhpY3NMYXllci5jcHAKQEAgLTQ4OSwyMCArNDg5LDE0 IEBAIHZvaWQgV2ViR3JhcGhpY3NMYXllcjo6c2V0VmlzaWJsZUNvbnRlbnRSZWN0VHJhamVjdG9y eVZlY3Rvcihjb25zdCBGbG9hdFBvaW50JiB0CiAgICAgICAgIG1fbWFpbkJhY2tpbmdTdG9yZS0+ c2V0VmlzaWJsZVJlY3RUcmFqZWN0b3J5VmVjdG9yKHRyYWplY3RvcnlWZWN0b3IpOwogfQogCi12 b2lkIFdlYkdyYXBoaWNzTGF5ZXI6OnNldFZpc2libGVDb250ZW50UmVjdEFuZFNjYWxlKGNvbnN0 IEludFJlY3QmIHBhZ2VWaXNpYmxlUmVjdCwgZmxvYXQgc2NhbGUpCit2b2lkIFdlYkdyYXBoaWNz TGF5ZXI6OnNldENvbnRlbnRzU2NhbGUoZmxvYXQgc2NhbGUpCiB7Ci0gICAgaWYgKG1fcGFnZVZp c2libGVSZWN0ID09IHBhZ2VWaXNpYmxlUmVjdCAmJiBtX2NvbnRlbnRzU2NhbGUgPT0gc2NhbGUp Ci0gICAgICAgIHJldHVybjsKLQotICAgIG1fcGFnZVZpc2libGVSZWN0ID0gcGFnZVZpc2libGVS ZWN0OwogICAgIG1fY29udGVudHNTY2FsZSA9IHNjYWxlOwotCi0gICAgaWYgKCFtX21haW5CYWNr aW5nU3RvcmUgfHwgbV9tYWluQmFja2luZ1N0b3JlLT5jb250ZW50c1NjYWxlKCkgIT0gc2NhbGUp IHsKKyAgICBpZiAobV9tYWluQmFja2luZ1N0b3JlICYmIG1fbWFpbkJhY2tpbmdTdG9yZS0+Y29u dGVudHNTY2FsZSgpICE9IHNjYWxlKSB7CiAgICAgICAgIG1fcHJldmlvdXNCYWNraW5nU3RvcmUg PSBtX21haW5CYWNraW5nU3RvcmUucmVsZWFzZSgpOwogICAgICAgICBtX21haW5CYWNraW5nU3Rv cmUgPSBhZG9wdFB0cihuZXcgVGlsZWRCYWNraW5nU3RvcmUodGhpcywgVGlsZWRCYWNraW5nU3Rv cmVSZW1vdGVUaWxlQmFja2VuZDo6Y3JlYXRlKHRoaXMpKSk7CiAgICAgICAgIG1fbWFpbkJhY2tp bmdTdG9yZS0+c2V0Q29udGVudHNTY2FsZShzY2FsZSk7Ci0gICAgfSBlbHNlCi0gICAgICAgIG1f bWFpbkJhY2tpbmdTdG9yZS0+YWRqdXN0VmlzaWJsZVJlY3QoKTsKKyAgICB9CiB9CiAKIHZvaWQg V2ViR3JhcGhpY3NMYXllcjo6dGlsZWRCYWNraW5nU3RvcmVQYWludChHcmFwaGljc0NvbnRleHQq IGNvbnRleHQsIGNvbnN0IEludFJlY3QmIHJlY3QpCkBAIC01NDUsNyArNTM5LDcgQEAgSW50UmVj dCBXZWJHcmFwaGljc0xheWVyOjp0aWxlZEJhY2tpbmdTdG9yZVZpc2libGVSZWN0KCkKICAgICAv LyBSZXR1cm4gYSBwcm9qZWN0aW9uIG9mIHRoZSB2aXNpYmxlIHJlY3QgKHN1cmZhY2UgY29vcmRp bmF0ZXMpIG9udG8gdGhlIGxheWVyJ3MgcGxhbmUgKGxheWVyIGNvb3JkaW5hdGVzKS4KICAgICAv LyBUaGUgcmVzdWx0aW5nIHF1YWQgbWlnaHQgYmUgc3F1ZXdlZCBhbmQgdGhlIHZpc2libGUgcmVj dCBpcyB0aGUgYm91bmRpbmcgYm94IG9mIHRoaXMgcXVhZCwKICAgICAvLyBzbyBpdCBtaWdodCBz cHJlYWQgZnVydGhlciB0aGFuIHRoZSByZWFsIHZpc2libGUgYXJlYSAoYW5kIHRoZW4gZXZlbiBt b3JlIGFtcGxpZmllZCBieSB0aGUgY292ZXIgcmVjdCBtdWx0aXBsaWVyKS4KLSAgICByZXR1cm4g bV9sYXllclRyYW5zZm9ybS5jb21iaW5lZCgpLmludmVyc2UoKS5jbGFtcGVkQm91bmRzT2ZQcm9q ZWN0ZWRRdWFkKEZsb2F0UXVhZChGbG9hdFJlY3QobV9wYWdlVmlzaWJsZVJlY3QpKSk7CisgICAg cmV0dXJuIG1fbGF5ZXJUcmFuc2Zvcm0uY29tYmluZWQoKS5pbnZlcnNlKCkuY2xhbXBlZEJvdW5k c09mUHJvamVjdGVkUXVhZChGbG9hdFF1YWQoRmxvYXRSZWN0KG1fd2ViR3JhcGhpY3NMYXllckNs aWVudC0+dmlzaWJsZUNvbnRlbnRzUmVjdCgpKSkpOwogfQogCiBDb2xvciBXZWJHcmFwaGljc0xh eWVyOjp0aWxlZEJhY2tpbmdTdG9yZUJhY2tncm91bmRDb2xvcigpIGNvbnN0CkBAIC02MzAsNiAr NjI0LDEyIEBAIHZvaWQgV2ViR3JhcGhpY3NMYXllcjo6c2V0V2ViR3JhcGhpY3NMYXllckNsaWVu dChXZWJLaXQ6OldlYkdyYXBoaWNzTGF5ZXJDbGllbnQqCiAgICAgICAgIGNsaWVudC0+cmVnaXN0 ZXJMYXllcih0aGlzKTsKIH0KIAordm9pZCBXZWJHcmFwaGljc0xheWVyOjphZGp1c3RWaXNpYmxl UmVjdCgpCit7CisgICAgaWYgKG1fbWFpbkJhY2tpbmdTdG9yZSkKKyAgICAgICAgbV9tYWluQmFj a2luZ1N0b3JlLT5hZGp1c3RWaXNpYmxlUmVjdCgpOworfQorCiB2b2lkIFdlYkdyYXBoaWNzTGF5 ZXI6OmNvbXB1dGVUcmFuc2Zvcm1lZFZpc2libGVSZWN0KCkKIHsKICAgICAvLyBGSVhNRTogQ29u c2lkZXIgdHJhbnNmb3JtIGFuaW1hdGlvbnMgaW4gdGhlIHZpc2libGUgcmVjdCBjYWxjdWxhdGlv bi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQv V2ViR3JhcGhpY3NMYXllci5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3Vw cG9ydC9XZWJHcmFwaGljc0xheWVyLmgKaW5kZXggNTQwMGM3NjhlMzNkMjUyZjFiNWQyMjRmNGIz M2JjNjRhODgwZjYzYi4uOTJkYTkzMDk0MmQyYzNjZWZlYzkyZTViOTM0MmIyOTkzNTYyMDNjYiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJH cmFwaGljc0xheWVyLmgKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3Vw cG9ydC9XZWJHcmFwaGljc0xheWVyLmgKQEAgLTUyLDYgKzUyLDcgQEAgcHVibGljOgogICAgIHZp cnR1YWwgdm9pZCB1cGRhdGVUaWxlKFdlYkxheWVySUQsIGludCB0aWxlSUQsIGNvbnN0IFVwZGF0 ZUluZm8mKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIHJlbW92ZVRpbGUoV2ViTGF5ZXJJRCwgaW50 IHRpbGVJRCkgPSAwOwogCisgICAgdmlydHVhbCBXZWJDb3JlOjpJbnRSZWN0IHZpc2libGVDb250 ZW50c1JlY3QoKSBjb25zdCA9IDA7CiAgICAgdmlydHVhbCBib29sIGxheWVyVHJlZVRpbGVVcGRh dGVzQWxsb3dlZCgpIGNvbnN0ID0gMDsKICAgICB2aXJ0dWFsIGludDY0X3QgYWRvcHRJbWFnZUJh Y2tpbmdTdG9yZShXZWJDb3JlOjpJbWFnZSopID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgcmVsZWFz ZUltYWdlQmFja2luZ1N0b3JlKGludDY0X3QpID0gMDsKQEAgLTEwMiw3ICsxMDMsNyBAQCBwdWJs aWM6CiAgICAgdm9pZCBzZXROZWVkc0Rpc3BsYXkoKTsKICAgICB2b2lkIHNldE5lZWRzRGlzcGxh eUluUmVjdChjb25zdCBGbG9hdFJlY3QmKTsKICAgICB2b2lkIHNldENvbnRlbnRzTmVlZHNEaXNw bGF5KCk7Ci0gICAgdm9pZCBzZXRWaXNpYmxlQ29udGVudFJlY3RBbmRTY2FsZShjb25zdCBJbnRS ZWN0JiwgZmxvYXQgc2NhbGUpOworICAgIHZvaWQgc2V0Q29udGVudHNTY2FsZShmbG9hdCk7CiAg ICAgdm9pZCBzZXRWaXNpYmxlQ29udGVudFJlY3RUcmFqZWN0b3J5VmVjdG9yKGNvbnN0IEZsb2F0 UG9pbnQmKTsKICAgICB2aXJ0dWFsIHZvaWQgc3luY0NvbXBvc2l0aW5nU3RhdGUoY29uc3QgRmxv YXRSZWN0Jik7CiAgICAgdmlydHVhbCB2b2lkIHN5bmNDb21wb3NpdGluZ1N0YXRlRm9yVGhpc0xh eWVyT25seSgpOwpAQCAtMTM3LDYgKzEzOCw3IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgc2V0V2Vi R3JhcGhpY3NMYXllckNsaWVudChXZWJLaXQ6OldlYkdyYXBoaWNzTGF5ZXJDbGllbnQqKTsKIAor ICAgIHZvaWQgYWRqdXN0VmlzaWJsZVJlY3QoKTsKICAgICBib29sIGlzUmVhZHlGb3JUaWxlQnVm ZmVyU3dhcCgpIGNvbnN0OwogICAgIHZvaWQgdXBkYXRlQ29udGVudEJ1ZmZlcnMoKTsKICAgICB2 b2lkIHB1cmdlQmFja2luZ1N0b3JlcygpOwpAQCAtMTQ3LDcgKzE0OSw2IEBAIHByaXZhdGU6CiAg ICAgUmVmUHRyPEltYWdlPiBtX2ltYWdlOwogICAgIEdyYXBoaWNzTGF5ZXIqIG1fbWFza1Rhcmdl dDsKICAgICBGbG9hdFJlY3QgbV9uZWVkc0Rpc3BsYXlSZWN0OwotICAgIEludFJlY3QgbV9wYWdl VmlzaWJsZVJlY3Q7CiAgICAgTGF5ZXJUcmFuc2Zvcm0gbV9sYXllclRyYW5zZm9ybTsKICAgICBi b29sIG1fbmVlZHNEaXNwbGF5IDogMTsKICAgICBib29sIG1fbW9kaWZpZWQgOiAxOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL3F0L0xheWVyVHJlZUhvc3RR dC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvcXQvTGF5ZXJUcmVlSG9z dFF0LmNwcAppbmRleCAzMmZjOGU5ZTA2ZDBmMjkzNDc4MDFlN2YzYmFjMWZhOWM0ZWI0MDk5Li41 YjQxN2FiZWQ1MmJkMDVmODM4NTQwZWMxYmJiOTBhMGZkOWZjYmVhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvcXQvTGF5ZXJUcmVlSG9zdFF0LmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvcXQvTGF5ZXJUcmVlSG9zdFF0LmNw cApAQCAtMjQwLDcgKzI0MCw4IEBAIHZvaWQgTGF5ZXJUcmVlSG9zdFF0OjpyZWdpc3RlckxheWVy KFdlYkdyYXBoaWNzTGF5ZXIqIGxheWVyKQogICAgIEFTU0VSVCghbV9yZWdpc3RlcmVkTGF5ZXJz LmNvbnRhaW5zKGxheWVyKSk7CiAgICAgbV9yZWdpc3RlcmVkTGF5ZXJzLmFkZChsYXllcik7CiAK LSAgICBsYXllci0+c2V0VmlzaWJsZUNvbnRlbnRSZWN0QW5kU2NhbGUobV92aXNpYmxlQ29udGVu dHNSZWN0LCBtX2NvbnRlbnRzU2NhbGUpOworICAgIGxheWVyLT5zZXRDb250ZW50c1NjYWxlKG1f Y29udGVudHNTY2FsZSk7CisgICAgbGF5ZXItPmFkanVzdFZpc2libGVSZWN0KCk7CiB9CiAKIHZv aWQgTGF5ZXJUcmVlSG9zdFF0OjpyZWxlYXNlTGF5ZXIoV2ViR3JhcGhpY3NMYXllciogbGF5ZXIp CkBAIC00MTQsNiArNDE1LDExIEBAIHZvaWQgTGF5ZXJUcmVlSG9zdFF0OjpyZW1vdmVUaWxlKFdl YkxheWVySUQgbGF5ZXJJRCwgaW50IHRpbGVJRCkKICAgICBtX3dlYlBhZ2UtPnNlbmQoTWVzc2Fn ZXM6OkxheWVyVHJlZUhvc3RQcm94eTo6UmVtb3ZlVGlsZUZvckxheWVyKGxheWVySUQsIHRpbGVJ RCkpOwogfQogCitXZWJDb3JlOjpJbnRSZWN0IExheWVyVHJlZUhvc3RRdDo6dmlzaWJsZUNvbnRl bnRzUmVjdCgpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1fdmlzaWJsZUNvbnRlbnRzUmVjdDsKK30K Kwogdm9pZCBMYXllclRyZWVIb3N0UXQ6OnNldFZpc2libGVDb250ZW50UmVjdEFuZFNjYWxlKGNv bnN0IEludFJlY3QmIHJlY3QsIGZsb2F0IHNjYWxlKQogewogICAgIGlmIChyZWN0ID09IG1fdmlz aWJsZUNvbnRlbnRzUmVjdCAmJiBzY2FsZSA9PSBtX2NvbnRlbnRzU2NhbGUpCkBAIC00MjIsOCAr NDI4LDEwIEBAIHZvaWQgTGF5ZXJUcmVlSG9zdFF0OjpzZXRWaXNpYmxlQ29udGVudFJlY3RBbmRT Y2FsZShjb25zdCBJbnRSZWN0JiByZWN0LCBmbG9hdCBzCiAgICAgbV9jb250ZW50c1NjYWxlID0g c2NhbGU7CiAKICAgICBIYXNoU2V0PFdlYkNvcmU6OldlYkdyYXBoaWNzTGF5ZXIqPjo6aXRlcmF0 b3IgZW5kID0gbV9yZWdpc3RlcmVkTGF5ZXJzLmVuZCgpOwotICAgIGZvciAoSGFzaFNldDxXZWJD b3JlOjpXZWJHcmFwaGljc0xheWVyKj46Oml0ZXJhdG9yIGl0ZXIgPSBtX3JlZ2lzdGVyZWRMYXll cnMuYmVnaW4oKTsgaXRlciAhPSBlbmQ7ICsraXRlcikKLSAgICAgICAgKCppdGVyKS0+c2V0Vmlz aWJsZUNvbnRlbnRSZWN0QW5kU2NhbGUocmVjdCwgc2NhbGUpOworICAgIGZvciAoSGFzaFNldDxX ZWJDb3JlOjpXZWJHcmFwaGljc0xheWVyKj46Oml0ZXJhdG9yIGl0ZXIgPSBtX3JlZ2lzdGVyZWRM YXllcnMuYmVnaW4oKTsgaXRlciAhPSBlbmQ7ICsraXRlcikgeworICAgICAgICAoKml0ZXIpLT5z ZXRDb250ZW50c1NjYWxlKHNjYWxlKTsKKyAgICAgICAgKCppdGVyKS0+YWRqdXN0VmlzaWJsZVJl Y3QoKTsKKyAgICB9CiAgICAgc2NoZWR1bGVMYXllckZsdXNoKCk7CiB9CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9xdC9MYXllclRyZWVIb3N0UXQuaCBi L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9xdC9MYXllclRyZWVIb3N0UXQuaApp bmRleCA1OTYwNTljNDUyMzkwZDRmNWMxYzdiMjdjYzJjNDdmZGU1MTBhNmE1Li40OTM0MGZhOGE0 MWNjYzM1YzUwZjM4YjQwY2JkZWIxZTUwZDA1ZjZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvcXQvTGF5ZXJUcmVlSG9zdFF0LmgKKysrIGIvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL3F0L0xheWVyVHJlZUhvc3RRdC5oCkBAIC02OSw2ICs2 OSw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgY3JlYXRlVGlsZShXZWJMYXllcklELCBp bnQgdGlsZUlELCBjb25zdCBVcGRhdGVJbmZvJik7CiAgICAgdmlydHVhbCB2b2lkIHVwZGF0ZVRp bGUoV2ViTGF5ZXJJRCwgaW50IHRpbGVJRCwgY29uc3QgVXBkYXRlSW5mbyYpOwogICAgIHZpcnR1 YWwgdm9pZCByZW1vdmVUaWxlKFdlYkxheWVySUQsIGludCB0aWxlSUQpOworICAgIHZpcnR1YWwg V2ViQ29yZTo6SW50UmVjdCB2aXNpYmxlQ29udGVudHNSZWN0KCkgY29uc3Q7CiAgICAgdmlydHVh bCB2b2lkIHJlbmRlck5leHRGcmFtZSgpOwogICAgIHZpcnR1YWwgdm9pZCBwdXJnZUJhY2tpbmdT dG9yZXMoKTsKICAgICB2aXJ0dWFsIGJvb2wgbGF5ZXJUcmVlVGlsZVVwZGF0ZXNBbGxvd2VkKCkg Y29uc3Q7Cg==