92042 2012-07-23 16:01:15 -0700 Make RenderBlock::paintChildren virtual so sub classes can change the paint order 2012-07-24 13:53:36 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 92041 1 tony tony eric hyatt ojan webkit.review.bot oldest_to_newest 676127 0 tony 2012-07-23 16:01:15 -0700 Make RenderBlock::paintChildren virtual so sub classes can change the paint order 676129 1 153889 tony 2012-07-23 16:05:22 -0700 Created attachment 153889 Patch 676192 2 eric 2012-07-23 17:04:21 -0700 Perf impact? I wouldn't expect there to be much of one... 677068 3 tony 2012-07-24 11:41:47 -0700 (In reply to comment #2) > Perf impact? I wouldn't expect there to be much of one... Good question. I ran the moz page cycler on my machine and the difference appears to be in the noise. I'll watch the page cyclers on the bots when I land this. 677187 4 tony 2012-07-24 13:53:36 -0700 Committed r123524: <http://trac.webkit.org/changeset/123524> 153889 2012-07-23 16:05:22 -0700 2012-07-24 12:48:31 -0700 Patch bug-92042-20120723160539.patch text/plain 9461 tony U3VidmVyc2lvbiBSZXZpc2lvbjogMTIzMzg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODc4NmE1OWFjODFiOTBk MTgyYTA4NGQwYWVhOGEwOWI1NzI5MzkxNC4uOGM4ZDMzNTBlNWQ2MmEyNDg3N2I2ZWJjOGU1OWU0 YWEwNjUzMTdlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTA3LTIzICBUb255 IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgTWFrZSBSZW5kZXJCbG9jazo6 cGFpbnRDaGlsZHJlbiB2aXJ0dWFsIHNvIHN1YiBjbGFzc2VzIGNhbiBjaGFuZ2UgdGhlIHBhaW50 IG9yZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05 MjA0MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRo ZSBmbGV4Ym94IHNwZWMgc2F5cyB0aGF0IHRoZSBvcmRlciBwcm9wZXJ0eSBzaG91bGQgY2hhbmdl IHRoZSBwYWludCBvcmRlciBvZiBmbGV4IGNoaWxkcmVuLgorICAgICAgICBUbyBtYWtlIHRoYXQg cG9zc2libGUsIG1ha2UgcGFpbnRDaGlsZHJlbiB2aXJ0dWFsIHNvIFJlbmRlckZsZXhpYmxlQm94 IGNhbiBvdmVycmlkZSBpdC4KKworICAgICAgICBObyBuZXcgdGVzdHMsIHRoaXMgaXMganVzdCBh IHJlZmFjdG9yaW5nLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpwYWludENvbnRlbnRzKTogTW92ZSBzb21lIGNv ZGUgb3V0IG9mIHBhaW50Q2hpbGRyZW4gaW50byBwYWludENvbnRlbnRzLgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyQmxvY2s6OnBhaW50Q2hpbGRyZW4pOiBNYWtlIHZpcnR1YWwgYW5kIGp1c3Qg aGF2ZSBpdCBiZSBhIHNpbXBsZSBmb3IgbG9vcC4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJs b2NrOjpwYWludENoaWxkKTogTW92ZSBjb2RlIG91dCBvZiBwYWludENoaWxkcmVuIHNvIHN1YmNs YXNzZXMgY2FuIHJldXNlLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9jay5oOgorICAg ICAgICAoUmVuZGVyQmxvY2spOiBNYWtlIHBhaW50Q2hpbGRyZW4gdmlydHVhbCBhbmQgcHJvdGVj dGVkIHNvIHN1YiBjbGFzc2VzIGNhbiBjYWxsIHBhaW50Q2hpbGQuCisKIDIwMTItMDctMjMgIFNj b3R0IEdyYWhhbSAgPHNjb3R0bWdAZ29vZ2xlLmNvbT4KIAogICAgICAgICBVc2UgbmF0aXZlIChu b24tY3lnd2luKSBiaW5hcmllcyBmb3IgcGVybCwgZ3BlcmYsIGFuZCBiaXNvbiBpbiBDaHJvbWl1 bQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKaW5kZXggZjhlYWVkZmRh MWNhODE4ODRjNWRmNWZkY2RjNjEzNWY1ZDQ2OWQ1ZS4uMWI4ZGI5NDY4ZjFhZjNlNmQ4Y2RkNjI4 MzExYWIwMzIxMzJjMWFjNCAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckJsb2NrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2su Y3BwCkBAIC0yODY2LDYyICsyODY2LDcwIEBAIHZvaWQgUmVuZGVyQmxvY2s6OnBhaW50Q29udGVu dHMoUGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0IExheW91dFBvaW50JiBwYWludE9mCiAKICAg ICBpZiAoY2hpbGRyZW5JbmxpbmUoKSkKICAgICAgICAgbV9saW5lQm94ZXMucGFpbnQodGhpcywg cGFpbnRJbmZvLCBwYWludE9mZnNldCk7Ci0gICAgZWxzZQotICAgICAgICBwYWludENoaWxkcmVu KHBhaW50SW5mbywgcGFpbnRPZmZzZXQpOworICAgIGVsc2UgeworICAgICAgICBQYWludFBoYXNl IG5ld1BoYXNlID0gKHBhaW50SW5mby5waGFzZSA9PSBQYWludFBoYXNlQ2hpbGRPdXRsaW5lcykg PyBQYWludFBoYXNlT3V0bGluZSA6IHBhaW50SW5mby5waGFzZTsKKyAgICAgICAgbmV3UGhhc2Ug PSAobmV3UGhhc2UgPT0gUGFpbnRQaGFzZUNoaWxkQmxvY2tCYWNrZ3JvdW5kcykgPyBQYWludFBo YXNlQ2hpbGRCbG9ja0JhY2tncm91bmQgOiBuZXdQaGFzZTsKKworICAgICAgICAvLyBXZSBkb24n dCBwYWludCBvdXIgb3duIGJhY2tncm91bmQsIGJ1dCB3ZSBkbyBsZXQgdGhlIGtpZHMgcGFpbnQg dGhlaXIgYmFja2dyb3VuZHMuCisgICAgICAgIFBhaW50SW5mbyBwYWludEluZm9Gb3JDaGlsZChw YWludEluZm8pOworICAgICAgICBwYWludEluZm9Gb3JDaGlsZC5waGFzZSA9IG5ld1BoYXNlOwor ICAgICAgICBwYWludEluZm9Gb3JDaGlsZC51cGRhdGVQYWludGluZ1Jvb3RGb3JDaGlsZHJlbih0 aGlzKTsKKworICAgICAgICAvLyBGSVhNRTogUGFpbnQtdGltZSBwYWdpbmF0aW9uIGlzIG9ic29s ZXRlIGFuZCBpcyBub3cgb25seSB1c2VkIGJ5IGVtYmVkZGVkIFdlYlZpZXdzIGluc2lkZSBBcHBL aXQKKyAgICAgICAgLy8gTlNWaWV3cy4gRG8gbm90IGFkZCBhbnkgbW9yZSBjb2RlIGZvciB0aGlz LgorICAgICAgICBib29sIHVzZVByaW50UmVjdCA9ICF2aWV3KCktPnByaW50UmVjdCgpLmlzRW1w dHkoKTsKKyAgICAgICAgcGFpbnRDaGlsZHJlbihwYWludEluZm8sIHBhaW50T2Zmc2V0LCBwYWlu dEluZm9Gb3JDaGlsZCwgdXNlUHJpbnRSZWN0KTsKKyAgICB9CiB9CiAKLXZvaWQgUmVuZGVyQmxv Y2s6OnBhaW50Q2hpbGRyZW4oUGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0IExheW91dFBvaW50 JiBwYWludE9mZnNldCkKK3ZvaWQgUmVuZGVyQmxvY2s6OnBhaW50Q2hpbGRyZW4oUGFpbnRJbmZv JiBwYWludEluZm8sIGNvbnN0IExheW91dFBvaW50JiBwYWludE9mZnNldCwgUGFpbnRJbmZvJiBw YWludEluZm9Gb3JDaGlsZCwgYm9vbCB1c2VQcmludFJlY3QpCiB7Ci0gICAgUGFpbnRQaGFzZSBu ZXdQaGFzZSA9IChwYWludEluZm8ucGhhc2UgPT0gUGFpbnRQaGFzZUNoaWxkT3V0bGluZXMpID8g UGFpbnRQaGFzZU91dGxpbmUgOiBwYWludEluZm8ucGhhc2U7Ci0gICAgbmV3UGhhc2UgPSAobmV3 UGhhc2UgPT0gUGFpbnRQaGFzZUNoaWxkQmxvY2tCYWNrZ3JvdW5kcykgPyBQYWludFBoYXNlQ2hp bGRCbG9ja0JhY2tncm91bmQgOiBuZXdQaGFzZTsKLSAgICAKLSAgICAvLyBXZSBkb24ndCBwYWlu dCBvdXIgb3duIGJhY2tncm91bmQsIGJ1dCB3ZSBkbyBsZXQgdGhlIGtpZHMgcGFpbnQgdGhlaXIg YmFja2dyb3VuZHMuCi0gICAgUGFpbnRJbmZvIGluZm8ocGFpbnRJbmZvKTsKLSAgICBpbmZvLnBo YXNlID0gbmV3UGhhc2U7Ci0gICAgaW5mby51cGRhdGVQYWludGluZ1Jvb3RGb3JDaGlsZHJlbih0 aGlzKTsKLSAgICAKLSAgICAvLyBGSVhNRTogUGFpbnQtdGltZSBwYWdpbmF0aW9uIGlzIG9ic29s ZXRlIGFuZCBpcyBub3cgb25seSB1c2VkIGJ5IGVtYmVkZGVkIFdlYlZpZXdzIGluc2lkZSBBcHBL aXQKLSAgICAvLyBOU1ZpZXdzLiAgRG8gbm90IGFkZCBhbnkgbW9yZSBjb2RlIGZvciB0aGlzLgot ICAgIFJlbmRlclZpZXcqIHJlbmRlclZpZXcgPSB2aWV3KCk7Ci0gICAgYm9vbCB1c2VQcmludFJl Y3QgPSAhcmVuZGVyVmlldy0+cHJpbnRSZWN0KCkuaXNFbXB0eSgpOwotICAgIAotICAgIGZvciAo UmVuZGVyQm94KiBjaGlsZCA9IGZpcnN0Q2hpbGRCb3goKTsgY2hpbGQ7IGNoaWxkID0gY2hpbGQt Pm5leHRTaWJsaW5nQm94KCkpIHsgICAgICAgIAotICAgICAgICAvLyBDaGVjayBmb3IgcGFnZS1i cmVhay1iZWZvcmU6IGFsd2F5cywgYW5kIGlmIGl0J3Mgc2V0LCBicmVhayBhbmQgYmFpbC4KLSAg ICAgICAgYm9vbCBjaGVja0JlZm9yZUFsd2F5cyA9ICFjaGlsZHJlbklubGluZSgpICYmICh1c2VQ cmludFJlY3QgJiYgY2hpbGQtPnN0eWxlKCktPnBhZ2VCcmVha0JlZm9yZSgpID09IFBCQUxXQVlT KTsKLSAgICAgICAgTGF5b3V0VW5pdCBhYnNvbHV0ZUNoaWxkWSA9IHBhaW50T2Zmc2V0LnkoKSAr IGNoaWxkLT55KCk7Ci0gICAgICAgIGlmIChjaGVja0JlZm9yZUFsd2F5cwotICAgICAgICAgICAg JiYgYWJzb2x1dGVDaGlsZFkgPiBwYWludEluZm8ucmVjdC55KCkKLSAgICAgICAgICAgICYmIGFi c29sdXRlQ2hpbGRZIDwgcGFpbnRJbmZvLnJlY3QubWF4WSgpKSB7Ci0gICAgICAgICAgICB2aWV3 KCktPnNldEJlc3RUcnVuY2F0ZWRBdChhYnNvbHV0ZUNoaWxkWSwgdGhpcywgdHJ1ZSk7CisgICAg Zm9yIChSZW5kZXJCb3gqIGNoaWxkID0gZmlyc3RDaGlsZEJveCgpOyBjaGlsZDsgY2hpbGQgPSBj aGlsZC0+bmV4dFNpYmxpbmdCb3goKSkgeworICAgICAgICBpZiAoIXBhaW50Q2hpbGQoY2hpbGQs IHBhaW50SW5mbywgcGFpbnRPZmZzZXQsIHBhaW50SW5mb0ZvckNoaWxkLCB1c2VQcmludFJlY3Qp KQogICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB9CisgICAgfQorfQogCi0gICAgICAgIGlm ICghY2hpbGQtPmlzRmxvYXRpbmcoKSAmJiBjaGlsZC0+aXNSZXBsYWNlZCgpICYmIHVzZVByaW50 UmVjdCAmJiBjaGlsZC0+aGVpZ2h0KCkgPD0gcmVuZGVyVmlldy0+cHJpbnRSZWN0KCkuaGVpZ2h0 KCkpIHsKLSAgICAgICAgICAgIC8vIFBhZ2luYXRlIGJsb2NrLWxldmVsIHJlcGxhY2VkIGVsZW1l bnRzLgotICAgICAgICAgICAgaWYgKGFic29sdXRlQ2hpbGRZICsgY2hpbGQtPmhlaWdodCgpID4g cmVuZGVyVmlldy0+cHJpbnRSZWN0KCkubWF4WSgpKSB7Ci0gICAgICAgICAgICAgICAgaWYgKGFi c29sdXRlQ2hpbGRZIDwgcmVuZGVyVmlldy0+dHJ1bmNhdGVkQXQoKSkKLSAgICAgICAgICAgICAg ICAgICAgcmVuZGVyVmlldy0+c2V0QmVzdFRydW5jYXRlZEF0KGFic29sdXRlQ2hpbGRZLCBjaGls ZCk7Ci0gICAgICAgICAgICAgICAgLy8gSWYgd2Ugd2VyZSBhYmxlIHRvIHRydW5jYXRlLCBkb24n dCBwYWludC4KLSAgICAgICAgICAgICAgICBpZiAoYWJzb2x1dGVDaGlsZFkgPj0gcmVuZGVyVmll dy0+dHJ1bmNhdGVkQXQoKSkKLSAgICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAg ICB9Citib29sIFJlbmRlckJsb2NrOjpwYWludENoaWxkKFJlbmRlckJveCogY2hpbGQsIFBhaW50 SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBMYXlvdXRQb2ludCYgcGFpbnRPZmZzZXQsIFBhaW50SW5m byYgcGFpbnRJbmZvRm9yQ2hpbGQsIGJvb2wgdXNlUHJpbnRSZWN0KQoreworICAgIC8vIENoZWNr IGZvciBwYWdlLWJyZWFrLWJlZm9yZTogYWx3YXlzLCBhbmQgaWYgaXQncyBzZXQsIGJyZWFrIGFu ZCBiYWlsLgorICAgIGJvb2wgY2hlY2tCZWZvcmVBbHdheXMgPSAhY2hpbGRyZW5JbmxpbmUoKSAm JiAodXNlUHJpbnRSZWN0ICYmIGNoaWxkLT5zdHlsZSgpLT5wYWdlQnJlYWtCZWZvcmUoKSA9PSBQ QkFMV0FZUyk7CisgICAgTGF5b3V0VW5pdCBhYnNvbHV0ZUNoaWxkWSA9IHBhaW50T2Zmc2V0Lnko KSArIGNoaWxkLT55KCk7CisgICAgaWYgKGNoZWNrQmVmb3JlQWx3YXlzCisgICAgICAgICYmIGFi c29sdXRlQ2hpbGRZID4gcGFpbnRJbmZvLnJlY3QueSgpCisgICAgICAgICYmIGFic29sdXRlQ2hp bGRZIDwgcGFpbnRJbmZvLnJlY3QubWF4WSgpKSB7CisgICAgICAgIHZpZXcoKS0+c2V0QmVzdFRy dW5jYXRlZEF0KGFic29sdXRlQ2hpbGRZLCB0aGlzLCB0cnVlKTsKKyAgICAgICAgcmV0dXJuIGZh bHNlOworICAgIH0KKworICAgIFJlbmRlclZpZXcqIHJlbmRlclZpZXcgPSB2aWV3KCk7CisgICAg aWYgKCFjaGlsZC0+aXNGbG9hdGluZygpICYmIGNoaWxkLT5pc1JlcGxhY2VkKCkgJiYgdXNlUHJp bnRSZWN0ICYmIGNoaWxkLT5oZWlnaHQoKSA8PSByZW5kZXJWaWV3LT5wcmludFJlY3QoKS5oZWln aHQoKSkgeworICAgICAgICAvLyBQYWdpbmF0ZSBibG9jay1sZXZlbCByZXBsYWNlZCBlbGVtZW50 cy4KKyAgICAgICAgaWYgKGFic29sdXRlQ2hpbGRZICsgY2hpbGQtPmhlaWdodCgpID4gcmVuZGVy Vmlldy0+cHJpbnRSZWN0KCkubWF4WSgpKSB7CisgICAgICAgICAgICBpZiAoYWJzb2x1dGVDaGls ZFkgPCByZW5kZXJWaWV3LT50cnVuY2F0ZWRBdCgpKQorICAgICAgICAgICAgICAgIHJlbmRlclZp ZXctPnNldEJlc3RUcnVuY2F0ZWRBdChhYnNvbHV0ZUNoaWxkWSwgY2hpbGQpOworICAgICAgICAg ICAgLy8gSWYgd2Ugd2VyZSBhYmxlIHRvIHRydW5jYXRlLCBkb24ndCBwYWludC4KKyAgICAgICAg ICAgIGlmIChhYnNvbHV0ZUNoaWxkWSA+PSByZW5kZXJWaWV3LT50cnVuY2F0ZWRBdCgpKQorICAg ICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgfQorICAgIH0KIAotICAgICAgICBM YXlvdXRQb2ludCBjaGlsZFBvaW50ID0gZmxpcEZvcldyaXRpbmdNb2RlRm9yQ2hpbGQoY2hpbGQs IHBhaW50T2Zmc2V0KTsKLSAgICAgICAgaWYgKCFjaGlsZC0+aGFzU2VsZlBhaW50aW5nTGF5ZXIo KSAmJiAhY2hpbGQtPmlzRmxvYXRpbmcoKSkKLSAgICAgICAgICAgIGNoaWxkLT5wYWludChpbmZv LCBjaGlsZFBvaW50KTsKKyAgICBMYXlvdXRQb2ludCBjaGlsZFBvaW50ID0gZmxpcEZvcldyaXRp bmdNb2RlRm9yQ2hpbGQoY2hpbGQsIHBhaW50T2Zmc2V0KTsKKyAgICBpZiAoIWNoaWxkLT5oYXNT ZWxmUGFpbnRpbmdMYXllcigpICYmICFjaGlsZC0+aXNGbG9hdGluZygpKQorICAgICAgICBjaGls ZC0+cGFpbnQocGFpbnRJbmZvRm9yQ2hpbGQsIGNoaWxkUG9pbnQpOwogCi0gICAgICAgIC8vIENo ZWNrIGZvciBwYWdlLWJyZWFrLWFmdGVyOiBhbHdheXMsIGFuZCBpZiBpdCdzIHNldCwgYnJlYWsg YW5kIGJhaWwuCi0gICAgICAgIGJvb2wgY2hlY2tBZnRlckFsd2F5cyA9ICFjaGlsZHJlbklubGlu ZSgpICYmICh1c2VQcmludFJlY3QgJiYgY2hpbGQtPnN0eWxlKCktPnBhZ2VCcmVha0FmdGVyKCkg PT0gUEJBTFdBWVMpOwotICAgICAgICBpZiAoY2hlY2tBZnRlckFsd2F5cwotICAgICAgICAgICAg JiYgKGFic29sdXRlQ2hpbGRZICsgY2hpbGQtPmhlaWdodCgpKSA+IHBhaW50SW5mby5yZWN0Lnko KQotICAgICAgICAgICAgJiYgKGFic29sdXRlQ2hpbGRZICsgY2hpbGQtPmhlaWdodCgpKSA8IHBh aW50SW5mby5yZWN0Lm1heFkoKSkgewotICAgICAgICAgICAgdmlldygpLT5zZXRCZXN0VHJ1bmNh dGVkQXQoYWJzb2x1dGVDaGlsZFkgKyBjaGlsZC0+aGVpZ2h0KCkgKyBtYXgoWkVST19MQVlPVVRf VU5JVCwgY2hpbGQtPmNvbGxhcHNlZE1hcmdpbkFmdGVyKCkpLCB0aGlzLCB0cnVlKTsKLSAgICAg ICAgICAgIHJldHVybjsKLSAgICAgICAgfQorICAgIC8vIENoZWNrIGZvciBwYWdlLWJyZWFrLWFm dGVyOiBhbHdheXMsIGFuZCBpZiBpdCdzIHNldCwgYnJlYWsgYW5kIGJhaWwuCisgICAgYm9vbCBj aGVja0FmdGVyQWx3YXlzID0gIWNoaWxkcmVuSW5saW5lKCkgJiYgKHVzZVByaW50UmVjdCAmJiBj aGlsZC0+c3R5bGUoKS0+cGFnZUJyZWFrQWZ0ZXIoKSA9PSBQQkFMV0FZUyk7CisgICAgaWYgKGNo ZWNrQWZ0ZXJBbHdheXMKKyAgICAgICAgJiYgKGFic29sdXRlQ2hpbGRZICsgY2hpbGQtPmhlaWdo dCgpKSA+IHBhaW50SW5mby5yZWN0LnkoKQorICAgICAgICAmJiAoYWJzb2x1dGVDaGlsZFkgKyBj aGlsZC0+aGVpZ2h0KCkpIDwgcGFpbnRJbmZvLnJlY3QubWF4WSgpKSB7CisgICAgICAgIHZpZXco KS0+c2V0QmVzdFRydW5jYXRlZEF0KGFic29sdXRlQ2hpbGRZICsgY2hpbGQtPmhlaWdodCgpICsg bWF4KFpFUk9fTEFZT1VUX1VOSVQsIGNoaWxkLT5jb2xsYXBzZWRNYXJnaW5BZnRlcigpKSwgdGhp cywgdHJ1ZSk7CisgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CisgICAgcmV0dXJuIHRydWU7 CiB9CiAKKwogdm9pZCBSZW5kZXJCbG9jazo6cGFpbnRDYXJldChQYWludEluZm8mIHBhaW50SW5m bywgY29uc3QgTGF5b3V0UG9pbnQmIHBhaW50T2Zmc2V0LCBDYXJldFR5cGUgdHlwZSkKIHsKICAg ICAvLyBQYWludCB0aGUgY2FyZXQgaWYgdGhlIEZyYW1lU2VsZWN0aW9uIHNheXMgc28gb3IgaWYg Y2FyZXQgYnJvd3NpbmcgaXMgZW5hYmxlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJsb2NrLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxv Y2suaAppbmRleCA2OTUxYzI2MjQzODg3ODIyOWM0Y2Q0NWVlNWFhODY0ODMyODU4MGU3Li4wN2M4 ZGI3Mjc4OWVkZDk4MmJmM2U0NTUzMzY5ODVlZDUwMmE0MDU3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQmxvY2suaApAQCAtNDE0LDYgKzQxNCw4IEBAIHByb3RlY3RlZDoKIAogICAg IHZpcnR1YWwgdm9pZCBwYWludChQYWludEluZm8mLCBjb25zdCBMYXlvdXRQb2ludCYpOwogICAg IHZpcnR1YWwgdm9pZCBwYWludE9iamVjdChQYWludEluZm8mLCBjb25zdCBMYXlvdXRQb2ludCYp OworICAgIHZpcnR1YWwgdm9pZCBwYWludENoaWxkcmVuKFBhaW50SW5mbyYgZm9yU2VsZiwgY29u c3QgTGF5b3V0UG9pbnQmLCBQYWludEluZm8mIGZvckNoaWxkLCBib29sIHVzZVByaW50UmVjdCk7 CisgICAgYm9vbCBwYWludENoaWxkKFJlbmRlckJveCosIFBhaW50SW5mbyYgZm9yU2VsZiwgY29u c3QgTGF5b3V0UG9pbnQmLCBQYWludEluZm8mIGZvckNoaWxkLCBib29sIHVzZVByaW50UmVjdCk7 CiAgICAKICAgICBMYXlvdXRVbml0IGxvZ2ljYWxSaWdodE9mZnNldEZvckxpbmUoTGF5b3V0VW5p dCBwb3NpdGlvbiwgTGF5b3V0VW5pdCBmaXhlZE9mZnNldCwgYm9vbCBhcHBseVRleHRJbmRlbnQs IExheW91dFVuaXQqIGxvZ2ljYWxIZWlnaHRSZW1haW5pbmcgPSAwLCBMYXlvdXRVbml0IGxvZ2lj YWxIZWlnaHQgPSAwKSBjb25zdDsKICAgICBMYXlvdXRVbml0IGxvZ2ljYWxMZWZ0T2Zmc2V0Rm9y TGluZShMYXlvdXRVbml0IHBvc2l0aW9uLCBMYXlvdXRVbml0IGZpeGVkT2Zmc2V0LCBib29sIGFw cGx5VGV4dEluZGVudCwgTGF5b3V0VW5pdCogbG9naWNhbEhlaWdodFJlbWFpbmluZyA9IDAsIExh eW91dFVuaXQgbG9naWNhbEhlaWdodCA9IDApIGNvbnN0OwpAQCAtNzMyLDcgKzczNCw2IEBAIHBy aXZhdGU6CiAgICAgdm9pZCBwYWludENvbnRlbnRzKFBhaW50SW5mbyYsIGNvbnN0IExheW91dFBv aW50Jik7CiAgICAgdm9pZCBwYWludENvbHVtbkNvbnRlbnRzKFBhaW50SW5mbyYsIGNvbnN0IExh eW91dFBvaW50JiwgYm9vbCBwYWludEZsb2F0cyA9IGZhbHNlKTsKICAgICB2b2lkIHBhaW50Q29s dW1uUnVsZXMoUGFpbnRJbmZvJiwgY29uc3QgTGF5b3V0UG9pbnQmKTsKLSAgICB2b2lkIHBhaW50 Q2hpbGRyZW4oUGFpbnRJbmZvJiwgY29uc3QgTGF5b3V0UG9pbnQmKTsKICAgICB2b2lkIHBhaW50 RWxsaXBzaXNCb3hlcyhQYWludEluZm8mLCBjb25zdCBMYXlvdXRQb2ludCYpOwogICAgIHZvaWQg cGFpbnRTZWxlY3Rpb24oUGFpbnRJbmZvJiwgY29uc3QgTGF5b3V0UG9pbnQmKTsKICAgICB2b2lk IHBhaW50Q2FyZXQoUGFpbnRJbmZvJiwgY29uc3QgTGF5b3V0UG9pbnQmLCBDYXJldFR5cGUpOwo=