46196 2010-09-21 09:55:12 -0700 Add marginBefore/After/Start/End accessors to RenderBoxModelObject and subclasses 2010-09-21 10:49:38 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 46123 1 hyatt hyatt oldest_to_newest 282372 0 hyatt 2010-09-21 09:55:12 -0700 Add marginBefore/After/Start/End accessors to RenderBoxModelObject and subclasses. 282378 1 68252 hyatt 2010-09-21 09:59:58 -0700 Created attachment 68252 Patch 282379 2 68253 hyatt 2010-09-21 10:01:25 -0700 Created attachment 68253 Patch 282384 3 68253 mitz 2010-09-21 10:05:04 -0700 Comment on attachment 68253 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=68253&action=review > WebCore/rendering/RenderInline.h:44 > + virtual int marginTop() const; > + virtual int marginBottom() const; Any reason why these need to be public now (or, for that matter, any of the new methods)? 282425 4 hyatt 2010-09-21 10:49:38 -0700 Fixed in r67964. 68252 2010-09-21 09:59:58 -0700 2010-09-21 10:01:25 -0700 Patch patch.txt text/plain 7738 hyatt SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2Nzk2MSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjggQEAKKzIwMTAtMDktMjEgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NjE5NiwgYWRkIG1hcmdpblN0YXJ0 L0JlZm9yZS9FbmQvQWZ0ZXIgYWNjZXNzb3JzIHRvIFJlbmRlckJveE1vZGVsT2JqZWN0LgorCisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJCb3g6Om1hcmdpbkJlZm9yZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6Om1hcmdp bkFmdGVyKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6bWFyZ2luU3RhcnQpOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyQm94OjptYXJnaW5FbmQpOgorICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJCb3guaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3Qu aDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVySW5saW5lLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OmNvbXB1dGVNYXJnaW4pOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVySW5saW5lOjptYXJn aW5MZWZ0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlcklubGluZTo6bWFyZ2luUmlnaHQpOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVySW5saW5lOjptYXJnaW5Ub3ApOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVySW5saW5lOjptYXJnaW5Cb3R0b20pOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVySW5saW5lOjptYXJnaW5TdGFydCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJJbmxpbmU6 Om1hcmdpbkVuZCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlcklubGluZS5oOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVySW5saW5lOjptYXJnaW5CZWZvcmUpOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVySW5saW5lOjptYXJnaW5BZnRlcik6CisKIDIwMTAtMDktMjEgIERhdmlkIEh5YXR0 ICA8aHlhdHRAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhbiBCZXJuc3RlaW4u CkluZGV4OiBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAJKHJldmlzaW9uIDY3OTMwKQorKysgV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAkod29ya2luZyBjb3B5KQpAQCAtODMsNiArODMsNTIg QEAgUmVuZGVyQm94Ojp+UmVuZGVyQm94KCkKIHsKIH0KIAoraW50IFJlbmRlckJveDo6bWFyZ2lu QmVmb3JlKCkgY29uc3QKK3sKKyAgICBzd2l0Y2ggKHN0eWxlKCktPmJsb2NrRmxvdygpKSB7Cisg ICAgY2FzZSBUb3BUb0JvdHRvbUJsb2NrRmxvdzoKKyAgICAgICAgcmV0dXJuIG1fbWFyZ2luVG9w OworICAgIGNhc2UgQm90dG9tVG9Ub3BCbG9ja0Zsb3c6CisgICAgICAgIHJldHVybiBtX21hcmdp bkJvdHRvbTsKKyAgICBjYXNlIExlZnRUb1JpZ2h0QmxvY2tGbG93OgorICAgICAgICByZXR1cm4g bV9tYXJnaW5MZWZ0OworICAgIGNhc2UgUmlnaHRUb0xlZnRCbG9ja0Zsb3c6CisgICAgICAgIHJl dHVybiBtX21hcmdpblJpZ2h0OworICAgIH0KKyAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAg ICByZXR1cm4gbV9tYXJnaW5Ub3A7Cit9CisKK2ludCBSZW5kZXJCb3g6Om1hcmdpbkFmdGVyKCkg Y29uc3QKK3sKKyAgICBzd2l0Y2ggKHN0eWxlKCktPmJsb2NrRmxvdygpKSB7CisgICAgY2FzZSBU b3BUb0JvdHRvbUJsb2NrRmxvdzoKKyAgICAgICAgcmV0dXJuIG1fbWFyZ2luQm90dG9tOworICAg IGNhc2UgQm90dG9tVG9Ub3BCbG9ja0Zsb3c6CisgICAgICAgIHJldHVybiBtX21hcmdpblRvcDsK KyAgICBjYXNlIExlZnRUb1JpZ2h0QmxvY2tGbG93OgorICAgICAgICByZXR1cm4gbV9tYXJnaW5S aWdodDsKKyAgICBjYXNlIFJpZ2h0VG9MZWZ0QmxvY2tGbG93OgorICAgICAgICByZXR1cm4gbV9t YXJnaW5MZWZ0OworICAgIH0KKyAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICByZXR1cm4g bV9tYXJnaW5Cb3R0b207Cit9CisKK2ludCBSZW5kZXJCb3g6Om1hcmdpblN0YXJ0KCkgY29uc3QK K3sKKyAgICBpZiAoc3R5bGUoKS0+aXNWZXJ0aWNhbEJsb2NrRmxvdygpKQorICAgICAgICByZXR1 cm4gc3R5bGUoKS0+ZGlyZWN0aW9uKCkgPT0gTFRSID8gbWFyZ2luTGVmdCgpIDogbWFyZ2luUmln aHQoKTsKKyAgICByZXR1cm4gc3R5bGUoKS0+ZGlyZWN0aW9uKCkgPT0gTFRSID8gbWFyZ2luVG9w KCkgOiBtYXJnaW5Cb3R0b20oKTsKK30KKworaW50IFJlbmRlckJveDo6bWFyZ2luRW5kKCkgY29u c3QKK3sKKyAgICBpZiAoc3R5bGUoKS0+aXNWZXJ0aWNhbEJsb2NrRmxvdygpKQorICAgICAgICBy ZXR1cm4gc3R5bGUoKS0+ZGlyZWN0aW9uKCkgPT0gTFRSID8gbWFyZ2luUmlnaHQoKSA6IG1hcmdp bkxlZnQoKTsKKyAgICByZXR1cm4gc3R5bGUoKS0+ZGlyZWN0aW9uKCkgPT0gTFRSID8gbWFyZ2lu Qm90dG9tKCkgOiBtYXJnaW5Ub3AoKTsKK30KKwogdm9pZCBSZW5kZXJCb3g6OmRlc3Ryb3koKQog ewogICAgIC8vIEEgbG90IG9mIHRoZSBjb2RlIGluIHRoaXMgZnVuY3Rpb24gaXMganVzdCBwYXN0 ZWQgaW50bwpJbmRleDogV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgJKHJldmlzaW9uIDY3OTMwKQorKysgV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgJKHdvcmtpbmcgY29weSkKQEAgLTEzOSw2ICsxMzks MTAgQEAgcHVibGljOgogICAgIHZpcnR1YWwgaW50IG1hcmdpbkJvdHRvbSgpIGNvbnN0IHsgcmV0 dXJuIG1fbWFyZ2luQm90dG9tOyB9CiAgICAgdmlydHVhbCBpbnQgbWFyZ2luTGVmdCgpIGNvbnN0 IHsgcmV0dXJuIG1fbWFyZ2luTGVmdDsgfQogICAgIHZpcnR1YWwgaW50IG1hcmdpblJpZ2h0KCkg Y29uc3QgeyByZXR1cm4gbV9tYXJnaW5SaWdodDsgfQorICAgIHZpcnR1YWwgaW50IG1hcmdpbkJl Zm9yZSgpIGNvbnN0OworICAgIHZpcnR1YWwgaW50IG1hcmdpbkFmdGVyKCkgY29uc3Q7CisgICAg dmlydHVhbCBpbnQgbWFyZ2luU3RhcnQoKSBjb25zdDsKKyAgICB2aXJ0dWFsIGludCBtYXJnaW5F bmQoKSBjb25zdDsKIAogICAgIC8vIFRoZSBmb2xsb3dpbmcgZml2ZSBmdW5jdGlvbnMgYXJlIHVz ZWQgdG8gaW1wbGVtZW50IGNvbGxhcHNpbmcgbWFyZ2lucy4KICAgICAvLyBBbGwgb2JqZWN0cyBr bm93IHRoZWlyIG1heGltYWwgcG9zaXRpdmUgYW5kIG5lZ2F0aXZlIG1hcmdpbnMuICBUaGUKSW5k ZXg6IFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuaAkocmV2aXNpb24gNjc5 NjApCisrKyBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5oCSh3b3JraW5n IGNvcHkpCkBAIC05Myw2ICs5MywxMCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBpbnQgbWFyZ2lu Qm90dG9tKCkgY29uc3QgPSAwOwogICAgIHZpcnR1YWwgaW50IG1hcmdpbkxlZnQoKSBjb25zdCA9 IDA7CiAgICAgdmlydHVhbCBpbnQgbWFyZ2luUmlnaHQoKSBjb25zdCA9IDA7CisgICAgdmlydHVh bCBpbnQgbWFyZ2luQmVmb3JlKCkgY29uc3QgPSAwOworICAgIHZpcnR1YWwgaW50IG1hcmdpbkFm dGVyKCkgY29uc3QgPSAwOworICAgIHZpcnR1YWwgaW50IG1hcmdpblN0YXJ0KCkgY29uc3QgPSAw OworICAgIHZpcnR1YWwgaW50IG1hcmdpbkVuZCgpIGNvbnN0ID0gMDsKIAogICAgIGJvb2wgaGFz SG9yaXpvbnRhbEJvcmRlcnNQYWRkaW5nT3JNYXJnaW4oKSBjb25zdCB7IHJldHVybiBoYXNIb3Jp em9udGFsQm9yZGVyc09yUGFkZGluZygpIHx8IG1hcmdpbkxlZnQoKSAhPSAwIHx8IG1hcmdpblJp Z2h0KCkgIT0gMDsgfQogICAgIGJvb2wgaGFzSG9yaXpvbnRhbEJvcmRlcnNPclBhZGRpbmcoKSBj b25zdCB7IHJldHVybiBib3JkZXJMZWZ0KCkgIT0gMCB8fCBib3JkZXJSaWdodCgpICE9IDAgfHwg cGFkZGluZ0xlZnQoKSAhPSAwIHx8IHBhZGRpbmdSaWdodCgpICE9IDA7IH0KSW5kZXg6IFdlYkNv cmUvcmVuZGVyaW5nL1JlbmRlcklubGluZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVySW5saW5lLmNwcAkocmV2aXNpb24gNjc5MzApCisrKyBXZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJJbmxpbmUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00NTgsMjggKzQ1OCw1MyBA QCBpbnQgUmVuZGVySW5saW5lOjpvZmZzZXRUb3AoKSBjb25zdAogICAgIHJldHVybiB5OwogfQog Ci1pbnQgUmVuZGVySW5saW5lOjptYXJnaW5MZWZ0KCkgY29uc3QKK3N0YXRpYyBpbnQgY29tcHV0 ZU1hcmdpbihjb25zdCBSZW5kZXJJbmxpbmUqIHJlbmRlcmVyLCBjb25zdCBMZW5ndGgmIG1hcmdp bikKIHsKLSAgICBMZW5ndGggbWFyZ2luID0gc3R5bGUoKS0+bWFyZ2luTGVmdCgpOwogICAgIGlm IChtYXJnaW4uaXNBdXRvKCkpCiAgICAgICAgIHJldHVybiAwOwogICAgIGlmIChtYXJnaW4uaXNG aXhlZCgpKQogICAgICAgICByZXR1cm4gbWFyZ2luLnZhbHVlKCk7CiAgICAgaWYgKG1hcmdpbi5p c1BlcmNlbnQoKSkKLSAgICAgICAgcmV0dXJuIG1hcmdpbi5jYWxjTWluVmFsdWUobWF4KDAsIGNv bnRhaW5pbmdCbG9jaygpLT5hdmFpbGFibGVXaWR0aCgpKSk7CisgICAgICAgIHJldHVybiBtYXJn aW4uY2FsY01pblZhbHVlKG1heCgwLCByZW5kZXJlci0+Y29udGFpbmluZ0Jsb2NrKCktPmF2YWls YWJsZUxvZ2ljYWxXaWR0aCgpKSk7CiAgICAgcmV0dXJuIDA7CiB9CiAKK2ludCBSZW5kZXJJbmxp bmU6Om1hcmdpbkxlZnQoKSBjb25zdAoreworICAgIGlmICghc3R5bGUoKS0+aXNWZXJ0aWNhbEJs b2NrRmxvdygpKQorICAgICAgICByZXR1cm4gMDsKKyAgICByZXR1cm4gY29tcHV0ZU1hcmdpbih0 aGlzLCBzdHlsZSgpLT5tYXJnaW5MZWZ0KCkpOworfQorCiBpbnQgUmVuZGVySW5saW5lOjptYXJn aW5SaWdodCgpIGNvbnN0CiB7Ci0gICAgTGVuZ3RoIG1hcmdpbiA9IHN0eWxlKCktPm1hcmdpblJp Z2h0KCk7Ci0gICAgaWYgKG1hcmdpbi5pc0F1dG8oKSkKKyAgICBpZiAoIXN0eWxlKCktPmlzVmVy dGljYWxCbG9ja0Zsb3coKSkKICAgICAgICAgcmV0dXJuIDA7Ci0gICAgaWYgKG1hcmdpbi5pc0Zp eGVkKCkpCi0gICAgICAgIHJldHVybiBtYXJnaW4udmFsdWUoKTsKLSAgICBpZiAobWFyZ2luLmlz UGVyY2VudCgpKQotICAgICAgICByZXR1cm4gbWFyZ2luLmNhbGNNaW5WYWx1ZShtYXgoMCwgY29u dGFpbmluZ0Jsb2NrKCktPmF2YWlsYWJsZVdpZHRoKCkpKTsKLSAgICByZXR1cm4gMDsKKyAgICBy ZXR1cm4gY29tcHV0ZU1hcmdpbih0aGlzLCBzdHlsZSgpLT5tYXJnaW5SaWdodCgpKTsKK30KKwor aW50IFJlbmRlcklubGluZTo6bWFyZ2luVG9wKCkgY29uc3QKK3sKKyAgICBpZiAoc3R5bGUoKS0+ aXNWZXJ0aWNhbEJsb2NrRmxvdygpKQorICAgICAgICByZXR1cm4gMDsKKyAgICByZXR1cm4gY29t cHV0ZU1hcmdpbih0aGlzLCBzdHlsZSgpLT5tYXJnaW5Ub3AoKSk7Cit9CisKK2ludCBSZW5kZXJJ bmxpbmU6Om1hcmdpbkJvdHRvbSgpIGNvbnN0Cit7CisgICAgaWYgKHN0eWxlKCktPmlzVmVydGlj YWxCbG9ja0Zsb3coKSkKKyAgICAgICAgcmV0dXJuIDA7CisgICAgcmV0dXJuIGNvbXB1dGVNYXJn aW4odGhpcywgc3R5bGUoKS0+bWFyZ2luQm90dG9tKCkpOworfQorCitpbnQgUmVuZGVySW5saW5l OjptYXJnaW5TdGFydCgpIGNvbnN0Cit7CisgICAgcmV0dXJuIGNvbXB1dGVNYXJnaW4odGhpcywg c3R5bGUoKS0+bWFyZ2luU3RhcnQoKSk7Cit9CisKK2ludCBSZW5kZXJJbmxpbmU6Om1hcmdpbkVu ZCgpIGNvbnN0Cit7CisgICAgcmV0dXJuIGNvbXB1dGVNYXJnaW4odGhpcywgc3R5bGUoKS0+bWFy Z2luRW5kKCkpOwogfQogCiBjb25zdCBjaGFyKiBSZW5kZXJJbmxpbmU6OnJlbmRlck5hbWUoKSBj b25zdApJbmRleDogV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5lLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5lLmgJKHJldmlzaW9uIDY3OTMwKQorKysg V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5lLmgJKHdvcmtpbmcgY29weSkKQEAgLTQwLDcg KzQwLDEzIEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgaW50IG1hcmdpbkxlZnQoKSBjb25zdDsK ICAgICB2aXJ0dWFsIGludCBtYXJnaW5SaWdodCgpIGNvbnN0OwotICAgIAorICAgIHZpcnR1YWwg aW50IG1hcmdpblRvcCgpIGNvbnN0OworICAgIHZpcnR1YWwgaW50IG1hcmdpbkJvdHRvbSgpIGNv bnN0OworICAgIHZpcnR1YWwgaW50IG1hcmdpbkJlZm9yZSgpIGNvbnN0IHsgcmV0dXJuIDA7IH0K KyAgICB2aXJ0dWFsIGludCBtYXJnaW5BZnRlcigpIGNvbnN0IHsgcmV0dXJuIDA7IH0KKyAgICB2 aXJ0dWFsIGludCBtYXJnaW5TdGFydCgpIGNvbnN0OworICAgIHZpcnR1YWwgaW50IG1hcmdpbkVu ZCgpIGNvbnN0OworCiAgICAgdmlydHVhbCB2b2lkIGFic29sdXRlUmVjdHMoVmVjdG9yPEludFJl Y3Q+JiwgaW50IHR4LCBpbnQgdHkpOwogICAgIHZpcnR1YWwgdm9pZCBhYnNvbHV0ZVF1YWRzKFZl Y3RvcjxGbG9hdFF1YWQ+Jik7CiAKQEAgLTEwOCw5ICsxMTQsNiBAQCBwcml2YXRlOgogICAgIHZp cnR1YWwgaW50IG9mZnNldFdpZHRoKCkgY29uc3QgeyByZXR1cm4gbGluZXNCb3VuZGluZ0JveCgp LndpZHRoKCk7IH0KICAgICB2aXJ0dWFsIGludCBvZmZzZXRIZWlnaHQoKSBjb25zdCB7IHJldHVy biBsaW5lc0JvdW5kaW5nQm94KCkuaGVpZ2h0KCk7IH0KIAotICAgIC8vIEp1c3QgaWdub3JlIHRv cC9ib3R0b20gbWFyZ2lucyBvbiBSZW5kZXJJbmxpbmVzLgotICAgIHZpcnR1YWwgaW50IG1hcmdp blRvcCgpIGNvbnN0IHsgcmV0dXJuIDA7IH0KLSAgICB2aXJ0dWFsIGludCBtYXJnaW5Cb3R0b20o KSBjb25zdCB7IHJldHVybiAwOyB9CiAgICAgdmlydHVhbCBJbnRSZWN0IGNsaXBwZWRPdmVyZmxv d1JlY3RGb3JSZXBhaW50KFJlbmRlckJveE1vZGVsT2JqZWN0KiByZXBhaW50Q29udGFpbmVyKTsK ICAgICB2aXJ0dWFsIEludFJlY3QgcmVjdFdpdGhPdXRsaW5lRm9yUmVwYWludChSZW5kZXJCb3hN b2RlbE9iamVjdCogcmVwYWludENvbnRhaW5lciwgaW50IG91dGxpbmVXaWR0aCk7CiAgICAgdmly dHVhbCB2b2lkIGNvbXB1dGVSZWN0Rm9yUmVwYWludChSZW5kZXJCb3hNb2RlbE9iamVjdCogcmVw YWludENvbnRhaW5lciwgSW50UmVjdCYgcmVjdCwgYm9vbCBmaXhlZCk7Cg== 68253 2010-09-21 10:01:25 -0700 2010-09-21 10:05:04 -0700 Patch patch.txt text/plain 7738 hyatt SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2Nzk2MSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjggQEAKKzIwMTAtMDktMjEgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NjE5NiwgYWRkIG1hcmdpblN0YXJ0 L0JlZm9yZS9FbmQvQWZ0ZXIgYWNjZXNzb3JzIHRvIFJlbmRlckJveE1vZGVsT2JqZWN0LgorCisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJCb3g6Om1hcmdpbkJlZm9yZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6Om1hcmdp bkFmdGVyKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6bWFyZ2luU3RhcnQpOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyQm94OjptYXJnaW5FbmQpOgorICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJCb3guaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3Qu aDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVySW5saW5lLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OmNvbXB1dGVNYXJnaW4pOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVySW5saW5lOjptYXJn aW5MZWZ0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlcklubGluZTo6bWFyZ2luUmlnaHQpOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVySW5saW5lOjptYXJnaW5Ub3ApOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVySW5saW5lOjptYXJnaW5Cb3R0b20pOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVySW5saW5lOjptYXJnaW5TdGFydCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJJbmxpbmU6 Om1hcmdpbkVuZCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlcklubGluZS5oOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVySW5saW5lOjptYXJnaW5CZWZvcmUpOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVySW5saW5lOjptYXJnaW5BZnRlcik6CisKIDIwMTAtMDktMjEgIERhdmlkIEh5YXR0 ICA8aHlhdHRAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhbiBCZXJuc3RlaW4u CkluZGV4OiBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAJKHJldmlzaW9uIDY3OTMwKQorKysgV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAkod29ya2luZyBjb3B5KQpAQCAtODMsNiArODMsNTIg QEAgUmVuZGVyQm94Ojp+UmVuZGVyQm94KCkKIHsKIH0KIAoraW50IFJlbmRlckJveDo6bWFyZ2lu QmVmb3JlKCkgY29uc3QKK3sKKyAgICBzd2l0Y2ggKHN0eWxlKCktPmJsb2NrRmxvdygpKSB7Cisg ICAgY2FzZSBUb3BUb0JvdHRvbUJsb2NrRmxvdzoKKyAgICAgICAgcmV0dXJuIG1fbWFyZ2luVG9w OworICAgIGNhc2UgQm90dG9tVG9Ub3BCbG9ja0Zsb3c6CisgICAgICAgIHJldHVybiBtX21hcmdp bkJvdHRvbTsKKyAgICBjYXNlIExlZnRUb1JpZ2h0QmxvY2tGbG93OgorICAgICAgICByZXR1cm4g bV9tYXJnaW5MZWZ0OworICAgIGNhc2UgUmlnaHRUb0xlZnRCbG9ja0Zsb3c6CisgICAgICAgIHJl dHVybiBtX21hcmdpblJpZ2h0OworICAgIH0KKyAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAg ICByZXR1cm4gbV9tYXJnaW5Ub3A7Cit9CisKK2ludCBSZW5kZXJCb3g6Om1hcmdpbkFmdGVyKCkg Y29uc3QKK3sKKyAgICBzd2l0Y2ggKHN0eWxlKCktPmJsb2NrRmxvdygpKSB7CisgICAgY2FzZSBU b3BUb0JvdHRvbUJsb2NrRmxvdzoKKyAgICAgICAgcmV0dXJuIG1fbWFyZ2luQm90dG9tOworICAg IGNhc2UgQm90dG9tVG9Ub3BCbG9ja0Zsb3c6CisgICAgICAgIHJldHVybiBtX21hcmdpblRvcDsK KyAgICBjYXNlIExlZnRUb1JpZ2h0QmxvY2tGbG93OgorICAgICAgICByZXR1cm4gbV9tYXJnaW5S aWdodDsKKyAgICBjYXNlIFJpZ2h0VG9MZWZ0QmxvY2tGbG93OgorICAgICAgICByZXR1cm4gbV9t YXJnaW5MZWZ0OworICAgIH0KKyAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICByZXR1cm4g bV9tYXJnaW5Cb3R0b207Cit9CisKK2ludCBSZW5kZXJCb3g6Om1hcmdpblN0YXJ0KCkgY29uc3QK K3sKKyAgICBpZiAoc3R5bGUoKS0+aXNWZXJ0aWNhbEJsb2NrRmxvdygpKQorICAgICAgICByZXR1 cm4gc3R5bGUoKS0+ZGlyZWN0aW9uKCkgPT0gTFRSID8gbV9tYXJnaW5MZWZ0IDogbV9tYXJnaW5S aWdodDsKKyAgICByZXR1cm4gc3R5bGUoKS0+ZGlyZWN0aW9uKCkgPT0gTFRSID8gbV9tYXJnaW5U b3AgOiBtX21hcmdpbkJvdHRvbTsKK30KKworaW50IFJlbmRlckJveDo6bWFyZ2luRW5kKCkgY29u c3QKK3sKKyAgICBpZiAoc3R5bGUoKS0+aXNWZXJ0aWNhbEJsb2NrRmxvdygpKQorICAgICAgICBy ZXR1cm4gc3R5bGUoKS0+ZGlyZWN0aW9uKCkgPT0gTFRSID8gbV9tYXJnaW5SaWdodCA6IG1fbWFy Z2luTGVmdDsKKyAgICByZXR1cm4gc3R5bGUoKS0+ZGlyZWN0aW9uKCkgPT0gTFRSID8gbV9tYXJn aW5Cb3R0b20gOiBtX21hcmdpblRvcDsKK30KKwogdm9pZCBSZW5kZXJCb3g6OmRlc3Ryb3koKQog ewogICAgIC8vIEEgbG90IG9mIHRoZSBjb2RlIGluIHRoaXMgZnVuY3Rpb24gaXMganVzdCBwYXN0 ZWQgaW50bwpJbmRleDogV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgJKHJldmlzaW9uIDY3OTMwKQorKysgV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgJKHdvcmtpbmcgY29weSkKQEAgLTEzOSw2ICsxMzks MTAgQEAgcHVibGljOgogICAgIHZpcnR1YWwgaW50IG1hcmdpbkJvdHRvbSgpIGNvbnN0IHsgcmV0 dXJuIG1fbWFyZ2luQm90dG9tOyB9CiAgICAgdmlydHVhbCBpbnQgbWFyZ2luTGVmdCgpIGNvbnN0 IHsgcmV0dXJuIG1fbWFyZ2luTGVmdDsgfQogICAgIHZpcnR1YWwgaW50IG1hcmdpblJpZ2h0KCkg Y29uc3QgeyByZXR1cm4gbV9tYXJnaW5SaWdodDsgfQorICAgIHZpcnR1YWwgaW50IG1hcmdpbkJl Zm9yZSgpIGNvbnN0OworICAgIHZpcnR1YWwgaW50IG1hcmdpbkFmdGVyKCkgY29uc3Q7CisgICAg dmlydHVhbCBpbnQgbWFyZ2luU3RhcnQoKSBjb25zdDsKKyAgICB2aXJ0dWFsIGludCBtYXJnaW5F bmQoKSBjb25zdDsKIAogICAgIC8vIFRoZSBmb2xsb3dpbmcgZml2ZSBmdW5jdGlvbnMgYXJlIHVz ZWQgdG8gaW1wbGVtZW50IGNvbGxhcHNpbmcgbWFyZ2lucy4KICAgICAvLyBBbGwgb2JqZWN0cyBr bm93IHRoZWlyIG1heGltYWwgcG9zaXRpdmUgYW5kIG5lZ2F0aXZlIG1hcmdpbnMuICBUaGUKSW5k ZXg6IFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuaAkocmV2aXNpb24gNjc5 NjApCisrKyBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5oCSh3b3JraW5n IGNvcHkpCkBAIC05Myw2ICs5MywxMCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBpbnQgbWFyZ2lu Qm90dG9tKCkgY29uc3QgPSAwOwogICAgIHZpcnR1YWwgaW50IG1hcmdpbkxlZnQoKSBjb25zdCA9 IDA7CiAgICAgdmlydHVhbCBpbnQgbWFyZ2luUmlnaHQoKSBjb25zdCA9IDA7CisgICAgdmlydHVh bCBpbnQgbWFyZ2luQmVmb3JlKCkgY29uc3QgPSAwOworICAgIHZpcnR1YWwgaW50IG1hcmdpbkFm dGVyKCkgY29uc3QgPSAwOworICAgIHZpcnR1YWwgaW50IG1hcmdpblN0YXJ0KCkgY29uc3QgPSAw OworICAgIHZpcnR1YWwgaW50IG1hcmdpbkVuZCgpIGNvbnN0ID0gMDsKIAogICAgIGJvb2wgaGFz SG9yaXpvbnRhbEJvcmRlcnNQYWRkaW5nT3JNYXJnaW4oKSBjb25zdCB7IHJldHVybiBoYXNIb3Jp em9udGFsQm9yZGVyc09yUGFkZGluZygpIHx8IG1hcmdpbkxlZnQoKSAhPSAwIHx8IG1hcmdpblJp Z2h0KCkgIT0gMDsgfQogICAgIGJvb2wgaGFzSG9yaXpvbnRhbEJvcmRlcnNPclBhZGRpbmcoKSBj b25zdCB7IHJldHVybiBib3JkZXJMZWZ0KCkgIT0gMCB8fCBib3JkZXJSaWdodCgpICE9IDAgfHwg cGFkZGluZ0xlZnQoKSAhPSAwIHx8IHBhZGRpbmdSaWdodCgpICE9IDA7IH0KSW5kZXg6IFdlYkNv cmUvcmVuZGVyaW5nL1JlbmRlcklubGluZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVySW5saW5lLmNwcAkocmV2aXNpb24gNjc5MzApCisrKyBXZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJJbmxpbmUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00NTgsMjggKzQ1OCw1MyBA QCBpbnQgUmVuZGVySW5saW5lOjpvZmZzZXRUb3AoKSBjb25zdAogICAgIHJldHVybiB5OwogfQog Ci1pbnQgUmVuZGVySW5saW5lOjptYXJnaW5MZWZ0KCkgY29uc3QKK3N0YXRpYyBpbnQgY29tcHV0 ZU1hcmdpbihjb25zdCBSZW5kZXJJbmxpbmUqIHJlbmRlcmVyLCBjb25zdCBMZW5ndGgmIG1hcmdp bikKIHsKLSAgICBMZW5ndGggbWFyZ2luID0gc3R5bGUoKS0+bWFyZ2luTGVmdCgpOwogICAgIGlm IChtYXJnaW4uaXNBdXRvKCkpCiAgICAgICAgIHJldHVybiAwOwogICAgIGlmIChtYXJnaW4uaXNG aXhlZCgpKQogICAgICAgICByZXR1cm4gbWFyZ2luLnZhbHVlKCk7CiAgICAgaWYgKG1hcmdpbi5p c1BlcmNlbnQoKSkKLSAgICAgICAgcmV0dXJuIG1hcmdpbi5jYWxjTWluVmFsdWUobWF4KDAsIGNv bnRhaW5pbmdCbG9jaygpLT5hdmFpbGFibGVXaWR0aCgpKSk7CisgICAgICAgIHJldHVybiBtYXJn aW4uY2FsY01pblZhbHVlKG1heCgwLCByZW5kZXJlci0+Y29udGFpbmluZ0Jsb2NrKCktPmF2YWls YWJsZUxvZ2ljYWxXaWR0aCgpKSk7CiAgICAgcmV0dXJuIDA7CiB9CiAKK2ludCBSZW5kZXJJbmxp bmU6Om1hcmdpbkxlZnQoKSBjb25zdAoreworICAgIGlmICghc3R5bGUoKS0+aXNWZXJ0aWNhbEJs b2NrRmxvdygpKQorICAgICAgICByZXR1cm4gMDsKKyAgICByZXR1cm4gY29tcHV0ZU1hcmdpbih0 aGlzLCBzdHlsZSgpLT5tYXJnaW5MZWZ0KCkpOworfQorCiBpbnQgUmVuZGVySW5saW5lOjptYXJn aW5SaWdodCgpIGNvbnN0CiB7Ci0gICAgTGVuZ3RoIG1hcmdpbiA9IHN0eWxlKCktPm1hcmdpblJp Z2h0KCk7Ci0gICAgaWYgKG1hcmdpbi5pc0F1dG8oKSkKKyAgICBpZiAoIXN0eWxlKCktPmlzVmVy dGljYWxCbG9ja0Zsb3coKSkKICAgICAgICAgcmV0dXJuIDA7Ci0gICAgaWYgKG1hcmdpbi5pc0Zp eGVkKCkpCi0gICAgICAgIHJldHVybiBtYXJnaW4udmFsdWUoKTsKLSAgICBpZiAobWFyZ2luLmlz UGVyY2VudCgpKQotICAgICAgICByZXR1cm4gbWFyZ2luLmNhbGNNaW5WYWx1ZShtYXgoMCwgY29u dGFpbmluZ0Jsb2NrKCktPmF2YWlsYWJsZVdpZHRoKCkpKTsKLSAgICByZXR1cm4gMDsKKyAgICBy ZXR1cm4gY29tcHV0ZU1hcmdpbih0aGlzLCBzdHlsZSgpLT5tYXJnaW5SaWdodCgpKTsKK30KKwor aW50IFJlbmRlcklubGluZTo6bWFyZ2luVG9wKCkgY29uc3QKK3sKKyAgICBpZiAoc3R5bGUoKS0+ aXNWZXJ0aWNhbEJsb2NrRmxvdygpKQorICAgICAgICByZXR1cm4gMDsKKyAgICByZXR1cm4gY29t cHV0ZU1hcmdpbih0aGlzLCBzdHlsZSgpLT5tYXJnaW5Ub3AoKSk7Cit9CisKK2ludCBSZW5kZXJJ bmxpbmU6Om1hcmdpbkJvdHRvbSgpIGNvbnN0Cit7CisgICAgaWYgKHN0eWxlKCktPmlzVmVydGlj YWxCbG9ja0Zsb3coKSkKKyAgICAgICAgcmV0dXJuIDA7CisgICAgcmV0dXJuIGNvbXB1dGVNYXJn aW4odGhpcywgc3R5bGUoKS0+bWFyZ2luQm90dG9tKCkpOworfQorCitpbnQgUmVuZGVySW5saW5l OjptYXJnaW5TdGFydCgpIGNvbnN0Cit7CisgICAgcmV0dXJuIGNvbXB1dGVNYXJnaW4odGhpcywg c3R5bGUoKS0+bWFyZ2luU3RhcnQoKSk7Cit9CisKK2ludCBSZW5kZXJJbmxpbmU6Om1hcmdpbkVu ZCgpIGNvbnN0Cit7CisgICAgcmV0dXJuIGNvbXB1dGVNYXJnaW4odGhpcywgc3R5bGUoKS0+bWFy Z2luRW5kKCkpOwogfQogCiBjb25zdCBjaGFyKiBSZW5kZXJJbmxpbmU6OnJlbmRlck5hbWUoKSBj b25zdApJbmRleDogV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5lLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5lLmgJKHJldmlzaW9uIDY3OTMwKQorKysg V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5lLmgJKHdvcmtpbmcgY29weSkKQEAgLTQwLDcg KzQwLDEzIEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgaW50IG1hcmdpbkxlZnQoKSBjb25zdDsK ICAgICB2aXJ0dWFsIGludCBtYXJnaW5SaWdodCgpIGNvbnN0OwotICAgIAorICAgIHZpcnR1YWwg aW50IG1hcmdpblRvcCgpIGNvbnN0OworICAgIHZpcnR1YWwgaW50IG1hcmdpbkJvdHRvbSgpIGNv bnN0OworICAgIHZpcnR1YWwgaW50IG1hcmdpbkJlZm9yZSgpIGNvbnN0IHsgcmV0dXJuIDA7IH0K KyAgICB2aXJ0dWFsIGludCBtYXJnaW5BZnRlcigpIGNvbnN0IHsgcmV0dXJuIDA7IH0KKyAgICB2 aXJ0dWFsIGludCBtYXJnaW5TdGFydCgpIGNvbnN0OworICAgIHZpcnR1YWwgaW50IG1hcmdpbkVu ZCgpIGNvbnN0OworCiAgICAgdmlydHVhbCB2b2lkIGFic29sdXRlUmVjdHMoVmVjdG9yPEludFJl Y3Q+JiwgaW50IHR4LCBpbnQgdHkpOwogICAgIHZpcnR1YWwgdm9pZCBhYnNvbHV0ZVF1YWRzKFZl Y3RvcjxGbG9hdFF1YWQ+Jik7CiAKQEAgLTEwOCw5ICsxMTQsNiBAQCBwcml2YXRlOgogICAgIHZp cnR1YWwgaW50IG9mZnNldFdpZHRoKCkgY29uc3QgeyByZXR1cm4gbGluZXNCb3VuZGluZ0JveCgp LndpZHRoKCk7IH0KICAgICB2aXJ0dWFsIGludCBvZmZzZXRIZWlnaHQoKSBjb25zdCB7IHJldHVy biBsaW5lc0JvdW5kaW5nQm94KCkuaGVpZ2h0KCk7IH0KIAotICAgIC8vIEp1c3QgaWdub3JlIHRv cC9ib3R0b20gbWFyZ2lucyBvbiBSZW5kZXJJbmxpbmVzLgotICAgIHZpcnR1YWwgaW50IG1hcmdp blRvcCgpIGNvbnN0IHsgcmV0dXJuIDA7IH0KLSAgICB2aXJ0dWFsIGludCBtYXJnaW5Cb3R0b20o KSBjb25zdCB7IHJldHVybiAwOyB9CiAgICAgdmlydHVhbCBJbnRSZWN0IGNsaXBwZWRPdmVyZmxv d1JlY3RGb3JSZXBhaW50KFJlbmRlckJveE1vZGVsT2JqZWN0KiByZXBhaW50Q29udGFpbmVyKTsK ICAgICB2aXJ0dWFsIEludFJlY3QgcmVjdFdpdGhPdXRsaW5lRm9yUmVwYWludChSZW5kZXJCb3hN b2RlbE9iamVjdCogcmVwYWludENvbnRhaW5lciwgaW50IG91dGxpbmVXaWR0aCk7CiAgICAgdmly dHVhbCB2b2lkIGNvbXB1dGVSZWN0Rm9yUmVwYWludChSZW5kZXJCb3hNb2RlbE9iamVjdCogcmVw YWludENvbnRhaW5lciwgSW50UmVjdCYgcmVjdCwgYm9vbCBmaXhlZCk7Cg==