82641 2012-03-29 12:28:13 -0700 remove unneeded copies of SkPaths, remove unneeded save/restore 2012-03-30 09:33:32 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 reed reed eric pdr senorblanco webkit.review.bot oldest_to_newest 591444 0 reed 2012-03-29 12:28:13 -0700 avoid unneeded copies of SkPaths, avoid unneeded save/restore 591445 1 134645 reed 2012-03-29 12:29:55 -0700 Created attachment 134645 Patch 591447 2 webkit.review.bot 2012-03-29 12:34:05 -0700 Attachment 134645 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/ChangeLog:8: You should remove the 'No new tests' and either add and list tests, or explain why no new tests were possible. [changelog/nonewtests] [5] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 591460 3 134648 reed 2012-03-29 12:49:41 -0700 Created attachment 134648 Patch 591476 4 134648 eric 2012-03-29 13:12:02 -0700 Comment on attachment 134648 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=134648&action=review > Source/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp:398 > + // we must make a copy of the path, to mark it as inverse-filled I believe comments are supposed to be sentences in WebKit with capitals and periods. > Source/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp:422 > + if (path->getFillType() != ftype) { > + storage = *path; > + storage.setFillType(ftype); > + path = &storage; > + } I'm confused by this idium. You're copying the path to change its fill type? > Source/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp:-831 > - platformContext()->save(); setupPaintForFilling does not affect the context I take it? 591491 5 reed 2012-03-29 13:22:16 -0700 I have to copy the path, which is a pointer to a const path, if I want to change anything. The point of this CL is to perform those expensive copies only if they are actually needed. The previous version always did an implicit copy, since the data-type was SkPath, and not SkPath*. All of the setupPaint[forFilling,ForStroking] methods are const, and do not affect the context. I will fix the comment. 591496 6 134655 reed 2012-03-29 13:30:32 -0700 Created attachment 134655 Patch 591497 7 reed 2012-03-29 13:31:23 -0700 patch #3 updated the comment. PTAL 591508 8 senorblanco 2012-03-29 13:37:32 -0700 (In reply to comment #5) > I have to copy the path, which is a pointer to a const path, if I want to change anything. The point of this CL is to perform those expensive copies only if they are actually needed. The previous version always did an implicit copy, since the data-type was SkPath, and not SkPath*. Actually (not Mike's fault), it looks like Path::platformPath() is const, but returns a non-const PlatformPath* (in this case, an SkPath*). That's pretty bad. IMHO, we should have two accessors: a const one that returns a const PlatformPath*, and a non-const one that returns a non-const PlatformPath* (if absolutely necessary). 591532 9 reed 2012-03-29 14:00:21 -0700 In these cases (I think), the Path object is always const, so I really can't mutate the underlying impl. I think my (deferred) copies are still needed... 591545 10 senorblanco 2012-03-29 14:16:22 -0700 (In reply to comment #9) > In these cases (I think), the Path object is always const, so I really can't mutate the underlying impl. I think my (deferred) copies are still needed... Your code is correct. What I meant was that Path::platformPath() is const, but returns a non-const SkPath* (I think?). 591567 11 reed 2012-03-29 14:28:55 -0700 Gotcha. Agreed. Certain 'platformPath() const' should return a const native*. If the EWS goes green, can the CL get a + ? 592172 12 134655 senorblanco 2012-03-30 08:10:16 -0700 Comment on attachment 134655 Patch OK. r=me 592227 13 134655 webkit.review.bot 2012-03-30 09:33:27 -0700 Comment on attachment 134655 Patch Clearing flags on attachment: 134655 Committed r112676: <http://trac.webkit.org/changeset/112676> 592228 14 webkit.review.bot 2012-03-30 09:33:32 -0700 All reviewed patches have been landed. Closing bug. 134645 2012-03-29 12:29:55 -0700 2012-03-29 12:49:31 -0700 Patch bug-82641-20120329152954.patch text/plain 4275 reed SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMjU2MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDEyLTAzLTI5ICBNaWtlIFJl ZWQgIDxyZWVkQGdvb2dsZS5jb20+CisKKyAgICAgICAgYXZvaWQgdW5uZWVkZWQgY29waWVzIG9m IFNrUGF0aHMsIGF2b2lkIHVubmVlZGVkIHNhdmUvcmVzdG9yZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODI2NDEKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMuIChPT1BTISkKKworICAg ICAgICBQZXJmb3JtYW5jZSBjaGFuZ2UsIGV4aXN0aW5nIHdlYmtpdCB0ZXN0cyBhcHBseQorCisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9HcmFwaGljc0NvbnRleHRTa2lhLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6Y2xpcE91dCk6CisgICAgICAgIChX ZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmNsaXBQYXRoKToKKyAgICAgICAgKFdlYkNvcmU6Okdy YXBoaWNzQ29udGV4dDo6ZmlsbFBhdGgpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250 ZXh0OjpmaWxsUmVjdCk6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OnN0cm9r ZVBhdGgpOgorCiAyMDEyLTAzLTI5ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdt YWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMTEyNTUzLgpJbmRl eDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9HcmFwaGljc0NvbnRleHRT a2lhLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9z a2lhL0dyYXBoaWNzQ29udGV4dFNraWEuY3BwCShyZXZpc2lvbiAxMTI1NDcpCisrKyBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL0dyYXBoaWNzQ29udGV4dFNraWEuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0zOTUsNyArMzk1LDggQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OmNs aXBPdXQoY29uc3QgUGF0aAogICAgIGlmIChwYWludGluZ0Rpc2FibGVkKCkpCiAgICAgICAgIHJl dHVybjsKIAotICAgIFNrUGF0aCBwYXRoID0gKnAucGxhdGZvcm1QYXRoKCk7CisgICAgLy8gd2Ug bXVzdCBtYWtlIGEgY29weSBvZiB0aGUgcGF0aCwgdG8gbWFyayBpdCBhcyBpbnZlcnNlLWZpbGxl ZAorICAgIFNrUGF0aCBwYXRoKCpwLnBsYXRmb3JtUGF0aCgpKTsKICAgICBpZiAoIWlzUGF0aFNr aWFTYWZlKGdldENUTSgpLCBwYXRoKSkKICAgICAgICAgcmV0dXJuOwogCkBAIC00MDgsMTIgKzQw OSwxOCBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6Y2xpcFBhdGgoY29uc3QgUGF0CiAgICAgaWYg KHBhaW50aW5nRGlzYWJsZWQoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgU2tQYXRoIHBhdGgg PSAqcGF0aFRvQ2xpcC5wbGF0Zm9ybVBhdGgoKTsKLSAgICBpZiAoIWlzUGF0aFNraWFTYWZlKGdl dENUTSgpLCBwYXRoKSkKKyAgICBjb25zdCBTa1BhdGgqIHBhdGggPSBwYXRoVG9DbGlwLnBsYXRm b3JtUGF0aCgpOworICAgIGlmICghaXNQYXRoU2tpYVNhZmUoZ2V0Q1RNKCksICpwYXRoKSkKICAg ICAgICAgcmV0dXJuOwogCi0gICAgcGF0aC5zZXRGaWxsVHlwZShjbGlwUnVsZSA9PSBSVUxFX0VW RU5PREQgPyBTa1BhdGg6OmtFdmVuT2RkX0ZpbGxUeXBlIDogU2tQYXRoOjprV2luZGluZ19GaWxs VHlwZSk7Ci0gICAgcGxhdGZvcm1Db250ZXh0KCktPmNsaXBQYXRoQW50aUFsaWFzZWQocGF0aCk7 CisgICAgU2tQYXRoOjpGaWxsVHlwZSBmdHlwZSA9IChjbGlwUnVsZSA9PSBSVUxFX0VWRU5PREQp ID8gU2tQYXRoOjprRXZlbk9kZF9GaWxsVHlwZSA6IFNrUGF0aDo6a1dpbmRpbmdfRmlsbFR5cGU7 CisgICAgU2tQYXRoIHN0b3JhZ2U7CisgICAgaWYgKHBhdGgtPmdldEZpbGxUeXBlKCkgIT0gZnR5 cGUpIHsKKyAgICAgICAgc3RvcmFnZSA9ICpwYXRoOworICAgICAgICBzdG9yYWdlLnNldEZpbGxU eXBlKGZ0eXBlKTsKKyAgICAgICAgcGF0aCA9ICZzdG9yYWdlOworICAgIH0KKyAgICBwbGF0Zm9y bUNvbnRleHQoKS0+Y2xpcFBhdGhBbnRpQWxpYXNlZCgqcGF0aCk7CiB9CiAKIHZvaWQgR3JhcGhp Y3NDb250ZXh0Ojpjb25jYXRDVE0oY29uc3QgQWZmaW5lVHJhbnNmb3JtJiBhZmZpbmUpCkBAIC04 MDIsMTkgKzgwOSwyNiBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZmlsbFBhdGgoY29uc3QgUGF0 CiAgICAgaWYgKHBhaW50aW5nRGlzYWJsZWQoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgU2tQ YXRoIHBhdGggPSAqcGF0aFRvRmlsbC5wbGF0Zm9ybVBhdGgoKTsKLSAgICBpZiAoIWlzUGF0aFNr aWFTYWZlKGdldENUTSgpLCBwYXRoKSkKKyAgICBjb25zdCBTa1BhdGgqIHBhdGggPSBwYXRoVG9G aWxsLnBsYXRmb3JtUGF0aCgpOworICAgIGlmICghaXNQYXRoU2tpYVNhZmUoZ2V0Q1RNKCksICpw YXRoKSkKICAgICAgIHJldHVybjsKIAogICAgIGNvbnN0IEdyYXBoaWNzQ29udGV4dFN0YXRlJiBz dGF0ZSA9IG1fc3RhdGU7Ci0gICAgcGF0aC5zZXRGaWxsVHlwZShzdGF0ZS5maWxsUnVsZSA9PSBS VUxFX0VWRU5PREQgPwotICAgICAgICBTa1BhdGg6OmtFdmVuT2RkX0ZpbGxUeXBlIDogU2tQYXRo OjprV2luZGluZ19GaWxsVHlwZSk7CisgICAgU2tQYXRoOjpGaWxsVHlwZSBmdHlwZSA9IHN0YXRl LmZpbGxSdWxlID09IFJVTEVfRVZFTk9ERCA/CisgICAgICAgIFNrUGF0aDo6a0V2ZW5PZGRfRmls bFR5cGUgOiBTa1BhdGg6OmtXaW5kaW5nX0ZpbGxUeXBlOworCisgICAgU2tQYXRoIHN0b3JhZ2U7 CisgICAgaWYgKHBhdGgtPmdldEZpbGxUeXBlKCkgIT0gZnR5cGUpIHsKKyAgICAgICAgc3RvcmFn ZSA9ICpwYXRoOworICAgICAgICBzdG9yYWdlLnNldEZpbGxUeXBlKGZ0eXBlKTsKKyAgICAgICAg cGF0aCA9ICZzdG9yYWdlOworICAgIH0KIAogICAgIFNrUGFpbnQgcGFpbnQ7CiAgICAgcGxhdGZv cm1Db250ZXh0KCktPnNldHVwUGFpbnRGb3JGaWxsaW5nKCZwYWludCk7CiAKLSAgICBwbGF0Zm9y bUNvbnRleHQoKS0+Y2FudmFzKCktPmRyYXdQYXRoKHBhdGgsIHBhaW50KTsKLSAgICBwbGF0Zm9y bUNvbnRleHQoKS0+ZGlkRHJhd1BhdGgocGF0aCwgcGFpbnQpOworICAgIHBsYXRmb3JtQ29udGV4 dCgpLT5jYW52YXMoKS0+ZHJhd1BhdGgoKnBhdGgsIHBhaW50KTsKKyAgICBwbGF0Zm9ybUNvbnRl eHQoKS0+ZGlkRHJhd1BhdGgoKnBhdGgsIHBhaW50KTsKIH0KIAogdm9pZCBHcmFwaGljc0NvbnRl eHQ6OmZpbGxSZWN0KGNvbnN0IEZsb2F0UmVjdCYgcmVjdCkKQEAgLTgyOCwxNCArODQyLDEwIEBA IHZvaWQgR3JhcGhpY3NDb250ZXh0OjpmaWxsUmVjdChjb25zdCBGbG8KICAgICAgICAgQ2xpcFJl Y3RUb0NhbnZhcygqcGxhdGZvcm1Db250ZXh0KCktPmNhbnZhcygpLCByLCAmcik7CiAgICAgfQog Ci0gICAgcGxhdGZvcm1Db250ZXh0KCktPnNhdmUoKTsKLQogICAgIFNrUGFpbnQgcGFpbnQ7CiAg ICAgcGxhdGZvcm1Db250ZXh0KCktPnNldHVwUGFpbnRGb3JGaWxsaW5nKCZwYWludCk7CiAgICAg cGxhdGZvcm1Db250ZXh0KCktPmNhbnZhcygpLT5kcmF3UmVjdChyLCBwYWludCk7CiAgICAgcGxh dGZvcm1Db250ZXh0KCktPmRpZERyYXdSZWN0KHIsIHBhaW50KTsKLQotICAgIHBsYXRmb3JtQ29u dGV4dCgpLT5yZXN0b3JlKCk7CiB9CiAKIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpmaWxsUmVjdChj b25zdCBGbG9hdFJlY3QmIHJlY3QsIGNvbnN0IENvbG9yJiBjb2xvciwgQ29sb3JTcGFjZSBjb2xv clNwYWNlKQpAQCAtMTE5NSw3ICsxMjA1LDcgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OnN0cm9r ZVBhdGgoY29uc3QgUAogICAgIGlmIChwYWludGluZ0Rpc2FibGVkKCkpCiAgICAgICAgIHJldHVy bjsKIAotICAgIFNrUGF0aCBwYXRoID0gKnBhdGhUb1N0cm9rZS5wbGF0Zm9ybVBhdGgoKTsKKyAg ICBjb25zdCBTa1BhdGgmIHBhdGggPSAqcGF0aFRvU3Ryb2tlLnBsYXRmb3JtUGF0aCgpOwogICAg IGlmICghaXNQYXRoU2tpYVNhZmUoZ2V0Q1RNKCksIHBhdGgpKQogICAgICAgICByZXR1cm47CiAK 134648 2012-03-29 12:49:41 -0700 2012-03-29 13:30:11 -0700 Patch bug-82641-20120329154938.patch text/plain 4245 reed SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMjU2MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDEyLTAzLTI5ICBNaWtlIFJl ZWQgIDxyZWVkQGdvb2dsZS5jb20+CisKKyAgICAgICAgcmVtb3ZlIHVubmVlZGVkIGNvcGllcyBv ZiBTa1BhdGhzLCByZW1vdmUgdW5uZWVkZWQgc2F2ZS9yZXN0b3JlCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MjY0MQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBlcmZvcm1hbmNlIGNoYW5nZSwgZXhpc3Rp bmcgd2Via2l0IHRlc3RzIGFwcGx5LgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvc2tp YS9HcmFwaGljc0NvbnRleHRTa2lhLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29u dGV4dDo6Y2xpcE91dCk6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmNsaXBQ YXRoKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6ZmlsbFBhdGgpOgorICAg ICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpmaWxsUmVjdCk6CisgICAgICAgIChXZWJD b3JlOjpHcmFwaGljc0NvbnRleHQ6OnN0cm9rZVBhdGgpOgorCiAyMDEyLTAzLTI5ICBTaGVyaWZm IEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2Vk LCByb2xsaW5nIG91dCByMTEyNTUzLgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3Mvc2tpYS9HcmFwaGljc0NvbnRleHRTa2lhLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL0dyYXBoaWNzQ29udGV4dFNraWEuY3BwCShy ZXZpc2lvbiAxMTI1NDcpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lh L0dyYXBoaWNzQ29udGV4dFNraWEuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zOTUsNyArMzk1LDgg QEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OmNsaXBPdXQoY29uc3QgUGF0aAogICAgIGlmIChwYWlu dGluZ0Rpc2FibGVkKCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIFNrUGF0aCBwYXRoID0gKnAu cGxhdGZvcm1QYXRoKCk7CisgICAgLy8gd2UgbXVzdCBtYWtlIGEgY29weSBvZiB0aGUgcGF0aCwg dG8gbWFyayBpdCBhcyBpbnZlcnNlLWZpbGxlZAorICAgIFNrUGF0aCBwYXRoKCpwLnBsYXRmb3Jt UGF0aCgpKTsKICAgICBpZiAoIWlzUGF0aFNraWFTYWZlKGdldENUTSgpLCBwYXRoKSkKICAgICAg ICAgcmV0dXJuOwogCkBAIC00MDgsMTIgKzQwOSwxOCBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6 Y2xpcFBhdGgoY29uc3QgUGF0CiAgICAgaWYgKHBhaW50aW5nRGlzYWJsZWQoKSkKICAgICAgICAg cmV0dXJuOwogCi0gICAgU2tQYXRoIHBhdGggPSAqcGF0aFRvQ2xpcC5wbGF0Zm9ybVBhdGgoKTsK LSAgICBpZiAoIWlzUGF0aFNraWFTYWZlKGdldENUTSgpLCBwYXRoKSkKKyAgICBjb25zdCBTa1Bh dGgqIHBhdGggPSBwYXRoVG9DbGlwLnBsYXRmb3JtUGF0aCgpOworICAgIGlmICghaXNQYXRoU2tp YVNhZmUoZ2V0Q1RNKCksICpwYXRoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgcGF0aC5zZXRG aWxsVHlwZShjbGlwUnVsZSA9PSBSVUxFX0VWRU5PREQgPyBTa1BhdGg6OmtFdmVuT2RkX0ZpbGxU eXBlIDogU2tQYXRoOjprV2luZGluZ19GaWxsVHlwZSk7Ci0gICAgcGxhdGZvcm1Db250ZXh0KCkt PmNsaXBQYXRoQW50aUFsaWFzZWQocGF0aCk7CisgICAgU2tQYXRoOjpGaWxsVHlwZSBmdHlwZSA9 IChjbGlwUnVsZSA9PSBSVUxFX0VWRU5PREQpID8gU2tQYXRoOjprRXZlbk9kZF9GaWxsVHlwZSA6 IFNrUGF0aDo6a1dpbmRpbmdfRmlsbFR5cGU7CisgICAgU2tQYXRoIHN0b3JhZ2U7CisgICAgaWYg KHBhdGgtPmdldEZpbGxUeXBlKCkgIT0gZnR5cGUpIHsKKyAgICAgICAgc3RvcmFnZSA9ICpwYXRo OworICAgICAgICBzdG9yYWdlLnNldEZpbGxUeXBlKGZ0eXBlKTsKKyAgICAgICAgcGF0aCA9ICZz dG9yYWdlOworICAgIH0KKyAgICBwbGF0Zm9ybUNvbnRleHQoKS0+Y2xpcFBhdGhBbnRpQWxpYXNl ZCgqcGF0aCk7CiB9CiAKIHZvaWQgR3JhcGhpY3NDb250ZXh0Ojpjb25jYXRDVE0oY29uc3QgQWZm aW5lVHJhbnNmb3JtJiBhZmZpbmUpCkBAIC04MDIsMTkgKzgwOSwyNiBAQCB2b2lkIEdyYXBoaWNz Q29udGV4dDo6ZmlsbFBhdGgoY29uc3QgUGF0CiAgICAgaWYgKHBhaW50aW5nRGlzYWJsZWQoKSkK ICAgICAgICAgcmV0dXJuOwogCi0gICAgU2tQYXRoIHBhdGggPSAqcGF0aFRvRmlsbC5wbGF0Zm9y bVBhdGgoKTsKLSAgICBpZiAoIWlzUGF0aFNraWFTYWZlKGdldENUTSgpLCBwYXRoKSkKKyAgICBj b25zdCBTa1BhdGgqIHBhdGggPSBwYXRoVG9GaWxsLnBsYXRmb3JtUGF0aCgpOworICAgIGlmICgh aXNQYXRoU2tpYVNhZmUoZ2V0Q1RNKCksICpwYXRoKSkKICAgICAgIHJldHVybjsKIAogICAgIGNv bnN0IEdyYXBoaWNzQ29udGV4dFN0YXRlJiBzdGF0ZSA9IG1fc3RhdGU7Ci0gICAgcGF0aC5zZXRG aWxsVHlwZShzdGF0ZS5maWxsUnVsZSA9PSBSVUxFX0VWRU5PREQgPwotICAgICAgICBTa1BhdGg6 OmtFdmVuT2RkX0ZpbGxUeXBlIDogU2tQYXRoOjprV2luZGluZ19GaWxsVHlwZSk7CisgICAgU2tQ YXRoOjpGaWxsVHlwZSBmdHlwZSA9IHN0YXRlLmZpbGxSdWxlID09IFJVTEVfRVZFTk9ERCA/Cisg ICAgICAgIFNrUGF0aDo6a0V2ZW5PZGRfRmlsbFR5cGUgOiBTa1BhdGg6OmtXaW5kaW5nX0ZpbGxU eXBlOworCisgICAgU2tQYXRoIHN0b3JhZ2U7CisgICAgaWYgKHBhdGgtPmdldEZpbGxUeXBlKCkg IT0gZnR5cGUpIHsKKyAgICAgICAgc3RvcmFnZSA9ICpwYXRoOworICAgICAgICBzdG9yYWdlLnNl dEZpbGxUeXBlKGZ0eXBlKTsKKyAgICAgICAgcGF0aCA9ICZzdG9yYWdlOworICAgIH0KIAogICAg IFNrUGFpbnQgcGFpbnQ7CiAgICAgcGxhdGZvcm1Db250ZXh0KCktPnNldHVwUGFpbnRGb3JGaWxs aW5nKCZwYWludCk7CiAKLSAgICBwbGF0Zm9ybUNvbnRleHQoKS0+Y2FudmFzKCktPmRyYXdQYXRo KHBhdGgsIHBhaW50KTsKLSAgICBwbGF0Zm9ybUNvbnRleHQoKS0+ZGlkRHJhd1BhdGgocGF0aCwg cGFpbnQpOworICAgIHBsYXRmb3JtQ29udGV4dCgpLT5jYW52YXMoKS0+ZHJhd1BhdGgoKnBhdGgs IHBhaW50KTsKKyAgICBwbGF0Zm9ybUNvbnRleHQoKS0+ZGlkRHJhd1BhdGgoKnBhdGgsIHBhaW50 KTsKIH0KIAogdm9pZCBHcmFwaGljc0NvbnRleHQ6OmZpbGxSZWN0KGNvbnN0IEZsb2F0UmVjdCYg cmVjdCkKQEAgLTgyOCwxNCArODQyLDEwIEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpmaWxsUmVj dChjb25zdCBGbG8KICAgICAgICAgQ2xpcFJlY3RUb0NhbnZhcygqcGxhdGZvcm1Db250ZXh0KCkt PmNhbnZhcygpLCByLCAmcik7CiAgICAgfQogCi0gICAgcGxhdGZvcm1Db250ZXh0KCktPnNhdmUo KTsKLQogICAgIFNrUGFpbnQgcGFpbnQ7CiAgICAgcGxhdGZvcm1Db250ZXh0KCktPnNldHVwUGFp bnRGb3JGaWxsaW5nKCZwYWludCk7CiAgICAgcGxhdGZvcm1Db250ZXh0KCktPmNhbnZhcygpLT5k cmF3UmVjdChyLCBwYWludCk7CiAgICAgcGxhdGZvcm1Db250ZXh0KCktPmRpZERyYXdSZWN0KHIs IHBhaW50KTsKLQotICAgIHBsYXRmb3JtQ29udGV4dCgpLT5yZXN0b3JlKCk7CiB9CiAKIHZvaWQg R3JhcGhpY3NDb250ZXh0OjpmaWxsUmVjdChjb25zdCBGbG9hdFJlY3QmIHJlY3QsIGNvbnN0IENv bG9yJiBjb2xvciwgQ29sb3JTcGFjZSBjb2xvclNwYWNlKQpAQCAtMTE5NSw3ICsxMjA1LDcgQEAg dm9pZCBHcmFwaGljc0NvbnRleHQ6OnN0cm9rZVBhdGgoY29uc3QgUAogICAgIGlmIChwYWludGlu Z0Rpc2FibGVkKCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIFNrUGF0aCBwYXRoID0gKnBhdGhU b1N0cm9rZS5wbGF0Zm9ybVBhdGgoKTsKKyAgICBjb25zdCBTa1BhdGgmIHBhdGggPSAqcGF0aFRv U3Ryb2tlLnBsYXRmb3JtUGF0aCgpOwogICAgIGlmICghaXNQYXRoU2tpYVNhZmUoZ2V0Q1RNKCks IHBhdGgpKQogICAgICAgICByZXR1cm47CiAK 134655 2012-03-29 13:30:32 -0700 2012-03-30 09:33:27 -0700 Patch bug-82641-20120329163030.patch text/plain 4246 reed SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMjU2MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDEyLTAzLTI5ICBNaWtlIFJl ZWQgIDxyZWVkQGdvb2dsZS5jb20+CisKKyAgICAgICAgcmVtb3ZlIHVubmVlZGVkIGNvcGllcyBv ZiBTa1BhdGhzLCByZW1vdmUgdW5uZWVkZWQgc2F2ZS9yZXN0b3JlCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MjY0MQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBlcmZvcm1hbmNlIGNoYW5nZSwgZXhpc3Rp bmcgd2Via2l0IHRlc3RzIGFwcGx5LgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvc2tp YS9HcmFwaGljc0NvbnRleHRTa2lhLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29u dGV4dDo6Y2xpcE91dCk6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmNsaXBQ YXRoKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6ZmlsbFBhdGgpOgorICAg ICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpmaWxsUmVjdCk6CisgICAgICAgIChXZWJD b3JlOjpHcmFwaGljc0NvbnRleHQ6OnN0cm9rZVBhdGgpOgorCiAyMDEyLTAzLTI5ICBTaGVyaWZm IEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2Vk LCByb2xsaW5nIG91dCByMTEyNTUzLgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3Mvc2tpYS9HcmFwaGljc0NvbnRleHRTa2lhLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL0dyYXBoaWNzQ29udGV4dFNraWEuY3BwCShy ZXZpc2lvbiAxMTI1NDcpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lh L0dyYXBoaWNzQ29udGV4dFNraWEuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zOTUsNyArMzk1LDgg QEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OmNsaXBPdXQoY29uc3QgUGF0aAogICAgIGlmIChwYWlu dGluZ0Rpc2FibGVkKCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIFNrUGF0aCBwYXRoID0gKnAu cGxhdGZvcm1QYXRoKCk7CisgICAgLy8gV2UgbXVzdCBtYWtlIGEgY29weSBvZiB0aGUgcGF0aCwg dG8gbWFyayBpdCBhcyBpbnZlcnNlLWZpbGxlZC4KKyAgICBTa1BhdGggcGF0aCgqcC5wbGF0Zm9y bVBhdGgoKSk7CiAgICAgaWYgKCFpc1BhdGhTa2lhU2FmZShnZXRDVE0oKSwgcGF0aCkpCiAgICAg ICAgIHJldHVybjsKIApAQCAtNDA4LDEyICs0MDksMTggQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6 OmNsaXBQYXRoKGNvbnN0IFBhdAogICAgIGlmIChwYWludGluZ0Rpc2FibGVkKCkpCiAgICAgICAg IHJldHVybjsKIAotICAgIFNrUGF0aCBwYXRoID0gKnBhdGhUb0NsaXAucGxhdGZvcm1QYXRoKCk7 Ci0gICAgaWYgKCFpc1BhdGhTa2lhU2FmZShnZXRDVE0oKSwgcGF0aCkpCisgICAgY29uc3QgU2tQ YXRoKiBwYXRoID0gcGF0aFRvQ2xpcC5wbGF0Zm9ybVBhdGgoKTsKKyAgICBpZiAoIWlzUGF0aFNr aWFTYWZlKGdldENUTSgpLCAqcGF0aCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIHBhdGguc2V0 RmlsbFR5cGUoY2xpcFJ1bGUgPT0gUlVMRV9FVkVOT0REID8gU2tQYXRoOjprRXZlbk9kZF9GaWxs VHlwZSA6IFNrUGF0aDo6a1dpbmRpbmdfRmlsbFR5cGUpOwotICAgIHBsYXRmb3JtQ29udGV4dCgp LT5jbGlwUGF0aEFudGlBbGlhc2VkKHBhdGgpOworICAgIFNrUGF0aDo6RmlsbFR5cGUgZnR5cGUg PSAoY2xpcFJ1bGUgPT0gUlVMRV9FVkVOT0REKSA/IFNrUGF0aDo6a0V2ZW5PZGRfRmlsbFR5cGUg OiBTa1BhdGg6OmtXaW5kaW5nX0ZpbGxUeXBlOworICAgIFNrUGF0aCBzdG9yYWdlOworICAgIGlm IChwYXRoLT5nZXRGaWxsVHlwZSgpICE9IGZ0eXBlKSB7CisgICAgICAgIHN0b3JhZ2UgPSAqcGF0 aDsKKyAgICAgICAgc3RvcmFnZS5zZXRGaWxsVHlwZShmdHlwZSk7CisgICAgICAgIHBhdGggPSAm c3RvcmFnZTsKKyAgICB9CisgICAgcGxhdGZvcm1Db250ZXh0KCktPmNsaXBQYXRoQW50aUFsaWFz ZWQoKnBhdGgpOwogfQogCiB2b2lkIEdyYXBoaWNzQ29udGV4dDo6Y29uY2F0Q1RNKGNvbnN0IEFm ZmluZVRyYW5zZm9ybSYgYWZmaW5lKQpAQCAtODAyLDE5ICs4MDksMjYgQEAgdm9pZCBHcmFwaGlj c0NvbnRleHQ6OmZpbGxQYXRoKGNvbnN0IFBhdAogICAgIGlmIChwYWludGluZ0Rpc2FibGVkKCkp CiAgICAgICAgIHJldHVybjsKIAotICAgIFNrUGF0aCBwYXRoID0gKnBhdGhUb0ZpbGwucGxhdGZv cm1QYXRoKCk7Ci0gICAgaWYgKCFpc1BhdGhTa2lhU2FmZShnZXRDVE0oKSwgcGF0aCkpCisgICAg Y29uc3QgU2tQYXRoKiBwYXRoID0gcGF0aFRvRmlsbC5wbGF0Zm9ybVBhdGgoKTsKKyAgICBpZiAo IWlzUGF0aFNraWFTYWZlKGdldENUTSgpLCAqcGF0aCkpCiAgICAgICByZXR1cm47CiAKICAgICBj b25zdCBHcmFwaGljc0NvbnRleHRTdGF0ZSYgc3RhdGUgPSBtX3N0YXRlOwotICAgIHBhdGguc2V0 RmlsbFR5cGUoc3RhdGUuZmlsbFJ1bGUgPT0gUlVMRV9FVkVOT0REID8KLSAgICAgICAgU2tQYXRo OjprRXZlbk9kZF9GaWxsVHlwZSA6IFNrUGF0aDo6a1dpbmRpbmdfRmlsbFR5cGUpOworICAgIFNr UGF0aDo6RmlsbFR5cGUgZnR5cGUgPSBzdGF0ZS5maWxsUnVsZSA9PSBSVUxFX0VWRU5PREQgPwor ICAgICAgICBTa1BhdGg6OmtFdmVuT2RkX0ZpbGxUeXBlIDogU2tQYXRoOjprV2luZGluZ19GaWxs VHlwZTsKKworICAgIFNrUGF0aCBzdG9yYWdlOworICAgIGlmIChwYXRoLT5nZXRGaWxsVHlwZSgp ICE9IGZ0eXBlKSB7CisgICAgICAgIHN0b3JhZ2UgPSAqcGF0aDsKKyAgICAgICAgc3RvcmFnZS5z ZXRGaWxsVHlwZShmdHlwZSk7CisgICAgICAgIHBhdGggPSAmc3RvcmFnZTsKKyAgICB9CiAKICAg ICBTa1BhaW50IHBhaW50OwogICAgIHBsYXRmb3JtQ29udGV4dCgpLT5zZXR1cFBhaW50Rm9yRmls bGluZygmcGFpbnQpOwogCi0gICAgcGxhdGZvcm1Db250ZXh0KCktPmNhbnZhcygpLT5kcmF3UGF0 aChwYXRoLCBwYWludCk7Ci0gICAgcGxhdGZvcm1Db250ZXh0KCktPmRpZERyYXdQYXRoKHBhdGgs IHBhaW50KTsKKyAgICBwbGF0Zm9ybUNvbnRleHQoKS0+Y2FudmFzKCktPmRyYXdQYXRoKCpwYXRo LCBwYWludCk7CisgICAgcGxhdGZvcm1Db250ZXh0KCktPmRpZERyYXdQYXRoKCpwYXRoLCBwYWlu dCk7CiB9CiAKIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpmaWxsUmVjdChjb25zdCBGbG9hdFJlY3Qm IHJlY3QpCkBAIC04MjgsMTQgKzg0MiwxMCBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZmlsbFJl Y3QoY29uc3QgRmxvCiAgICAgICAgIENsaXBSZWN0VG9DYW52YXMoKnBsYXRmb3JtQ29udGV4dCgp LT5jYW52YXMoKSwgciwgJnIpOwogICAgIH0KIAotICAgIHBsYXRmb3JtQ29udGV4dCgpLT5zYXZl KCk7Ci0KICAgICBTa1BhaW50IHBhaW50OwogICAgIHBsYXRmb3JtQ29udGV4dCgpLT5zZXR1cFBh aW50Rm9yRmlsbGluZygmcGFpbnQpOwogICAgIHBsYXRmb3JtQ29udGV4dCgpLT5jYW52YXMoKS0+ ZHJhd1JlY3QociwgcGFpbnQpOwogICAgIHBsYXRmb3JtQ29udGV4dCgpLT5kaWREcmF3UmVjdChy LCBwYWludCk7Ci0KLSAgICBwbGF0Zm9ybUNvbnRleHQoKS0+cmVzdG9yZSgpOwogfQogCiB2b2lk IEdyYXBoaWNzQ29udGV4dDo6ZmlsbFJlY3QoY29uc3QgRmxvYXRSZWN0JiByZWN0LCBjb25zdCBD b2xvciYgY29sb3IsIENvbG9yU3BhY2UgY29sb3JTcGFjZSkKQEAgLTExOTUsNyArMTIwNSw3IEBA IHZvaWQgR3JhcGhpY3NDb250ZXh0OjpzdHJva2VQYXRoKGNvbnN0IFAKICAgICBpZiAocGFpbnRp bmdEaXNhYmxlZCgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBTa1BhdGggcGF0aCA9ICpwYXRo VG9TdHJva2UucGxhdGZvcm1QYXRoKCk7CisgICAgY29uc3QgU2tQYXRoJiBwYXRoID0gKnBhdGhU b1N0cm9rZS5wbGF0Zm9ybVBhdGgoKTsKICAgICBpZiAoIWlzUGF0aFNraWFTYWZlKGdldENUTSgp LCBwYXRoKSkKICAgICAgICAgcmV0dXJuOwogCg==