64099 2011-07-07 09:22:10 -0700 [Qt][WK2] Don't support ridiculous matrix of QT_NO_FEATURE combinations. 2011-07-07 10:43:44 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Qt, QtTriaged P2 Normal --- 1 kling kling benjamin oldest_to_newest 433501 0 kling 2011-07-07 09:22:10 -0700 We don't plan to support all the QT_NO_* build-time flags in the Qt/WebKit2 API, so let's prune them from the code. 433503 1 99995 kling 2011-07-07 09:23:12 -0700 Created attachment 99995 Proposed patch 433534 2 99995 benjamin 2011-07-07 09:50:38 -0700 Comment on attachment 99995 Proposed patch Good 433587 3 99995 kling 2011-07-07 10:43:36 -0700 Comment on attachment 99995 Proposed patch Clearing flags on attachment: 99995 Committed r90577: <http://trac.webkit.org/changeset/90577> 433588 4 kling 2011-07-07 10:43:44 -0700 All reviewed patches have been landed. Closing bug. 99995 2011-07-07 09:23:12 -0700 2011-07-07 10:43:36 -0700 Proposed patch bug-64099.diff text/plain 15267 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAyODNjMWQ4Li5jZmNjYmFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzcg QEAKIDIwMTEtMDctMDcgIEFuZHJlYXMgS2xpbmcgIDxrbGluZ0B3ZWJraXQub3JnPgogCisgICAg ICAgIFtRdF1bV0syXSBEb24ndCBzdXBwb3J0IHJpZGljdWxvdXMgbWF0cml4IG9mIFFUX05PX0ZF QVRVUkUgY29tYmluYXRpb25zLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NjQwOTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFNoYXJlZC9xdC9XZWJFdmVudEZhY3RvcnlRdC5jcHA6CisgICAgICAgIChX ZWJLaXQ6OldlYkV2ZW50RmFjdG9yeTo6Y3JlYXRlV2ViV2hlZWxFdmVudCk6CisgICAgICAgICog VUlQcm9jZXNzL0FQSS9xdC9xZGVza3RvcHdlYnZpZXdfcC5oOgorICAgICAgICAqIFVJUHJvY2Vz cy9xdC9RdFdlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChRdFdlYlBhZ2VQcm94eTo6UXRXZWJQ YWdlUHJveHkpOgorICAgICAgICAoUXRXZWJQYWdlUHJveHk6OnNldEN1cnNvcik6CisgICAgICAg IChRdFdlYlBhZ2VQcm94eTo6cmVnaXN0ZXJFZGl0Q29tbWFuZCk6CisgICAgICAgIChRdFdlYlBh Z2VQcm94eTo6Y2xlYXJBbGxFZGl0Q29tbWFuZHMpOgorICAgICAgICAoUXRXZWJQYWdlUHJveHk6 OmNhblVuZG9SZWRvKToKKyAgICAgICAgKFF0V2ViUGFnZVByb3h5OjpleGVjdXRlVW5kb1JlZG8p OgorICAgICAgICAoUXRXZWJQYWdlUHJveHk6OnVwZGF0ZUFjdGlvbik6CisgICAgICAgIChRdFdl YlBhZ2VQcm94eTo6d2ViQWN0aW9uVHJpZ2dlcmVkKToKKyAgICAgICAgKFF0V2ViUGFnZVByb3h5 Ojp0cmlnZ2VyQWN0aW9uKToKKyAgICAgICAgKFF0V2ViUGFnZVByb3h5OjphY3Rpb24pOgorICAg ICAgICAqIFVJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQcm94eS5oOgorICAgICAgICAqIFVJUHJvY2Vz cy9xdC9Ub3VjaFZpZXdJbnRlcmZhY2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpUb3VjaFZpZXdJ bnRlcmZhY2U6OmRpZENoYW5nZUN1cnNvcik6CisgICAgICAgICogVUlQcm9jZXNzL3F0L1RvdWNo Vmlld0ludGVyZmFjZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9xdC9WaWV3SW50ZXJmYWNlLmg6 CisgICAgICAgICogVUlQcm9jZXNzL3F0L1dlYlVuZG9Db21tYW5kUXQuY3BwOgorICAgICAgICAo V2ViVW5kb0NvbW1hbmRRdDo6V2ViVW5kb0NvbW1hbmRRdCk6CisgICAgICAgICogVUlQcm9jZXNz L3F0L1dlYlVuZG9Db21tYW5kUXQuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBw b3J0L3F0L1dlYkRyYWdDbGllbnRRdC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkRyYWdDbGll bnQ6OnN0YXJ0RHJhZyk6CisKKzIwMTEtMDctMDcgIEFuZHJlYXMgS2xpbmcgIDxrbGluZ0B3ZWJr aXQub3JnPgorCiAgICAgICAgIFtRdF1bV0syXSBWaWV3cyBzaG91bGQga25vdyBhYm91dCBXZWJQ cm9jZXNzIGNyYXNoL3JlbGF1bmNoLgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NjQwOTMKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVk L3F0L1dlYkV2ZW50RmFjdG9yeVF0LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9xdC9XZWJF dmVudEZhY3RvcnlRdC5jcHAKaW5kZXggNjVjODM1OS4uYmVmNGIzMSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvU2hhcmVkL3F0L1dlYkV2ZW50RmFjdG9yeVF0LmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvcXQvV2ViRXZlbnRGYWN0b3J5UXQuY3BwCkBAIC0xMzUsMTAgKzEzNSw4 IEBAIFdlYldoZWVsRXZlbnQgV2ViRXZlbnRGYWN0b3J5OjpjcmVhdGVXZWJXaGVlbEV2ZW50KFFH cmFwaGljc1NjZW5lV2hlZWxFdmVudCogZSkKICAgICAvLyBVc2UgdGhlIHNhbWUgc2luZ2xlIHNj cm9sbCBzdGVwIGFzIFFUZXh0RWRpdAogICAgIC8vIChpbiBRVGV4dEVkaXRQcml2YXRlOjppbml0 IFtoLHZdYmFyLT5zZXRTaW5nbGVTdGVwKQogICAgIHN0YXRpYyBjb25zdCBmbG9hdCBjRGVmYXVs dFF0U2Nyb2xsU3RlcCA9IDIwLmY7Ci0jaWZuZGVmIFFUX05PX1dIRUVMRVZFTlQKICAgICBkZWx0 YVggKj0gKGZ1bGxUaWNrKSA/IFFBcHBsaWNhdGlvbjo6d2hlZWxTY3JvbGxMaW5lcygpICogY0Rl ZmF1bHRRdFNjcm9sbFN0ZXAgOiAxOwogICAgIGRlbHRhWSAqPSAoZnVsbFRpY2spID8gUUFwcGxp Y2F0aW9uOjp3aGVlbFNjcm9sbExpbmVzKCkgKiBjRGVmYXVsdFF0U2Nyb2xsU3RlcCA6IDE7Ci0j ZW5kaWYKIAogICAgIHJldHVybiBXZWJXaGVlbEV2ZW50KFdlYkV2ZW50OjpXaGVlbCwgZS0+cG9z KCkudG9Qb2ludCgpLCBlLT5zY3JlZW5Qb3MoKSwgRmxvYXRTaXplKGRlbHRhWCwgZGVsdGFZKSwg RmxvYXRTaXplKHdoZWVsVGlja3NYLCB3aGVlbFRpY2tzWSksIGdyYW51bGFyaXR5LCBtb2RpZmll cnMsIHRpbWVzdGFtcCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL3F0L3FkZXNrdG9wd2Vidmlld19wLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L3F0L3FkZXNrdG9wd2Vidmlld19wLmgKaW5kZXggNzU3NWEyNi4uYzFmMDBlMyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xZGVza3RvcHdlYnZpZXdfcC5oCisr KyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcWRlc2t0b3B3ZWJ2aWV3X3AuaApA QCAtNTUsOSArNTUsNyBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9pZCBkaWRDaGFuZ2VUaXRs ZShjb25zdCBRU3RyaW5nJik7CiAgICAgdmlydHVhbCB2b2lkIGRpZENoYW5nZVRvb2xUaXAoY29u c3QgUVN0cmluZyYpOwogICAgIHZpcnR1YWwgdm9pZCBkaWRDaGFuZ2VTdGF0dXNUZXh0KGNvbnN0 IFFTdHJpbmcmKTsKLSNpZm5kZWYgUVRfTk9fQ1VSU09SCiAgICAgdmlydHVhbCB2b2lkIGRpZENo YW5nZUN1cnNvcihjb25zdCBRQ3Vyc29yJik7Ci0jZW5kaWYKICAgICB2aXJ0dWFsIHZvaWQgbG9h ZERpZEJlZ2luKCk7CiAgICAgdmlydHVhbCB2b2lkIGxvYWREaWRTdWNjZWVkKCk7CiAgICAgdmly dHVhbCB2b2lkIGRpZENoYW5nZUxvYWRQcm9ncmVzcyhpbnQpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQcm94eS5jcHAKaW5kZXggNmU4NDAxZC4uOTU2MmJhNiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZVByb3h5LmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuY3BwCkBA IC0xMjQsOSArMTI0LDcgQEAgUXRXZWJQYWdlUHJveHk6OlF0V2ViUGFnZVByb3h5KFZpZXdJbnRl cmZhY2UqIHZpZXdJbnRlcmZhY2UsIFFXS0NvbnRleHQqIGMsIFdLUGEKICAgICAsIG1fY29udGV4 dChjKQogICAgICwgbV9wcmVmZXJlbmNlcygwKQogICAgICwgbV9jcmVhdGVOZXdQYWdlRm4oMCkK LSNpZm5kZWYgUVRfTk9fVU5ET1NUQUNLCiAgICAgLCBtX3VuZG9TdGFjayhhZG9wdFB0cihuZXcg UVVuZG9TdGFjayh0aGlzKSkpCi0jZW5kaWYKIHsKICAgICBBU1NFUlQodmlld0ludGVyZmFjZSk7 CiAgICAgbWVtc2V0KG1fYWN0aW9ucywgMCwgc2l6ZW9mKG1fYWN0aW9ucykpOwpAQCAtMjYzLDkg KzI2MSw3IEBAIGJvb2wgUXRXZWJQYWdlUHJveHk6OmhhbmRsZUZvY3VzT3V0RXZlbnQoUUZvY3Vz RXZlbnQqKQogCiB2b2lkIFF0V2ViUGFnZVByb3h5OjpzZXRDdXJzb3IoY29uc3QgV2ViQ29yZTo6 Q3Vyc29yJiBjdXJzb3IpCiB7Ci0jaWZuZGVmIFFUX05PX0NVUlNPUgogICAgIG1fdmlld0ludGVy ZmFjZS0+ZGlkQ2hhbmdlQ3Vyc29yKCpjdXJzb3IucGxhdGZvcm1DdXJzb3IoKSk7Ci0jZW5kaWYK IH0KIAogdm9pZCBRdFdlYlBhZ2VQcm94eTo6c2V0Vmlld05lZWRzRGlzcGxheShjb25zdCBXZWJD b3JlOjpJbnRSZWN0JiByZWN0KQpAQCAtMzM2LDQyICszMzIsMzIgQEAgdm9pZCBRdFdlYlBhZ2VQ cm94eTo6dG9vbFRpcENoYW5nZWQoY29uc3QgU3RyaW5nJiwgY29uc3QgU3RyaW5nJiBuZXdUb29s dGlwKQogCiB2b2lkIFF0V2ViUGFnZVByb3h5OjpyZWdpc3RlckVkaXRDb21tYW5kKFBhc3NSZWZQ dHI8V2ViRWRpdENvbW1hbmRQcm94eT4gY29tbWFuZCwgV2ViUGFnZVByb3h5OjpVbmRvT3JSZWRv IHVuZG9PclJlZG8pCiB7Ci0jaWZuZGVmIFFUX05PX1VORE9TVEFDSwogICAgIGlmICh1bmRvT3JS ZWRvID09IFdlYlBhZ2VQcm94eTo6VW5kbykgewogICAgICAgICBjb25zdCBXZWJVbmRvQ29tbWFu ZFF0KiB3ZWJVbmRvQ29tbWFuZCA9IHN0YXRpY19jYXN0PGNvbnN0IFdlYlVuZG9Db21tYW5kUXQq PihtX3VuZG9TdGFjay0+Y29tbWFuZChtX3VuZG9TdGFjay0+aW5kZXgoKSkpOwogICAgICAgICBp ZiAod2ViVW5kb0NvbW1hbmQgJiYgd2ViVW5kb0NvbW1hbmQtPmluVW5kb1JlZG8oKSkKICAgICAg ICAgICAgIHJldHVybjsKICAgICAgICAgbV91bmRvU3RhY2stPnB1c2gobmV3IFdlYlVuZG9Db21t YW5kUXQoY29tbWFuZCkpOwogICAgIH0KLSNlbmRpZgogfQogCiB2b2lkIFF0V2ViUGFnZVByb3h5 OjpjbGVhckFsbEVkaXRDb21tYW5kcygpCiB7Ci0jaWZuZGVmIFFUX05PX1VORE9TVEFDSwogICAg IG1fdW5kb1N0YWNrLT5jbGVhcigpOwotI2VuZGlmCiB9CiAKIGJvb2wgUXRXZWJQYWdlUHJveHk6 OmNhblVuZG9SZWRvKFdlYlBhZ2VQcm94eTo6VW5kb09yUmVkbyB1bmRvT3JSZWRvKQogewotI2lm ZGVmIFFUX05PX1VORE9TVEFDSwotICAgIHJldHVybiBmYWxzZTsKLSNlbHNlCiAgICAgaWYgKHVu ZG9PclJlZG8gPT0gV2ViUGFnZVByb3h5OjpVbmRvKQogICAgICAgICByZXR1cm4gbV91bmRvU3Rh Y2stPmNhblVuZG8oKTsKICAgICByZXR1cm4gbV91bmRvU3RhY2stPmNhblJlZG8oKTsKLSNlbmRp ZgogfQogCiB2b2lkIFF0V2ViUGFnZVByb3h5OjpleGVjdXRlVW5kb1JlZG8oV2ViUGFnZVByb3h5 OjpVbmRvT3JSZWRvIHVuZG9PclJlZG8pCiB7Ci0jaWZuZGVmIFFUX05PX1VORE9TVEFDSwogICAg IGlmICh1bmRvT3JSZWRvID09IFdlYlBhZ2VQcm94eTo6VW5kbykKICAgICAgICAgbV91bmRvU3Rh Y2stPnVuZG8oKTsKICAgICBlbHNlCiAgICAgICAgIG1fdW5kb1N0YWNrLT5yZWRvKCk7Ci0jZW5k aWYKIH0KIAogRmxvYXRSZWN0IFF0V2ViUGFnZVByb3h5Ojpjb252ZXJ0VG9EZXZpY2VTcGFjZShj b25zdCBGbG9hdFJlY3QmIHJlY3QpCkBAIC00ODUsOSArNDcxLDYgQEAgdm9pZCBRdFdlYlBhZ2VQ cm94eTo6cGFpbnQoUVBhaW50ZXIqIHBhaW50ZXIsIFFSZWN0IGFyZWEpCiAKIHZvaWQgUXRXZWJQ YWdlUHJveHk6OnVwZGF0ZUFjdGlvbihRdFdlYlBhZ2VQcm94eTo6V2ViQWN0aW9uIGFjdGlvbikK IHsKLSNpZmRlZiBRVF9OT19BQ1RJT04KLSAgICBRX1VOVVNFRChhY3Rpb24pCi0jZWxzZQogICAg IFFBY3Rpb24qIGEgPSBtX2FjdGlvbnNbYWN0aW9uXTsKICAgICBpZiAoIWEpCiAgICAgICAgIHJl dHVybjsKQEAgLTUyMCw3ICs1MDMsNiBAQCB2b2lkIFF0V2ViUGFnZVByb3h5Ojp1cGRhdGVBY3Rp b24oUXRXZWJQYWdlUHJveHk6OldlYkFjdGlvbiBhY3Rpb24pCiAKICAgICBpZiAoYS0+aXNDaGVj a2FibGUoKSkKICAgICAgICAgYS0+c2V0Q2hlY2tlZChjaGVja2VkKTsKLSNlbmRpZiAvLyBRVF9O T19BQ1RJT04KIH0KIAogdm9pZCBRdFdlYlBhZ2VQcm94eTo6dXBkYXRlTmF2aWdhdGlvbkFjdGlv bnMoKQpAQCAtNTMxLDcgKzUxMyw2IEBAIHZvaWQgUXRXZWJQYWdlUHJveHk6OnVwZGF0ZU5hdmln YXRpb25BY3Rpb25zKCkKICAgICB1cGRhdGVBY3Rpb24oUXRXZWJQYWdlUHJveHk6OlJlbG9hZCk7 CiB9CiAKLSNpZm5kZWYgUVRfTk9fQUNUSU9OCiB2b2lkIFF0V2ViUGFnZVByb3h5Ojp3ZWJBY3Rp b25UcmlnZ2VyZWQoYm9vbCBjaGVja2VkKQogewogICAgIFFBY3Rpb24qIGEgPSBxb2JqZWN0X2Nh c3Q8UUFjdGlvbio+KHNlbmRlcigpKTsKQEAgLTU0MCw3ICs1MjEsNiBAQCB2b2lkIFF0V2ViUGFn ZVByb3h5Ojp3ZWJBY3Rpb25UcmlnZ2VyZWQoYm9vbCBjaGVja2VkKQogICAgIFF0V2ViUGFnZVBy b3h5OjpXZWJBY3Rpb24gYWN0aW9uID0gc3RhdGljX2Nhc3Q8UXRXZWJQYWdlUHJveHk6OldlYkFj dGlvbj4oYS0+ZGF0YSgpLnRvSW50KCkpOwogICAgIHRyaWdnZXJBY3Rpb24oYWN0aW9uLCBjaGVj a2VkKTsKIH0KLSNlbmRpZiAvLyBRVF9OT19BQ1RJT04KIAogdm9pZCBRdFdlYlBhZ2VQcm94eTo6 ZGlkUmVsYXVuY2hQcm9jZXNzKCkKIHsKQEAgLTY0Niw3ICs2MjYsNiBAQCB2b2lkIFF0V2ViUGFn ZVByb3h5OjpzZXRSZXNpemVzVG9Db250ZW50c1VzaW5nTGF5b3V0U2l6ZShjb25zdCBRU2l6ZSYg dGFyZ2V0TGF5bwogI2VuZGlmCiB9CiAKLSNpZm5kZWYgUVRfTk9fQUNUSU9OCiB2b2lkIFF0V2Vi UGFnZVByb3h5Ojp0cmlnZ2VyQWN0aW9uKFdlYkFjdGlvbiB3ZWJBY3Rpb24sIGJvb2wpCiB7CiAg ICAgc3dpdGNoICh3ZWJBY3Rpb24pIHsKQEAgLTY3MCw5ICs2NDksNyBAQCB2b2lkIFF0V2ViUGFn ZVByb3h5Ojp0cmlnZ2VyQWN0aW9uKFdlYkFjdGlvbiB3ZWJBY3Rpb24sIGJvb2wpCiAgICAgV2Vi S2l0OjpXZWJDb250ZXh0TWVudUl0ZW1EYXRhIG1lbnVJdGVtRGF0YShBY3Rpb25UeXBlLCBjb250 ZXh0TWVudUFjdGlvbkZvcldlYkFjdGlvbih3ZWJBY3Rpb24pLCBxdEFjdGlvbi0+dGV4dCgpLCBx dEFjdGlvbi0+aXNFbmFibGVkKCksIHF0QWN0aW9uLT5pc0NoZWNrZWQoKSk7CiAgICAgbV93ZWJQ YWdlUHJveHktPmNvbnRleHRNZW51SXRlbVNlbGVjdGVkKG1lbnVJdGVtRGF0YSk7CiB9Ci0jZW5k aWYgLy8gUVRfTk9fQUNUSU9OCiAKLSNpZm5kZWYgUVRfTk9fQUNUSU9OCiBRQWN0aW9uKiBRdFdl YlBhZ2VQcm94eTo6YWN0aW9uKFdlYkFjdGlvbiBhY3Rpb24pIGNvbnN0CiB7CiAgICAgaWYgKGFj dGlvbiA9PSBRdFdlYlBhZ2VQcm94eTo6Tm9XZWJBY3Rpb24gfHwgYWN0aW9uID49IFdlYkFjdGlv bkNvdW50KQpAQCAtNzI4LDcgKzcwNSw2IEBAIFFBY3Rpb24qIFF0V2ViUGFnZVByb3h5OjphY3Rp b24oV2ViQWN0aW9uIGFjdGlvbikgY29uc3QKICAgICBjYXNlIFNlbGVjdEFsbDoKICAgICAgICAg dGV4dCA9IGNvbnRleHRNZW51SXRlbVRhZ1NlbGVjdEFsbCgpOwogICAgICAgICBicmVhazsKLSNp Zm5kZWYgUVRfTk9fVU5ET1NUQUNLCiAgICAgY2FzZSBVbmRvOiB7CiAgICAgICAgIFFBY3Rpb24q IHVuZG9BY3Rpb24gPSBtX3VuZG9TdGFjay0+Y3JlYXRlVW5kb0FjdGlvbihtdXRhYmxlU2VsZik7 CiAgICAgICAgIG1fYWN0aW9uc1thY3Rpb25dID0gdW5kb0FjdGlvbjsKQEAgLTczOSw3ICs3MTUs NiBAQCBRQWN0aW9uKiBRdFdlYlBhZ2VQcm94eTo6YWN0aW9uKFdlYkFjdGlvbiBhY3Rpb24pIGNv bnN0CiAgICAgICAgIG1fYWN0aW9uc1thY3Rpb25dID0gcmVkb0FjdGlvbjsKICAgICAgICAgcmV0 dXJuIHJlZG9BY3Rpb247CiAgICAgfQotI2VuZGlmCiAgICAgZGVmYXVsdDoKICAgICAgICAgcmV0 dXJuIDA7CiAgICAgICAgIGJyZWFrOwpAQCAtNzYwLDcgKzczNSw2IEBAIFFBY3Rpb24qIFF0V2Vi UGFnZVByb3h5OjphY3Rpb24oV2ViQWN0aW9uIGFjdGlvbikgY29uc3QKICAgICBtdXRhYmxlU2Vs Zi0+dXBkYXRlQWN0aW9uKGFjdGlvbik7CiAgICAgcmV0dXJuIGE7CiB9Ci0jZW5kaWYgLy8gUVRf Tk9fQUNUSU9OCiAKIHZvaWQgUXRXZWJQYWdlUHJveHk6OmZpbmRab29tYWJsZUFyZWFGb3JQb2lu dChjb25zdCBRUG9pbnQmIHBvaW50KQogewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL3F0L1F0V2ViUGFnZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQv UXRXZWJQYWdlUHJveHkuaAppbmRleCA4NmI2YWQ2Li4yMzJlMDRmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuaApAQCAtMjIxLDkgKzIyMSw3IEBAIHBy aXZhdGU6CiAKICAgICBDcmVhdGVOZXdQYWdlRm4gbV9jcmVhdGVOZXdQYWdlRm47CiAKLSNpZm5k ZWYgUVRfTk9fVU5ET1NUQUNLCiAgICAgT3duUHRyPFFVbmRvU3RhY2s+IG1fdW5kb1N0YWNrOwot I2VuZGlmCiB9OwogCiAjZW5kaWYgLyogUXRXZWJQYWdlUHJveHlfaCAqLwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1RvdWNoVmlld0ludGVyZmFjZS5jcHAgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvVG91Y2hWaWV3SW50ZXJmYWNlLmNwcAppbmRleCA2NjMy N2JjLi41M2I0MjlmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvVG91 Y2hWaWV3SW50ZXJmYWNlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvVG91 Y2hWaWV3SW50ZXJmYWNlLmNwcApAQCAtODgsMTIgKzg4LDEwIEBAIHZvaWQgVG91Y2hWaWV3SW50 ZXJmYWNlOjpkaWRDaGFuZ2VTdGF0dXNUZXh0KGNvbnN0IFFTdHJpbmcmKQogICAgIC8vIFRoZXJl IGlzIG5vdCB5ZXQgYW55IFVJIGRlZmluZWQgZm9yIHN0YXR1cyB0ZXh0IHNvIHdlIGlnbm9yZSB0 aGUgY2FsbC4KIH0KIAotI2lmbmRlZiBRVF9OT19DVVJTT1IKIHZvaWQgVG91Y2hWaWV3SW50ZXJm YWNlOjpkaWRDaGFuZ2VDdXJzb3IoY29uc3QgUUN1cnNvciYpCiB7CiAgICAgLy8gVGhlIGN1cnNv ciBpcyBub3QgdmlzaWJsZSBvbiBtb2JpbGUsIGp1c3QgaWdub3JlIHRoaXMgbWVzc2FnZS4KIH0K LSNlbmRpZgogCiB2b2lkIFRvdWNoVmlld0ludGVyZmFjZTo6bG9hZERpZEJlZ2luKCkKIHsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9Ub3VjaFZpZXdJbnRlcmZhY2Uu aCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9Ub3VjaFZpZXdJbnRlcmZhY2UuaAppbmRl eCA4NDI2NDg3Li43MmEyOTZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv cXQvVG91Y2hWaWV3SW50ZXJmYWNlLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0 L1RvdWNoVmlld0ludGVyZmFjZS5oCkBAIC01MSw5ICs1MSw3IEBAIHByaXZhdGU6CiAgICAgdmly dHVhbCB2b2lkIGRpZENoYW5nZVRpdGxlKGNvbnN0IFFTdHJpbmcmKTsKICAgICB2aXJ0dWFsIHZv aWQgZGlkQ2hhbmdlVG9vbFRpcChjb25zdCBRU3RyaW5nJik7CiAgICAgdmlydHVhbCB2b2lkIGRp ZENoYW5nZVN0YXR1c1RleHQoY29uc3QgUVN0cmluZyYpOwotI2lmbmRlZiBRVF9OT19DVVJTT1IK ICAgICB2aXJ0dWFsIHZvaWQgZGlkQ2hhbmdlQ3Vyc29yKGNvbnN0IFFDdXJzb3ImKTsKLSNlbmRp ZgogICAgIHZpcnR1YWwgdm9pZCBsb2FkRGlkQmVnaW4oKTsKICAgICB2aXJ0dWFsIHZvaWQgbG9h ZERpZFN1Y2NlZWQoKTsKICAgICB2aXJ0dWFsIHZvaWQgZGlkQ2hhbmdlTG9hZFByb2dyZXNzKGlu dCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvVmlld0ludGVyZmFj ZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1ZpZXdJbnRlcmZhY2UuaAppbmRleCAx YjM5MTdmLi4wZmQ4OWY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQv Vmlld0ludGVyZmFjZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9WaWV3SW50 ZXJmYWNlLmgKQEAgLTU2LDkgKzU2LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBkaWRD aGFuZ2VUaXRsZShjb25zdCBRU3RyaW5nJikgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBkaWRDaGFu Z2VUb29sVGlwKGNvbnN0IFFTdHJpbmcmKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGRpZENoYW5n ZVN0YXR1c1RleHQoY29uc3QgUVN0cmluZyYpID0gMDsKLSNpZm5kZWYgUVRfTk9fQ1VSU09SCiAg ICAgdmlydHVhbCB2b2lkIGRpZENoYW5nZUN1cnNvcihjb25zdCBRQ3Vyc29yJikgPSAwOwotI2Vu ZGlmCiAgICAgdmlydHVhbCB2b2lkIGxvYWREaWRCZWdpbigpID0gMDsKICAgICB2aXJ0dWFsIHZv aWQgbG9hZERpZFN1Y2NlZWQoKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGRpZENoYW5nZUxvYWRQ cm9ncmVzcyhpbnQpID0gMDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9x dC9XZWJVbmRvQ29tbWFuZFF0LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9XZWJV bmRvQ29tbWFuZFF0LmNwcAppbmRleCAyYTNkOTUxLi5iODZkZGFmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvV2ViVW5kb0NvbW1hbmRRdC5jcHAKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL3F0L1dlYlVuZG9Db21tYW5kUXQuY3BwCkBAIC0yMyw3ICsyMyw2 IEBACiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAKLSNpZm5kZWYgUVRfTk9fVU5ET0NPTU1B TkQKIFdlYlVuZG9Db21tYW5kUXQ6OldlYlVuZG9Db21tYW5kUXQoUGFzc1JlZlB0cjxXZWJFZGl0 Q29tbWFuZFByb3h5PiBjb21tYW5kLCBRVW5kb0NvbW1hbmQqIHBhcmVudCkKICAgICA6IFFVbmRv Q29tbWFuZChwYXJlbnQpCiAgICAgLCBtX2NvbW1hbmQoY29tbWFuZCkKQEAgLTMxLDE0ICszMCw2 IEBAIFdlYlVuZG9Db21tYW5kUXQ6OldlYlVuZG9Db21tYW5kUXQoUGFzc1JlZlB0cjxXZWJFZGl0 Q29tbWFuZFByb3h5PiBjb21tYW5kLCBRVW5kCiAgICAgLCBtX2luVW5kb1JlZG8oZmFsc2UpCiB7 CiB9Ci0jZWxzZQotV2ViVW5kb0NvbW1hbmRRdDo6V2ViVW5kb0NvbW1hbmRRdChQYXNzUmVmUHRy PFdlYkVkaXRDb21tYW5kUHJveHk+IGNvbW1hbmQpCi0gICAgOiBtX2NvbW1hbmQoY29tbWFuZCkK LSAgICAsIG1fZmlyc3QodHJ1ZSkKLSAgICAsIG1faW5VbmRvUmVkbyhmYWxzZSkKLXsKLX0KLSNl bmRpZgogCiBXZWJVbmRvQ29tbWFuZFF0Ojp+V2ViVW5kb0NvbW1hbmRRdCgpCiB7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvV2ViVW5kb0NvbW1hbmRRdC5oIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1dlYlVuZG9Db21tYW5kUXQuaAppbmRleCAxYjI5YmI1 Li5jMTZhNmVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvV2ViVW5k b0NvbW1hbmRRdC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9XZWJVbmRvQ29t bWFuZFF0LmgKQEAgLTI2LDE3ICsyNiw5IEBACiAjaW5jbHVkZSA8cWdsb2JhbC5oPgogI2luY2x1 ZGUgPHd0Zi9SZWZQdHIuaD4KIAotY2xhc3MgV2ViVW5kb0NvbW1hbmRRdAotI2lmbmRlZiBRVF9O T19VTkRPQ09NTUFORAotICAgIDogcHVibGljIFFVbmRvQ29tbWFuZAotI2VuZGlmCi17CitjbGFz cyBXZWJVbmRvQ29tbWFuZFF0IDogcHVibGljIFFVbmRvQ29tbWFuZCB7CiBwdWJsaWM6Ci0jaWZu ZGVmIFFUX05PX1VORE9DT01NQU5ECiAgICAgV2ViVW5kb0NvbW1hbmRRdChQYXNzUmVmUHRyPFdl YktpdDo6V2ViRWRpdENvbW1hbmRQcm94eT4sIFFVbmRvQ29tbWFuZCogcGFyZW50ID0gMCk7Ci0j ZWxzZQotICAgIFdlYlVuZG9Db21tYW5kUXQoUGFzc1JlZlB0cjxXZWJLaXQ6OldlYkVkaXRDb21t YW5kUHJveHk+KTsKLSNlbmRpZgogICAgIH5XZWJVbmRvQ29tbWFuZFF0KCk7CiAKICAgICB2b2lk IHJlZG8oKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1 cHBvcnQvcXQvV2ViRHJhZ0NsaWVudFF0LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViQ29yZVN1cHBvcnQvcXQvV2ViRHJhZ0NsaWVudFF0LmNwcAppbmRleCA4MjY1MTFjLi4wMmI3 MmNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0 L3F0L1dlYkRyYWdDbGllbnRRdC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJDb3JlU3VwcG9ydC9xdC9XZWJEcmFnQ2xpZW50UXQuY3BwCkBAIC01NCw3ICs1NCw2IEBAIHN0 YXRpYyBQYXNzUmVmUHRyPFNoYXJlYWJsZUJpdG1hcD4gY29udmVydFFQaXhtYXBUb1NoYXJlYWJs ZUJpdG1hcChRUGl4bWFwKiBwaXhtCiAKIHZvaWQgV2ViRHJhZ0NsaWVudDo6c3RhcnREcmFnKERy YWdJbWFnZVJlZiBkcmFnSW1hZ2UsIGNvbnN0IEludFBvaW50JiBjbGllbnRQb3NpdGlvbiwgY29u c3QgSW50UG9pbnQmIGdsb2JhbFBvc2l0aW9uLCBDbGlwYm9hcmQqIGNsaXBib2FyZCwgRnJhbWUq LCBib29sKQogewotI2lmbmRlZiBRVF9OT19EUkFHQU5ERFJPUAogICAgIFFNaW1lRGF0YSogY2xp cGJvYXJkRGF0YSA9IHN0YXRpY19jYXN0PENsaXBib2FyZFF0Kj4oY2xpcGJvYXJkKS0+Y2xpcGJv YXJkRGF0YSgpOwogICAgIERyYWdPcGVyYXRpb24gZHJhZ09wZXJhdGlvbk1hc2sgPSBjbGlwYm9h cmQtPnNvdXJjZU9wZXJhdGlvbigpOwogICAgIHN0YXRpY19jYXN0PENsaXBib2FyZFF0Kj4oY2xp cGJvYXJkKS0+aW52YWxpZGF0ZVdyaXRhYmxlRGF0YSgpOwpAQCAtNjYsMTIgKzY1LDYgQEAgdm9p ZCBXZWJEcmFnQ2xpZW50OjpzdGFydERyYWcoRHJhZ0ltYWdlUmVmIGRyYWdJbWFnZSwgY29uc3Qg SW50UG9pbnQmIGNsaWVudFBvc2kKICAgICAgICAgcmV0dXJuOwogCiAgICAgbV9wYWdlLT5zZW5k KE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlN0YXJ0RHJhZyhkcmFnRGF0YSwgaGFuZGxlKSk7Ci0j ZWxzZQotICAgIFFfVU5VU0VEKGRyYWdJbWFnZSkKLSAgICBRX1VOVVNFRChjbGllbnRQb3NpdGlv bikKLSAgICBRX1VOVVNFRChnbG9iYWxQb3NpdGlvbikKLSAgICBRX1VOVVNFRChjbGlwYm9hcmQp Ci0jZW5kaWYKIH0KIAogfQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hh bmdlTG9nCmluZGV4IGE5NDUyMTcuLjI1MDVkMmUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxv ZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMS0wNy0wNyAgQW5k cmVhcyBLbGluZyAgPGtsaW5nQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW1F0XVtXSzJdIERvbid0 IHN1cHBvcnQgcmlkaWN1bG91cyBtYXRyaXggb2YgUVRfTk9fRkVBVFVSRSBjb21iaW5hdGlvbnMu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NDA5OQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogTWluaUJy b3dzZXIvcXQvQnJvd3NlcldpbmRvdy5jcHA6CisgICAgICAgIChCcm93c2VyV2luZG93OjpvcGVu RmlsZSk6CisgICAgICAgIChCcm93c2VyV2luZG93OjpzY3JlZW5zaG90KToKKyAgICAgICAgKEJy b3dzZXJXaW5kb3c6OmxvYWRVUkxMaXN0RnJvbUZpbGUpOgorCiAyMDExLTA3LTA3ICBDYXJsb3Mg R2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBPcGVu IGxpbmtzIGluIGEgbmV3IHdpbmRvdyB3aGVuIGNsaWNraW5nIHdpdGggdGhlIG1pZGRsZSBidXR0 b24gaW4gTWluaUJyb3dzZXIKZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL3F0L0Jyb3dz ZXJXaW5kb3cuY3BwIGIvVG9vbHMvTWluaUJyb3dzZXIvcXQvQnJvd3NlcldpbmRvdy5jcHAKaW5k ZXggZjJhNzllMi4uMTYzYTkwOSAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvcXQvQnJv d3NlcldpbmRvdy5jcHAKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvcXQvQnJvd3NlcldpbmRvdy5j cHAKQEAgLTIxNiw3ICsyMTYsNiBAQCB2b2lkIEJyb3dzZXJXaW5kb3c6OnVybENoYW5nZWQoY29u c3QgUVVybCYgdXJsKQogCiB2b2lkIEJyb3dzZXJXaW5kb3c6Om9wZW5GaWxlKCkKIHsKLSNpZm5k ZWYgUVRfTk9fRklMRURJQUxPRwogICAgIHN0YXRpYyBjb25zdCBRU3RyaW5nIGZpbHRlcigiSFRN TCBGaWxlcyAoKi5odG0gKi5odG1sICoueGh0bWwpOztUZXh0IEZpbGVzICgqLnR4dCk7O0ltYWdl IEZpbGVzICgqLmdpZiAqLmpwZyAqLnBuZyk7O1NWRyBGaWxlcyAoKi5zdmcpOztBbGwgRmlsZXMg KCopIik7CiAKICAgICBRRmlsZURpYWxvZyBmaWxlRGlhbG9nKHRoaXMsIHRyKCJPcGVuIiksIFFT dHJpbmcoKSwgZmlsdGVyKTsKQEAgLTIyOSw3ICsyMjgsNiBAQCB2b2lkIEJyb3dzZXJXaW5kb3c6 Om9wZW5GaWxlKCkKICAgICAgICAgaWYgKCFzZWxlY3RlZEZpbGUuaXNFbXB0eSgpKQogICAgICAg ICAgICAgbG9hZChzZWxlY3RlZEZpbGUpOwogICAgIH0KLSNlbmRpZgogfQogCiB2b2lkIEJyb3dz ZXJXaW5kb3c6OnNjcmVlbnNob3QoKQpAQCAtMjQ0LDcgKzI0Miw2IEBAIHZvaWQgQnJvd3Nlcldp bmRvdzo6c2NyZWVuc2hvdCgpCiAgICAgbGFiZWwtPnNob3coKTsKICNlbmRpZgogCi0jaWZuZGVm IFFUX05PX0ZJTEVESUFMT0cKICAgICBRU3RyaW5nIGZpbGVOYW1lID0gUUZpbGVEaWFsb2c6Omdl dFNhdmVGaWxlTmFtZShsYWJlbCwgIlNjcmVlbnNob3QiLCBRU3RyaW5nKCksIFFTdHJpbmcoIlBO RyBGaWxlICgucG5nKSIpKTsKICAgICBpZiAoIWZpbGVOYW1lLmlzRW1wdHkoKSkgewogICAgICAg ICBRUmVnRXhwIHJ4KCIqLnBuZyIpOwpAQCAtMjU4LDcgKzI1NSw2IEBAIHZvaWQgQnJvd3Nlcldp bmRvdzo6c2NyZWVuc2hvdCgpCiAgICAgICAgIGlmIChsYWJlbCkKICAgICAgICAgICAgIGxhYmVs LT5zZXRXaW5kb3dUaXRsZShRU3RyaW5nKCJTY3JlZW5zaG90IC0gU2F2ZWQgYXQgJTEiKS5hcmco ZmlsZU5hbWUpKTsKICAgICB9Ci0jZW5kaWYKIH0KIAogdm9pZCBCcm93c2VyV2luZG93Ojp0b2dn bGVGdWxsU2NyZWVuTW9kZShib29sIGVuYWJsZSkKQEAgLTMwMywxMCArMjk5LDggQEAgdm9pZCBC cm93c2VyV2luZG93OjpzaG93VXNlckFnZW50RGlhbG9nKCkKIHZvaWQgQnJvd3NlcldpbmRvdzo6 bG9hZFVSTExpc3RGcm9tRmlsZSgpCiB7CiAgICAgUVN0cmluZyBzZWxlY3RlZEZpbGU7Ci0jaWZu ZGVmIFFUX05PX0ZJTEVESUFMT0cKICAgICBzZWxlY3RlZEZpbGUgPSBRRmlsZURpYWxvZzo6Z2V0 T3BlbkZpbGVOYW1lKHRoaXMsIHRyKCJMb2FkIFVSTCBsaXN0IGZyb20gZmlsZSIpCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLCBRU3RyaW5n KCksIHRyKCJUZXh0IEZpbGVzICgqLnR4dCk7O0FsbCBGaWxlcyAoKikiKSk7Ci0jZW5kaWYKICAg ICBpZiAoc2VsZWN0ZWRGaWxlLmlzRW1wdHkoKSkKICAgICAgICByZXR1cm47CiAK