16389 2007-12-10 14:50:48 -0800 Common Implementation of NetscapePlugInStreamLoader 2007-12-16 17:50:57 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 0 dobey webkit-unassigned oldest_to_newest 63867 0 dobey 2007-12-10 14:50:48 -0800 The code in NetscapePlugInStreamLoaderWin.cpp is not specific to win32, and is usable on other platforms as well. We should use this code as the default implementation, rather than having no implementation for the default. This patch adds this code to the common loader/NetscapePlugInStreamLoader.cpp as the common default implementation. 63868 1 17829 dobey 2007-12-10 14:51:22 -0800 Created attachment 17829 Common impl of NetscapePlugInStreamLoader 63881 2 17829 mrowe 2007-12-10 20:18:52 -0800 Comment on attachment 17829 Common impl of NetscapePlugInStreamLoader My reading of this suggests that we'd now have two identical implementations of NetscapePlugInStreamLoader in the tree. This code should be shared rather than duplicated. 63928 3 dobey 2007-12-11 08:10:41 -0800 (In reply to comment #2) > (From update of attachment 17829 [edit]) > My reading of this suggests that we'd now have two identical implementations of > NetscapePlugInStreamLoader in the tree. This code should be shared rather than > duplicated. > This would be that shared code. I don't know how to remove the file from the win32 builds, as a different build system is used there. I could remove the win32 port file from svn with this patch, but then it would just break the build. The appropriate build files need to be updated as well. Should I just resubmit with the file removal in the patch also? 64048 4 17868 dobey 2007-12-12 13:29:16 -0800 Created attachment 17868 Updated patch to remove win32 specific portions This updated patch also removes the NetscapePlugInLoaderWin.cpp file and it's reference in the WebCore.vcproj. 64222 5 17868 mjs 2007-12-14 15:52:59 -0800 Comment on attachment 17868 Updated patch to remove win32 specific portions r=me 64452 6 mrowe 2007-12-16 17:50:57 -0800 Landed in r28790. 17829 2007-12-10 14:51:22 -0800 2007-12-12 13:29:16 -0800 Common impl of NetscapePlugInStreamLoader webkit-nspl-common.patch text/plain 3234 dobey SW5kZXg6IFdlYkNvcmUvbG9hZGVyL05ldHNjYXBlUGx1Z0luU3RyZWFtTG9hZGVyLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJDb3JlL2xvYWRlci9OZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlci5jcHAJ KHJldmlzaW9uIDI4NTgxKQorKysgV2ViQ29yZS9sb2FkZXIvTmV0c2NhcGVQbHVnSW5TdHJlYW1M b2FkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yOSw4ICsyOSw5MSBAQAogI2luY2x1ZGUgImNv bmZpZy5oIgogI2luY2x1ZGUgIk5ldHNjYXBlUGx1Z0luU3RyZWFtTG9hZGVyLmgiCiAKKyNpbmNs dWRlICJGcmFtZUxvYWRlci5oIgogI2luY2x1ZGUgIkRvY3VtZW50TG9hZGVyLmgiCiAKIG5hbWVz cGFjZSBXZWJDb3JlIHsKIAorTmV0c2NhcGVQbHVnSW5TdHJlYW1Mb2FkZXI6Ok5ldHNjYXBlUGx1 Z0luU3RyZWFtTG9hZGVyKEZyYW1lKiBmcmFtZSwgTmV0c2NhcGVQbHVnSW5TdHJlYW1Mb2FkZXJD bGllbnQqIGNsaWVudCkKKyAgICA6IFJlc291cmNlTG9hZGVyKGZyYW1lLCB0cnVlLCB0cnVlKQor ICAgICwgbV9jbGllbnQoY2xpZW50KQoreworfQorCitOZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRl cjo6fk5ldHNjYXBlUGx1Z0luU3RyZWFtTG9hZGVyKCkKK3sKK30KKworUGFzc1JlZlB0cjxOZXRz Y2FwZVBsdWdJblN0cmVhbUxvYWRlcj4gTmV0c2NhcGVQbHVnSW5TdHJlYW1Mb2FkZXI6OmNyZWF0 ZShGcmFtZSogZnJhbWUsIE5ldHNjYXBlUGx1Z0luU3RyZWFtTG9hZGVyQ2xpZW50KiBjbGllbnQp Cit7CisgICAgcmV0dXJuIG5ldyBOZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlcihmcmFtZSwgY2xp ZW50KTsKK30KKworYm9vbCBOZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlcjo6aXNEb25lKCkgY29u c3QKK3sKKyAgICByZXR1cm4gIW1fY2xpZW50OworfQorCit2b2lkIE5ldHNjYXBlUGx1Z0luU3Ry ZWFtTG9hZGVyOjpyZWxlYXNlUmVzb3VyY2VzKCkKK3sKKyAgICBtX2NsaWVudCA9IDA7CisgICAg UmVzb3VyY2VMb2FkZXI6OnJlbGVhc2VSZXNvdXJjZXMoKTsKK30KKwordm9pZCBOZXRzY2FwZVBs dWdJblN0cmVhbUxvYWRlcjo6ZGlkUmVjZWl2ZVJlc3BvbnNlKGNvbnN0IFJlc291cmNlUmVzcG9u c2UmIHJlc3BvbnNlKQoreworICAgIFJlZlB0cjxOZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlcj4g cHJvdGVjdCh0aGlzKTsKKworICAgIG1fY2xpZW50LT5kaWRSZWNlaXZlUmVzcG9uc2UodGhpcywg cmVzcG9uc2UpOworCisgICAgLy8gRG9uJ3QgY29udGludWUgaWYgdGhlIHN0cmVhbSBpcyBjYW5j ZWxsZWQKKyAgICBpZiAoIW1fY2xpZW50KQorICAgICAgICByZXR1cm47CisKKyAgICBSZXNvdXJj ZUxvYWRlcjo6ZGlkUmVjZWl2ZVJlc3BvbnNlKHJlc3BvbnNlKTsKKworICAgIC8vIERvbid0IGNv bnRpbnVlIGlmIHRoZSBzdHJlYW0gaXMgY2FuY2VsbGVkCisgICAgaWYgKCFtX2NsaWVudCkKKyAg ICAgICAgcmV0dXJuOworCisgICAgaWYgKHJlc3BvbnNlLmlzSFRUUCgpICYmIChyZXNwb25zZS5o dHRwU3RhdHVzQ29kZSgpIDwgMTAwIHx8IHJlc3BvbnNlLmh0dHBTdGF0dXNDb2RlKCkgPj0gNDAw KSkKKyAgICAgICAgZGlkQ2FuY2VsKGZyYW1lTG9hZGVyKCktPmZpbGVEb2VzTm90RXhpc3RFcnJv cihyZXNwb25zZSkpOworfQorCit2b2lkIE5ldHNjYXBlUGx1Z0luU3RyZWFtTG9hZGVyOjpkaWRS ZWNlaXZlRGF0YShjb25zdCBjaGFyKiBkYXRhLCBpbnQgbGVuZ3RoLCBsb25nIGxvbmcgbGVuZ3Ro UmVjZWl2ZWQsIGJvb2wgYWxsQXRPbmNlKQoreworICAgIFJlZlB0cjxOZXRzY2FwZVBsdWdJblN0 cmVhbUxvYWRlcj4gcHJvdGVjdCh0aGlzKTsKKworICAgIG1fY2xpZW50LT5kaWRSZWNlaXZlRGF0 YSh0aGlzLCBkYXRhLCBsZW5ndGgpOworICAgIAorICAgIFJlc291cmNlTG9hZGVyOjpkaWRSZWNl aXZlRGF0YShkYXRhLCBsZW5ndGgsIGxlbmd0aFJlY2VpdmVkLCBhbGxBdE9uY2UpOworfQorCit2 b2lkIE5ldHNjYXBlUGx1Z0luU3RyZWFtTG9hZGVyOjpkaWRGaW5pc2hMb2FkaW5nKCkKK3sKKyAg ICBSZWZQdHI8TmV0c2NhcGVQbHVnSW5TdHJlYW1Mb2FkZXI+IHByb3RlY3QodGhpcyk7CisKKyAg ICBtX2RvY3VtZW50TG9hZGVyLT5yZW1vdmVQbHVnSW5TdHJlYW1Mb2FkZXIodGhpcyk7CisgICAg bV9jbGllbnQtPmRpZEZpbmlzaExvYWRpbmcodGhpcyk7CisgICAgUmVzb3VyY2VMb2FkZXI6OmRp ZEZpbmlzaExvYWRpbmcoKTsKK30KKwordm9pZCBOZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlcjo6 ZGlkRmFpbChjb25zdCBSZXNvdXJjZUVycm9yJiBlcnJvcikKK3sKKyAgICBSZWZQdHI8TmV0c2Nh cGVQbHVnSW5TdHJlYW1Mb2FkZXI+IHByb3RlY3QodGhpcyk7CisKKyAgICBtX2RvY3VtZW50TG9h ZGVyLT5yZW1vdmVQbHVnSW5TdHJlYW1Mb2FkZXIodGhpcyk7CisgICAgbV9jbGllbnQtPmRpZEZh aWwodGhpcywgZXJyb3IpOworICAgIFJlc291cmNlTG9hZGVyOjpkaWRGYWlsKGVycm9yKTsKK30K Kwordm9pZCBOZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlcjo6ZGlkQ2FuY2VsKGNvbnN0IFJlc291 cmNlRXJyb3ImIGVycm9yKQoreworICAgIFJlZlB0cjxOZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRl cj4gcHJvdGVjdCh0aGlzKTsKKworICAgIG1fZG9jdW1lbnRMb2FkZXItPnJlbW92ZVBsdWdJblN0 cmVhbUxvYWRlcih0aGlzKTsKKyAgICBtX2NsaWVudC0+ZGlkRmFpbCh0aGlzLCBlcnJvcik7Cisg ICAgUmVzb3VyY2VMb2FkZXI6OmRpZENhbmNlbChlcnJvcik7Cit9CisKIH0KSW5kZXg6IFdlYkNv cmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9nCShyZXZpc2lvbiAy ODU4OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTEg QEAKKzIwMDctMTItMTAgIFJvZG5leSBEYXdlcyAgPGRvYmV5QHdheW9mdGhlbW9ua2V5LmNvbT4K KworCVJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEhKQorCisJQ29tbW9uIGRlZmF1bHQgaW1wbGVt ZW50YXRpb24gb2YgTmV0c2NhcGVQbHVnSW5TdHJlYW1Mb2FkZXIKKworCSogbG9hZGVyL05ldHNj YXBlUGx1Z0luU3RyYWVtTG9hZGVyLmNwcDoKKwogMjAwNy0xMi0xMCAgQWxwIFRva2VyICA8YWxw QGF0b2tlci5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTmlrby4K 17868 2007-12-12 13:29:16 -0800 2007-12-14 15:52:59 -0800 Updated patch to remove win32 specific portions webkit-nspl-common.patch text/plain 8140 dobey SW5kZXg6IFdlYkNvcmUvbG9hZGVyL05ldHNjYXBlUGx1Z0luU3RyZWFtTG9hZGVyLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJDb3JlL2xvYWRlci9OZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlci5jcHAJ KHJldmlzaW9uIDI4NTgxKQorKysgV2ViQ29yZS9sb2FkZXIvTmV0c2NhcGVQbHVnSW5TdHJlYW1M b2FkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yOSw4ICsyOSw5MSBAQAogI2luY2x1ZGUgImNv bmZpZy5oIgogI2luY2x1ZGUgIk5ldHNjYXBlUGx1Z0luU3RyZWFtTG9hZGVyLmgiCiAKKyNpbmNs dWRlICJGcmFtZUxvYWRlci5oIgogI2luY2x1ZGUgIkRvY3VtZW50TG9hZGVyLmgiCiAKIG5hbWVz cGFjZSBXZWJDb3JlIHsKIAorTmV0c2NhcGVQbHVnSW5TdHJlYW1Mb2FkZXI6Ok5ldHNjYXBlUGx1 Z0luU3RyZWFtTG9hZGVyKEZyYW1lKiBmcmFtZSwgTmV0c2NhcGVQbHVnSW5TdHJlYW1Mb2FkZXJD bGllbnQqIGNsaWVudCkKKyAgICA6IFJlc291cmNlTG9hZGVyKGZyYW1lLCB0cnVlLCB0cnVlKQor ICAgICwgbV9jbGllbnQoY2xpZW50KQoreworfQorCitOZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRl cjo6fk5ldHNjYXBlUGx1Z0luU3RyZWFtTG9hZGVyKCkKK3sKK30KKworUGFzc1JlZlB0cjxOZXRz Y2FwZVBsdWdJblN0cmVhbUxvYWRlcj4gTmV0c2NhcGVQbHVnSW5TdHJlYW1Mb2FkZXI6OmNyZWF0 ZShGcmFtZSogZnJhbWUsIE5ldHNjYXBlUGx1Z0luU3RyZWFtTG9hZGVyQ2xpZW50KiBjbGllbnQp Cit7CisgICAgcmV0dXJuIG5ldyBOZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlcihmcmFtZSwgY2xp ZW50KTsKK30KKworYm9vbCBOZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlcjo6aXNEb25lKCkgY29u c3QKK3sKKyAgICByZXR1cm4gIW1fY2xpZW50OworfQorCit2b2lkIE5ldHNjYXBlUGx1Z0luU3Ry ZWFtTG9hZGVyOjpyZWxlYXNlUmVzb3VyY2VzKCkKK3sKKyAgICBtX2NsaWVudCA9IDA7CisgICAg UmVzb3VyY2VMb2FkZXI6OnJlbGVhc2VSZXNvdXJjZXMoKTsKK30KKwordm9pZCBOZXRzY2FwZVBs dWdJblN0cmVhbUxvYWRlcjo6ZGlkUmVjZWl2ZVJlc3BvbnNlKGNvbnN0IFJlc291cmNlUmVzcG9u c2UmIHJlc3BvbnNlKQoreworICAgIFJlZlB0cjxOZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlcj4g cHJvdGVjdCh0aGlzKTsKKworICAgIG1fY2xpZW50LT5kaWRSZWNlaXZlUmVzcG9uc2UodGhpcywg cmVzcG9uc2UpOworCisgICAgLy8gRG9uJ3QgY29udGludWUgaWYgdGhlIHN0cmVhbSBpcyBjYW5j ZWxsZWQKKyAgICBpZiAoIW1fY2xpZW50KQorICAgICAgICByZXR1cm47CisKKyAgICBSZXNvdXJj ZUxvYWRlcjo6ZGlkUmVjZWl2ZVJlc3BvbnNlKHJlc3BvbnNlKTsKKworICAgIC8vIERvbid0IGNv bnRpbnVlIGlmIHRoZSBzdHJlYW0gaXMgY2FuY2VsbGVkCisgICAgaWYgKCFtX2NsaWVudCkKKyAg ICAgICAgcmV0dXJuOworCisgICAgaWYgKHJlc3BvbnNlLmlzSFRUUCgpICYmIChyZXNwb25zZS5o dHRwU3RhdHVzQ29kZSgpIDwgMTAwIHx8IHJlc3BvbnNlLmh0dHBTdGF0dXNDb2RlKCkgPj0gNDAw KSkKKyAgICAgICAgZGlkQ2FuY2VsKGZyYW1lTG9hZGVyKCktPmZpbGVEb2VzTm90RXhpc3RFcnJv cihyZXNwb25zZSkpOworfQorCit2b2lkIE5ldHNjYXBlUGx1Z0luU3RyZWFtTG9hZGVyOjpkaWRS ZWNlaXZlRGF0YShjb25zdCBjaGFyKiBkYXRhLCBpbnQgbGVuZ3RoLCBsb25nIGxvbmcgbGVuZ3Ro UmVjZWl2ZWQsIGJvb2wgYWxsQXRPbmNlKQoreworICAgIFJlZlB0cjxOZXRzY2FwZVBsdWdJblN0 cmVhbUxvYWRlcj4gcHJvdGVjdCh0aGlzKTsKKworICAgIG1fY2xpZW50LT5kaWRSZWNlaXZlRGF0 YSh0aGlzLCBkYXRhLCBsZW5ndGgpOworICAgIAorICAgIFJlc291cmNlTG9hZGVyOjpkaWRSZWNl aXZlRGF0YShkYXRhLCBsZW5ndGgsIGxlbmd0aFJlY2VpdmVkLCBhbGxBdE9uY2UpOworfQorCit2 b2lkIE5ldHNjYXBlUGx1Z0luU3RyZWFtTG9hZGVyOjpkaWRGaW5pc2hMb2FkaW5nKCkKK3sKKyAg ICBSZWZQdHI8TmV0c2NhcGVQbHVnSW5TdHJlYW1Mb2FkZXI+IHByb3RlY3QodGhpcyk7CisKKyAg ICBtX2RvY3VtZW50TG9hZGVyLT5yZW1vdmVQbHVnSW5TdHJlYW1Mb2FkZXIodGhpcyk7CisgICAg bV9jbGllbnQtPmRpZEZpbmlzaExvYWRpbmcodGhpcyk7CisgICAgUmVzb3VyY2VMb2FkZXI6OmRp ZEZpbmlzaExvYWRpbmcoKTsKK30KKwordm9pZCBOZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlcjo6 ZGlkRmFpbChjb25zdCBSZXNvdXJjZUVycm9yJiBlcnJvcikKK3sKKyAgICBSZWZQdHI8TmV0c2Nh cGVQbHVnSW5TdHJlYW1Mb2FkZXI+IHByb3RlY3QodGhpcyk7CisKKyAgICBtX2RvY3VtZW50TG9h ZGVyLT5yZW1vdmVQbHVnSW5TdHJlYW1Mb2FkZXIodGhpcyk7CisgICAgbV9jbGllbnQtPmRpZEZh aWwodGhpcywgZXJyb3IpOworICAgIFJlc291cmNlTG9hZGVyOjpkaWRGYWlsKGVycm9yKTsKK30K Kwordm9pZCBOZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlcjo6ZGlkQ2FuY2VsKGNvbnN0IFJlc291 cmNlRXJyb3ImIGVycm9yKQoreworICAgIFJlZlB0cjxOZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRl cj4gcHJvdGVjdCh0aGlzKTsKKworICAgIG1fZG9jdW1lbnRMb2FkZXItPnJlbW92ZVBsdWdJblN0 cmVhbUxvYWRlcih0aGlzKTsKKyAgICBtX2NsaWVudC0+ZGlkRmFpbCh0aGlzLCBlcnJvcik7Cisg ICAgUmVzb3VyY2VMb2FkZXI6OmRpZENhbmNlbChlcnJvcik7Cit9CisKIH0KSW5kZXg6IFdlYkNv cmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9nCShyZXZpc2lvbiAy ODU4OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTEg QEAKKzIwMDctMTItMTAgIFJvZG5leSBEYXdlcyAgPGRvYmV5QHdheW9mdGhlbW9ua2V5LmNvbT4K KworCVJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEhKQorCisJQ29tbW9uIGRlZmF1bHQgaW1wbGVt ZW50YXRpb24gb2YgTmV0c2NhcGVQbHVnSW5TdHJlYW1Mb2FkZXIKKworCSogbG9hZGVyL05ldHNj YXBlUGx1Z0luU3RyYWVtTG9hZGVyLmNwcDoKKwogMjAwNy0xMi0xMCAgQWxwIFRva2VyICA8YWxw QGF0b2tlci5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTmlrby4KSW5kZXg6IFdlYkNvcmUv V2ViQ29yZS52Y3Byb2ovV2ViQ29yZS52Y3Byb2oKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9XZWJD b3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvagkocmV2aXNpb24gMjg2NTUpCisrKyBXZWJDb3JlL1dl YkNvcmUudmNwcm9qL1dlYkNvcmUudmNwcm9qCSh3b3JraW5nIGNvcHkpCkBAIC0yOTk0LDE0ICsy OTk0LDYgQEAKIAkJCQkJPg0KIAkJCQk8L0ZpbGU+DQogCQkJPC9GaWx0ZXI+DQotCQkJPEZpbHRl cg0KLQkJCQlOYW1lPSJ3aW4iDQotCQkJCT4NCi0JCQkJPEZpbGUNCi0JCQkJCVJlbGF0aXZlUGF0 aD0iLi5cbG9hZGVyXHdpblxOZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlcldpbi5jcHAiDQotCQkJ CQk+DQotCQkJCTwvRmlsZT4NCi0JCQk8L0ZpbHRlcj4NCiAJCTwvRmlsdGVyPg0KIAkJPEZpbHRl cg0KIAkJCU5hbWU9InBsYXRmb3JtIg0KSW5kZXg6IFdlYkNvcmUvbG9hZGVyL3dpbi9OZXRzY2Fw ZVBsdWdJblN0cmVhbUxvYWRlcldpbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9sb2FkZXIv d2luL05ldHNjYXBlUGx1Z0luU3RyZWFtTG9hZGVyV2luLmNwcAkocmV2aXNpb24gMjg2NTUpCisr KyBXZWJDb3JlL2xvYWRlci93aW4vTmV0c2NhcGVQbHVnSW5TdHJlYW1Mb2FkZXJXaW4uY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0xLDExOSArMCwwIEBACi0vKgotICogQ29weXJpZ2h0IChDKSAyMDA2 IEFwcGxlIENvbXB1dGVyLCBJbmMuICBBbGwgcmlnaHRzIHJlc2VydmVkLgotICoKLSAqIFJlZGlz dHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0 aG91dAotICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZv bGxvd2luZyBjb25kaXRpb25zCi0gKiBhcmUgbWV0OgotICoKLSAqIDEuICBSZWRpc3RyaWJ1dGlv bnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAotICogICAg IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xh aW1lci4gCi0gKiAyLiAgUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9k dWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKLSAqICAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25k aXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCi0gKiAgICAgZG9jdW1l bnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1 dGlvbi4gCi0gKiAzLiAgTmVpdGhlciB0aGUgbmFtZSBvZiBBcHBsZSBDb21wdXRlciwgSW5jLiAo IkFwcGxlIikgbm9yIHRoZSBuYW1lcyBvZgotICogICAgIGl0cyBjb250cmlidXRvcnMgbWF5IGJl IHVzZWQgdG8gZW5kb3JzZSBvciBwcm9tb3RlIHByb2R1Y3RzIGRlcml2ZWQKLSAqICAgICBmcm9t IHRoaXMgc29mdHdhcmUgd2l0aG91dCBzcGVjaWZpYyBwcmlvciB3cml0dGVuIHBlcm1pc3Npb24u IAotICoKLSAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgQU5EIElUUyBDT05U UklCVVRPUlMgIkFTIElTIiBBTkQgQU5ZCi0gKiBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElF UywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFRIRSBJTVBMSUVECi0gKiBXQVJSQU5U SUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBP U0UgQVJFCi0gKiBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBPUiBJVFMgQ09O VFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZCi0gKiBESVJFQ1QsIElORElSRUNULCBJTkNJREVO VEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUwotICogKElO Q0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdP T0RTIE9SIFNFUlZJQ0VTOwotICogTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJV U0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5ECi0gKiBPTiBBTlkgVEhFT1JZ IE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1Ig VE9SVAotICogKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBB TlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GCi0gKiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklT RUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgotICovCi0KLSNpbmNsdWRlICJj b25maWcuaCIKLSNpbmNsdWRlICJOZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlci5oIgotCi0jaW5j bHVkZSAiRnJhbWVMb2FkZXIuaCIKLSNpbmNsdWRlICJEb2N1bWVudExvYWRlci5oIgotCi1uYW1l c3BhY2UgV2ViQ29yZSB7Ci0KLU5ldHNjYXBlUGx1Z0luU3RyZWFtTG9hZGVyOjpOZXRzY2FwZVBs dWdJblN0cmVhbUxvYWRlcihGcmFtZSogZnJhbWUsIE5ldHNjYXBlUGx1Z0luU3RyZWFtTG9hZGVy Q2xpZW50KiBjbGllbnQpCi0gICAgOiBSZXNvdXJjZUxvYWRlcihmcmFtZSwgdHJ1ZSwgdHJ1ZSkK LSAgICAsIG1fY2xpZW50KGNsaWVudCkKLXsKLX0KLQotTmV0c2NhcGVQbHVnSW5TdHJlYW1Mb2Fk ZXI6On5OZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlcigpCi17Ci19Ci0KLVBhc3NSZWZQdHI8TmV0 c2NhcGVQbHVnSW5TdHJlYW1Mb2FkZXI+IE5ldHNjYXBlUGx1Z0luU3RyZWFtTG9hZGVyOjpjcmVh dGUoRnJhbWUqIGZyYW1lLCBOZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlckNsaWVudCogY2xpZW50 KQotewotICAgIHJldHVybiBuZXcgTmV0c2NhcGVQbHVnSW5TdHJlYW1Mb2FkZXIoZnJhbWUsIGNs aWVudCk7Ci19Ci0KLWJvb2wgTmV0c2NhcGVQbHVnSW5TdHJlYW1Mb2FkZXI6OmlzRG9uZSgpIGNv bnN0Ci17Ci0gICAgcmV0dXJuICFtX2NsaWVudDsKLX0KLQotdm9pZCBOZXRzY2FwZVBsdWdJblN0 cmVhbUxvYWRlcjo6cmVsZWFzZVJlc291cmNlcygpCi17Ci0gICAgbV9jbGllbnQgPSAwOwotICAg IFJlc291cmNlTG9hZGVyOjpyZWxlYXNlUmVzb3VyY2VzKCk7Ci19Ci0KLXZvaWQgTmV0c2NhcGVQ bHVnSW5TdHJlYW1Mb2FkZXI6OmRpZFJlY2VpdmVSZXNwb25zZShjb25zdCBSZXNvdXJjZVJlc3Bv bnNlJiByZXNwb25zZSkKLXsKLSAgICBSZWZQdHI8TmV0c2NhcGVQbHVnSW5TdHJlYW1Mb2FkZXI+ IHByb3RlY3QodGhpcyk7Ci0KLSAgICBtX2NsaWVudC0+ZGlkUmVjZWl2ZVJlc3BvbnNlKHRoaXMs IHJlc3BvbnNlKTsKLQotICAgIC8vIERvbid0IGNvbnRpbnVlIGlmIHRoZSBzdHJlYW0gaXMgY2Fu Y2VsbGVkCi0gICAgaWYgKCFtX2NsaWVudCkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgUmVzb3Vy Y2VMb2FkZXI6OmRpZFJlY2VpdmVSZXNwb25zZShyZXNwb25zZSk7Ci0KLSAgICAvLyBEb24ndCBj b250aW51ZSBpZiB0aGUgc3RyZWFtIGlzIGNhbmNlbGxlZAotICAgIGlmICghbV9jbGllbnQpCi0g ICAgICAgIHJldHVybjsKLQotICAgIGlmIChyZXNwb25zZS5pc0hUVFAoKSAmJiAocmVzcG9uc2Uu aHR0cFN0YXR1c0NvZGUoKSA8IDEwMCB8fCByZXNwb25zZS5odHRwU3RhdHVzQ29kZSgpID49IDQw MCkpCi0gICAgICAgIGRpZENhbmNlbChmcmFtZUxvYWRlcigpLT5maWxlRG9lc05vdEV4aXN0RXJy b3IocmVzcG9uc2UpKTsKLX0KLQotdm9pZCBOZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlcjo6ZGlk UmVjZWl2ZURhdGEoY29uc3QgY2hhciogZGF0YSwgaW50IGxlbmd0aCwgbG9uZyBsb25nIGxlbmd0 aFJlY2VpdmVkLCBib29sIGFsbEF0T25jZSkKLXsKLSAgICBSZWZQdHI8TmV0c2NhcGVQbHVnSW5T dHJlYW1Mb2FkZXI+IHByb3RlY3QodGhpcyk7Ci0KLSAgICBtX2NsaWVudC0+ZGlkUmVjZWl2ZURh dGEodGhpcywgZGF0YSwgbGVuZ3RoKTsKLSAgICAKLSAgICBSZXNvdXJjZUxvYWRlcjo6ZGlkUmVj ZWl2ZURhdGEoZGF0YSwgbGVuZ3RoLCBsZW5ndGhSZWNlaXZlZCwgYWxsQXRPbmNlKTsKLX0KLQot dm9pZCBOZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlcjo6ZGlkRmluaXNoTG9hZGluZygpCi17Ci0g ICAgUmVmUHRyPE5ldHNjYXBlUGx1Z0luU3RyZWFtTG9hZGVyPiBwcm90ZWN0KHRoaXMpOwotCi0g ICAgbV9kb2N1bWVudExvYWRlci0+cmVtb3ZlUGx1Z0luU3RyZWFtTG9hZGVyKHRoaXMpOwotICAg IG1fY2xpZW50LT5kaWRGaW5pc2hMb2FkaW5nKHRoaXMpOwotICAgIFJlc291cmNlTG9hZGVyOjpk aWRGaW5pc2hMb2FkaW5nKCk7Ci19Ci0KLXZvaWQgTmV0c2NhcGVQbHVnSW5TdHJlYW1Mb2FkZXI6 OmRpZEZhaWwoY29uc3QgUmVzb3VyY2VFcnJvciYgZXJyb3IpCi17Ci0gICAgUmVmUHRyPE5ldHNj YXBlUGx1Z0luU3RyZWFtTG9hZGVyPiBwcm90ZWN0KHRoaXMpOwotCi0gICAgbV9kb2N1bWVudExv YWRlci0+cmVtb3ZlUGx1Z0luU3RyZWFtTG9hZGVyKHRoaXMpOwotICAgIG1fY2xpZW50LT5kaWRG YWlsKHRoaXMsIGVycm9yKTsKLSAgICBSZXNvdXJjZUxvYWRlcjo6ZGlkRmFpbChlcnJvcik7Ci19 Ci0KLXZvaWQgTmV0c2NhcGVQbHVnSW5TdHJlYW1Mb2FkZXI6OmRpZENhbmNlbChjb25zdCBSZXNv dXJjZUVycm9yJiBlcnJvcikKLXsKLSAgICBSZWZQdHI8TmV0c2NhcGVQbHVnSW5TdHJlYW1Mb2Fk ZXI+IHByb3RlY3QodGhpcyk7Ci0KLSAgICBtX2RvY3VtZW50TG9hZGVyLT5yZW1vdmVQbHVnSW5T dHJlYW1Mb2FkZXIodGhpcyk7Ci0gICAgbV9jbGllbnQtPmRpZEZhaWwodGhpcywgZXJyb3IpOwot ICAgIFJlc291cmNlTG9hZGVyOjpkaWRDYW5jZWwoZXJyb3IpOwotfQotCi19Cg==