36889 2010-03-31 09:54:42 -0700 Misc IndexedDatabase cleanup 2010-04-01 03:24:28 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 jorlow webkit-unassigned fishd japhet webkit.review.bot oldest_to_newest 206557 0 jorlow 2010-03-31 09:54:42 -0700 Misc IndexedDatabase cleanup 206561 1 52181 jorlow 2010-03-31 10:03:48 -0700 Created attachment 52181 Patch 206563 2 webkit.review.bot 2010-03-31 10:09:51 -0700 Attachment 52181 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebKit/chromium/src/IndexedDatabaseProxy.cpp:40: Alphabetical sorting problem. [build/include_order] [4] Total errors found: 1 in 13 files If any of these errors are false positives, please file a bug against check-webkit-style. 206625 3 52181 japhet 2010-03-31 12:05:45 -0700 Comment on attachment 52181 Patch One question (plus the style violation the script caught). I'm r+ing and assuming Darin will override if he sees something I missed in the WebKit/chromium changes. > --- a/WebKit/chromium/public/WebIndexedDatabase.h > +++ b/WebKit/chromium/public/WebIndexedDatabase.h > @@ -36,6 +36,7 @@ namespace WebKit { > > class WebIDBDatabase; > class WebString; > +class WebFrame; Do we care about ordering of these? 206630 4 jorlow 2010-03-31 12:12:08 -0700 (In reply to comment #3) > (From update of attachment 52181 [details]) > One question (plus the style violation the script caught). I'm r+ing and > assuming Darin will override if he sees something I missed in the > WebKit/chromium changes. > > > --- a/WebKit/chromium/public/WebIndexedDatabase.h > > +++ b/WebKit/chromium/public/WebIndexedDatabase.h > > @@ -36,6 +36,7 @@ namespace WebKit { > > > > class WebIDBDatabase; > > class WebString; > > +class WebFrame; > > Do we care about ordering of these? We do. This is an artifact of me changing it from WebView to WebFrame at some point. Will fix before landing. 207077 5 jorlow 2010-04-01 03:24:28 -0700 Committed r56907: <http://trac.webkit.org/changeset/56907> 52181 2010-03-31 10:03:48 -0700 2010-03-31 12:05:44 -0700 Patch bug-36889-20100331180345.patch text/plain 11553 jorlow ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg Njk1NzVlOS4uODM3NDU1ZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNyBAQAorMjAxMC0wMy0zMSAgSmVyZW15IE9ybG93 ICA8am9ybG93QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBNaXNjIEluZGV4ZWREYXRhYmFzZSBjbGVhbnVwCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNjg4OQorCisgICAgICAgIE5v IGZ1bmN0aW9uYWwgY2hhbmdlcy4KKworICAgICAgICAqIGJpbmRpbmdzL3Y4L2N1c3RvbS9WOEN1 c3RvbUlEQkNhbGxiYWNrcy5oOiAgCisgICAgICAgIChXZWJDb3JlOjpWOEN1c3RvbUlEQkNhbGxi YWNrczo6b25TdWNjZXNzKToKKyAgICAgICAgKFdlYkNvcmU6OlY4Q3VzdG9tSURCQ2FsbGJhY2tz OjpvbkVycm9yKToKKyAgICAgICAgKFdlYkNvcmU6OlY4Q3VzdG9tSURCQ2FsbGJhY2tzOjpWOEN1 c3RvbUlEQkNhbGxiYWNrcyk6CisgICAgICAgICAgICBHZXQgcmlkIG9mIDIgbGFyZ2VseSByZWR1 bmRhbnQgYm9vbHMKKworICAgICAgICAqIHN0b3JhZ2UvSW5kZXhlZERhdGFiYXNlLmg6CisgICAg ICAgICogc3RvcmFnZS9JbmRleGVkRGF0YWJhc2VJbXBsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkluZGV4ZWREYXRhYmFzZUltcGw6Om9wZW4pOgorICAgICAgICAqIHN0b3JhZ2UvSW5kZXhlZERh dGFiYXNlSW1wbC5oOgorICAgICAgICAqIHN0b3JhZ2UvSW5kZXhlZERhdGFiYXNlUmVxdWVzdC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpJbmRleGVkRGF0YWJhc2VSZXF1ZXN0OjpvcGVuKToKKyAg ICAgICAgKiBzdG9yYWdlL0luZGV4ZWREYXRhYmFzZVJlcXVlc3QuaDoKKyAgICAgICAgICAgIFBs dW1iIHRoZSBGcmFtZSogYW5kIHN0eWxlIGNsZWFudXBzLgorCiAyMDEwLTAzLTMwICBKZXJlbXkg T3Jsb3cgIDxqb3Jsb3dAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE5hdGUg Q2hhcGluLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhDdXN0b21J REJDYWxsYmFja3MuaCBiL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4Q3VzdG9tSURCQ2Fs bGJhY2tzLmgKaW5kZXggZjNlYWMyNC4uYzcxYWVhMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5k aW5ncy92OC9jdXN0b20vVjhDdXN0b21JREJDYWxsYmFja3MuaAorKysgYi9XZWJDb3JlL2JpbmRp bmdzL3Y4L2N1c3RvbS9WOEN1c3RvbUlEQkNhbGxiYWNrcy5oCkBAIC02MSw3ICs2MSw3IEBAIHB1 YmxpYzoKIAogICAgIHZpcnR1YWwgdm9pZCBvblN1Y2Nlc3MoUGFzc1JlZlB0cjxSZXN1bHRUeXBl PiByZXN1bHQpCiAgICAgewotICAgICAgICBpZiAobV9vblN1Y2Nlc3NOdWxsKQorICAgICAgICBp ZiAobV9vblN1Y2Nlc3MuSXNFbXB0eSgpKQogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB2 ODo6SGFuZGxlU2NvcGUgaGFuZGxlU2NvcGU7CiAgICAgICAgIHY4OjpIYW5kbGU8djg6OkNvbnRl eHQ+IGNvbnRleHQgPSBWOFByb3h5Ojpjb250ZXh0KG1fZnJhbWUuZ2V0KCkpOwpAQCAtODAsNyAr ODAsNyBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIHZvaWQgb25FcnJvcihQYXNzUmVmUHRyPElE QkRhdGFiYXNlRXJyb3I+IGVycm9yKQogICAgIHsKLSAgICAgICAgaWYgKG1fb25FcnJvck51bGwp CisgICAgICAgIGlmIChtX29uRXJyb3IuSXNFbXB0eSgpKQogICAgICAgICAgICAgcmV0dXJuOwog ICAgICAgICB2ODo6SGFuZGxlU2NvcGUgaGFuZGxlU2NvcGU7CiAgICAgICAgIHY4OjpIYW5kbGU8 djg6OkNvbnRleHQ+IGNvbnRleHQgPSBWOFByb3h5Ojpjb250ZXh0KG1fZnJhbWUuZ2V0KCkpOwpA QCAtOTksMTggKzk5LDE0IEBAIHB1YmxpYzoKIAogcHJpdmF0ZToKICAgICBWOEN1c3RvbUlEQkNh bGxiYWNrcyh2ODo6TG9jYWw8djg6OlZhbHVlPiBvblN1Y2Nlc3MsIHY4OjpMb2NhbDx2ODo6VmFs dWU+IG9uRXJyb3IsIEZyYW1lKiBmcmFtZSkKLSAgICAgICAgOiBtX29uU3VjY2Vzc051bGwoIW9u U3VjY2Vzcy0+SXNPYmplY3QoKSkKLSAgICAgICAgLCBtX29uU3VjY2Vzcyh2ODo6UGVyc2lzdGVu dDx2ODo6T2JqZWN0Pjo6TmV3KG9uU3VjY2Vzcy0+VG9PYmplY3QoKSkpCi0gICAgICAgICwgbV9v bkVycm9yTnVsbCghb25FcnJvci0+SXNPYmplY3QoKSkKLSAgICAgICAgLCBtX29uRXJyb3Iodjg6 OlBlcnNpc3RlbnQ8djg6Ok9iamVjdD46Ok5ldyhvbkVycm9yLT5Ub09iamVjdCgpKSkKKyAgICAg ICAgOiBtX29uU3VjY2VzcyhvblN1Y2Nlc3MtPklzT2JqZWN0KCkgPyB2ODo6UGVyc2lzdGVudDx2 ODo6T2JqZWN0Pjo6TmV3KG9uU3VjY2Vzcy0+VG9PYmplY3QoKSkgOiB2ODo6UGVyc2lzdGVudDx2 ODo6T2JqZWN0PigpKQorICAgICAgICAsIG1fb25FcnJvcihvbkVycm9yLT5Jc09iamVjdCgpID8g djg6OlBlcnNpc3RlbnQ8djg6Ok9iamVjdD46Ok5ldyhvbkVycm9yLT5Ub09iamVjdCgpKSA6IHY4 OjpQZXJzaXN0ZW50PHY4OjpPYmplY3Q+KCkpCiAgICAgICAgICwgbV9mcmFtZShmcmFtZSkKICAg ICB7CiAgICAgfQogCiAgICAgLy8gRklYTUU6IFNob3VsZCB0aGVzZSBiZSB2ODo6RnVuY3Rpb25z PyAgRm9yIHNvbWUgcmVhc29uLCBWb2lkQ2FsbGJhY2sgKHdoaWNoIHRoaXMgY29waWVkKSB1c2Vz IHY4OjpPYmplY3RzLgotICAgIGJvb2wgbV9vblN1Y2Nlc3NOdWxsOwogICAgIHY4OjpQZXJzaXN0 ZW50PHY4OjpPYmplY3Q+IG1fb25TdWNjZXNzOwotICAgIGJvb2wgbV9vbkVycm9yTnVsbDsKICAg ICB2ODo6UGVyc2lzdGVudDx2ODo6T2JqZWN0PiBtX29uRXJyb3I7CiAgICAgUmVmUHRyPEZyYW1l PiBtX2ZyYW1lOwogfTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvc3RvcmFnZS9JbmRleGVkRGF0YWJh c2UuaCBiL1dlYkNvcmUvc3RvcmFnZS9JbmRleGVkRGF0YWJhc2UuaAppbmRleCA2ODBlNDhhLi41 OTBjM2VlIDEwMDY0NAotLS0gYS9XZWJDb3JlL3N0b3JhZ2UvSW5kZXhlZERhdGFiYXNlLmgKKysr IGIvV2ViQ29yZS9zdG9yYWdlL0luZGV4ZWREYXRhYmFzZS5oCkBAIC0zNyw2ICszNyw3IEBACiAK IG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorY2xhc3MgRnJhbWU7CiBjbGFzcyBJREJEYXRhYmFzZTsK IAogdHlwZWRlZiBJREJDYWxsYmFja3M8SURCRGF0YWJhc2U+IElEQkRhdGFiYXNlQ2FsbGJhY2tz OwpAQCAtNTAsNyArNTEsNyBAQCBwdWJsaWM6CiAgICAgc3RhdGljIFBhc3NSZWZQdHI8SW5kZXhl ZERhdGFiYXNlPiBjcmVhdGUoKTsKICAgICB2aXJ0dWFsIH5JbmRleGVkRGF0YWJhc2UoKSB7IH0K IAotICAgIHZpcnR1YWwgdm9pZCBvcGVuKGNvbnN0IFN0cmluZyYgbmFtZSwgY29uc3QgU3RyaW5n JiBkZXNjcmlwdGlvbiwgYm9vbCBtb2RpZnlEYXRhYmFzZSwgRXhjZXB0aW9uQ29kZSYsIFBhc3NS ZWZQdHI8SURCRGF0YWJhc2VDYWxsYmFja3M+KSA9IDA7CisgICAgdmlydHVhbCB2b2lkIG9wZW4o Y29uc3QgU3RyaW5nJiBuYW1lLCBjb25zdCBTdHJpbmcmIGRlc2NyaXB0aW9uLCBib29sIG1vZGlm eURhdGFiYXNlLCBFeGNlcHRpb25Db2RlJiwgUGFzc1JlZlB0cjxJREJEYXRhYmFzZUNhbGxiYWNr cz4sIEZyYW1lKikgPSAwOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9zdG9yYWdlL0luZGV4ZWREYXRhYmFzZUltcGwuY3BwIGIvV2ViQ29yZS9zdG9y YWdlL0luZGV4ZWREYXRhYmFzZUltcGwuY3BwCmluZGV4IDk1NGUyMDYuLmIyZjA2NjAgMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvc3RvcmFnZS9JbmRleGVkRGF0YWJhc2VJbXBsLmNwcAorKysgYi9XZWJD b3JlL3N0b3JhZ2UvSW5kZXhlZERhdGFiYXNlSW1wbC5jcHAKQEAgLTQ5LDcgKzQ5LDcgQEAgSW5k ZXhlZERhdGFiYXNlSW1wbDo6fkluZGV4ZWREYXRhYmFzZUltcGwoKQogewogfQogCi12b2lkIElu ZGV4ZWREYXRhYmFzZUltcGw6Om9wZW4oY29uc3QgU3RyaW5nJiBuYW1lLCBjb25zdCBTdHJpbmcm IGRlc2NyaXB0aW9uLCBib29sIG1vZGlmeURhdGFiYXNlLCBFeGNlcHRpb25Db2RlJiwgUGFzc1Jl ZlB0cjxJREJEYXRhYmFzZUNhbGxiYWNrcz4pCit2b2lkIEluZGV4ZWREYXRhYmFzZUltcGw6Om9w ZW4oY29uc3QgU3RyaW5nJiBuYW1lLCBjb25zdCBTdHJpbmcmIGRlc2NyaXB0aW9uLCBib29sIG1v ZGlmeURhdGFiYXNlLCBFeGNlcHRpb25Db2RlJiwgUGFzc1JlZlB0cjxJREJEYXRhYmFzZUNhbGxi YWNrcz4sIEZyYW1lKiBmcmFtZSkKIHsKICAgICAvLyBGSVhNRTogV3JpdGUuCiAgICAgQVNTRVJU X05PVF9SRUFDSEVEKCk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL3N0b3JhZ2UvSW5kZXhlZERhdGFi YXNlSW1wbC5oIGIvV2ViQ29yZS9zdG9yYWdlL0luZGV4ZWREYXRhYmFzZUltcGwuaAppbmRleCA4 ZDg3NGZmLi4wYTgxYzEwIDEwMDY0NAotLS0gYS9XZWJDb3JlL3N0b3JhZ2UvSW5kZXhlZERhdGFi YXNlSW1wbC5oCisrKyBiL1dlYkNvcmUvc3RvcmFnZS9JbmRleGVkRGF0YWJhc2VJbXBsLmgKQEAg LTM5LDcgKzM5LDcgQEAgcHVibGljOgogICAgIHN0YXRpYyBQYXNzUmVmUHRyPEluZGV4ZWREYXRh YmFzZUltcGw+IGNyZWF0ZSgpOwogICAgIHZpcnR1YWwgfkluZGV4ZWREYXRhYmFzZUltcGwoKTsK IAotICAgIHZpcnR1YWwgdm9pZCBvcGVuKGNvbnN0IFN0cmluZyYgbmFtZSwgY29uc3QgU3RyaW5n JiBkZXNjcmlwdGlvbiwgYm9vbCBtb2RpZnlEYXRhYmFzZSwgRXhjZXB0aW9uQ29kZSYsIFBhc3NS ZWZQdHI8SURCQ2FsbGJhY2tzPElEQkRhdGFiYXNlPiA+KTsKKyAgICB2aXJ0dWFsIHZvaWQgb3Bl bihjb25zdCBTdHJpbmcmIG5hbWUsIGNvbnN0IFN0cmluZyYgZGVzY3JpcHRpb24sIGJvb2wgbW9k aWZ5RGF0YWJhc2UsIEV4Y2VwdGlvbkNvZGUmLCBQYXNzUmVmUHRyPElEQkNhbGxiYWNrczxJREJE YXRhYmFzZT4gPiwgRnJhbWUqKTsKIAogcHJpdmF0ZToKICAgICBJbmRleGVkRGF0YWJhc2VJbXBs KCk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL3N0b3JhZ2UvSW5kZXhlZERhdGFiYXNlUmVxdWVzdC5j cHAgYi9XZWJDb3JlL3N0b3JhZ2UvSW5kZXhlZERhdGFiYXNlUmVxdWVzdC5jcHAKaW5kZXggYjRi N2E5OC4uZmE0MDBmZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9zdG9yYWdlL0luZGV4ZWREYXRhYmFz ZVJlcXVlc3QuY3BwCisrKyBiL1dlYkNvcmUvc3RvcmFnZS9JbmRleGVkRGF0YWJhc2VSZXF1ZXN0 LmNwcApAQCAtNDgsNyArNDgsNyBAQCBJbmRleGVkRGF0YWJhc2VSZXF1ZXN0Ojp+SW5kZXhlZERh dGFiYXNlUmVxdWVzdCgpCiAKIHZvaWQgSW5kZXhlZERhdGFiYXNlUmVxdWVzdDo6b3Blbihjb25z dCBTdHJpbmcmIG5hbWUsIGNvbnN0IFN0cmluZyYgZGVzY3JpcHRpb24sIGJvb2wgbW9kaWZ5RGF0 YWJhc2UsIEV4Y2VwdGlvbkNvZGUmIGV4Y2VwdGlvbiwgUGFzc1JlZlB0cjxJREJEYXRhYmFzZUNh bGxiYWNrcz4gY2FsbGJhY2tzKQogewotICAgIG1faW5kZXhlZERhdGFiYXNlLT5vcGVuKG5hbWUs IGRlc2NyaXB0aW9uLCBtb2RpZnlEYXRhYmFzZSwgZXhjZXB0aW9uLCBjYWxsYmFja3MpOworICAg IG1faW5kZXhlZERhdGFiYXNlLT5vcGVuKG5hbWUsIGRlc2NyaXB0aW9uLCBtb2RpZnlEYXRhYmFz ZSwgZXhjZXB0aW9uLCBjYWxsYmFja3MsIG1fZnJhbWUpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBX ZWJDb3JlCmRpZmYgLS1naXQgYS9XZWJDb3JlL3N0b3JhZ2UvSW5kZXhlZERhdGFiYXNlUmVxdWVz dC5oIGIvV2ViQ29yZS9zdG9yYWdlL0luZGV4ZWREYXRhYmFzZVJlcXVlc3QuaAppbmRleCA5NTBj YjdjLi45NmVkODVhIDEwMDY0NAotLS0gYS9XZWJDb3JlL3N0b3JhZ2UvSW5kZXhlZERhdGFiYXNl UmVxdWVzdC5oCisrKyBiL1dlYkNvcmUvc3RvcmFnZS9JbmRleGVkRGF0YWJhc2VSZXF1ZXN0LmgK QEAgLTUwLDcgKzUwLDcgQEAgcHVibGljOgogICAgIH0KICAgICB+SW5kZXhlZERhdGFiYXNlUmVx dWVzdCgpOwogCi0gICAgdm9pZCBvcGVuKGNvbnN0IFN0cmluZyYgbmFtZSwgY29uc3QgU3RyaW5n JiBkZXNjcmlwdGlvbiwgYm9vbCBtb2RpZnlEYXRhYmFzZSwgRXhjZXB0aW9uQ29kZSYsIFBhc3NS ZWZQdHI8SURCRGF0YWJhc2VDYWxsYmFja3M+IGNhbGxiYWNrcyk7CisgICAgdm9pZCBvcGVuKGNv bnN0IFN0cmluZyYgbmFtZSwgY29uc3QgU3RyaW5nJiBkZXNjcmlwdGlvbiwgYm9vbCBtb2RpZnlE YXRhYmFzZSwgRXhjZXB0aW9uQ29kZSYsIFBhc3NSZWZQdHI8SURCRGF0YWJhc2VDYWxsYmFja3M+ KTsKIAogICAgIHZvaWQgZGlzY29ubmVjdEZyYW1lKCkgeyBtX2ZyYW1lID0gMDsgfQogCmRpZmYg LS1naXQgYS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5n ZUxvZwppbmRleCBkY2FmODBjLi5lNTc1M2ViIDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCisrKyBiL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBA QAorMjAxMC0wMy0zMSAgSmVyZW15IE9ybG93ICA8am9ybG93QGNocm9taXVtLm9yZz4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNaXNjIEluZGV4ZWRE YXRhYmFzZSBjbGVhbnVwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0zNjg4OQorCisgICAgICAgIFBsdW1iIHRoZSBGcmFtZSogc28gQ2hyb21pdW0ga25v d3Mgd2hlcmUgdGhlIHJlcXVlc3Qgb3JpZ2luYXRlZCBmcm9tLgorCisgICAgICAgICogcHVibGlj L1dlYkluZGV4ZWREYXRhYmFzZS5oOgorICAgICAgICAqIHNyYy9JbmRleGVkRGF0YWJhc2VQcm94 eS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbmRleGVkRGF0YWJhc2VQcm94eTo6b3Blbik6Cisg ICAgICAgICogc3JjL0luZGV4ZWREYXRhYmFzZVByb3h5Lmg6CisgICAgICAgICogc3JjL1dlYklu ZGV4ZWREYXRhYmFzZUltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJJbmRleGVkRGF0YWJh c2VJbXBsOjpvcGVuKToKKyAgICAgICAgKiBzcmMvV2ViSW5kZXhlZERhdGFiYXNlSW1wbC5oOgor CiAyMDEwLTAzLTMxICBKb2huIEdyZWdnICA8am9obm55Z0Bnb29nbGUuY29tPgogCiAgICAgICAg IFJldmlld2VkIGJ5IERhcmluIEZpc2hlci4KZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9w dWJsaWMvV2ViSW5kZXhlZERhdGFiYXNlLmggYi9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYklu ZGV4ZWREYXRhYmFzZS5oCmluZGV4IDhhYTNjMjQuLjVmNDU4N2EgMTAwNjQ0Ci0tLSBhL1dlYktp dC9jaHJvbWl1bS9wdWJsaWMvV2ViSW5kZXhlZERhdGFiYXNlLmgKKysrIGIvV2ViS2l0L2Nocm9t aXVtL3B1YmxpYy9XZWJJbmRleGVkRGF0YWJhc2UuaApAQCAtMzYsNiArMzYsNyBAQCBuYW1lc3Bh Y2UgV2ViS2l0IHsKIAogY2xhc3MgV2ViSURCRGF0YWJhc2U7CiBjbGFzcyBXZWJTdHJpbmc7Citj bGFzcyBXZWJGcmFtZTsKIAogLy8gVGhlIGVudHJ5IHBvaW50IGludG8gdGhlIEluZGV4ZWREYXRh YmFzZSBBUEkuICBUaGVzZSBjbGFzc2VzIG1hdGNoIHRoZWlyIF9fX19fUmVxdWVzdCBhbmQKIC8v IF9fX19fU3luYyBjb3VudGVycGFydHMgaW4gdGhlIHNwZWMsIGJ1dCBvcGVyYXRlIG9ubHkgaW4g YW4gYXN5bmMgbWFubmVyLgpAQCAtNDYsNyArNDcsNyBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFs IH5XZWJJbmRleGVkRGF0YWJhc2UoKSB7IH0KIAotICAgIHZpcnR1YWwgdm9pZCBvcGVuKGNvbnN0 IFdlYlN0cmluZyYgbmFtZSwgY29uc3QgV2ViU3RyaW5nJiBkZXNjcmlwdGlvbiwgYm9vbCBtb2Rp ZnlEYXRhYmFzZSwgaW50JiBleGNlcHRpb25Db2RlLCBXZWJJREJDYWxsYmFja3M8V2ViSURCRGF0 YWJhc2U+KiBjYWxsYmFja3MpID0gMDsKKyAgICB2aXJ0dWFsIHZvaWQgb3Blbihjb25zdCBXZWJT dHJpbmcmIG5hbWUsIGNvbnN0IFdlYlN0cmluZyYgZGVzY3JpcHRpb24sIGJvb2wgbW9kaWZ5RGF0 YWJhc2UsIGludCYgZXhjZXB0aW9uQ29kZSwgV2ViSURCQ2FsbGJhY2tzPFdlYklEQkRhdGFiYXNl PiosIFdlYkZyYW1lKikgPSAwOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1n aXQgYS9XZWJLaXQvY2hyb21pdW0vc3JjL0luZGV4ZWREYXRhYmFzZVByb3h5LmNwcCBiL1dlYktp dC9jaHJvbWl1bS9zcmMvSW5kZXhlZERhdGFiYXNlUHJveHkuY3BwCmluZGV4IGIzYzU2YjMuLjhm MDExMWYgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9zcmMvSW5kZXhlZERhdGFiYXNlUHJv eHkuY3BwCisrKyBiL1dlYktpdC9jaHJvbWl1bS9zcmMvSW5kZXhlZERhdGFiYXNlUHJveHkuY3Bw CkBAIC0zNyw2ICszNyw3IEBACiAjaW5jbHVkZSAiV2ViSW5kZXhlZERhdGFiYXNlLmgiCiAjaW5j bHVkZSAiV2ViS2l0LmgiCiAjaW5jbHVkZSAiV2ViS2l0Q2xpZW50LmgiCisjaW5jbHVkZSAiV2Vi RnJhbWVJbXBsLmgiCiAKICNpZiBFTkFCTEUoSU5ERVhFRF9EQVRBQkFTRSkKIApAQCAtNTYsMTAg KzU3LDExIEBAIEluZGV4ZWREYXRhYmFzZVByb3h5Ojp+SW5kZXhlZERhdGFiYXNlUHJveHkoKQog ewogfQogCi12b2lkIEluZGV4ZWREYXRhYmFzZVByb3h5OjpvcGVuKGNvbnN0IFN0cmluZyYgbmFt ZSwgY29uc3QgU3RyaW5nJiBkZXNjcmlwdGlvbiwgYm9vbCBtb2RpZnlEYXRhYmFzZSwgRXhjZXB0 aW9uQ29kZSYgZWMsIFBhc3NSZWZQdHI8SURCRGF0YWJhc2VDYWxsYmFja3M+IGNhbGxiYWNrcykK K3ZvaWQgSW5kZXhlZERhdGFiYXNlUHJveHk6Om9wZW4oY29uc3QgU3RyaW5nJiBuYW1lLCBjb25z dCBTdHJpbmcmIGRlc2NyaXB0aW9uLCBib29sIG1vZGlmeURhdGFiYXNlLCBFeGNlcHRpb25Db2Rl JiBlYywgUGFzc1JlZlB0cjxJREJEYXRhYmFzZUNhbGxiYWNrcz4gY2FsbGJhY2tzLCBGcmFtZSog ZnJhbWUpCiB7CisgICAgV2ViS2l0OjpXZWJGcmFtZSogd2ViRnJhbWUgPSBXZWJLaXQ6OldlYkZy YW1lSW1wbDo6ZnJvbUZyYW1lKGZyYW1lKTsKICAgICBtX3dlYkluZGV4ZWREYXRhYmFzZS0+b3Bl bihuYW1lLCBkZXNjcmlwdGlvbiwgbW9kaWZ5RGF0YWJhc2UsIGVjLAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIG5ldyBJREJDYWxsYmFja3NQcm94eTxXZWJLaXQ6OldlYklEQkRhdGFi YXNlLCBJREJEYXRhYmFzZSwgSURCRGF0YWJhc2VQcm94eT4oY2FsbGJhY2tzKSk7CisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgbmV3IElEQkNhbGxiYWNrc1Byb3h5PFdlYktpdDo6V2Vi SURCRGF0YWJhc2UsIElEQkRhdGFiYXNlLCBJREJEYXRhYmFzZVByb3h5PihjYWxsYmFja3MpLCB3 ZWJGcmFtZSk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1dlYktp dC9jaHJvbWl1bS9zcmMvSW5kZXhlZERhdGFiYXNlUHJveHkuaCBiL1dlYktpdC9jaHJvbWl1bS9z cmMvSW5kZXhlZERhdGFiYXNlUHJveHkuaAppbmRleCA5NDdmYWVlLi45OTdlNWM4IDEwMDY0NAot LS0gYS9XZWJLaXQvY2hyb21pdW0vc3JjL0luZGV4ZWREYXRhYmFzZVByb3h5LmgKKysrIGIvV2Vi S2l0L2Nocm9taXVtL3NyYy9JbmRleGVkRGF0YWJhc2VQcm94eS5oCkBAIC00Miw3ICs0Miw3IEBA IHB1YmxpYzoKICAgICBzdGF0aWMgUGFzc1JlZlB0cjxJbmRleGVkRGF0YWJhc2U+IGNyZWF0ZSgp OwogICAgIHZpcnR1YWwgfkluZGV4ZWREYXRhYmFzZVByb3h5KCk7CiAKLSAgICB2aXJ0dWFsIHZv aWQgb3Blbihjb25zdCBTdHJpbmcmIG5hbWUsIGNvbnN0IFN0cmluZyYgZGVzY3JpcHRpb24sIGJv b2wgbW9kaWZ5RGF0YWJhc2UsIEV4Y2VwdGlvbkNvZGUmLCBQYXNzUmVmUHRyPElEQkRhdGFiYXNl Q2FsbGJhY2tzPik7CisgICAgdmlydHVhbCB2b2lkIG9wZW4oY29uc3QgU3RyaW5nJiBuYW1lLCBj b25zdCBTdHJpbmcmIGRlc2NyaXB0aW9uLCBib29sIG1vZGlmeURhdGFiYXNlLCBFeGNlcHRpb25D b2RlJiwgUGFzc1JlZlB0cjxJREJEYXRhYmFzZUNhbGxiYWNrcz4sIEZyYW1lKik7CiAKIHByaXZh dGU6CiAgICAgSW5kZXhlZERhdGFiYXNlUHJveHkoKTsKZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJv bWl1bS9zcmMvV2ViSW5kZXhlZERhdGFiYXNlSW1wbC5jcHAgYi9XZWJLaXQvY2hyb21pdW0vc3Jj L1dlYkluZGV4ZWREYXRhYmFzZUltcGwuY3BwCmluZGV4IDEwZTQyOTIuLjhhOTk4YWYgMTAwNjQ0 Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSW5kZXhlZERhdGFiYXNlSW1wbC5jcHAKKysr IGIvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJJbmRleGVkRGF0YWJhc2VJbXBsLmNwcApAQCAtNDcs NyArNDcsNyBAQCBXZWJJbmRleGVkRGF0YWJhc2VJbXBsOjp+V2ViSW5kZXhlZERhdGFiYXNlSW1w bCgpCiB7CiB9CiAKLXZvaWQgV2ViSW5kZXhlZERhdGFiYXNlSW1wbDo6b3Blbihjb25zdCBXZWJT dHJpbmcmIG5hbWUsIGNvbnN0IFdlYlN0cmluZyYgZGVzY3JpcHRpb24sIGJvb2wgbW9kaWZ5RGF0 YWJhc2UsIGludCYgZXhjZXB0aW9uQ29kZSwgV2ViSURCQ2FsbGJhY2tzPFdlYklEQkRhdGFiYXNl PiogY2FsbGJhY2tzUHRyKQordm9pZCBXZWJJbmRleGVkRGF0YWJhc2VJbXBsOjpvcGVuKGNvbnN0 IFdlYlN0cmluZyYgbmFtZSwgY29uc3QgV2ViU3RyaW5nJiBkZXNjcmlwdGlvbiwgYm9vbCBtb2Rp ZnlEYXRhYmFzZSwgaW50JiBleGNlcHRpb25Db2RlLCBXZWJJREJDYWxsYmFja3M8V2ViSURCRGF0 YWJhc2U+KiBjYWxsYmFja3NQdHIsIFdlYkZyYW1lKikKIHsKICAgICBPd25QdHI8V2ViSURCQ2Fs bGJhY2tzPFdlYklEQkRhdGFiYXNlPio+IGNhbGxiYWNrcyhjYWxsYmFja3NQdHIpOwogICAgIGNh bGxiYWNrcy0+b25FcnJvcihXZWJJREJEYXRhYmFzZUVycm9yKDAsICJOb3QgaW1wbGVtZW50ZWQi KSk7CmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkluZGV4ZWREYXRhYmFzZUlt cGwuaCBiL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSW5kZXhlZERhdGFiYXNlSW1wbC5oCmluZGV4 IDY2MmM3OGYuLmU3MzQ3MzIgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSW5k ZXhlZERhdGFiYXNlSW1wbC5oCisrKyBiL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSW5kZXhlZERh dGFiYXNlSW1wbC5oCkBAIC0zNyw3ICszNyw3IEBAIGNsYXNzIFdlYkluZGV4ZWREYXRhYmFzZUlt cGwgOiBwdWJsaWMgV2ViSW5kZXhlZERhdGFiYXNlIHsKIHB1YmxpYzoKICAgICB2aXJ0dWFsIH5X ZWJJbmRleGVkRGF0YWJhc2VJbXBsKCk7CiAKLSAgICB2aXJ0dWFsIHZvaWQgb3Blbihjb25zdCBX ZWJTdHJpbmcmIG5hbWUsIGNvbnN0IFdlYlN0cmluZyYgZGVzY3JpcHRpb24sIGJvb2wgbW9kaWZ5 RGF0YWJhc2UsIGludCYgZXhjZXB0aW9uQ29kZSwgV2ViSURCQ2FsbGJhY2tzPFdlYklEQkRhdGFi YXNlPiogY2FsbGJhY2tzKTsKKyAgICB2aXJ0dWFsIHZvaWQgb3Blbihjb25zdCBXZWJTdHJpbmcm IG5hbWUsIGNvbnN0IFdlYlN0cmluZyYgZGVzY3JpcHRpb24sIGJvb2wgbW9kaWZ5RGF0YWJhc2Us IGludCYgZXhjZXB0aW9uQ29kZSwgV2ViSURCQ2FsbGJhY2tzPFdlYklEQkRhdGFiYXNlPiosIFdl YkZyYW1lKik7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQK