79052 2012-02-20 16:24:16 -0800 NOTIFICATIONS should be implemented as PageSupplement 2012-02-23 16:27:17 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 78440 1 morrita morrita abarth aroben hausmann jonlee ossy webkit.review.bot oldest_to_newest 560447 0 morrita 2012-02-20 16:24:16 -0800 This is series of supplement-ification (Bug 78440). NotificationController and its client should be pushed out from Page class using PageSupplement. 560451 1 morrita 2012-02-20 16:25:53 -0800 CC-ed some folks just for FYI because it looks notification is under hot discussion. Note that this change never intents any functional change. This is purely code-level factoring. 562825 2 128395 morrita 2012-02-22 22:08:42 -0800 Created attachment 128395 Patch 562826 3 morrita 2012-02-22 22:09:34 -0800 Adam, Hakaken, could you give me a stamp? This will help future supplimentalization. 562876 4 128395 webkit.review.bot 2012-02-22 23:29:15 -0800 Comment on attachment 128395 Patch Clearing flags on attachment: 128395 Committed r108615: <http://trac.webkit.org/changeset/108615> 562877 5 webkit.review.bot 2012-02-22 23:29:20 -0800 All reviewed patches have been landed. Closing bug. 562922 6 ossy 2012-02-23 00:34:14 -0800 Reopen, because it broke Qt WK2 build: /home/webkitbuildbot/slaves/release32bit-qt5/buildslave/qt-linux-32-release-qt5/build/Source/WebKit2/WebProcess/WebPage/WebPage.cpp: In constructor ‘WebKit::WebPage::WebPage(uint64_t, const WebKit::WebPageCreationParameters&)’: /home/webkitbuildbot/slaves/release32bit-qt5/buildslave/qt-linux-32-release-qt5/build/Source/WebKit2/WebProcess/WebPage/WebPage.cpp:236: error: ‘struct WebCore::Page::PageClients’ has no member named ‘notificationClient’ 562925 7 abarth 2012-02-23 00:40:51 -0800 Why was the qt EWS bot green? :( /me will see if morrita is around and if not I'll fix it. 562927 8 hausmann 2012-02-23 00:43:54 -0800 (In reply to comment #7) > Why was the qt EWS bot green? :( Because the Qt EWS doesn't build WebKit2 :( I hope that we can change that in the future. 562934 9 hausmann 2012-02-23 00:53:40 -0800 Committed r108621: <http://trac.webkit.org/changeset/108621> 563082 10 ossy 2012-02-23 06:34:19 -0800 (In reply to comment #8) > (In reply to comment #7) > > Why was the qt EWS bot green? :( > > Because the Qt EWS doesn't build WebKit2 :( > > I hope that we can change that in the future. The Qt EWS is same as "Qt Linux Release" bot on build.webkit.org. (Qt 4.8.0, x86 architecture) It is only a decision, we can do everything. :) Now all of our bots (except Qt Linux 64-bit Release (Perf)) on build.webkit.org uses the released Qt 4.8.0 because of historically reason. When we drop WebKit2 for Qt 4.8, Qt 5 wasn't so stable, we have build problems every day, etc. If we would like to switch the EWS to Qt 5, we should guarantee that QtWebKit with Qt5 with WebKit2 almost always builds. If the EWS doesn't work for a night, because nobody fix the build, it can cause much more trouble than we don't have WebKit2 EWS and somebody break the Qt-WK2 build once in a month. The best solution would be if we setup a Qt-WK2 EWS too and leave the Qt EWS build WebKit1 with Qt 4.8. 563083 11 hausmann 2012-02-23 06:39:28 -0800 (In reply to comment #10) > (In reply to comment #8) > > (In reply to comment #7) > > > Why was the qt EWS bot green? :( > > > > Because the Qt EWS doesn't build WebKit2 :( > > > > I hope that we can change that in the future. > > The Qt EWS is same as "Qt Linux Release" bot on build.webkit.org. > (Qt 4.8.0, x86 architecture) > > It is only a decision, we can do everything. :) Now all of our bots (except Qt Linux 64-bit Release (Perf)) on build.webkit.org uses the released Qt 4.8.0 because of historically reason. When we drop WebKit2 for Qt 4.8, Qt 5 wasn't so stable, we have build problems every day, etc. > > If we would like to switch the EWS to Qt 5, we should guarantee that QtWebKit with Qt5 with WebKit2 almost always builds. If the EWS doesn't work for a night, because nobody fix the build, it can cause much more trouble than we don't have WebKit2 EWS and somebody break the Qt-WK2 build once in a month. > > The best solution would be if we setup a Qt-WK2 EWS too and leave the Qt EWS build WebKit1 with Qt 4.8. Right, either two EWSes or one Qt-EWS that does a build against Qt 4 and Qt 5 in one shot. I suppose the former is easier? :) 563121 12 aroben 2012-02-23 08:04:38 -0800 This broke the Mac build: Undefined symbols for architecture x86_64: "__ZN7WebCore19provideNotificationEPNS_4PageEPNS_21NotificationPresenterE", referenced from: ld: symbol(s) not found for architecture x86_64 I'm fixing it now. 563656 13 morrita 2012-02-23 16:27:17 -0800 (In reply to comment #12) > This broke the Mac build: > Undefined symbols for architecture x86_64: > "__ZN7WebCore19provideNotificationEPNS_4PageEPNS_21NotificationPresenterE", referenced from: > ld: symbol(s) not found for architecture x86_64 > > I'm fixing it now. Oops. Thank you for taking care of this. 128395 2012-02-22 22:08:42 -0800 2012-02-22 23:29:15 -0800 Patch bug-79052-20120223150840.patch text/plain 13890 morrita U3VidmVyc2lvbiBSZXZpc2lvbjogMTA4NTk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWYwNTcwNDNjNDYxMTk2 MTk0YzU5YmNjYzY0ZDA5Nzc0NDk4ZTJkNi4uOWM3ZWNiZDM1MWMxNDc3NmY5N2Q0NTgxM2NiZDUy MTY2ODI2MWFiOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDEyLTAyLTIyICBIYWpp bWUgTW9ycml0YSAgPG1vcnJpdGFAY2hyb21pdW0ub3JnPgorCisgICAgICAgIE5PVElGSUNBVElP TlMgc2hvdWxkIGJlIGltcGxlbWVudGVkIGFzIFBhZ2VTdXBwbGVtZW50CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03OTA1MgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFR1cm5lZCBOb3RpZmljYXRpb25Db250 cm9sbGVyIHRvIGEgUGFnZVN1cHBsZW1lbnQuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBObyBi ZWhhdmlvciBjaGFuZ2UuCisKKyAgICAgICAgKiBub3RpZmljYXRpb25zL05vdGlmaWNhdGlvbkNv bnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Tm90aWZpY2F0aW9uQ29udHJvbGxlcjo6 Y2xpZW50RnJvbSk6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6Ok5vdGlm aWNhdGlvbkNvbnRyb2xsZXI6OnN1cHBsZW1lbnROYW1lKToKKyAgICAgICAgKFdlYkNvcmU6OnBy b3ZpZGVOb3RpZmljYXRpb24pOgorICAgICAgICAqIG5vdGlmaWNhdGlvbnMvTm90aWZpY2F0aW9u Q29udHJvbGxlci5oOgorICAgICAgICAoTm90aWZpY2F0aW9uQ29udHJvbGxlcik6CisgICAgICAg IChXZWJDb3JlOjpOb3RpZmljYXRpb25Db250cm9sbGVyOjpmcm9tKToKKyAgICAgICAgKiBub3Rp ZmljYXRpb25zL05vdGlmaWNhdGlvblByZXNlbnRlci5oOgorICAgICAgICAoV2ViQ29yZSk6Cisg ICAgICAgICogcGFnZS9ET01XaW5kb3cuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RE9NV2luZG93 Ojp3ZWJraXROb3RpZmljYXRpb25zKToKKyAgICAgICAgKiBwYWdlL1BhZ2UuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UGFnZTo6UGFnZSk6CisgICAgICAgIChXZWJDb3JlOjpQYWdlOjpQYWdlQ2xp ZW50czo6UGFnZUNsaWVudHMpOgorICAgICAgICAqIHBhZ2UvUGFnZS5oOgorICAgICAgICAoV2Vi Q29yZSk6CisgICAgICAgIChQYWdlQ2xpZW50cyk6CisgICAgICAgIChQYWdlKToKKwogMjAxMi0w Mi0yMiAgQWRhbSBLbGVpbiAgPGFkYW1rQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZW1vdmUg b2Jzb2xldGUgRklYTUVzIGZyb20gQ29udGFpbmVyTm9kZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxv ZwppbmRleCA5NzEzNzQ5Y2U3ODc0YWIwOGNiOTBhY2MwYzJmOGI5OGE4MGExNzVkLi43ZDZiMGMz M2E2YzcwMjEyZTdkNTYzODRlYmM3YmIzYTM0NTIyMTliIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEyLTAyLTIyICBIYWppbWUgTW9ycml0YSAgPG1vcnJp dGFAY2hyb21pdW0ub3JnPgorCisgICAgICAgIE5PVElGSUNBVElPTlMgc2hvdWxkIGJlIGltcGxl bWVudGVkIGFzIFBhZ2VTdXBwbGVtZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD03OTA1MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 V2ViVmlld0ltcGw6OldlYlZpZXdJbXBsKToKKwogMjAxMi0wMi0yMiAgWXV0YSBLaXRhbXVyYSAg PHl1dGFrQGNocm9taXVtLm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCBy MTA4NTkwLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nIGIvU291cmNl L1dlYktpdC9tYWMvQ2hhbmdlTG9nCmluZGV4IGVlMmZkYjdjOWQzY2NlMjNiNmU0YTUyZGQ0Yzlh NzNjYmE2M2FiYjIuLmJlYjY3ZmFkMmJkNGVlNjU4NDUyNWIwNTQ1YjM5YTUwMTcxZDg3MDYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0 L21hYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMi0wMi0yMiAgSGFqaW1lIE1vcnJp dGEgIDxtb3JyaXRhQGNocm9taXVtLm9yZz4KKworICAgICAgICBOT1RJRklDQVRJT05TIHNob3Vs ZCBiZSBpbXBsZW1lbnRlZCBhcyBQYWdlU3VwcGxlbWVudAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzkwNTIKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlZpZXcvV2ViVmlldy5tbToKKyAgICAgICAg KC1bV2ViVmlldyBfY29tbW9uSW5pdGlhbGl6YXRpb25XaXRoRnJhbWVOYW1lOmdyb3VwTmFtZTpd KToKKwogMjAxMi0wMi0yMSAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAg ICAgICBSZW1vdmUgdGhlIHJlbWFpbmluZyB1c2VzIG9mIENTU1N0eWxlRGVjbGFyYXRpb24gaW4g RWRpdG9yCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZyBiL1NvdXJjZS9X ZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IGRhNWViODc3ZTRmNmI3OTdjNDAzMWRmZWQwZDMxZGNh Y2VjODI5MWIuLjM3ZGQ5NGE4NDU3YmM5MzU4OTNiZDM0MzI3NzRjMmE0Mjg1MDJiYWYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTItMDItMjIgIEhhamltZSBNb3JyaXRhICA8 bW9ycml0YUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgTk9USUZJQ0FUSU9OUyBzaG91bGQgYmUg aW1wbGVtZW50ZWQgYXMgUGFnZVN1cHBsZW1lbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTc5MDUyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBBcGkvcXdlYnBhZ2UuY3BwOgorICAgICAgICAoUVdlYlBh Z2VQcml2YXRlOjpRV2ViUGFnZVByaXZhdGUpOgorCiAyMDEyLTAyLTIxICBSeW9zdWtlIE5pd2Eg IDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIFJlbW92ZSB0aGUgcmVtYWluaW5nIHVzZXMg b2YgQ1NTU3R5bGVEZWNsYXJhdGlvbiBpbiBFZGl0b3IKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL25vdGlmaWNhdGlvbnMvTm90aWZpY2F0aW9uQ29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9ub3RpZmljYXRpb25zL05vdGlmaWNhdGlvbkNvbnRyb2xsZXIuY3BwCmluZGV4IGM4NmFh MTI4Y2ZhNjQ4M2U4ZGYxMTRjOTc5OTBmMDQ4YmJjMzcxOGQuLmNiZGMzZWE0NWU1MzBlM2FiZGUw ZjJkZGNkZDAxMWY4NmI4N2YzYTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL25vdGlmaWNh dGlvbnMvTm90aWZpY2F0aW9uQ29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbm90 aWZpY2F0aW9ucy9Ob3RpZmljYXRpb25Db250cm9sbGVyLmNwcApAQCAtNTAsNiArNTAsMjQgQEAg UGFzc093blB0cjxOb3RpZmljYXRpb25Db250cm9sbGVyPiBOb3RpZmljYXRpb25Db250cm9sbGVy OjpjcmVhdGUoUGFnZSogcGFnZSwgTm8KICAgICByZXR1cm4gYWRvcHRQdHIobmV3IE5vdGlmaWNh dGlvbkNvbnRyb2xsZXIocGFnZSwgY2xpZW50KSk7CiB9CiAKK05vdGlmaWNhdGlvblByZXNlbnRl ciogTm90aWZpY2F0aW9uQ29udHJvbGxlcjo6Y2xpZW50RnJvbShQYWdlKiBwYWdlKQoreworICAg IGlmIChOb3RpZmljYXRpb25Db250cm9sbGVyKiBjb250cm9sbGVyID0gTm90aWZpY2F0aW9uQ29u dHJvbGxlcjo6ZnJvbShwYWdlKSkKKyAgICAgICAgcmV0dXJuIGNvbnRyb2xsZXItPmNsaWVudCgp OworICAgIHJldHVybiAwOworfQorCitjb25zdCBBdG9taWNTdHJpbmcmIE5vdGlmaWNhdGlvbkNv bnRyb2xsZXI6OnN1cHBsZW1lbnROYW1lKCkKK3sKKyAgICBERUZJTkVfU1RBVElDX0xPQ0FMKEF0 b21pY1N0cmluZywgbmFtZSwgKCJOb3RpZmljYXRpb25Db250cm9sbGVyIikpOworICAgIHJldHVy biBuYW1lOworfQorCit2b2lkIHByb3ZpZGVOb3RpZmljYXRpb24oUGFnZSogcGFnZSwgTm90aWZp Y2F0aW9uUHJlc2VudGVyKiBjbGllbnQpCit7CisgICAgUGFnZVN1cHBsZW1lbnQ6OnByb3ZpZGVU byhwYWdlLCBOb3RpZmljYXRpb25Db250cm9sbGVyOjpzdXBwbGVtZW50TmFtZSgpLCBOb3RpZmlj YXRpb25Db250cm9sbGVyOjpjcmVhdGUocGFnZSwgY2xpZW50KSk7Cit9CisKIH0gLy8gbmFtZXNw YWNlIFdlYkNvcmUKIAogI2VuZGlmIC8vIEVOQUJMRShOT1RJRklDQVRJT05TKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbm90aWZpY2F0aW9ucy9Ob3RpZmljYXRpb25Db250cm9sbGVyLmgg Yi9Tb3VyY2UvV2ViQ29yZS9ub3RpZmljYXRpb25zL05vdGlmaWNhdGlvbkNvbnRyb2xsZXIuaApp bmRleCBhOTU4YTA1N2FiYTljNDIxMjViOGRjMWU2YWYxMzc0NjI1MTg3NTBlLi4zM2E5NWQ1MTYx NzE1MzJmZTIzNTQwMWY0ODNiOGI1NDZmMzk4ZjgwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9ub3RpZmljYXRpb25zL05vdGlmaWNhdGlvbkNvbnRyb2xsZXIuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9ub3RpZmljYXRpb25zL05vdGlmaWNhdGlvbkNvbnRyb2xsZXIuaApAQCAtMjgsNiArMjgs NyBAQAogCiAjaWYgRU5BQkxFKE5PVElGSUNBVElPTlMpCiAKKyNpbmNsdWRlICJQYWdlU3VwcGxl bWVudC5oIgogI2luY2x1ZGUgPHd0Zi9Gb3J3YXJkLmg+CiAjaW5jbHVkZSA8d3RmL05vbmNvcHlh YmxlLmg+CiAKQEAgLTM2LDEyICszNywxNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiBjbGFzcyBO b3RpZmljYXRpb25QcmVzZW50ZXI7CiBjbGFzcyBQYWdlOwogCi1jbGFzcyBOb3RpZmljYXRpb25D b250cm9sbGVyIHsKK2NsYXNzIE5vdGlmaWNhdGlvbkNvbnRyb2xsZXIgOiBwdWJsaWMgUGFnZVN1 cHBsZW1lbnQgewogICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKE5vdGlmaWNhdGlvbkNvbnRyb2xs ZXIpOwogcHVibGljOgogICAgIH5Ob3RpZmljYXRpb25Db250cm9sbGVyKCk7CiAKICAgICBzdGF0 aWMgUGFzc093blB0cjxOb3RpZmljYXRpb25Db250cm9sbGVyPiBjcmVhdGUoUGFnZSosIE5vdGlm aWNhdGlvblByZXNlbnRlciopOworICAgIHN0YXRpYyBjb25zdCBBdG9taWNTdHJpbmcmIHN1cHBs ZW1lbnROYW1lKCk7CisgICAgc3RhdGljIE5vdGlmaWNhdGlvbkNvbnRyb2xsZXIqIGZyb20oRnJh bWUqIGZyYW1lKSB7IHJldHVybiBzdGF0aWNfY2FzdDxOb3RpZmljYXRpb25Db250cm9sbGVyKj4o UGFnZVN1cHBsZW1lbnQ6OmZyb20oZnJhbWUsIHN1cHBsZW1lbnROYW1lKCkpKTsgfQorICAgIHN0 YXRpYyBOb3RpZmljYXRpb25Db250cm9sbGVyKiBmcm9tKFBhZ2UqIHBhZ2UpIHsgcmV0dXJuIHN0 YXRpY19jYXN0PE5vdGlmaWNhdGlvbkNvbnRyb2xsZXIqPihQYWdlU3VwcGxlbWVudDo6ZnJvbShw YWdlLCBzdXBwbGVtZW50TmFtZSgpKSk7IH0KKyAgICBzdGF0aWMgTm90aWZpY2F0aW9uUHJlc2Vu dGVyKiBjbGllbnRGcm9tKFBhZ2UqKTsKIAogICAgIE5vdGlmaWNhdGlvblByZXNlbnRlciogY2xp ZW50KCkgeyByZXR1cm4gbV9jbGllbnQ7IH0KICAgICAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL25vdGlmaWNhdGlvbnMvTm90aWZpY2F0aW9uUHJlc2VudGVyLmggYi9Tb3VyY2UvV2ViQ29y ZS9ub3RpZmljYXRpb25zL05vdGlmaWNhdGlvblByZXNlbnRlci5oCmluZGV4IDEwOGYwNTU4M2Q3 ZWJlYjZiZDhjMzQ3MDZhNmFkYWI2NjQ3MWQyZjYuLjE5MzUzODRkYzFmNmNiOTE3NDgwYTlkNGM4 MWI5NmY0M2E0OGIxOWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL25vdGlmaWNhdGlvbnMv Tm90aWZpY2F0aW9uUHJlc2VudGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbm90aWZpY2F0aW9u cy9Ob3RpZmljYXRpb25QcmVzZW50ZXIuaApAQCAtNDAsNiArNDAsNyBAQCBuYW1lc3BhY2UgV2Vi Q29yZSB7CiBjbGFzcyBEb2N1bWVudDsKIGNsYXNzIE5vdGlmaWNhdGlvbjsKIGNsYXNzIEtVUkw7 CitjbGFzcyBQYWdlOwogY2xhc3MgU2NyaXB0RXhlY3V0aW9uQ29udGV4dDsKIAogY2xhc3MgTm90 aWZpY2F0aW9uUHJlc2VudGVyIHsKQEAgLTg0LDYgKzg1LDggQEAgcHJvdGVjdGVkOgogICAgIHZp cnR1YWwgfk5vdGlmaWNhdGlvblByZXNlbnRlcigpIHsgfQogfTsKIAordm9pZCBwcm92aWRlTm90 aWZpY2F0aW9uKFBhZ2UqLCBOb3RpZmljYXRpb25QcmVzZW50ZXIqKTsKKwogfSAvLyBuYW1lc3Bh Y2UgV2ViQ29yZQogCiAjZW5kaWYgLy8gTm90aWZpY2F0aW9uUHJlc2VudGVyX2gKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRE9NV2luZG93LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvRE9NV2luZG93LmNwcAppbmRleCA0NWQ5NjBiZjIyNzc5NjA5NTExMTFjNWFiYWVjOGUxNDg1 MGIwMTdjLi45ZmYwYWY4MWU5MmI1NmU4ZjQ2ZTMzNjE4MzFjMDZiODI2MGU5OWUzIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGFnZS9ET01XaW5kb3cuY3BwCkBAIC03MTksNyArNzE5LDcgQEAgTm90aWZpY2F0aW9uQ2Vu dGVyKiBET01XaW5kb3c6OndlYmtpdE5vdGlmaWNhdGlvbnMoKSBjb25zdAogICAgIGlmICghcGFn ZSkKICAgICAgICAgcmV0dXJuIDA7CiAKLSAgICBOb3RpZmljYXRpb25QcmVzZW50ZXIqIHByb3Zp ZGVyID0gcGFnZS0+bm90aWZpY2F0aW9uQ29udHJvbGxlcigpLT5jbGllbnQoKTsKKyAgICBOb3Rp ZmljYXRpb25QcmVzZW50ZXIqIHByb3ZpZGVyID0gTm90aWZpY2F0aW9uQ29udHJvbGxlcjo6Y2xp ZW50RnJvbShwYWdlKTsKICAgICBpZiAocHJvdmlkZXIpIAogICAgICAgICBtX25vdGlmaWNhdGlv bnMgPSBOb3RpZmljYXRpb25DZW50ZXI6OmNyZWF0ZShkb2N1bWVudCwgcHJvdmlkZXIpOyAgICAK ICAgICAgIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAKaW5kZXggNmI2MmE5ZjIzZDIzYjNiYzI2NzAyNTc4OWFh ZDA5YzNlNzQ2MzE3Ny4uMWJhZDBhNDdiYjI2ZTQ3Zjk4ZWYxZGZhNzA2ZWM0MjI4OTU4MmZhMyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL1BhZ2UuY3BwCkBAIC01MSw4ICs1MSw2IEBACiAjaW5jbHVkZSAiTWVkaWFDYW5T dGFydExpc3RlbmVyLmgiCiAjaW5jbHVkZSAiTmF2aWdhdG9yLmgiCiAjaW5jbHVkZSAiTmV0d29y a1N0YXRlTm90aWZpZXIuaCIKLSNpbmNsdWRlICJOb3RpZmljYXRpb25Db250cm9sbGVyLmgiCi0j aW5jbHVkZSAiTm90aWZpY2F0aW9uUHJlc2VudGVyLmgiCiAjaW5jbHVkZSAiUGFnZUdyb3VwLmgi CiAjaW5jbHVkZSAiUGx1Z2luRGF0YS5oIgogI2luY2x1ZGUgIlBsdWdpblZpZXcuaCIKQEAgLTcw LDYgKzY4LDcgQEAKICNpbmNsdWRlICJTdG9yYWdlQXJlYS5oIgogI2luY2x1ZGUgIlN0b3JhZ2VO YW1lc3BhY2UuaCIKICNpbmNsdWRlICJUZXh0UmVzb3VyY2VEZWNvZGVyLmgiCisjaW5jbHVkZSAi Vm9pZENhbGxiYWNrLmgiCiAjaW5jbHVkZSAiV2lkZ2V0LmgiCiAjaW5jbHVkZSA8d3RmL0hhc2hN YXAuaD4KICNpbmNsdWRlIDx3dGYvUmVmQ291bnRlZExlYWtDb3VudGVyLmg+CkBAIC0xMjksOSAr MTI4LDYgQEAgUGFnZTo6UGFnZShQYWdlQ2xpZW50cyYgcGFnZUNsaWVudHMpCiAjaWYgRU5BQkxF KENMSUVOVF9CQVNFRF9HRU9MT0NBVElPTikKICAgICAsIG1fZ2VvbG9jYXRpb25Db250cm9sbGVy KEdlb2xvY2F0aW9uQ29udHJvbGxlcjo6Y3JlYXRlKHRoaXMsIHBhZ2VDbGllbnRzLmdlb2xvY2F0 aW9uQ2xpZW50KSkKICNlbmRpZgotI2lmIEVOQUJMRShOT1RJRklDQVRJT05TKQotICAgICwgbV9u b3RpZmljYXRpb25Db250cm9sbGVyKE5vdGlmaWNhdGlvbkNvbnRyb2xsZXI6OmNyZWF0ZSh0aGlz LCBwYWdlQ2xpZW50cy5ub3RpZmljYXRpb25DbGllbnQpKQotI2VuZGlmCiAjaWYgRU5BQkxFKFBP SU5URVJfTE9DSykKICAgICAsIG1fcG9pbnRlckxvY2tDb250cm9sbGVyKFBvaW50ZXJMb2NrQ29u dHJvbGxlcjo6Y3JlYXRlKHRoaXMpKQogI2VuZGlmCkBAIC0xMDcxLDcgKzEwNjcsNiBAQCBQYWdl OjpQYWdlQ2xpZW50czo6UGFnZUNsaWVudHMoKQogICAgICwgZHJhZ0NsaWVudCgwKQogICAgICwg aW5zcGVjdG9yQ2xpZW50KDApCiAgICAgLCBnZW9sb2NhdGlvbkNsaWVudCgwKQotICAgICwgbm90 aWZpY2F0aW9uQ2xpZW50KDApCiB7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvUGFnZS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmgKaW5kZXggZDQ2ZjY0Mzk1YWU4 OGRlNjI2ZWY5MThiMzNkOGQwMDdkZWFlMmQ5Yy4uNjg1ZWVkN2U3MDViNTY3YWM5MzEwNGY1Yjdk OThjODIzZjRhNGU5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmgKKysr IGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmgKQEAgLTcwLDggKzcwLDYgQEAgbmFtZXNwYWNl IFdlYkNvcmUgewogICAgIGNsYXNzIEluc3BlY3RvckNvbnRyb2xsZXI7CiAgICAgY2xhc3MgTWVk aWFDYW5TdGFydExpc3RlbmVyOwogICAgIGNsYXNzIE5vZGU7Ci0gICAgY2xhc3MgTm90aWZpY2F0 aW9uQ29udHJvbGxlcjsKLSAgICBjbGFzcyBOb3RpZmljYXRpb25QcmVzZW50ZXI7CiAgICAgY2xh c3MgUGFnZUdyb3VwOwogICAgIGNsYXNzIFBsdWdpbkRhdGE7CiAgICAgY2xhc3MgUG9pbnRlckxv Y2tDb250cm9sbGVyOwpAQCAtODQsOSArODIsNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAg Y2xhc3MgU2Nyb2xsaW5nQ29vcmRpbmF0b3I7CiAgICAgY2xhc3MgU2V0dGluZ3M7CiAgICAgY2xh c3MgU3RvcmFnZU5hbWVzcGFjZTsKLSNpZiBFTkFCTEUoTk9USUZJQ0FUSU9OUykKLSAgICBjbGFz cyBOb3RpZmljYXRpb25QcmVzZW50ZXI7Ci0jZW5kaWYKIAogICAgIHR5cGVkZWYgdWludDY0X3Qg TGlua0hhc2g7CiAKQEAgLTExNCw3ICsxMDksNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAg ICAgICAgICBJbnNwZWN0b3JDbGllbnQqIGluc3BlY3RvckNsaWVudDsKICAgICAgICAgICAgIEdl b2xvY2F0aW9uQ2xpZW50KiBnZW9sb2NhdGlvbkNsaWVudDsKICAgICAgICAgICAgIFJlZlB0cjxC YWNrRm9yd2FyZExpc3Q+IGJhY2tGb3J3YXJkQ2xpZW50OwotICAgICAgICAgICAgTm90aWZpY2F0 aW9uUHJlc2VudGVyKiBub3RpZmljYXRpb25DbGllbnQ7CiAgICAgICAgIH07CiAKICAgICAgICAg UGFnZShQYWdlQ2xpZW50cyYpOwpAQCAtMTc1LDkgKzE2OSw2IEBAIG5hbWVzcGFjZSBXZWJDb3Jl IHsKICNpZiBFTkFCTEUoQ0xJRU5UX0JBU0VEX0dFT0xPQ0FUSU9OKQogICAgICAgICBHZW9sb2Nh dGlvbkNvbnRyb2xsZXIqIGdlb2xvY2F0aW9uQ29udHJvbGxlcigpIGNvbnN0IHsgcmV0dXJuIG1f Z2VvbG9jYXRpb25Db250cm9sbGVyLmdldCgpOyB9CiAjZW5kaWYKLSNpZiBFTkFCTEUoTk9USUZJ Q0FUSU9OUykKLSAgICAgICAgTm90aWZpY2F0aW9uQ29udHJvbGxlciogbm90aWZpY2F0aW9uQ29u dHJvbGxlcigpIGNvbnN0IHsgcmV0dXJuIG1fbm90aWZpY2F0aW9uQ29udHJvbGxlci5nZXQoKTsg fQotI2VuZGlmCiAjaWYgRU5BQkxFKFBPSU5URVJfTE9DSykKICAgICAgICAgUG9pbnRlckxvY2tD b250cm9sbGVyKiBwb2ludGVyTG9ja0NvbnRyb2xsZXIoKSBjb25zdCB7IHJldHVybiBtX3BvaW50 ZXJMb2NrQ29udHJvbGxlci5nZXQoKTsgfQogI2VuZGlmCkBAIC0zNjksOSArMzYwLDYgQEAgbmFt ZXNwYWNlIFdlYkNvcmUgewogI2lmIEVOQUJMRShDTElFTlRfQkFTRURfR0VPTE9DQVRJT04pCiAg ICAgICAgIE93blB0cjxHZW9sb2NhdGlvbkNvbnRyb2xsZXI+IG1fZ2VvbG9jYXRpb25Db250cm9s bGVyOwogI2VuZGlmCi0jaWYgRU5BQkxFKE5PVElGSUNBVElPTlMpCi0gICAgICAgIE93blB0cjxO b3RpZmljYXRpb25Db250cm9sbGVyPiBtX25vdGlmaWNhdGlvbkNvbnRyb2xsZXI7Ci0jZW5kaWYK ICNpZiBFTkFCTEUoUE9JTlRFUl9MT0NLKQogICAgICAgICBPd25QdHI8UG9pbnRlckxvY2tDb250 cm9sbGVyPiBtX3BvaW50ZXJMb2NrQ29udHJvbGxlcjsKICNlbmRpZgpAQCAtNDI1LDEwICs0MTMs NiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKICAgICAgICAgUmVmUHRyPFN0b3JhZ2VOYW1lc3Bh Y2U+IG1fc2Vzc2lvblN0b3JhZ2U7CiAKLSNpZiBFTkFCTEUoTk9USUZJQ0FUSU9OUykKLSAgICAg ICAgTm90aWZpY2F0aW9uUHJlc2VudGVyKiBtX25vdGlmaWNhdGlvblByZXNlbnRlcjsKLSNlbmRp ZgotCiAgICAgICAgIFZpZXdNb2RlIG1fdmlld01vZGU7CiAKICAgICAgICAgZG91YmxlIG1fbWlu aW11bVRpbWVySW50ZXJ2YWw7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJWaWV3SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1w bC5jcHAKaW5kZXggMzRkYTBkZWI0YmFlZjMyNTFiOWVlZjhhODI4NzVjMDk0MTBiYjAxZC4uOWM1 MTRiYTAxNWRlNjgzOWVjYWU3N2ZmZjg2NTE3YzMxOTE1NzZmZCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcApAQCAtMzk4LDkgKzM5OCw2IEBAIFdlYlZpZXdJ bXBsOjpXZWJWaWV3SW1wbChXZWJWaWV3Q2xpZW50KiBjbGllbnQpCiAgICAgcGFnZUNsaWVudHMu ZHJhZ0NsaWVudCA9ICZtX2RyYWdDbGllbnRJbXBsOwogICAgIHBhZ2VDbGllbnRzLmluc3BlY3Rv ckNsaWVudCA9ICZtX2luc3BlY3RvckNsaWVudEltcGw7CiAgICAgcGFnZUNsaWVudHMuZ2VvbG9j YXRpb25DbGllbnQgPSBtX2dlb2xvY2F0aW9uQ2xpZW50UHJveHkuZ2V0KCk7Ci0jaWYgRU5BQkxF KE5PVElGSUNBVElPTlMpCi0gICAgcGFnZUNsaWVudHMubm90aWZpY2F0aW9uQ2xpZW50ID0gbm90 aWZpY2F0aW9uUHJlc2VudGVySW1wbCgpOwotI2VuZGlmCiAgICAgcGFnZUNsaWVudHMuYmFja0Zv cndhcmRDbGllbnQgPSBCYWNrRm9yd2FyZExpc3RDaHJvbWl1bTo6Y3JlYXRlKHRoaXMpOwogCiAg ICAgbV9wYWdlID0gYWRvcHRQdHIobmV3IFBhZ2UocGFnZUNsaWVudHMpKTsKQEAgLTQxMCw2ICs0 MDcsOSBAQCBXZWJWaWV3SW1wbDo6V2ViVmlld0ltcGwoV2ViVmlld0NsaWVudCogY2xpZW50KQog I2lmIEVOQUJMRShJTlBVVF9TUEVFQ0gpCiAgICAgcHJvdmlkZVNwZWVjaElucHV0VG8obV9wYWdl LmdldCgpLCBtX3NwZWVjaElucHV0Q2xpZW50LmdldCgpKTsKICNlbmRpZgorI2lmIEVOQUJMRShO T1RJRklDQVRJT05TKQorICAgIHByb3ZpZGVOb3RpZmljYXRpb24obV9wYWdlLmdldCgpLCBub3Rp ZmljYXRpb25QcmVzZW50ZXJJbXBsKCkpOworI2VuZGlmCiAKICAgICBwcm92aWRlRGV2aWNlT3Jp ZW50YXRpb25UbyhtX3BhZ2UuZ2V0KCksIG1fZGV2aWNlT3JpZW50YXRpb25DbGllbnRQcm94eS5n ZXQoKSk7CiAgICAgbV9nZW9sb2NhdGlvbkNsaWVudFByb3h5LT5zZXRDb250cm9sbGVyKG1fcGFn ZS0+Z2VvbG9jYXRpb25Db250cm9sbGVyKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9t YWMvV2ViVmlldy9XZWJWaWV3Lm1tIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3 Lm1tCmluZGV4IDE2MTFhNmQ2YTYxMDM0NGI0Y2YzMTIyZDM1ODM0YzM5YWQ3NjhjMTkuLjhjMWQ1 ZGRhYjNhYzk0MDBlNTQ3YTE4YzA3NDFiMmZlNzY2ZGIxM2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJW aWV3L1dlYlZpZXcubW0KQEAgLTc0MiwxMCArNzQyLDEwIEBAIHN0YXRpYyBOU1N0cmluZyAqbGVh a091dGxvb2tRdWlya3NVc2VyU2NyaXB0Q29udGVudHMoKQogI2lmIEVOQUJMRShDTElFTlRfQkFT RURfR0VPTE9DQVRJT04pCiAgICAgcGFnZUNsaWVudHMuZ2VvbG9jYXRpb25DbGllbnQgPSBuZXcg V2ViR2VvbG9jYXRpb25DbGllbnQoc2VsZik7CiAjZW5kaWYKKyAgICBfcHJpdmF0ZS0+cGFnZSA9 IG5ldyBQYWdlKHBhZ2VDbGllbnRzKTsKICNpZiBFTkFCTEUoTk9USUZJQ0FUSU9OUykKLSAgICBw YWdlQ2xpZW50cy5ub3RpZmljYXRpb25DbGllbnQgPSBuZXcgV2ViTm90aWZpY2F0aW9uQ2xpZW50 KHNlbGYpOworICAgIFdlYkNvcmU6OnByb3ZpZGVOb3RpZmljYXRpb24oX3ByaXZhdGUtPnBhZ2Us IG5ldyBXZWJOb3RpZmljYXRpb25DbGllbnQoc2VsZikpOwogI2VuZGlmCi0gICAgX3ByaXZhdGUt PnBhZ2UgPSBuZXcgUGFnZShwYWdlQ2xpZW50cyk7CiAjaWYgRU5BQkxFKERFVklDRV9PUklFTlRB VElPTikKICAgICBXZWJDb3JlOjpwcm92aWRlRGV2aWNlT3JpZW50YXRpb25UbyhfcHJpdmF0ZS0+ cGFnZSwgbmV3IFdlYkRldmljZU9yaWVudGF0aW9uQ2xpZW50KHNlbGYpKTsKICNlbmRpZgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwIGIvU291cmNlL1dlYktp dC9xdC9BcGkvcXdlYnBhZ2UuY3BwCmluZGV4IGUwZGM3NzhjMjQwNGNiN2Q5N2IwNDM0NTFlNzk4 ODUxNWExMmE4MzIuLjg2MzQxMzM4NGEyOGNmNzI0Y2JkYjlhMTNiMjAwODIyMGZjMDAwMWYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAKQEAgLTMzMiw5ICszMzIsNiBAQCBRV2ViUGFnZVBy aXZhdGU6OlFXZWJQYWdlUHJpdmF0ZShRV2ViUGFnZSAqcXEpCiAgICAgZWxzZQogICAgICAgICBw YWdlQ2xpZW50cy5nZW9sb2NhdGlvbkNsaWVudCA9IG5ldyBHZW9sb2NhdGlvbkNsaWVudFF0KHEp OwogI2VuZGlmCi0jaWYgRU5BQkxFKE5PVElGSUNBVElPTlMpCi0gICAgcGFnZUNsaWVudHMubm90 aWZpY2F0aW9uQ2xpZW50ID0gTm90aWZpY2F0aW9uUHJlc2VudGVyQ2xpZW50UXQ6Om5vdGlmaWNh dGlvblByZXNlbnRlcigpOwotI2VuZGlmCiAgICAgcGFnZSA9IG5ldyBQYWdlKHBhZ2VDbGllbnRz KTsKICNpZiBFTkFCTEUoREVWSUNFX09SSUVOVEFUSU9OKQogICAgIGlmICh1c2VNb2NrKQpAQCAt MzQzLDYgKzM0MCw5IEBAIFFXZWJQYWdlUHJpdmF0ZTo6UVdlYlBhZ2VQcml2YXRlKFFXZWJQYWdl ICpxcSkKICAgICAgICAgV2ViQ29yZTo6cHJvdmlkZURldmljZU9yaWVudGF0aW9uVG8ocGFnZSwg bmV3IERldmljZU9yaWVudGF0aW9uQ2xpZW50UXQpOwogICAgIFdlYkNvcmU6OnByb3ZpZGVEZXZp Y2VNb3Rpb25UbyhwYWdlLCBuZXcgRGV2aWNlTW90aW9uQ2xpZW50UXQpOwogI2VuZGlmCisjaWYg RU5BQkxFKE5PVElGSUNBVElPTlMpCisgICAgV2ViQ29yZTo6cHJvdmlkZU5vdGlmaWNhdGlvbihw YWdlLCBOb3RpZmljYXRpb25QcmVzZW50ZXJDbGllbnRRdDo6bm90aWZpY2F0aW9uUHJlc2VudGVy KCkpOworI2VuZGlmCiAKICAgICAvLyBCeSBkZWZhdWx0IGVhY2ggcGFnZSBpcyBwdXQgaW50byB0 aGVpciBvd24gdW5pcXVlIHBhZ2UgZ3JvdXAsIHdoaWNoIGFmZmVjdHMgcG9wdXAgd2luZG93cwog ICAgIC8vIGFuZCB2aXNpdGVkIGxpbmtzLiBQYWdlIGdyb3VwcyAocGVyIHByb2Nlc3Mgb25seSkg aXMgYSBmZWF0dXJlIG1ha2luZyBpdCBwb3NzaWJsZSB0byB1c2UK