194614 2019-02-13 14:49:30 -0800 [WPE][GTK] Clean up handling of WEBKIT_FORCE_COMPLEX_TEXT 2019-02-25 08:10:38 -0800 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build PC Linux RESOLVED FIXED P2 Normal --- 1 mcatanzaro mcatanzaro berto bugs-noreply cgarcia commit-queue ews-watchlist gustavo mcatanzaro oldest_to_newest 1505868 0 mcatanzaro 2019-02-13 14:49:30 -0800 In WebProcessPool::platformInitializeWebProcess: #if PLATFORM(GTK) // This is misnamed. It can only be used to disable complex text. parameters.shouldAlwaysUseComplexTextCodePath = true; const char* forceComplexText = getenv("WEBKIT_FORCE_COMPLEX_TEXT"); if (forceComplexText && !strcmp(forceComplexText, "0")) parameters.shouldAlwaysUseComplexTextCodePath = m_alwaysUsesComplexTextCodePath; #endif But this doesn't make sense, for two reasons: (1) WEBKIT_FORCE_COMPLEX_TEXT=1 is ignored and does nothing, because complex text is used by default, which is confusing. It would be better to name this WEBKIT_DISABLE_COMPLEX_TEXT. (2) I would expect WEBKIT_FORCE_COMPLEX_TEXT=0 to set parameters.shouldAlwaysUseComplexTextCodePath = false, but it doesn't. The envvar just causes the code to respect m_alwaysUsesComplexTextCodePath. WebProcessPool::setAlwaysUsesComplexTextCodePath is therefore broken unless WEBKIT_FORCE_COMPLEX_TEXT=0 is specified. 1505875 1 mcatanzaro 2019-02-13 15:03:05 -0800 Let's make WEBKIT_FORCE_COMPLEX_TEXT=0 disable complex text, and WEBKIT_FORCE_COMPLEX_TEXT=1 or any other value enable it, for both WPE and GTK. After landing, we need to update https://trac.webkit.org/wiki/EnvironmentVariables. 1505885 2 361945 mcatanzaro 2019-02-13 15:18:43 -0800 Created attachment 361945 Patch 1505886 3 ews-watchlist 2019-02-13 15:19:49 -0800 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 1506090 4 361945 cgarcia 2019-02-14 00:58:00 -0800 Comment on attachment 361945 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=361945&action=review > Source/WebKit/ChangeLog:16 > + Also, move this code up to WebKitWebContext and use setAlwaysUsesComplexTextCodePath; > + otherwise, setAlwaysUsesComplexTextCodePath doesn't work as intended. Why not? it has worked so far. That means we can't use it to run layout tests with complex text enabled/disabled. > Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp:372 > +#if PLATFORM(GTK) > + else > + priv->processPool->setAlwaysUsesComplexTextCodePath(true); > +#endif I don't like the ifdefs in the middle of an if, I prefer to use a local variable to define the default value using ifdefs. 1506209 5 mcatanzaro 2019-02-14 10:00:47 -0800 (In reply to Carlos Garcia Campos from comment #4) > Why not? it has worked so far. That means we can't use it to run layout > tests with complex text enabled/disabled. Oh wow, you're right. I was trying to make setAlwaysUseComplexTextCodePath actually work. Currently, if you call setAlwaysUseComplexTextCodePath(false) then on GTK port the value will still be true. That's not good. I'll find another way. > > Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp:372 > > +#if PLATFORM(GTK) > > + else > > + priv->processPool->setAlwaysUsesComplexTextCodePath(true); > > +#endif > > I don't like the ifdefs in the middle of an if, I prefer to use a local > variable to define the default value using ifdefs. Sure. 1509392 6 362833 mcatanzaro 2019-02-23 13:32:10 -0800 Created attachment 362833 Patch 1509576 7 362833 cgarcia 2019-02-25 02:07:31 -0800 Comment on attachment 362833 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=362833&action=review > Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp:77 > + if (const char* forceComplexText = getenv("WEBKIT_FORCE_COMPLEX_TEXT")) > + setAlwaysUsesComplexTextCodePath(strcmp(forceComplexText, "0")); Since we know there aren't any processes at this point, you could simply set the value of m_alwaysUsesComplexTextCodePath. You can initialize it here also when the env var is not present to avoid adding ifdefs in cross platform file. 1509607 8 362898 mcatanzaro 2019-02-25 06:31:24 -0800 Created attachment 362898 Patch 1509637 9 362898 commit-queue 2019-02-25 08:10:37 -0800 Comment on attachment 362898 Patch Clearing flags on attachment: 362898 Committed r242042: <https://trac.webkit.org/changeset/242042> 1509638 10 commit-queue 2019-02-25 08:10:38 -0800 All reviewed patches have been landed. Closing bug. 361945 2019-02-13 15:18:43 -0800 2019-02-23 13:32:07 -0800 Patch bug-194614-20190213171842.patch text/plain 3589 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMjQxNDc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDBkYzk4MTQwYTc4NjExNWM3 Nzg0NjE5ZjNhNWQzMjFkZTVlM2E2ZTMuLjhlMmVjMGFmNjQ4MzNlNjQ0MzkzODVlMWUxMmI4MGEw MGNlODljZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTktMDItMTMgIE1pY2hhZWwg Q2F0YW56YXJvICA8bWNhdGFuemFyb0BpZ2FsaWEuY29tPgorCisgICAgICAgIFtXUEVdW0dUS10g Q2xlYW4gdXAgaGFuZGxpbmcgb2YgV0VCS0lUX0ZPUkNFX0NPTVBMRVhfVEVYVAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk0NjE0CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSXQncyBub3cgcG9zc2libGUg dG8gdXNlIHRoaXMgZW52aXJvbm1lbnQgdmFyaWFibGUgdG8gZW5hYmxlIGNvbXBsZXggdGV4dCwg bm90IGp1c3QgdG8KKyAgICAgICAgZGlzYWJsZSBpdC4gV0VCS0lUX0ZPUkNFX0NPTVBMRVhfVEVY VD0wIHdpbGwgZGlzYWJsZSBhbmQgYW55IG90aGVyIHZhbHVlIHdpbGwgZW5hYmxlLgorCisgICAg ICAgIFRoZSBlbnZpcm9ubWVudCB2YXJpYWJsZSB3aWxsIG5vdyBiZSByZXNwZWN0ZWQgZm9yIFdQ RSwgbm90IGp1c3QgR1RLLgorCisgICAgICAgIElmIG5vdCBkZWZpbmVkLCBjb21wbGV4IHRleHQg aXMgc3RpbGwgZm9yY2VkIGZvciBHVEsgb25seSwgbm90IGZvciBXUEUuCisKKyAgICAgICAgQWxz bywgbW92ZSB0aGlzIGNvZGUgdXAgdG8gV2ViS2l0V2ViQ29udGV4dCBhbmQgdXNlIHNldEFsd2F5 c1VzZXNDb21wbGV4VGV4dENvZGVQYXRoOworICAgICAgICBvdGhlcndpc2UsIHNldEFsd2F5c1Vz ZXNDb21wbGV4VGV4dENvZGVQYXRoIGRvZXNuJ3Qgd29yayBhcyBpbnRlbmRlZC4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRXZWJDb250ZXh0LmNwcDoKKyAgICAgICAgKHdl YmtpdFdlYkNvbnRleHRDb25zdHJ1Y3RlZCk6CisgICAgICAgICogVUlQcm9jZXNzL2dsaWIvV2Vi UHJvY2Vzc1Bvb2xHTGliLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OnBs YXRmb3JtSW5pdGlhbGl6ZVdlYlByb2Nlc3MpOgorCiAyMDE5LTAyLTEzICBNaWNoYWVsIENhdGFu emFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNvbT4KIAogICAgICAgICBbV1BFXVtHVEtdIE1lcmdl IFdlYlByb2Nlc3NQb29sV1BFLmNwcCBhbmQgV2ViUHJvY2Vzc1Bvb2xHdGsuY3BwCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRXZWJDb250ZXh0LmNw cCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9nbGliL1dlYktpdFdlYkNvbnRleHQuY3Bw CmluZGV4IDcyNGM1ZmJmNWU4NDdjZWQxZjMwZmIwOGNmZDU4ZDhkMWY1NjlmMGIuLjM5NzA4Mjcw NDM3Y2RiNWIzNTM4YzAwODFlOWZmNGU3ZTY3MTNjODEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0FQSS9nbGliL1dlYktpdFdlYkNvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9nbGliL1dlYktpdFdlYkNvbnRleHQuY3BwCkBAIC01NCw2ICs1 NCw3IEBACiAjaW5jbHVkZSAiV2ViTm90aWZpY2F0aW9uTWFuYWdlclByb3h5LmgiCiAjaW5jbHVk ZSAiV2Vic2l0ZURhdGFUeXBlLmgiCiAjaW5jbHVkZSA8SmF2YVNjcmlwdENvcmUvUmVtb3RlSW5z cGVjdG9yLmg+CisjaW5jbHVkZSA8Y3N0ZGxpYj4KICNpbmNsdWRlIDxnbGliL2dpMThuLWxpYi5o PgogI2luY2x1ZGUgPGxpYmludGwuaD4KICNpbmNsdWRlIDxtZW1vcnk+CkBAIC0zNjMsNiArMzY0 LDEzIEBAIHN0YXRpYyB2b2lkIHdlYmtpdFdlYkNvbnRleHRDb25zdHJ1Y3RlZChHT2JqZWN0KiBv YmplY3QpCiAgICAgICAgIHByaXYtPnByb2Nlc3NQb29sLT5zdGFydE1lbW9yeVNhbXBsZXIoMCk7 CiAjZW5kaWYKIAorICAgIGlmIChjb25zdCBjaGFyKiBmb3JjZUNvbXBsZXhUZXh0ID0gZ2V0ZW52 KCJXRUJLSVRfRk9SQ0VfQ09NUExFWF9URVhUIikpCisgICAgICAgIHByaXYtPnByb2Nlc3NQb29s LT5zZXRBbHdheXNVc2VzQ29tcGxleFRleHRDb2RlUGF0aChzdHJjbXAoZm9yY2VDb21wbGV4VGV4 dCwgIjAiKSk7CisjaWYgUExBVEZPUk0oR1RLKQorICAgIGVsc2UKKyAgICAgICAgcHJpdi0+cHJv Y2Vzc1Bvb2wtPnNldEFsd2F5c1VzZXNDb21wbGV4VGV4dENvZGVQYXRoKHRydWUpOworI2VuZGlm CisKICAgICBhdHRhY2hJbmplY3RlZEJ1bmRsZUNsaWVudFRvQ29udGV4dCh3ZWJDb250ZXh0KTsK ICAgICBhdHRhY2hEb3dubG9hZENsaWVudFRvQ29udGV4dCh3ZWJDb250ZXh0KTsKICAgICBhdHRh Y2hDdXN0b21Qcm90b2NvbE1hbmFnZXJDbGllbnRUb0NvbnRleHQod2ViQ29udGV4dCk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9nbGliL1dlYlByb2Nlc3NQb29sR0xpYi5j cHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9nbGliL1dlYlByb2Nlc3NQb29sR0xpYi5jcHAK aW5kZXggYTJhMTYwYmU2ODY0YWJkZGQ0NmQ3ODk5NGJhZTAwYzZkY2Q1MDI4Ny4uOTU3MDNhYjRh ZmQwZjkzY2FhZGY1MThiNDE2MTc1ODM1ZTk5OGMyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvZ2xpYi9XZWJQcm9jZXNzUG9vbEdMaWIuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL2dsaWIvV2ViUHJvY2Vzc1Bvb2xHTGliLmNwcApAQCAtODYsMTQgKzg2LDYg QEAgdm9pZCBXZWJQcm9jZXNzUG9vbDo6cGxhdGZvcm1Jbml0aWFsaXplV2ViUHJvY2VzcyhXZWJQ cm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzJgogICAgIHBhcmFtZXRlcnMubWVtb3J5Q2FjaGVEaXNh YmxlZCA9IG1fbWVtb3J5Q2FjaGVEaXNhYmxlZCB8fCBjYWNoZU1vZGVsKCkgPT0gQ2FjaGVNb2Rl bDo6RG9jdW1lbnRWaWV3ZXI7CiAgICAgcGFyYW1ldGVycy5wcm94eVNldHRpbmdzID0gbV9uZXR3 b3JrUHJveHlTZXR0aW5nczsKIAotI2lmIFBMQVRGT1JNKEdUSykKLSAgICAvLyBUaGlzIGlzIG1p c25hbWVkLiBJdCBjYW4gb25seSBiZSB1c2VkIHRvIGRpc2FibGUgY29tcGxleCB0ZXh0LgotICAg IHBhcmFtZXRlcnMuc2hvdWxkQWx3YXlzVXNlQ29tcGxleFRleHRDb2RlUGF0aCA9IHRydWU7Ci0g ICAgY29uc3QgY2hhciogZm9yY2VDb21wbGV4VGV4dCA9IGdldGVudigiV0VCS0lUX0ZPUkNFX0NP TVBMRVhfVEVYVCIpOwotICAgIGlmIChmb3JjZUNvbXBsZXhUZXh0ICYmICFzdHJjbXAoZm9yY2VD b21wbGV4VGV4dCwgIjAiKSkKLSAgICAgICAgcGFyYW1ldGVycy5zaG91bGRBbHdheXNVc2VDb21w bGV4VGV4dENvZGVQYXRoID0gbV9hbHdheXNVc2VzQ29tcGxleFRleHRDb2RlUGF0aDsKLSNlbmRp ZgotCiAgICAgaWYgKG1lbW9yeVByZXNzdXJlTW9uaXRvckRpc2FibGVkKCkpCiAgICAgICAgIHBh cmFtZXRlcnMuc2hvdWxkU3VwcHJlc3NNZW1vcnlQcmVzc3VyZUhhbmRsZXIgPSB0cnVlOwogCg== 362833 2019-02-23 13:32:10 -0800 2019-02-25 06:31:22 -0800 Patch bug-194614-20190223153209.patch text/plain 3768 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMjQxOTk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGYxNWYyNjY5ZTUzY2RhMTMw YWQwMmI2ZjQ0ZGJjNjM3Mjc0ZmQzMGEuLmNlMjJlMDQzYmJkMzM3MWE5ZGNhMTc5NzczNjExODg1 NDk4MGMwNWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTktMDItMjMgIE1pY2hhZWwg Q2F0YW56YXJvICA8bWNhdGFuemFyb0BpZ2FsaWEuY29tPgorCisgICAgICAgIFtXUEVdW0dUS10g Q2xlYW4gdXAgaGFuZGxpbmcgb2YgV0VCS0lUX0ZPUkNFX0NPTVBMRVhfVEVYVAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk0NjE0CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBlbnZpcm9ubWVudCB2 YXJpYWJsZSBpcyBub3cgZW5hYmxlZCBmb3IgV1BFLCBub3QganVzdCBmb3IgR1RLLgorCisgICAg ICAgIEl0IGlzIG5vdyBwb3NzaWJsZSB0byB1c2UgdGhpcyBlbnZpcm9ubWVudCB2YXJpYWJsZSB0 byBlbmFibGUgY29tcGxleCB0ZXh0LCBub3QganVzdCB0bworICAgICAgICBkaXNhYmxlIGl0Lgor CisgICAgICAgIFdlYlByb2Nlc3NQb29sOjpzZXRBbHdheXNVc2VzQ29tcGxleFRleHRDb2RlUGF0 aCBpcyBmaXhlZCB0byBiZSByZXNwZWN0ZWQgZXZlbiB3aGVuIHRoaXMKKyAgICAgICAgZW52aXJv bm1lbnQgdmFyaWFibGUgaXMgc2V0LCBhbHRob3VnaCBXUEUgYW5kIEdUSyB3aWxsIG5ldmVyIGRv IHNvLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmg6CisgICAgICAgICog VUlQcm9jZXNzL2dsaWIvV2ViUHJvY2Vzc1Bvb2xHTGliLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 V2ViUHJvY2Vzc1Bvb2w6OnBsYXRmb3JtSW5pdGlhbGl6ZSk6CisgICAgICAgIChXZWJLaXQ6Oldl YlByb2Nlc3NQb29sOjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcm9jZXNzKToKKwogMjAxOS0wMi0y MyAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQg bmV3IG1hYyB0YXJnZXQgbnVtYmVycwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2ViUHJvY2Vzc1Bvb2wuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQ b29sLmgKaW5kZXggN2MxMWI3YjY5ZGMyOTNkYjMyNmUyN2VjMjc0MjY3MjNmYWIyMjUyMy4uNzEy MDZjZmY3N2FmZWVhMWQ5MGVjNzk0ZmQzYjc0N2M2MDIzNzJkZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5oCkBAIC0xMTUsNiArMTE1LDEyIEBAIGludCB3ZWJQcm9j ZXNzTGF0ZW5jeVFPUygpOwogaW50IHdlYlByb2Nlc3NUaHJvdWdocHV0UU9TKCk7CiAjZW5kaWYK IAorI2lmIFBMQVRGT1JNKEdUSykKK2NvbnN0IGJvb2wgYWx3YXlzVXNlc0NvbXBsZXhUZXh0Q29k ZVBhdGhEZWZhdWx0ID0gdHJ1ZTsKKyNlbHNlCitjb25zdCBib29sIGFsd2F5c1VzZXNDb21wbGV4 VGV4dENvZGVQYXRoRGVmYXVsdCA9IGZhbHNlOworI2VuZGlmCisKIGVudW0gY2xhc3MgUHJvY2Vz c1N3YXBSZXF1ZXN0ZWRCeUNsaWVudDsKIAogY2xhc3MgV2ViUHJvY2Vzc1Bvb2wgZmluYWwgOiBw dWJsaWMgQVBJOjpPYmplY3RJbXBsPEFQSTo6T2JqZWN0OjpUeXBlOjpQcm9jZXNzUG9vbD4sIHB1 YmxpYyBDYW5NYWtlV2Vha1B0cjxXZWJQcm9jZXNzUG9vbD4sIHByaXZhdGUgSVBDOjpNZXNzYWdl UmVjZWl2ZXIgewpAQCAtNjIzLDcgKzYyOSw3IEBAIHByaXZhdGU6CiAgICAgSGFzaFNldDxTdHJp bmc+IG1fc2NoZW1lc1NlcnZpY2VXb3JrZXJzQ2FuSGFuZGxlOwogICAgIEhhc2hTZXQ8U3RyaW5n PiBtX3NjaGVtZXNUb1JlZ2lzdGVyQXNDYW5EaXNwbGF5T25seUlmQ2FuUmVxdWVzdDsKIAotICAg IGJvb2wgbV9hbHdheXNVc2VzQ29tcGxleFRleHRDb2RlUGF0aCB7IGZhbHNlIH07CisgICAgYm9v bCBtX2Fsd2F5c1VzZXNDb21wbGV4VGV4dENvZGVQYXRoIHsgYWx3YXlzVXNlc0NvbXBsZXhUZXh0 Q29kZVBhdGhEZWZhdWx0IH07CiAgICAgYm9vbCBtX3Nob3VsZFVzZUZvbnRTbW9vdGhpbmcgeyB0 cnVlIH07CiAKICAgICBWZWN0b3I8U3RyaW5nPiBtX2ZvbnRXaGl0ZWxpc3Q7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9nbGliL1dlYlByb2Nlc3NQb29sR0xpYi5jcHAgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9nbGliL1dlYlByb2Nlc3NQb29sR0xpYi5jcHAKaW5kZXgg NjdmZTNkYjhhNWE1ODRlMDNhNWU4YjdhOGNmMWU0NDdhYTIxNTI1NC4uODUxYzkzN2VhODE0Yzk4 OGNmNTc4MzNlYThiMmNjNmE0MzlhYzU1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvZ2xpYi9XZWJQcm9jZXNzUG9vbEdMaWIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL2dsaWIvV2ViUHJvY2Vzc1Bvb2xHTGliLmNwcApAQCAtNzMsNiArNzMsOSBAQCBzdGF0 aWMgYm9vbCBtZW1vcnlQcmVzc3VyZU1vbml0b3JEaXNhYmxlZCgpCiAKIHZvaWQgV2ViUHJvY2Vz c1Bvb2w6OnBsYXRmb3JtSW5pdGlhbGl6ZSgpCiB7CisgICAgaWYgKGNvbnN0IGNoYXIqIGZvcmNl Q29tcGxleFRleHQgPSBnZXRlbnYoIldFQktJVF9GT1JDRV9DT01QTEVYX1RFWFQiKSkKKyAgICAg ICAgc2V0QWx3YXlzVXNlc0NvbXBsZXhUZXh0Q29kZVBhdGgoc3RyY21wKGZvcmNlQ29tcGxleFRl eHQsICIwIikpOworCiAjaWYgRU5BQkxFKFJFTU9URV9JTlNQRUNUT1IpCiAgICAgaWYgKGNvbnN0 IGNoYXIqIGFkZHJlc3MgPSBnX2dldGVudigiV0VCS0lUX0lOU1BFQ1RPUl9TRVJWRVIiKSkKICAg ICAgICAgaW5pdGlhbGl6ZVJlbW90ZUluc3BlY3RvclNlcnZlcihhZGRyZXNzKTsKQEAgLTk4LDE0 ICsxMDEsNiBAQCB2b2lkIFdlYlByb2Nlc3NQb29sOjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcm9j ZXNzKFdlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMmCiAgICAgcGFyYW1ldGVycy5tZW1vcnlD YWNoZURpc2FibGVkID0gbV9tZW1vcnlDYWNoZURpc2FibGVkIHx8IGNhY2hlTW9kZWwoKSA9PSBD YWNoZU1vZGVsOjpEb2N1bWVudFZpZXdlcjsKICAgICBwYXJhbWV0ZXJzLnByb3h5U2V0dGluZ3Mg PSBtX25ldHdvcmtQcm94eVNldHRpbmdzOwogCi0jaWYgUExBVEZPUk0oR1RLKQotICAgIC8vIFRo aXMgaXMgbWlzbmFtZWQuIEl0IGNhbiBvbmx5IGJlIHVzZWQgdG8gZGlzYWJsZSBjb21wbGV4IHRl eHQuCi0gICAgcGFyYW1ldGVycy5zaG91bGRBbHdheXNVc2VDb21wbGV4VGV4dENvZGVQYXRoID0g dHJ1ZTsKLSAgICBjb25zdCBjaGFyKiBmb3JjZUNvbXBsZXhUZXh0ID0gZ2V0ZW52KCJXRUJLSVRf Rk9SQ0VfQ09NUExFWF9URVhUIik7Ci0gICAgaWYgKGZvcmNlQ29tcGxleFRleHQgJiYgIXN0cmNt cChmb3JjZUNvbXBsZXhUZXh0LCAiMCIpKQotICAgICAgICBwYXJhbWV0ZXJzLnNob3VsZEFsd2F5 c1VzZUNvbXBsZXhUZXh0Q29kZVBhdGggPSBtX2Fsd2F5c1VzZXNDb21wbGV4VGV4dENvZGVQYXRo OwotI2VuZGlmCi0KICAgICBpZiAobWVtb3J5UHJlc3N1cmVNb25pdG9yRGlzYWJsZWQoKSkKICAg ICAgICAgcGFyYW1ldGVycy5zaG91bGRTdXBwcmVzc01lbW9yeVByZXNzdXJlSGFuZGxlciA9IHRy dWU7CiAK 362898 2019-02-25 06:31:24 -0800 2019-02-25 08:10:37 -0800 Patch bug-194614-20190225083124.patch text/plain 2701 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMjQyMDM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGU1Njg4NGJmNjFiNTUxMGQ5 YjdjODcyZGJjNDg1MjYwMTM5ODllOWMuLmU3Mjc0NjYzMjFmNjgyMTczZDQxMGNkZWYwNmU5ODI4 ZTIyYmJkYzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTktMDItMjUgIE1pY2hhZWwg Q2F0YW56YXJvICA8bWNhdGFuemFyb0BpZ2FsaWEuY29tPgorCisgICAgICAgIFtXUEVdW0dUS10g Q2xlYW4gdXAgaGFuZGxpbmcgb2YgV0VCS0lUX0ZPUkNFX0NPTVBMRVhfVEVYVAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk0NjE0CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBlbnZpcm9ubWVudCB2 YXJpYWJsZSBpcyBub3cgZW5hYmxlZCBmb3IgV1BFLCBub3QganVzdCBmb3IgR1RLLgorCisgICAg ICAgIEl0IGlzIG5vdyBwb3NzaWJsZSB0byB1c2UgdGhpcyBlbnZpcm9ubWVudCB2YXJpYWJsZSB0 byBlbmFibGUgY29tcGxleCB0ZXh0LCBub3QganVzdCB0bworICAgICAgICBkaXNhYmxlIGl0Lgor CisgICAgICAgIFdlYlByb2Nlc3NQb29sOjpzZXRBbHdheXNVc2VzQ29tcGxleFRleHRDb2RlUGF0 aCBpcyBmaXhlZCB0byBiZSByZXNwZWN0ZWQgZXZlbiB3aGVuIHRoaXMKKyAgICAgICAgZW52aXJv bm1lbnQgdmFyaWFibGUgaXMgc2V0LCBhbHRob3VnaCBXUEUgYW5kIEdUSyB3aWxsIG5ldmVyIGRv IHNvLgorCisgICAgICAgICogVUlQcm9jZXNzL2dsaWIvV2ViUHJvY2Vzc1Bvb2xHTGliLmNwcDoK KyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OnBsYXRmb3JtSW5pdGlhbGl6ZSk6Cisg ICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcm9j ZXNzKToKKwogMjAxOS0wMi0yNCAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAg ICAgICAgIEludHJvZHVjZSBDb250ZW50Q2hhbmdlT2JzZXJ2ZXIgY2xhc3MKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2dsaWIvV2ViUHJvY2Vzc1Bvb2xHTGliLmNwcCBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL2dsaWIvV2ViUHJvY2Vzc1Bvb2xHTGliLmNwcAppbmRleCAx YzY1YjNjMWMwNTI3ODMxYjVhMzU1YTEwYTRjOTAyNTQ5MmI1MDVmLi4yMDVmYTZiYWE1OTgwYzY2 ZWJjMTQzZTYxM2VmNDYwNjljMmRmMzFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9nbGliL1dlYlByb2Nlc3NQb29sR0xpYi5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvZ2xpYi9XZWJQcm9jZXNzUG9vbEdMaWIuY3BwCkBAIC03Myw2ICs3MywxMiBAQCBzdGF0 aWMgYm9vbCBtZW1vcnlQcmVzc3VyZU1vbml0b3JEaXNhYmxlZCgpCiAKIHZvaWQgV2ViUHJvY2Vz c1Bvb2w6OnBsYXRmb3JtSW5pdGlhbGl6ZSgpCiB7CisjaWYgUExBVEZPUk0oR1RLKQorICAgIG1f YWx3YXlzVXNlc0NvbXBsZXhUZXh0Q29kZVBhdGggPSB0cnVlOworI2VuZGlmCisgICAgaWYgKGNv bnN0IGNoYXIqIGZvcmNlQ29tcGxleFRleHQgPSBnZXRlbnYoIldFQktJVF9GT1JDRV9DT01QTEVY X1RFWFQiKSkKKyAgICAgICAgbV9hbHdheXNVc2VzQ29tcGxleFRleHRDb2RlUGF0aCA9ICFzdHJj bXAoZm9yY2VDb21wbGV4VGV4dCwgIjEiKTsKKwogI2lmIEVOQUJMRShSRU1PVEVfSU5TUEVDVE9S KQogICAgIGlmIChjb25zdCBjaGFyKiBhZGRyZXNzID0gZ19nZXRlbnYoIldFQktJVF9JTlNQRUNU T1JfU0VSVkVSIikpCiAgICAgICAgIGluaXRpYWxpemVSZW1vdGVJbnNwZWN0b3JTZXJ2ZXIoYWRk cmVzcyk7CkBAIC05NCwxNCArMTAwLDYgQEAgdm9pZCBXZWJQcm9jZXNzUG9vbDo6cGxhdGZvcm1J bml0aWFsaXplV2ViUHJvY2VzcyhXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzJgogICAgIHBh cmFtZXRlcnMubWVtb3J5Q2FjaGVEaXNhYmxlZCA9IG1fbWVtb3J5Q2FjaGVEaXNhYmxlZCB8fCBj YWNoZU1vZGVsKCkgPT0gQ2FjaGVNb2RlbDo6RG9jdW1lbnRWaWV3ZXI7CiAgICAgcGFyYW1ldGVy cy5wcm94eVNldHRpbmdzID0gbV9uZXR3b3JrUHJveHlTZXR0aW5nczsKIAotI2lmIFBMQVRGT1JN KEdUSykKLSAgICAvLyBUaGlzIGlzIG1pc25hbWVkLiBJdCBjYW4gb25seSBiZSB1c2VkIHRvIGRp c2FibGUgY29tcGxleCB0ZXh0LgotICAgIHBhcmFtZXRlcnMuc2hvdWxkQWx3YXlzVXNlQ29tcGxl eFRleHRDb2RlUGF0aCA9IHRydWU7Ci0gICAgY29uc3QgY2hhciogZm9yY2VDb21wbGV4VGV4dCA9 IGdldGVudigiV0VCS0lUX0ZPUkNFX0NPTVBMRVhfVEVYVCIpOwotICAgIGlmIChmb3JjZUNvbXBs ZXhUZXh0ICYmICFzdHJjbXAoZm9yY2VDb21wbGV4VGV4dCwgIjAiKSkKLSAgICAgICAgcGFyYW1l dGVycy5zaG91bGRBbHdheXNVc2VDb21wbGV4VGV4dENvZGVQYXRoID0gbV9hbHdheXNVc2VzQ29t cGxleFRleHRDb2RlUGF0aDsKLSNlbmRpZgotCiAgICAgaWYgKG1lbW9yeVByZXNzdXJlTW9uaXRv ckRpc2FibGVkKCkpCiAgICAgICAgIHBhcmFtZXRlcnMuc2hvdWxkU3VwcHJlc3NNZW1vcnlQcmVz c3VyZUhhbmRsZXIgPSB0cnVlOwogCg==