136095 2014-08-19 22:42:00 -0700 [EFL] Apply 'direct' option to accelerated compositing for rendering directly to evas' window. 2017-03-11 10:35:32 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Linux RESOLVED WONTFIX P2 Normal --- 1 hw1008.kim hw1008.kim bunhere cdumez cmarcelo commit-queue darin gyuyoung.kim kondapallykalyan lucas.de.marchi luiz mcatanzaro noam ryuan.choi sergio oldest_to_newest 1030213 0 hw1008.kim 2014-08-19 22:42:00 -0700 Evas introduced EVAS_GL_OPTIONS_DIRECT which allows GL rendering directly to evas' window. This option would be effective for accelerated compositing on WebKitEFL. 1030214 1 236854 hw1008.kim 2014-08-19 22:52:35 -0700 Created attachment 236854 Patch 1030259 2 236854 ryuan.choi 2014-08-20 04:52:21 -0700 Comment on attachment 236854 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=236854&action=review > Source/WebCore/ChangeLog:3 > + Apply 'direct' option to accelerated compositing for rendering directly to evas' window. Let's add [EFL] prefix > Source/WebKit2/UIProcess/API/efl/EwkView.cpp:578 > + return; Looks unnecessary 1030260 3 236854 ryuan.choi 2014-08-20 05:08:24 -0700 Comment on attachment 236854 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=236854&action=review > Source/WebCore/ChangeLog:18 > + * platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp: > + (WebCore::CoordinatedGraphicsScene::CoordinatedGraphicsScene): > + (WebCore::CoordinatedGraphicsScene::updateViewportFired): > + (WebCore::CoordinatedGraphicsScene::paintToCurrentGLContext): I think that you leave the message why you added timer. > Source/WebKit2/UIProcess/API/efl/EwkView.cpp:591 > + else { > + if (!m_displayTimer.isActive()) > + m_displayTimer.startOneShot(0); > + } Let's simply this. 1041268 4 ryuan.choi 2014-10-13 04:07:40 -0700 hyowon, when you can update this? 1066425 5 236854 gyuyoung.kim 2015-02-03 07:37:19 -0800 Comment on attachment 236854 Patch Cleared review? from attachment 236854 [details] so that this bug does not appear in http://webkit.org/pending-review. If you would like this patch reviewed, please attach it to a new bug or this bug again. 1103083 6 ryuan.choi 2015-06-18 16:37:07 -0700 Hyowon, Do you have plan to update this? If not, I will rebase your patch to land it. 1103201 7 255183 ryuan.choi 2015-06-19 00:28:02 -0700 Created attachment 255183 Patch 1172890 8 255183 gyuyoung.kim 2016-03-09 16:59:16 -0800 Comment on attachment 255183 Patch Ryaun, this patch is still valid ? 1172984 9 255183 ryuan.choi 2016-03-09 20:32:20 -0800 Comment on attachment 255183 Patch IMO, this is valid but should be rebased. So, cleared r? flag. 1286275 10 mcatanzaro 2017-03-11 10:35:32 -0800 Closing this bug because the EFL port has been removed from trunk. If you feel this bug applies to a different upstream WebKit port and was closed in error, please either update the title and reopen the bug, or leave a comment to request this. 236854 2014-08-19 22:52:35 -0700 2015-06-19 00:27:56 -0700 Patch bug-136095-20140820145227.patch text/plain 11519 hw1008.kim U3VidmVyc2lvbiBSZXZpc2lvbjogMTcyNzQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzBjMGIzMTY0MjBjZGI2 YTg1MmNlODcxYTI3NmQwZGI5YmIwZWE2YS4uY2I1YTQxMThmNDMyMjNkYTJkOWQ3N2Y0Mjk0ZTkw YjU2NTgzZmQ2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE0LTA4LTE5ICBIeW93 b24gS2ltICA8aHcxMDA4LmtpbUBzYW1zdW5nLmNvbT4KKworICAgICAgICBBcHBseSAnZGlyZWN0 JyBvcHRpb24gdG8gYWNjZWxlcmF0ZWQgY29tcG9zaXRpbmcgZm9yIHJlbmRlcmluZyBkaXJlY3Rs eSB0byBldmFzJyB3aW5kb3cuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMzYwOTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBUbyBpbXByb3ZlIHJlbmRlcmluZyBwZXJmb3JtYW5jZSBmb3IgRUZMIGFwcGxp Y2F0aW9ucyB1c2luZyBHTCwKKyAgICAgICAgRXZhcyBpbnRyb2R1Y2VkIEVWQVNfR0xfT1BUSU9O U19ESVJFQ1Qgd2hpY2ggYWxsb3dzIEdMIHJlbmRlcmluZyBkaXJlY3RseSB0byBldmFzJyB3aW5k b3cuCisgICAgICAgIFRoaXMgcGF0Y2ggYXBwbGllcyB0aGlzIG9wdGlvbiB0byBhY2NlbGVyYXRl ZCBjb21wb3NpdGluZyBvbiBXZWJLaXQyIEVGTC4KKyAgICAgICAgVG8gZG8gdGhpcywgRXZhc19O YXRpdmVfU3VyZmFjZSBzaG91bGQgYmUgY3JlYXRlZCB3aXRoIEVWQVNfR0xfT1BUSU9OU19ESVJF Q1QuCisgICAgICAgIEFuZCBjb21wb3NpdGluZyB0cmlnZ2VyIGlzIGEgcGl4ZWxfZ2V0X2NhbGxi YWNrLCBub3QgYSB0aW1lci4KKyAgICAgICAgQnV0IHRoZSB0aW1lciwgbV9kaXNwbGF5VGltZXIs IGlzIHN0aWxsIHVzZWQgb24gdGhlIFNXIGJhY2tlbmQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy90ZXhtYXAvY29vcmRpbmF0ZWQvQ29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkNvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZTo6Q29vcmRpbmF0ZWRH cmFwaGljc1NjZW5lKToKKyAgICAgICAgKFdlYkNvcmU6OkNvb3JkaW5hdGVkR3JhcGhpY3NTY2Vu ZTo6dXBkYXRlVmlld3BvcnRGaXJlZCk6CisgICAgICAgIChXZWJDb3JlOjpDb29yZGluYXRlZEdy YXBoaWNzU2NlbmU6OnBhaW50VG9DdXJyZW50R0xDb250ZXh0KToKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy90ZXhtYXAvY29vcmRpbmF0ZWQvQ29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lLmg6 CisKIDIwMTQtMDgtMTggIENvbW1pdCBRdWV1ZSAgPGNvbW1pdC1xdWV1ZUB3ZWJraXQub3JnPgog CiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIxNzI3MzYuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg MzgxYWQ5NmIwZTI0ZmIyZDA3ZTY0NjgzYzdkNTcwMjgwZWQzODhmMC4uYzRkM2E3YmE5N2UzMmUx MTk4NjI0N2ViYjdhMDA3ZGU2NzVhMmNlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hh bmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisy MDE0LTA4LTE5ICBIeW93b24gS2ltICA8aHcxMDA4LmtpbUBzYW1zdW5nLmNvbT4KKworICAgICAg ICBBcHBseSAnZGlyZWN0JyBvcHRpb24gdG8gYWNjZWxlcmF0ZWQgY29tcG9zaXRpbmcgZm9yIHJl bmRlcmluZyBkaXJlY3RseSB0byBldmFzJyB3aW5kb3cuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzYwOTUKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUbyBpbXByb3ZlIHJlbmRlcmluZyBwZXJmb3JtYW5j ZSBmb3IgRUZMIGFwcGxpY2F0aW9ucyB1c2luZyBHTCwKKyAgICAgICAgRXZhcyBpbnRyb2R1Y2Vk IEVWQVNfR0xfT1BUSU9OU19ESVJFQ1Qgd2hpY2ggYWxsb3dzIEdMIHJlbmRlcmluZyBkaXJlY3Rs eSB0byBldmFzJyB3aW5kb3cuCisgICAgICAgIFRoaXMgcGF0Y2ggYXBwbGllcyB0aGlzIG9wdGlv biB0byBhY2NlbGVyYXRlZCBjb21wb3NpdGluZyBvbiBXZWJLaXQyIEVGTC4KKyAgICAgICAgVG8g ZG8gdGhpcywgRXZhc19OYXRpdmVfU3VyZmFjZSBzaG91bGQgYmUgY3JlYXRlZCB3aXRoIEVWQVNf R0xfT1BUSU9OU19ESVJFQ1QuCisgICAgICAgIEFuZCBjb21wb3NpdGluZyB0cmlnZ2VyIGlzIGEg cGl4ZWxfZ2V0X2NhbGxiYWNrLCBub3QgYSB0aW1lci4KKyAgICAgICAgQnV0IHRoZSB0aW1lciwg bV9kaXNwbGF5VGltZXIsIGlzIHN0aWxsIHVzZWQgb24gdGhlIFNXIGJhY2tlbmQuCisKKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3LmNwcDoKKyAgICAgICAgKEV3a1ZpZXc6OkV3 a1ZpZXcpOgorICAgICAgICAoRXdrVmlldzo6ZGlzcGxheVRpbWVyRmlyZWQpOgorICAgICAgICAo RXdrVmlldzo6c2NoZWR1bGVVcGRhdGVEaXNwbGF5KToKKyAgICAgICAgKEV3a1ZpZXc6OmNvbXBv c2l0ZSk6CisgICAgICAgIChFd2tWaWV3OjpyZXNpemVHTFN1cmZhY2UpOgorICAgICAgICAoRXdr Vmlldzo6aGFuZGxlRXZhc09iamVjdENhbGN1bGF0ZSk6CisgICAgICAgIChFd2tWaWV3OjpoYW5k bGVFdmFzT2JqZWN0U2hvdyk6CisgICAgICAgIChFd2tWaWV3OjpjcmVhdGVHTFN1cmZhY2UpOiBE ZWxldGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXcuaDoKKyAgICAgICAg KEV3a1ZpZXc6OnNldE5lZWRzU3VyZmFjZVJlc2l6ZSk6IERlbGV0ZWQuCisKIDIwMTQtMDgtMTgg IENvbW1pdCBRdWV1ZSAgPGNvbW1pdC1xdWV1ZUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2 aWV3ZWQsIHJvbGxpbmcgb3V0IHIxNzI3MzYuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29vcmRpbmF0ZWQvQ29vcmRpbmF0ZWRHcmFwaGljc1Nj ZW5lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9jb29yZGlu YXRlZC9Db29yZGluYXRlZEdyYXBoaWNzU2NlbmUuY3BwCmluZGV4IGVlNjNjNTczM2Y1NzFhMDAz ZGIxZGJkNWUxMDRhODQzODQ1ZTFjZTEuLjdlYjUxNWEzNzgwZDBmY2ZkYjkxOTc2Zjg1ZjUzNGFi MTdmMTg0MWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3Rl eG1hcC9jb29yZGluYXRlZC9Db29yZGluYXRlZEdyYXBoaWNzU2NlbmUuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9jb29yZGluYXRlZC9Db29yZGluYXRl ZEdyYXBoaWNzU2NlbmUuY3BwCkBAIC00OCw3ICs0OCw4IEBAIHN0YXRpYyBib29sIGxheWVyU2hv dWxkSGF2ZUJhY2tpbmdTdG9yZShUZXh0dXJlTWFwcGVyTGF5ZXIqIGxheWVyKQogfQogCiBDb29y ZGluYXRlZEdyYXBoaWNzU2NlbmU6OkNvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZShDb29yZGluYXRl ZEdyYXBoaWNzU2NlbmVDbGllbnQqIGNsaWVudCkKLSAgICA6IG1fY2xpZW50KGNsaWVudCkKKyAg ICA6IG1fdXBkYXRlVmlld3BvcnRUaW1lcih0aGlzLCAmQ29vcmRpbmF0ZWRHcmFwaGljc1NjZW5l Ojp1cGRhdGVWaWV3cG9ydEZpcmVkKQorICAgICwgbV9jbGllbnQoY2xpZW50KQogICAgICwgbV9p c0FjdGl2ZShmYWxzZSkKICAgICAsIG1fcm9vdExheWVySUQoSW52YWxpZENvb3JkaW5hdGVkTGF5 ZXJJRCkKICAgICAsIG1fYmFja2dyb3VuZENvbG9yKENvbG9yOjp3aGl0ZSkKQEAgLTYyLDYgKzYz LDE0IEBAIENvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZTo6fkNvb3JkaW5hdGVkR3JhcGhpY3NTY2Vu ZSgpCiB7CiB9CiAKK3ZvaWQgQ29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lOjp1cGRhdGVWaWV3cG9y dEZpcmVkKFRpbWVyPENvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZT4qKQoreworICAgIFJlZlB0cjxD b29yZGluYXRlZEdyYXBoaWNzU2NlbmU+IHByb3RlY3Rvcih0aGlzKTsKKyAgICBkaXNwYXRjaE9u TWFpblRocmVhZChbPV0geworICAgICAgICBwcm90ZWN0b3ItPnVwZGF0ZVZpZXdwb3J0KCk7Cisg ICAgfSk7Cit9CisKIHZvaWQgQ29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lOjpwYWludFRvQ3VycmVu dEdMQ29udGV4dChjb25zdCBUcmFuc2Zvcm1hdGlvbk1hdHJpeCYgbWF0cml4LCBmbG9hdCBvcGFj aXR5LCBjb25zdCBGbG9hdFJlY3QmIGNsaXBSZWN0LCBUZXh0dXJlTWFwcGVyOjpQYWludEZsYWdz IFBhaW50RmxhZ3MpCiB7CiAgICAgaWYgKCFtX3RleHR1cmVNYXBwZXIpIHsKQEAgLTEwMywxMiAr MTEyLDggQEAgdm9pZCBDb29yZGluYXRlZEdyYXBoaWNzU2NlbmU6OnBhaW50VG9DdXJyZW50R0xD b250ZXh0KGNvbnN0IFRyYW5zZm9ybWF0aW9uTWF0cmkKICAgICBtX3RleHR1cmVNYXBwZXItPmVu ZENsaXAoKTsKICAgICBtX3RleHR1cmVNYXBwZXItPmVuZFBhaW50aW5nKCk7CiAKLSAgICBpZiAo Y3VycmVudFJvb3RMYXllci0+ZGVzY2VuZGFudHNPclNlbGZIYXZlUnVubmluZ0FuaW1hdGlvbnMo KSkgewotICAgICAgICBSZWZQdHI8Q29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lPiBwcm90ZWN0b3Io dGhpcyk7Ci0gICAgICAgIGRpc3BhdGNoT25NYWluVGhyZWFkKFs9XSB7Ci0gICAgICAgICAgICBw cm90ZWN0b3ItPnVwZGF0ZVZpZXdwb3J0KCk7Ci0gICAgICAgIH0pOwotICAgIH0KKyAgICBpZiAo Y3VycmVudFJvb3RMYXllci0+ZGVzY2VuZGFudHNPclNlbGZIYXZlUnVubmluZ0FuaW1hdGlvbnMo KSkKKyAgICAgICAgbV91cGRhdGVWaWV3cG9ydFRpbWVyLnN0YXJ0T25lU2hvdCgwKTsKIH0KIAog dm9pZCBDb29yZGluYXRlZEdyYXBoaWNzU2NlbmU6OnBhaW50VG9HcmFwaGljc0NvbnRleHQoUGxh dGZvcm1HcmFwaGljc0NvbnRleHQqIHBsYXRmb3JtQ29udGV4dCkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9jb29yZGluYXRlZC9Db29yZGluYXRl ZEdyYXBoaWNzU2NlbmUuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1h cC9jb29yZGluYXRlZC9Db29yZGluYXRlZEdyYXBoaWNzU2NlbmUuaAppbmRleCA3NWE0NzJkNGQx MjljMzM5NzgxZTk5NjdiYzFkOWFkYzRmYWE3OGRiLi44ODEyMTRmNThkM2Y0MGRjOTkyNGJkNWY5 ZWU3ODYxYzZjODJkMTA3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy90ZXhtYXAvY29vcmRpbmF0ZWQvQ29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lLmgKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL2Nvb3JkaW5hdGVkL0Nvb3Jk aW5hdGVkR3JhcGhpY3NTY2VuZS5oCkBAIC0xNDgsMTAgKzE0OCwxNCBAQCBwcml2YXRlOgogCiAg ICAgdm9pZCBkaXNwYXRjaENvbW1pdFNjcm9sbE9mZnNldCh1aW50MzJfdCBsYXllcklELCBjb25z dCBJbnRTaXplJiBvZmZzZXQpOwogCisgICAgdm9pZCB1cGRhdGVWaWV3cG9ydEZpcmVkKFRpbWVy PENvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZT4qKTsKKwogICAgIC8vIFJlbmRlciBxdWV1ZSBjYW4g YmUgYWNjZXNzZWQgb255IGZyb20gbWFpbiB0aHJlYWQgb3IgdXBkYXRlUGFpbnROb2RlIGNhbGwg c3RhY2shCiAgICAgVmVjdG9yPHN0ZDo6ZnVuY3Rpb248dm9pZCgpPj4gbV9yZW5kZXJRdWV1ZTsK ICAgICBNdXRleCBtX3JlbmRlclF1ZXVlTXV0ZXg7CiAKKyAgICBUaW1lcjxDb29yZGluYXRlZEdy YXBoaWNzU2NlbmU+IG1fdXBkYXRlVmlld3BvcnRUaW1lcjsKKwogICAgIHN0ZDo6dW5pcXVlX3B0 cjxUZXh0dXJlTWFwcGVyPiBtX3RleHR1cmVNYXBwZXI7CiAKICAgICB0eXBlZGVmIEhhc2hNYXA8 Q29vcmRpbmF0ZWRJbWFnZUJhY2tpbmdJRCwgUmVmUHRyPENvb3JkaW5hdGVkQmFja2luZ1N0b3Jl PiA+IEltYWdlQmFja2luZ01hcDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZWZsL0V3a1ZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv RXdrVmlldy5jcHAKaW5kZXggYjgxZWQxZTFmZTM5OGQzNzUwNTdmM2MxY2I3YzQ0NTgwYTRjOGI0 YS4uOTRhYjRhNDZlOTA5OTE5YTdmMzNjZDMwZGQwZTE1NTMxNzQ0NTcwMSAxMDA3NTUKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlldy5jcHAKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlldy5jcHAKQEAgLTMwOSw3ICszMDksNiBA QCBFd2tWaWV3OjpFd2tWaWV3KFdLVmlld1JlZiB2aWV3LCBFdmFzX09iamVjdCogZXZhc09iamVj dCkKICAgICAgICAgbV9pc0FjY2VsZXJhdGVkID0gZmFsc2U7CiAgICAgfQogCi0gICAgbV9wZW5k aW5nU3VyZmFjZVJlc2l6ZSA9IG1faXNBY2NlbGVyYXRlZDsKICAgICBXS1ZpZXdJbml0aWFsaXpl KHdrVmlldygpKTsKIAogICAgIFdLUGFnZUdyb3VwUmVmIHdrUGFnZUdyb3VwID0gV0tQYWdlR2V0 UGFnZUdyb3VwKHdrUGFnZSgpKTsKQEAgLTU2NiwzNCArNTY1LDE3IEBAIGlubGluZSBJbnRTaXpl IEV3a1ZpZXc6OmRldmljZVNpemUoKSBjb25zdAogCiB2b2lkIEV3a1ZpZXc6OmRpc3BsYXlUaW1l ckZpcmVkKFRpbWVyPEV3a1ZpZXc+KikKIHsKLSAgICBFd2tfVmlld19TbWFydF9EYXRhKiBzZCA9 IHNtYXJ0RGF0YSgpOwotCi0gICAgaWYgKG1fcGVuZGluZ1N1cmZhY2VSZXNpemUpIHsKLSAgICAg ICAgLy8gQ3JlYXRlIGEgR0wgc3VyZmFjZSBoZXJlIHNvIHRoYXQgRXZhcyBoYXMgbm8gY2hhbmNl IG9mIHBhaW50aW5nIHRvIGFuIGVtcHR5IEdMIHN1cmZhY2UuCi0gICAgICAgIGlmICghY3JlYXRl R0xTdXJmYWNlKCkpCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIC8vIE1ha2UgRXZhcyBv YmplY3RzIHZpc2libGUgaGVyZSBpbiBvcmRlciBub3QgdG8gcGFpbnQgZW1wdHkgRXZhcyBvYmpl Y3RzIHdpdGggYmxhY2sgY29sb3IuCi0gICAgICAgIHNob3dFdmFzT2JqZWN0c0lmTmVlZGVkKHNk KTsKLQotICAgICAgICBtX3BlbmRpbmdTdXJmYWNlUmVzaXplID0gZmFsc2U7Ci0gICAgfQorICAg IEFTU0VSVCghbV9pc0FjY2VsZXJhdGVkKTsKIAotICAgIGlmICghbV9pc0FjY2VsZXJhdGVkKSB7 Ci0gICAgICAgIFJlZlB0cjxjYWlyb19zdXJmYWNlX3Q+IHN1cmZhY2UgPSBjcmVhdGVTdXJmYWNl Rm9ySW1hZ2Uoc2QtPmltYWdlKTsKLSAgICAgICAgaWYgKCFzdXJmYWNlKQotICAgICAgICAgICAg cmV0dXJuOworICAgIEV3a19WaWV3X1NtYXJ0X0RhdGEqIHNkID0gc21hcnREYXRhKCk7CiAKLSAg ICAgICAgV0tWaWV3UGFpbnRUb0NhaXJvU3VyZmFjZSh3a1ZpZXcoKSwgc3VyZmFjZS5nZXQoKSk7 Ci0gICAgICAgIGV2YXNfb2JqZWN0X2ltYWdlX2RhdGFfdXBkYXRlX2FkZChzZC0+aW1hZ2UsIDAs IDAsIHNkLT52aWV3LncsIHNkLT52aWV3LmgpOworICAgIFJlZlB0cjxjYWlyb19zdXJmYWNlX3Q+ IHN1cmZhY2UgPSBjcmVhdGVTdXJmYWNlRm9ySW1hZ2Uoc2QtPmltYWdlKTsKKyAgICBpZiAoIXN1 cmZhY2UpCiAgICAgICAgIHJldHVybjsKLSAgICB9Ci0KLSAgICBldmFzX2dsX21ha2VfY3VycmVu dChtX2V2YXNHTC5nZXQoKSwgbV9ldmFzR0xTdXJmYWNlLT5zdXJmYWNlKCksIG1fZXZhc0dMQ29u dGV4dC0+Y29udGV4dCgpKTsKIAotICAgIFdLVmlld1BhaW50VG9DdXJyZW50R0xDb250ZXh0KHdr VmlldygpKTsKLQotICAgIC8vIHNkLT5pbWFnZSBpcyB0aWVkIHRvIGEgbmF0aXZlIHN1cmZhY2Us IHdoaWNoIGlzIGluIHRoZSBwYXJlbnQncyBjb29yZGluYXRlcy4KLSAgICBldmFzX29iamVjdF9p bWFnZV9kYXRhX3VwZGF0ZV9hZGQoc2QtPmltYWdlLCBzZC0+dmlldy54LCBzZC0+dmlldy55LCBz ZC0+dmlldy53LCBzZC0+dmlldy5oKTsKKyAgICBXS1ZpZXdQYWludFRvQ2Fpcm9TdXJmYWNlKHdr VmlldygpLCBzdXJmYWNlLmdldCgpKTsKKyAgICBldmFzX29iamVjdF9pbWFnZV9kYXRhX3VwZGF0 ZV9hZGQoc2QtPmltYWdlLCAwLCAwLCBzZC0+dmlldy53LCBzZC0+dmlldy5oKTsKKyAgICByZXR1 cm47CiB9CiAKIHZvaWQgRXdrVmlldzo6c2NoZWR1bGVVcGRhdGVEaXNwbGF5KCkKQEAgLTYwMSw4 ICs1ODMsMTIgQEAgdm9pZCBFd2tWaWV3OjpzY2hlZHVsZVVwZGF0ZURpc3BsYXkoKQogICAgIGlm IChkZXZpY2VTaXplKCkuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAoIW1f ZGlzcGxheVRpbWVyLmlzQWN0aXZlKCkpCi0gICAgICAgIG1fZGlzcGxheVRpbWVyLnN0YXJ0T25l U2hvdCgwKTsKKyAgICBpZiAobV9pc0FjY2VsZXJhdGVkKQorICAgICAgICBldmFzX29iamVjdF9p bWFnZV9waXhlbHNfZGlydHlfc2V0KHNtYXJ0RGF0YSgpLT5pbWFnZSwgdHJ1ZSk7CisgICAgZWxz ZSB7CisgICAgICAgIGlmICghbV9kaXNwbGF5VGltZXIuaXNBY3RpdmUoKSkKKyAgICAgICAgICAg IG1fZGlzcGxheVRpbWVyLnN0YXJ0T25lU2hvdCgwKTsKKyAgICB9CiB9CiAKICNpZiBFTkFCTEUo RlVMTFNDUkVFTl9BUEkpCkBAIC04MzMsNyArODE5LDE1IEBAIHZvaWQgRXdrVmlldzo6ZG9uZVdp dGhUb3VjaEV2ZW50KFdLVG91Y2hFdmVudFJlZiBldmVudCwgYm9vbCB3YXNFdmVudEhhbmRsZWQp CiB9CiAjZW5kaWYKIAotYm9vbCBFd2tWaWV3OjpjcmVhdGVHTFN1cmZhY2UoKQordm9pZCBFd2tW aWV3Ojpjb21wb3NpdGUoKQoreworICAgIGlmICghZXZhc19nbF9tYWtlX2N1cnJlbnQobV9ldmFz R0wuZ2V0KCksIG1fZXZhc0dMU3VyZmFjZS0+c3VyZmFjZSgpLCBtX2V2YXNHTENvbnRleHQtPmNv bnRleHQoKSkpCisgICAgICAgIHJldHVybjsKKworICAgIFdLVmlld1BhaW50VG9DdXJyZW50R0xD b250ZXh0KHdrVmlldygpKTsKK30KKworYm9vbCBFd2tWaWV3OjpyZXNpemVHTFN1cmZhY2UoKQog ewogICAgIGlmICghbV9pc0FjY2VsZXJhdGVkKQogICAgICAgICByZXR1cm4gdHJ1ZTsKQEAgLTg0 Miw3ICs4MzYsNyBAQCBib29sIEV3a1ZpZXc6OmNyZWF0ZUdMU3VyZmFjZSgpCiAgICAgICAgIEVW QVNfR0xfUkdCQV84ODg4LAogICAgICAgICBFVkFTX0dMX0RFUFRIX0JJVF84LAogICAgICAgICBF VkFTX0dMX1NURU5DSUxfTk9ORSwKLSAgICAgICAgRVZBU19HTF9PUFRJT05TX05PTkUsCisgICAg ICAgIEVWQVNfR0xfT1BUSU9OU19ESVJFQ1QsCiAgICAgICAgIEVWQVNfR0xfTVVMVElTQU1QTEVf Tk9ORQogICAgIH07CiAKQEAgLTg1NSw2ICs4NDksMTAgQEAgYm9vbCBFd2tWaWV3OjpjcmVhdGVH TFN1cmZhY2UoKQogICAgIGV2YXNfZ2xfbmF0aXZlX3N1cmZhY2VfZ2V0KG1fZXZhc0dMLmdldCgp LCBtX2V2YXNHTFN1cmZhY2UtPnN1cmZhY2UoKSwgJm5hdGl2ZVN1cmZhY2UpOwogICAgIGV2YXNf b2JqZWN0X2ltYWdlX25hdGl2ZV9zdXJmYWNlX3NldChzbWFydERhdGEoKS0+aW1hZ2UsICZuYXRp dmVTdXJmYWNlKTsKIAorICAgIGV2YXNfb2JqZWN0X2ltYWdlX3BpeGVsc19nZXRfY2FsbGJhY2tf c2V0KHNtYXJ0RGF0YSgpLT5pbWFnZSwgW10gKHZvaWQqIGRhdGEsIEV2YXNfT2JqZWN0Kikgewor ICAgICAgICBzdGF0aWNfY2FzdDxFd2tWaWV3Kj4oZGF0YSktPmNvbXBvc2l0ZSgpOworICAgIH0s IHRoaXMpOworCiAgICAgZXZhc19nbF9tYWtlX2N1cnJlbnQobV9ldmFzR0wuZ2V0KCksIG1fZXZh c0dMU3VyZmFjZS0+c3VyZmFjZSgpLCBtX2V2YXNHTENvbnRleHQtPmNvbnRleHQoKSk7CiAKICAg ICBFdmFzX0dMX0FQSSogZ2wgPSBldmFzX2dsX2FwaV9nZXQobV9ldmFzR0wuZ2V0KCkpOwpAQCAt MTIyNCw3ICsxMjIyLDcgQEAgdm9pZCBFd2tWaWV3OjpoYW5kbGVFdmFzT2JqZWN0Q2FsY3VsYXRl KEV2YXNfT2JqZWN0KiBldmFzT2JqZWN0KQogICAgICAgICBpZiAoV0tQYWdlVXNlRml4ZWRMYXlv dXQoc2VsZi0+d2tQYWdlKCkpKQogICAgICAgICAgICAgc2VsZi0+cGFnZVZpZXdwb3J0Q29udHJv bGxlcigpLmRpZENoYW5nZVZpZXdwb3J0U2l6ZShzZWxmLT5zaXplKCkpOwogCi0gICAgICAgIHNl bGYtPnNldE5lZWRzU3VyZmFjZVJlc2l6ZSgpOworICAgICAgICBzZWxmLT5yZXNpemVHTFN1cmZh Y2UoKTsKICAgICB9CiB9CiAKQEAgLTEyMzMsOCArMTIzMSw3IEBAIHZvaWQgRXdrVmlldzo6aGFu ZGxlRXZhc09iamVjdFNob3coRXZhc19PYmplY3QqIGV2YXNPYmplY3QpCiAgICAgRXdrX1ZpZXdf U21hcnRfRGF0YSogc21hcnREYXRhID0gdG9TbWFydERhdGEoZXZhc09iamVjdCk7CiAgICAgQVNT RVJUKHNtYXJ0RGF0YSk7CiAKLSAgICBpZiAoIXRvRXdrVmlldyhzbWFydERhdGEpLT5tX3BlbmRp bmdTdXJmYWNlUmVzaXplKQotICAgICAgICBzaG93RXZhc09iamVjdHNJZk5lZWRlZChzbWFydERh dGEpOworICAgIHNob3dFdmFzT2JqZWN0c0lmTmVlZGVkKHNtYXJ0RGF0YSk7CiB9CiAKIHZvaWQg RXdrVmlldzo6aGFuZGxlRXZhc09iamVjdEhpZGUoRXZhc19PYmplY3QqIGV2YXNPYmplY3QpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3LmggYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3LmgKaW5kZXggYTA3YjM1MzQx YzBiZmI2MDk3YjJhZWZlYzA1ODc2NDE2OTIxYzhmNy4uNGRjMzI2ZTMyN2Q5NWFiNjhhNWRkYTgx MzViYjk4ZTk2ODczZWIzNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9lZmwvRXdrVmlldy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3 a1ZpZXcuaApAQCAtMTQyLDggKzE0Miw4IEBAIHB1YmxpYzoKICAgICBXS1JlY3Qgd2luZG93R2Vv bWV0cnkoKSBjb25zdDsKICAgICB2b2lkIHNldFdpbmRvd0dlb21ldHJ5KGNvbnN0IFdLUmVjdCYp OwogCi0gICAgYm9vbCBjcmVhdGVHTFN1cmZhY2UoKTsKLSAgICB2b2lkIHNldE5lZWRzU3VyZmFj ZVJlc2l6ZSgpIHsgbV9wZW5kaW5nU3VyZmFjZVJlc2l6ZSA9IHRydWU7IH0KKyAgICBib29sIHJl c2l6ZUdMU3VyZmFjZSgpOworICAgIHZvaWQgY29tcG9zaXRlKCk7CiAKICNpZiBFTkFCTEUoSU5Q VVRfVFlQRV9DT0xPUikKICAgICB2b2lkIHJlcXVlc3RDb2xvclBpY2tlcihXS0NvbG9yUGlja2Vy UmVzdWx0TGlzdGVuZXJSZWYgbGlzdGVuZXIsIGNvbnN0IFdlYkNvcmU6OkNvbG9yJik7CkBAIC0y NDYsNyArMjQ2LDYgQEAgcHJpdmF0ZToKICAgICBFZmxVbmlxdWVQdHI8RXZhc19HTD4gbV9ldmFz R0w7CiAgICAgc3RkOjp1bmlxdWVfcHRyPFdlYkNvcmU6OkV2YXNHTENvbnRleHQ+IG1fZXZhc0dM Q29udGV4dDsKICAgICBzdGQ6OnVuaXF1ZV9wdHI8V2ViQ29yZTo6RXZhc0dMU3VyZmFjZT4gbV9l dmFzR0xTdXJmYWNlOwotICAgIGJvb2wgbV9wZW5kaW5nU3VyZmFjZVJlc2l6ZTsKIAogICAgIFdl YkNvcmU6OlRyYW5zZm9ybWF0aW9uTWF0cml4IG1fdXNlclZpZXdwb3J0VHJhbnNmb3JtOwogICAg IHN0ZDo6dW5pcXVlX3B0cjxXZWJLaXQ6OlBhZ2VMb2FkQ2xpZW50RWZsPiBtX3BhZ2VMb2FkQ2xp ZW50Owo= 255183 2015-06-19 00:28:02 -0700 2016-03-09 20:32:20 -0800 Patch bug-136095-20150619162721.patch text/plain 10320 ryuan.choi U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1NjkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOGUyY2UwZjY0YjMzNWQ4 ZTRlMWYzNzVjNDQ2Mzc5NzllZTE3OGIzMy4uZmM2MTkxMmQ3ZTU2ODZmMzliNzdhOTIzNGE0YjAz YTgwYTdlYmM3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDE1LTA2LTE5ICBSeXVh biBDaG9pICA8cnl1YW4uY2hvaUBuYXZlcmNvcnAuY29tPgorCisgICAgICAgIFtFRkxdIEFwcGx5 ICdkaXJlY3QnIG9wdGlvbiB0byBhY2NlbGVyYXRlZCBjb21wb3NpdGluZyBmb3IgcmVuZGVyaW5n IGRpcmVjdGx5IHRvIGV2YXMnIHdpbmRvdy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEzNjA5NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIE9yaWdpbmFsIHBhdGNoIGJ5IEh5b3dvbiBLaW0gPGh3MTAwOC5r aW1Ac2Ftc3VuZy5jb20+CisKKyAgICAgICAgVG8gaW1wcm92ZSByZW5kZXJpbmcgcGVyZm9ybWFu Y2UgZm9yIEVGTCBhcHBsaWNhdGlvbnMgdXNpbmcgR0wsCisgICAgICAgIEV2YXMgaW50cm9kdWNl ZCBFVkFTX0dMX09QVElPTlNfRElSRUNUIHdoaWNoIGFsbG93cyBHTCByZW5kZXJpbmcgZGlyZWN0 bHkgdG8gZXZhcycgd2luZG93LgorICAgICAgICBUaGlzIHBhdGNoIGFwcGxpZXMgdGhpcyBvcHRp b24gdG8gYWNjZWxlcmF0ZWQgY29tcG9zaXRpbmcgb24gV2ViS2l0MiBFRkwuCisgICAgICAgIFRv IGRvIHRoaXMsIEV2YXNfTmF0aXZlX1N1cmZhY2Ugc2hvdWxkIGJlIGNyZWF0ZWQgd2l0aCBFVkFT X0dMX09QVElPTlNfRElSRUNULgorICAgICAgICBBbmQgY29tcG9zaXRpbmcgdHJpZ2dlciBpcyBh IHBpeGVsX2dldF9jYWxsYmFjaywgbm90IGEgdGltZXIuCisgICAgICAgIEJ1dCB0aGUgdGltZXIs IG1fZGlzcGxheVRpbWVyLCBpcyBzdGlsbCB1c2VkIG9uIHRoZSBTVyBiYWNrZW5kLgorCisgICAg ICAgICogU2hhcmVkL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0ZWRHcmFwaGljc1NjZW5l LmNwcDoKKyAgICAgICAgKFdlYktpdDo6Q29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lOjpDb29yZGlu YXRlZEdyYXBoaWNzU2NlbmUpOgorICAgICAgICAoV2ViS2l0OjpDb29yZGluYXRlZEdyYXBoaWNz U2NlbmU6OnVwZGF0ZVZpZXdwb3J0VGltZXJGaXJlZCk6CisgICAgICAgIChXZWJLaXQ6OkNvb3Jk aW5hdGVkR3JhcGhpY3NTY2VuZTo6cGFpbnRUb0N1cnJlbnRHTENvbnRleHQpOgorICAgICAgICAq IFNoYXJlZC9Db29yZGluYXRlZEdyYXBoaWNzL0Nvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZS5oOgor ICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXcuY3BwOgorICAgICAgICAoRXdrVmll dzo6ZGlzcGxheVRpbWVyRmlyZWQpOgorICAgICAgICAoRXdrVmlldzo6c2NoZWR1bGVVcGRhdGVE aXNwbGF5KToKKyAgICAgICAgKEV3a1ZpZXc6OmNvbXBvc2l0ZSk6CisgICAgICAgIChFd2tWaWV3 OjpyZXNpemVHTFN1cmZhY2UpOgorICAgICAgICAoRXdrVmlldzo6aGFuZGxlRXZhc09iamVjdENh bGN1bGF0ZSk6CisgICAgICAgIChFd2tWaWV3OjpoYW5kbGVFdmFzT2JqZWN0U2hvdyk6CisgICAg ICAgIChFd2tWaWV3OjpFd2tWaWV3KTogRGVsZXRlZC4KKyAgICAgICAgKEV3a1ZpZXc6OmNyZWF0 ZUdMU3VyZmFjZSk6IERlbGV0ZWQuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmll dy5oOgorICAgICAgICAoRXdrVmlldzo6c2V0TmVlZHNTdXJmYWNlUmVzaXplKTogRGVsZXRlZC4K KwogMjAxNS0wNi0xNyAgWW9uZ2p1biBaaGFuZyAgPHlvbmdqdW5femhhbmdAYXBwbGUuY29tPgog CiAgICAgICAgIEFsc28gdHVybiBvZmYgbG9uZyBwcmVzcyBvbiBsaW5rIHByZXZpZXcuCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGlu YXRlZEdyYXBoaWNzU2NlbmUuY3BwIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL0Nvb3JkaW5hdGVk R3JhcGhpY3MvQ29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lLmNwcAppbmRleCAzYjNmYzc3ZTQ5OGQz NjYzNzdmYjczNmQ2Yjc4MGUxODYzZWMxZTBjLi4xZjVhZjg5Nzk1OWY4YWQ3ZWZmZDE2MzY0ZmY2 NDVkMzJhMDIyNzNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQ29vcmRpbmF0 ZWRHcmFwaGljcy9Db29yZGluYXRlZEdyYXBoaWNzU2NlbmUuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQyL1NoYXJlZC9Db29yZGluYXRlZEdyYXBoaWNzL0Nvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZS5j cHAKQEAgLTU3LDcgKzU3LDggQEAgc3RhdGljIGJvb2wgbGF5ZXJTaG91bGRIYXZlQmFja2luZ1N0 b3JlKFRleHR1cmVNYXBwZXJMYXllciogbGF5ZXIpCiB9CiAKIENvb3JkaW5hdGVkR3JhcGhpY3NT Y2VuZTo6Q29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lKENvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZUNs aWVudCogY2xpZW50KQotICAgIDogbV9jbGllbnQoY2xpZW50KQorICAgIDogbV91cGRhdGVWaWV3 cG9ydFRpbWVyKCp0aGlzLCAmQ29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lOjp1cGRhdGVWaWV3cG9y dFRpbWVyRmlyZWQpCisgICAgLCBtX2NsaWVudChjbGllbnQpCiAgICAgLCBtX2lzQWN0aXZlKGZh bHNlKQogICAgICwgbV9yb290TGF5ZXJJRChJbnZhbGlkQ29vcmRpbmF0ZWRMYXllcklEKQogICAg ICwgbV92aWV3QmFja2dyb3VuZENvbG9yKENvbG9yOjp3aGl0ZSkKQEAgLTY5LDYgKzcwLDE0IEBA IENvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZTo6fkNvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZSgpCiB7 CiB9CiAKK3ZvaWQgQ29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lOjp1cGRhdGVWaWV3cG9ydFRpbWVy RmlyZWQoKQoreworICAgIFJlZlB0cjxDb29yZGluYXRlZEdyYXBoaWNzU2NlbmU+IHByb3RlY3Rv cih0aGlzKTsKKyAgICBkaXNwYXRjaE9uQ2xpZW50UnVuTG9vcChbPV0geworICAgICAgICBwcm90 ZWN0b3ItPnVwZGF0ZVZpZXdwb3J0KCk7CisgICAgfSk7Cit9CisKIHZvaWQgQ29vcmRpbmF0ZWRH cmFwaGljc1NjZW5lOjpwYWludFRvQ3VycmVudEdMQ29udGV4dChjb25zdCBUcmFuc2Zvcm1hdGlv bk1hdHJpeCYgbWF0cml4LCBmbG9hdCBvcGFjaXR5LCBjb25zdCBGbG9hdFJlY3QmIGNsaXBSZWN0 LCBjb25zdCBDb2xvciYgYmFja2dyb3VuZENvbG9yLCBib29sIGRyYXdzQmFja2dyb3VuZCwgY29u c3QgRmxvYXRQb2ludCYgY29udGVudFBvc2l0aW9uLCBUZXh0dXJlTWFwcGVyOjpQYWludEZsYWdz IFBhaW50RmxhZ3MpCiB7CiAgICAgaWYgKCFtX3RleHR1cmVNYXBwZXIpIHsKQEAgLTEwOSwxMiAr MTE4LDggQEAgdm9pZCBDb29yZGluYXRlZEdyYXBoaWNzU2NlbmU6OnBhaW50VG9DdXJyZW50R0xD b250ZXh0KGNvbnN0IFRyYW5zZm9ybWF0aW9uTWF0cmkKICAgICBtX3RleHR1cmVNYXBwZXItPmVu ZENsaXAoKTsKICAgICBtX3RleHR1cmVNYXBwZXItPmVuZFBhaW50aW5nKCk7CiAKLSAgICBpZiAo Y3VycmVudFJvb3RMYXllci0+ZGVzY2VuZGFudHNPclNlbGZIYXZlUnVubmluZ0FuaW1hdGlvbnMo KSkgewotICAgICAgICBSZWZQdHI8Q29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lPiBwcm90ZWN0b3Io dGhpcyk7Ci0gICAgICAgIGRpc3BhdGNoT25DbGllbnRSdW5Mb29wKFs9XSB7Ci0gICAgICAgICAg ICBwcm90ZWN0b3ItPnVwZGF0ZVZpZXdwb3J0KCk7Ci0gICAgICAgIH0pOwotICAgIH0KKyAgICBp ZiAoY3VycmVudFJvb3RMYXllci0+ZGVzY2VuZGFudHNPclNlbGZIYXZlUnVubmluZ0FuaW1hdGlv bnMoKSkKKyAgICAgICAgbV91cGRhdGVWaWV3cG9ydFRpbWVyLnN0YXJ0T25lU2hvdCgwKTsKIH0K IAogdm9pZCBDb29yZGluYXRlZEdyYXBoaWNzU2NlbmU6OnBhaW50VG9HcmFwaGljc0NvbnRleHQo UGxhdGZvcm1HcmFwaGljc0NvbnRleHQqIHBsYXRmb3JtQ29udGV4dCwgY29uc3QgQ29sb3ImIGJh Y2tncm91bmRDb2xvciwgYm9vbCBkcmF3c0JhY2tncm91bmQpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZEdyYXBoaWNzU2Nl bmUuaCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9Db29yZGluYXRlZEdyYXBoaWNzL0Nvb3JkaW5h dGVkR3JhcGhpY3NTY2VuZS5oCmluZGV4IGY3MTcxOWNkNDk0MWIyYjg5NWY3OTJjNzA4YzRiYzAy NjY2ODUwZmUuLjljMmVhOGI4NDQ5ZWRmYmY4YmM5YjMxZjIyYjIzNmU2YzY0YTVjYWQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9Db29yZGluYXRlZEdyYXBoaWNzL0Nvb3JkaW5h dGVkR3JhcGhpY3NTY2VuZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9Db29yZGluYXRl ZEdyYXBoaWNzL0Nvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZS5oCkBAIC0xNDMsMTAgKzE0MywxMyBA QCBwcml2YXRlOgogCiAgICAgdm9pZCBkaXNwYXRjaENvbW1pdFNjcm9sbE9mZnNldCh1aW50MzJf dCBsYXllcklELCBjb25zdCBXZWJDb3JlOjpJbnRTaXplJiBvZmZzZXQpOwogCisgICAgdm9pZCB1 cGRhdGVWaWV3cG9ydFRpbWVyRmlyZWQoKTsKKwogICAgIC8vIFJlbmRlciBxdWV1ZSBjYW4gYmUg YWNjZXNzZWQgb255IGZyb20gbWFpbiB0aHJlYWQgb3IgdXBkYXRlUGFpbnROb2RlIGNhbGwgc3Rh Y2shCiAgICAgVmVjdG9yPHN0ZDo6ZnVuY3Rpb248dm9pZCgpPj4gbV9yZW5kZXJRdWV1ZTsKICAg ICBNdXRleCBtX3JlbmRlclF1ZXVlTXV0ZXg7CiAKKyAgICBXZWJDb3JlOjpUaW1lciBtX3VwZGF0 ZVZpZXdwb3J0VGltZXI7CiAgICAgc3RkOjp1bmlxdWVfcHRyPFdlYkNvcmU6OlRleHR1cmVNYXBw ZXI+IG1fdGV4dHVyZU1hcHBlcjsKIAogICAgIHR5cGVkZWYgSGFzaE1hcDxXZWJDb3JlOjpDb29y ZGluYXRlZEltYWdlQmFja2luZ0lELCBSZWZQdHI8Q29vcmRpbmF0ZWRCYWNraW5nU3RvcmU+PiBJ bWFnZUJhY2tpbmdNYXA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2VmbC9Fd2tWaWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1Zp ZXcuY3BwCmluZGV4IDc3YjUwMWE4NGRmNjQzZTFiZGVlN2U1NzQ1ZmYxOTQ0MTQyNWFmNTkuLjFk NDhiMWE4NTk5YmM5MDhmY2EyZmRmMjVmZmMxNmUzN2QzOGRkZmUgMTAwNzU1Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXcuY3BwCkBAIC0zMjIsNyArMzIyLDYgQEAgRXdr Vmlldzo6RXdrVmlldyhXS1ZpZXdSZWYgdmlldywgRXZhc19PYmplY3QqIGV2YXNPYmplY3QpCiAg ICAgICAgIG1faXNBY2NlbGVyYXRlZCA9IGZhbHNlOwogICAgIH0KIAotICAgIG1fcGVuZGluZ1N1 cmZhY2VSZXNpemUgPSBtX2lzQWNjZWxlcmF0ZWQ7CiAgICAgV0tWaWV3SW5pdGlhbGl6ZSh3a1Zp ZXcoKSk7CiAKICAgICBtX3BhZ2VVSUNsaWVudCA9IHN0ZDo6bWFrZV91bmlxdWU8UGFnZVVJQ2xp ZW50RWZsPih0aGlzKTsKQEAgLTU0OCwzMyArNTQ3LDE0IEBAIGlubGluZSBJbnRTaXplIEV3a1Zp ZXc6OmRldmljZVNpemUoKSBjb25zdAogCiB2b2lkIEV3a1ZpZXc6OmRpc3BsYXlUaW1lckZpcmVk KCkKIHsKKyAgICBBU1NFUlQoIW1faXNBY2NlbGVyYXRlZCk7CiAgICAgRXdrX1ZpZXdfU21hcnRf RGF0YSogc2QgPSBzbWFydERhdGEoKTsKIAotICAgIGlmIChtX3BlbmRpbmdTdXJmYWNlUmVzaXpl KSB7Ci0gICAgICAgIC8vIENyZWF0ZSBhIEdMIHN1cmZhY2UgaGVyZSBzbyB0aGF0IEV2YXMgaGFz IG5vIGNoYW5jZSBvZiBwYWludGluZyB0byBhbiBlbXB0eSBHTCBzdXJmYWNlLgotICAgICAgICBp ZiAoIWNyZWF0ZUdMU3VyZmFjZSgpKQotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAvLyBN YWtlIEV2YXMgb2JqZWN0cyB2aXNpYmxlIGhlcmUgaW4gb3JkZXIgbm90IHRvIHBhaW50IGVtcHR5 IEV2YXMgb2JqZWN0cyB3aXRoIGJsYWNrIGNvbG9yLgotICAgICAgICBzaG93RXZhc09iamVjdHNJ Zk5lZWRlZChzZCk7Ci0KLSAgICAgICAgbV9wZW5kaW5nU3VyZmFjZVJlc2l6ZSA9IGZhbHNlOwot ICAgIH0KLQotICAgIGlmICghbV9pc0FjY2VsZXJhdGVkKSB7Ci0gICAgICAgIFJlZlB0cjxjYWly b19zdXJmYWNlX3Q+IHN1cmZhY2UgPSBjcmVhdGVTdXJmYWNlRm9ySW1hZ2Uoc2QtPmltYWdlKTsK LSAgICAgICAgaWYgKCFzdXJmYWNlKQotICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgIFdL Vmlld1BhaW50VG9DYWlyb1N1cmZhY2Uod2tWaWV3KCksIHN1cmZhY2UuZ2V0KCkpOwotICAgICAg ICBldmFzX29iamVjdF9pbWFnZV9kYXRhX3VwZGF0ZV9hZGQoc2QtPmltYWdlLCAwLCAwLCBzZC0+ dmlldy53LCBzZC0+dmlldy5oKTsKKyAgICBSZWZQdHI8Y2Fpcm9fc3VyZmFjZV90PiBzdXJmYWNl ID0gY3JlYXRlU3VyZmFjZUZvckltYWdlKHNkLT5pbWFnZSk7CisgICAgaWYgKCFzdXJmYWNlKQog ICAgICAgICByZXR1cm47Ci0gICAgfQotCi0gICAgZXZhc19nbF9tYWtlX2N1cnJlbnQobV9ldmFz R0wsIG1fZXZhc0dMU3VyZmFjZS0+c3VyZmFjZSgpLCBtX2V2YXNHTENvbnRleHQtPmNvbnRleHQo KSk7CiAKLSAgICBXS1ZpZXdQYWludFRvQ3VycmVudEdMQ29udGV4dCh3a1ZpZXcoKSk7Ci0KLSAg ICAvLyBzZC0+aW1hZ2Ugc2hvdWxkIGJlIHVwZGF0ZWQgZnJvbSAoMCwwKSB3aGVuIHVzaW5nIHRo ZSBldmFzR0wgZm9yIGdyYXBoaWNzIGJhY2tlbmQuCisgICAgV0tWaWV3UGFpbnRUb0NhaXJvU3Vy ZmFjZSh3a1ZpZXcoKSwgc3VyZmFjZS5nZXQoKSk7CiAgICAgZXZhc19vYmplY3RfaW1hZ2VfZGF0 YV91cGRhdGVfYWRkKHNkLT5pbWFnZSwgMCwgMCwgc2QtPnZpZXcudywgc2QtPnZpZXcuaCk7CiB9 CiAKQEAgLTU4Myw3ICs1NjMsOSBAQCB2b2lkIEV3a1ZpZXc6OnNjaGVkdWxlVXBkYXRlRGlzcGxh eSgpCiAgICAgaWYgKGRldmljZVNpemUoKS5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybjsKIAot ICAgIGlmICghbV9kaXNwbGF5VGltZXIuaXNBY3RpdmUoKSkKKyAgICBpZiAobV9pc0FjY2VsZXJh dGVkKQorICAgICAgICBldmFzX29iamVjdF9pbWFnZV9waXhlbHNfZGlydHlfc2V0KHNtYXJ0RGF0 YSgpLT5pbWFnZSwgdHJ1ZSk7CisgICAgZWxzZSBpZiAoIW1fZGlzcGxheVRpbWVyLmlzQWN0aXZl KCkpCiAgICAgICAgIG1fZGlzcGxheVRpbWVyLnN0YXJ0T25lU2hvdCgwKTsKIH0KIApAQCAtODIx LDcgKzgwMywxNSBAQCB2b2lkIEV3a1ZpZXc6OmRvbmVXaXRoVG91Y2hFdmVudChXS1RvdWNoRXZl bnRSZWYgZXZlbnQsIGJvb2wgd2FzRXZlbnRIYW5kbGVkKQogfQogI2VuZGlmCiAKLWJvb2wgRXdr Vmlldzo6Y3JlYXRlR0xTdXJmYWNlKCkKK3ZvaWQgRXdrVmlldzo6Y29tcG9zaXRlKCkKK3sKKyAg ICBpZiAoIWV2YXNfZ2xfbWFrZV9jdXJyZW50KG1fZXZhc0dMLCBtX2V2YXNHTFN1cmZhY2UtPnN1 cmZhY2UoKSwgbV9ldmFzR0xDb250ZXh0LT5jb250ZXh0KCkpKQorICAgICAgICByZXR1cm47CisK KyAgICBXS1ZpZXdQYWludFRvQ3VycmVudEdMQ29udGV4dCh3a1ZpZXcoKSk7Cit9CisKK2Jvb2wg RXdrVmlldzo6cmVzaXplR0xTdXJmYWNlKCkKIHsKICAgICBpZiAoIW1faXNBY2NlbGVyYXRlZCkK ICAgICAgICAgcmV0dXJuIHRydWU7CkBAIC04MzAsNyArODIwLDcgQEAgYm9vbCBFd2tWaWV3Ojpj cmVhdGVHTFN1cmZhY2UoKQogICAgICAgICBFVkFTX0dMX1JHQkFfODg4OCwKICAgICAgICAgRVZB U19HTF9ERVBUSF9CSVRfOCwKICAgICAgICAgRVZBU19HTF9TVEVOQ0lMX05PTkUsCi0gICAgICAg IEVWQVNfR0xfT1BUSU9OU19OT05FLAorICAgICAgICBFVkFTX0dMX09QVElPTlNfRElSRUNULAog ICAgICAgICBFVkFTX0dMX01VTFRJU0FNUExFX05PTkUsCiAjaWYgZGVmaW5lZChFVkFTX0dMX0FQ SV9WRVJTSU9OKSAmJiBFVkFTX0dMX0FQSV9WRVJTSU9OID49IDIKICAgICAgICAgRVZBU19HTF9H TEVTXzJfWApAQCAtODQ2LDYgKzgzNiwxMyBAQCBib29sIEV3a1ZpZXc6OmNyZWF0ZUdMU3VyZmFj ZSgpCiAgICAgZXZhc19nbF9uYXRpdmVfc3VyZmFjZV9nZXQobV9ldmFzR0wsIG1fZXZhc0dMU3Vy ZmFjZS0+c3VyZmFjZSgpLCAmbmF0aXZlU3VyZmFjZSk7CiAgICAgZXZhc19vYmplY3RfaW1hZ2Vf bmF0aXZlX3N1cmZhY2Vfc2V0KHNtYXJ0RGF0YSgpLT5pbWFnZSwgJm5hdGl2ZVN1cmZhY2UpOwog CisgICAgZXZhc19vYmplY3RfaW1hZ2VfcGl4ZWxzX2dldF9jYWxsYmFja19zZXQoc21hcnREYXRh KCktPmltYWdlLCAKKyAgICAgICAgW10gKHZvaWQqIGRhdGEsIEV2YXNfT2JqZWN0KikKKyAgICAg ICAgeworICAgICAgICAgICAgc3RhdGljX2Nhc3Q8RXdrVmlldyo+KGRhdGEpLT5jb21wb3NpdGUo KTsKKyAgICAgICAgfSwKKyAgICAgICAgdGhpcyk7CisKICAgICBldmFzX2dsX21ha2VfY3VycmVu dChtX2V2YXNHTCwgbV9ldmFzR0xTdXJmYWNlLT5zdXJmYWNlKCksIG1fZXZhc0dMQ29udGV4dC0+ Y29udGV4dCgpKTsKIAogICAgIEV2YXNfR0xfQVBJKiBnbCA9IGV2YXNfZ2xfYXBpX2dldChtX2V2 YXNHTCk7CkBAIC0xMjI3LDcgKzEyMjQsNyBAQCB2b2lkIEV3a1ZpZXc6OmhhbmRsZUV2YXNPYmpl Y3RDYWxjdWxhdGUoRXZhc19PYmplY3QqIGV2YXNPYmplY3QpCiAgICAgICAgIGlmIChXS1BhZ2VV c2VGaXhlZExheW91dChzZWxmLT53a1BhZ2UoKSkpCiAgICAgICAgICAgICBzZWxmLT5wYWdlVmll d3BvcnRDb250cm9sbGVyKCkuZGlkQ2hhbmdlVmlld3BvcnRTaXplKHNlbGYtPnNpemUoKSk7CiAK LSAgICAgICAgc2VsZi0+c2V0TmVlZHNTdXJmYWNlUmVzaXplKCk7CisgICAgICAgIHNlbGYtPnJl c2l6ZUdMU3VyZmFjZSgpOwogICAgIH0KIH0KIApAQCAtMTIzNiw4ICsxMjMzLDcgQEAgdm9pZCBF d2tWaWV3OjpoYW5kbGVFdmFzT2JqZWN0U2hvdyhFdmFzX09iamVjdCogZXZhc09iamVjdCkKICAg ICBFd2tfVmlld19TbWFydF9EYXRhKiBzbWFydERhdGEgPSB0b1NtYXJ0RGF0YShldmFzT2JqZWN0 KTsKICAgICBBU1NFUlQoc21hcnREYXRhKTsKIAotICAgIGlmICghdG9Fd2tWaWV3KHNtYXJ0RGF0 YSktPm1fcGVuZGluZ1N1cmZhY2VSZXNpemUpCi0gICAgICAgIHNob3dFdmFzT2JqZWN0c0lmTmVl ZGVkKHNtYXJ0RGF0YSk7CisgICAgc2hvd0V2YXNPYmplY3RzSWZOZWVkZWQoc21hcnREYXRhKTsK IH0KIAogdm9pZCBFd2tWaWV3OjpoYW5kbGVFdmFzT2JqZWN0SGlkZShFdmFzX09iamVjdCogZXZh c09iamVjdCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3 a1ZpZXcuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXcuaAppbmRl eCBlZGZiMDgxYzg0ZjhmYjI2MmVkNWMxZTJmYjdjZjJhYTE4ZDAyNjZkLi4yYzc5ZjZhYjBlYzRj NzczNTgyNzJiM2FlMDYzMGUxOGQzZTRiZWY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9lZmwvRXdrVmlldy5oCkBAIC0xNTUsOCArMTU1LDggQEAgcHVibGljOgogICAgIFdLUmVj dCB3aW5kb3dHZW9tZXRyeSgpIGNvbnN0OwogICAgIHZvaWQgc2V0V2luZG93R2VvbWV0cnkoY29u c3QgV0tSZWN0Jik7CiAKLSAgICBib29sIGNyZWF0ZUdMU3VyZmFjZSgpOwotICAgIHZvaWQgc2V0 TmVlZHNTdXJmYWNlUmVzaXplKCkgeyBtX3BlbmRpbmdTdXJmYWNlUmVzaXplID0gdHJ1ZTsgfQor ICAgIGJvb2wgcmVzaXplR0xTdXJmYWNlKCk7CisgICAgdm9pZCBjb21wb3NpdGUoKTsKIAogI2lm IEVOQUJMRShJTlBVVF9UWVBFX0NPTE9SKQogICAgIHZvaWQgcmVxdWVzdENvbG9yUGlja2VyKFdL Q29sb3JQaWNrZXJSZXN1bHRMaXN0ZW5lclJlZiBsaXN0ZW5lciwgY29uc3QgV2ViQ29yZTo6Q29s b3ImKTsKQEAgLTI2MCw3ICsyNjAsNiBAQCBwcml2YXRlOgogICAgIEV2YXNfR0wqIG1fZXZhc0dM OwogICAgIHN0ZDo6dW5pcXVlX3B0cjxXZWJDb3JlOjpFdmFzR0xDb250ZXh0PiBtX2V2YXNHTENv bnRleHQ7CiAgICAgc3RkOjp1bmlxdWVfcHRyPFdlYkNvcmU6OkV2YXNHTFN1cmZhY2U+IG1fZXZh c0dMU3VyZmFjZTsKLSAgICBib29sIG1fcGVuZGluZ1N1cmZhY2VSZXNpemU7CiAKICAgICBXZWJD b3JlOjpUcmFuc2Zvcm1hdGlvbk1hdHJpeCBtX3VzZXJWaWV3cG9ydFRyYW5zZm9ybTsKICAgICBz dGQ6OnVuaXF1ZV9wdHI8V2ViS2l0OjpQYWdlTG9hZENsaWVudEVmbD4gbV9wYWdlTG9hZENsaWVu dDsK