74395 2011-12-13 02:49:00 -0800 [Qt][WK2] Move load & navigation related functions out of QtWebPageProxy 2011-12-13 13:28:40 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 72943 1 cmarcelo cmarcelo webkit.review.bot zoltan oldest_to_newest 519989 0 cmarcelo 2011-12-13 02:49:00 -0800 [Qt][WK2] Move load related functions from QtWebPageProxy to QtWebPageLoadClient 519990 1 118986 cmarcelo 2011-12-13 02:49:44 -0800 Created attachment 118986 Patch 520028 2 119004 cmarcelo 2011-12-13 04:30:00 -0800 Created attachment 119004 Patch 520032 3 cmarcelo 2011-12-13 04:35:46 -0800 Committed r102670: <http://trac.webkit.org/changeset/102670> 118986 2011-12-13 02:49:44 -0800 2011-12-13 04:29:52 -0800 Patch bug-74395-20111213075042.patch text/plain 9668 cmarcelo U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyNjY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggM2VmMGRiZjcxN2VlZDkx M2FhZGI3NzRmNzE1ZTFhZGY5NGUzOGZhNy4uYzYxYTdjNTZlMTZhYTcyNTZmNDk3OWE3YjA2NDQy YjFiNjA5OGViOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDExLTEyLTEzICBDYWlv IE1hcmNlbG8gZGUgT2xpdmVpcmEgRmlsaG8gIDxjYWlvLm9saXZlaXJhQG9wZW5ib3NzYS5vcmc+ CisKKyAgICAgICAgW1F0XVtXSzJdIE1vdmUgbG9hZCByZWxhdGVkIGZ1bmN0aW9ucyBmcm9tIFF0 V2ViUGFnZVByb3h5IHRvIFF0V2ViUGFnZUxvYWRDbGllbnQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc0Mzk1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZp ZXcuY3BwOgorICAgICAgICAoUVF1aWNrV2ViVmlldzo6bG9hZCk6CisgICAgICAgIChRUXVpY2tX ZWJWaWV3OjpzdG9wKToKKyAgICAgICAgKFFRdWlja1dlYlZpZXc6OnJlbG9hZCk6CisgICAgICAg IChRUXVpY2tXZWJWaWV3Ojpsb2FkaW5nKToKKyAgICAgICAgKFFRdWlja1dlYlZpZXc6OmNhblJl bG9hZCk6CisgICAgICAgIChRUXVpY2tXZWJWaWV3Ojpsb2FkSHRtbCk6CisgICAgICAgICogVUlQ cm9jZXNzL3F0L1F0V2ViUGFnZUxvYWRDbGllbnQuY3BwOgorICAgICAgICAoUXRXZWJQYWdlTG9h ZENsaWVudDo6UXRXZWJQYWdlTG9hZENsaWVudCk6CisgICAgICAgIChRdFdlYlBhZ2VMb2FkQ2xp ZW50Ojpsb2FkKToKKyAgICAgICAgKFF0V2ViUGFnZUxvYWRDbGllbnQ6OmxvYWRIVE1MU3RyaW5n KToKKyAgICAgICAgKFF0V2ViUGFnZUxvYWRDbGllbnQ6OmxvYWRpbmcpOgorICAgICAgICAoUXRX ZWJQYWdlTG9hZENsaWVudDo6c3RvcCk6CisgICAgICAgIChRdFdlYlBhZ2VMb2FkQ2xpZW50Ojpj YW5SZWxvYWQpOgorICAgICAgICAoUXRXZWJQYWdlTG9hZENsaWVudDo6cmVsb2FkKToKKyAgICAg ICAgKiBVSVByb2Nlc3MvcXQvUXRXZWJQYWdlTG9hZENsaWVudC5oOgorICAgICAgICAoUXRXZWJQ YWdlTG9hZENsaWVudDo6cGFnZVJlZik6CisgICAgICAgICogVUlQcm9jZXNzL3F0L1F0V2ViUGFn ZVByb3h5LmNwcDoKKyAgICAgICAgKiBVSVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuaDoKKwog MjAxMS0xMi0xMyAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAK ICAgICAgICAgVW5yZXZpZXdlZC4gRml4IEdUSysgYnVpbGQgYWZ0ZXIgcjEwMjY0MC4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHAg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwCmluZGV4 IDU5YjE2MzdjZmE3YjFlMDI0NjkxNWVkNjYyNDIwNmI1NGEzYTliOWQuLmZhZDk3OWZjYzE2YWE2 OGNjMDA1YjdiNTlkNDQwMTlhZTY0NzE4NTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcApAQCAtNTc5LDcgKzU3OSw3IEBAIFFRdWlj a1dlYlBhZ2UqIFFRdWlja1dlYlZpZXc6OnBhZ2UoKQogdm9pZCBRUXVpY2tXZWJWaWV3Ojpsb2Fk KGNvbnN0IFFVcmwmIHVybCkKIHsKICAgICBRX0QoUVF1aWNrV2ViVmlldyk7Ci0gICAgZC0+cGFn ZVByb3h5LT5sb2FkKHVybCk7CisgICAgZC0+cGFnZUxvYWRDbGllbnQtPmxvYWQodXJsKTsKIH0K IAogdm9pZCBRUXVpY2tXZWJWaWV3Ojpnb0JhY2soKQpAQCAtNTk3LDEzICs1OTcsMTMgQEAgdm9p ZCBRUXVpY2tXZWJWaWV3Ojpnb0ZvcndhcmQoKQogdm9pZCBRUXVpY2tXZWJWaWV3OjpzdG9wKCkK IHsKICAgICBRX0QoUVF1aWNrV2ViVmlldyk7Ci0gICAgZC0+cGFnZVByb3h5LT5zdG9wKCk7Cisg ICAgZC0+cGFnZUxvYWRDbGllbnQtPnN0b3AoKTsKIH0KIAogdm9pZCBRUXVpY2tXZWJWaWV3Ojpy ZWxvYWQoKQogewogICAgIFFfRChRUXVpY2tXZWJWaWV3KTsKLSAgICBkLT5wYWdlUHJveHktPnJl bG9hZCgpOworICAgIGQtPnBhZ2VMb2FkQ2xpZW50LT5yZWxvYWQoKTsKIH0KIAogUVVybCBRUXVp Y2tXZWJWaWV3Ojp1cmwoKSBjb25zdApAQCAtNjMzLDEzICs2MzMsMTMgQEAgYm9vbCBRUXVpY2tX ZWJWaWV3OjpjYW5Hb0ZvcndhcmQoKSBjb25zdAogYm9vbCBRUXVpY2tXZWJWaWV3Ojpsb2FkaW5n KCkgY29uc3QKIHsKICAgICBRX0QoY29uc3QgUVF1aWNrV2ViVmlldyk7Ci0gICAgcmV0dXJuIGQt PnBhZ2VQcm94eS0+bG9hZGluZygpOworICAgIHJldHVybiBkLT5wYWdlTG9hZENsaWVudC0+bG9h ZGluZygpOwogfQogCiBib29sIFFRdWlja1dlYlZpZXc6OmNhblJlbG9hZCgpIGNvbnN0CiB7CiAg ICAgUV9EKGNvbnN0IFFRdWlja1dlYlZpZXcpOwotICAgIHJldHVybiBkLT5wYWdlUHJveHktPmNh blJlbG9hZCgpOworICAgIHJldHVybiBkLT5wYWdlTG9hZENsaWVudC0+Y2FuUmVsb2FkKCk7CiB9 CiAKIFFTdHJpbmcgUVF1aWNrV2ViVmlldzo6dGl0bGUoKSBjb25zdApAQCAtNzE4LDcgKzcxOCw3 IEBAIFdLUGFnZVJlZiBRUXVpY2tXZWJWaWV3OjpwYWdlUmVmKCkgY29uc3QKIHZvaWQgUVF1aWNr V2ViVmlldzo6bG9hZEh0bWwoY29uc3QgUVN0cmluZyYgaHRtbCwgY29uc3QgUVVybCYgYmFzZVVy bCkKIHsKICAgICBRX0QoUVF1aWNrV2ViVmlldyk7Ci0gICAgZC0+cGFnZVByb3h5LT5sb2FkSFRN TFN0cmluZyhodG1sLCBiYXNlVXJsKTsKKyAgICBkLT5wYWdlTG9hZENsaWVudC0+bG9hZEhUTUxT dHJpbmcoaHRtbCwgYmFzZVVybCk7CiB9CiAKICNpbmNsdWRlICJtb2NfcXF1aWNrd2Vidmlld19w LmNwcCIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VM b2FkQ2xpZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VMb2Fk Q2xpZW50LmNwcAppbmRleCAxM2FmYjIxNDAyN2IyOWY4NWNkZWIzMWU3ZWVhYjJiNjg5MjQ3Yzdl Li42MTAwNDlkNzgyMjA4MWY5Y2VkNzIyYWU1MGJiYmQ5OWYzNDYzMDgxIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlTG9hZENsaWVudC5jcHAKKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZUxvYWRDbGllbnQuY3BwCkBAIC0y MSwxMyArMjEsMTcgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJRdFdlYlBhZ2VM b2FkQ2xpZW50LmgiCiAKKyNpbmNsdWRlICJXS1JldGFpblB0ci5oIgogI2luY2x1ZGUgIldLU3Ry aW5nUXQuaCIKKyNpbmNsdWRlICJXS1VSTFF0LmgiCiAjaW5jbHVkZSAicXF1aWNrd2Vidmlld19w LmgiCiAjaW5jbHVkZSAicXF1aWNrd2Vidmlld19wX3AuaCIKKyNpbmNsdWRlIDxXS0JhY2tGb3J3 YXJkTGlzdC5oPgogI2luY2x1ZGUgPFdLRnJhbWUuaD4KIAogUXRXZWJQYWdlTG9hZENsaWVudDo6 UXRXZWJQYWdlTG9hZENsaWVudChXS1BhZ2VSZWYgcGFnZVJlZiwgUVF1aWNrV2ViVmlldyogd2Vi VmlldykKLSAgICA6IG1fd2ViVmlldyh3ZWJWaWV3KQorICAgIDogbV9wYWdlUmVmKHBhZ2VSZWYp CisgICAgLCBtX3dlYlZpZXcod2ViVmlldykKICAgICAsIG1fbG9hZFByb2dyZXNzKDApCiB7CiAg ICAgV0tQYWdlTG9hZGVyQ2xpZW50IGxvYWRDbGllbnQ7CkBAIC00OSw2ICs1Myw0NCBAQCBRdFdl YlBhZ2VMb2FkQ2xpZW50OjpRdFdlYlBhZ2VMb2FkQ2xpZW50KFdLUGFnZVJlZiBwYWdlUmVmLCBR UXVpY2tXZWJWaWV3KiB3ZWJWaQogICAgIFdLUGFnZVNldFBhZ2VMb2FkZXJDbGllbnQocGFnZVJl ZiwgJmxvYWRDbGllbnQpOwogfQogCit2b2lkIFF0V2ViUGFnZUxvYWRDbGllbnQ6OmxvYWQoY29u c3QgUVVybCYgdXJsKQoreworICAgIFdLUmV0YWluUHRyPFdLVVJMUmVmPiB3a1VybCA9IGFkb3B0 V0soV0tVUkxDcmVhdGVXaXRoUVVybCh1cmwpKTsKKyAgICBXS1BhZ2VMb2FkVVJMKHBhZ2VSZWYo KSwgd2tVcmwuZ2V0KCkpOworfQorCit2b2lkIFF0V2ViUGFnZUxvYWRDbGllbnQ6OmxvYWRIVE1M U3RyaW5nKGNvbnN0IFFTdHJpbmcmIGh0bWwsIGNvbnN0IFFVcmwmIGJhc2VVcmwpCit7CisgICAg V0tSZXRhaW5QdHI8V0tVUkxSZWY+IHdrVXJsKFdLVVJMQ3JlYXRlV2l0aFFVcmwoYmFzZVVybCkp OworICAgIFdLUmV0YWluUHRyPFdLU3RyaW5nUmVmPiB3a0h0bWxTdHJpbmcoV0tTdHJpbmdDcmVh dGVXaXRoUVN0cmluZyhodG1sKSk7CisgICAgV0tQYWdlTG9hZEhUTUxTdHJpbmcocGFnZVJlZigp LCB3a0h0bWxTdHJpbmcuZ2V0KCksIHdrVXJsLmdldCgpKTsKK30KKworYm9vbCBRdFdlYlBhZ2VM b2FkQ2xpZW50Ojpsb2FkaW5nKCkgY29uc3QKK3sKKyAgICBXS1JldGFpblB0cjxXS0ZyYW1lUmVm PiBtYWluRnJhbWUgPSBXS1BhZ2VHZXRNYWluRnJhbWUocGFnZVJlZigpKTsKKyAgICByZXR1cm4g bWFpbkZyYW1lICYmICEoV0tGcmFtZUdldEZyYW1lTG9hZFN0YXRlKG1haW5GcmFtZS5nZXQoKSkg PT0ga1dLRnJhbWVMb2FkU3RhdGVGaW5pc2hlZCk7Cit9CisKK3ZvaWQgUXRXZWJQYWdlTG9hZENs aWVudDo6c3RvcCgpCit7CisgICAgV0tQYWdlU3RvcExvYWRpbmcocGFnZVJlZigpKTsKK30KKwor Ym9vbCBRdFdlYlBhZ2VMb2FkQ2xpZW50OjpjYW5SZWxvYWQoKSBjb25zdAoreworICAgIFdLUmV0 YWluUHRyPFdLRnJhbWVSZWY+IG1haW5GcmFtZSA9IFdLUGFnZUdldE1haW5GcmFtZShwYWdlUmVm KCkpOworICAgIGlmIChtYWluRnJhbWUpCisgICAgICAgIHJldHVybiAhKFdLRnJhbWVHZXRGcmFt ZUxvYWRTdGF0ZShtYWluRnJhbWUuZ2V0KCkpID09IGtXS0ZyYW1lTG9hZFN0YXRlRmluaXNoZWQp OworICAgIFdLUmV0YWluUHRyPFdLQmFja0ZvcndhcmRMaXN0UmVmPiBiYWNrRm9yd2FyZExpc3Qg PSBXS1BhZ2VHZXRCYWNrRm9yd2FyZExpc3QocGFnZVJlZigpKTsKKyAgICByZXR1cm4gV0tCYWNr Rm9yd2FyZExpc3RHZXRCYWNrTGlzdENvdW50KGJhY2tGb3J3YXJkTGlzdC5nZXQoKSk7Cit9CisK K3ZvaWQgUXRXZWJQYWdlTG9hZENsaWVudDo6cmVsb2FkKCkKK3sKKyAgICBXS1BhZ2VSZWxvYWRG cm9tT3JpZ2luKHBhZ2VSZWYoKSk7Cit9CisKIHZvaWQgUXRXZWJQYWdlTG9hZENsaWVudDo6ZGlk U3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZSgpCiB7CiAgICAgZW1pdCBtX3dlYlZpZXctPm5h dmlnYXRpb25TdGF0ZUNoYW5nZWQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9xdC9RdFdlYlBhZ2VMb2FkQ2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv cXQvUXRXZWJQYWdlTG9hZENsaWVudC5oCmluZGV4IGZiZGI5MmU3YmU2OWRhNWEzZDdkOGYzY2Jl NjYyNzg1M2FkN2IyNGMuLjYzYWM2ZGVlZWI3NmY2ZGM0NGI0YzQwMTBiY2EyNGVmMWUwOWViNmEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VMb2FkQ2xp ZW50LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZUxvYWRDbGll bnQuaApAQCAtMjIsNiArMjIsNyBAQAogI2RlZmluZSBRdFdlYlBhZ2VMb2FkQ2xpZW50X2gKIAog I2luY2x1ZGUgIlF0V2ViRXJyb3IuaCIKKyNpbmNsdWRlICJXS1JldGFpblB0ci5oIgogI2luY2x1 ZGUgPFF0Q29yZS9RU3RyaW5nPgogI2luY2x1ZGUgPFF0Q29yZS9RVXJsPgogI2luY2x1ZGUgPFdL UGFnZS5oPgpAQCAtMzIsNyArMzMsMTMgQEAgY2xhc3MgUXRXZWJQYWdlTG9hZENsaWVudCB7CiBw dWJsaWM6CiAgICAgUXRXZWJQYWdlTG9hZENsaWVudChXS1BhZ2VSZWYsIFFRdWlja1dlYlZpZXcq KTsKIAorICAgIHZvaWQgbG9hZChjb25zdCBRVXJsJik7CisgICAgdm9pZCBsb2FkSFRNTFN0cmlu Zyhjb25zdCBRU3RyaW5nJiBodG1sLCBjb25zdCBRVXJsJiBiYXNlVXJsKTsKICAgICBpbnQgbG9h ZFByb2dyZXNzKCkgY29uc3QgeyByZXR1cm4gbV9sb2FkUHJvZ3Jlc3M7IH0KKyAgICBib29sIGxv YWRpbmcoKSBjb25zdDsKKyAgICB2b2lkIHN0b3AoKTsKKyAgICBib29sIGNhblJlbG9hZCgpIGNv bnN0OworICAgIHZvaWQgcmVsb2FkKCk7CiAKIHByaXZhdGU6CiAgICAgdm9pZCBkaWRTdGFydFBy b3Zpc2lvbmFsTG9hZEZvckZyYW1lKCk7CkBAIC02MCw2ICs2Nyw5IEBAIHByaXZhdGU6CiAgICAg c3RhdGljIHZvaWQgZGlkRmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0Rm9yRnJhbWUoV0tQYWdl UmVmLCBXS0ZyYW1lUmVmLCBXS1R5cGVSZWYgdXNlckRhdGEsIGNvbnN0IHZvaWQqIGNsaWVudElu Zm8pOwogICAgIHN0YXRpYyB2b2lkIGRpZENoYW5nZUJhY2tGb3J3YXJkTGlzdChXS1BhZ2VSZWYs IFdLQmFja0ZvcndhcmRMaXN0SXRlbVJlZiwgV0tBcnJheVJlZiwgY29uc3Qgdm9pZCAqY2xpZW50 SW5mbyk7CiAKKyAgICBXS1BhZ2VSZWYgcGFnZVJlZigpIGNvbnN0IHsgcmV0dXJuIG1fcGFnZVJl Zi5nZXQoKTsgfQorCisgICAgV0tSZXRhaW5QdHI8V0tQYWdlUmVmPiBtX3BhZ2VSZWY7CiAgICAg UVF1aWNrV2ViVmlldyogbV93ZWJWaWV3OwogICAgIGludCBtX2xvYWRQcm9ncmVzczsKIH07CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuY3Bw IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZVByb3h5LmNwcAppbmRleCA0 ZmM1NmQ0NDVmM2JkMGI1NWQyMjRhNzgzYzc2MmU4NTA3N2I4YmJhLi44MjlhZGZmOThkYzcxN2U0 MjA0Yjg3NzVhNTAyMjc3Y2Q2MjJkYjJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9xdC9RdFdlYlBhZ2VQcm94eS5jcHAKQEAgLTM5LDcgKzM5LDYgQEAKICNpbmNsdWRlICJRdERv d25sb2FkTWFuYWdlci5oIgogI2luY2x1ZGUgIlF0UGFnZUNsaWVudC5oIgogI2luY2x1ZGUgIlF0 V2ViUGFnZUV2ZW50SGFuZGxlci5oIgotI2luY2x1ZGUgIldlYkJhY2tGb3J3YXJkTGlzdC5oIgog I2luY2x1ZGUgIldlYkNvbnRleHRNZW51UHJveHlRdC5oIgogI2luY2x1ZGUgIldlYlBvcHVwTWVu dVByb3h5UXQuaCIKICNpbmNsdWRlICJXS1N0cmluZ1F0LmgiCkBAIC0xODksMzAgKzE4OCw2IEBA IHZvaWQgUXRXZWJQYWdlUHJveHk6OmdvRm9yd2FyZFRvKGludCBpbmRleCkKICAgICBtX25hdmln YXRpb25IaXN0b3J5LT5kLT5nb0ZvcndhcmRUbyhpbmRleCk7CiB9CiAKLWJvb2wgUXRXZWJQYWdl UHJveHk6OmxvYWRpbmcoKSBjb25zdAotewotICAgIFJlZlB0cjxXZWJLaXQ6OldlYkZyYW1lUHJv eHk+IG1haW5GcmFtZSA9IG1fd2ViUGFnZVByb3h5LT5tYWluRnJhbWUoKTsKLSAgICByZXR1cm4g bWFpbkZyYW1lICYmICEoV2ViRnJhbWVQcm94eTo6TG9hZFN0YXRlRmluaXNoZWQgPT0gbWFpbkZy YW1lLT5sb2FkU3RhdGUoKSk7Ci19Ci0KLXZvaWQgUXRXZWJQYWdlUHJveHk6OnN0b3AoKQotewot ICAgIG1fd2ViUGFnZVByb3h5LT5zdG9wTG9hZGluZygpOwotfQotCi1ib29sIFF0V2ViUGFnZVBy b3h5OjpjYW5SZWxvYWQoKSBjb25zdAotewotICAgIFJlZlB0cjxXZWJLaXQ6OldlYkZyYW1lUHJv eHk+IG1haW5GcmFtZSA9IG1fd2ViUGFnZVByb3h5LT5tYWluRnJhbWUoKTsKLSAgICBpZiAobWFp bkZyYW1lKQotICAgICAgICByZXR1cm4gKFdlYkZyYW1lUHJveHk6OkxvYWRTdGF0ZUZpbmlzaGVk ID09IG1haW5GcmFtZS0+bG9hZFN0YXRlKCkpOwotICAgIHJldHVybiBtX3dlYlBhZ2VQcm94eS0+ YmFja0ZvcndhcmRMaXN0KCktPmN1cnJlbnRJdGVtKCk7Ci19Ci0KLXZvaWQgUXRXZWJQYWdlUHJv eHk6OnJlbG9hZCgpCi17Ci0gICAgbV93ZWJQYWdlUHJveHktPnJlbG9hZCgvKiByZWxvYWRGcm9t T3JpZ2luICovIHRydWUpOwotfQotCiB2b2lkIFF0V2ViUGFnZVByb3h5Ojp1cGRhdGVOYXZpZ2F0 aW9uU3RhdGUoKQogewogICAgIGVtaXQgbV9xbWxXZWJWaWV3LT5uYXZpZ2F0aW9uU3RhdGVDaGFu Z2VkKCk7CkBAIC0yNjcsMjAgKzI0Miw2IEBAIHZvaWQgUXRXZWJQYWdlUHJveHk6OnBvc3RNZXNz YWdlVG9OYXZpZ2F0b3JRdE9iamVjdChjb25zdCBRU3RyaW5nJiBtZXNzYWdlKQogICAgIG1fY29u dGV4dC0+cG9zdE1lc3NhZ2VUb05hdmlnYXRvclF0T2JqZWN0KG1fd2ViUGFnZVByb3h5LmdldCgp LCBtZXNzYWdlKTsKIH0KIAotdm9pZCBRdFdlYlBhZ2VQcm94eTo6bG9hZEhUTUxTdHJpbmcoY29u c3QgUVN0cmluZyYgaHRtbCwgY29uc3QgUVVybCYgYmFzZVVybCkKLXsKLSAgICBXS1JldGFpblB0 cjxXS1VSTFJlZj4gd2tVcmwoV0tVUkxDcmVhdGVXaXRoUVVybChiYXNlVXJsKSk7Ci0gICAgV0tS ZXRhaW5QdHI8V0tTdHJpbmdSZWY+IHdrSHRtbFN0cmluZyhXS1N0cmluZ0NyZWF0ZVdpdGhRU3Ry aW5nKGh0bWwpKTsKLQotICAgIFdLUGFnZUxvYWRIVE1MU3RyaW5nKHBhZ2VSZWYoKSwgd2tIdG1s U3RyaW5nLmdldCgpLCB3a1VybC5nZXQoKSk7Ci19Ci0KLXZvaWQgUXRXZWJQYWdlUHJveHk6Omxv YWQoY29uc3QgUVVybCYgdXJsKQotewotICAgIFdLUmV0YWluUHRyPFdLVVJMUmVmPiB3a3VybCA9 IGFkb3B0V0soV0tVUkxDcmVhdGVXaXRoUVVybCh1cmwpKTsKLSAgICBXS1BhZ2VMb2FkVVJMKHBh Z2VSZWYoKSwgd2t1cmwuZ2V0KCkpOwotfQotCiBRVXJsIFF0V2ViUGFnZVByb3h5Ojp1cmwoKSBj b25zdAogewogICAgIFdLUmV0YWluUHRyPFdLRnJhbWVSZWY+IGZyYW1lID0gV0tQYWdlR2V0TWFp bkZyYW1lKHBhZ2VSZWYoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv cXQvUXRXZWJQYWdlUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBh Z2VQcm94eS5oCmluZGV4IDVmNzA2MmUzOGVhNTFjOTM0OWViMjNmMzNmODE2NzNjMjFmOThiY2Uu LjlmZDU4NjVmZDAwODQzMDAwMmM3MjU0ZmMxZjFmYzJkOWE1MGQzNmEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQcm94eS5oCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQcm94eS5oCkBAIC03OSwxNyArNzksMTEgQEAg cHVibGljOgogICAgIGJvb2wgY2FuR29Gb3J3YXJkKCkgY29uc3Q7CiAgICAgdm9pZCBnb0Zvcndh cmQoKTsKICAgICB2b2lkIGdvRm9yd2FyZFRvKGludCBpbmRleCk7Ci0gICAgYm9vbCBsb2FkaW5n KCkgY29uc3Q7Ci0gICAgdm9pZCBzdG9wKCk7Ci0gICAgYm9vbCBjYW5SZWxvYWQoKSBjb25zdDsK LSAgICB2b2lkIHJlbG9hZCgpOwogCiAgICAgdm9pZCB1cGRhdGVOYXZpZ2F0aW9uU3RhdGUoKTsK IAogICAgIFdLUGFnZVJlZiBwYWdlUmVmKCkgY29uc3Q7CiAKLSAgICB2b2lkIGxvYWQoY29uc3Qg UVVybCYgdXJsKTsKLSAgICB2b2lkIGxvYWRIVE1MU3RyaW5nKGNvbnN0IFFTdHJpbmcmIGh0bWws IGNvbnN0IFFVcmwmIGJhc2VVcmwpOwogICAgIFFVcmwgdXJsKCkgY29uc3Q7CiAKICAgICB2b2lk IHNldERyYXdpbmdBcmVhU2l6ZShjb25zdCBRU2l6ZSYpOwo= 119004 2011-12-13 04:30:00 -0800 2011-12-13 04:33:48 -0800 Patch bug-74395-20111213093058.patch text/plain 12797 cmarcelo U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyNjY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggM2VmMGRiZjcxN2VlZDkx M2FhZGI3NzRmNzE1ZTFhZGY5NGUzOGZhNy4uZGU5ZWJmMGZjYjlhYTQ0ZjMxYzhlN2QyMWQ3Yzg5 MzM0MzIwNmY2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDExLTEyLTEzICBDYWlv IE1hcmNlbG8gZGUgT2xpdmVpcmEgRmlsaG8gIDxjYWlvLm9saXZlaXJhQG9wZW5ib3NzYS5vcmc+ CisKKyAgICAgICAgW1F0XVtXSzJdIE1vdmUgbG9hZCAmIG5hdmlnYXRpb24gcmVsYXRlZCBmdW5j dGlvbnMgb3V0IG9mIFF0V2ViUGFnZVByb3h5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD03NDM5NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogVGFyZ2V0LnByaToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L3F0L3FxdWlja3dlYnZpZXcuY3BwOgorICAgICAgICAoUVF1aWNrV2ViVmlld1ByaXZhdGU6Ol9x X29uVmlzaWJsZUNoYW5nZWQpOgorICAgICAgICAoUVF1aWNrV2ViVmlld1ByaXZhdGU6OnVwZGF0 ZVZpZXdwb3J0U2l6ZSk6CisgICAgICAgIChRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6Y29tcHV0ZVZp ZXdwb3J0Q29uc3RyYWludHMpOgorICAgICAgICAoUVF1aWNrV2ViVmlld1ByaXZhdGU6OnNldFVz ZVRyYWRpdGlvbmFsRGVza3RvcEJlaGF2aW91cik6CisgICAgICAgIChRUXVpY2tXZWJWaWV3UHJp dmF0ZTo6d2ViUGFnZVByb3h5KToKKyAgICAgICAgKFFRdWlja1dlYlZpZXc6OmxvYWQpOgorICAg ICAgICAoUVF1aWNrV2ViVmlldzo6Z29CYWNrKToKKyAgICAgICAgKFFRdWlja1dlYlZpZXc6Omdv Rm9yd2FyZCk6CisgICAgICAgIChRUXVpY2tXZWJWaWV3OjpzdG9wKToKKyAgICAgICAgKFFRdWlj a1dlYlZpZXc6OnJlbG9hZCk6CisgICAgICAgIChRUXVpY2tXZWJWaWV3Ojp1cmwpOgorICAgICAg ICAoUVF1aWNrV2ViVmlldzo6Y2FuR29CYWNrKToKKyAgICAgICAgKFFRdWlja1dlYlZpZXc6OmNh bkdvRm9yd2FyZCk6CisgICAgICAgIChRUXVpY2tXZWJWaWV3Ojpsb2FkaW5nKToKKyAgICAgICAg KFFRdWlja1dlYlZpZXc6OmNhblJlbG9hZCk6CisgICAgICAgIChRUXVpY2tXZWJWaWV3Ojp0aXRs ZSk6CisgICAgICAgIChRUXVpY2tXZWJWaWV3Ojpsb2FkSHRtbCk6CisgICAgICAgICogVUlQcm9j ZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3X3BfcC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9xdC9R dFdlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChRdFdlYlBhZ2VQcm94eTo6ZGlkUmVjZWl2ZU1l c3NhZ2VGcm9tTmF2aWdhdG9yUXRPYmplY3QpOgorICAgICAgICAqIFVJUHJvY2Vzcy9xdC9RdFdl YlBhZ2VQcm94eS5oOgorCiAyMDExLTEyLTEzICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJj aWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLiBGaXggR1RLKyBidWlsZCBhZnRl ciByMTAyNjQwLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVGFyZ2V0LnByaSBiL1NvdXJj ZS9XZWJLaXQyL1RhcmdldC5wcmkKaW5kZXggMTQ3NzE2NTRkNWE5ZDE3ZDJiYzFiNWY5Y2M0ZDE5 OWZlMjM3ZWM1Ny4uN2ViMDhjZDk1ZTkwYWE3MmEzZjEwNjJjZGNhZjkyOGU1NWI5NTQyZiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVGFyZ2V0LnByaQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9U YXJnZXQucHJpCkBAIC0yMTMsNiArMjEzLDcgQEAgSEVBREVSUyArPSBcCiAgICAgVUlQcm9jZXNz L1RpbGVkRHJhd2luZ0FyZWFQcm94eS5oIFwKICAgICBVSVByb2Nlc3MvVmlzaXRlZExpbmtQcm92 aWRlci5oIFwKICAgICBVSVByb2Nlc3MvV2ViQXBwbGljYXRpb25DYWNoZU1hbmFnZXJQcm94eS5o IFwKKyAgICBVSVByb2Nlc3MvV2ViQmFja0ZvcndhcmRMaXN0LmggXAogICAgIFVJUHJvY2Vzcy9X ZWJDb25uZWN0aW9uVG9XZWJQcm9jZXNzLmggXAogICAgIFVJUHJvY2Vzcy9XZWJDb250ZXh0Lmgg XAogICAgIFVJUHJvY2Vzcy9XZWJDb250ZXh0Q29ubmVjdGlvbkNsaWVudC5oIFwKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwCmluZGV4IDU5 YjE2MzdjZmE3YjFlMDI0NjkxNWVkNjYyNDIwNmI1NGEzYTliOWQuLjhhYjk0NmI5ZTU0Y2U1M2Q1 ZDliODk0N2Q3ZmY4ZGVlMDAwZDAxNmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcApAQCAtMjQsNiArMjQsNyBAQAogI2luY2x1ZGUg IlF0RGlhbG9nUnVubmVyLmgiCiAjaW5jbHVkZSAiUXRXZWJQYWdlUHJveHkuaCIKICNpbmNsdWRl ICJVdGlsc1F0LmgiCisjaW5jbHVkZSAiV2ViQmFja0ZvcndhcmRMaXN0LmgiCiAjaW5jbHVkZSAi V2ViUGFnZUdyb3VwLmgiCiAjaW5jbHVkZSAiV2ViUHJlZmVyZW5jZXMuaCIKIApAQCAtMjI1LDkg KzIyNiw3IEBAIHZvaWQgUVF1aWNrV2ViVmlld1ByaXZhdGU6Ol9xX3ZpZXdwb3J0VHJhamVjdG9y eVZlY3RvckNoYW5nZWQoY29uc3QgUVBvaW50RiYgdHJhCiAKIHZvaWQgUVF1aWNrV2ViVmlld1By aXZhdGU6Ol9xX29uVmlzaWJsZUNoYW5nZWQoKQogewotICAgIFdlYlBhZ2VQcm94eSogd2tQYWdl ID0gdG9JbXBsKHBhZ2VQcm94eS0+cGFnZVJlZigpKTsKLQotICAgIHdrUGFnZS0+dmlld1N0YXRl RGlkQ2hhbmdlKFdlYlBhZ2VQcm94eTo6Vmlld0lzVmlzaWJsZSk7CisgICAgd2ViUGFnZVByb3h5 KCktPnZpZXdTdGF0ZURpZENoYW5nZShXZWJQYWdlUHJveHk6OlZpZXdJc1Zpc2libGUpOwogfQog CiB2b2lkIFFRdWlja1dlYlZpZXdQcml2YXRlOjp1cGRhdGVWaWV3cG9ydFNpemUoKQpAQCAtMjM4 LDEwICsyMzcsOSBAQCB2b2lkIFFRdWlja1dlYlZpZXdQcml2YXRlOjp1cGRhdGVWaWV3cG9ydFNp emUoKQogICAgIGlmICh2aWV3cG9ydFNpemUuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm47CiAK LSAgICBXZWJQYWdlUHJveHkqIHdrUGFnZSA9IHRvSW1wbChwYWdlUHJveHktPnBhZ2VSZWYoKSk7 CiAgICAgLy8gTGV0IHRoZSBXZWJQcm9jZXNzIGtub3cgYWJvdXQgdGhlIG5ldyB2aWV3cG9ydCBz aXplLCBzbyB0aGF0CiAgICAgLy8gaXQgY2FuIHJlc2l6ZSB0aGUgY29udGVudCBhY2NvcmRpbmds eS4KLSAgICB3a1BhZ2UtPnNldFZpZXdwb3J0U2l6ZSh2aWV3cG9ydFNpemUpOworICAgIHdlYlBh Z2VQcm94eSgpLT5zZXRWaWV3cG9ydFNpemUodmlld3BvcnRTaXplKTsKIAogICAgIGludGVyYWN0 aW9uRW5naW5lLT5hcHBseUNvbnN0cmFpbnRzKGNvbXB1dGVWaWV3cG9ydENvbnN0cmFpbnRzKCkp OwogICAgIHVwZGF0ZVZpc2libGVDb250ZW50UmVjdCgpOwpAQCAtMjU4LDggKzI1Niw3IEBAIFF0 Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6Q29uc3RyYWludHMgUVF1aWNrV2ViVmlld1ByaXZh dGU6OmNvbXB1dGVWaWV3cG9ydENvCiAgICAgaWYgKGF2YWlsYWJsZVNpemUuaXNFbXB0eSgpKQog ICAgICAgICByZXR1cm4gbmV3Q29uc3RyYWludHM7CiAKLSAgICBXZWJQYWdlUHJveHkqIHdrUGFn ZSA9IHRvSW1wbChwYWdlUHJveHktPnBhZ2VSZWYoKSk7Ci0gICAgV2ViUHJlZmVyZW5jZXMqIHdr UHJlZnMgPSB3a1BhZ2UtPnBhZ2VHcm91cCgpLT5wcmVmZXJlbmNlcygpOworICAgIFdlYlByZWZl cmVuY2VzKiB3a1ByZWZzID0gd2ViUGFnZVByb3h5KCktPnBhZ2VHcm91cCgpLT5wcmVmZXJlbmNl cygpOwogCiAgICAgLy8gRklYTUU6IFJlbW92ZSBsYXRlcjsgSGFyZGNvZGUgc29tZSB2YWx1ZXMg Zm9yIG5vdyB0byBtYWtlIHN1cmUgdGhlIERQSSBhZGp1c3RtZW50IGlzIGJlaW5nIHRlc3RlZC4K ICAgICB3a1ByZWZzLT5zZXREZXZpY2VEUEkoMjQwKTsKQEAgLTM5Miw3ICszODksNyBAQCB2b2lk IFFRdWlja1dlYlZpZXdQcml2YXRlOjpzZXRVc2VUcmFkaXRpb25hbERlc2t0b3BCZWhhdmlvdXIo Ym9vbCBlbmFibGUpCiAKICAgICAvLyBEbyBub3QgZ3VhcmQsIHRlc3RpbmcgZm9yIHRoZSBzYW1l IHZhbHVlLCBhcyB3ZSBjYWxsIHRoaXMgZnJvbSB0aGUgY29uc3RydWN0b3IuCiAKLSAgICB0b0lt cGwocGFnZVByb3h5LT5wYWdlUmVmKCkpLT5zZXRVc2VGaXhlZExheW91dCghZW5hYmxlKTsKKyAg ICB3ZWJQYWdlUHJveHkoKS0+c2V0VXNlRml4ZWRMYXlvdXQoIWVuYWJsZSk7CiAKICAgICB1c2VU cmFkaXRpb25hbERlc2t0b3BCZWhhdmlvdXIgPSBlbmFibGU7CiAgICAgaWYgKHVzZVRyYWRpdGlv bmFsRGVza3RvcEJlaGF2aW91cikKQEAgLTQwOCw2ICs0MDUsMTIgQEAgdm9pZCBRUXVpY2tXZWJW aWV3UHJpdmF0ZTo6c2V0Vmlld0luQXR0YWNoZWRQcm9wZXJ0aWVzKFFPYmplY3QqIG9iamVjdCkK ICAgICBhdHRhY2hlZC0+c2V0VmlldyhxKTsKIH0KIAorLy8gRklYTUU6IFJlbW92ZSB0aGlzIG9u Y2UgUXRXZWJQYWdlUHJveHkgaXMgcmVtb3ZlZC4KK1dlYktpdDo6V2ViUGFnZVByb3h5KiBRUXVp Y2tXZWJWaWV3UHJpdmF0ZTo6d2ViUGFnZVByb3h5KCkgY29uc3QKK3sKKyAgICByZXR1cm4gdG9J bXBsKHBhZ2VQcm94eS0+cGFnZVJlZigpKTsKK30KKwogLyohCiAgICAgXHFtbHNpZ25hbCBXZWJW aWV3Ojpvbk5hdmlnYXRpb25SZXF1ZXN0ZWQocmVxdWVzdCkKIApAQCAtNTc5LDM3ICs1ODIsNDEg QEAgUVF1aWNrV2ViUGFnZSogUVF1aWNrV2ViVmlldzo6cGFnZSgpCiB2b2lkIFFRdWlja1dlYlZp ZXc6OmxvYWQoY29uc3QgUVVybCYgdXJsKQogewogICAgIFFfRChRUXVpY2tXZWJWaWV3KTsKLSAg ICBkLT5wYWdlUHJveHktPmxvYWQodXJsKTsKKyAgICBkLT53ZWJQYWdlUHJveHkoKS0+bG9hZFVS TCh1cmwudG9TdHJpbmcoKSk7CiB9CiAKIHZvaWQgUVF1aWNrV2ViVmlldzo6Z29CYWNrKCkKIHsK ICAgICBRX0QoUVF1aWNrV2ViVmlldyk7Ci0gICAgZC0+cGFnZVByb3h5LT5nb0JhY2soKTsKKyAg ICBkLT53ZWJQYWdlUHJveHkoKS0+Z29CYWNrKCk7CiB9CiAKIHZvaWQgUVF1aWNrV2ViVmlldzo6 Z29Gb3J3YXJkKCkKIHsKICAgICBRX0QoUVF1aWNrV2ViVmlldyk7Ci0gICAgZC0+cGFnZVByb3h5 LT5nb0ZvcndhcmQoKTsKKyAgICBkLT53ZWJQYWdlUHJveHkoKS0+Z29Gb3J3YXJkKCk7CiB9CiAK IHZvaWQgUVF1aWNrV2ViVmlldzo6c3RvcCgpCiB7CiAgICAgUV9EKFFRdWlja1dlYlZpZXcpOwot ICAgIGQtPnBhZ2VQcm94eS0+c3RvcCgpOworICAgIGQtPndlYlBhZ2VQcm94eSgpLT5zdG9wTG9h ZGluZygpOwogfQogCiB2b2lkIFFRdWlja1dlYlZpZXc6OnJlbG9hZCgpCiB7CiAgICAgUV9EKFFR dWlja1dlYlZpZXcpOwotICAgIGQtPnBhZ2VQcm94eS0+cmVsb2FkKCk7CisgICAgY29uc3QgYm9v bCByZWxvYWRGcm9tT3JpZ2luID0gdHJ1ZTsKKyAgICBkLT53ZWJQYWdlUHJveHkoKS0+cmVsb2Fk KHJlbG9hZEZyb21PcmlnaW4pOwogfQogCiBRVXJsIFFRdWlja1dlYlZpZXc6OnVybCgpIGNvbnN0 CiB7CiAgICAgUV9EKGNvbnN0IFFRdWlja1dlYlZpZXcpOwotICAgIHJldHVybiBkLT5wYWdlUHJv eHktPnVybCgpOworICAgIFJlZlB0cjxXZWJGcmFtZVByb3h5PiBtYWluRnJhbWUgPSBkLT53ZWJQ YWdlUHJveHkoKS0+bWFpbkZyYW1lKCk7CisgICAgaWYgKCFtYWluRnJhbWUpCisgICAgICAgIHJl dHVybiBRVXJsKCk7CisgICAgcmV0dXJuIFFVcmwoUVN0cmluZyhtYWluRnJhbWUtPnVybCgpKSk7 CiB9CiAKIGludCBRUXVpY2tXZWJWaWV3Ojpsb2FkUHJvZ3Jlc3MoKSBjb25zdApAQCAtNjIxLDMx ICs2MjgsMzUgQEAgaW50IFFRdWlja1dlYlZpZXc6OmxvYWRQcm9ncmVzcygpIGNvbnN0CiBib29s IFFRdWlja1dlYlZpZXc6OmNhbkdvQmFjaygpIGNvbnN0CiB7CiAgICAgUV9EKGNvbnN0IFFRdWlj a1dlYlZpZXcpOwotICAgIHJldHVybiBkLT5wYWdlUHJveHktPmNhbkdvQmFjaygpOworICAgIHJl dHVybiBkLT53ZWJQYWdlUHJveHkoKS0+Y2FuR29CYWNrKCk7CiB9CiAKIGJvb2wgUVF1aWNrV2Vi Vmlldzo6Y2FuR29Gb3J3YXJkKCkgY29uc3QKIHsKICAgICBRX0QoY29uc3QgUVF1aWNrV2ViVmll dyk7Ci0gICAgcmV0dXJuIGQtPnBhZ2VQcm94eS0+Y2FuR29Gb3J3YXJkKCk7CisgICAgcmV0dXJu IGQtPndlYlBhZ2VQcm94eSgpLT5jYW5Hb0ZvcndhcmQoKTsKIH0KIAogYm9vbCBRUXVpY2tXZWJW aWV3Ojpsb2FkaW5nKCkgY29uc3QKIHsKICAgICBRX0QoY29uc3QgUVF1aWNrV2ViVmlldyk7Ci0g ICAgcmV0dXJuIGQtPnBhZ2VQcm94eS0+bG9hZGluZygpOworICAgIFJlZlB0cjxXZWJLaXQ6Oldl YkZyYW1lUHJveHk+IG1haW5GcmFtZSA9IGQtPndlYlBhZ2VQcm94eSgpLT5tYWluRnJhbWUoKTsK KyAgICByZXR1cm4gbWFpbkZyYW1lICYmICEoV2ViRnJhbWVQcm94eTo6TG9hZFN0YXRlRmluaXNo ZWQgPT0gbWFpbkZyYW1lLT5sb2FkU3RhdGUoKSk7CiB9CiAKIGJvb2wgUVF1aWNrV2ViVmlldzo6 Y2FuUmVsb2FkKCkgY29uc3QKIHsKICAgICBRX0QoY29uc3QgUVF1aWNrV2ViVmlldyk7Ci0gICAg cmV0dXJuIGQtPnBhZ2VQcm94eS0+Y2FuUmVsb2FkKCk7CisgICAgUmVmUHRyPFdlYktpdDo6V2Vi RnJhbWVQcm94eT4gbWFpbkZyYW1lID0gZC0+d2ViUGFnZVByb3h5KCktPm1haW5GcmFtZSgpOwor ICAgIGlmIChtYWluRnJhbWUpCisgICAgICAgIHJldHVybiAoV2ViRnJhbWVQcm94eTo6TG9hZFN0 YXRlRmluaXNoZWQgPT0gbWFpbkZyYW1lLT5sb2FkU3RhdGUoKSk7CisgICAgcmV0dXJuIGQtPndl YlBhZ2VQcm94eSgpLT5iYWNrRm9yd2FyZExpc3QoKS0+Y3VycmVudEl0ZW0oKTsKIH0KIAogUVN0 cmluZyBRUXVpY2tXZWJWaWV3Ojp0aXRsZSgpIGNvbnN0CiB7CiAgICAgUV9EKGNvbnN0IFFRdWlj a1dlYlZpZXcpOwotICAgIHJldHVybiBkLT5wYWdlUHJveHktPnRpdGxlKCk7CisgICAgcmV0dXJu IGQtPndlYlBhZ2VQcm94eSgpLT5wYWdlVGl0bGUoKTsKIH0KIAogUVdlYlByZWZlcmVuY2VzKiBR UXVpY2tXZWJWaWV3OjpwcmVmZXJlbmNlcygpIGNvbnN0CkBAIC03MTgsNyArNzI5LDcgQEAgV0tQ YWdlUmVmIFFRdWlja1dlYlZpZXc6OnBhZ2VSZWYoKSBjb25zdAogdm9pZCBRUXVpY2tXZWJWaWV3 Ojpsb2FkSHRtbChjb25zdCBRU3RyaW5nJiBodG1sLCBjb25zdCBRVXJsJiBiYXNlVXJsKQogewog ICAgIFFfRChRUXVpY2tXZWJWaWV3KTsKLSAgICBkLT5wYWdlUHJveHktPmxvYWRIVE1MU3RyaW5n KGh0bWwsIGJhc2VVcmwpOworICAgIGQtPndlYlBhZ2VQcm94eSgpLT5sb2FkSFRNTFN0cmluZyho dG1sLCBiYXNlVXJsLnRvU3RyaW5nKCkpOwogfQogCiAjaW5jbHVkZSAibW9jX3FxdWlja3dlYnZp ZXdfcC5jcHAiCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Fx dWlja3dlYnZpZXdfcF9wLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlj a3dlYnZpZXdfcF9wLmgKaW5kZXggODI3YzA1YjJmMDhhZWJmOWJlZjRiN2ZjNDhmNWI4NjgxZTA3 MWMzMy4uNWY1YWExM2RmYjEyMTU3OWZmNDM4ZjhmYWE3M2Y3NDJiNTZjY2Q4YiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3X3BfcC5oCisr KyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlld19wX3AuaApA QCAtMzcsNiArMzcsOSBAQAogI2luY2x1ZGUgPFF0Q29yZS9RU2NvcGVkUG9pbnRlcj4KICNpbmNs dWRlIDx3dGYvT3duUHRyLmg+CiAKK25hbWVzcGFjZSBXZWJLaXQgeworY2xhc3MgV2ViUGFnZVBy b3h5OworfQogY2xhc3MgUXRXZWJQYWdlUHJveHk7CiAKIFFUX0JFR0lOX05BTUVTUEFDRQpAQCAt ODcsNiArOTAsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRVc2VUcmFkaXRpb25hbERlc2t0b3BC ZWhhdmlvdXIoYm9vbCBlbmFibGUpOwogICAgIHZvaWQgc2V0Vmlld0luQXR0YWNoZWRQcm9wZXJ0 aWVzKFFPYmplY3QqKTsKIAorICAgIFdlYktpdDo6V2ViUGFnZVByb3h5KiB3ZWJQYWdlUHJveHko KSBjb25zdDsKKwogcHJpdmF0ZToKICAgICAvLyBUaGlzIGNsYXNzIGlzIHJlc3BvbnNpYmxlIGZv ciBjb2xsZWN0aW5nIGFuZCBhcHBseWluZyBhbGwgcHJvcGVydGllcwogICAgIC8vIG9uIHRoZSB2 aWV3cG9ydCBpdGVtLCB3aGVuIHRyYW5zaXRpb25pbmcgZnJvbSBwYWdlIEEgdG8gcGFnZSBCIGlz IGZpbmlzaGVkLgpAQCAtMTMyLDYgKzEzNyw4IEBAIHByaXZhdGU6CiAgICAgUVF1aWNrV2ViVmll dyogcV9wdHI7CiAgICAgUVNjb3BlZFBvaW50ZXI8UXRXZWJQYWdlUHJveHk+IHBhZ2VQcm94eTsK IAorICAgIE93blB0cjxRV2ViTmF2aWdhdGlvbkhpc3Rvcnk+IG5hdmlnYXRpb25IaXN0b3J5Owor CiAgICAgUURlY2xhcmF0aXZlQ29tcG9uZW50KiBhbGVydERpYWxvZzsKICAgICBRRGVjbGFyYXRp dmVDb21wb25lbnQqIGNvbmZpcm1EaWFsb2c7CiAgICAgUURlY2xhcmF0aXZlQ29tcG9uZW50KiBw cm9tcHREaWFsb2c7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRX ZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZVBy b3h5LmNwcAppbmRleCA0ZmM1NmQ0NDVmM2JkMGI1NWQyMjRhNzgzYzc2MmU4NTA3N2I4YmJhLi5i MjJjYWNmZDY2Zjk5YTI0MGJkYTQ2Y2YwNjg1YjYwNmZmNjRkZjBkIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQcm94eS5jcHAKQEAgLTE1NSw2NCArMTU1LDIw IEBAIHZvaWQgUXRXZWJQYWdlUHJveHk6OmRpZFJlY2VpdmVNZXNzYWdlRnJvbU5hdmlnYXRvclF0 T2JqZWN0KGNvbnN0IFN0cmluZyYgbWVzc2FnCiB7CiAgICAgUVZhcmlhbnRNYXAgdmFyaWFudE1h cDsKICAgICB2YXJpYW50TWFwLmluc2VydChRTGF0aW4xU3RyaW5nKCJkYXRhIiksIFFTdHJpbmco bWVzc2FnZSkpOwotICAgIHZhcmlhbnRNYXAuaW5zZXJ0KFFMYXRpbjFTdHJpbmcoIm9yaWdpbiIp LCB1cmwoKSk7CisgICAgdmFyaWFudE1hcC5pbnNlcnQoUUxhdGluMVN0cmluZygib3JpZ2luIiks IG1fcW1sV2ViVmlldy0+dXJsKCkpOwogICAgIGVtaXQgcmVjZWl2ZWRNZXNzYWdlRnJvbU5hdmln YXRvclF0T2JqZWN0KHZhcmlhbnRNYXApOwogfQogCi1ib29sIFF0V2ViUGFnZVByb3h5OjpjYW5H b0JhY2soKSBjb25zdAotewotICAgIHJldHVybiBtX3dlYlBhZ2VQcm94eS0+Y2FuR29CYWNrKCk7 Ci19Ci0KLXZvaWQgUXRXZWJQYWdlUHJveHk6OmdvQmFjaygpCi17Ci0gICAgbV93ZWJQYWdlUHJv eHktPmdvQmFjaygpOwotfQotCiB2b2lkIFF0V2ViUGFnZVByb3h5Ojpnb0JhY2tUbyhpbnQgaW5k ZXgpCiB7CiAgICAgbV9uYXZpZ2F0aW9uSGlzdG9yeS0+ZC0+Z29CYWNrVG8oaW5kZXgpOwogfQog Ci1ib29sIFF0V2ViUGFnZVByb3h5OjpjYW5Hb0ZvcndhcmQoKSBjb25zdAotewotICAgIHJldHVy biBtX3dlYlBhZ2VQcm94eS0+Y2FuR29Gb3J3YXJkKCk7Ci19Ci0KLXZvaWQgUXRXZWJQYWdlUHJv eHk6OmdvRm9yd2FyZCgpCi17Ci0gICAgbV93ZWJQYWdlUHJveHktPmdvRm9yd2FyZCgpOwotfQot CiB2b2lkIFF0V2ViUGFnZVByb3h5Ojpnb0ZvcndhcmRUbyhpbnQgaW5kZXgpCiB7CiAgICAgbV9u YXZpZ2F0aW9uSGlzdG9yeS0+ZC0+Z29Gb3J3YXJkVG8oaW5kZXgpOwogfQogCi1ib29sIFF0V2Vi UGFnZVByb3h5Ojpsb2FkaW5nKCkgY29uc3QKLXsKLSAgICBSZWZQdHI8V2ViS2l0OjpXZWJGcmFt ZVByb3h5PiBtYWluRnJhbWUgPSBtX3dlYlBhZ2VQcm94eS0+bWFpbkZyYW1lKCk7Ci0gICAgcmV0 dXJuIG1haW5GcmFtZSAmJiAhKFdlYkZyYW1lUHJveHk6OkxvYWRTdGF0ZUZpbmlzaGVkID09IG1h aW5GcmFtZS0+bG9hZFN0YXRlKCkpOwotfQotCi12b2lkIFF0V2ViUGFnZVByb3h5OjpzdG9wKCkK LXsKLSAgICBtX3dlYlBhZ2VQcm94eS0+c3RvcExvYWRpbmcoKTsKLX0KLQotYm9vbCBRdFdlYlBh Z2VQcm94eTo6Y2FuUmVsb2FkKCkgY29uc3QKLXsKLSAgICBSZWZQdHI8V2ViS2l0OjpXZWJGcmFt ZVByb3h5PiBtYWluRnJhbWUgPSBtX3dlYlBhZ2VQcm94eS0+bWFpbkZyYW1lKCk7Ci0gICAgaWYg KG1haW5GcmFtZSkKLSAgICAgICAgcmV0dXJuIChXZWJGcmFtZVByb3h5OjpMb2FkU3RhdGVGaW5p c2hlZCA9PSBtYWluRnJhbWUtPmxvYWRTdGF0ZSgpKTsKLSAgICByZXR1cm4gbV93ZWJQYWdlUHJv eHktPmJhY2tGb3J3YXJkTGlzdCgpLT5jdXJyZW50SXRlbSgpOwotfQotCi12b2lkIFF0V2ViUGFn ZVByb3h5OjpyZWxvYWQoKQotewotICAgIG1fd2ViUGFnZVByb3h5LT5yZWxvYWQoLyogcmVsb2Fk RnJvbU9yaWdpbiAqLyB0cnVlKTsKLX0KLQogdm9pZCBRdFdlYlBhZ2VQcm94eTo6dXBkYXRlTmF2 aWdhdGlvblN0YXRlKCkKIHsKICAgICBlbWl0IG1fcW1sV2ViVmlldy0+bmF2aWdhdGlvblN0YXRl Q2hhbmdlZCgpOwpAQCAtMjY3LDMzICsyMjMsNiBAQCB2b2lkIFF0V2ViUGFnZVByb3h5Ojpwb3N0 TWVzc2FnZVRvTmF2aWdhdG9yUXRPYmplY3QoY29uc3QgUVN0cmluZyYgbWVzc2FnZSkKICAgICBt X2NvbnRleHQtPnBvc3RNZXNzYWdlVG9OYXZpZ2F0b3JRdE9iamVjdChtX3dlYlBhZ2VQcm94eS5n ZXQoKSwgbWVzc2FnZSk7CiB9CiAKLXZvaWQgUXRXZWJQYWdlUHJveHk6OmxvYWRIVE1MU3RyaW5n KGNvbnN0IFFTdHJpbmcmIGh0bWwsIGNvbnN0IFFVcmwmIGJhc2VVcmwpCi17Ci0gICAgV0tSZXRh aW5QdHI8V0tVUkxSZWY+IHdrVXJsKFdLVVJMQ3JlYXRlV2l0aFFVcmwoYmFzZVVybCkpOwotICAg IFdLUmV0YWluUHRyPFdLU3RyaW5nUmVmPiB3a0h0bWxTdHJpbmcoV0tTdHJpbmdDcmVhdGVXaXRo UVN0cmluZyhodG1sKSk7Ci0KLSAgICBXS1BhZ2VMb2FkSFRNTFN0cmluZyhwYWdlUmVmKCksIHdr SHRtbFN0cmluZy5nZXQoKSwgd2tVcmwuZ2V0KCkpOwotfQotCi12b2lkIFF0V2ViUGFnZVByb3h5 Ojpsb2FkKGNvbnN0IFFVcmwmIHVybCkKLXsKLSAgICBXS1JldGFpblB0cjxXS1VSTFJlZj4gd2t1 cmwgPSBhZG9wdFdLKFdLVVJMQ3JlYXRlV2l0aFFVcmwodXJsKSk7Ci0gICAgV0tQYWdlTG9hZFVS TChwYWdlUmVmKCksIHdrdXJsLmdldCgpKTsKLX0KLQotUVVybCBRdFdlYlBhZ2VQcm94eTo6dXJs KCkgY29uc3QKLXsKLSAgICBXS1JldGFpblB0cjxXS0ZyYW1lUmVmPiBmcmFtZSA9IFdLUGFnZUdl dE1haW5GcmFtZShwYWdlUmVmKCkpOwotICAgIGlmICghZnJhbWUpCi0gICAgICAgIHJldHVybiBR VXJsKCk7Ci0gICAgcmV0dXJuIFdLVVJMQ29weVFVcmwoYWRvcHRXSyhXS0ZyYW1lQ29weVVSTChm cmFtZS5nZXQoKSkpLmdldCgpKTsKLX0KLQotUVN0cmluZyBRdFdlYlBhZ2VQcm94eTo6dGl0bGUo KSBjb25zdAotewotICAgIHJldHVybiBXS1N0cmluZ0NvcHlRU3RyaW5nKGFkb3B0V0soV0tQYWdl Q29weVRpdGxlKHRvQVBJKG1fd2ViUGFnZVByb3h5LmdldCgpKSkpLmdldCgpKTsKLX0KLQogdm9p ZCBRdFdlYlBhZ2VQcm94eTo6c2V0RHJhd2luZ0FyZWFTaXplKGNvbnN0IFFTaXplJiBzaXplKQog ewogICAgIGlmICghbV93ZWJQYWdlUHJveHktPmRyYXdpbmdBcmVhKCkpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuaCBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQcm94eS5oCmluZGV4IDVmNzA2MmUzOGVhNTFjOTM0 OWViMjNmMzNmODE2NzNjMjFmOThiY2UuLjk1MGMzODcwMDU3MjlmYjRhNDIwMGUzMGE3ZGM3MDdi NWUxY2E5NmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBh Z2VQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQcm94 eS5oCkBAIC03MywzMSArNzMsMTcgQEAgcHVibGljOgogCiAgICAgdm9pZCBkaWRSZWNlaXZlTWVz c2FnZUZyb21OYXZpZ2F0b3JRdE9iamVjdChjb25zdCBTdHJpbmcmKTsKIAotICAgIGJvb2wgY2Fu R29CYWNrKCkgY29uc3Q7Ci0gICAgdm9pZCBnb0JhY2soKTsKICAgICB2b2lkIGdvQmFja1RvKGlu dCBpbmRleCk7Ci0gICAgYm9vbCBjYW5Hb0ZvcndhcmQoKSBjb25zdDsKLSAgICB2b2lkIGdvRm9y d2FyZCgpOwogICAgIHZvaWQgZ29Gb3J3YXJkVG8oaW50IGluZGV4KTsKLSAgICBib29sIGxvYWRp bmcoKSBjb25zdDsKLSAgICB2b2lkIHN0b3AoKTsKLSAgICBib29sIGNhblJlbG9hZCgpIGNvbnN0 OwotICAgIHZvaWQgcmVsb2FkKCk7CiAKICAgICB2b2lkIHVwZGF0ZU5hdmlnYXRpb25TdGF0ZSgp OwogCiAgICAgV0tQYWdlUmVmIHBhZ2VSZWYoKSBjb25zdDsKIAotICAgIHZvaWQgbG9hZChjb25z dCBRVXJsJiB1cmwpOwotICAgIHZvaWQgbG9hZEhUTUxTdHJpbmcoY29uc3QgUVN0cmluZyYgaHRt bCwgY29uc3QgUVVybCYgYmFzZVVybCk7Ci0gICAgUVVybCB1cmwoKSBjb25zdDsKLQogICAgIHZv aWQgc2V0RHJhd2luZ0FyZWFTaXplKGNvbnN0IFFTaXplJik7CiAKICAgICBRV2ViUHJlZmVyZW5j ZXMqIHByZWZlcmVuY2VzKCkgY29uc3Q7CiAKLSAgICBRU3RyaW5nIHRpdGxlKCkgY29uc3Q7Ci0K ICAgICB2b2lkIHNldEN1c3RvbVVzZXJBZ2VudChjb25zdCBRU3RyaW5nJik7CiAgICAgUVN0cmlu ZyBjdXN0b21Vc2VyQWdlbnQoKSBjb25zdDsKIAo=