124528 2013-11-18 11:25:27 -0800 Add PageLoadState class 2013-11-18 11:58:07 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca eflews.bot gyuyoung.kim mitz philn xan.lopez oldest_to_newest 951710 0 andersca 2013-11-18 11:25:27 -0800 Add PageLoadState class 951712 1 217215 andersca 2013-11-18 11:27:01 -0800 Created attachment 217215 Patch 951716 2 217215 mitz 2013-11-18 11:30:28 -0800 Comment on attachment 217215 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=217215&action=review Looks OK. > Source/WebKit2/ChangeLog:10 > + Trying to use the main frame load state as the page load state was a bad idea, > + add a new PageLoadState and use it instead. Ultimately the long term plan is to > + transition away from FrameLoadState entirely. FrameLoadState was just recently added? Should we revert those patches if they were steps in the wrong direction? > Source/WebKit2/UIProcess/PageLoadState.h:41 > +private: > + Please remove this. 951719 3 217215 eflews.bot 2013-11-18 11:37:48 -0800 Comment on attachment 217215 Patch Attachment 217215 did not pass efl-wk2-ews (efl-wk2): Output: http://webkit-queues.appspot.com/results/25928075 951733 4 andersca 2013-11-18 11:54:23 -0800 (In reply to comment #2) > (From update of attachment 217215 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=217215&action=review > > Looks OK. > > > Source/WebKit2/ChangeLog:10 > > + Trying to use the main frame load state as the page load state was a bad idea, > > + add a new PageLoadState and use it instead. Ultimately the long term plan is to > > + transition away from FrameLoadState entirely. > > FrameLoadState was just recently added? Should we revert those patches if they were steps in the wrong direction? I still think it’s worth abstracting the frame load state out into a separate object. 951738 5 andersca 2013-11-18 11:58:07 -0800 Committed r159444: <http://trac.webkit.org/changeset/159444> 217215 2013-11-18 11:27:01 -0800 2013-11-18 11:37:48 -0800 Patch bug-124528-20131118112700.patch text/plain 11526 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTU5NDM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMGYxNTgxZDUwZGI1Yjcz ZmQ0YTI3NzRhMWUyMWI2MDMxMWFiMDNlMi4uNGM5MzBhZTA0ZjljMWU5YTA4MmJjOGQ2ZDU0MWM0 NDc3YjJiNTliZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI2IEBACiAyMDEzLTExLTE4ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgQWRkIFBhZ2VMb2Fk U3RhdGUgY2xhc3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEyNDUyOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFRyeWluZyB0byB1c2UgdGhlIG1haW4gZnJhbWUgbG9hZCBzdGF0ZSBhcyB0aGUgcGFnZSBs b2FkIHN0YXRlIHdhcyBhIGJhZCBpZGVhLAorICAgICAgICBhZGQgYSBuZXcgUGFnZUxvYWRTdGF0 ZSBhbmQgdXNlIGl0IGluc3RlYWQuIFVsdGltYXRlbHkgdGhlIGxvbmcgdGVybSBwbGFuIGlzIHRv CisgICAgICAgIHRyYW5zaXRpb24gYXdheSBmcm9tIEZyYW1lTG9hZFN0YXRlIGVudGlyZWx5Lgor CisgICAgICAgICogVUlQcm9jZXNzL1BhZ2VMb2FkU3RhdGUuY3BwOiBBZGRlZC4KKyAgICAgICAg KFdlYktpdDo6UGFnZUxvYWRTdGF0ZTo6UGFnZUxvYWRTdGF0ZSk6CisgICAgICAgIChXZWJLaXQ6 OlBhZ2VMb2FkU3RhdGU6On5QYWdlTG9hZFN0YXRlKToKKyAgICAgICAgKFdlYktpdDo6UGFnZUxv YWRTdGF0ZTo6ZGlkU3RhcnRQcm92aXNpb25hbExvYWQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9Q YWdlTG9hZFN0YXRlLmg6IEFkZGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHku Y3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRpZFN0YXJ0UHJvdmlzaW9uYWxM b2FkRm9yRnJhbWUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAg ICAgKiBXZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisKKzIwMTMtMTEtMTggIEFu ZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKwogICAgICAgICBVc2UgYSBzdHJv bmcgZW51bSBmb3IgZnJhbWUgbG9hZCBzdGF0ZXMKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNDUyNAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvUGFnZUxvYWRTdGF0ZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv UGFnZUxvYWRTdGF0ZS5jcHAKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMmNjMTFlOTg2MWRiNDk2ZTc2OGExNTRjNmI5 YmRjMmE3MWQwMDc0ZAotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9QYWdlTG9hZFN0YXRlLmNwcApAQCAtMCwwICsxLDQ0IEBACisvKgorICogQ29weXJpZ2h0IChD KSAyMDEzIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1 dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQK KyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dp bmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3Vy Y2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRo aXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAy LiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3Zl IGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhl IGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Ig b3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBU SElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRP UlMgYGBBUyBJUycnCisgKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJ TkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMg T0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBP U0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENP TlRSSUJVVE9SUworICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURF TlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgorICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJ TkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRV VEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBC VVNJTkVTUworICogSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9S WSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KKyAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZ LCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCisgKiBBUklTSU5H IElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJ U0VEIE9GCisgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworI2luY2x1 ZGUgImNvbmZpZy5oIgorI2luY2x1ZGUgIlBhZ2VMb2FkU3RhdGUuaCIKKworbmFtZXNwYWNlIFdl YktpdCB7CisKK1BhZ2VMb2FkU3RhdGU6OlBhZ2VMb2FkU3RhdGUoKQoreworfQorCitQYWdlTG9h ZFN0YXRlOjp+UGFnZUxvYWRTdGF0ZSgpCit7Cit9CisKK3ZvaWQgUGFnZUxvYWRTdGF0ZTo6ZGlk U3RhcnRQcm92aXNpb25hbExvYWQoY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0cmluZyYgdW5y ZWFjaGFibGVVUkwpCit7CisgICAgLy8gRklYTUU6IEltcGxlbWVudCB0aGlzLgorfQorCit9IC8v IG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Q YWdlTG9hZFN0YXRlLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZUxvYWRTdGF0ZS5o Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAuLjc1YjU1NWY3OWM4ODI1ZDk4NTY5MTA0ZTVjMjliMWRiNjcxMjc2MzcKLS0t IC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZUxvYWRTdGF0ZS5o CkBAIC0wLDAgKzEsNDYgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTMgQXBwbGUgSW5jLiBB bGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291 cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBh cmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBh cmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWlu IHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlv bnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBp biBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBu b3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWlt ZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJv dmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJP VklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFO RCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBM SU1JVEVEIFRPLAorICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkg QU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4g SU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBM SUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVN UExBUlksIE9SCisgKiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBM SU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgorICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNF UzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJV UFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hF VEhFUiBJTgorICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElO RyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKKyAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0Yg VEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NT SUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjaWZuZGVmIFBhZ2VMb2FkU3RhdGVfaAor I2RlZmluZSBQYWdlTG9hZFN0YXRlX2gKKworI2luY2x1ZGUgPHd0Zi90ZXh0L1dURlN0cmluZy5o PgorCituYW1lc3BhY2UgV2ViS2l0IHsKKworY2xhc3MgUGFnZUxvYWRTdGF0ZSB7CitwdWJsaWM6 CisgICAgUGFnZUxvYWRTdGF0ZSgpOworICAgIH5QYWdlTG9hZFN0YXRlKCk7CisKKyAgICB2b2lk IGRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkKGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBTdHJpbmcm IHVucmVhY2hhYmxlVVJMKTsKKworcHJpdmF0ZToKKworfTsKKworfSAvLyBuYW1lc3BhY2UgV2Vi S2l0CisKKyNlbmRpZiAvLyBQYWdlTG9hZFN0YXRlX2gKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggM2NiNWNkNmNmN2YyZGE4M2VlMjcxYWVjMTE5OTE0OWJk ZGE5ODA1ZS4uODQ2ODdkMjkxYmM3MWFjOGE1YTYwYzk5NGZjNjQ4OTA5OGQyY2ZkYSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTIxNDUsOSArMjE0NSwx MiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1 aW50NjRfdCBmcmFtZUlELCBjb25zdCBTdHJpbgogICAgIE1FU1NBR0VfQ0hFQ0soZnJhbWUpOwog ICAgIE1FU1NBR0VfQ0hFQ0tfVVJMKHVybCk7CiAKLSAgICBmcmFtZS0+c2V0VW5yZWFjaGFibGVV UkwodW5yZWFjaGFibGVVUkwpOworICAgIGlmIChmcmFtZS0+aXNNYWluRnJhbWUoKSkKKyAgICAg ICAgbV9wYWdlTG9hZFN0YXRlLmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkKHVybCwgdW5yZWFjaGFi bGVVUkwpOwogCisgICAgZnJhbWUtPnNldFVucmVhY2hhYmxlVVJMKHVucmVhY2hhYmxlVVJMKTsK ICAgICBmcmFtZS0+ZGlkU3RhcnRQcm92aXNpb25hbExvYWQodXJsKTsKKwogICAgIG1fbG9hZGVy Q2xpZW50LmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodGhpcywgZnJhbWUsIHVzZXJE YXRhLmdldCgpKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCmlu ZGV4IGFjOGU1Njc5MWQzYTQ5YzFjNzE3OWMyMDQ0ZTkwZmJmZDM5YmE1Y2IuLjU0NzUwZmI2MTI1 MmJhNTI3ZGE4ZTZlODg0OWNmNGVhOWNmYzg2ZmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmgKQEAgLTM0LDYgKzM0LDcgQEAKICNpbmNsdWRlICJHZW9sb2NhdGlvblBl cm1pc3Npb25SZXF1ZXN0TWFuYWdlclByb3h5LmgiCiAjaW5jbHVkZSAiTGF5ZXJUcmVlQ29udGV4 dC5oIgogI2luY2x1ZGUgIk5vdGlmaWNhdGlvblBlcm1pc3Npb25SZXF1ZXN0TWFuYWdlclByb3h5 LmgiCisjaW5jbHVkZSAiUGFnZUxvYWRTdGF0ZS5oIgogI2luY2x1ZGUgIlBsYXRmb3JtUHJvY2Vz c0lkZW50aWZpZXIuaCIKICNpbmNsdWRlICJTYW5kYm94RXh0ZW5zaW9uLmgiCiAjaW5jbHVkZSAi U2hhcmVhYmxlQml0bWFwLmgiCkBAIC0xMTgwLDYgKzExODEsNyBAQCBwcml2YXRlOgogICAgIFdl YkNvcmU6OkRyYWdTZXNzaW9uIG1fY3VycmVudERyYWdTZXNzaW9uOwogI2VuZGlmCiAKKyAgICBQ YWdlTG9hZFN0YXRlIG1fcGFnZUxvYWRTdGF0ZTsKICAgICBTdHJpbmcgbV9wZW5kaW5nQVBJUmVx dWVzdFVSTDsKIAogICAgIGJvb2wgbV9tYWluRnJhbWVIYXNIb3Jpem9udGFsU2Nyb2xsYmFyOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhw cm9qIGIvU291cmNlL1dlYktpdDIvV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCmlu ZGV4IDE0NDkzMjU5Yjk5MzVjN2RiMGNjNzliYTJlZmI4YTRlYmM3NjNkMGEuLmRjYjQyYzJkZDM5 NmJkZDVmZTkyNTczY2VlMDYxYzQ0YjVmYmI5YmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1dlYktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagorKysgYi9Tb3VyY2UvV2ViS2l0Mi9X ZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKQEAgLTI0Nyw2ICsyNDcsOCBAQAogCQkx QUMyNUZDMjEyQTQ4RjYwMDBCRDI2NzEgLyogUGx1Z2luUHJvY2Vzc1NoaW0ubW0gaW4gU291cmNl cyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQUMyNUY4QTEyQTQ4RTAzMDBC RDI2NzEgLyogUGx1Z2luUHJvY2Vzc1NoaW0ubW0gKi87IH07CiAJCTFBQzRDODI5MTZCODc2QTkw MDY5RENDRCAvKiBNZXNzYWdlRmxhZ3MuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxk RmlsZTsgZmlsZVJlZiA9IDFBQzRDODI4MTZCODc2QTkwMDY5RENDRCAvKiBNZXNzYWdlRmxhZ3Mu aCAqLzsgfTsKIAkJMUFDNUZGQzIxNzRCRkQxQjAwMDE0ODNEIC8qIFBsdWdpblByb2Nlc3NBdHRy aWJ1dGVzLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAx QUM1RkZDMTE3NEJGRDFCMDAwMTQ4M0QgLyogUGx1Z2luUHJvY2Vzc0F0dHJpYnV0ZXMuaCAqLzsg fTsKKwkJMUFDNzUzN0IxODNBOUZEQjAwNzJDQjE1IC8qIFBhZ2VMb2FkU3RhdGUuY3BwIGluIFNv dXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUFDNzUzNzkxODNBOUZE QTAwNzJDQjE1IC8qIFBhZ2VMb2FkU3RhdGUuY3BwICovOyB9OworCQkxQUM3NTM3QzE4M0E5RkRC MDA3MkNCMTUgLyogUGFnZUxvYWRTdGF0ZS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVp bGRGaWxlOyBmaWxlUmVmID0gMUFDNzUzN0ExODNBOUZEQjAwNzJDQjE1IC8qIFBhZ2VMb2FkU3Rh dGUuaCAqLzsgfTsKIAkJMUFDODZGRjMxMzBCNDZEMzAwMkMxMjU3IC8qIFdLUGx1Z2luU2l0ZURh dGFNYW5hZ2VyLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJl ZiA9IDFBQzg2RkYxMTMwQjQ2RDMwMDJDMTI1NyAvKiBXS1BsdWdpblNpdGVEYXRhTWFuYWdlci5j cHAgKi87IH07CiAJCTFBQzg2RkY0MTMwQjQ2RDMwMDJDMTI1NyAvKiBXS1BsdWdpblNpdGVEYXRh TWFuYWdlci5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0g MUFDODZGRjIxMzBCNDZEMzAwMkMxMjU3IC8qIFdLUGx1Z2luU2l0ZURhdGFNYW5hZ2VyLmggKi87 IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKIAkJMUFDODcwMkQx MzBCNDlBMjAwMkMxMjU3IC8qIFdlYlBsdWdpblNpdGVEYXRhTWFuYWdlci5oIGluIEhlYWRlcnMg Ki8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUFDODcwMkIxMzBCNDlBMjAwMkMx MjU3IC8qIFdlYlBsdWdpblNpdGVEYXRhTWFuYWdlci5oICovOyB9OwpAQCAtMTcyOSw2ICsxNzMx LDggQEAKIAkJMUFDMjVGQjAxMkE0OEVBNzAwQkQyNjcxIC8qIFBsdWdpblByb2Nlc3NTaGltLmR5 bGliICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGV4cGxpY2l0RmlsZVR5cGUgPSAiY29t cGlsZWQubWFjaC1vLmR5bGliIjsgaW5jbHVkZUluSW5kZXggPSAwOyBwYXRoID0gUGx1Z2luUHJv Y2Vzc1NoaW0uZHlsaWI7IHNvdXJjZVRyZWUgPSBCVUlMVF9QUk9EVUNUU19ESVI7IH07CiAJCTFB QzRDODI4MTZCODc2QTkwMDY5RENDRCAvKiBNZXNzYWdlRmxhZ3MuaCAqLyA9IHtpc2EgPSBQQlhG aWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJj ZWNvZGUuYy5oOyBwYXRoID0gTWVzc2FnZUZsYWdzLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7 IH07CiAJCTFBQzVGRkMxMTc0QkZEMUIwMDAxNDgzRCAvKiBQbHVnaW5Qcm9jZXNzQXR0cmlidXRl cy5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RL bm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBQbHVnaW5Qcm9jZXNzQXR0cmli dXRlcy5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQkxQUM3NTM3OTE4M0E5RkRBMDA3 MkNCMTUgLyogUGFnZUxvYWRTdGF0ZS5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsg ZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7 IHBhdGggPSBQYWdlTG9hZFN0YXRlLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJ MUFDNzUzN0ExODNBOUZEQjAwNzJDQjE1IC8qIFBhZ2VMb2FkU3RhdGUuaCAqLyA9IHtpc2EgPSBQ QlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNv dXJjZWNvZGUuYy5oOyBwYXRoID0gUGFnZUxvYWRTdGF0ZS5oOyBzb3VyY2VUcmVlID0gIjxncm91 cD4iOyB9OwogCQkxQUM4NkZGMTEzMEI0NkQzMDAyQzEyNTcgLyogV0tQbHVnaW5TaXRlRGF0YU1h bmFnZXIuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7 IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gV0tQbHVnaW5T aXRlRGF0YU1hbmFnZXIuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkxQUM4NkZG MjEzMEI0NkQzMDAyQzEyNTcgLyogV0tQbHVnaW5TaXRlRGF0YU1hbmFnZXIuaCAqLyA9IHtpc2Eg PSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9 IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gV0tQbHVnaW5TaXRlRGF0YU1hbmFnZXIuaDsgc291cmNl VHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUFDODcwMkIxMzBCNDlBMjAwMkMxMjU3IC8qIFdlYlBs dWdpblNpdGVEYXRhTWFuYWdlci5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVF bmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBX ZWJQbHVnaW5TaXRlRGF0YU1hbmFnZXIuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAg LTQzMDIsNiArNDMwNiw4IEBACiAJCQkJQkMwNkY0MzkxMkRCQ0NGQjAwMkQ3OERFIC8qIEdlb2xv Y2F0aW9uUGVybWlzc2lvblJlcXVlc3RQcm94eS5jcHAgKi8sCiAJCQkJQkMwNkY0MzgxMkRCQ0NG QjAwMkQ3OERFIC8qIEdlb2xvY2F0aW9uUGVybWlzc2lvblJlcXVlc3RQcm94eS5oICovLAogCQkJ CUJDNkVEQUE1MTExMjcxQzYwMEU3Njc4QiAvKiBQYWdlQ2xpZW50LmggKi8sCisJCQkJMUFDNzUz NzkxODNBOUZEQTAwNzJDQjE1IC8qIFBhZ2VMb2FkU3RhdGUuY3BwICovLAorCQkJCTFBQzc1MzdB MTgzQTlGREIwMDcyQ0IxNSAvKiBQYWdlTG9hZFN0YXRlLmggKi8sCiAJCQkJQkM1OTcwNzQxMTY1 OTFEMDAwNTUxRkNBIC8qIFByb2Nlc3NNb2RlbC5oICovLAogCQkJCUJDMTExQjA4MTEyRjVFM0Mw MDMzN0JBQiAvKiBSZXNwb25zaXZlbmVzc1RpbWVyLmNwcCAqLywKIAkJCQkxQTMwMDY2QzExMTBG NEY3MDAzMTkzN0MgLyogUmVzcG9uc2l2ZW5lc3NUaW1lci5oICovLApAQCAtNTg1OCw2ICs1ODY0 LDcgQEAKIAkJCQlCQ0M1NzE1QjExNUFEQUVGMDAxQ0NBRjkgLyogV2ViU3lzdGVtSW50ZXJmYWNl LmggaW4gSGVhZGVycyAqLywKIAkJCQkxQTU5NEFCQjExMkExRkI2MDA5REU3QzcgLyogV2ViVUlD bGllbnQuaCBpbiBIZWFkZXJzICovLAogCQkJCUJDQTBFRjdGMTIzMzFFNzgwMDdEM0NGQiAvKiBX ZWJVbmRvU3RlcC5oIGluIEhlYWRlcnMgKi8sCisJCQkJMUFDNzUzN0MxODNBOUZEQjAwNzJDQjE1 IC8qIFBhZ2VMb2FkU3RhdGUuaCBpbiBIZWFkZXJzICovLAogCQkJCUJDREI4NkMxMTIwMEZCOTcw MDcyNTRCRSAvKiBXZWJVUkwuaCBpbiBIZWFkZXJzICovLAogCQkJCUJDRTIzMTVEMTIyQzMwQ0Ew MEQ1QzM1QSAvKiBXZWJVUkxSZXF1ZXN0LmggaW4gSGVhZGVycyAqLywKIAkJCQlCQzkwQTFEMjEy MkRENTVFMDBDQzhDNTAgLyogV2ViVVJMUmVzcG9uc2UuaCBpbiBIZWFkZXJzICovLApAQCAtNzMw NSw2ICs3MzEyLDcgQEAKIAkJCQlCQzQwNzYwNTEyNEZGMDI3MDA2OEYyMEEgLyogV0tTdHJpbmcu Y3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJQkM0MDc2MTkxMjRGRjAzNzAwNjhGMjBBIC8qIFdLU3Ry aW5nQ0YubW0gaW4gU291cmNlcyAqLywKIAkJCQkxQTRBOUFBOTEyQjdFNzk2MDA4RkU5ODQgLyog V0tUZXh0SW5wdXRXaW5kb3dDb250cm9sbGVyLm1tIGluIFNvdXJjZXMgKi8sCisJCQkJMUFDNzUz N0IxODNBOUZEQjAwNzJDQjE1IC8qIFBhZ2VMb2FkU3RhdGUuY3BwIGluIFNvdXJjZXMgKi8sCiAJ CQkJQkM0MDc2MDcxMjRGRjAyNzAwNjhGMjBBIC8qIFdLVHlwZS5jcHAgaW4gU291cmNlcyAqLywK IAkJCQk3Q0Q1RUJCRTE3NDZCMDRDMDAwQzFDNDUgLyogV0tUeXBlUmVmV3JhcHBlci5tbSBpbiBT b3VyY2VzICovLAogCQkJCUJDNDA3NjA5MTI0RkYwMjcwMDY4RjIwQSAvKiBXS1VSTC5jcHAgaW4g U291cmNlcyAqLywK