25485 2009-04-30 11:06:17 -0700 Implement visitedURL to Re-unfork Chromium. 2009-05-01 14:19:09 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 20952 1 dglazkov dglazkov darin zecke oldest_to_newest 119487 0 dglazkov 2009-04-30 11:06:17 -0700 Change http://trac.webkit.org/changeset/43052 broke Chromium build -- we need to implement visitedURL in HashLinkChromium.cpp. 119534 1 dglazkov 2009-04-30 16:02:11 -0700 Gar. This looks messy. I wonder if it'll be okay if I just do: #if PLATFORM(CHROMIUM) LinkHash hash = visitedLinkHash(m_document->baseURL(), *attr); if (!hash) return PseudoLink; #endif Vector<UChar, 512> url; 119535 2 dglazkov 2009-04-30 16:02:38 -0700 Or something like that :) 119567 3 fishd 2009-04-30 22:35:55 -0700 It seems like _only_ the QT port requires the visitedURL call. Surely that is not a free call on other platforms, so maybe only the QT port should make that call. 119588 4 29940 dglazkov 2009-05-01 09:23:47 -0700 Created attachment 29940 Only use visitedURL in QT builds, v1. WebCore/ChangeLog | 13 +++++++++++++ WebCore/css/CSSStyleSelector.cpp | 25 +++++++++++++++---------- WebCore/platform/LinkHash.h | 3 ++- 3 files changed, 30 insertions(+), 11 deletions(-) 119589 5 dglazkov 2009-05-01 09:28:52 -0700 Ok, here's an ugly fix -- create separate code paths for QT and non-QT builds in checkPseudoState. The good news is that the separation is only on the high level, because visitedLinkHash still uses visitedURL. 119590 6 29940 darin 2009-05-01 09:34:52 -0700 Comment on attachment 29940 Only use visitedURL in QT builds, v1. > + (WebCore::CSSStyleSelector::SelectorChecker::checkPseudoState): Moved guards around to > + provide separate code paths for QT and non-QT ports. It’s Qt, not QT. This mistake makes this especially confusing at Apple, because lots of people at Apple use QT to mean QuickTime. > +#if PLATFORM(QT) > // Resolves the potentially relative URL "attributeURL" relative to the given > // base URL, and returns the hash of the string that will be used for visited. > // It will return an empty Vector in case of errors. > void visitedURL(const KURL& base, const AtomicString& attributeURL, Vector<UChar, 512>&); > - > +#endif My general thought here is: 1) It doesn’t do harm to declare a function we plan to never define, so sometimes we just leave out the #if statements in headers for cases like this. 2) I believe adding this #if to the header but not the LinkHash.cpp file will break the Mac build, because we compile with a warning for functions that are defined with external linkage and not previously declared. So you need to add this #if to LinkHash.cpp, not just LinkHash.h. review- because of breaking the Mac build. 119591 7 darin 2009-05-01 09:35:32 -0700 The direction here seems fine. It’s good not to burden the non-Qt platforms with Qt’s requirement here. 119595 8 29941 dglazkov 2009-05-01 10:14:17 -0700 Created attachment 29941 Only use visitedURL in QT builds, v1. WebCore/ChangeLog | 13 +++++++++++++ WebCore/css/CSSStyleSelector.cpp | 25 +++++++++++++++---------- WebCore/platform/LinkHash.h | 3 ++- 3 files changed, 30 insertions(+), 11 deletions(-) 119596 9 dglazkov 2009-05-01 10:15:38 -0700 Oops, sorry -- hair-trigger-finger :) Correct patch coming up. 119598 10 29942 dglazkov 2009-05-01 10:16:42 -0700 Created attachment 29942 Only use visitedURL in QT builds, v2. WebCore/ChangeLog | 12 ++++++++++++ WebCore/css/CSSStyleSelector.cpp | 25 +++++++++++++++---------- 2 files changed, 27 insertions(+), 10 deletions(-) 119599 11 dglazkov 2009-05-01 10:17:48 -0700 Fixed up -- I removed the guards in LinkHash.h and corrected the Qt whoopsie. 119617 12 29942 eric 2009-05-01 11:57:47 -0700 Comment on attachment 29942 Only use visitedURL in QT builds, v2. You should mention restoring the order in your ChangeLog. This looks sane, so long as you know that no other build besides Qt needs the visitedURL call. 119632 13 dglazkov 2009-05-01 14:19:09 -0700 Landed as http://trac.webkit.org/changeset/43120. 29940 2009-05-01 09:23:47 -0700 2009-05-01 10:17:58 -0700 Only use visitedURL in QT builds, v1. Only-use-visitedURL-in-QT-builds-v1..patch text/plain 3127 dglazkov NmU2NWI4NmJkYWVlM2I5N2IwNDYyNzc0MTQwZjk5ZTE2MTFhMzg4MApkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBjMDY4ZDMyLi44YTNiZTk4 IDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpA QCAtMSwzICsxLDE2IEBACisyMDA5LTA1LTAxICBEaW1pdHJpIEdsYXprb3YgIDxkZ2xhemtvdkBj aHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI1NDg1CisgICAg ICAgIE9ubHkgdXNlIHZpc2l0ZWRVUkwgaW4gUVQuIFRoaXMgaXMgYSBmb2xsb3ctdXAgY2hhbmdl IHRvIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzQzMDUyLAorICAgICAgICB3aGlj aCBicm9rZSBDaHJvbWl1bSBidWlsZC4KKworICAgICAgICAqIGNzcy9DU1NTdHlsZVNlbGVjdG9y LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1N0eWxlU2VsZWN0b3I6OlNlbGVjdG9yQ2hlY2tl cjo6Y2hlY2tQc2V1ZG9TdGF0ZSk6IE1vdmVkIGd1YXJkcyBhcm91bmQgdG8KKyAgICAgICAgICAg IHByb3ZpZGUgc2VwYXJhdGUgY29kZSBwYXRocyBmb3IgUVQgYW5kIG5vbi1RVCBwb3J0cy4KKyAg ICAgICAgKiBwbGF0Zm9ybS9MaW5rSGFzaC5oOiBBZGRlZCBRVCBwbGF0Zm9ybSBndWFyZC4KKwog MjAwOS0wNS0wMSAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KIAogICAg ICAgICBSZXZpZXdlZCBieSBUaW1vdGh5IEhhdGNoZXIuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2Nz cy9DU1NTdHlsZVNlbGVjdG9yLmNwcCBiL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3Bw CmluZGV4IDhiODY2YTcuLjNmMDBmNGMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvY3NzL0NTU1N0eWxl U2VsZWN0b3IuY3BwCisrKyBiL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwCkBAIC04 NjcsMzAgKzg2NywzNSBAQCBQc2V1ZG9TdGF0ZSBDU1NTdHlsZVNlbGVjdG9yOjpTZWxlY3RvckNo ZWNrZXI6OmNoZWNrUHNldWRvU3RhdGUoRWxlbWVudCogZWxlbWVudAogICAgIGlmICghY2hlY2tW aXNpdGVkKQogICAgICAgICByZXR1cm4gUHNldWRvQW55TGluazsKIAotICAgIEZyYW1lKiBmcmFt ZSA9IG1fZG9jdW1lbnQtPmZyYW1lKCk7Ci0gICAgaWYgKCFmcmFtZSkKLSAgICAgICAgcmV0dXJu IFBzZXVkb0xpbms7Ci0KLSAgICBQYWdlKiBwYWdlID0gZnJhbWUtPnBhZ2UoKTsKLSAgICBpZiAo IXBhZ2UpCi0gICAgICAgIHJldHVybiBQc2V1ZG9MaW5rOwotCisjaWYgUExBVEZPUk0oUVQpCiAg ICAgVmVjdG9yPFVDaGFyLCA1MTI+IHVybDsKICAgICB2aXNpdGVkVVJMKG1fZG9jdW1lbnQtPmJh c2VVUkwoKSwgKmF0dHIsIHVybCk7CiAgICAgaWYgKHVybC5pc0VtcHR5KCkpCiAgICAgICAgIHJl dHVybiBQc2V1ZG9MaW5rOwogCi0jaWYgUExBVEZPUk0oUVQpCiAgICAgLy8gSWYgdGhlIFF0NC40 IGludGVyZmFjZSBmb3IgdGhlIGhpc3RvcnkgaXMgdXNlZCwgd2Ugd2lsbCBoYXZlIHRvIGZhbGxi YWNrCiAgICAgLy8gdG8gdGhlIG9sZCBnbG9iYWwgaGlzdG9yeS4KICAgICBRV2ViSGlzdG9yeUlu dGVyZmFjZSogaW50ZXJmYWNlID0gUVdlYkhpc3RvcnlJbnRlcmZhY2U6OmRlZmF1bHRJbnRlcmZh Y2UoKTsKICAgICBpZiAoaW50ZXJmYWNlKQogICAgICAgICByZXR1cm4gaW50ZXJmYWNlLT5oaXN0 b3J5Q29udGFpbnMoUVN0cmluZyhyZWludGVycHJldF9jYXN0PFFDaGFyKj4odXJsLmRhdGEoKSks IHVybC5zaXplKCkpKSA/IFBzZXVkb1Zpc2l0ZWQgOiBQc2V1ZG9MaW5rOwotI2VuZGlmCiAKICAg ICBMaW5rSGFzaCBoYXNoID0gdmlzaXRlZExpbmtIYXNoKHVybC5kYXRhKCksIHVybC5zaXplKCkp OwogICAgIGlmICghaGFzaCkKICAgICAgICAgcmV0dXJuIFBzZXVkb0xpbms7CisjZWxzZQorICAg IExpbmtIYXNoIGhhc2ggPSB2aXNpdGVkTGlua0hhc2gobV9kb2N1bWVudC0+YmFzZVVSTCgpLCAq YXR0cik7CisgICAgaWYgKCFoYXNoKQorICAgICAgICByZXR1cm4gUHNldWRvTGluazsKKyNlbmRp ZgorCisgICAgRnJhbWUqIGZyYW1lID0gbV9kb2N1bWVudC0+ZnJhbWUoKTsKKyAgICBpZiAoIWZy YW1lKQorICAgICAgICByZXR1cm4gUHNldWRvTGluazsKKworICAgIFBhZ2UqIHBhZ2UgPSBmcmFt ZS0+cGFnZSgpOworICAgIGlmICghcGFnZSkKKyAgICAgICAgcmV0dXJuIFBzZXVkb0xpbms7CisK ICAgICBtX2xpbmtzQ2hlY2tlZEZvclZpc2l0ZWRTdGF0ZS5hZGQoaGFzaCk7CiAgICAgcmV0dXJu IHBhZ2UtPmdyb3VwKCkuaXNMaW5rVmlzaXRlZChoYXNoKSA/IFBzZXVkb1Zpc2l0ZWQgOiBQc2V1 ZG9MaW5rOwogfQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9MaW5rSGFzaC5oIGIvV2Vi Q29yZS9wbGF0Zm9ybS9MaW5rSGFzaC5oCmluZGV4IDI3NTY2NTQuLmU2NjYzNTIgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvcGxhdGZvcm0vTGlua0hhc2guaAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL0xp bmtIYXNoLmgKQEAgLTYyLDExICs2MiwxMiBAQCBMaW5rSGFzaCB2aXNpdGVkTGlua0hhc2goY29u c3QgVUNoYXIqIHVybCwgdW5zaWduZWQgbGVuZ3RoKTsKIC8vIGxvb2sgbGlrZSBhIHJlbGF0aXZl IFVSTC4KIExpbmtIYXNoIHZpc2l0ZWRMaW5rSGFzaChjb25zdCBLVVJMJiBiYXNlLCBjb25zdCBB dG9taWNTdHJpbmcmIGF0dHJpYnV0ZVVSTCk7CiAKKyNpZiBQTEFURk9STShRVCkKIC8vIFJlc29s dmVzIHRoZSBwb3RlbnRpYWxseSByZWxhdGl2ZSBVUkwgImF0dHJpYnV0ZVVSTCIgcmVsYXRpdmUg dG8gdGhlIGdpdmVuCiAvLyBiYXNlIFVSTCwgYW5kIHJldHVybnMgdGhlIGhhc2ggb2YgdGhlIHN0 cmluZyB0aGF0IHdpbGwgYmUgdXNlZCBmb3IgdmlzaXRlZC4KIC8vIEl0IHdpbGwgcmV0dXJuIGFu IGVtcHR5IFZlY3RvciBpbiBjYXNlIG9mIGVycm9ycy4KIHZvaWQgdmlzaXRlZFVSTChjb25zdCBL VVJMJiBiYXNlLCBjb25zdCBBdG9taWNTdHJpbmcmIGF0dHJpYnV0ZVVSTCwgVmVjdG9yPFVDaGFy LCA1MTI+Jik7Ci0KKyNlbmRpZgogCiB9ICAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCg== 29941 2009-05-01 10:14:17 -0700 2009-05-01 10:14:45 -0700 Only use visitedURL in QT builds, v1. Only-use-visitedURL-in-QT-builds-v1..patch text/plain 3127 dglazkov MjI4YTUxNjdiMzA4YzJjNTYwYjY0NmU3ZTJjZTBmMmJkNDE0ZmZkOApkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBjMDY4ZDMyLi44YTNiZTk4 IDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpA QCAtMSwzICsxLDE2IEBACisyMDA5LTA1LTAxICBEaW1pdHJpIEdsYXprb3YgIDxkZ2xhemtvdkBj aHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI1NDg1CisgICAg ICAgIE9ubHkgdXNlIHZpc2l0ZWRVUkwgaW4gUVQuIFRoaXMgaXMgYSBmb2xsb3ctdXAgY2hhbmdl IHRvIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzQzMDUyLAorICAgICAgICB3aGlj aCBicm9rZSBDaHJvbWl1bSBidWlsZC4KKworICAgICAgICAqIGNzcy9DU1NTdHlsZVNlbGVjdG9y LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1N0eWxlU2VsZWN0b3I6OlNlbGVjdG9yQ2hlY2tl cjo6Y2hlY2tQc2V1ZG9TdGF0ZSk6IE1vdmVkIGd1YXJkcyBhcm91bmQgdG8KKyAgICAgICAgICAg IHByb3ZpZGUgc2VwYXJhdGUgY29kZSBwYXRocyBmb3IgUVQgYW5kIG5vbi1RVCBwb3J0cy4KKyAg ICAgICAgKiBwbGF0Zm9ybS9MaW5rSGFzaC5oOiBBZGRlZCBRVCBwbGF0Zm9ybSBndWFyZC4KKwog MjAwOS0wNS0wMSAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KIAogICAg ICAgICBSZXZpZXdlZCBieSBUaW1vdGh5IEhhdGNoZXIuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2Nz cy9DU1NTdHlsZVNlbGVjdG9yLmNwcCBiL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3Bw CmluZGV4IDhiODY2YTcuLjNmMDBmNGMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvY3NzL0NTU1N0eWxl U2VsZWN0b3IuY3BwCisrKyBiL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwCkBAIC04 NjcsMzAgKzg2NywzNSBAQCBQc2V1ZG9TdGF0ZSBDU1NTdHlsZVNlbGVjdG9yOjpTZWxlY3RvckNo ZWNrZXI6OmNoZWNrUHNldWRvU3RhdGUoRWxlbWVudCogZWxlbWVudAogICAgIGlmICghY2hlY2tW aXNpdGVkKQogICAgICAgICByZXR1cm4gUHNldWRvQW55TGluazsKIAotICAgIEZyYW1lKiBmcmFt ZSA9IG1fZG9jdW1lbnQtPmZyYW1lKCk7Ci0gICAgaWYgKCFmcmFtZSkKLSAgICAgICAgcmV0dXJu IFBzZXVkb0xpbms7Ci0KLSAgICBQYWdlKiBwYWdlID0gZnJhbWUtPnBhZ2UoKTsKLSAgICBpZiAo IXBhZ2UpCi0gICAgICAgIHJldHVybiBQc2V1ZG9MaW5rOwotCisjaWYgUExBVEZPUk0oUVQpCiAg ICAgVmVjdG9yPFVDaGFyLCA1MTI+IHVybDsKICAgICB2aXNpdGVkVVJMKG1fZG9jdW1lbnQtPmJh c2VVUkwoKSwgKmF0dHIsIHVybCk7CiAgICAgaWYgKHVybC5pc0VtcHR5KCkpCiAgICAgICAgIHJl dHVybiBQc2V1ZG9MaW5rOwogCi0jaWYgUExBVEZPUk0oUVQpCiAgICAgLy8gSWYgdGhlIFF0NC40 IGludGVyZmFjZSBmb3IgdGhlIGhpc3RvcnkgaXMgdXNlZCwgd2Ugd2lsbCBoYXZlIHRvIGZhbGxi YWNrCiAgICAgLy8gdG8gdGhlIG9sZCBnbG9iYWwgaGlzdG9yeS4KICAgICBRV2ViSGlzdG9yeUlu dGVyZmFjZSogaW50ZXJmYWNlID0gUVdlYkhpc3RvcnlJbnRlcmZhY2U6OmRlZmF1bHRJbnRlcmZh Y2UoKTsKICAgICBpZiAoaW50ZXJmYWNlKQogICAgICAgICByZXR1cm4gaW50ZXJmYWNlLT5oaXN0 b3J5Q29udGFpbnMoUVN0cmluZyhyZWludGVycHJldF9jYXN0PFFDaGFyKj4odXJsLmRhdGEoKSks IHVybC5zaXplKCkpKSA/IFBzZXVkb1Zpc2l0ZWQgOiBQc2V1ZG9MaW5rOwotI2VuZGlmCiAKICAg ICBMaW5rSGFzaCBoYXNoID0gdmlzaXRlZExpbmtIYXNoKHVybC5kYXRhKCksIHVybC5zaXplKCkp OwogICAgIGlmICghaGFzaCkKICAgICAgICAgcmV0dXJuIFBzZXVkb0xpbms7CisjZWxzZQorICAg IExpbmtIYXNoIGhhc2ggPSB2aXNpdGVkTGlua0hhc2gobV9kb2N1bWVudC0+YmFzZVVSTCgpLCAq YXR0cik7CisgICAgaWYgKCFoYXNoKQorICAgICAgICByZXR1cm4gUHNldWRvTGluazsKKyNlbmRp ZgorCisgICAgRnJhbWUqIGZyYW1lID0gbV9kb2N1bWVudC0+ZnJhbWUoKTsKKyAgICBpZiAoIWZy YW1lKQorICAgICAgICByZXR1cm4gUHNldWRvTGluazsKKworICAgIFBhZ2UqIHBhZ2UgPSBmcmFt ZS0+cGFnZSgpOworICAgIGlmICghcGFnZSkKKyAgICAgICAgcmV0dXJuIFBzZXVkb0xpbms7CisK ICAgICBtX2xpbmtzQ2hlY2tlZEZvclZpc2l0ZWRTdGF0ZS5hZGQoaGFzaCk7CiAgICAgcmV0dXJu IHBhZ2UtPmdyb3VwKCkuaXNMaW5rVmlzaXRlZChoYXNoKSA/IFBzZXVkb1Zpc2l0ZWQgOiBQc2V1 ZG9MaW5rOwogfQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9MaW5rSGFzaC5oIGIvV2Vi Q29yZS9wbGF0Zm9ybS9MaW5rSGFzaC5oCmluZGV4IDI3NTY2NTQuLmU2NjYzNTIgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvcGxhdGZvcm0vTGlua0hhc2guaAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL0xp bmtIYXNoLmgKQEAgLTYyLDExICs2MiwxMiBAQCBMaW5rSGFzaCB2aXNpdGVkTGlua0hhc2goY29u c3QgVUNoYXIqIHVybCwgdW5zaWduZWQgbGVuZ3RoKTsKIC8vIGxvb2sgbGlrZSBhIHJlbGF0aXZl IFVSTC4KIExpbmtIYXNoIHZpc2l0ZWRMaW5rSGFzaChjb25zdCBLVVJMJiBiYXNlLCBjb25zdCBB dG9taWNTdHJpbmcmIGF0dHJpYnV0ZVVSTCk7CiAKKyNpZiBQTEFURk9STShRVCkKIC8vIFJlc29s dmVzIHRoZSBwb3RlbnRpYWxseSByZWxhdGl2ZSBVUkwgImF0dHJpYnV0ZVVSTCIgcmVsYXRpdmUg dG8gdGhlIGdpdmVuCiAvLyBiYXNlIFVSTCwgYW5kIHJldHVybnMgdGhlIGhhc2ggb2YgdGhlIHN0 cmluZyB0aGF0IHdpbGwgYmUgdXNlZCBmb3IgdmlzaXRlZC4KIC8vIEl0IHdpbGwgcmV0dXJuIGFu IGVtcHR5IFZlY3RvciBpbiBjYXNlIG9mIGVycm9ycy4KIHZvaWQgdmlzaXRlZFVSTChjb25zdCBL VVJMJiBiYXNlLCBjb25zdCBBdG9taWNTdHJpbmcmIGF0dHJpYnV0ZVVSTCwgVmVjdG9yPFVDaGFy LCA1MTI+Jik7Ci0KKyNlbmRpZgogCiB9ICAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCg== 29942 2009-05-01 10:16:42 -0700 2009-05-01 11:57:47 -0700 Only use visitedURL in QT builds, v2. Only-use-visitedURL-in-QT-builds-v2..patch text/plain 2348 dglazkov OWFlYmU2NjRjYTQ5YjI3NjM1MDIxNTdiNzc5YTkwNmVkMzNhMWJkMQpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBjMDY4ZDMyLi4xODQ1MjFk IDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpA QCAtMSwzICsxLDE1IEBACisyMDA5LTA1LTAxICBEaW1pdHJpIEdsYXprb3YgIDxkZ2xhemtvdkBj aHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI1NDg1CisgICAg ICAgIE9ubHkgdXNlIHZpc2l0ZWRVUkwgaW4gUXQuIFRoaXMgaXMgYSBmb2xsb3ctdXAgY2hhbmdl IHRvIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzQzMDUyLAorICAgICAgICB3aGlj aCBicm9rZSBDaHJvbWl1bSBidWlsZC4KKworICAgICAgICAqIGNzcy9DU1NTdHlsZVNlbGVjdG9y LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1N0eWxlU2VsZWN0b3I6OlNlbGVjdG9yQ2hlY2tl cjo6Y2hlY2tQc2V1ZG9TdGF0ZSk6IE1vdmVkIGd1YXJkcyBhcm91bmQgdG8KKyAgICAgICAgICAg IHByb3ZpZGUgc2VwYXJhdGUgY29kZSBwYXRocyBmb3IgUXQgYW5kIG5vbi1RdCBwb3J0cy4KKwog MjAwOS0wNS0wMSAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KIAogICAg ICAgICBSZXZpZXdlZCBieSBUaW1vdGh5IEhhdGNoZXIuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2Nz cy9DU1NTdHlsZVNlbGVjdG9yLmNwcCBiL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3Bw CmluZGV4IDhiODY2YTcuLjNmMDBmNGMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvY3NzL0NTU1N0eWxl U2VsZWN0b3IuY3BwCisrKyBiL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwCkBAIC04 NjcsMzAgKzg2NywzNSBAQCBQc2V1ZG9TdGF0ZSBDU1NTdHlsZVNlbGVjdG9yOjpTZWxlY3RvckNo ZWNrZXI6OmNoZWNrUHNldWRvU3RhdGUoRWxlbWVudCogZWxlbWVudAogICAgIGlmICghY2hlY2tW aXNpdGVkKQogICAgICAgICByZXR1cm4gUHNldWRvQW55TGluazsKIAotICAgIEZyYW1lKiBmcmFt ZSA9IG1fZG9jdW1lbnQtPmZyYW1lKCk7Ci0gICAgaWYgKCFmcmFtZSkKLSAgICAgICAgcmV0dXJu IFBzZXVkb0xpbms7Ci0KLSAgICBQYWdlKiBwYWdlID0gZnJhbWUtPnBhZ2UoKTsKLSAgICBpZiAo IXBhZ2UpCi0gICAgICAgIHJldHVybiBQc2V1ZG9MaW5rOwotCisjaWYgUExBVEZPUk0oUVQpCiAg ICAgVmVjdG9yPFVDaGFyLCA1MTI+IHVybDsKICAgICB2aXNpdGVkVVJMKG1fZG9jdW1lbnQtPmJh c2VVUkwoKSwgKmF0dHIsIHVybCk7CiAgICAgaWYgKHVybC5pc0VtcHR5KCkpCiAgICAgICAgIHJl dHVybiBQc2V1ZG9MaW5rOwogCi0jaWYgUExBVEZPUk0oUVQpCiAgICAgLy8gSWYgdGhlIFF0NC40 IGludGVyZmFjZSBmb3IgdGhlIGhpc3RvcnkgaXMgdXNlZCwgd2Ugd2lsbCBoYXZlIHRvIGZhbGxi YWNrCiAgICAgLy8gdG8gdGhlIG9sZCBnbG9iYWwgaGlzdG9yeS4KICAgICBRV2ViSGlzdG9yeUlu dGVyZmFjZSogaW50ZXJmYWNlID0gUVdlYkhpc3RvcnlJbnRlcmZhY2U6OmRlZmF1bHRJbnRlcmZh Y2UoKTsKICAgICBpZiAoaW50ZXJmYWNlKQogICAgICAgICByZXR1cm4gaW50ZXJmYWNlLT5oaXN0 b3J5Q29udGFpbnMoUVN0cmluZyhyZWludGVycHJldF9jYXN0PFFDaGFyKj4odXJsLmRhdGEoKSks IHVybC5zaXplKCkpKSA/IFBzZXVkb1Zpc2l0ZWQgOiBQc2V1ZG9MaW5rOwotI2VuZGlmCiAKICAg ICBMaW5rSGFzaCBoYXNoID0gdmlzaXRlZExpbmtIYXNoKHVybC5kYXRhKCksIHVybC5zaXplKCkp OwogICAgIGlmICghaGFzaCkKICAgICAgICAgcmV0dXJuIFBzZXVkb0xpbms7CisjZWxzZQorICAg IExpbmtIYXNoIGhhc2ggPSB2aXNpdGVkTGlua0hhc2gobV9kb2N1bWVudC0+YmFzZVVSTCgpLCAq YXR0cik7CisgICAgaWYgKCFoYXNoKQorICAgICAgICByZXR1cm4gUHNldWRvTGluazsKKyNlbmRp ZgorCisgICAgRnJhbWUqIGZyYW1lID0gbV9kb2N1bWVudC0+ZnJhbWUoKTsKKyAgICBpZiAoIWZy YW1lKQorICAgICAgICByZXR1cm4gUHNldWRvTGluazsKKworICAgIFBhZ2UqIHBhZ2UgPSBmcmFt ZS0+cGFnZSgpOworICAgIGlmICghcGFnZSkKKyAgICAgICAgcmV0dXJuIFBzZXVkb0xpbms7CisK ICAgICBtX2xpbmtzQ2hlY2tlZEZvclZpc2l0ZWRTdGF0ZS5hZGQoaGFzaCk7CiAgICAgcmV0dXJu IHBhZ2UtPmdyb3VwKCkuaXNMaW5rVmlzaXRlZChoYXNoKSA/IFBzZXVkb1Zpc2l0ZWQgOiBQc2V1 ZG9MaW5rOwogfQo=