158689 2016-06-13 04:55:03 -0700 [GTK] Web view is not redrawn when reparented in force compositing mode 2016-06-21 04:05:15 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Local Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 154444 1 cgarcia webkit-unassigned berto bugs-noreply commit-queue gustavo mcatanzaro mrobinson yoon zan oldest_to_newest 1201815 0 cgarcia 2016-06-13 04:55:03 -0700 This is easy to reproduce undocking the inspector: 1- Run MiniBrowser with WEBKIT_FORCE_COMPOSITING_MODE=1 2- Open the inspector 3- Click on undock button The new window is created and the view is moved there but nothing is rendered. you need to force a redraw, by resizing the window, for example, to see the contents. This also happen when using the threaded compositor, since compositing mode is always enabled too. 1201818 1 281167 cgarcia 2016-06-13 05:06:12 -0700 Created attachment 281167 Patch 1201819 2 commit-queue 2016-06-13 05:08:00 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1201843 3 mcatanzaro 2016-06-13 08:47:52 -0700 Does this fix the similar bug that occurs when resizing the window? 1202101 4 cgarcia 2016-06-13 23:48:41 -0700 (In reply to comment #3) > Does this fix the similar bug that occurs when resizing the window? I don't know I haven't noticed that. Do you mean when resizing the window with the threaded compositor or without it but compositing mode forced? 1202181 5 mcatanzaro 2016-06-14 08:05:26 -0700 (In reply to comment #4) > (In reply to comment #3) > > Does this fix the similar bug that occurs when resizing the window? > > I don't know I haven't noticed that. Do you mean when resizing the window > with the threaded compositor or without it but compositing mode forced? With compositing mode, without threaded compositor... but actually, I can't reproduce it anymore. Let's forget about it for now; maybe it got fixed at some point. 1202183 6 281167 mcatanzaro 2016-06-14 08:06:36 -0700 Comment on attachment 281167 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=281167&action=review (I think Zan would be a better reviewer for this.) > Source/WebKit2/ChangeLog:9 > + mode when the view is unrealized, because the native surface handle por compositing is destroyed, but it doesn't for ;) > Source/WebKit2/ChangeLog:12 > + not. The Web process never exits accelerated mode when compositing mode is forzed, but the UI process doesn't forced 1202501 7 281337 cgarcia 2016-06-14 22:56:27 -0700 Created attachment 281337 Updated patch Previous patch broke the build with redirected X window disabled because of a wrong ifdef. 1204098 8 281337 zan 2016-06-21 03:39:02 -0700 Comment on attachment 281337 Updated patch LGTM. 1204100 9 cgarcia 2016-06-21 04:05:15 -0700 Committed r202273: <http://trac.webkit.org/changeset/202273> 281167 2016-06-13 05:06:12 -0700 2016-06-14 22:56:27 -0700 Patch wk2-reparent-force-ac.diff text/plain 9919 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA4YzI3OTM3Li5jNjIyNzRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMg QEAKKzIwMTYtMDYtMTMgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIFdlYiB2aWV3IGlzIG5vdCByZWRyYXduIHdoZW4gcmVwYXJlbnRl ZCBpbiBmb3JjZSBjb21wb3NpdGluZyBtb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNTg2ODkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXaGVuIHRoZSB3ZWIgdmlldyBpcyByZXBhcmVudGVkIGluIGFj Y2VsZXJhdGVkIGNvbXBvc2l0aW5nIG1vZGUsIHRoZSBVSSBwcm9jZXNzIGFsd2F5cyBleGlzdHMg dGhlIGFjY2VsZXJhdGVkCisgICAgICAgIG1vZGUgd2hlbiB0aGUgdmlldyBpcyB1bnJlYWxpemVk LCBiZWNhdXNlIHRoZSBuYXRpdmUgc3VyZmFjZSBoYW5kbGUgcG9yIGNvbXBvc2l0aW5nIGlzIGRl c3Ryb3llZCwgYnV0IGl0IGRvZXNuJ3QKKyAgICAgICAgZW50ZXIgYWdhaW4gd2hlbiB0aGUgdmll dyBpcyByZWFsaXplZCBhbmQgYSBuZXcgbmF0aXZlIHN1cmZhY2UgaGFuZGxlIGZvciBjb21wb3Np dGluZyBpcyB1c2VkLiBUaGlzIGhhcHBlbnMKKyAgICAgICAgYmVjYXVzZSB0aGUgVUkgYW5kIFdl YiBwcm9jZXNzZXMgYXJlIG5vdCBpbiBzeW5jIHJlZ2FyZGluZyB3aGV0aGVyIHRoZSBwYWdlIGlz IGluIGFjY2VsZXJhdGVkIGNvbXBvc2l0aW5nIG9yCisgICAgICAgIG5vdC4gVGhlIFdlYiBwcm9j ZXNzIG5ldmVyIGV4aXRzIGFjY2VsZXJhdGVkIG1vZGUgd2hlbiBjb21wb3NpdGluZyBtb2RlIGlz IGZvcnplZCwgYnV0IHRoZSBVSSBwcm9jZXNzIGRvZXNuJ3QKKyAgICAgICAgY2hlY2sgdGhhdCBz ZXR0aW5nIGF0IGFsbC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZp ZXdCYXNlLmNwcDoKKyAgICAgICAgKHdlYmtpdFdlYlZpZXdCYXNlUmVzaXplUmVkaXJlY3RlZFdp bmRvdyk6IEhlbHBlciBmdW5jdGlvbiB0byBlbnN1cmUgdGhlIHJlZGlyZWN0ZWQgd2luZG93IHNp emUgaXMgcHJvcGVybHkgdXBkYXRlZC4KKyAgICAgICAgKHdlYmtpdFdlYlZpZXdCYXNlUmVhbGl6 ZSk6IFJlc2l6ZSB0aGUgcmVkaXJlY3RlZCB3aW5kb3cgaWYgdGhlIHZpZXcgaXMgYWxyZWFkeSBp biBBQyBtb2RlIHdoZW4gcmVhbGl6ZWQuCisgICAgICAgICh3ZWJraXRXZWJWaWV3UmVuZGVyQWNj ZWxlcmF0ZWRDb21wb3NpdGluZ1Jlc3VsdHMpOiBVc2Ugd2Via2l0V2ViVmlld0Jhc2VSZXNpemVS ZWRpcmVjdGVkV2luZG93KCkuCisgICAgICAgICh3ZWJraXRXZWJWaWV3QmFzZVNpemVBbGxvY2F0 ZSk6IERpdHRvLgorICAgICAgICAod2Via2l0V2ViVmlld0Jhc2VXaWxsRW50ZXJBY2NlbGVyYXRl ZENvbXBvc2l0aW5nTW9kZSk6IERpdHRvLgorICAgICAgICAqIFVJUHJvY2Vzcy9EcmF3aW5nQXJl YVByb3h5SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OkRyYXdpbmdBcmVhUHJveHlJbXBsOjph bHdheXNVc2VDb21wb3NpdGluZyk6IFJldHVybiB0cnVlIGluIGZvcmNlIGNvbXBvc2l0aW5nIG1v ZGUuCisgICAgICAgIChXZWJLaXQ6OkRyYXdpbmdBcmVhUHJveHlJbXBsOjplbnRlckFjY2VsZXJh dGVkQ29tcG9zaXRpbmdNb2RlKTogVXBkYXRlIGFzc2VydC4KKyAgICAgICAgKFdlYktpdDo6RHJh d2luZ0FyZWFQcm94eUltcGw6OmV4aXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSk6IERvIG5v dCBleGl0IEFDIG1vZGUgY29tcG9zaXRpbmcgbW9kZSBpcyBhbHdheXMgZW5hYmxlZC4KKyAgICAg ICAgKiBVSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eUltcGwuaDoKKyAgICAgICAgKFdlYktpdDo6 RHJhd2luZ0FyZWFQcm94eUltcGw6OmlzSW5BY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSk6IFJl dHVybiB0cnVlIGFsc28gaW4gZm9yY2UgY29tcG9zaXRpbmcgbW9kZS4KKyAgICAgICAgKiBVSVBy b2Nlc3MvZ3RrL1JlZGlyZWN0ZWRYQ29tcG9zaXRlV2luZG93LmNwcDoKKyAgICAgICAgKFdlYktp dDo6UmVkaXJlY3RlZFhDb21wb3NpdGVXaW5kb3c6OnN1cmZhY2UpOiBFbnN1cmUgd2UgbmV2ZXIg cmV0dXJuIGFuIHVuaW5pdGlhbGl6ZWQgc3VyZmFjZSB0byBwcmV2ZW50CisgICAgICAgIHJlbmRl cmluZyBhcnRpZmFjdHMgaW4gaW4gZm9yY2UgY29tcG9zaXRpbmcgbW9kZSB3aGVuIHdhaXRpbmcg Zm9yIHRoZSBmaXJzdCB1cGRhdGUgb24gdGhlIHJlZGlyZWN0ZWQgd2luZG93LgorCiAyMDE2LTA2 LTEwICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAg ICBbVGhyZWFkZWQgQ29tcG9zaXRvcl0gTW9kZXJuaXplIGFuZCBzaW1wbGlmeSB0aHJlYWRlZCBj b21wb3NpdG9yIGNvZGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Z3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Z3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcAppbmRleCBjYjBhZTMzLi42ZTQ3NGUzZSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2Uu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdC YXNlLmNwcApAQCAtMzU0LDYgKzM1NCwxNyBAQCBzdGF0aWMgdm9pZCB3ZWJraXRXZWJWaWV3QmFz ZVNldFRvcGxldmVsT25TY3JlZW5XaW5kb3coV2ViS2l0V2ViVmlld0Jhc2UqIHdlYlZpZQogICAg ICAgICBwcml2LT50b3BsZXZlbFdpbmRvd1JlYWxpemVkSUQgPSBnX3NpZ25hbF9jb25uZWN0X3N3 YXBwZWQod2luZG93LCAicmVhbGl6ZSIsIEdfQ0FMTEJBQ0sodG9wbGV2ZWxXaW5kb3dSZWFsaXpl ZCksIHdlYlZpZXdCYXNlKTsKIH0KIAorI2lmIFVTRShSRURJUkVDVEVEX1hDT01QT1NJVEVfV0lO RE9XKQorc3RhdGljIHZvaWQgd2Via2l0V2ViVmlld0Jhc2VSZXNpemVSZWRpcmVjdGVkV2luZG93 KFdlYktpdFdlYlZpZXdCYXNlKiB3ZWJWaWV3KQoreworICAgIFdlYktpdFdlYlZpZXdCYXNlUHJp dmF0ZSogcHJpdiA9IHdlYlZpZXctPnByaXY7CisgICAgRHJhd2luZ0FyZWFQcm94eUltcGwqIGRy YXdpbmdBcmVhID0gc3RhdGljX2Nhc3Q8RHJhd2luZ0FyZWFQcm94eUltcGwqPihwcml2LT5wYWdl UHJveHktPmRyYXdpbmdBcmVhKCkpOworICAgIEFTU0VSVChkcmF3aW5nQXJlYSk7CisgICAgcHJp di0+cmVkaXJlY3RlZFdpbmRvdy0+c2V0RGV2aWNlU2NhbGVGYWN0b3IocHJpdi0+cGFnZVByb3h5 LT5kZXZpY2VTY2FsZUZhY3RvcigpKTsKKyAgICBwcml2LT5yZWRpcmVjdGVkV2luZG93LT5yZXNp emUoZHJhd2luZ0FyZWEtPnNpemUoKSk7CisjZW5kaWYKK30KKwogc3RhdGljIHZvaWQgd2Via2l0 V2ViVmlld0Jhc2VSZWFsaXplKEd0a1dpZGdldCogd2lkZ2V0KQogewogICAgIFdlYktpdFdlYlZp ZXdCYXNlKiB3ZWJWaWV3ID0gV0VCS0lUX1dFQl9WSUVXX0JBU0Uod2lkZ2V0KTsKQEAgLTM3MCw4 ICszODEsMTEgQEAgc3RhdGljIHZvaWQgd2Via2l0V2ViVmlld0Jhc2VSZWFsaXplKEd0a1dpZGdl dCogd2lkZ2V0KQogICAgICAgICAgICAgICAgICAgICBndGtfd2lkZ2V0X3F1ZXVlX2RyYXcoR1RL X1dJREdFVCh3ZWJWaWV3KSk7CiAgICAgICAgICAgICB9KTsKICAgICAgICAgaWYgKHByaXYtPnJl ZGlyZWN0ZWRXaW5kb3cpIHsKLSAgICAgICAgICAgIGlmIChEcmF3aW5nQXJlYVByb3h5SW1wbCog ZHJhd2luZ0FyZWEgPSBzdGF0aWNfY2FzdDxEcmF3aW5nQXJlYVByb3h5SW1wbCo+KHByaXYtPnBh Z2VQcm94eS0+ZHJhd2luZ0FyZWEoKSkpCisgICAgICAgICAgICBpZiAoRHJhd2luZ0FyZWFQcm94 eUltcGwqIGRyYXdpbmdBcmVhID0gc3RhdGljX2Nhc3Q8RHJhd2luZ0FyZWFQcm94eUltcGwqPihw cml2LT5wYWdlUHJveHktPmRyYXdpbmdBcmVhKCkpKSB7CiAgICAgICAgICAgICAgICAgZHJhd2lu Z0FyZWEtPnNldE5hdGl2ZVN1cmZhY2VIYW5kbGVGb3JDb21wb3NpdGluZyhwcml2LT5yZWRpcmVj dGVkV2luZG93LT53aW5kb3dJRCgpKTsKKyAgICAgICAgICAgICAgICBpZiAoZHJhd2luZ0FyZWEt PmlzSW5BY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSgpKQorICAgICAgICAgICAgICAgICAgICB3 ZWJraXRXZWJWaWV3QmFzZVJlc2l6ZVJlZGlyZWN0ZWRXaW5kb3cod2ViVmlldyk7CisgICAgICAg ICAgICB9CiAgICAgICAgIH0KICAgICB9CiAjZW5kaWYKQEAgLTU3NSw5ICs1ODksNyBAQCBzdGF0 aWMgYm9vbCB3ZWJraXRXZWJWaWV3UmVuZGVyQWNjZWxlcmF0ZWRDb21wb3NpdGluZ1Jlc3VsdHMo V2ViS2l0V2ViVmlld0Jhc2UqCiAgICAgaWYgKCFwcml2LT5yZWRpcmVjdGVkV2luZG93KQogICAg ICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBwcml2LT5yZWRpcmVjdGVkV2luZG93LT5zZXREZXZp Y2VTY2FsZUZhY3Rvcih3ZWJWaWV3QmFzZS0+cHJpdi0+cGFnZVByb3h5LT5kZXZpY2VTY2FsZUZh Y3RvcigpKTsKLSAgICBwcml2LT5yZWRpcmVjdGVkV2luZG93LT5yZXNpemUoZHJhd2luZ0FyZWEt PnNpemUoKSk7Ci0KKyAgICB3ZWJraXRXZWJWaWV3QmFzZVJlc2l6ZVJlZGlyZWN0ZWRXaW5kb3co d2ViVmlld0Jhc2UpOwogICAgIGlmIChjYWlyb19zdXJmYWNlX3QqIHN1cmZhY2UgPSBwcml2LT5y ZWRpcmVjdGVkV2luZG93LT5zdXJmYWNlKCkpIHsKICAgICAgICAgY2Fpcm9fc2F2ZShjcik7CiAg ICAgICAgIGNhaXJvX3JlY3RhbmdsZShjciwgY2xpcFJlY3QtPngsIGNsaXBSZWN0LT55LCBjbGlw UmVjdC0+d2lkdGgsIGNsaXBSZWN0LT5oZWlnaHQpOwpAQCAtNjkxLDcgKzcwMyw3IEBAIHN0YXRp YyB2b2lkIHdlYmtpdFdlYlZpZXdCYXNlU2l6ZUFsbG9jYXRlKEd0a1dpZGdldCogd2lkZ2V0LCBH dGtBbGxvY2F0aW9uKiBhbGxvCiAKICNpZiBVU0UoUkVESVJFQ1RFRF9YQ09NUE9TSVRFX1dJTkRP VykKICAgICBpZiAocHJpdi0+cmVkaXJlY3RlZFdpbmRvdyAmJiBkcmF3aW5nQXJlYS0+aXNJbkFj Y2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKCkpCi0gICAgICAgIHByaXYtPnJlZGlyZWN0ZWRXaW5k b3ctPnJlc2l6ZSh2aWV3UmVjdC5zaXplKCkpOworICAgICAgICB3ZWJraXRXZWJWaWV3QmFzZVJl c2l6ZVJlZGlyZWN0ZWRXaW5kb3cod2ViVmlld0Jhc2UpOwogI2VuZGlmCiAKICAgICBkcmF3aW5n QXJlYS0+c2V0U2l6ZSh2aWV3UmVjdC5zaXplKCksIEludFNpemUoKSwgSW50U2l6ZSgpKTsKQEAg LTE1NTcsOCArMTU2OSw3IEBAIHZvaWQgd2Via2l0V2ViVmlld0Jhc2VXaWxsRW50ZXJBY2NlbGVy YXRlZENvbXBvc2l0aW5nTW9kZShXZWJLaXRXZWJWaWV3QmFzZSogd2ViCiAgICAgaWYgKCFkcmF3 aW5nQXJlYSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgcHJpdi0+cmVkaXJlY3RlZFdpbmRvdy0+ c2V0RGV2aWNlU2NhbGVGYWN0b3Iod2Via2l0V2ViVmlld0Jhc2UtPnByaXYtPnBhZ2VQcm94eS0+ ZGV2aWNlU2NhbGVGYWN0b3IoKSk7Ci0gICAgcHJpdi0+cmVkaXJlY3RlZFdpbmRvdy0+cmVzaXpl KGRyYXdpbmdBcmVhLT5zaXplKCkpOworICAgIHdlYmtpdFdlYlZpZXdCYXNlUmVzaXplUmVkaXJl Y3RlZFdpbmRvdyh3ZWJraXRXZWJWaWV3QmFzZSk7CiAKICAgICAvLyBDbGVhciB0aGUgcmVkaXJl Y3RlZCB3aW5kb3cgaWYgd2UgZG9uJ3QgZW50ZXIgQUMgbW9kZSBpbiB0aGUgZW5kLgogICAgIHdl YmtpdFdlYlZpZXdCYXNlQ2xlYXJSZWRpcmVjdGVkV2luZG93U29vbih3ZWJraXRXZWJWaWV3QmFz ZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94 eUltcGwuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHlJbXBs LmNwcAppbmRleCBjZDUyM2JjLi41ZTg5NjgwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eUltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5SW1wbC5jcHAKQEAgLTU4LDYgKzU4LDExIEBAIERyYXdp bmdBcmVhUHJveHlJbXBsOjp+RHJhd2luZ0FyZWFQcm94eUltcGwoKQogICAgICAgICBleGl0QWNj ZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUoKTsKIH0KIAorYm9vbCBEcmF3aW5nQXJlYVByb3h5SW1w bDo6YWx3YXlzVXNlQ29tcG9zaXRpbmcoKSBjb25zdAoreworICAgIHJldHVybiBtX3dlYlBhZ2VQ cm94eS5wcmVmZXJlbmNlcygpLmFjY2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkKCkgJiYgbV93 ZWJQYWdlUHJveHkucHJlZmVyZW5jZXMoKS5mb3JjZUNvbXBvc2l0aW5nTW9kZSgpOworfQorCiB2 b2lkIERyYXdpbmdBcmVhUHJveHlJbXBsOjpwYWludChCYWNraW5nU3RvcmU6OlBsYXRmb3JtR3Jh cGhpY3NDb250ZXh0IGNvbnRleHQsIGNvbnN0IEludFJlY3QmIHJlY3QsIFJlZ2lvbiYgdW5wYWlu dGVkUmVnaW9uKQogewogICAgIHVucGFpbnRlZFJlZ2lvbiA9IHJlY3Q7CkBAIC0yOTUsNyArMzAw LDcgQEAgdm9pZCBEcmF3aW5nQXJlYVByb3h5SW1wbDo6d2FpdEZvckFuZERpc3BhdGNoRGlkVXBk YXRlQmFja2luZ1N0b3JlU3RhdGUoKQogCiB2b2lkIERyYXdpbmdBcmVhUHJveHlJbXBsOjplbnRl ckFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKGNvbnN0IExheWVyVHJlZUNvbnRleHQmIGxheWVy VHJlZUNvbnRleHQpCiB7Ci0gICAgQVNTRVJUKCFpc0luQWNjZWxlcmF0ZWRDb21wb3NpdGluZ01v ZGUoKSk7CisgICAgQVNTRVJUKGFsd2F5c1VzZUNvbXBvc2l0aW5nKCkgfHwgIWlzSW5BY2NlbGVy YXRlZENvbXBvc2l0aW5nTW9kZSgpKTsKIAogICAgIG1fYmFja2luZ1N0b3JlID0gbnVsbHB0cjsK ICAgICBtX2xheWVyVHJlZUNvbnRleHQgPSBsYXllclRyZWVDb250ZXh0OwpAQCAtMzI5LDggKzMz NCw5IEBAIHZvaWQgRHJhd2luZ0FyZWFQcm94eUltcGw6OmV4aXRBY2NlbGVyYXRlZENvbXBvc2l0 aW5nTW9kZSgpCiB7CiAgICAgQVNTRVJUKGlzSW5BY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSgp KTsKIAotICAgIG1fbGF5ZXJUcmVlQ29udGV4dCA9IExheWVyVHJlZUNvbnRleHQoKTsgICAgCi0g ICAgbV93ZWJQYWdlUHJveHkuZXhpdEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKCk7CisgICAg bV9sYXllclRyZWVDb250ZXh0ID0gTGF5ZXJUcmVlQ29udGV4dCgpOworICAgIGlmICghYWx3YXlz VXNlQ29tcG9zaXRpbmcoKSkKKyAgICAgICAgbV93ZWJQYWdlUHJveHkuZXhpdEFjY2VsZXJhdGVk Q29tcG9zaXRpbmdNb2RlKCk7CiB9CiAKIHZvaWQgRHJhd2luZ0FyZWFQcm94eUltcGw6OnVwZGF0 ZUFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKGNvbnN0IExheWVyVHJlZUNvbnRleHQmIGxheWVy VHJlZUNvbnRleHQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2lu Z0FyZWFQcm94eUltcGwuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVBy b3h5SW1wbC5oCmluZGV4IGM1NjczMTMuLmY5NjFmNDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5SW1wbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5SW1wbC5oCkBAIC00NCw3ICs0NCw3IEBAIHB1Ymxp YzoKIAogICAgIHZvaWQgcGFpbnQoQmFja2luZ1N0b3JlOjpQbGF0Zm9ybUdyYXBoaWNzQ29udGV4 dCwgY29uc3QgV2ViQ29yZTo6SW50UmVjdCYsIFdlYkNvcmU6OlJlZ2lvbiYgdW5wYWludGVkUmVn aW9uKTsKIAotICAgIGJvb2wgaXNJbkFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKCkgY29uc3Qg eyByZXR1cm4gIW1fbGF5ZXJUcmVlQ29udGV4dC5pc0VtcHR5KCk7IH0KKyAgICBib29sIGlzSW5B Y2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSgpIGNvbnN0IHsgcmV0dXJuIGFsd2F5c1VzZUNvbXBv c2l0aW5nKCkgfHwgIW1fbGF5ZXJUcmVlQ29udGV4dC5pc0VtcHR5KCk7IH0KIAogICAgIGJvb2wg aGFzUmVjZWl2ZWRGaXJzdFVwZGF0ZSgpIGNvbnN0IHsgcmV0dXJuIG1faGFzUmVjZWl2ZWRGaXJz dFVwZGF0ZTsgfQogCkBAIC04MSw2ICs4MSw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBlbnRlckFj Y2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKGNvbnN0IExheWVyVHJlZUNvbnRleHQmKTsKICAgICB2 b2lkIGV4aXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSgpOwogICAgIHZvaWQgdXBkYXRlQWNj ZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUoY29uc3QgTGF5ZXJUcmVlQ29udGV4dCYpOworICAgIGJv b2wgYWx3YXlzVXNlQ29tcG9zaXRpbmcoKSBjb25zdDsKIAogICAgIHZvaWQgZGlzY2FyZEJhY2tp bmdTdG9yZVNvb24oKTsKICAgICB2b2lkIGRpc2NhcmRCYWNraW5nU3RvcmUoKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvUmVkaXJlY3RlZFhDb21wb3NpdGVXaW5k b3cuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9SZWRpcmVjdGVkWENvbXBvc2l0 ZVdpbmRvdy5jcHAKaW5kZXggNjJhYmFiNS4uYWQwNzEzMyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL2d0ay9SZWRpcmVjdGVkWENvbXBvc2l0ZVdpbmRvdy5jcHAKKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9SZWRpcmVjdGVkWENvbXBvc2l0ZVdpbmRvdy5j cHAKQEAgLTI2MywxNCArMjYzLDE1IEBAIGNhaXJvX3N1cmZhY2VfdCogUmVkaXJlY3RlZFhDb21w b3NpdGVXaW5kb3c6OnN1cmZhY2UoKQogICAgIFJlZlB0cjxjYWlyb19zdXJmYWNlX3Q+IG5ld1N1 cmZhY2UgPSBhZG9wdFJlZihjYWlyb194bGliX3N1cmZhY2VfY3JlYXRlKG1fZGlzcGxheSwgbmV3 UGl4bWFwLmdldCgpLCB3aW5kb3dBdHRyaWJ1dGVzLnZpc3VhbCwgbV9zaXplLndpZHRoKCksIG1f c2l6ZS5oZWlnaHQoKSkpOwogICAgIGNhaXJvU3VyZmFjZVNldERldmljZVNjYWxlKG5ld1N1cmZh Y2UuZ2V0KCksIG1fZGV2aWNlU2NhbGUsIG1fZGV2aWNlU2NhbGUpOwogCisgICAgUmVmUHRyPGNh aXJvX3Q+IGNyID0gYWRvcHRSZWYoY2Fpcm9fY3JlYXRlKG5ld1N1cmZhY2UuZ2V0KCkpKTsKKyAg ICBjYWlyb19zZXRfc291cmNlX3JnYihjci5nZXQoKSwgMSwgMSwgMSk7CisgICAgY2Fpcm9fcGFp bnQoY3IuZ2V0KCkpOworCiAgICAgLy8gTnZpZGlhIGRyaXZlcnMgc2VlbSB0byBwcmVwYXJlIHRo ZWlyIHJlZGlyZWN0ZWQgd2luZG93IHBpeG1hcCBhc3luY2hyb25vdXNseSwgc28gZm9yIGEgZmV3 IGZyYWN0aW9ucwogICAgIC8vIG9mIGEgc2Vjb25kIGFmdGVyIGVhY2ggcmVzaXplLCB3aGlsZSBk b2luZyBjb250aW51b3VzIHJlc2l6aW5nICh3aGljaCBjb25zdGFudGx5IGRlc3Ryb3lzIGFuZCBj cmVhdGVzCiAgICAgLy8gcGl4bWFwIHdpbmRvdy1iYWNraW5ncyksIHRoZSBwaXhtYXAgbWVtb3J5 IGlzIHVuaW5pdGlhbGl6ZWQuIFRvIHdvcmsgYXJvdW5kIHRoaXMgaXNzdWUsIHBhaW50IHRoZSBv bGQKICAgICAvLyBwaXhtYXAgdG8gdGhlIG5ldyBvbmUgdG8gcHJvcGVybHkgaW5pdGlhbGl6ZSBp dC4KICAgICBpZiAobV9zdXJmYWNlKSB7Ci0gICAgICAgIFJlZlB0cjxjYWlyb190PiBjciA9IGFk b3B0UmVmKGNhaXJvX2NyZWF0ZShuZXdTdXJmYWNlLmdldCgpKSk7Ci0gICAgICAgIGNhaXJvX3Nl dF9zb3VyY2VfcmdiKGNyLmdldCgpLCAxLCAxLCAxKTsKLSAgICAgICAgY2Fpcm9fcGFpbnQoY3Iu Z2V0KCkpOwogICAgICAgICBjYWlyb19zZXRfc291cmNlX3N1cmZhY2UoY3IuZ2V0KCksIG1fc3Vy ZmFjZS5nZXQoKSwgMCwgMCk7CiAgICAgICAgIGNhaXJvX3BhaW50KGNyLmdldCgpKTsKICAgICB9 Cg== 281337 2016-06-14 22:56:27 -0700 2016-06-21 03:39:02 -0700 Updated patch wk2-resize-forced-ac.diff text/plain 9920 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA0Y2JiODMzLi4zNDBiNTRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMg QEAKKzIwMTYtMDYtMTMgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIFdlYiB2aWV3IGlzIG5vdCByZWRyYXduIHdoZW4gcmVwYXJlbnRl ZCBpbiBmb3JjZSBjb21wb3NpdGluZyBtb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNTg2ODkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXaGVuIHRoZSB3ZWIgdmlldyBpcyByZXBhcmVudGVkIGluIGFj Y2VsZXJhdGVkIGNvbXBvc2l0aW5nIG1vZGUsIHRoZSBVSSBwcm9jZXNzIGFsd2F5cyBleGlzdHMg dGhlIGFjY2VsZXJhdGVkCisgICAgICAgIG1vZGUgd2hlbiB0aGUgdmlldyBpcyB1bnJlYWxpemVk LCBiZWNhdXNlIHRoZSBuYXRpdmUgc3VyZmFjZSBoYW5kbGUgcG9yIGNvbXBvc2l0aW5nIGlzIGRl c3Ryb3llZCwgYnV0IGl0IGRvZXNuJ3QKKyAgICAgICAgZW50ZXIgYWdhaW4gd2hlbiB0aGUgdmll dyBpcyByZWFsaXplZCBhbmQgYSBuZXcgbmF0aXZlIHN1cmZhY2UgaGFuZGxlIGZvciBjb21wb3Np dGluZyBpcyB1c2VkLiBUaGlzIGhhcHBlbnMKKyAgICAgICAgYmVjYXVzZSB0aGUgVUkgYW5kIFdl YiBwcm9jZXNzZXMgYXJlIG5vdCBpbiBzeW5jIHJlZ2FyZGluZyB3aGV0aGVyIHRoZSBwYWdlIGlz IGluIGFjY2VsZXJhdGVkIGNvbXBvc2l0aW5nIG9yCisgICAgICAgIG5vdC4gVGhlIFdlYiBwcm9j ZXNzIG5ldmVyIGV4aXRzIGFjY2VsZXJhdGVkIG1vZGUgd2hlbiBjb21wb3NpdGluZyBtb2RlIGlz IGZvcnplZCwgYnV0IHRoZSBVSSBwcm9jZXNzIGRvZXNuJ3QKKyAgICAgICAgY2hlY2sgdGhhdCBz ZXR0aW5nIGF0IGFsbC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZp ZXdCYXNlLmNwcDoKKyAgICAgICAgKHdlYmtpdFdlYlZpZXdCYXNlUmVzaXplUmVkaXJlY3RlZFdp bmRvdyk6IEhlbHBlciBmdW5jdGlvbiB0byBlbnN1cmUgdGhlIHJlZGlyZWN0ZWQgd2luZG93IHNp emUgaXMgcHJvcGVybHkgdXBkYXRlZC4KKyAgICAgICAgKHdlYmtpdFdlYlZpZXdCYXNlUmVhbGl6 ZSk6IFJlc2l6ZSB0aGUgcmVkaXJlY3RlZCB3aW5kb3cgaWYgdGhlIHZpZXcgaXMgYWxyZWFkeSBp biBBQyBtb2RlIHdoZW4gcmVhbGl6ZWQuCisgICAgICAgICh3ZWJraXRXZWJWaWV3UmVuZGVyQWNj ZWxlcmF0ZWRDb21wb3NpdGluZ1Jlc3VsdHMpOiBVc2Ugd2Via2l0V2ViVmlld0Jhc2VSZXNpemVS ZWRpcmVjdGVkV2luZG93KCkuCisgICAgICAgICh3ZWJraXRXZWJWaWV3QmFzZVNpemVBbGxvY2F0 ZSk6IERpdHRvLgorICAgICAgICAod2Via2l0V2ViVmlld0Jhc2VXaWxsRW50ZXJBY2NlbGVyYXRl ZENvbXBvc2l0aW5nTW9kZSk6IERpdHRvLgorICAgICAgICAqIFVJUHJvY2Vzcy9EcmF3aW5nQXJl YVByb3h5SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OkRyYXdpbmdBcmVhUHJveHlJbXBsOjph bHdheXNVc2VDb21wb3NpdGluZyk6IFJldHVybiB0cnVlIGluIGZvcmNlIGNvbXBvc2l0aW5nIG1v ZGUuCisgICAgICAgIChXZWJLaXQ6OkRyYXdpbmdBcmVhUHJveHlJbXBsOjplbnRlckFjY2VsZXJh dGVkQ29tcG9zaXRpbmdNb2RlKTogVXBkYXRlIGFzc2VydC4KKyAgICAgICAgKFdlYktpdDo6RHJh d2luZ0FyZWFQcm94eUltcGw6OmV4aXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSk6IERvIG5v dCBleGl0IEFDIG1vZGUgY29tcG9zaXRpbmcgbW9kZSBpcyBhbHdheXMgZW5hYmxlZC4KKyAgICAg ICAgKiBVSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eUltcGwuaDoKKyAgICAgICAgKFdlYktpdDo6 RHJhd2luZ0FyZWFQcm94eUltcGw6OmlzSW5BY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSk6IFJl dHVybiB0cnVlIGFsc28gaW4gZm9yY2UgY29tcG9zaXRpbmcgbW9kZS4KKyAgICAgICAgKiBVSVBy b2Nlc3MvZ3RrL1JlZGlyZWN0ZWRYQ29tcG9zaXRlV2luZG93LmNwcDoKKyAgICAgICAgKFdlYktp dDo6UmVkaXJlY3RlZFhDb21wb3NpdGVXaW5kb3c6OnN1cmZhY2UpOiBFbnN1cmUgd2UgbmV2ZXIg cmV0dXJuIGFuIHVuaW5pdGlhbGl6ZWQgc3VyZmFjZSB0byBwcmV2ZW50CisgICAgICAgIHJlbmRl cmluZyBhcnRpZmFjdHMgaW4gaW4gZm9yY2UgY29tcG9zaXRpbmcgbW9kZSB3aGVuIHdhaXRpbmcg Zm9yIHRoZSBmaXJzdCB1cGRhdGUgb24gdGhlIHJlZGlyZWN0ZWQgd2luZG93LgorCiAyMDE2LTA2 LTE0ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAg ICBbVGhyZWFkZWRDb21wb3NpdG9yXSBPcGVuaW5nIHRoZSBpbnNwZWN0b3IgaW4gYSB3aW5kb3cg Y2F1c2VzIGEgY3Jhc2guCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHAKaW5kZXggY2IwYWUzMy4uOTc1MmI3NzMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNl LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3 QmFzZS5jcHAKQEAgLTM1NCw2ICszNTQsMTcgQEAgc3RhdGljIHZvaWQgd2Via2l0V2ViVmlld0Jh c2VTZXRUb3BsZXZlbE9uU2NyZWVuV2luZG93KFdlYktpdFdlYlZpZXdCYXNlKiB3ZWJWaWUKICAg ICAgICAgcHJpdi0+dG9wbGV2ZWxXaW5kb3dSZWFsaXplZElEID0gZ19zaWduYWxfY29ubmVjdF9z d2FwcGVkKHdpbmRvdywgInJlYWxpemUiLCBHX0NBTExCQUNLKHRvcGxldmVsV2luZG93UmVhbGl6 ZWQpLCB3ZWJWaWV3QmFzZSk7CiB9CiAKKyNpZiBVU0UoUkVESVJFQ1RFRF9YQ09NUE9TSVRFX1dJ TkRPVykKK3N0YXRpYyB2b2lkIHdlYmtpdFdlYlZpZXdCYXNlUmVzaXplUmVkaXJlY3RlZFdpbmRv dyhXZWJLaXRXZWJWaWV3QmFzZSogd2ViVmlldykKK3sKKyAgICBXZWJLaXRXZWJWaWV3QmFzZVBy aXZhdGUqIHByaXYgPSB3ZWJWaWV3LT5wcml2OworICAgIERyYXdpbmdBcmVhUHJveHlJbXBsKiBk cmF3aW5nQXJlYSA9IHN0YXRpY19jYXN0PERyYXdpbmdBcmVhUHJveHlJbXBsKj4ocHJpdi0+cGFn ZVByb3h5LT5kcmF3aW5nQXJlYSgpKTsKKyAgICBBU1NFUlQoZHJhd2luZ0FyZWEpOworICAgIHBy aXYtPnJlZGlyZWN0ZWRXaW5kb3ctPnNldERldmljZVNjYWxlRmFjdG9yKHByaXYtPnBhZ2VQcm94 eS0+ZGV2aWNlU2NhbGVGYWN0b3IoKSk7CisgICAgcHJpdi0+cmVkaXJlY3RlZFdpbmRvdy0+cmVz aXplKGRyYXdpbmdBcmVhLT5zaXplKCkpOworfQorI2VuZGlmCisKIHN0YXRpYyB2b2lkIHdlYmtp dFdlYlZpZXdCYXNlUmVhbGl6ZShHdGtXaWRnZXQqIHdpZGdldCkKIHsKICAgICBXZWJLaXRXZWJW aWV3QmFzZSogd2ViVmlldyA9IFdFQktJVF9XRUJfVklFV19CQVNFKHdpZGdldCk7CkBAIC0zNzAs OCArMzgxLDExIEBAIHN0YXRpYyB2b2lkIHdlYmtpdFdlYlZpZXdCYXNlUmVhbGl6ZShHdGtXaWRn ZXQqIHdpZGdldCkKICAgICAgICAgICAgICAgICAgICAgZ3RrX3dpZGdldF9xdWV1ZV9kcmF3KEdU S19XSURHRVQod2ViVmlldykpOwogICAgICAgICAgICAgfSk7CiAgICAgICAgIGlmIChwcml2LT5y ZWRpcmVjdGVkV2luZG93KSB7Ci0gICAgICAgICAgICBpZiAoRHJhd2luZ0FyZWFQcm94eUltcGwq IGRyYXdpbmdBcmVhID0gc3RhdGljX2Nhc3Q8RHJhd2luZ0FyZWFQcm94eUltcGwqPihwcml2LT5w YWdlUHJveHktPmRyYXdpbmdBcmVhKCkpKQorICAgICAgICAgICAgaWYgKERyYXdpbmdBcmVhUHJv eHlJbXBsKiBkcmF3aW5nQXJlYSA9IHN0YXRpY19jYXN0PERyYXdpbmdBcmVhUHJveHlJbXBsKj4o cHJpdi0+cGFnZVByb3h5LT5kcmF3aW5nQXJlYSgpKSkgewogICAgICAgICAgICAgICAgIGRyYXdp bmdBcmVhLT5zZXROYXRpdmVTdXJmYWNlSGFuZGxlRm9yQ29tcG9zaXRpbmcocHJpdi0+cmVkaXJl Y3RlZFdpbmRvdy0+d2luZG93SUQoKSk7CisgICAgICAgICAgICAgICAgaWYgKGRyYXdpbmdBcmVh LT5pc0luQWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUoKSkKKyAgICAgICAgICAgICAgICAgICAg d2Via2l0V2ViVmlld0Jhc2VSZXNpemVSZWRpcmVjdGVkV2luZG93KHdlYlZpZXcpOworICAgICAg ICAgICAgfQogICAgICAgICB9CiAgICAgfQogI2VuZGlmCkBAIC01NzUsOSArNTg5LDcgQEAgc3Rh dGljIGJvb2wgd2Via2l0V2ViVmlld1JlbmRlckFjY2VsZXJhdGVkQ29tcG9zaXRpbmdSZXN1bHRz KFdlYktpdFdlYlZpZXdCYXNlKgogICAgIGlmICghcHJpdi0+cmVkaXJlY3RlZFdpbmRvdykKICAg ICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgcHJpdi0+cmVkaXJlY3RlZFdpbmRvdy0+c2V0RGV2 aWNlU2NhbGVGYWN0b3Iod2ViVmlld0Jhc2UtPnByaXYtPnBhZ2VQcm94eS0+ZGV2aWNlU2NhbGVG YWN0b3IoKSk7Ci0gICAgcHJpdi0+cmVkaXJlY3RlZFdpbmRvdy0+cmVzaXplKGRyYXdpbmdBcmVh LT5zaXplKCkpOwotCisgICAgd2Via2l0V2ViVmlld0Jhc2VSZXNpemVSZWRpcmVjdGVkV2luZG93 KHdlYlZpZXdCYXNlKTsKICAgICBpZiAoY2Fpcm9fc3VyZmFjZV90KiBzdXJmYWNlID0gcHJpdi0+ cmVkaXJlY3RlZFdpbmRvdy0+c3VyZmFjZSgpKSB7CiAgICAgICAgIGNhaXJvX3NhdmUoY3IpOwog ICAgICAgICBjYWlyb19yZWN0YW5nbGUoY3IsIGNsaXBSZWN0LT54LCBjbGlwUmVjdC0+eSwgY2xp cFJlY3QtPndpZHRoLCBjbGlwUmVjdC0+aGVpZ2h0KTsKQEAgLTY5MSw3ICs3MDMsNyBAQCBzdGF0 aWMgdm9pZCB3ZWJraXRXZWJWaWV3QmFzZVNpemVBbGxvY2F0ZShHdGtXaWRnZXQqIHdpZGdldCwg R3RrQWxsb2NhdGlvbiogYWxsbwogCiAjaWYgVVNFKFJFRElSRUNURURfWENPTVBPU0lURV9XSU5E T1cpCiAgICAgaWYgKHByaXYtPnJlZGlyZWN0ZWRXaW5kb3cgJiYgZHJhd2luZ0FyZWEtPmlzSW5B Y2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSgpKQotICAgICAgICBwcml2LT5yZWRpcmVjdGVkV2lu ZG93LT5yZXNpemUodmlld1JlY3Quc2l6ZSgpKTsKKyAgICAgICAgd2Via2l0V2ViVmlld0Jhc2VS ZXNpemVSZWRpcmVjdGVkV2luZG93KHdlYlZpZXdCYXNlKTsKICNlbmRpZgogCiAgICAgZHJhd2lu Z0FyZWEtPnNldFNpemUodmlld1JlY3Quc2l6ZSgpLCBJbnRTaXplKCksIEludFNpemUoKSk7CkBA IC0xNTU3LDggKzE1NjksNyBAQCB2b2lkIHdlYmtpdFdlYlZpZXdCYXNlV2lsbEVudGVyQWNjZWxl cmF0ZWRDb21wb3NpdGluZ01vZGUoV2ViS2l0V2ViVmlld0Jhc2UqIHdlYgogICAgIGlmICghZHJh d2luZ0FyZWEpCiAgICAgICAgIHJldHVybjsKIAotICAgIHByaXYtPnJlZGlyZWN0ZWRXaW5kb3ct PnNldERldmljZVNjYWxlRmFjdG9yKHdlYmtpdFdlYlZpZXdCYXNlLT5wcml2LT5wYWdlUHJveHkt PmRldmljZVNjYWxlRmFjdG9yKCkpOwotICAgIHByaXYtPnJlZGlyZWN0ZWRXaW5kb3ctPnJlc2l6 ZShkcmF3aW5nQXJlYS0+c2l6ZSgpKTsKKyAgICB3ZWJraXRXZWJWaWV3QmFzZVJlc2l6ZVJlZGly ZWN0ZWRXaW5kb3cod2Via2l0V2ViVmlld0Jhc2UpOwogCiAgICAgLy8gQ2xlYXIgdGhlIHJlZGly ZWN0ZWQgd2luZG93IGlmIHdlIGRvbid0IGVudGVyIEFDIG1vZGUgaW4gdGhlIGVuZC4KICAgICB3 ZWJraXRXZWJWaWV3QmFzZUNsZWFyUmVkaXJlY3RlZFdpbmRvd1Nvb24od2Via2l0V2ViVmlld0Jh c2UpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJv eHlJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5SW1w bC5jcHAKaW5kZXggY2Q1MjNiYy4uNWU4OTY4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHlJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eUltcGwuY3BwCkBAIC01OCw2ICs1OCwxMSBAQCBEcmF3 aW5nQXJlYVByb3h5SW1wbDo6fkRyYXdpbmdBcmVhUHJveHlJbXBsKCkKICAgICAgICAgZXhpdEFj Y2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKCk7CiB9CiAKK2Jvb2wgRHJhd2luZ0FyZWFQcm94eUlt cGw6OmFsd2F5c1VzZUNvbXBvc2l0aW5nKCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV93ZWJQYWdl UHJveHkucHJlZmVyZW5jZXMoKS5hY2NlbGVyYXRlZENvbXBvc2l0aW5nRW5hYmxlZCgpICYmIG1f d2ViUGFnZVByb3h5LnByZWZlcmVuY2VzKCkuZm9yY2VDb21wb3NpdGluZ01vZGUoKTsKK30KKwog dm9pZCBEcmF3aW5nQXJlYVByb3h5SW1wbDo6cGFpbnQoQmFja2luZ1N0b3JlOjpQbGF0Zm9ybUdy YXBoaWNzQ29udGV4dCBjb250ZXh0LCBjb25zdCBJbnRSZWN0JiByZWN0LCBSZWdpb24mIHVucGFp bnRlZFJlZ2lvbikKIHsKICAgICB1bnBhaW50ZWRSZWdpb24gPSByZWN0OwpAQCAtMjk1LDcgKzMw MCw3IEBAIHZvaWQgRHJhd2luZ0FyZWFQcm94eUltcGw6OndhaXRGb3JBbmREaXNwYXRjaERpZFVw ZGF0ZUJhY2tpbmdTdG9yZVN0YXRlKCkKIAogdm9pZCBEcmF3aW5nQXJlYVByb3h5SW1wbDo6ZW50 ZXJBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZShjb25zdCBMYXllclRyZWVDb250ZXh0JiBsYXll clRyZWVDb250ZXh0KQogewotICAgIEFTU0VSVCghaXNJbkFjY2VsZXJhdGVkQ29tcG9zaXRpbmdN b2RlKCkpOworICAgIEFTU0VSVChhbHdheXNVc2VDb21wb3NpdGluZygpIHx8ICFpc0luQWNjZWxl cmF0ZWRDb21wb3NpdGluZ01vZGUoKSk7CiAKICAgICBtX2JhY2tpbmdTdG9yZSA9IG51bGxwdHI7 CiAgICAgbV9sYXllclRyZWVDb250ZXh0ID0gbGF5ZXJUcmVlQ29udGV4dDsKQEAgLTMyOSw4ICsz MzQsOSBAQCB2b2lkIERyYXdpbmdBcmVhUHJveHlJbXBsOjpleGl0QWNjZWxlcmF0ZWRDb21wb3Np dGluZ01vZGUoKQogewogICAgIEFTU0VSVChpc0luQWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUo KSk7CiAKLSAgICBtX2xheWVyVHJlZUNvbnRleHQgPSBMYXllclRyZWVDb250ZXh0KCk7ICAgIAot ICAgIG1fd2ViUGFnZVByb3h5LmV4aXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSgpOworICAg IG1fbGF5ZXJUcmVlQ29udGV4dCA9IExheWVyVHJlZUNvbnRleHQoKTsKKyAgICBpZiAoIWFsd2F5 c1VzZUNvbXBvc2l0aW5nKCkpCisgICAgICAgIG1fd2ViUGFnZVByb3h5LmV4aXRBY2NlbGVyYXRl ZENvbXBvc2l0aW5nTW9kZSgpOwogfQogCiB2b2lkIERyYXdpbmdBcmVhUHJveHlJbXBsOjp1cGRh dGVBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZShjb25zdCBMYXllclRyZWVDb250ZXh0JiBsYXll clRyZWVDb250ZXh0KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0RyYXdp bmdBcmVhUHJveHlJbXBsLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQ cm94eUltcGwuaAppbmRleCBjNTY3MzEzLi5mOTYxZjQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eUltcGwuaAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eUltcGwuaApAQCAtNDQsNyArNDQsNyBAQCBwdWJs aWM6CiAKICAgICB2b2lkIHBhaW50KEJhY2tpbmdTdG9yZTo6UGxhdGZvcm1HcmFwaGljc0NvbnRl eHQsIGNvbnN0IFdlYkNvcmU6OkludFJlY3QmLCBXZWJDb3JlOjpSZWdpb24mIHVucGFpbnRlZFJl Z2lvbik7CiAKLSAgICBib29sIGlzSW5BY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSgpIGNvbnN0 IHsgcmV0dXJuICFtX2xheWVyVHJlZUNvbnRleHQuaXNFbXB0eSgpOyB9CisgICAgYm9vbCBpc0lu QWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUoKSBjb25zdCB7IHJldHVybiBhbHdheXNVc2VDb21w b3NpdGluZygpIHx8ICFtX2xheWVyVHJlZUNvbnRleHQuaXNFbXB0eSgpOyB9CiAKICAgICBib29s IGhhc1JlY2VpdmVkRmlyc3RVcGRhdGUoKSBjb25zdCB7IHJldHVybiBtX2hhc1JlY2VpdmVkRmly c3RVcGRhdGU7IH0KIApAQCAtODEsNiArODEsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgZW50ZXJB Y2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZShjb25zdCBMYXllclRyZWVDb250ZXh0Jik7CiAgICAg dm9pZCBleGl0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUoKTsKICAgICB2b2lkIHVwZGF0ZUFj Y2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKGNvbnN0IExheWVyVHJlZUNvbnRleHQmKTsKKyAgICBi b29sIGFsd2F5c1VzZUNvbXBvc2l0aW5nKCkgY29uc3Q7CiAKICAgICB2b2lkIGRpc2NhcmRCYWNr aW5nU3RvcmVTb29uKCk7CiAgICAgdm9pZCBkaXNjYXJkQmFja2luZ1N0b3JlKCk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1JlZGlyZWN0ZWRYQ29tcG9zaXRlV2lu ZG93LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvUmVkaXJlY3RlZFhDb21wb3Np dGVXaW5kb3cuY3BwCmluZGV4IDYyYWJhYjUuLmFkMDcxMzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9ndGsvUmVkaXJlY3RlZFhDb21wb3NpdGVXaW5kb3cuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvUmVkaXJlY3RlZFhDb21wb3NpdGVXaW5kb3cu Y3BwCkBAIC0yNjMsMTQgKzI2MywxNSBAQCBjYWlyb19zdXJmYWNlX3QqIFJlZGlyZWN0ZWRYQ29t cG9zaXRlV2luZG93OjpzdXJmYWNlKCkKICAgICBSZWZQdHI8Y2Fpcm9fc3VyZmFjZV90PiBuZXdT dXJmYWNlID0gYWRvcHRSZWYoY2Fpcm9feGxpYl9zdXJmYWNlX2NyZWF0ZShtX2Rpc3BsYXksIG5l d1BpeG1hcC5nZXQoKSwgd2luZG93QXR0cmlidXRlcy52aXN1YWwsIG1fc2l6ZS53aWR0aCgpLCBt X3NpemUuaGVpZ2h0KCkpKTsKICAgICBjYWlyb1N1cmZhY2VTZXREZXZpY2VTY2FsZShuZXdTdXJm YWNlLmdldCgpLCBtX2RldmljZVNjYWxlLCBtX2RldmljZVNjYWxlKTsKIAorICAgIFJlZlB0cjxj YWlyb190PiBjciA9IGFkb3B0UmVmKGNhaXJvX2NyZWF0ZShuZXdTdXJmYWNlLmdldCgpKSk7Cisg ICAgY2Fpcm9fc2V0X3NvdXJjZV9yZ2IoY3IuZ2V0KCksIDEsIDEsIDEpOworICAgIGNhaXJvX3Bh aW50KGNyLmdldCgpKTsKKwogICAgIC8vIE52aWRpYSBkcml2ZXJzIHNlZW0gdG8gcHJlcGFyZSB0 aGVpciByZWRpcmVjdGVkIHdpbmRvdyBwaXhtYXAgYXN5bmNocm9ub3VzbHksIHNvIGZvciBhIGZl dyBmcmFjdGlvbnMKICAgICAvLyBvZiBhIHNlY29uZCBhZnRlciBlYWNoIHJlc2l6ZSwgd2hpbGUg ZG9pbmcgY29udGludW91cyByZXNpemluZyAod2hpY2ggY29uc3RhbnRseSBkZXN0cm95cyBhbmQg Y3JlYXRlcwogICAgIC8vIHBpeG1hcCB3aW5kb3ctYmFja2luZ3MpLCB0aGUgcGl4bWFwIG1lbW9y eSBpcyB1bmluaXRpYWxpemVkLiBUbyB3b3JrIGFyb3VuZCB0aGlzIGlzc3VlLCBwYWludCB0aGUg b2xkCiAgICAgLy8gcGl4bWFwIHRvIHRoZSBuZXcgb25lIHRvIHByb3Blcmx5IGluaXRpYWxpemUg aXQuCiAgICAgaWYgKG1fc3VyZmFjZSkgewotICAgICAgICBSZWZQdHI8Y2Fpcm9fdD4gY3IgPSBh ZG9wdFJlZihjYWlyb19jcmVhdGUobmV3U3VyZmFjZS5nZXQoKSkpOwotICAgICAgICBjYWlyb19z ZXRfc291cmNlX3JnYihjci5nZXQoKSwgMSwgMSwgMSk7Ci0gICAgICAgIGNhaXJvX3BhaW50KGNy LmdldCgpKTsKICAgICAgICAgY2Fpcm9fc2V0X3NvdXJjZV9zdXJmYWNlKGNyLmdldCgpLCBtX3N1 cmZhY2UuZ2V0KCksIDAsIDApOwogICAgICAgICBjYWlyb19wYWludChjci5nZXQoKSk7CiAgICAg fQo=