110345 2013-02-20 06:56:14 -0800 [WK2][EFL] Move PageViewportController and PageViewportControllerClientEfl out from WebView 2013-02-21 04:00:39 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 107657 107662 1 mikhail.pozdnyakov mikhail.pozdnyakov andersca benjamin cmarcelo gyuyoung.kim kenneth kling lucas.de.marchi rakuco webkit.review.bot oldest_to_newest 837438 0 mikhail.pozdnyakov 2013-02-20 06:56:14 -0800 SSIA. WebView does not need to know about both PageViewportController and PageViewportControllerClientEfl. Considering the fact that PageViewportController will stop being WK2 internal and will be based on WK2 C API, it's worth moving it to Ewk API layer - into EwkView. 837469 1 189318 mikhail.pozdnyakov 2013-02-20 07:45:39 -0800 Created attachment 189318 patch 837472 2 189318 kenneth 2013-02-20 08:04:58 -0800 Comment on attachment 189318 patch View in context: https://bugs.webkit.org/attachment.cgi?id=189318&action=review LGTM > Source/WebKit2/UIProcess/efl/WebView.cpp:155 > + m_ewkView->pageViewportControllerClient()->updateViewportSize(); Would be nice to get rid of m_ewkView from this class 838166 3 mikhail.pozdnyakov 2013-02-20 23:12:23 -0800 (In reply to comment #2) > (From update of attachment 189318 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=189318&action=review > > LGTM > > > Source/WebKit2/UIProcess/efl/WebView.cpp:155 > > + m_ewkView->pageViewportControllerClient()->updateViewportSize(); > > Would be nice to get rid of m_ewkView from this class Sure. We'll remove m_ewkView usage here via WKViewClient API extension. 838314 4 189318 webkit.review.bot 2013-02-21 04:00:34 -0800 Comment on attachment 189318 patch Clearing flags on attachment: 189318 Committed r143582: <http://trac.webkit.org/changeset/143582> 838315 5 webkit.review.bot 2013-02-21 04:00:39 -0800 All reviewed patches have been landed. Closing bug. 189318 2013-02-20 07:45:39 -0800 2013-02-21 04:00:34 -0800 patch bug110345 text/plain 8949 mikhail.pozdnyakov Y29tbWl0IGU5ZGNiYWM1ZTIyZWU1NDEyMWMyMmI1Nzk5Mzc5YmEyMWNiOWY5N2EKQXV0aG9yOiBN aWtoYWlsIFBvemRueWFrb3YgPG1pa2hhaWwucG96ZG55YWtvdkBpbnRlbC5jb20+CkRhdGU6ICAg V2VkIEZlYiAyMCAxNzozOTo0MCAyMDEzICswMjAwCgogICAgYnVnMTEwMzQ1CgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmlu ZGV4IDM2NDRjZDIuLmJjOTA0OWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxv ZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNyBAQAorMjAxMy0w Mi0yMCAgTWlraGFpbCBQb3pkbnlha292ICA8bWlraGFpbC5wb3pkbnlha292QGludGVsLmNvbT4K KworICAgICAgICBbV0syXVtFRkxdIE1vdmUgUGFnZVZpZXdwb3J0Q29udHJvbGxlciBhbmQgUGFn ZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudEVmbCBvdXQgZnJvbSBXZWJWaWV3CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTAzNDUKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWJWaWV3IGRvZXMgbm90IG5l ZWQgdG8ga25vdyBhYm91dCBib3RoIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXIgYW5kIAorICAgICAg ICBQYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50RWZsLiBDb25zaWRlcmluZyB0aGUgZmFjdCB0 aGF0IFBhZ2VWaWV3cG9ydENvbnRyb2xsZXIKKyAgICAgICAgd2lsbCBzdG9wIGJlaW5nIFdLMiBp bnRlcm5hbCBhbmQgd2lsbCBiZSBiYXNlZCBvbiBXSzIgQyBBUEksIGl0IAorICAgICAgICBzaG91 bGQgYmUgb3duZWQgYnkgRXdrVmlldyByYXRoZXIgdGhhbiBXZWJWaWV3LgorCisgICAgICAgIFRo aXMgcGF0Y2ggaXMgYWxzbyBhIHByZXBhcmF0aW9uIGZvciBXS1ZpZXdDbGllbnQgQVBJIGV4dGVu c2lvbiB0byBjb3ZlciBhbGwKKyAgICAgICAgdGhlIHBsYWNlcyB3aGVyZSBQYWdlVmlld3BvcnRD b250cm9sbGVyIGFuZCBQYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50RWZsCisgICAgICAgIGFy ZSBhY2Nlc3NlZCBkaXJlY3RseSBmcm9tIFdlYlZpZXcgYXQgdGhlIG1vbWVudC4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXcuY3BwOgorICAgICAgICAoRXdrVmlldzo6RXdr Vmlldyk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlldy5oOgorICAgICAgICAo V2ViS2l0KToKKyAgICAgICAgKEV3a1ZpZXc6OnBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnQp OgorICAgICAgICAoRXdrVmlldzo6cGFnZVZpZXdwb3J0Q29udHJvbGxlcik6CisgICAgICAgIChF d2tWaWV3KToKKyAgICAgICAgKiBVSVByb2Nlc3MvZWZsL1dlYlZpZXcuY3BwOgorICAgICAgICAo V2ViS2l0OjpXZWJWaWV3OjpkaWRDb21taXRMb2FkKToKKyAgICAgICAgKFdlYktpdDo6V2ViVmll dzo6dXBkYXRlVmlld3BvcnRTaXplKToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlldzo6ZGlkQ2hh bmdlQ29udGVudHNTaXplKToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlldzo6ZGlkQ2hhbmdlVmll d3BvcnRQcm9wZXJ0aWVzKToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlldzo6cGFnZURpZFJlcXVl c3RTY3JvbGwpOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3OjpkaWRSZW5kZXJGcmFtZSk6Cisg ICAgICAgIChXZWJLaXQ6OldlYlZpZXc6OnBhZ2VUcmFuc2l0aW9uVmlld3BvcnRSZWFkeSk6Cisg ICAgICAgICogVUlQcm9jZXNzL2VmbC9XZWJWaWV3Lmg6CisgICAgICAgIChXZWJWaWV3KToKKwog MjAxMy0wMi0yMCAgQ2hyaXN0b3BoZSBEdW1leiAgPGNoLmR1bWV6QHNpc2Euc2Ftc3VuZy5jb20+ CiAKICAgICAgICAgW0VGTF1bV0syXSBQb3J0IEV3a1BvcHVwTWVudUl0ZW0gdG8gdGhlIEMgQVBJ CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3LmNw cCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXcuY3BwCmluZGV4IDdj MDQ2NGMuLjBkMzk1MGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv ZWZsL0V3a1ZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3 a1ZpZXcuY3BwCkBAIC0zMyw2ICszMyw4IEBACiAjaW5jbHVkZSAiUGFnZUxvYWRDbGllbnRFZmwu aCIKICNpbmNsdWRlICJQYWdlUG9saWN5Q2xpZW50RWZsLmgiCiAjaW5jbHVkZSAiUGFnZVVJQ2xp ZW50RWZsLmgiCisjaW5jbHVkZSAiUGFnZVZpZXdwb3J0Q29udHJvbGxlci5oIgorI2luY2x1ZGUg IlBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRFZmwuaCIKICNpbmNsdWRlICJTbmFwc2hvdElt YWdlR0wuaCIKICNpbmNsdWRlICJWaWV3Q2xpZW50RWZsLmgiCiAjaW5jbHVkZSAiV0tEaWN0aW9u YXJ5LmgiCkBAIC0yNTMsNiArMjU1LDggQEAgRXdrVmlldzo6RXdrVmlldyhFdmFzX09iamVjdCog ZXZhc09iamVjdCwgUGFzc1JlZlB0cjxFd2tDb250ZXh0PiBjb250ZXh0LCBXS1BhZ2UKICNlbmRp ZgogICAgICwgbV9kaXNwbGF5VGltZXIodGhpcywgJkV3a1ZpZXc6OmRpc3BsYXlUaW1lckZpcmVk KQogICAgICwgbV9pbnB1dE1ldGhvZENvbnRleHQoSW5wdXRNZXRob2RDb250ZXh0RWZsOjpjcmVh dGUodGhpcywgc21hcnREYXRhKCktPmJhc2UuZXZhcykpCisgICAgLCBtX3BhZ2VWaWV3cG9ydENv bnRyb2xsZXJDbGllbnQoUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudEVmbDo6Y3JlYXRlKHRo aXMpKQorICAgICwgbV9wYWdlVmlld3BvcnRDb250cm9sbGVyKGFkb3B0UHRyKG5ldyBQYWdlVmll d3BvcnRDb250cm9sbGVyKHBhZ2UoKSwgbV9wYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50Lmdl dCgpKSkpCiAgICAgLCBtX2lzQWNjZWxlcmF0ZWQodHJ1ZSkKIHsKICAgICBBU1NFUlQobV9ldmFz T2JqZWN0KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3 a1ZpZXcuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXcuaAppbmRl eCBiOTQ2NjA4Li4xNzA2M2NmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2VmbC9Fd2tWaWV3LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv RXdrVmlldy5oCkBAIC02Myw2ICs2Myw4IEBAIGNsYXNzIFBhZ2VMb2FkQ2xpZW50RWZsOwogY2xh c3MgUGFnZVBvbGljeUNsaWVudEVmbDsKIGNsYXNzIFBhZ2VVSUNsaWVudEVmbDsKIGNsYXNzIFZp ZXdDbGllbnRFZmw7CitjbGFzcyBQYWdlVmlld3BvcnRDb250cm9sbGVyOworY2xhc3MgUGFnZVZp ZXdwb3J0Q29udHJvbGxlckNsaWVudEVmbDsKIGNsYXNzIFdlYkNvbnRleHRNZW51SXRlbURhdGE7 CiBjbGFzcyBXZWJDb250ZXh0TWVudVByb3h5RWZsOwogY2xhc3MgV2ViUGFnZUdyb3VwOwpAQCAt MTIyLDYgKzEyNCw4IEBAIHB1YmxpYzoKICAgICBFd2tTZXR0aW5ncyogc2V0dGluZ3MoKSB7IHJl dHVybiBtX3NldHRpbmdzLmdldCgpOyB9CiAgICAgRXdrQmFja0ZvcndhcmRMaXN0KiBiYWNrRm9y d2FyZExpc3QoKSB7IHJldHVybiBtX2JhY2tGb3J3YXJkTGlzdC5nZXQoKTsgfQogICAgIEV3a1dp bmRvd0ZlYXR1cmVzKiB3aW5kb3dGZWF0dXJlcygpOworICAgIFdlYktpdDo6UGFnZVZpZXdwb3J0 Q29udHJvbGxlckNsaWVudEVmbCogcGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudCgpIHsgcmV0 dXJuIG1fcGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudC5nZXQoKTsgfQorICAgIFdlYktpdDo6 UGFnZVZpZXdwb3J0Q29udHJvbGxlciogcGFnZVZpZXdwb3J0Q29udHJvbGxlcigpIHsgcmV0dXJu IG1fcGFnZVZpZXdwb3J0Q29udHJvbGxlci5nZXQoKTsgfQogCiAgICAgYm9vbCBpc0ZvY3VzZWQo KSBjb25zdDsKICAgICBib29sIGlzVmlzaWJsZSgpIGNvbnN0OwpAQCAtMzAxLDYgKzMwNSw4IEBA IHByaXZhdGU6CiAjaWYgRU5BQkxFKElOUFVUX1RZUEVfQ09MT1IpCiAgICAgT3duUHRyPEV3a0Nv bG9yUGlja2VyPiBtX2NvbG9yUGlja2VyOwogI2VuZGlmCisgICAgT3duUHRyPFdlYktpdDo6UGFn ZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudEVmbD4gbV9wYWdlVmlld3BvcnRDb250cm9sbGVyQ2xp ZW50OworICAgIE93blB0cjxXZWJLaXQ6OlBhZ2VWaWV3cG9ydENvbnRyb2xsZXI+IG1fcGFnZVZp ZXdwb3J0Q29udHJvbGxlcjsKICAgICBib29sIG1faXNBY2NlbGVyYXRlZDsKIAogICAgIHN0YXRp YyBFdmFzX1NtYXJ0X0NsYXNzIHBhcmVudFNtYXJ0Q2xhc3M7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1dlYlZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL2VmbC9XZWJWaWV3LmNwcAppbmRleCAxMGEzODUxLi42YjQ5ZDg3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1dlYlZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9lZmwvV2ViVmlldy5jcHAKQEAgLTE0MywyOSArMTQzLDI2IEBAIHZvaWQg V2ViVmlldzo6aW5pdGlhbGl6ZUNsaWVudChjb25zdCBXS1ZpZXdDbGllbnQqIGNsaWVudCkKIHZv aWQgV2ViVmlldzo6ZGlkQ29tbWl0TG9hZCgpCiB7CiAgICAgaWYgKG1fcGFnZS0+dXNlRml4ZWRM YXlvdXQoKSkgewotICAgICAgICBBU1NFUlQobV9wYWdlVmlld3BvcnRDb250cm9sbGVyKTsKLSAg ICAgICAgbV9wYWdlVmlld3BvcnRDb250cm9sbGVyLT5kaWRDb21taXRMb2FkKCk7Ci0gICAgfSBl bHNlCi0gICAgICAgIG1fZXdrVmlldy0+c2NoZWR1bGVVcGRhdGVEaXNwbGF5KCk7CisgICAgICAg IG1fZXdrVmlldy0+cGFnZVZpZXdwb3J0Q29udHJvbGxlcigpLT5kaWRDb21taXRMb2FkKCk7Cisg ICAgICAgIHJldHVybjsKKyAgICB9CisgICAgbV9ld2tWaWV3LT5zY2hlZHVsZVVwZGF0ZURpc3Bs YXkoKTsKIH0KIAogdm9pZCBXZWJWaWV3Ojp1cGRhdGVWaWV3cG9ydFNpemUoKQogewogICAgIGlm IChtX3BhZ2UtPnVzZUZpeGVkTGF5b3V0KCkpIHsKLSAgICAgICAgaWYgKCFtX3BhZ2VWaWV3cG9y dENvbnRyb2xsZXJDbGllbnQpIHsKLSAgICAgICAgICAgIG1fcGFnZVZpZXdwb3J0Q29udHJvbGxl ckNsaWVudCA9IFBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRFZmw6OmNyZWF0ZShtX2V3a1Zp ZXcpOwotICAgICAgICAgICAgbV9wYWdlVmlld3BvcnRDb250cm9sbGVyID0gYWRvcHRQdHIobmV3 IFBhZ2VWaWV3cG9ydENvbnRyb2xsZXIocGFnZSgpLCBtX3BhZ2VWaWV3cG9ydENvbnRyb2xsZXJD bGllbnQuZ2V0KCkpKTsKLSAgICAgICAgfQotICAgICAgICBtX3BhZ2VWaWV3cG9ydENvbnRyb2xs ZXJDbGllbnQtPnVwZGF0ZVZpZXdwb3J0U2l6ZSgpOwotICAgIH0gZWxzZQotICAgICAgICBtX3Bh Z2UtPmRyYXdpbmdBcmVhKCktPnNldFZpc2libGVDb250ZW50c1JlY3QoSW50UmVjdChyb3VuZGVk SW50UG9pbnQobV9ld2tWaWV3LT5wYWdlUG9zaXRpb24oKSksIG1fZXdrVmlldy0+c2l6ZSgpKSwg RmxvYXRQb2ludCgpKTsKKyAgICAgICAgbV9ld2tWaWV3LT5wYWdlVmlld3BvcnRDb250cm9sbGVy Q2xpZW50KCktPnVwZGF0ZVZpZXdwb3J0U2l6ZSgpOworICAgICAgICByZXR1cm47CisgICAgfQor ICAgIG1fcGFnZS0+ZHJhd2luZ0FyZWEoKS0+c2V0VmlzaWJsZUNvbnRlbnRzUmVjdChJbnRSZWN0 KHJvdW5kZWRJbnRQb2ludChtX2V3a1ZpZXctPnBhZ2VQb3NpdGlvbigpKSwgbV9ld2tWaWV3LT5z aXplKCkpLCBGbG9hdFBvaW50KCkpOwogfQogCiB2b2lkIFdlYlZpZXc6OmRpZENoYW5nZUNvbnRl bnRzU2l6ZShjb25zdCBXZWJDb3JlOjpJbnRTaXplJiBzaXplKQogewogICAgIGlmIChtX3BhZ2Ut PnVzZUZpeGVkTGF5b3V0KCkpIHsKLSAgICAgICAgQVNTRVJUKG1fcGFnZVZpZXdwb3J0Q29udHJv bGxlcik7Ci0gICAgICAgIG1fcGFnZVZpZXdwb3J0Q29udHJvbGxlci0+ZGlkQ2hhbmdlQ29udGVu dHNTaXplKHNpemUpOworICAgICAgICBtX2V3a1ZpZXctPnBhZ2VWaWV3cG9ydENvbnRyb2xsZXIo KS0+ZGlkQ2hhbmdlQ29udGVudHNTaXplKHNpemUpOworICAgICAgICByZXR1cm47CiAgICAgfQog ICAgIG1fY2xpZW50LmRpZENoYW5nZUNvbnRlbnRzU2l6ZSh0aGlzLCBzaXplKTsKIH0KQEAgLTQz MSwzOSArNDI4LDM4IEBAIEZsb2F0UmVjdCBXZWJWaWV3Ojpjb252ZXJ0VG9Vc2VyU3BhY2UoY29u c3QgRmxvYXRSZWN0JiBkZXZpY2VSZWN0KQogdm9pZCBXZWJWaWV3OjpkaWRDaGFuZ2VWaWV3cG9y dFByb3BlcnRpZXMoY29uc3QgV2ViQ29yZTo6Vmlld3BvcnRBdHRyaWJ1dGVzJiBhdHRyKQogewog ICAgIGlmIChtX3BhZ2UtPnVzZUZpeGVkTGF5b3V0KCkpIHsKLSAgICAgICAgQVNTRVJUKG1fcGFn ZVZpZXdwb3J0Q29udHJvbGxlcik7Ci0gICAgICAgIG1fcGFnZVZpZXdwb3J0Q29udHJvbGxlci0+ ZGlkQ2hhbmdlVmlld3BvcnRBdHRyaWJ1dGVzKGF0dHIpOwotICAgIH0gZWxzZQotICAgICAgICBt X2V3a1ZpZXctPnNjaGVkdWxlVXBkYXRlRGlzcGxheSgpOworICAgICAgICBtX2V3a1ZpZXctPnBh Z2VWaWV3cG9ydENvbnRyb2xsZXIoKS0+ZGlkQ2hhbmdlVmlld3BvcnRBdHRyaWJ1dGVzKGF0dHIp OworICAgICAgICByZXR1cm47CisgICAgfQorICAgIG1fZXdrVmlldy0+c2NoZWR1bGVVcGRhdGVE aXNwbGF5KCk7CiB9CiAKIHZvaWQgV2ViVmlldzo6cGFnZURpZFJlcXVlc3RTY3JvbGwoY29uc3Qg SW50UG9pbnQmIHBvc2l0aW9uKQogewotICAgIGlmIChtX3BhZ2UtPnVzZUZpeGVkTGF5b3V0KCkp IHsKLSAgICAgICAgQVNTRVJUKG1fcGFnZVZpZXdwb3J0Q29udHJvbGxlcik7Ci0gICAgICAgIG1f cGFnZVZpZXdwb3J0Q29udHJvbGxlci0+cGFnZURpZFJlcXVlc3RTY3JvbGwocG9zaXRpb24pOwot ICAgIH0gZWxzZSB7Ci0gICAgICAgIG1fZXdrVmlldy0+c2V0UGFnZVBvc2l0aW9uKEZsb2F0UG9p bnQocG9zaXRpb24pKTsKLSAgICAgICAgbV9ld2tWaWV3LT5zY2hlZHVsZVVwZGF0ZURpc3BsYXko KTsKKyAgICBpZiAobV9wYWdlLT51c2VGaXhlZExheW91dCgpKSB7ICAgICAgICAKKyAgICAgICAg bV9ld2tWaWV3LT5wYWdlVmlld3BvcnRDb250cm9sbGVyKCktPnBhZ2VEaWRSZXF1ZXN0U2Nyb2xs KHBvc2l0aW9uKTsKKyAgICAgICAgcmV0dXJuOwogICAgIH0KKyAgICBtX2V3a1ZpZXctPnNldFBh Z2VQb3NpdGlvbihGbG9hdFBvaW50KHBvc2l0aW9uKSk7CisgICAgbV9ld2tWaWV3LT5zY2hlZHVs ZVVwZGF0ZURpc3BsYXkoKTsKIH0KIAogdm9pZCBXZWJWaWV3OjpkaWRSZW5kZXJGcmFtZShjb25z dCBXZWJDb3JlOjpJbnRTaXplJiBjb250ZW50c1NpemUsIGNvbnN0IFdlYkNvcmU6OkludFJlY3Qm IGNvdmVyZWRSZWN0KQogewogICAgIGlmIChtX3BhZ2UtPnVzZUZpeGVkTGF5b3V0KCkpIHsKLSAg ICAgICAgQVNTRVJUKG1fcGFnZVZpZXdwb3J0Q29udHJvbGxlcik7Ci0gICAgICAgIG1fcGFnZVZp ZXdwb3J0Q29udHJvbGxlci0+ZGlkUmVuZGVyRnJhbWUoY29udGVudHNTaXplLCBjb3ZlcmVkUmVj dCk7Ci0gICAgfSBlbHNlCi0gICAgICAgIG1fZXdrVmlldy0+c2NoZWR1bGVVcGRhdGVEaXNwbGF5 KCk7CisgICAgICAgIG1fZXdrVmlldy0+cGFnZVZpZXdwb3J0Q29udHJvbGxlcigpLT5kaWRSZW5k ZXJGcmFtZShjb250ZW50c1NpemUsIGNvdmVyZWRSZWN0KTsKKyAgICAgICAgcmV0dXJuOworICAg IH0KKyAgICBtX2V3a1ZpZXctPnNjaGVkdWxlVXBkYXRlRGlzcGxheSgpOwogfQogCiB2b2lkIFdl YlZpZXc6OnBhZ2VUcmFuc2l0aW9uVmlld3BvcnRSZWFkeSgpCiB7CiAgICAgaWYgKG1fcGFnZS0+ dXNlRml4ZWRMYXlvdXQoKSkgewotICAgICAgICBBU1NFUlQobV9wYWdlVmlld3BvcnRDb250cm9s bGVyKTsKLSAgICAgICAgbV9wYWdlVmlld3BvcnRDb250cm9sbGVyLT5wYWdlVHJhbnNpdGlvblZp ZXdwb3J0UmVhZHkoKTsKLSAgICB9IGVsc2UKLSAgICAgICAgbV9ld2tWaWV3LT5zY2hlZHVsZVVw ZGF0ZURpc3BsYXkoKTsKKyAgICAgICAgbV9ld2tWaWV3LT5wYWdlVmlld3BvcnRDb250cm9sbGVy KCktPnBhZ2VUcmFuc2l0aW9uVmlld3BvcnRSZWFkeSgpOworICAgICAgICByZXR1cm47CisgICAg fQorICAgIG1fZXdrVmlldy0+c2NoZWR1bGVVcGRhdGVEaXNwbGF5KCk7CiB9CiAKIH0gLy8gbmFt ZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9X ZWJWaWV3LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1dlYlZpZXcuaAppbmRleCA0 NGVlOWQ3Li44NWI2MTYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZs L1dlYlZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1dlYlZpZXcuaApA QCAtNDAsOSArNDAsNiBAQCBjbGFzcyBFd2tWaWV3OwogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAot Y2xhc3MgUGFnZVZpZXdwb3J0Q29udHJvbGxlcjsKLWNsYXNzIFBhZ2VWaWV3cG9ydENvbnRyb2xs ZXJDbGllbnRFZmw7Ci0KIGNsYXNzIFdlYlZpZXcgOiBwdWJsaWMgQVBJT2JqZWN0LCBwdWJsaWMg UGFnZUNsaWVudCB7CiBwdWJsaWM6CiAgICAgc3RhdGljIGNvbnN0IFR5cGUgQVBJVHlwZSA9IFR5 cGVWaWV3OwpAQCAtMTYzLDkgKzE2MCw2IEBAIHByaXZhdGU6CiAgICAgRXdrVmlldyogbV9ld2tW aWV3OwogICAgIFJlZlB0cjxXZWJQYWdlUHJveHk+IG1fcGFnZTsKICAgICBEZWZhdWx0VW5kb0Nv bnRyb2xsZXIgbV91bmRvQ29udHJvbGxlcjsKLSAgICAvLyBGSVhNRTogUmVtb3ZlIHdoZW4gcG9z c2libGUuCi0gICAgT3duUHRyPFdlYktpdDo6UGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudEVm bD4gbV9wYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50OwotICAgIE93blB0cjxXZWJLaXQ6OlBh Z2VWaWV3cG9ydENvbnRyb2xsZXI+IG1fcGFnZVZpZXdwb3J0Q29udHJvbGxlcjsKIH07CiAKIH0K