94131 2012-08-15 11:27:27 -0700 Avoid repeated calls to decorationColor on RenderObject::getTextDecorationColors 2012-12-04 20:17:43 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bruno.abinader bruno.abinader bfulgham eric igor.oliveira kling koivisto macpherson noam ojan webkit.review.bot oldest_to_newest 696189 0 bruno.abinader 2012-08-15 11:27:27 -0700 There is a number of not necessary calls to decorationcolor inside this function, as well as a variable which gets created and destroyed on every 'do' loop, that can be optimized. This bug intends to fix this by suggesting an optimized approach. 696196 1 158604 bruno.abinader 2012-08-15 11:31:46 -0700 Created attachment 158604 Patch Proposed patch. 696243 2 158604 eric 2012-08-15 12:08:53 -0700 Comment on attachment 158604 Patch I'm confused. This method walks backwards through styles until it finds colors for each of the 3 types of decoration. They can be different colors. Your code looks like it only works with one color total? 696292 3 bruno.abinader 2012-08-15 12:53:42 -0700 (In reply to comment #2) > (From update of attachment 158604 [details]) > I'm confused. This method walks backwards through styles until it finds colors for each of the 3 types of decoration. They can be different colors. Your code looks like it only works with one color total? The method walks backwards through styles, indeed :) but the color value is the same because all that decorationColor() takes as param is styleToUse, which is the same for all colors on the loop run. So each style (underline, overline, line-through) continues to obtain separated color values as the layout tests runs demonstrates on cr-linux. In resume: the behavior is not changed at all, only optimized. 696305 4 158625 bruno.abinader 2012-08-15 13:14:23 -0700 Created attachment 158625 Patch Moved current object is anonymous block check to preserve behavior. 775156 5 158625 bfulgham 2012-11-25 22:40:23 -0800 Comment on attachment 158625 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=158625&action=review While I like the goal of your change, I think the current form of your patch introduces a potential crash. I think you should stay more like the original code in layout, but incorporate the constant lifting you correctly identified. I'm curious if you did any profiling that identified this code as a bottleneck, or if you ran across this from code inspection? > Source/WebCore/rendering/RenderObject.cpp:2616 > + Color resultColor = decorationColor(styleToUse); I think you should just declare these variables here, and assign in the top of the do loop, as was done previously. This avoids a potential null dereference later. > Source/WebCore/rendering/RenderObject.cpp:-2617 > - int currDecs = styleToUse->textDecoration(); Move assignments here (but keep the change from int to ETextDecoration) > Source/WebCore/rendering/RenderObject.cpp:-2636 > - curr = toRenderBlock(curr)->continuation(); I think you should keep this stanza as-is, rather than the new block below. > Source/WebCore/rendering/RenderObject.cpp:2637 > + styleToUse = curr->style(firstlineStyle); You might have just reassigned curr from the call to continuation in the line above. You should null-check again to avoid faulting here. I think a better flow would be to follow the original logic as outlined in the earlier comments I made. 775157 6 158625 bfulgham 2012-11-25 22:40:39 -0800 Comment on attachment 158625 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=158625&action=review While I like the goal of your change, I think the current form of your patch introduces a potential crash. I think you should stay more like the original code in layout, but incorporate the constant lifting you correctly identified. I'm curious if you did any profiling that identified this code as a bottleneck, or if you ran across this from code inspection? > Source/WebCore/rendering/RenderObject.cpp:2616 > + Color resultColor = decorationColor(styleToUse); I think you should just declare these variables here, and assign in the top of the do loop, as was done previously. This avoids a potential null dereference later. > Source/WebCore/rendering/RenderObject.cpp:-2617 > - int currDecs = styleToUse->textDecoration(); Move assignments here (but keep the change from int to ETextDecoration) > Source/WebCore/rendering/RenderObject.cpp:-2636 > - curr = toRenderBlock(curr)->continuation(); I think you should keep this stanza as-is, rather than the new block below. > Source/WebCore/rendering/RenderObject.cpp:2637 > + styleToUse = curr->style(firstlineStyle); You might have just reassigned curr from the call to continuation in the line above. You should null-check again to avoid faulting here. I think a better flow would be to follow the original logic as outlined in the earlier comments I made. 775159 7 bfulgham 2012-11-25 22:41:41 -0800 I really like the goal of this change, but I think the new code would introduce a potential crash. Please revise as I outline. For this reason, I am setting this r-. 781497 8 bruno.abinader 2012-12-03 08:50:26 -0800 (In reply to comment #7) > I really like the goal of this change, but I think the new code would introduce a potential crash. Please revise as I outline. > > For this reason, I am setting this r-. Hi Brent, thank you for the valuable review, I just got back from vacations and I'll update the patch with your recommendations as soon as possible. 782579 9 177493 bruno.abinader 2012-12-04 08:39:43 -0800 Created attachment 177493 Patch Updated version based on Brent's review. 782604 10 177493 bfulgham 2012-12-04 09:30:44 -0800 Comment on attachment 177493 Patch Thanks for revising the code. Looks good! r=me. 782606 11 177493 webkit.review.bot 2012-12-04 09:34:56 -0800 Comment on attachment 177493 Patch Rejecting attachment 177493 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: ripts/update-webkit line 152. Failed to run "['Tools/Scripts/update-webkit', '--chromium', '--force-update']" exit_code: 2 Updating OpenSource From http://git.chromium.org/external/Webkit 16b6329..69df7e9 HEAD -> origin/HEAD error: Ref refs/remotes/origin/master is at 69df7e90d827085e08064fe2060b71e2a596ead5 but expected 16b6329a5796e11a418c6e68e9effd8d7e1537bf ! 16b6329..69df7e9 master -> origin/master (unable to update local ref) Died at Tools/Scripts/update-webkit line 152. Full output: http://queues.webkit.org/results/15138245 782828 12 177493 bruno.abinader 2012-12-04 12:57:19 -0800 Comment on attachment 177493 Patch Thanks for the review Brent. The above error sounds like a buildbot internal issue, so trying again. 783299 13 177493 webkit.review.bot 2012-12-04 20:17:38 -0800 Comment on attachment 177493 Patch Clearing flags on attachment: 177493 Committed r136617: <http://trac.webkit.org/changeset/136617> 783300 14 webkit.review.bot 2012-12-04 20:17:43 -0800 All reviewed patches have been landed. Closing bug. 158604 2012-08-15 11:31:46 -0700 2012-08-15 13:14:16 -0700 Patch bug-94131-20120815143111.patch text/plain 4354 bruno.abinader U3VidmVyc2lvbiBSZXZpc2lvbjogMTI1NjY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGM4OTU0MjM3NTQyODgw YjNkOGMwMzNmNWNkNzljNzYwNDcxYzBhMS4uZjg0ZDZjMmVmY2UyYjY0YTVmYjQwNjlhODBiZGE5 MmIyZmIxMjMyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTA4LTE1ICBCcnVu byBkZSBPbGl2ZWlyYSBBYmluYWRlciAgPGJydW5vLmFiaW5hZGVyQGJhc3lza29tLmNvbT4KKwor ICAgICAgICBBdm9pZCByZXBlYXRlZCBjYWxscyB0byBkZWNvcmF0aW9uQ29sb3Igb24gUmVuZGVy T2JqZWN0OjpnZXRUZXh0RGVjb3JhdGlvbkNvbG9ycworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTQxMzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBUaGVyZSBpcyBhIG51bWJlciBvZiBub3QgbmVjZXNzYXJ5 IGNhbGxzIHRvIGRlY29yYXRpb25jb2xvciBpbnNpZGUgdGhpcworICAgICAgICBmdW5jdGlvbiwg YXMgd2VsbCBhcyBhIHZhcmlhYmxlIHdoaWNoIGdldHMgY3JlYXRlZCBhbmQgZGVzdHJveWVkIG9u IGV2ZXJ5ICdkbycKKyAgICAgICAgbG9vcCwgdGhhdCBjYW4gYmUgb3B0aW1pemVkLiBUaGlzIGJ1 ZyBpbnRlbmRzIHRvIGZpeCB0aGlzIGJ5IHN1Z2dlc3RpbmcgYW4KKyAgICAgICAgb3B0aW1pemVk IGFwcHJvYWNoLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJPYmplY3Q6OmdldFRleHREZWNvcmF0aW9uQ29sb3JzKToKKwog MjAxMi0wOC0xNSAgVnNldm9sb2QgVmxhc292ICA8dnNldmlrQGNocm9taXVtLm9yZz4KIAogICAg ICAgICBXZWIgSW5zcGVjdG9yOiBbUkVHUkVTU0lPTl0gInNhdmUgYXMiIG9mIGVkaXRlZCBzb3Vy Y2UgaW4gZGV2ZWxvcGVyIG1vZGUgZmFpbHMgdG8gdXBkYXRlIHNhdmVkIGZpbGUKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKaW5kZXggYjVmNjk1NzVhZTNhNDRjOWFh YjVhNzYxY2QwZDU3MGY2ZWMxNDE4NS4uZDdkM2E0Y2Y3MjFiYmU4MDRmMDg5YTM5NzYwNTcwOWE3 NmJlMzUxZCAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVj dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKQEAg LTI2MTEsNDEgKzI2MTEsNDYgQEAgdm9pZCBSZW5kZXJPYmplY3Q6OmdldFRleHREZWNvcmF0aW9u Q29sb3JzKGludCBkZWNvcmF0aW9ucywgQ29sb3ImIHVuZGVybGluZSwgQ28KICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBDb2xvciYgbGluZXRocm91Z2gsIGJvb2wg cXVpcmtzTW9kZSwgYm9vbCBmaXJzdGxpbmVTdHlsZSkKIHsKICAgICBSZW5kZXJPYmplY3QqIGN1 cnIgPSB0aGlzOwotICAgIFJlbmRlclN0eWxlKiBzdHlsZVRvVXNlID0gMDsKKyAgICBSZW5kZXJT dHlsZSogc3R5bGVUb1VzZSA9IGN1cnItPnN0eWxlKGZpcnN0bGluZVN0eWxlKTsKKyAgICBFVGV4 dERlY29yYXRpb24gY3VycmVudERlY29yYXRpb25zID0gc3R5bGVUb1VzZS0+dGV4dERlY29yYXRp b24oKTsKKyAgICBDb2xvciByZXN1bHRDb2xvciA9IGRlY29yYXRpb25Db2xvcihzdHlsZVRvVXNl KTsKICAgICBkbyB7Ci0gICAgICAgIHN0eWxlVG9Vc2UgPSBjdXJyLT5zdHlsZShmaXJzdGxpbmVT dHlsZSk7Ci0gICAgICAgIGludCBjdXJyRGVjcyA9IHN0eWxlVG9Vc2UtPnRleHREZWNvcmF0aW9u KCk7Ci0gICAgICAgIGlmIChjdXJyRGVjcykgewotICAgICAgICAgICAgaWYgKGN1cnJEZWNzICYg VU5ERVJMSU5FKSB7Ci0gICAgICAgICAgICAgICAgZGVjb3JhdGlvbnMgJj0gflVOREVSTElORTsK LSAgICAgICAgICAgICAgICB1bmRlcmxpbmUgPSBkZWNvcmF0aW9uQ29sb3Ioc3R5bGVUb1VzZSk7 Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICBpZiAoY3VyckRlY3MgJiBPVkVSTElORSkgewot ICAgICAgICAgICAgICAgIGRlY29yYXRpb25zICY9IH5PVkVSTElORTsKLSAgICAgICAgICAgICAg ICBvdmVybGluZSA9IGRlY29yYXRpb25Db2xvcihzdHlsZVRvVXNlKTsKLSAgICAgICAgICAgIH0K LSAgICAgICAgICAgIGlmIChjdXJyRGVjcyAmIExJTkVfVEhST1VHSCkgewotICAgICAgICAgICAg ICAgIGRlY29yYXRpb25zICY9IH5MSU5FX1RIUk9VR0g7Ci0gICAgICAgICAgICAgICAgbGluZXRo cm91Z2ggPSBkZWNvcmF0aW9uQ29sb3Ioc3R5bGVUb1VzZSk7Ci0gICAgICAgICAgICB9CisgICAg ICAgIC8vIFBhcmFtZXRlciAnZGVjb3JhdGlvbnMnIGlzIGNhc3QgYXMgYW4gaW50IHRvIGVuYWJs ZSB0aGUgYml0d2lzZSBvcGVyYXRpb25zIGJlbG93LgorICAgICAgICBpZiAoY3VycmVudERlY29y YXRpb25zICYgVU5ERVJMSU5FKSB7CisgICAgICAgICAgICBkZWNvcmF0aW9ucyAmPSB+VU5ERVJM SU5FOworICAgICAgICAgICAgdW5kZXJsaW5lID0gcmVzdWx0Q29sb3I7CisgICAgICAgIH0KKyAg ICAgICAgaWYgKGN1cnJlbnREZWNvcmF0aW9ucyAmIE9WRVJMSU5FKSB7CisgICAgICAgICAgICBk ZWNvcmF0aW9ucyAmPSB+T1ZFUkxJTkU7CisgICAgICAgICAgICBvdmVybGluZSA9IHJlc3VsdENv bG9yOworICAgICAgICB9CisgICAgICAgIGlmIChjdXJyZW50RGVjb3JhdGlvbnMgJiBMSU5FX1RI Uk9VR0gpIHsKKyAgICAgICAgICAgIGRlY29yYXRpb25zICY9IH5MSU5FX1RIUk9VR0g7CisgICAg ICAgICAgICBsaW5ldGhyb3VnaCA9IHJlc3VsdENvbG9yOwogICAgICAgICB9CiAgICAgICAgIGlm IChjdXJyLT5pc1J1YnlUZXh0KCkpCiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIGN1cnIg PSBjdXJyLT5wYXJlbnQoKTsKLSAgICAgICAgaWYgKGN1cnIgJiYgY3Vyci0+aXNBbm9ueW1vdXNC bG9jaygpICYmIHRvUmVuZGVyQmxvY2soY3VyciktPmNvbnRpbnVhdGlvbigpKQotICAgICAgICAg ICAgY3VyciA9IHRvUmVuZGVyQmxvY2soY3VyciktPmNvbnRpbnVhdGlvbigpOworICAgICAgICBp ZiAoY3VycikgeworICAgICAgICAgICAgc3R5bGVUb1VzZSA9IGN1cnItPnN0eWxlKGZpcnN0bGlu ZVN0eWxlKTsKKyAgICAgICAgICAgIGN1cnJlbnREZWNvcmF0aW9ucyA9IHN0eWxlVG9Vc2UtPnRl eHREZWNvcmF0aW9uKCk7CisgICAgICAgICAgICByZXN1bHRDb2xvciA9IGRlY29yYXRpb25Db2xv cihzdHlsZVRvVXNlKTsKKyAgICAgICAgICAgIGlmIChjdXJyLT5pc0Fub255bW91c0Jsb2NrKCkg JiYgdG9SZW5kZXJCbG9jayhjdXJyKS0+Y29udGludWF0aW9uKCkpCisgICAgICAgICAgICAgICAg Y3VyciA9IHRvUmVuZGVyQmxvY2soY3VyciktPmNvbnRpbnVhdGlvbigpOworICAgICAgICB9CiAg ICAgfSB3aGlsZSAoY3VyciAmJiBkZWNvcmF0aW9ucyAmJiAoIXF1aXJrc01vZGUgfHwgIWN1cnIt Pm5vZGUoKSB8fAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICghY3Vyci0+ bm9kZSgpLT5oYXNUYWdOYW1lKGFUYWcpICYmICFjdXJyLT5ub2RlKCktPmhhc1RhZ05hbWUoZm9u dFRhZykpKSk7CiAKICAgICAvLyBJZiB3ZSBiYWlsZWQgb3V0LCB1c2UgdGhlIGVsZW1lbnQgd2Ug YmFpbGVkIG91dCBhdCAodHlwaWNhbGx5IGEgPGZvbnQ+IG9yIDxhPiBlbGVtZW50KS4KICAgICBp ZiAoZGVjb3JhdGlvbnMgJiYgY3VycikgewogICAgICAgICBzdHlsZVRvVXNlID0gY3Vyci0+c3R5 bGUoZmlyc3RsaW5lU3R5bGUpOworICAgICAgICByZXN1bHRDb2xvciA9IGRlY29yYXRpb25Db2xv cihzdHlsZVRvVXNlKTsKICAgICAgICAgaWYgKGRlY29yYXRpb25zICYgVU5ERVJMSU5FKQotICAg ICAgICAgICAgdW5kZXJsaW5lID0gZGVjb3JhdGlvbkNvbG9yKHN0eWxlVG9Vc2UpOworICAgICAg ICAgICAgdW5kZXJsaW5lID0gcmVzdWx0Q29sb3I7CiAgICAgICAgIGlmIChkZWNvcmF0aW9ucyAm IE9WRVJMSU5FKQotICAgICAgICAgICAgb3ZlcmxpbmUgPSBkZWNvcmF0aW9uQ29sb3Ioc3R5bGVU b1VzZSk7CisgICAgICAgICAgICBvdmVybGluZSA9IHJlc3VsdENvbG9yOwogICAgICAgICBpZiAo ZGVjb3JhdGlvbnMgJiBMSU5FX1RIUk9VR0gpCi0gICAgICAgICAgICBsaW5ldGhyb3VnaCA9IGRl Y29yYXRpb25Db2xvcihzdHlsZVRvVXNlKTsKKyAgICAgICAgICAgIGxpbmV0aHJvdWdoID0gcmVz dWx0Q29sb3I7CiAgICAgfQogfQogCg== 158625 2012-08-15 13:14:23 -0700 2012-12-04 08:39:37 -0800 Patch bug-94131-20120815161348.patch text/plain 4354 bruno.abinader U3VidmVyc2lvbiBSZXZpc2lvbjogMTI1NjY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGM4OTU0MjM3NTQyODgw YjNkOGMwMzNmNWNkNzljNzYwNDcxYzBhMS4uZjg0ZDZjMmVmY2UyYjY0YTVmYjQwNjlhODBiZGE5 MmIyZmIxMjMyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTA4LTE1ICBCcnVu byBkZSBPbGl2ZWlyYSBBYmluYWRlciAgPGJydW5vLmFiaW5hZGVyQGJhc3lza29tLmNvbT4KKwor ICAgICAgICBBdm9pZCByZXBlYXRlZCBjYWxscyB0byBkZWNvcmF0aW9uQ29sb3Igb24gUmVuZGVy T2JqZWN0OjpnZXRUZXh0RGVjb3JhdGlvbkNvbG9ycworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTQxMzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBUaGVyZSBpcyBhIG51bWJlciBvZiBub3QgbmVjZXNzYXJ5 IGNhbGxzIHRvIGRlY29yYXRpb25jb2xvciBpbnNpZGUgdGhpcworICAgICAgICBmdW5jdGlvbiwg YXMgd2VsbCBhcyBhIHZhcmlhYmxlIHdoaWNoIGdldHMgY3JlYXRlZCBhbmQgZGVzdHJveWVkIG9u IGV2ZXJ5ICdkbycKKyAgICAgICAgbG9vcCwgdGhhdCBjYW4gYmUgb3B0aW1pemVkLiBUaGlzIGJ1 ZyBpbnRlbmRzIHRvIGZpeCB0aGlzIGJ5IHN1Z2dlc3RpbmcgYW4KKyAgICAgICAgb3B0aW1pemVk IGFwcHJvYWNoLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJPYmplY3Q6OmdldFRleHREZWNvcmF0aW9uQ29sb3JzKToKKwog MjAxMi0wOC0xNSAgVnNldm9sb2QgVmxhc292ICA8dnNldmlrQGNocm9taXVtLm9yZz4KIAogICAg ICAgICBXZWIgSW5zcGVjdG9yOiBbUkVHUkVTU0lPTl0gInNhdmUgYXMiIG9mIGVkaXRlZCBzb3Vy Y2UgaW4gZGV2ZWxvcGVyIG1vZGUgZmFpbHMgdG8gdXBkYXRlIHNhdmVkIGZpbGUKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKaW5kZXggYjVmNjk1NzVhZTNhNDRjOWFh YjVhNzYxY2QwZDU3MGY2ZWMxNDE4NS4uYzM1MzQ4ZDM2ZTFmMmVhNTNlOTljOWNjNzA1NWZlZTU4 MGM5MWYwNCAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVj dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKQEAg LTI2MTEsNDEgKzI2MTEsNDYgQEAgdm9pZCBSZW5kZXJPYmplY3Q6OmdldFRleHREZWNvcmF0aW9u Q29sb3JzKGludCBkZWNvcmF0aW9ucywgQ29sb3ImIHVuZGVybGluZSwgQ28KICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBDb2xvciYgbGluZXRocm91Z2gsIGJvb2wg cXVpcmtzTW9kZSwgYm9vbCBmaXJzdGxpbmVTdHlsZSkKIHsKICAgICBSZW5kZXJPYmplY3QqIGN1 cnIgPSB0aGlzOwotICAgIFJlbmRlclN0eWxlKiBzdHlsZVRvVXNlID0gMDsKKyAgICBSZW5kZXJT dHlsZSogc3R5bGVUb1VzZSA9IGN1cnItPnN0eWxlKGZpcnN0bGluZVN0eWxlKTsKKyAgICBFVGV4 dERlY29yYXRpb24gY3VycmVudERlY29yYXRpb25zID0gc3R5bGVUb1VzZS0+dGV4dERlY29yYXRp b24oKTsKKyAgICBDb2xvciByZXN1bHRDb2xvciA9IGRlY29yYXRpb25Db2xvcihzdHlsZVRvVXNl KTsKICAgICBkbyB7Ci0gICAgICAgIHN0eWxlVG9Vc2UgPSBjdXJyLT5zdHlsZShmaXJzdGxpbmVT dHlsZSk7Ci0gICAgICAgIGludCBjdXJyRGVjcyA9IHN0eWxlVG9Vc2UtPnRleHREZWNvcmF0aW9u KCk7Ci0gICAgICAgIGlmIChjdXJyRGVjcykgewotICAgICAgICAgICAgaWYgKGN1cnJEZWNzICYg VU5ERVJMSU5FKSB7Ci0gICAgICAgICAgICAgICAgZGVjb3JhdGlvbnMgJj0gflVOREVSTElORTsK LSAgICAgICAgICAgICAgICB1bmRlcmxpbmUgPSBkZWNvcmF0aW9uQ29sb3Ioc3R5bGVUb1VzZSk7 Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICBpZiAoY3VyckRlY3MgJiBPVkVSTElORSkgewot ICAgICAgICAgICAgICAgIGRlY29yYXRpb25zICY9IH5PVkVSTElORTsKLSAgICAgICAgICAgICAg ICBvdmVybGluZSA9IGRlY29yYXRpb25Db2xvcihzdHlsZVRvVXNlKTsKLSAgICAgICAgICAgIH0K LSAgICAgICAgICAgIGlmIChjdXJyRGVjcyAmIExJTkVfVEhST1VHSCkgewotICAgICAgICAgICAg ICAgIGRlY29yYXRpb25zICY9IH5MSU5FX1RIUk9VR0g7Ci0gICAgICAgICAgICAgICAgbGluZXRo cm91Z2ggPSBkZWNvcmF0aW9uQ29sb3Ioc3R5bGVUb1VzZSk7Ci0gICAgICAgICAgICB9CisgICAg ICAgIC8vIFBhcmFtZXRlciAnZGVjb3JhdGlvbnMnIGlzIGNhc3QgYXMgYW4gaW50IHRvIGVuYWJs ZSB0aGUgYml0d2lzZSBvcGVyYXRpb25zIGJlbG93LgorICAgICAgICBpZiAoY3VycmVudERlY29y YXRpb25zICYgVU5ERVJMSU5FKSB7CisgICAgICAgICAgICBkZWNvcmF0aW9ucyAmPSB+VU5ERVJM SU5FOworICAgICAgICAgICAgdW5kZXJsaW5lID0gcmVzdWx0Q29sb3I7CisgICAgICAgIH0KKyAg ICAgICAgaWYgKGN1cnJlbnREZWNvcmF0aW9ucyAmIE9WRVJMSU5FKSB7CisgICAgICAgICAgICBk ZWNvcmF0aW9ucyAmPSB+T1ZFUkxJTkU7CisgICAgICAgICAgICBvdmVybGluZSA9IHJlc3VsdENv bG9yOworICAgICAgICB9CisgICAgICAgIGlmIChjdXJyZW50RGVjb3JhdGlvbnMgJiBMSU5FX1RI Uk9VR0gpIHsKKyAgICAgICAgICAgIGRlY29yYXRpb25zICY9IH5MSU5FX1RIUk9VR0g7CisgICAg ICAgICAgICBsaW5ldGhyb3VnaCA9IHJlc3VsdENvbG9yOwogICAgICAgICB9CiAgICAgICAgIGlm IChjdXJyLT5pc1J1YnlUZXh0KCkpCiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIGN1cnIg PSBjdXJyLT5wYXJlbnQoKTsKLSAgICAgICAgaWYgKGN1cnIgJiYgY3Vyci0+aXNBbm9ueW1vdXNC bG9jaygpICYmIHRvUmVuZGVyQmxvY2soY3VyciktPmNvbnRpbnVhdGlvbigpKQotICAgICAgICAg ICAgY3VyciA9IHRvUmVuZGVyQmxvY2soY3VyciktPmNvbnRpbnVhdGlvbigpOworICAgICAgICBp ZiAoY3VycikgeworICAgICAgICAgICAgaWYgKGN1cnItPmlzQW5vbnltb3VzQmxvY2soKSAmJiB0 b1JlbmRlckJsb2NrKGN1cnIpLT5jb250aW51YXRpb24oKSkKKyAgICAgICAgICAgICAgICBjdXJy ID0gdG9SZW5kZXJCbG9jayhjdXJyKS0+Y29udGludWF0aW9uKCk7CisgICAgICAgICAgICBzdHls ZVRvVXNlID0gY3Vyci0+c3R5bGUoZmlyc3RsaW5lU3R5bGUpOworICAgICAgICAgICAgY3VycmVu dERlY29yYXRpb25zID0gc3R5bGVUb1VzZS0+dGV4dERlY29yYXRpb24oKTsKKyAgICAgICAgICAg IHJlc3VsdENvbG9yID0gZGVjb3JhdGlvbkNvbG9yKHN0eWxlVG9Vc2UpOworICAgICAgICB9CiAg ICAgfSB3aGlsZSAoY3VyciAmJiBkZWNvcmF0aW9ucyAmJiAoIXF1aXJrc01vZGUgfHwgIWN1cnIt Pm5vZGUoKSB8fAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICghY3Vyci0+ bm9kZSgpLT5oYXNUYWdOYW1lKGFUYWcpICYmICFjdXJyLT5ub2RlKCktPmhhc1RhZ05hbWUoZm9u dFRhZykpKSk7CiAKICAgICAvLyBJZiB3ZSBiYWlsZWQgb3V0LCB1c2UgdGhlIGVsZW1lbnQgd2Ug YmFpbGVkIG91dCBhdCAodHlwaWNhbGx5IGEgPGZvbnQ+IG9yIDxhPiBlbGVtZW50KS4KICAgICBp ZiAoZGVjb3JhdGlvbnMgJiYgY3VycikgewogICAgICAgICBzdHlsZVRvVXNlID0gY3Vyci0+c3R5 bGUoZmlyc3RsaW5lU3R5bGUpOworICAgICAgICByZXN1bHRDb2xvciA9IGRlY29yYXRpb25Db2xv cihzdHlsZVRvVXNlKTsKICAgICAgICAgaWYgKGRlY29yYXRpb25zICYgVU5ERVJMSU5FKQotICAg ICAgICAgICAgdW5kZXJsaW5lID0gZGVjb3JhdGlvbkNvbG9yKHN0eWxlVG9Vc2UpOworICAgICAg ICAgICAgdW5kZXJsaW5lID0gcmVzdWx0Q29sb3I7CiAgICAgICAgIGlmIChkZWNvcmF0aW9ucyAm IE9WRVJMSU5FKQotICAgICAgICAgICAgb3ZlcmxpbmUgPSBkZWNvcmF0aW9uQ29sb3Ioc3R5bGVU b1VzZSk7CisgICAgICAgICAgICBvdmVybGluZSA9IHJlc3VsdENvbG9yOwogICAgICAgICBpZiAo ZGVjb3JhdGlvbnMgJiBMSU5FX1RIUk9VR0gpCi0gICAgICAgICAgICBsaW5ldGhyb3VnaCA9IGRl Y29yYXRpb25Db2xvcihzdHlsZVRvVXNlKTsKKyAgICAgICAgICAgIGxpbmV0aHJvdWdoID0gcmVz dWx0Q29sb3I7CiAgICAgfQogfQogCg== 177493 2012-12-04 08:39:43 -0800 2012-12-04 20:17:38 -0800 Patch bug-94131-20121204123707.patch text/plain 3269 bruno.abinader U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2NDA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTY1ZDdlYTM3YTAzZWIx MWNmMDExMjlkZjY1MDVlYmI5MTQxOTc3Ny4uMmIzMmEzZWM3MjE4MTI1ZWQwZjlhZTM5MDgyMTZj MTFhMWQxYzg0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTEyLTA0ICBCcnVu byBkZSBPbGl2ZWlyYSBBYmluYWRlciAgPGJydW5vLmFiaW5hZGVyQGJhc3lza29tLmNvbT4KKwor ICAgICAgICBBdm9pZCByZXBlYXRlZCBjYWxscyB0byBkZWNvcmF0aW9uQ29sb3Igb24gUmVuZGVy T2JqZWN0OjpnZXRUZXh0RGVjb3JhdGlvbkNvbG9ycworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTQxMzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBSZXBsYWNlcyByZXBlYXRlZCBjYWxscyB0byBkZWNvcmF0 aW9uQ29sb3IgYnkgYWRkaW5nIGEgdmFyaWFibGUgdGhhdCByZWFkcyB0aGUKKyAgICAgICAgcmV0 dXJuIHZhbHVlIGZyb20gdGhhdCBmdW5jdGlvbiBqdXN0IG9uY2Ugb24gZWFjaCBsb29wIGFuZCBn ZXRzIHVzZWQgdXBvbiBuZWVkLgorCisgICAgICAgIFRoaXMgY2hhbmdlIHdvbid0IGFmZmVjdCB0 ZXh0IGRlY29yYXRpb24gYmVoYXZpb3IsIHNvIGN1cnJlbnQgdGVzdHMgc3VmZmljZS4KKworICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyT2JqZWN0OjpnZXRUZXh0RGVjb3JhdGlvbkNvbG9ycyk6CisKIDIwMTItMTItMDMgIEtvbnJh ZCBQaWFzY2lrICA8a3BpYXNjaWtAcmltLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBm cmVlIFBhZ2UgcmVzb3VyY2VzIG9uIGluc3BlY3RvciBkaXNjb25uZWN0CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCmluZGV4IDExMDQ2N2FkNTQ4ZmNiY2IwNDE0ZWFh YWM2MjNhMDQzY2NjYjFhNDguLjNjMGQ2NzNkNDlhZTc4YTAzZmVkMmUyZGM2MDA5Nzk5NmM1NTJj MTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCkBAIC0yNzU1 LDIxICsyNzU1LDI1IEBAIHZvaWQgUmVuZGVyT2JqZWN0OjpnZXRUZXh0RGVjb3JhdGlvbkNvbG9y cyhpbnQgZGVjb3JhdGlvbnMsIENvbG9yJiB1bmRlcmxpbmUsIENvCiB7CiAgICAgUmVuZGVyT2Jq ZWN0KiBjdXJyID0gdGhpczsKICAgICBSZW5kZXJTdHlsZSogc3R5bGVUb1VzZSA9IDA7CisgICAg RVRleHREZWNvcmF0aW9uIGN1cnJEZWNzID0gVEROT05FOworICAgIENvbG9yIHJlc3VsdENvbG9y OwogICAgIGRvIHsKICAgICAgICAgc3R5bGVUb1VzZSA9IGN1cnItPnN0eWxlKGZpcnN0bGluZVN0 eWxlKTsKLSAgICAgICAgaW50IGN1cnJEZWNzID0gc3R5bGVUb1VzZS0+dGV4dERlY29yYXRpb24o KTsKKyAgICAgICAgY3VyckRlY3MgPSBzdHlsZVRvVXNlLT50ZXh0RGVjb3JhdGlvbigpOworICAg ICAgICByZXN1bHRDb2xvciA9IGRlY29yYXRpb25Db2xvcihzdHlsZVRvVXNlKTsKKyAgICAgICAg Ly8gUGFyYW1ldGVyICdkZWNvcmF0aW9ucycgaXMgY2FzdCBhcyBhbiBpbnQgdG8gZW5hYmxlIHRo ZSBiaXR3aXNlIG9wZXJhdGlvbnMgYmVsb3cuCiAgICAgICAgIGlmIChjdXJyRGVjcykgewogICAg ICAgICAgICAgaWYgKGN1cnJEZWNzICYgVU5ERVJMSU5FKSB7CiAgICAgICAgICAgICAgICAgZGVj b3JhdGlvbnMgJj0gflVOREVSTElORTsKLSAgICAgICAgICAgICAgICB1bmRlcmxpbmUgPSBkZWNv cmF0aW9uQ29sb3Ioc3R5bGVUb1VzZSk7CisgICAgICAgICAgICAgICAgdW5kZXJsaW5lID0gcmVz dWx0Q29sb3I7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBpZiAoY3VyckRlY3MgJiBPVkVS TElORSkgewogICAgICAgICAgICAgICAgIGRlY29yYXRpb25zICY9IH5PVkVSTElORTsKLSAgICAg ICAgICAgICAgICBvdmVybGluZSA9IGRlY29yYXRpb25Db2xvcihzdHlsZVRvVXNlKTsKKyAgICAg ICAgICAgICAgICBvdmVybGluZSA9IHJlc3VsdENvbG9yOwogICAgICAgICAgICAgfQogICAgICAg ICAgICAgaWYgKGN1cnJEZWNzICYgTElORV9USFJPVUdIKSB7CiAgICAgICAgICAgICAgICAgZGVj b3JhdGlvbnMgJj0gfkxJTkVfVEhST1VHSDsKLSAgICAgICAgICAgICAgICBsaW5ldGhyb3VnaCA9 IGRlY29yYXRpb25Db2xvcihzdHlsZVRvVXNlKTsKKyAgICAgICAgICAgICAgICBsaW5ldGhyb3Vn aCA9IHJlc3VsdENvbG9yOwogICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgICAgIGlmIChj dXJyLT5pc1J1YnlUZXh0KCkpCkBAIC0yNzgzLDEyICsyNzg3LDEzIEBAIHZvaWQgUmVuZGVyT2Jq ZWN0OjpnZXRUZXh0RGVjb3JhdGlvbkNvbG9ycyhpbnQgZGVjb3JhdGlvbnMsIENvbG9yJiB1bmRl cmxpbmUsIENvCiAgICAgLy8gSWYgd2UgYmFpbGVkIG91dCwgdXNlIHRoZSBlbGVtZW50IHdlIGJh aWxlZCBvdXQgYXQgKHR5cGljYWxseSBhIDxmb250PiBvciA8YT4gZWxlbWVudCkuCiAgICAgaWYg KGRlY29yYXRpb25zICYmIGN1cnIpIHsKICAgICAgICAgc3R5bGVUb1VzZSA9IGN1cnItPnN0eWxl KGZpcnN0bGluZVN0eWxlKTsKKyAgICAgICAgcmVzdWx0Q29sb3IgPSBkZWNvcmF0aW9uQ29sb3Io c3R5bGVUb1VzZSk7CiAgICAgICAgIGlmIChkZWNvcmF0aW9ucyAmIFVOREVSTElORSkKLSAgICAg ICAgICAgIHVuZGVybGluZSA9IGRlY29yYXRpb25Db2xvcihzdHlsZVRvVXNlKTsKKyAgICAgICAg ICAgIHVuZGVybGluZSA9IHJlc3VsdENvbG9yOwogICAgICAgICBpZiAoZGVjb3JhdGlvbnMgJiBP VkVSTElORSkKLSAgICAgICAgICAgIG92ZXJsaW5lID0gZGVjb3JhdGlvbkNvbG9yKHN0eWxlVG9V c2UpOworICAgICAgICAgICAgb3ZlcmxpbmUgPSByZXN1bHRDb2xvcjsKICAgICAgICAgaWYgKGRl Y29yYXRpb25zICYgTElORV9USFJPVUdIKQotICAgICAgICAgICAgbGluZXRocm91Z2ggPSBkZWNv cmF0aW9uQ29sb3Ioc3R5bGVUb1VzZSk7CisgICAgICAgICAgICBsaW5ldGhyb3VnaCA9IHJlc3Vs dENvbG9yOwogICAgIH0KIH0KIAo=