30711 2009-10-23 02:01:55 -0700 [Qt] Windowless Plugins : Don't use m_clipRect when painting. 2009-10-23 12:02:48 -0700 1 1 1 Unclassified WebKit Plug-ins 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED Qt P2 Normal --- 0 girish webkit-unassigned zecke oldest_to_newest 157125 0 girish 2009-10-23 02:01:55 -0700 Though it works, it is not correct to use m_clipRect for painting in Windowless mode. Instead, the rect paramater that is passed as a part of PluginView::paint() must be used. This change will also result in some speedup since previously we used to paint all the visible parts of a windowless plugin (even if those parts are not dirty). 157126 1 41720 girish 2009-10-23 02:04:35 -0700 Created attachment 41720 [Qt] Windowless Plugins : Don't use m_clipRect when painting. Though it works, it is not correct to use m_clipRect for painting in Windowless mode. Instead, the rect paramater that is passed as a part of PluginView::paint() must be used. This change will also result in some speedup since previously we used to paint all the visible parts of a windowless plugin (even if those parts are not dirty). https://bugs.webkit.org/show_bug.cgi?id=30711 --- WebCore/ChangeLog | 19 +++++++++++++++++++ WebCore/plugins/qt/PluginViewQt.cpp | 23 +++++++++++++---------- 2 files changed, 32 insertions(+), 10 deletions(-) 157132 2 41721 girish 2009-10-23 02:54:32 -0700 Created attachment 41721 [Qt] Windowless Plugins : Don't use m_clipRect when painting (2) ChangeLog updated based on Holger's comments. 157134 3 41721 zecke 2009-10-23 02:58:22 -0700 Comment on attachment 41721 [Qt] Windowless Plugins : Don't use m_clipRect when painting (2) The exposedRect.move took some time to get around to. Due the clipping we can not simply use IntRect(0, 0, width, height())... Patch seems fine. 157136 4 41721 commit-queue 2009-10-23 03:05:40 -0700 Comment on attachment 41721 [Qt] Windowless Plugins : Don't use m_clipRect when painting (2) Rejecting patch 41721 from commit-queue. Failed to run "['WebKitTools/Scripts/run-webkit-tests', '--no-launch-safari', '--quiet', '--exit-after-n-failures=1']" exit_code: 1 Running build-dumprendertree Running tests from /Users/eseidel/Projects/CommitQueue/LayoutTests Testing 11506 test cases. fast/media/mq-transform-02.html -> failed Exiting early after 1 failures. 7441 tests run. 139.46s total testing time 7440 test cases (99%) succeeded 1 test case (<1%) had incorrect layout 3 test cases (<1%) had stderr output 157146 5 zecke 2009-10-23 05:04:33 -0700 Landed in r49974. 157234 6 41721 eric 2009-10-23 12:02:48 -0700 Comment on attachment 41721 [Qt] Windowless Plugins : Don't use m_clipRect when painting (2) Sorry about the commit-queue trouble. Should work fine now. 41720 2009-10-23 02:04:35 -0700 2009-10-23 02:54:32 -0700 [Qt] Windowless Plugins : Don't use m_clipRect when painting. -Qt-Windowless-Plugins-Don-t-use-m_clipRect-when-painting..patch text/plain 4489 girish ZmY4ODM0YThiODUxZTliNmI0ZTVkYzgzMmJjNGYyODdkOGEwOTdlZApkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAyYmFiYjE4Li5hMmM2NmZi IDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpA QCAtMSwzICsxLDIyIEBACisyMDA5LTEwLTIzICBHaXJpc2ggUmFtYWtyaXNobmFuICA8Z2lyaXNo QGZvcndhcmRiaWFzLmluPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFtRdF0gV2luZG93bGVzcyBQbHVnaW5zIDogRG9uJ3QgdXNlIG1fY2xpcFJlY3Qg d2hlbiBwYWludGluZy4KKyAgICAgICAgCisgICAgICAgIFRob3VnaCBpdCB3b3JrcywgaXQgaXMg bm90IGNvcnJlY3QgdG8gdXNlIG1fY2xpcFJlY3QgZm9yIHBhaW50aW5nCisgICAgICAgIGluIFdp bmRvd2xlc3MgbW9kZS4gSW5zdGVhZCwgdGhlIHJlY3QgcGFyYW1hdGVyIHRoYXQgaXMgcGFzc2Vk CisgICAgICAgIGFzIGEgcGFydCBvZiBQbHVnaW5WaWV3OjpwYWludCgpIG11c3QgYmUgdXNlZC4g VGhpcyBjaGFuZ2Ugd2lsbAorICAgICAgICBhbHNvIHJlc3VsdCBpbiBzb21lIHNwZWVkdXAgc2lu Y2UgcHJldmlvdXNseSB3ZSB1c2VkIHRvIHBhaW50IGFsbAorICAgICAgICB0aGUgdmlzaWJsZSBw YXJ0cyBvZiBhIHdpbmRvd2xlc3MgcGx1Z2luIChldmVuIGlmIHRob3NlIHBhcnRzIGFyZQorICAg ICAgICBub3QgZGlydHkpLgorICAgICAgICAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTMwNzExCisKKyAgICAgICAgKiBwbHVnaW5zL3F0L1BsdWdpblZp ZXdRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5WaWV3OjpwYWludCk6CisgICAgICAg IChXZWJDb3JlOjpQbHVnaW5WaWV3OjppbnZhbGlkYXRlUmVjdCk6CisKIDIwMDktMTAtMTYgIEdh dmluIEJhcnJhY2xvdWdoICA8YmFycmFjbG91Z2hAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmll d2VkIGJ5IFNhbSBXZWluaWcgJiBHZW9mZiBHYXJlbi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGx1 Z2lucy9xdC9QbHVnaW5WaWV3UXQuY3BwIGIvV2ViQ29yZS9wbHVnaW5zL3F0L1BsdWdpblZpZXdR dC5jcHAKaW5kZXggMjg2MzdhMS4uZjY3YzZiYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbHVnaW5z L3F0L1BsdWdpblZpZXdRdC5jcHAKKysrIGIvV2ViQ29yZS9wbHVnaW5zL3F0L1BsdWdpblZpZXdR dC5jcHAKQEAgLTE3OCw2ICsxNzgsOSBAQCB2b2lkIFBsdWdpblZpZXc6OnBhaW50KEdyYXBoaWNz Q29udGV4dCogY29udGV4dCwgY29uc3QgSW50UmVjdCYgcmVjdCkKICAgICBjb25zdCBib29sIHN5 bmNYID0gbV9wbHVnaW5EaXNwbGF5ICYmIG1fcGx1Z2luRGlzcGxheSAhPSBRWDExSW5mbzo6ZGlz cGxheSgpOwogCiAgICAgUVBhaW50ZXIqIHBhaW50ZXIgPSBjb250ZXh0LT5wbGF0Zm9ybUNvbnRl eHQoKTsKKyAgICBJbnRSZWN0IGV4cG9zZWRSZWN0KHJlY3QpOworICAgIGV4cG9zZWRSZWN0Lmlu dGVyc2VjdChmcmFtZVJlY3QoKSk7CisgICAgZXhwb3NlZFJlY3QubW92ZSgtZnJhbWVSZWN0KCku eCgpLCAtZnJhbWVSZWN0KCkueSgpKTsKIAogICAgIFFQaXhtYXAgcXREcmF3YWJsZSA9IFFQaXht YXA6OmZyb21YMTFQaXhtYXAobV9kcmF3YWJsZSwgUVBpeG1hcDo6RXhwbGljaXRseVNoYXJlZCk7 CiAgICAgY29uc3QgaW50IGRyYXdhYmxlRGVwdGggPSAoKE5QU2V0V2luZG93Q2FsbGJhY2tTdHJ1 Y3QqKW1fbnBXaW5kb3cud3NfaW5mbyktPmRlcHRoOwpAQCAtMjAyLDExICsyMDUsMTEgQEAgdm9p ZCBQbHVnaW5WaWV3OjpwYWludChHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IEludFJl Y3QmIHJlY3QpCiAgICAgICAgICAgICAmJiBiYWNraW5nU3RvcmVIYXNVbnRyYW5zZm9ybWVkQ29u dGVudHMpIHsKICAgICAgICAgICAgIEdDIGdjID0gWERlZmF1bHRHQyhRWDExSW5mbzo6ZGlzcGxh eSgpLCBRWDExSW5mbzo6YXBwU2NyZWVuKCkpOwogICAgICAgICAgICAgWENvcHlBcmVhKFFYMTFJ bmZvOjpkaXNwbGF5KCksIGJhY2tpbmdTdG9yZVBpeG1hcC0+aGFuZGxlKCksIG1fZHJhd2FibGUs IGdjLAotICAgICAgICAgICAgICAgIG9mZnNldC54KCkgKyBtX3dpbmRvd1JlY3QueCgpICsgbV9j bGlwUmVjdC54KCksIG9mZnNldC55KCkgKyBtX3dpbmRvd1JlY3QueSgpICsgbV9jbGlwUmVjdC55 KCksCi0gICAgICAgICAgICAgICAgbV9jbGlwUmVjdC53aWR0aCgpLCBtX2NsaXBSZWN0LmhlaWdo dCgpLCBtX2NsaXBSZWN0LngoKSwgbV9jbGlwUmVjdC55KCkpOworICAgICAgICAgICAgICAgIG9m ZnNldC54KCkgKyBtX3dpbmRvd1JlY3QueCgpICsgZXhwb3NlZFJlY3QueCgpLCBvZmZzZXQueSgp ICsgbV93aW5kb3dSZWN0LnkoKSArIGV4cG9zZWRSZWN0LnkoKSwKKyAgICAgICAgICAgICAgICBl eHBvc2VkUmVjdC53aWR0aCgpLCBleHBvc2VkUmVjdC5oZWlnaHQoKSwgZXhwb3NlZFJlY3QueCgp LCBleHBvc2VkUmVjdC55KCkpOwogICAgICAgICB9IGVsc2UgeyAvLyBubyBiYWNraW5nIHN0b3Jl LCBjbGVhbiB0aGUgcGl4bWFwIGJlY2F1c2UgdGhlIHBsdWdpbiB0aGlua3MgaXRzIHRyYW5zcGFy ZW50CiAgICAgICAgICAgICBRUGFpbnRlciBwYWludGVyKCZxdERyYXdhYmxlKTsKLSAgICAgICAg ICAgIHBhaW50ZXIuZmlsbFJlY3QobV9jbGlwUmVjdCwgUXQ6OndoaXRlKTsKKyAgICAgICAgICAg IHBhaW50ZXIuZmlsbFJlY3QoZXhwb3NlZFJlY3QsIFF0Ojp3aGl0ZSk7CiAgICAgICAgIH0KIAog ICAgICAgICBpZiAoc3luY1gpCkBAIC0yMTksMTggKzIyMiwxOCBAQCB2b2lkIFBsdWdpblZpZXc6 OnBhaW50KEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgSW50UmVjdCYgcmVjdCkKICAg ICBleHBvc2VFdmVudC50eXBlID0gR3JhcGhpY3NFeHBvc2U7CiAgICAgZXhwb3NlRXZlbnQuZGlz cGxheSA9IFFYMTFJbmZvOjpkaXNwbGF5KCk7CiAgICAgZXhwb3NlRXZlbnQuZHJhd2FibGUgPSBt X2RyYXdhYmxlOwotICAgIGV4cG9zZUV2ZW50LnggPSBtX2NsaXBSZWN0LngoKTsKLSAgICBleHBv c2VFdmVudC55ID0gbV9jbGlwUmVjdC55KCk7Ci0gICAgZXhwb3NlRXZlbnQud2lkdGggPSBtX2Ns aXBSZWN0LngoKSArIG1fY2xpcFJlY3Qud2lkdGgoKTsgLy8gZmxhc2ggYnVnPyBpdCB0aGlua3Mg d2lkdGggaXMgdGhlIHJpZ2h0Ci0gICAgZXhwb3NlRXZlbnQuaGVpZ2h0ID0gbV9jbGlwUmVjdC55 KCkgKyBtX2NsaXBSZWN0LmhlaWdodCgpOyAvLyBmbGFzaCBidWc/IGl0IHRoaW5rcyBoZWlnaHQg aXMgdGhlIGJvdHRvbQorICAgIGV4cG9zZUV2ZW50LnggPSBleHBvc2VkUmVjdC54KCk7CisgICAg ZXhwb3NlRXZlbnQueSA9IGV4cG9zZWRSZWN0LnkoKTsKKyAgICBleHBvc2VFdmVudC53aWR0aCA9 IGV4cG9zZWRSZWN0LngoKSArIGV4cG9zZWRSZWN0LndpZHRoKCk7IC8vIGZsYXNoIGJ1Zz8gaXQg dGhpbmtzIHdpZHRoIGlzIHRoZSByaWdodCBpbiB0cmFuc3BhcmVudCBtb2RlCisgICAgZXhwb3Nl RXZlbnQuaGVpZ2h0ID0gZXhwb3NlZFJlY3QueSgpICsgZXhwb3NlZFJlY3QuaGVpZ2h0KCk7IC8v IGZsYXNoIGJ1Zz8gaXQgdGhpbmtzIGhlaWdodCBpcyB0aGUgYm90dG9tIGluIHRyYW5zcGFyZW50 IG1vZGUKIAogICAgIGRpc3BhdGNoTlBFdmVudCh4ZXZlbnQpOwogCiAgICAgaWYgKHN5bmNYKQog ICAgICAgICBYU3luYyhtX3BsdWdpbkRpc3BsYXksIEZhbHNlKTsgLy8gc3luYyBjaGFuZ2VzIGJ5 IHBsdWdpbgogCi0gICAgcGFpbnRlci0+ZHJhd1BpeG1hcChmcmFtZVJlY3QoKS54KCkgKyBtX2Ns aXBSZWN0LngoKSwgZnJhbWVSZWN0KCkueSgpICsgbV9jbGlwUmVjdC55KCksIHF0RHJhd2FibGUs Ci0gICAgICAgIG1fY2xpcFJlY3QueCgpLCBtX2NsaXBSZWN0LnkoKSwgbV9jbGlwUmVjdC53aWR0 aCgpLCBtX2NsaXBSZWN0LmhlaWdodCgpKTsKKyAgICBwYWludGVyLT5kcmF3UGl4bWFwKFFQb2lu dChmcmFtZVJlY3QoKS54KCkgKyBleHBvc2VkUmVjdC54KCksIGZyYW1lUmVjdCgpLnkoKSArIGV4 cG9zZWRSZWN0LnkoKSksIHF0RHJhd2FibGUsCisgICAgICAgICAgICAgICAgICAgICAgICBleHBv c2VkUmVjdCk7CiB9CiAKIC8vIFRPRE86IFVuaWZ5IGFjcm9zcyBwb3J0cy4KQEAgLTY2MSw3ICs2 NjQsNyBAQCB2b2lkIFBsdWdpblZpZXc6OmludmFsaWRhdGVSZWN0KE5QUmVjdCogcmVjdCkKICAg ICAgICAgaW52YWxpZGF0ZSgpOwogICAgICAgICByZXR1cm47CiAgICAgfQotICAgIEludFJlY3Qg cihyZWN0LT5sZWZ0LCByZWN0LT50b3AsIHJlY3QtPnJpZ2h0ICsgcmVjdC0+bGVmdCwgcmVjdC0+ Ym90dG9tICsgcmVjdC0+dG9wKTsKKyAgICBJbnRSZWN0IHIocmVjdC0+bGVmdCwgcmVjdC0+dG9w LCByZWN0LT5yaWdodCAtIHJlY3QtPmxlZnQsIHJlY3QtPmJvdHRvbSAtIHJlY3QtPnRvcCk7CiAg ICAgaW52YWxpZGF0ZVdpbmRvd2xlc3NQbHVnaW5SZWN0KHIpOwogfQogCg== 41721 2009-10-23 02:54:32 -0700 2009-10-23 12:02:48 -0700 [Qt] Windowless Plugins : Don't use m_clipRect when painting (2) patchy text/plain 5230 girish Y29tbWl0IDYzNmRjMmRmYzFiODY4M2MzNmZmMTliNzMyZmUwMWIwNTIwNDM0ZjEKQXV0aG9yOiBH aXJpc2ggUmFtYWtyaXNobmFuIDxnaXJpc2hAZm9yd2FyZGJpYXMuaW4+CkRhdGU6ICAgRnJpIE9j dCAyMyAxNToyMDo0MSAyMDA5ICswNTMwCgogICAgW1F0XSBXaW5kb3dsZXNzIFBsdWdpbnMgOiBE b24ndCB1c2UgbV9jbGlwUmVjdCB3aGVuIHBhaW50aW5nLgogICAgCiAgICBUaG91Z2ggaXQgd29y a3MsIGl0IGlzIG5vdCBjb3JyZWN0IHRvIHVzZSBtX2NsaXBSZWN0IGZvciBwYWludGluZwogICAg aW4gV2luZG93bGVzcyBtb2RlLiBJbnN0ZWFkLCB0aGUgcmVjdCBwYXJhbWF0ZXIgdGhhdCBpcyBw YXNzZWQKICAgIGFzIGEgcGFydCBvZiBQbHVnaW5WaWV3OjpwYWludCgpIG11c3QgYmUgdXNlZC4g VGhpcyBjaGFuZ2Ugd2lsbAogICAgYWxzbyByZXN1bHQgaW4gc29tZSBzcGVlZHVwIHNpbmNlIHBy ZXZpb3VzbHkgd2UgdXNlZCB0byBwYWludCBhbGwKICAgIHRoZSB2aXNpYmxlIHBhcnRzIG9mIGEg d2luZG93bGVzcyBwbHVnaW4gKGV2ZW4gaWYgdGhvc2UgcGFydHMgd2VyZQogICAgbm90IGRpcnR5 KS4KICAgIAogICAgQWxzbywgZml4IGludmFsaWRhdGVSZWN0KCkgdG8gY29tcHV0ZSB0aGUgY29y cmVjdCB3aWR0aCBhbmQgaGVpZ2h0LgogICAgCiAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MzA3MTEKCmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dl YkNvcmUvQ2hhbmdlTG9nCmluZGV4IDY1NDRkMDQuLmE3YjQ1ZTYgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIw MDktMTAtMjMgIEdpcmlzaCBSYW1ha3Jpc2huYW4gIDxnaXJpc2hAZm9yd2FyZGJpYXMuaW4+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBXaW5k b3dsZXNzIFBsdWdpbnMgOiBEb24ndCB1c2UgbV9jbGlwUmVjdCB3aGVuIHBhaW50aW5nLgorICAg ICAgICAKKyAgICAgICAgVGhvdWdoIGl0IHdvcmtzLCBpdCBpcyBub3QgY29ycmVjdCB0byB1c2Ug bV9jbGlwUmVjdCBmb3IgcGFpbnRpbmcKKyAgICAgICAgaW4gV2luZG93bGVzcyBtb2RlLiBJbnN0 ZWFkLCB0aGUgcmVjdCBwYXJhbWF0ZXIgdGhhdCBpcyBwYXNzZWQKKyAgICAgICAgYXMgYSBwYXJ0 IG9mIFBsdWdpblZpZXc6OnBhaW50KCkgbXVzdCBiZSB1c2VkLiBUaGlzIGNoYW5nZSB3aWxsCisg ICAgICAgIGFsc28gcmVzdWx0IGluIHNvbWUgc3BlZWR1cCBzaW5jZSBwcmV2aW91c2x5IHdlIHVz ZWQgdG8gcGFpbnQgYWxsCisgICAgICAgIHRoZSB2aXNpYmxlIHBhcnRzIG9mIGEgd2luZG93bGVz cyBwbHVnaW4gKGV2ZW4gaWYgdGhvc2UgcGFydHMgd2VyZQorICAgICAgICBub3QgZGlydHkpLgor ICAgICAgICAKKyAgICAgICAgQWxzbywgZml4IGludmFsaWRhdGVSZWN0KCkgdG8gY29tcHV0ZSB0 aGUgY29ycmVjdCB3aWR0aCBhbmQgaGVpZ2h0LgorICAgICAgICAKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMwNzExCisKKyAgICAgICAgKiBwbHVnaW5z L3F0L1BsdWdpblZpZXdRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5WaWV3OjpwYWlu dCk6CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5WaWV3OjppbnZhbGlkYXRlUmVjdCk6CisKIDIw MDktMTAtMjIgIEpvYW5tYXJpZSBEaWdncyAgPGpvYW5tYXJpZS5kaWdnc0BnbWFpbC5jb20+CiAg CiAgICAgICAgIFJldmlld2VkIGJ5IFhhbiBMb3Blei4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGx1 Z2lucy9xdC9QbHVnaW5WaWV3UXQuY3BwIGIvV2ViQ29yZS9wbHVnaW5zL3F0L1BsdWdpblZpZXdR dC5jcHAKaW5kZXggMjg2MzdhMS4uZjY3YzZiYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbHVnaW5z L3F0L1BsdWdpblZpZXdRdC5jcHAKKysrIGIvV2ViQ29yZS9wbHVnaW5zL3F0L1BsdWdpblZpZXdR dC5jcHAKQEAgLTE3OCw2ICsxNzgsOSBAQCB2b2lkIFBsdWdpblZpZXc6OnBhaW50KEdyYXBoaWNz Q29udGV4dCogY29udGV4dCwgY29uc3QgSW50UmVjdCYgcmVjdCkKICAgICBjb25zdCBib29sIHN5 bmNYID0gbV9wbHVnaW5EaXNwbGF5ICYmIG1fcGx1Z2luRGlzcGxheSAhPSBRWDExSW5mbzo6ZGlz cGxheSgpOwogCiAgICAgUVBhaW50ZXIqIHBhaW50ZXIgPSBjb250ZXh0LT5wbGF0Zm9ybUNvbnRl eHQoKTsKKyAgICBJbnRSZWN0IGV4cG9zZWRSZWN0KHJlY3QpOworICAgIGV4cG9zZWRSZWN0Lmlu dGVyc2VjdChmcmFtZVJlY3QoKSk7CisgICAgZXhwb3NlZFJlY3QubW92ZSgtZnJhbWVSZWN0KCku eCgpLCAtZnJhbWVSZWN0KCkueSgpKTsKIAogICAgIFFQaXhtYXAgcXREcmF3YWJsZSA9IFFQaXht YXA6OmZyb21YMTFQaXhtYXAobV9kcmF3YWJsZSwgUVBpeG1hcDo6RXhwbGljaXRseVNoYXJlZCk7 CiAgICAgY29uc3QgaW50IGRyYXdhYmxlRGVwdGggPSAoKE5QU2V0V2luZG93Q2FsbGJhY2tTdHJ1 Y3QqKW1fbnBXaW5kb3cud3NfaW5mbyktPmRlcHRoOwpAQCAtMjAyLDExICsyMDUsMTEgQEAgdm9p ZCBQbHVnaW5WaWV3OjpwYWludChHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IEludFJl Y3QmIHJlY3QpCiAgICAgICAgICAgICAmJiBiYWNraW5nU3RvcmVIYXNVbnRyYW5zZm9ybWVkQ29u dGVudHMpIHsKICAgICAgICAgICAgIEdDIGdjID0gWERlZmF1bHRHQyhRWDExSW5mbzo6ZGlzcGxh eSgpLCBRWDExSW5mbzo6YXBwU2NyZWVuKCkpOwogICAgICAgICAgICAgWENvcHlBcmVhKFFYMTFJ bmZvOjpkaXNwbGF5KCksIGJhY2tpbmdTdG9yZVBpeG1hcC0+aGFuZGxlKCksIG1fZHJhd2FibGUs IGdjLAotICAgICAgICAgICAgICAgIG9mZnNldC54KCkgKyBtX3dpbmRvd1JlY3QueCgpICsgbV9j bGlwUmVjdC54KCksIG9mZnNldC55KCkgKyBtX3dpbmRvd1JlY3QueSgpICsgbV9jbGlwUmVjdC55 KCksCi0gICAgICAgICAgICAgICAgbV9jbGlwUmVjdC53aWR0aCgpLCBtX2NsaXBSZWN0LmhlaWdo dCgpLCBtX2NsaXBSZWN0LngoKSwgbV9jbGlwUmVjdC55KCkpOworICAgICAgICAgICAgICAgIG9m ZnNldC54KCkgKyBtX3dpbmRvd1JlY3QueCgpICsgZXhwb3NlZFJlY3QueCgpLCBvZmZzZXQueSgp ICsgbV93aW5kb3dSZWN0LnkoKSArIGV4cG9zZWRSZWN0LnkoKSwKKyAgICAgICAgICAgICAgICBl eHBvc2VkUmVjdC53aWR0aCgpLCBleHBvc2VkUmVjdC5oZWlnaHQoKSwgZXhwb3NlZFJlY3QueCgp LCBleHBvc2VkUmVjdC55KCkpOwogICAgICAgICB9IGVsc2UgeyAvLyBubyBiYWNraW5nIHN0b3Jl LCBjbGVhbiB0aGUgcGl4bWFwIGJlY2F1c2UgdGhlIHBsdWdpbiB0aGlua3MgaXRzIHRyYW5zcGFy ZW50CiAgICAgICAgICAgICBRUGFpbnRlciBwYWludGVyKCZxdERyYXdhYmxlKTsKLSAgICAgICAg ICAgIHBhaW50ZXIuZmlsbFJlY3QobV9jbGlwUmVjdCwgUXQ6OndoaXRlKTsKKyAgICAgICAgICAg IHBhaW50ZXIuZmlsbFJlY3QoZXhwb3NlZFJlY3QsIFF0Ojp3aGl0ZSk7CiAgICAgICAgIH0KIAog ICAgICAgICBpZiAoc3luY1gpCkBAIC0yMTksMTggKzIyMiwxOCBAQCB2b2lkIFBsdWdpblZpZXc6 OnBhaW50KEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgSW50UmVjdCYgcmVjdCkKICAg ICBleHBvc2VFdmVudC50eXBlID0gR3JhcGhpY3NFeHBvc2U7CiAgICAgZXhwb3NlRXZlbnQuZGlz cGxheSA9IFFYMTFJbmZvOjpkaXNwbGF5KCk7CiAgICAgZXhwb3NlRXZlbnQuZHJhd2FibGUgPSBt X2RyYXdhYmxlOwotICAgIGV4cG9zZUV2ZW50LnggPSBtX2NsaXBSZWN0LngoKTsKLSAgICBleHBv c2VFdmVudC55ID0gbV9jbGlwUmVjdC55KCk7Ci0gICAgZXhwb3NlRXZlbnQud2lkdGggPSBtX2Ns aXBSZWN0LngoKSArIG1fY2xpcFJlY3Qud2lkdGgoKTsgLy8gZmxhc2ggYnVnPyBpdCB0aGlua3Mg d2lkdGggaXMgdGhlIHJpZ2h0Ci0gICAgZXhwb3NlRXZlbnQuaGVpZ2h0ID0gbV9jbGlwUmVjdC55 KCkgKyBtX2NsaXBSZWN0LmhlaWdodCgpOyAvLyBmbGFzaCBidWc/IGl0IHRoaW5rcyBoZWlnaHQg aXMgdGhlIGJvdHRvbQorICAgIGV4cG9zZUV2ZW50LnggPSBleHBvc2VkUmVjdC54KCk7CisgICAg ZXhwb3NlRXZlbnQueSA9IGV4cG9zZWRSZWN0LnkoKTsKKyAgICBleHBvc2VFdmVudC53aWR0aCA9 IGV4cG9zZWRSZWN0LngoKSArIGV4cG9zZWRSZWN0LndpZHRoKCk7IC8vIGZsYXNoIGJ1Zz8gaXQg dGhpbmtzIHdpZHRoIGlzIHRoZSByaWdodCBpbiB0cmFuc3BhcmVudCBtb2RlCisgICAgZXhwb3Nl RXZlbnQuaGVpZ2h0ID0gZXhwb3NlZFJlY3QueSgpICsgZXhwb3NlZFJlY3QuaGVpZ2h0KCk7IC8v IGZsYXNoIGJ1Zz8gaXQgdGhpbmtzIGhlaWdodCBpcyB0aGUgYm90dG9tIGluIHRyYW5zcGFyZW50 IG1vZGUKIAogICAgIGRpc3BhdGNoTlBFdmVudCh4ZXZlbnQpOwogCiAgICAgaWYgKHN5bmNYKQog ICAgICAgICBYU3luYyhtX3BsdWdpbkRpc3BsYXksIEZhbHNlKTsgLy8gc3luYyBjaGFuZ2VzIGJ5 IHBsdWdpbgogCi0gICAgcGFpbnRlci0+ZHJhd1BpeG1hcChmcmFtZVJlY3QoKS54KCkgKyBtX2Ns aXBSZWN0LngoKSwgZnJhbWVSZWN0KCkueSgpICsgbV9jbGlwUmVjdC55KCksIHF0RHJhd2FibGUs Ci0gICAgICAgIG1fY2xpcFJlY3QueCgpLCBtX2NsaXBSZWN0LnkoKSwgbV9jbGlwUmVjdC53aWR0 aCgpLCBtX2NsaXBSZWN0LmhlaWdodCgpKTsKKyAgICBwYWludGVyLT5kcmF3UGl4bWFwKFFQb2lu dChmcmFtZVJlY3QoKS54KCkgKyBleHBvc2VkUmVjdC54KCksIGZyYW1lUmVjdCgpLnkoKSArIGV4 cG9zZWRSZWN0LnkoKSksIHF0RHJhd2FibGUsCisgICAgICAgICAgICAgICAgICAgICAgICBleHBv c2VkUmVjdCk7CiB9CiAKIC8vIFRPRE86IFVuaWZ5IGFjcm9zcyBwb3J0cy4KQEAgLTY2MSw3ICs2 NjQsNyBAQCB2b2lkIFBsdWdpblZpZXc6OmludmFsaWRhdGVSZWN0KE5QUmVjdCogcmVjdCkKICAg ICAgICAgaW52YWxpZGF0ZSgpOwogICAgICAgICByZXR1cm47CiAgICAgfQotICAgIEludFJlY3Qg cihyZWN0LT5sZWZ0LCByZWN0LT50b3AsIHJlY3QtPnJpZ2h0ICsgcmVjdC0+bGVmdCwgcmVjdC0+ Ym90dG9tICsgcmVjdC0+dG9wKTsKKyAgICBJbnRSZWN0IHIocmVjdC0+bGVmdCwgcmVjdC0+dG9w LCByZWN0LT5yaWdodCAtIHJlY3QtPmxlZnQsIHJlY3QtPmJvdHRvbSAtIHJlY3QtPnRvcCk7CiAg ICAgaW52YWxpZGF0ZVdpbmRvd2xlc3NQbHVnaW5SZWN0KHIpOwogfQogCg==