25066 2009-04-06 17:46:19 -0700 Video controls misplaced when dynamically adding reflection or opacity 2009-04-18 22:01:08 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser eric.carlson hyatt koivisto oldest_to_newest 116699 0 simon.fraser 2009-04-06 17:46:19 -0700 The video control bar shows up in the wrong location when you dynamically add a reflection, say on hover. 116701 1 29297 simon.fraser 2009-04-06 17:46:40 -0700 Created attachment 29297 Testcase: hover over the video 117570 2 simon.fraser 2009-04-14 22:17:24 -0700 Same bug happens with opacity. Seems to be related to the video element getting a layer. 117725 3 simon.fraser 2009-04-15 23:06:22 -0700 The problem here is that RenderMedia lies about the RenderObject hierarchy. It overrides RenderMedia::children() to return the children of the m_controlsShadowRoot renderer, thus skipping that renderer itself. This confuses RenderLayer::insertOnlyThisLayer(), which iterates through its child renderers, calling RenderObject::moveLayers() on each one. For RenderMedia, this finds the wrong renderers (which is important because the m_controlsShadowRoot has a layer!). If we actually add the m_controlsShadowRoot renderer as a child of the RenderMedia, and don't like about the render hierarchy, it works fine. Antti, was there a reason for faking the renderer hierarchy here? 117862 4 koivisto 2009-04-16 18:35:30 -0700 Simon, I think you should ask Hyatt who did that change. 117863 5 koivisto 2009-04-16 18:38:03 -0700 Probably just a mistake. 117869 6 simon.fraser 2009-04-16 20:47:31 -0700 Those changes came from r28397: http://trac.webkit.org/changeset/28397#file11 117878 7 koivisto 2009-04-16 22:00:59 -0700 No they are not. They are from http://trac.webkit.org/changeset/40461. 117881 8 simon.fraser 2009-04-16 23:27:57 -0700 Ah, right. Dave, can you explain what you did here? http://trac.webkit.org/changeset/40461/trunk/WebCore/rendering/RenderMedia.cpp 118017 9 29598 simon.fraser 2009-04-17 22:41:08 -0700 Created attachment 29598 Patch, testcase, changelog 118020 10 29598 koivisto 2009-04-18 00:44:03 -0700 Comment on attachment 29598 Patch, testcase, changelog r=me 118049 11 simon.fraser 2009-04-18 22:01:08 -0700 http://trac.webkit.org/changeset/42651 29297 2009-04-06 17:46:40 -0700 2009-04-17 22:41:08 -0700 Testcase: hover over the video reflected_video.html text/html 657 simon.fraser PCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9XM0MvL0RURCBIVE1MIDQuMDEvL0VOIgogICJodHRw Oi8vd3d3LnczLm9yZy9UUi9odG1sNC9zdHJpY3QuZHRkIj4KCjxodG1sPgo8aGVhZD4KICA8bWV0 YSBodHRwLWVxdWl2PSJDb250ZW50LVR5cGUiIGNvbnRlbnQ9InRleHQvaHRtbDsgY2hhcnNldD11 dGYtOCI+CiAgPHRpdGxlPlJlZmxlY3RlZCB2aWRlbzwvdGl0bGU+CiAgCiAgPHN0eWxlIHR5cGU9 InRleHQvY3NzIiBtZWRpYT0ic2NyZWVuIj4KICAgIAogICAgdmlkZW8gewogICAgICBib3JkZXI6 IDRweCBzb2xpZCBibHVlOwogICAgICBtYXJnaW46IDUwcHg7CiAgICB9CiAgICAKICAgIC5yZWZs ZWN0ZWQgewogICAgfQogICAgCiAgICB2aWRlbzpob3ZlciB7CiAgICAgIC13ZWJraXQtYm94LXJl ZmxlY3Q6YmVsb3cgNXB4IC13ZWJraXQtZ3JhZGllbnQobGluZWFyLCBsZWZ0IHRvcCwgbGVmdCBi b3R0b20sIGZyb20odHJhbnNwYXJlbnQpLCBjb2xvci1zdG9wKDAuNSwgdHJhbnNwYXJlbnQpLCB0 byh3aGl0ZSkpOwogICAgfQogIDwvc3R5bGU+CiAgCjwvaGVhZD4KPGJvZHk+CiAgCiAgPHZpZGVv IHNyYz0iIiB3aWR0aD0iNDgwIiBoZWlnaHQ9IjI3MCIgY29udHJvbHMgIGNsYXNzPSJyZWZsZWN0 ZWQiPjwvdmlkZW8+Cgo8L2JvZHk+CjwvaHRtbD4K 29598 2009-04-17 22:41:08 -0700 2009-04-18 00:44:03 -0700 Patch, testcase, changelog 25066_patch.txt text/plain 9137 simon.fraser ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA1YzY3N2M3Li40MGIyMjNiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMDktMDQt MTcgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjUwNjYKKyAgICAgICAgCisgICAgICAgIEFkZCB0 ZXN0Y2FzZSBmb3IgZHluYW1pY2FsbHkgZ2l2aW5nIDx2aWRlbz4gYSBsYXllciwgdmlhIG9wYWNp dHkuCisKKyAgICAgICAgKiBmYXN0L2xheWVycy92aWRlby1sYXllci5odG1sOiBBZGRlZC4KKyAg ICAgICAgKiBwbGF0Zm9ybS9tYWMvZmFzdC9sYXllcnMvdmlkZW8tbGF5ZXItZXhwZWN0ZWQuY2hl Y2tzdW06IEFkZGVkLgorICAgICAgICAqIHBsYXRmb3JtL21hYy9mYXN0L2xheWVycy92aWRlby1s YXllci1leHBlY3RlZC5wbmc6IEFkZGVkLgorICAgICAgICAqIHBsYXRmb3JtL21hYy9mYXN0L2xh eWVycy92aWRlby1sYXllci1leHBlY3RlZC50eHQ6IEFkZGVkLgorCiAyMDA5LTA0LTE3ICBPbGl2 ZXIgSHVudCAgPG9saXZlckBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4g QWRsZXIuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2xheWVycy92aWRlby1sYXllci5o dG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9sYXllcnMvdmlkZW8tbGF5ZXIuaHRtbApuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4xNzFmMDliCi0tLSAvZGV2L251bGwKKysrIGIvTGF5 b3V0VGVzdHMvZmFzdC9sYXllcnMvdmlkZW8tbGF5ZXIuaHRtbApAQCAtMCwwICsxLDE4IEBACis8 aHRtbD4KKzxoZWFkPgorICA8dGl0bGU+VmlkZW8gZWxlbWVudCBnZXRzIGxheWVyPC90aXRsZT4K KyAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KKyAgICB2aWRlbyB7CisgICAgICBib3JkZXI6IDFw eCBzb2xpZCBibGFjazsKKyAgICAgIG1hcmdpbjogNTBweDsKKyAgICB9CisgIDwvc3R5bGU+Cis8 L2hlYWQ+Cis8Ym9keT4KKyAgPHA+PGEgaHJlZj0iaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTI1MDY2Ij5odHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjUwNjY8L2E+PGJyPiBjb250cm9scyBzaG91bGQgbm90IGJlIG1pc3BsYWNlZCB3aGVuIHZp ZGVvIGdldHMgYSBSZW5kZXJMYXllci48L3A+CisgIDx2aWRlbyBpZD0idmlkZW8iIGNvbnRyb2xz PjwvdmlkZW8+CisgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBjaGFyc2V0PSJ1dGYt OCI+CisgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3ZpZGVvJykuc3R5bGUub3BhY2l0eSA9 IDAuNTsKKyAgPC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9wbGF0Zm9ybS9tYWMvZmFzdC9sYXllcnMvdmlkZW8tbGF5ZXItZXhwZWN0ZWQuY2hlY2tz dW0gYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvZmFzdC9sYXllcnMvdmlkZW8tbGF5ZXItZXhw ZWN0ZWQuY2hlY2tzdW0KbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZjRmNTQy YQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9mYXN0L2xheWVy cy92aWRlby1sYXllci1leHBlY3RlZC5jaGVja3N1bQpAQCAtMCwwICsxIEBACisyNzhjNzI1Yjlm ZTM0NWFkNzAxNTk4YjAxYjM5MzE5NQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9mYXN0L2xheWVycy92aWRlby1sYXllci1l eHBlY3RlZC5wbmcgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvZmFzdC9sYXllcnMvdmlkZW8t bGF5ZXItZXhwZWN0ZWQucG5nCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjk0 ZDBmOGMKQmluYXJ5IGZpbGVzIC9kZXYvbnVsbCBhbmQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9t YWMvZmFzdC9sYXllcnMvdmlkZW8tbGF5ZXItZXhwZWN0ZWQucG5nIGRpZmZlcgpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2Zhc3QvbGF5ZXJzL3ZpZGVvLWxheWVyLWV4cGVj dGVkLnR4dCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9mYXN0L2xheWVycy92aWRlby1sYXll ci1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZDAzYzcz NQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9mYXN0L2xheWVy cy92aWRlby1sYXllci1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwzNyBAQAorbGF5ZXIgYXQgKDAs MCkgc2l6ZSA4MDB4NjAwCisgIFJlbmRlclZpZXcgYXQgKDAsMCkgc2l6ZSA4MDB4NjAwCitsYXll ciBhdCAoMCwwKSBzaXplIDgwMHg2MDAKKyAgUmVuZGVyQmxvY2sge0hUTUx9IGF0ICgwLDApIHNp emUgODAweDYwMAorICAgIFJlbmRlckJvZHkge0JPRFl9IGF0ICg4LDgpIHNpemUgNzg0eDU4NAor ICAgICAgUmVuZGVyQmxvY2sge1B9IGF0ICgwLDApIHNpemUgNzg0eDM2CisgICAgICAgIFJlbmRl cklubGluZSB7QX0gYXQgKDAsMCkgc2l6ZSAzMDV4MTggW2NvbG9yPSMwMDAwRUVdCisgICAgICAg ICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgwLDApIHNpemUgMzA1eDE4CisgICAgICAgICAgICB0 ZXh0IHJ1biBhdCAoMCwwKSB3aWR0aCAzMDU6ICJodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjUwNjYiCisgICAgICAgIFJlbmRlckJSIHtCUn0gYXQgKDMwNSwxNCkgc2l6 ZSAweDAKKyAgICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgwLDE4KSBzaXplIDQxNXgxOAor ICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDE4KSB3aWR0aCA0MTU6ICJjb250cm9scyBzaG91bGQg bm90IGJlIG1pc3BsYWNlZCB3aGVuIHZpZGVvIGdldHMgYSBSZW5kZXJMYXllci4iCisgICAgICBS ZW5kZXJCbG9jayAoYW5vbnltb3VzKSBhdCAoMCw1Mikgc2l6ZSA3ODR4MjUyCisgICAgICAgIFJl bmRlclRleHQgeyN0ZXh0fSBhdCAoMCwwKSBzaXplIDB4MAorICAgICAgICBSZW5kZXJUZXh0IHsj dGV4dH0gYXQgKDAsMCkgc2l6ZSAweDAKKyAgICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgw LDApIHNpemUgMHgwCisgICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoMCwwKSBzaXplIDB4 MAorbGF5ZXIgYXQgKDU4LDExMCkgc2l6ZSAzMDJ4MTUyCisgIFJlbmRlclZpZGVvIHtWSURFT30g YXQgKDUwLDUwKSBzaXplIDMwMngxNTIgW2JvcmRlcjogKDFweCBzb2xpZCAjMDAwMDAwKV0KK2xh eWVyIGF0ICg1OSwxMTEpIHNpemUgMzAweDE1MAorICBSZW5kZXJCbG9jayAocmVsYXRpdmUgcG9z aXRpb25lZCkge0RJVn0gYXQgKDEsMSkgc2l6ZSAzMDB4MTUwCitsYXllciBhdCAoNTksMTExKSBz aXplIDMwMHgxNTAKKyAgUmVuZGVyQmxvY2sgKHBvc2l0aW9uZWQpIHtESVZ9IGF0ICgwLDApIHNp emUgMzAweDE1MAorICAgIFJlbmRlckJ1dHRvbiB7SU5QVVR9IGF0ICgwLDApIHNpemUgMzAweDE4 CitsYXllciBhdCAoNTksMjQ1KSBzaXplIDE3eDE2CisgIFJlbmRlckJ1dHRvbiB7SU5QVVR9IGF0 ICgwLDEzNCkgc2l6ZSAxN3gxNgorbGF5ZXIgYXQgKDc1LDI0NSkgc2l6ZSAxN3gxNgorICBSZW5k ZXJCdXR0b24ge0lOUFVUfSBhdCAoMTYsMTM0KSBzaXplIDE3eDE2CitsYXllciBhdCAoOTEsMjQ1 KSBzaXplIDIzNngxNgorICBSZW5kZXJCbG9jayAocG9zaXRpb25lZCkge0RJVn0gYXQgKDMyLDEz NCkgc2l6ZSAyMzZ4MTYKK2xheWVyIGF0ICg5MSwyNDUpIHNpemUgMjM2eDE2CisgIFJlbmRlclNs aWRlciB7SU5QVVR9IGF0ICgwLDApIHNpemUgMjM2eDE2CisgICAgUmVuZGVyQmxvY2sge0RJVn0g YXQgKDIsMSkgc2l6ZSAxM3gxNAorbGF5ZXIgYXQgKDMyNiwyNDUpIHNpemUgMTd4MTYKKyAgUmVu ZGVyQnV0dG9uIHtJTlBVVH0gYXQgKDI2NywxMzQpIHNpemUgMTd4MTYKK2xheWVyIGF0ICgzNDIs MjQ1KSBzaXplIDE3eDE2CisgIFJlbmRlckJ1dHRvbiB7SU5QVVR9IGF0ICgyODMsMTM0KSBzaXpl IDE3eDE2CmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9n CmluZGV4IGZlYmQ2MGQuLmEwM2VjNmMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisr KyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMDktMDQtMTcgIFNpbW9u IEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisgICAgICAgIAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjUwNjYKKyAgICAgICAgCisgICAgICAgIFdoZW4gYSA8dmlkZW8+ IGVsZW1lbnQgZ2FpbmVkIGEgUmVuZGVyTGF5ZXIgdmlhIG9wYWNpdHksIHJlZmxlY3Rpb24gZXRj LiwgdGhlCisgICAgICAgIGxheWVyIGhpZXJhcmNoeSB3YXMgbm90IGNvcnJlY3RseSB1cGRhdGVk IGJlY2F1c2UgUmVuZGVyTWVkaWEgc2tpcHBlZCBhIGxldmVsCisgICAgICAgIHdoZW4gYXNrZWQg Zm9yIGl0cyBjaGlsZHJlbjsgaXQgc2tpcHBlZCBtX2NvbnRyb2xzU2hhZG93Um9vdCdzIHJlbmRl cmVyLCB3aGljaAorICAgICAgICBhY3R1YWxseSBoYXMgYSBsYXllci4KKworICAgICAgICBUZXN0 OiBmYXN0L2xheWVycy92aWRlby1sYXllci5odG1sCisKKyAgICAgICAgKiByZW5kZXJpbmcvTWVk aWFDb250cm9sRWxlbWVudHMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9sU2hh ZG93Um9vdEVsZW1lbnQ6Ok1lZGlhQ29udHJvbFNoYWRvd1Jvb3RFbGVtZW50KToKKyAgICAgICAg RG9uJ3QgbWFudWFsbHkgY2FsbCBzZXRQYXJlbnQoKSBvbiB0aGUgcmVuZGVyZXIuIEl0IHdpbGwg aGFwcGVuIGxhdGVyCisgICAgICAgIGFzIGEgcmVzdWx0IG9mIGFkZENoaWxkKCkuCisgICAgICAg IAorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJNZWRpYS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJNZWRpYTo6Y3JlYXRlQ29udHJvbHNTaGFkb3dSb290KToKKyAgICAgICAgQWRkIG1f Y29udHJvbHNTaGFkb3dSb290J3MgcmVuZGVyZXIgYXMgYSBjaGlsZC4gCisKKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyTWVkaWEuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck1lZGlhOjpj aGlsZHJlbik6CisgICAgICAgIE5vdyBtYWludGFpbiBhIFJlbmRlck9iamVjdENoaWxkTGlzdCwg bV9jaGlsZHJlbiwgYW5kIHJlbW92ZSB0aGUgdW5uZWVkZWQKKyAgICAgICAgcmVtb3ZlQ2hpbGQo KSBtZXRob2QuIE1ha2UgdGhlIHR3byBjaGlsZHJlbigpIG1ldGhvZHMgaW5saW5lLgorCisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJPYmplY3Q6Om1vdmVMYXllcnMpOgorICAgICAgICBBc3NlcnQgaWYgbW92ZUxheWVycygpIGlz IGNhbGxlZCB3aXRoIGFuIG9sZFBhcmVudCB0aGF0IGlzIG5vdCB0aGUKKyAgICAgICAgbGF5ZXIn cyBhY3R1YWwgcGFyZW50ICh3aGljaCB3b3VsZCBoYXZlIHJldmVhbGVkIHRoaXMgYnVnKS4KKwog MjAwOS0wNC0xNyAgSnVzdGluIEdhcmNpYSAgPGp1c3Rpbi5nYXJjaWFAYXBwbGUuY29tPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IERhbiBCZXJuc3RlaW4uCmRpZmYgLS1naXQgYS9XZWJDb3JlL3Jl bmRlcmluZy9NZWRpYUNvbnRyb2xFbGVtZW50cy5jcHAgYi9XZWJDb3JlL3JlbmRlcmluZy9NZWRp YUNvbnRyb2xFbGVtZW50cy5jcHAKaW5kZXggZDg0ZTlhZC4uZGRkNjE3MCAxMDA2NDQKLS0tIGEv V2ViQ29yZS9yZW5kZXJpbmcvTWVkaWFDb250cm9sRWxlbWVudHMuY3BwCisrKyBiL1dlYkNvcmUv cmVuZGVyaW5nL01lZGlhQ29udHJvbEVsZW1lbnRzLmNwcApAQCAtNjEsNyArNjEsNiBAQCBNZWRp YUNvbnRyb2xTaGFkb3dSb290RWxlbWVudDo6TWVkaWFDb250cm9sU2hhZG93Um9vdEVsZW1lbnQo RG9jdW1lbnQqIGRvYywgSFRNTAogICAgIHJvb3RTdHlsZS0+c2V0RGlzcGxheShCTE9DSyk7CiAg ICAgcm9vdFN0eWxlLT5zZXRQb3NpdGlvbihSZWxhdGl2ZVBvc2l0aW9uKTsKICAgICBSZW5kZXJN ZWRpYUNvbnRyb2xTaGFkb3dSb290KiByZW5kZXJlciA9IG5ldyAobWVkaWFFbGVtZW50LT5yZW5k ZXJlcigpLT5yZW5kZXJBcmVuYSgpKSBSZW5kZXJNZWRpYUNvbnRyb2xTaGFkb3dSb290KHRoaXMp OwotICAgIHJlbmRlcmVyLT5zZXRQYXJlbnQobWVkaWFFbGVtZW50LT5yZW5kZXJlcigpKTsKICAg ICByZW5kZXJlci0+c2V0U3R5bGUocm9vdFN0eWxlLnJlbGVhc2UoKSk7CiAgICAgc2V0UmVuZGVy ZXIocmVuZGVyZXIpOwogICAgIHNldEF0dGFjaGVkKCk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJNZWRpYS5jcHAgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNZWRpYS5j cHAKaW5kZXggNDJjZDcwOS4uNjU4NWZhNCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyTWVkaWEuY3BwCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck1lZGlhLmNwcApA QCAtMTQ1LDI4ICsxNDUsMTEgQEAgdm9pZCBSZW5kZXJNZWRpYTo6bGF5b3V0KCkKICAgICB9CiB9 CiAKLWNvbnN0IFJlbmRlck9iamVjdENoaWxkTGlzdCogUmVuZGVyTWVkaWE6OmNoaWxkcmVuKCkg Y29uc3QKLXsKLSAgICByZXR1cm4gbV9jb250cm9sc1NoYWRvd1Jvb3QgPyBtX2NvbnRyb2xzU2hh ZG93Um9vdC0+cmVuZGVyZXIoKS0+dmlydHVhbENoaWxkcmVuKCkgOiAwOyAKLX0KLQotUmVuZGVy T2JqZWN0Q2hpbGRMaXN0KiBSZW5kZXJNZWRpYTo6Y2hpbGRyZW4oKQotewotICAgIHJldHVybiBt X2NvbnRyb2xzU2hhZG93Um9vdCA/IG1fY29udHJvbHNTaGFkb3dSb290LT5yZW5kZXJlcigpLT52 aXJ0dWFsQ2hpbGRyZW4oKSA6IDA7IAotfQotICAgCi12b2lkIFJlbmRlck1lZGlhOjpyZW1vdmVD aGlsZChSZW5kZXJPYmplY3QqIGNoaWxkKQotewotICAgIEFTU0VSVChtX2NvbnRyb2xzU2hhZG93 Um9vdCk7Ci0gICAgQVNTRVJUKGNoaWxkID09IG1fY29udHJvbHNTaGFkb3dSb290LT5yZW5kZXJl cigpKTsKLSAgICBjaGlsZC0+cmVtb3ZlTGF5ZXJzKGVuY2xvc2luZ0xheWVyKCkpOwotICAgIHN0 YXRpY19jYXN0PFJlbmRlck1lZGlhQ29udHJvbFNoYWRvd1Jvb3QqPihjaGlsZCktPnNldFBhcmVu dCgwKTsKLX0KLSAgICAKIHZvaWQgUmVuZGVyTWVkaWE6OmNyZWF0ZUNvbnRyb2xzU2hhZG93Um9v dCgpCiB7CiAgICAgQVNTRVJUKCFtX2NvbnRyb2xzU2hhZG93Um9vdCk7CiAgICAgbV9jb250cm9s c1NoYWRvd1Jvb3QgPSBuZXcgTWVkaWFDb250cm9sU2hhZG93Um9vdEVsZW1lbnQoZG9jdW1lbnQo KSwgbWVkaWFFbGVtZW50KCkpOworICAgIGFkZENoaWxkKG1fY29udHJvbHNTaGFkb3dSb290LT5y ZW5kZXJlcigpKTsKIH0KIAogdm9pZCBSZW5kZXJNZWRpYTo6Y3JlYXRlUGFuZWwoKQpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTWVkaWEuaCBiL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlck1lZGlhLmgKaW5kZXggMGU1NmRhYi4uNjAxM2Q3YiAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTWVkaWEuaAorKysgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJN ZWRpYS5oCkBAIC01MSwxMCArNTEsOSBAQCBwdWJsaWM6CiAgICAgCiAgICAgdmlydHVhbCBSZW5k ZXJPYmplY3RDaGlsZExpc3QqIHZpcnR1YWxDaGlsZHJlbigpIHsgcmV0dXJuIGNoaWxkcmVuKCk7 IH0KICAgICB2aXJ0dWFsIGNvbnN0IFJlbmRlck9iamVjdENoaWxkTGlzdCogdmlydHVhbENoaWxk cmVuKCkgY29uc3QgeyByZXR1cm4gY2hpbGRyZW4oKTsgfQotICAgIGNvbnN0IFJlbmRlck9iamVj dENoaWxkTGlzdCogY2hpbGRyZW4oKSBjb25zdDsKLSAgICBSZW5kZXJPYmplY3RDaGlsZExpc3Qq IGNoaWxkcmVuKCk7CisgICAgY29uc3QgUmVuZGVyT2JqZWN0Q2hpbGRMaXN0KiBjaGlsZHJlbigp IGNvbnN0IHsgcmV0dXJuICZtX2NoaWxkcmVuOyB9CisgICAgUmVuZGVyT2JqZWN0Q2hpbGRMaXN0 KiBjaGlsZHJlbigpIHsgcmV0dXJuICZtX2NoaWxkcmVuOyB9CiAKLSAgICB2aXJ0dWFsIHZvaWQg cmVtb3ZlQ2hpbGQoUmVuZGVyT2JqZWN0Kik7CiAgICAgdmlydHVhbCB2b2lkIGRlc3Ryb3koKTsK ICAgICAKICAgICB2aXJ0dWFsIHZvaWQgbGF5b3V0KCk7CkBAIC0xMTEsNiArMTEwLDcgQEAgcHJp dmF0ZToKICAgICBSZWZQdHI8SFRNTEVsZW1lbnQ+IG1fdGltZWxpbmVDb250YWluZXI7CiAgICAg UmVmUHRyPE1lZGlhVGltZURpc3BsYXlFbGVtZW50PiBtX2N1cnJlbnRUaW1lRGlzcGxheTsKICAg ICBSZWZQdHI8TWVkaWFUaW1lRGlzcGxheUVsZW1lbnQ+IG1fdGltZVJlbWFpbmluZ0Rpc3BsYXk7 CisgICAgUmVuZGVyT2JqZWN0Q2hpbGRMaXN0IG1fY2hpbGRyZW47CiAgICAgTm9kZSogbV9sYXN0 VW5kZXJOb2RlOwogICAgIE5vZGUqIG1fbm9kZVVuZGVyTW91c2U7CiAgICAgCmRpZmYgLS1naXQg YS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwIGIvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyT2JqZWN0LmNwcAppbmRleCBlMGU0ZTA5Li4yZmU1NWRjIDEwMDY0NAotLS0gYS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlck9iamVjdC5jcHAKQEAgLTQ2MSw2ICs0NjEsNyBAQCB2b2lkIFJlbmRlck9iamVjdDo6bW92 ZUxheWVycyhSZW5kZXJMYXllciogb2xkUGFyZW50LCBSZW5kZXJMYXllciogbmV3UGFyZW50KQog CiAgICAgaWYgKGhhc0xheWVyKCkpIHsKICAgICAgICAgUmVuZGVyTGF5ZXIqIGxheWVyID0gdG9S ZW5kZXJCb3hNb2RlbE9iamVjdCh0aGlzKS0+bGF5ZXIoKTsKKyAgICAgICAgQVNTRVJUKG9sZFBh cmVudCA9PSBsYXllci0+cGFyZW50KCkpOwogICAgICAgICBpZiAob2xkUGFyZW50KQogICAgICAg ICAgICAgb2xkUGFyZW50LT5yZW1vdmVDaGlsZChsYXllcik7CiAgICAgICAgIG5ld1BhcmVudC0+ YWRkQ2hpbGQobGF5ZXIpOwo=