94419 2012-08-18 16:11:41 -0700 Clean up SVGLocatable inheritance 2012-08-24 13:16:23 -0700 1 1 1 Unclassified WebKit SVG 420+ Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 pdr pdr krit mark.lam webkit.review.bot zimmermann oldest_to_newest 698961 0 pdr 2012-08-18 16:11:41 -0700 SVGLocatable's inheritance chain is a little crufty. SVGTransformableElement inherits from SVGLocatableElement but unnecessarily re-defines the SVGLocatable functions. Furthermore, SVGPathElement defines getBBox() but the function is deadcode. 698962 1 159276 pdr 2012-08-18 16:20:18 -0700 Created attachment 159276 Cleanup SVGLocatable inheritance 698963 2 pdr 2012-08-18 16:28:38 -0700 Reviewers: for context, here's an incomplete but useful description of the inheritance tree: https://docs.google.com/a/chromium.org/drawings/d/1h9TLoPbMI6h6q_RZK3BNgVc0nhxkBWStkpTYYozzeWU/edit 698964 3 159276 buildbot 2012-08-18 16:48:44 -0700 Comment on attachment 159276 Cleanup SVGLocatable inheritance Attachment 159276 did not pass win-ews (win): Output: http://queues.webkit.org/results/13529452 698967 4 pdr 2012-08-18 17:03:03 -0700 The windows build has a warning that is causing the build to fail. This is real and might be why the code was architected this way to begin with. http://msdn.microsoft.com/en-us/library/6b3sy7ae(v=vs.80).aspx The issue is we have a diamond inheritance chain: SVGLocatable -> SVGTransformable -> SVGStyledTransformableElement SVGLocatable -> SVGStyledLocatable -> SVGStyledLocatableElement -> SVGStyledTransformableElement getBBox() is only defined on SVGStyledLocatableElement but the win build is complaining that SVGStyledTransformableElement.getBBox() doesn't know which of the two parents to use. Removing the review flag for now. 698974 5 krit 2012-08-18 17:44:55 -0700 (In reply to comment #4) > The windows build has a warning that is causing the build to fail. This is real and might be why the code was architected this way to begin with. > http://msdn.microsoft.com/en-us/library/6b3sy7ae(v=vs.80).aspx > > The issue is we have a diamond inheritance chain: > SVGLocatable -> SVGTransformable -> SVGStyledTransformableElement > SVGLocatable -> SVGStyledLocatable -> SVGStyledLocatableElement -> SVGStyledTransformableElement > getBBox() is only defined on SVGStyledLocatableElement but the win build is complaining that SVGStyledTransformableElement.getBBox() doesn't know which of the two parents to use. > > Removing the review flag for now. Yes, we had this issue before that prevent us from cleaning up in the past. However, like said before, we will have a major refactoring later anyway. Since SVG 2 will switch to WebIDL, multiple inheritances are not allowed anymore. Don't spend to much time on it yet. 698975 6 pdr 2012-08-18 17:48:57 -0700 (In reply to comment #5) > (In reply to comment #4) > > The windows build has a warning that is causing the build to fail. This is real and might be why the code was architected this way to begin with. > > http://msdn.microsoft.com/en-us/library/6b3sy7ae(v=vs.80).aspx > > > > The issue is we have a diamond inheritance chain: > > SVGLocatable -> SVGTransformable -> SVGStyledTransformableElement > > SVGLocatable -> SVGStyledLocatable -> SVGStyledLocatableElement -> SVGStyledTransformableElement > > getBBox() is only defined on SVGStyledLocatableElement but the win build is complaining that SVGStyledTransformableElement.getBBox() doesn't know which of the two parents to use. > > > > Removing the review flag for now. > > Yes, we had this issue before that prevent us from cleaning up in the past. However, like said before, we will have a major refactoring later anyway. Since SVG 2 will switch to WebIDL, multiple inheritances are not allowed anymore. Don't spend to much time on it yet. Sounds good to me; I'm not a fan of multiple inheritance. Want me to extract out the deadcode removal in SVGPathElement and land that? It's genuinely wrong and confusing for anyone looking at bounding box code. 699230 7 159333 pdr 2012-08-19 22:29:30 -0700 Created attachment 159333 Remove incorrect getBBox() code Extracting out the useful piece from the previous patch. 699568 8 159333 krit 2012-08-20 09:05:08 -0700 Comment on attachment 159333 Remove incorrect getBBox() code View in context: https://bugs.webkit.org/attachment.cgi?id=159333&action=review r=me, but... > Source/WebCore/ChangeLog:9 > + SVGPathElement defines a getBBox() function that is both wrong and > + deadcode. This patch cleans this up. I would agree that we should return objectBoundingBox(), but is does not seem to be "deadcode". Can you change this comment please? 699590 9 159451 pdr 2012-08-20 09:27:25 -0700 Created attachment 159451 Update comment. @krit, good catch. 699812 10 159451 webkit.review.bot 2012-08-20 12:52:31 -0700 Comment on attachment 159451 Update comment. Clearing flags on attachment: 159451 Committed r126056: <http://trac.webkit.org/changeset/126056> 699813 11 webkit.review.bot 2012-08-20 12:52:35 -0700 All reviewed patches have been landed. Closing bug. 704377 12 mark.lam 2012-08-24 13:16:23 -0700 This change broke svg/custom/getBBox-path.svg on platform mac. See https://bugs.webkit.org/show_bug.cgi?id=94969. 159276 2012-08-18 16:20:18 -0700 2012-08-19 22:29:30 -0700 Cleanup SVGLocatable inheritance 94419.1.patch text/plain 5393 pdr SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyNTk3MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDEyLTA4LTE4ICBQaGlsaXAg Um9nZXJzICA8cGRyQGdvb2dsZS5jb20+CisKKyAgICAgICAgQ2xlYW51cCBTVkdMb2NhdGFibGUg aW5oZXJpdGFuY2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTk0NDE5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgU1ZHU3R5bGVkVHJhbnNmb3JtYWJsZUVsZW1lbnQgaW5oZXJpdHMgZnJvbSBTVkdTdHlsZWRM b2NhdGFibGVFbGVtZW50IGFuZCBkb2VzIG5vdAorICAgICAgICBuZWVkIHRvIHJlLWRlZmluZSBT VkdMb2NhdGFibGUncyBmdW5jdGlvbnMuIEFkZGl0aW9uYWxseSwgU1ZHUGF0aEVsZW1lbnQgZGVm aW5lZCBhCisgICAgICAgIGdldEJCb3goKSBmdW5jdGlvbiB0aGF0IHdhcyBib3RoIHdyb25nIGFu ZCBkZWFkY29kZS4gVGhpcyBwYXRjaCBjbGVhbnMgdXAgdGhlc2UKKyAgICAgICAgY29kZSBpc3N1 ZXMuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIGFzIHRoaXMgaXMganVzdCBhIGNsZWFudXAgb2Yg b2xkIGNvZGUuCisKKyAgICAgICAgKiBzdmcvU1ZHUGF0aEVsZW1lbnQuY3BwOgorICAgICAgICAo V2ViQ29yZSk6CisgICAgICAgICogc3ZnL1NWR1BhdGhFbGVtZW50Lmg6CisgICAgICAgIChTVkdQ YXRoRWxlbWVudCk6CisgICAgICAgICogc3ZnL1NWR1N0eWxlZFRyYW5zZm9ybWFibGVFbGVtZW50 LmNwcDoKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAqIHN2Zy9TVkdTdHlsZWRUcmFuc2Zv cm1hYmxlRWxlbWVudC5oOgorICAgICAgICAoU1ZHU3R5bGVkVHJhbnNmb3JtYWJsZUVsZW1lbnQp OgorCiAyMDEyLTA4LTE4ICBBbmRyZWFzIEtsaW5nICA8a2xpbmdAd2Via2l0Lm9yZz4KIAogICAg ICAgICBDU1NWYWx1ZUxpc3Q6IFJlc2VydmUgdGhlIGV4YWN0IGFtb3VudCBvZiBzcGFjZSBuZWVk ZWQgd2hlbiBjb25zdHJ1Y3RpbmcgZnJvbSBDU1MgcGFyc2VyLgpJbmRleDogU291cmNlL1dlYkNv cmUvc3ZnL1NWR1BhdGhFbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9z dmcvU1ZHUGF0aEVsZW1lbnQuY3BwCShyZXZpc2lvbiAxMjU4NzIpCisrKyBTb3VyY2UvV2ViQ29y ZS9zdmcvU1ZHUGF0aEVsZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNTYsMjAgKzM1Niw2 IEBAIHZvaWQgU1ZHUGF0aEVsZW1lbnQ6OnBhdGhTZWdMaXN0Q2hhbmdlZCgKICAgICBSZW5kZXJT VkdSZXNvdXJjZTo6bWFya0ZvckxheW91dEFuZFBhcmVudFJlc291cmNlSW52YWxpZGF0aW9uKHJl bmRlcmVyKTsKIH0KIAotRmxvYXRSZWN0IFNWR1BhdGhFbGVtZW50OjpnZXRCQm94KFN0eWxlVXBk YXRlU3RyYXRlZ3kgc3R5bGVVcGRhdGVTdHJhdGVneSkKLXsKLSAgICBpZiAoc3R5bGVVcGRhdGVT dHJhdGVneSA9PSBBbGxvd1N0eWxlVXBkYXRlKQotICAgICAgICB0aGlzLT5kb2N1bWVudCgpLT51 cGRhdGVMYXlvdXRJZ25vcmVQZW5kaW5nU3R5bGVzaGVldHMoKTsKLQotICAgIFJlbmRlclNWR1Bh dGgqIHJlbmRlcmVyID0gc3RhdGljX2Nhc3Q8UmVuZGVyU1ZHUGF0aCo+KHRoaXMtPnJlbmRlcmVy KCkpOwotCi0gICAgLy8gRklYTUU6IEV2ZW50dWFsbHkgd2Ugc2hvdWxkIHN1cHBvcnQgZ2V0QkJv eCBmb3IgZGV0YWNoZWQgZWxlbWVudHMuCi0gICAgaWYgKCFyZW5kZXJlcikKLSAgICAgICAgcmV0 dXJuIEZsb2F0UmVjdCgpOwotCi0gICAgcmV0dXJuIHJlbmRlcmVyLT5wYXRoKCkuYm91bmRpbmdS ZWN0KCk7Ci19Ci0KIFJlbmRlck9iamVjdCogU1ZHUGF0aEVsZW1lbnQ6OmNyZWF0ZVJlbmRlcmVy KFJlbmRlckFyZW5hKiBhcmVuYSwgUmVuZGVyU3R5bGUqKQogewogICAgIC8vIEJ5IGRlZmF1bHQs IGFueSBzdWJjbGFzcyBpcyBleHBlY3RlZCB0byBkbyBwYXRoLWJhc2VkIGRyYXdpbmcKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3N2Zy9TVkdQYXRoRWxlbWVudC5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3N2Zy9TVkdQYXRoRWxlbWVudC5oCShyZXZpc2lvbiAxMjU4NzIpCisrKyBTb3Vy Y2UvV2ViQ29yZS9zdmcvU1ZHUGF0aEVsZW1lbnQuaAkod29ya2luZyBjb3B5KQpAQCAtOTcsOCAr OTcsNiBAQCBwdWJsaWM6CiAKICAgICBzdGF0aWMgY29uc3QgU1ZHUHJvcGVydHlJbmZvKiBkUHJv cGVydHlJbmZvKCk7CiAKLSAgICB2aXJ0dWFsIEZsb2F0UmVjdCBnZXRCQm94KFN0eWxlVXBkYXRl U3RyYXRlZ3kgPSBBbGxvd1N0eWxlVXBkYXRlKTsKLQogICAgIGJvb2wgaXNBbmltVmFsT2JzZXJ2 ZWQoKSBjb25zdCB7IHJldHVybiBtX2lzQW5pbVZhbE9ic2VydmVkOyB9CiAKIHByaXZhdGU6Cklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9zdmcvU1ZHU3R5bGVkVHJhbnNmb3JtYWJsZUVsZW1lbnQuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3N2Zy9TVkdTdHlsZWRUcmFuc2Zvcm1hYmxl RWxlbWVudC5jcHAJKHJldmlzaW9uIDEyNTg3MikKKysrIFNvdXJjZS9XZWJDb3JlL3N2Zy9TVkdT dHlsZWRUcmFuc2Zvcm1hYmxlRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTUxLDE2ICs1 MSw2IEBAIFNWR1N0eWxlZFRyYW5zZm9ybWFibGVFbGVtZW50Ojp+U1ZHU3R5bGUKIHsKIH0KIAot QWZmaW5lVHJhbnNmb3JtIFNWR1N0eWxlZFRyYW5zZm9ybWFibGVFbGVtZW50OjpnZXRDVE0oU3R5 bGVVcGRhdGVTdHJhdGVneSBzdHlsZVVwZGF0ZVN0cmF0ZWd5KQotewotICAgIHJldHVybiBTVkdM b2NhdGFibGU6OmNvbXB1dGVDVE0odGhpcywgU1ZHTG9jYXRhYmxlOjpOZWFyZXN0Vmlld3BvcnRT Y29wZSwgc3R5bGVVcGRhdGVTdHJhdGVneSk7Ci19Ci0KLUFmZmluZVRyYW5zZm9ybSBTVkdTdHls ZWRUcmFuc2Zvcm1hYmxlRWxlbWVudDo6Z2V0U2NyZWVuQ1RNKFN0eWxlVXBkYXRlU3RyYXRlZ3kg c3R5bGVVcGRhdGVTdHJhdGVneSkKLXsKLSAgICByZXR1cm4gU1ZHTG9jYXRhYmxlOjpjb21wdXRl Q1RNKHRoaXMsIFNWR0xvY2F0YWJsZTo6U2NyZWVuU2NvcGUsIHN0eWxlVXBkYXRlU3RyYXRlZ3kp OwotfQotCiBBZmZpbmVUcmFuc2Zvcm0gU1ZHU3R5bGVkVHJhbnNmb3JtYWJsZUVsZW1lbnQ6OmFu aW1hdGVkTG9jYWxUcmFuc2Zvcm0oKSBjb25zdAogewogICAgIEFmZmluZVRyYW5zZm9ybSBtYXRy aXg7CkBAIC0xMzgsMjEgKzEyOCw2IEBAIHZvaWQgU1ZHU3R5bGVkVHJhbnNmb3JtYWJsZUVsZW1l bnQ6OnN2Z0EKICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKIH0KIAotU1ZHRWxlbWVudCogU1ZH U3R5bGVkVHJhbnNmb3JtYWJsZUVsZW1lbnQ6Om5lYXJlc3RWaWV3cG9ydEVsZW1lbnQoKSBjb25z dAotewotICAgIHJldHVybiBTVkdUcmFuc2Zvcm1hYmxlOjpuZWFyZXN0Vmlld3BvcnRFbGVtZW50 KHRoaXMpOwotfQotCi1TVkdFbGVtZW50KiBTVkdTdHlsZWRUcmFuc2Zvcm1hYmxlRWxlbWVudDo6 ZmFydGhlc3RWaWV3cG9ydEVsZW1lbnQoKSBjb25zdAotewotICAgIHJldHVybiBTVkdUcmFuc2Zv cm1hYmxlOjpmYXJ0aGVzdFZpZXdwb3J0RWxlbWVudCh0aGlzKTsKLX0KLQotRmxvYXRSZWN0IFNW R1N0eWxlZFRyYW5zZm9ybWFibGVFbGVtZW50OjpnZXRCQm94KFN0eWxlVXBkYXRlU3RyYXRlZ3kg c3R5bGVVcGRhdGVTdHJhdGVneSkKLXsKLSAgICByZXR1cm4gU1ZHVHJhbnNmb3JtYWJsZTo6Z2V0 QkJveCh0aGlzLCBzdHlsZVVwZGF0ZVN0cmF0ZWd5KTsKLX0KLQogUmVuZGVyT2JqZWN0KiBTVkdT dHlsZWRUcmFuc2Zvcm1hYmxlRWxlbWVudDo6Y3JlYXRlUmVuZGVyZXIoUmVuZGVyQXJlbmEqIGFy ZW5hLCBSZW5kZXJTdHlsZSopCiB7CiAgICAgLy8gQnkgZGVmYXVsdCwgYW55IHN1YmNsYXNzIGlz IGV4cGVjdGVkIHRvIGRvIHBhdGgtYmFzZWQgZHJhd2luZwpJbmRleDogU291cmNlL1dlYkNvcmUv c3ZnL1NWR1N0eWxlZFRyYW5zZm9ybWFibGVFbGVtZW50LmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvc3ZnL1NWR1N0eWxlZFRyYW5zZm9ybWFibGVFbGVtZW50LmgJKHJldmlzaW9uIDEy NTg3MikKKysrIFNvdXJjZS9XZWJDb3JlL3N2Zy9TVkdTdHlsZWRUcmFuc2Zvcm1hYmxlRWxlbWVu dC5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNiwxNyArMzYsMTAgQEAgY2xhc3MgU1ZHU3R5bGVkVHJh bnNmb3JtYWJsZUVsZW1lbnQgOiBwdQogcHVibGljOgogICAgIHZpcnR1YWwgflNWR1N0eWxlZFRy YW5zZm9ybWFibGVFbGVtZW50KCk7CiAKLSAgICB2aXJ0dWFsIEFmZmluZVRyYW5zZm9ybSBnZXRD VE0oU3R5bGVVcGRhdGVTdHJhdGVneSA9IEFsbG93U3R5bGVVcGRhdGUpOwotICAgIHZpcnR1YWwg QWZmaW5lVHJhbnNmb3JtIGdldFNjcmVlbkNUTShTdHlsZVVwZGF0ZVN0cmF0ZWd5ID0gQWxsb3dT dHlsZVVwZGF0ZSk7Ci0gICAgdmlydHVhbCBTVkdFbGVtZW50KiBuZWFyZXN0Vmlld3BvcnRFbGVt ZW50KCkgY29uc3Q7Ci0gICAgdmlydHVhbCBTVkdFbGVtZW50KiBmYXJ0aGVzdFZpZXdwb3J0RWxl bWVudCgpIGNvbnN0OwotCiAgICAgdmlydHVhbCBBZmZpbmVUcmFuc2Zvcm0gbG9jYWxDb29yZGlu YXRlU3BhY2VUcmFuc2Zvcm0oU1ZHTG9jYXRhYmxlOjpDVE1TY29wZSBtb2RlKSBjb25zdCB7IHJl dHVybiBTVkdUcmFuc2Zvcm1hYmxlOjpsb2NhbENvb3JkaW5hdGVTcGFjZVRyYW5zZm9ybShtb2Rl KTsgfQogICAgIHZpcnR1YWwgQWZmaW5lVHJhbnNmb3JtIGFuaW1hdGVkTG9jYWxUcmFuc2Zvcm0o KSBjb25zdDsKICAgICB2aXJ0dWFsIEFmZmluZVRyYW5zZm9ybSogc3VwcGxlbWVudGFsVHJhbnNm b3JtKCk7CiAKLSAgICB2aXJ0dWFsIEZsb2F0UmVjdCBnZXRCQm94KFN0eWxlVXBkYXRlU3RyYXRl Z3kgPSBBbGxvd1N0eWxlVXBkYXRlKTsKLQogICAgIC8vICJiYXNlIGNsYXNzIiBtZXRob2RzIGZv ciBhbGwgdGhlIGVsZW1lbnRzIHdoaWNoIHJlbmRlciBhcyBwYXRocwogICAgIHZpcnR1YWwgdm9p ZCB0b0NsaXBQYXRoKFBhdGgmKTsKICAgICB2aXJ0dWFsIFJlbmRlck9iamVjdCogY3JlYXRlUmVu ZGVyZXIoUmVuZGVyQXJlbmEqLCBSZW5kZXJTdHlsZSopOwo= 159333 2012-08-19 22:29:30 -0700 2012-08-20 09:27:25 -0700 Remove incorrect getBBox() code 94419.3.patch text/plain 2253 pdr SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyNTk5OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA4LTE5ICBQaGlsaXAg Um9nZXJzICA8cGRyQGdvb2dsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIGluY29ycmVjdCBnZXRC Qm94KCkgY29kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9OTQ0MTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBTVkdQYXRoRWxlbWVudCBkZWZpbmVzIGEgZ2V0QkJveCgpIGZ1bmN0aW9uIHRoYXQgaXMgYm90 aCB3cm9uZyBhbmQKKyAgICAgICAgZGVhZGNvZGUuIFRoaXMgcGF0Y2ggY2xlYW5zIHRoaXMgdXAu CisKKyAgICAgICAgTm8gbmV3IHRlc3RzIGFzIHRoaXMgaXMganVzdCBhIGNsZWFudXAgb2Ygb2xk IGNvZGUuCisKKyAgICAgICAgKiBzdmcvU1ZHUGF0aEVsZW1lbnQuY3BwOgorICAgICAgICAoV2Vi Q29yZSk6CisgICAgICAgICogc3ZnL1NWR1BhdGhFbGVtZW50Lmg6CisgICAgICAgIChTVkdQYXRo RWxlbWVudCk6CisKIDIwMTItMDgtMTkgIEtlbnRhcm8gSGFyYSAgPGhhcmFrZW5AY2hyb21pdW0u b3JnPgogCiAgICAgICAgIFtWOF0gTW92ZSBWOFByb3h5OjpjYWxsRnVuY3Rpb24oKSB0byBTY3Jp cHRDb250cm9sbGVyCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9zdmcvU1ZHUGF0aEVsZW1lbnQuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3N2Zy9TVkdQYXRoRWxlbWVudC5jcHAJKHJl dmlzaW9uIDEyNTg3MikKKysrIFNvdXJjZS9XZWJDb3JlL3N2Zy9TVkdQYXRoRWxlbWVudC5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTM1NiwyMCArMzU2LDYgQEAgdm9pZCBTVkdQYXRoRWxlbWVudDo6 cGF0aFNlZ0xpc3RDaGFuZ2VkKAogICAgIFJlbmRlclNWR1Jlc291cmNlOjptYXJrRm9yTGF5b3V0 QW5kUGFyZW50UmVzb3VyY2VJbnZhbGlkYXRpb24ocmVuZGVyZXIpOwogfQogCi1GbG9hdFJlY3Qg U1ZHUGF0aEVsZW1lbnQ6OmdldEJCb3goU3R5bGVVcGRhdGVTdHJhdGVneSBzdHlsZVVwZGF0ZVN0 cmF0ZWd5KQotewotICAgIGlmIChzdHlsZVVwZGF0ZVN0cmF0ZWd5ID09IEFsbG93U3R5bGVVcGRh dGUpCi0gICAgICAgIHRoaXMtPmRvY3VtZW50KCktPnVwZGF0ZUxheW91dElnbm9yZVBlbmRpbmdT dHlsZXNoZWV0cygpOwotCi0gICAgUmVuZGVyU1ZHUGF0aCogcmVuZGVyZXIgPSBzdGF0aWNfY2Fz dDxSZW5kZXJTVkdQYXRoKj4odGhpcy0+cmVuZGVyZXIoKSk7Ci0KLSAgICAvLyBGSVhNRTogRXZl bnR1YWxseSB3ZSBzaG91bGQgc3VwcG9ydCBnZXRCQm94IGZvciBkZXRhY2hlZCBlbGVtZW50cy4K LSAgICBpZiAoIXJlbmRlcmVyKQotICAgICAgICByZXR1cm4gRmxvYXRSZWN0KCk7Ci0KLSAgICBy ZXR1cm4gcmVuZGVyZXItPnBhdGgoKS5ib3VuZGluZ1JlY3QoKTsKLX0KLQogUmVuZGVyT2JqZWN0 KiBTVkdQYXRoRWxlbWVudDo6Y3JlYXRlUmVuZGVyZXIoUmVuZGVyQXJlbmEqIGFyZW5hLCBSZW5k ZXJTdHlsZSopCiB7CiAgICAgLy8gQnkgZGVmYXVsdCwgYW55IHN1YmNsYXNzIGlzIGV4cGVjdGVk IHRvIGRvIHBhdGgtYmFzZWQgZHJhd2luZwpJbmRleDogU291cmNlL1dlYkNvcmUvc3ZnL1NWR1Bh dGhFbGVtZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvc3ZnL1NWR1BhdGhFbGVt ZW50LmgJKHJldmlzaW9uIDEyNTg3MikKKysrIFNvdXJjZS9XZWJDb3JlL3N2Zy9TVkdQYXRoRWxl bWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC05Nyw4ICs5Nyw2IEBAIHB1YmxpYzoKIAogICAgIHN0 YXRpYyBjb25zdCBTVkdQcm9wZXJ0eUluZm8qIGRQcm9wZXJ0eUluZm8oKTsKIAotICAgIHZpcnR1 YWwgRmxvYXRSZWN0IGdldEJCb3goU3R5bGVVcGRhdGVTdHJhdGVneSA9IEFsbG93U3R5bGVVcGRh dGUpOwotCiAgICAgYm9vbCBpc0FuaW1WYWxPYnNlcnZlZCgpIGNvbnN0IHsgcmV0dXJuIG1faXNB bmltVmFsT2JzZXJ2ZWQ7IH0KIAogcHJpdmF0ZToK 159451 2012-08-20 09:27:25 -0700 2012-08-20 12:52:31 -0700 Update comment. 94419.3.patch text/plain 2270 pdr SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyNTk5OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA4LTE5ICBQaGlsaXAg Um9nZXJzICA8cGRyQGdvb2dsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIGluY29ycmVjdCBnZXRC Qm94KCkgY29kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9OTQ0MTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBTVkdQYXRoRWxlbWVudCBkZWZpbmVzIGEgZ2V0QkJveCgpIGZ1bmN0aW9uIHRoYXQgaXMgd3Jv bmcgYW5kCisgICAgICAgIHNob3VsZCB1c2Ugb2JqZWN0Qm91bmRpbmdCb3goKS4gVGhpcyBwYXRj aCBjbGVhbnMgdGhpcyB1cC4KKworICAgICAgICBObyBuZXcgdGVzdHMgYXMgdGhpcyBpcyBqdXN0 IGEgY2xlYW51cCBvZiBvbGQgY29kZS4KKworICAgICAgICAqIHN2Zy9TVkdQYXRoRWxlbWVudC5j cHA6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKiBzdmcvU1ZHUGF0aEVsZW1lbnQuaDoK KyAgICAgICAgKFNWR1BhdGhFbGVtZW50KToKKwogMjAxMi0wOC0xOSAgS2VudGFybyBIYXJhICA8 aGFyYWtlbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW1Y4XSBNb3ZlIFY4UHJveHk6OmNhbGxG dW5jdGlvbigpIHRvIFNjcmlwdENvbnRyb2xsZXIKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3N2Zy9T VkdQYXRoRWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvc3ZnL1NWR1Bh dGhFbGVtZW50LmNwcAkocmV2aXNpb24gMTI1ODcyKQorKysgU291cmNlL1dlYkNvcmUvc3ZnL1NW R1BhdGhFbGVtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzU2LDIwICszNTYsNiBAQCB2b2lk IFNWR1BhdGhFbGVtZW50OjpwYXRoU2VnTGlzdENoYW5nZWQoCiAgICAgUmVuZGVyU1ZHUmVzb3Vy Y2U6Om1hcmtGb3JMYXlvdXRBbmRQYXJlbnRSZXNvdXJjZUludmFsaWRhdGlvbihyZW5kZXJlcik7 CiB9CiAKLUZsb2F0UmVjdCBTVkdQYXRoRWxlbWVudDo6Z2V0QkJveChTdHlsZVVwZGF0ZVN0cmF0 ZWd5IHN0eWxlVXBkYXRlU3RyYXRlZ3kpCi17Ci0gICAgaWYgKHN0eWxlVXBkYXRlU3RyYXRlZ3kg PT0gQWxsb3dTdHlsZVVwZGF0ZSkKLSAgICAgICAgdGhpcy0+ZG9jdW1lbnQoKS0+dXBkYXRlTGF5 b3V0SWdub3JlUGVuZGluZ1N0eWxlc2hlZXRzKCk7Ci0KLSAgICBSZW5kZXJTVkdQYXRoKiByZW5k ZXJlciA9IHN0YXRpY19jYXN0PFJlbmRlclNWR1BhdGgqPih0aGlzLT5yZW5kZXJlcigpKTsKLQot ICAgIC8vIEZJWE1FOiBFdmVudHVhbGx5IHdlIHNob3VsZCBzdXBwb3J0IGdldEJCb3ggZm9yIGRl dGFjaGVkIGVsZW1lbnRzLgotICAgIGlmICghcmVuZGVyZXIpCi0gICAgICAgIHJldHVybiBGbG9h dFJlY3QoKTsKLQotICAgIHJldHVybiByZW5kZXJlci0+cGF0aCgpLmJvdW5kaW5nUmVjdCgpOwot fQotCiBSZW5kZXJPYmplY3QqIFNWR1BhdGhFbGVtZW50OjpjcmVhdGVSZW5kZXJlcihSZW5kZXJB cmVuYSogYXJlbmEsIFJlbmRlclN0eWxlKikKIHsKICAgICAvLyBCeSBkZWZhdWx0LCBhbnkgc3Vi Y2xhc3MgaXMgZXhwZWN0ZWQgdG8gZG8gcGF0aC1iYXNlZCBkcmF3aW5nCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9zdmcvU1ZHUGF0aEVsZW1lbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9zdmcvU1ZHUGF0aEVsZW1lbnQuaAkocmV2aXNpb24gMTI1ODcyKQorKysgU291cmNlL1dlYkNv cmUvc3ZnL1NWR1BhdGhFbGVtZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTk3LDggKzk3LDYgQEAg cHVibGljOgogCiAgICAgc3RhdGljIGNvbnN0IFNWR1Byb3BlcnR5SW5mbyogZFByb3BlcnR5SW5m bygpOwogCi0gICAgdmlydHVhbCBGbG9hdFJlY3QgZ2V0QkJveChTdHlsZVVwZGF0ZVN0cmF0ZWd5 ID0gQWxsb3dTdHlsZVVwZGF0ZSk7Ci0KICAgICBib29sIGlzQW5pbVZhbE9ic2VydmVkKCkgY29u c3QgeyByZXR1cm4gbV9pc0FuaW1WYWxPYnNlcnZlZDsgfQogCiBwcml2YXRlOgo=