98660 2012-10-08 09:54:56 -0700 RenderBoxModelObject::paintTranslucentBorderSides() creates needless transparency layers 2012-11-19 08:57:29 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 tomhudson tomhudson eric jamesr simon.fraser skyostil webkit.review.bot oldest_to_newest 736746 0 tomhudson 2012-10-08 09:54:56 -0700 The code that computes useTransparencyLayer doesn't pay attention to edges[i].shouldRender(), but paintBorderSides() does. So we can call beginTransparencyLayer() and endTransparencyLayer() - which can cost tens of ms on some platforms if the layers are large - but render nothing to the layer we so carefully create and painstakingly blend. 737650 1 167731 tomhudson 2012-10-09 04:22:33 -0700 Created attachment 167731 Simplified version of patch for testing 737658 2 167734 tomhudson 2012-10-09 04:32:04 -0700 Created attachment 167734 Fix pathnames. 737685 3 167739 tomhudson 2012-10-09 05:11:53 -0700 Created attachment 167739 Add Changelog. 737688 4 webkit.review.bot 2012-10-09 05:15:12 -0700 Attachment 167739 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:1: ChangeLog entry has no bug number [changelog/bugnumber] [5] Source/WebCore/ChangeLog:11: Need whitespace between colon and description [changelog/filechangedescriptionwhitespace] [5] Total errors found: 2 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 737693 5 167741 tomhudson 2012-10-09 05:23:13 -0700 Created attachment 167741 Fix ChangeLog formatting. 737804 6 167761 tomhudson 2012-10-09 08:37:11 -0700 Created attachment 167761 Alternate implementation in paintBorder() instead of paintTranslucentBorderSides() Early-out higher up the callstack, so we do even less unnecessary work. 737906 7 167776 tomhudson 2012-10-09 10:14:34 -0700 Created attachment 167776 After out-of-band review, moving the implementation back to paintTranslucentBorderSides(), but reversing the flag-application logic for reasability 737919 8 167776 simon.fraser 2012-10-09 10:32:29 -0700 Comment on attachment 167776 After out-of-band review, moving the implementation back to paintTranslucentBorderSides(), but reversing the flag-application logic for reasability I think it would be slightly better for RenderBoxModelObject::paintBorder() to compute edgesToDraw in its existing loop through the edges. edgesToDraw could then be passed to paintTranslucentBorderSides() and paintBorderSides(). 768169 9 174464 tomhudson 2012-11-15 09:23:20 -0800 Created attachment 174464 Patch 768333 10 174464 simon.fraser 2012-11-15 11:21:12 -0800 Comment on attachment 174464 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=174464&action=review > Source/WebCore/rendering/RenderBoxModelObject.cpp:1963 > + BorderEdgeFlags edgesToDraw = 0; > + for (int i = BSTop; i <= BSLeft; ++i) > + if (edges[i].shouldRender()) > + edgesToDraw |= edgeFlagForSide(static_cast<BoxSide>(i)); I don't like changing the value of input parameters. Why is this necessary here? 768349 11 tomhudson 2012-11-15 11:41:23 -0800 (In reply to comment #10) > (From update of attachment 174464 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=174464&action=review > > > Source/WebCore/rendering/RenderBoxModelObject.cpp:1963 > > + BorderEdgeFlags edgesToDraw = 0; > > + for (int i = BSTop; i <= BSLeft; ++i) > > + if (edges[i].shouldRender()) > > + edgesToDraw |= edgeFlagForSide(static_cast<BoxSide>(i)); > > I don't like changing the value of input parameters. Why is this necessary here? Simon, I'm not sure I understand your comment. edgesToDraw is not an input to paintBorder(). It was previously not an input to paintTransparentBorderSides(); you r-ed my previous the version in #8 and requested that I compute it in paintBorder() and pass it down. We were previously always passing AllBorderEdges to paintBorderSides(); I thought in #8 you were asking me to pass down the more-precise version. 768352 12 simon.fraser 2012-11-15 11:46:57 -0800 Sorry the review diff page confused me. This seems OK, but please upload a patch that applies cleanly. 770596 13 174948 tomhudson 2012-11-19 04:24:13 -0800 Created attachment 174948 Patch 770683 14 174948 tomhudson 2012-11-19 06:39:13 -0800 Comment on attachment 174948 Patch Simon, patch applies this time and seems to be doing well in EWS. 770797 15 174948 webkit.review.bot 2012-11-19 08:57:25 -0800 Comment on attachment 174948 Patch Clearing flags on attachment: 174948 Committed r135167: <http://trac.webkit.org/changeset/135167> 770798 16 webkit.review.bot 2012-11-19 08:57:29 -0800 All reviewed patches have been landed. Closing bug. 167731 2012-10-09 04:22:33 -0700 2012-10-09 05:11:53 -0700 Simplified version of patch for testing shouldRender.patch text/plain 856 tomhudson SW5kZXg6IHRoaXJkX3BhcnR5L1dlYktpdC9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy Qm94TW9kZWxPYmplY3QuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHRoaXJkX3BhcnR5L1dlYktpdC9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3BwCShyZXZpc2lvbiAx MzA3MTApCisrKyB0aGlyZF9wYXJ0eS9XZWJLaXQvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckJveE1vZGVsT2JqZWN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTcyOCw2ICsxNzI4LDEw IEBACiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgY29uc3QgQm9yZGVyRWRnZSBlZGdlc1tdLCBCYWNrZ3JvdW5kQmxlZWRBdm9pZGFuY2UgYmxl ZWRBdm9pZGFuY2UsIGJvb2wgaW5jbHVkZUxvZ2ljYWxMZWZ0RWRnZSwgYm9vbCBpbmNsdWRlTG9n aWNhbFJpZ2h0RWRnZSwgYm9vbCBhbnRpYWxpYXMpCiB7CiAgICAgQm9yZGVyRWRnZUZsYWdzIGVk Z2VzVG9EcmF3ID0gQWxsQm9yZGVyRWRnZXM7CisgICAgZm9yIChpbnQgaSA9IEJTVG9wOyBpIDw9 IEJTTGVmdDsgKytpKQorICAgICAgICBpZiAoIWVkZ2VzW2ldLnNob3VsZFJlbmRlcigpKQorICAg ICAgICAgICAgZWRnZXNUb0RyYXcgJj0gfmVkZ2VGbGFnRm9yU2lkZShzdGF0aWNfY2FzdDxCb3hT aWRlPihpKSk7CisKICAgICB3aGlsZSAoZWRnZXNUb0RyYXcpIHsKICAgICAgICAgLy8gRmluZCB1 bmRyYXduIGVkZ2VzIHNoYXJpbmcgYSBjb2xvci4KICAgICAgICAgQ29sb3IgY29tbW9uQ29sb3I7 Cg== 167734 2012-10-09 04:32:04 -0700 2012-10-09 05:11:53 -0700 Fix pathnames. shouldRender.patch text/plain 799 tomhudson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2Jq ZWN0LmNwcAkocmV2aXNpb24gMTMwNzEwKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckJveE1vZGVsT2JqZWN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTcyOCw2ICsxNzI4LDEw IEBACiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgY29uc3QgQm9yZGVyRWRnZSBlZGdlc1tdLCBCYWNrZ3JvdW5kQmxlZWRBdm9pZGFuY2UgYmxl ZWRBdm9pZGFuY2UsIGJvb2wgaW5jbHVkZUxvZ2ljYWxMZWZ0RWRnZSwgYm9vbCBpbmNsdWRlTG9n aWNhbFJpZ2h0RWRnZSwgYm9vbCBhbnRpYWxpYXMpCiB7CiAgICAgQm9yZGVyRWRnZUZsYWdzIGVk Z2VzVG9EcmF3ID0gQWxsQm9yZGVyRWRnZXM7CisgICAgZm9yIChpbnQgaSA9IEJTVG9wOyBpIDw9 IEJTTGVmdDsgKytpKQorICAgICAgICBpZiAoIWVkZ2VzW2ldLnNob3VsZFJlbmRlcigpKQorICAg ICAgICAgICAgZWRnZXNUb0RyYXcgJj0gfmVkZ2VGbGFnRm9yU2lkZShzdGF0aWNfY2FzdDxCb3hT aWRlPihpKSk7CisKICAgICB3aGlsZSAoZWRnZXNUb0RyYXcpIHsKICAgICAgICAgLy8gRmluZCB1 bmRyYXduIGVkZ2VzIHNoYXJpbmcgYSBjb2xvci4KICAgICAgICAgQ29sb3IgY29tbW9uQ29sb3I7 Cg== 167739 2012-10-09 05:11:53 -0700 2012-10-09 05:23:13 -0700 Add Changelog. shouldRender2.patch text/plain 1723 tomhudson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzMDcxMCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDEyLTEwLTA4ICBUb20gSHVk c29uICA8dG9taHVkc29uQGdvb2dsZS5jb20+CisKKyAgICAgICAgQ2hlY2sgZWRnZXNbaV0uc2hv dWxkUmVuZGVyKCkgaW4gcGFpbnRUcmFuc2x1Y2VudEJvcmRlclNpZGVzKCkKKyAgICAgICAgc28g d2UgZG9uJ3Qgc2V0IHVwIGFuZCB0ZWFyIGRvd24gYSB0cmFuc2x1Y2VudCBsYXllciBpZiBwYWlu dEJvcmRlcnMoKQorICAgICAgICBpc24ndCBnb2luZyB0byBkcmF3IGFueXRoaW5nLgorCisgICAg ICAgIE9uIG1vYmlsZSBwbGF0Zm9ybXMgdmlld2luZyBzaXRlcyB3aXRoIHRoZSBEaXNxdXMgY29t bWVudCBzeXN0ZW0KKyAgICAgICAgd2UncmUgc2VlaW5nIHVubmVjZXNzYXJ5IHRyYW5zcGFyZW50 IGxheWVyIGNyZWF0aW9uIGFkZGluZyAzMG1zIG9yCisgICAgICAgIG1vcmUgdG8gcGFpbnQgdGlt ZXM7IHRoaXMgcGF0Y2ggZml4ZXMgdGhhdCBwcm9ibGVtLgorCisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcAorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94TW9k ZWxPYmplY3Q6OnBhaW50VHJhbnNsdWNlbnRCb3JkZXJTaWRlcykKKwogMjAxMi0xMC0wOCAgRXJp YyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CiAKICAgICAgICAgSW5saW5lIGxvZ2ljYWxIZWln aHRGb3JSb3dTaXppbmcgdG8gc2hhdmUgYW5vdGhlciAyLTMlIG9mZiByb2JvaG9ybmV0J3MgcmVz aXplY29sLmh0bWwKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2Rl bE9iamVjdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJveE1vZGVsT2JqZWN0LmNwcAkocmV2aXNpb24gMTMwNzEwKQorKysgU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTcy OCw2ICsxNzI4LDEwIEBACiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgY29uc3QgQm9yZGVyRWRnZSBlZGdlc1tdLCBCYWNrZ3JvdW5kQmxlZWRB dm9pZGFuY2UgYmxlZWRBdm9pZGFuY2UsIGJvb2wgaW5jbHVkZUxvZ2ljYWxMZWZ0RWRnZSwgYm9v bCBpbmNsdWRlTG9naWNhbFJpZ2h0RWRnZSwgYm9vbCBhbnRpYWxpYXMpCiB7CiAgICAgQm9yZGVy RWRnZUZsYWdzIGVkZ2VzVG9EcmF3ID0gQWxsQm9yZGVyRWRnZXM7CisgICAgZm9yIChpbnQgaSA9 IEJTVG9wOyBpIDw9IEJTTGVmdDsgKytpKQorICAgICAgICBpZiAoIWVkZ2VzW2ldLnNob3VsZFJl bmRlcigpKQorICAgICAgICAgICAgZWRnZXNUb0RyYXcgJj0gfmVkZ2VGbGFnRm9yU2lkZShzdGF0 aWNfY2FzdDxCb3hTaWRlPihpKSk7CisKICAgICB3aGlsZSAoZWRnZXNUb0RyYXcpIHsKICAgICAg ICAgLy8gRmluZCB1bmRyYXduIGVkZ2VzIHNoYXJpbmcgYSBjb2xvci4KICAgICAgICAgQ29sb3Ig Y29tbW9uQ29sb3I7Cg== 167741 2012-10-09 05:23:13 -0700 2012-10-09 10:14:34 -0700 Fix ChangeLog formatting. shouldRender2.patch text/plain 1897 tomhudson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzMDcxMCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDEyLTEwLTA4ICBUb20gSHVk c29uICA8dG9taHVkc29uQGdvb2dsZS5jb20+CisKKyAgICAgICAgSW1wcm92ZSBwZXJmb3JtYW5j ZSBvZiBSZW5kZXJCb3hNb2RlbE9iamVjdCA6OnBhaW50VHJhbnNsdWNlbnRCb3JkZXJTaWRlcygp CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05ODY2MAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWS4KKworICAgICAgICBDaGVjayBlZGdlc1tpXS5z aG91bGRSZW5kZXIoKSBpbiBwYWludFRyYW5zbHVjZW50Qm9yZGVyU2lkZXMoKQorICAgICAgICBz byB3ZSBkb24ndCBzZXQgdXAgYW5kIHRlYXIgZG93biBhIHRyYW5zbHVjZW50IGxheWVyIGlmIHBh aW50Qm9yZGVycygpCisgICAgICAgIGlzbid0IGdvaW5nIHRvIGRyYXcgYW55dGhpbmcuCisKKyAg ICAgICAgT24gbW9iaWxlIHBsYXRmb3JtcyB2aWV3aW5nIHNpdGVzIHdpdGggdGhlIERpc3F1cyBj b21tZW50IHN5c3RlbQorICAgICAgICB3ZSdyZSBzZWVpbmcgdW5uZWNlc3NhcnkgdHJhbnNwYXJl bnQgbGF5ZXIgY3JlYXRpb24gYWRkaW5nIDMwbXMgb3IKKyAgICAgICAgbW9yZSB0byBwYWludCB0 aW1lczsgdGhpcyBwYXRjaCBmaXhlcyB0aGF0IHByb2JsZW0uCisKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94 TW9kZWxPYmplY3Q6OnBhaW50VHJhbnNsdWNlbnRCb3JkZXJTaWRlcykKKwogMjAxMi0xMC0wOCAg RXJpYyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CiAKICAgICAgICAgSW5saW5lIGxvZ2ljYWxI ZWlnaHRGb3JSb3dTaXppbmcgdG8gc2hhdmUgYW5vdGhlciAyLTMlIG9mZiByb2JvaG9ybmV0J3Mg cmVzaXplY29sLmh0bWwKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hN b2RlbE9iamVjdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckJveE1vZGVsT2JqZWN0LmNwcAkocmV2aXNpb24gMTMwNzEwKQorKysgU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAt MTcyOCw2ICsxNzI4LDEwIEBACiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgY29uc3QgQm9yZGVyRWRnZSBlZGdlc1tdLCBCYWNrZ3JvdW5kQmxl ZWRBdm9pZGFuY2UgYmxlZWRBdm9pZGFuY2UsIGJvb2wgaW5jbHVkZUxvZ2ljYWxMZWZ0RWRnZSwg Ym9vbCBpbmNsdWRlTG9naWNhbFJpZ2h0RWRnZSwgYm9vbCBhbnRpYWxpYXMpCiB7CiAgICAgQm9y ZGVyRWRnZUZsYWdzIGVkZ2VzVG9EcmF3ID0gQWxsQm9yZGVyRWRnZXM7CisgICAgZm9yIChpbnQg aSA9IEJTVG9wOyBpIDw9IEJTTGVmdDsgKytpKQorICAgICAgICBpZiAoIWVkZ2VzW2ldLnNob3Vs ZFJlbmRlcigpKQorICAgICAgICAgICAgZWRnZXNUb0RyYXcgJj0gfmVkZ2VGbGFnRm9yU2lkZShz dGF0aWNfY2FzdDxCb3hTaWRlPihpKSk7CisKICAgICB3aGlsZSAoZWRnZXNUb0RyYXcpIHsKICAg ICAgICAgLy8gRmluZCB1bmRyYXduIGVkZ2VzIHNoYXJpbmcgYSBjb2xvci4KICAgICAgICAgQ29s b3IgY29tbW9uQ29sb3I7Cg== 167761 2012-10-09 08:37:11 -0700 2012-10-09 10:14:34 -0700 Alternate implementation in paintBorder() instead of paintTranslucentBorderSides() shouldRender3.patch text/plain 1961 tomhudson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzMDcxMCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDEyLTEwLTA4ICBUb20gSHVk c29uICA8dG9taHVkc29uQGdvb2dsZS5jb20+CisKKyAgICAgICAgSW1wcm92ZSBwZXJmb3JtYW5j ZSBvZiBSZW5kZXJCb3hNb2RlbE9iamVjdCA6OnBhaW50VHJhbnNsdWNlbnRCb3JkZXJTaWRlcygp CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05ODY2MAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWS4KKworICAgICAgICBDaGVjayBlZGdlc1tpXS5z aG91bGRSZW5kZXIoKSBpbiBwYWludFRyYW5zbHVjZW50Qm9yZGVyU2lkZXMoKQorICAgICAgICBz byB3ZSBkb24ndCBzZXQgdXAgYW5kIHRlYXIgZG93biBhIHRyYW5zbHVjZW50IGxheWVyIGlmIHBh aW50Qm9yZGVycygpCisgICAgICAgIGlzbid0IGdvaW5nIHRvIGRyYXcgYW55dGhpbmcuCisKKyAg ICAgICAgT24gbW9iaWxlIHBsYXRmb3JtcyB2aWV3aW5nIHNpdGVzIHdpdGggdGhlIERpc3F1cyBj b21tZW50IHN5c3RlbQorICAgICAgICB3ZSdyZSBzZWVpbmcgdW5uZWNlc3NhcnkgdHJhbnNwYXJl bnQgbGF5ZXIgY3JlYXRpb24gYWRkaW5nIDMwbXMgb3IKKyAgICAgICAgbW9yZSB0byBwYWludCB0 aW1lczsgdGhpcyBwYXRjaCBmaXhlcyB0aGF0IHByb2JsZW0uCisKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94 TW9kZWxPYmplY3Q6OnBhaW50VHJhbnNsdWNlbnRCb3JkZXJTaWRlcykKKwogMjAxMi0xMC0wOCAg RXJpYyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CiAKICAgICAgICAgSW5saW5lIGxvZ2ljYWxI ZWlnaHRGb3JSb3dTaXppbmcgdG8gc2hhdmUgYW5vdGhlciAyLTMlIG9mZiByb2JvaG9ybmV0J3Mg cmVzaXplY29sLmh0bWwKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hN b2RlbE9iamVjdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckJveE1vZGVsT2JqZWN0LmNwcAkocmV2aXNpb24gMTMwNzEwKQorKysgU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAt MTc4Niw2ICsxNzg2LDcgQEAKICAgICBpbnQgbnVtRWRnZXNWaXNpYmxlID0gNDsKICAgICBib29s IGFsbEVkZ2VzU2hhcmVDb2xvciA9IHRydWU7CiAgICAgaW50IGZpcnN0VmlzaWJsZUVkZ2UgPSAt MTsKKyAgICBib29sIHJlbmRlckFueUVkZ2UgPSBmYWxzZTsKIAogICAgIGZvciAoaW50IGkgPSBC U1RvcDsgaSA8PSBCU0xlZnQ7ICsraSkgewogICAgICAgICBjb25zdCBCb3JkZXJFZGdlJiBjdXJy RWRnZSA9IGVkZ2VzW2ldOwpAQCAtMTgxMyw3ICsxODE0LDExIEBACiAKICAgICAgICAgaWYgKGN1 cnJFZGdlLnN0eWxlICE9IERPVUJMRSkKICAgICAgICAgICAgIGhhdmVBbGxEb3VibGVFZGdlcyA9 IGZhbHNlOworCisgICAgICAgIHJlbmRlckFueUVkZ2UgPSByZW5kZXJBbnlFZGdlIHx8IGN1cnJF ZGdlLnNob3VsZFJlbmRlcigpOwogICAgIH0KKyAgICBpZiAoIXJlbmRlckFueUVkZ2UpCisgICAg ICAgIHJldHVybjsKIAogICAgIC8vIElmIG5vIGNvcm5lciBpbnRlcnNlY3RzIHRoZSBjbGlwIHJl Z2lvbiwgd2UgY2FuIHByZXRlbmQgb3V0ZXJCb3JkZXIgaXMKICAgICAvLyByZWN0YW5ndWxhciB0 byBpbXByb3ZlIHBlcmZvcm1hbmNlLgo= 167776 2012-10-09 10:14:34 -0700 2012-11-15 09:23:17 -0800 After out-of-band review, moving the implementation back to paintTranslucentBorderSides(), but reversing the flag-application logic for reasability shouldRender4.patch text/plain 2227 tomhudson SW5kZXg6IHRoaXJkX3BhcnR5L1dlYktpdC9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gdGhpcmRfcGFydHkvV2ViS2l0L1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwkocmV2 aXNpb24gMTMwNzEwKQorKysgdGhpcmRfcGFydHkvV2ViS2l0L1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDEyLTEwLTA4ICBUb20gSHVk c29uICA8dG9taHVkc29uQGdvb2dsZS5jb20+CisKKyAgICAgICAgSW1wcm92ZSBwZXJmb3JtYW5j ZSBvZiBSZW5kZXJCb3hNb2RlbE9iamVjdCA6OnBhaW50VHJhbnNsdWNlbnRCb3JkZXJTaWRlcygp CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05ODY2MAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWS4KKworICAgICAgICBDaGVjayBlZGdlc1tpXS5z aG91bGRSZW5kZXIoKSBpbiBwYWludFRyYW5zbHVjZW50Qm9yZGVyU2lkZXMoKQorICAgICAgICBz byB3ZSBkb24ndCBzZXQgdXAgYW5kIHRlYXIgZG93biBhIHRyYW5zbHVjZW50IGxheWVyIGlmIHBh aW50Qm9yZGVycygpCisgICAgICAgIGlzbid0IGdvaW5nIHRvIGRyYXcgYW55dGhpbmcuCisKKyAg ICAgICAgT24gbW9iaWxlIHBsYXRmb3JtcyB2aWV3aW5nIHNpdGVzIHdpdGggdGhlIERpc3F1cyBj b21tZW50IHN5c3RlbQorICAgICAgICB3ZSdyZSBzZWVpbmcgdW5uZWNlc3NhcnkgdHJhbnNwYXJl bnQgbGF5ZXIgY3JlYXRpb24gYWRkaW5nIDMwbXMgb3IKKyAgICAgICAgbW9yZSB0byBwYWludCB0 aW1lczsgdGhpcyBwYXRjaCBmaXhlcyB0aGF0IHByb2JsZW0uCisKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94 TW9kZWxPYmplY3Q6OnBhaW50VHJhbnNsdWNlbnRCb3JkZXJTaWRlcykKKwogMjAxMi0xMC0wOCAg RXJpYyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CiAKICAgICAgICAgSW5saW5lIGxvZ2ljYWxI ZWlnaHRGb3JSb3dTaXppbmcgdG8gc2hhdmUgYW5vdGhlciAyLTMlIG9mZiByb2JvaG9ybmV0J3Mg cmVzaXplY29sLmh0bWwKSW5kZXg6IHRoaXJkX3BhcnR5L1dlYktpdC9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHRoaXJkX3Bh cnR5L1dlYktpdC9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3Qu Y3BwCShyZXZpc2lvbiAxMzA3MTApCisrKyB0aGlyZF9wYXJ0eS9XZWJLaXQvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAt MTcyNyw3ICsxNzI3LDExIEBACiB2b2lkIFJlbmRlckJveE1vZGVsT2JqZWN0OjpwYWludFRyYW5z bHVjZW50Qm9yZGVyU2lkZXMoR3JhcGhpY3NDb250ZXh0KiBncmFwaGljc0NvbnRleHQsIGNvbnN0 IFJlbmRlclN0eWxlKiBzdHlsZSwgY29uc3QgUm91bmRlZFJlY3QmIG91dGVyQm9yZGVyLCBjb25z dCBSb3VuZGVkUmVjdCYgaW5uZXJCb3JkZXIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgQm9yZGVyRWRnZSBlZGdlc1tdLCBCYWNr Z3JvdW5kQmxlZWRBdm9pZGFuY2UgYmxlZWRBdm9pZGFuY2UsIGJvb2wgaW5jbHVkZUxvZ2ljYWxM ZWZ0RWRnZSwgYm9vbCBpbmNsdWRlTG9naWNhbFJpZ2h0RWRnZSwgYm9vbCBhbnRpYWxpYXMpCiB7 Ci0gICAgQm9yZGVyRWRnZUZsYWdzIGVkZ2VzVG9EcmF3ID0gQWxsQm9yZGVyRWRnZXM7CisgICAg Qm9yZGVyRWRnZUZsYWdzIGVkZ2VzVG9EcmF3ID0gMDsKKyAgICBmb3IgKGludCBpID0gQlNUb3A7 IGkgPD0gQlNMZWZ0OyArK2kpCisgICAgICAgIGlmIChlZGdlc1tpXS5zaG91bGRSZW5kZXIoKSkK KyAgICAgICAgICAgIGVkZ2VzVG9EcmF3IHw9IGVkZ2VGbGFnRm9yU2lkZShzdGF0aWNfY2FzdDxC b3hTaWRlPihpKSk7CisKICAgICB3aGlsZSAoZWRnZXNUb0RyYXcpIHsKICAgICAgICAgLy8gRmlu ZCB1bmRyYXduIGVkZ2VzIHNoYXJpbmcgYSBjb2xvci4KICAgICAgICAgQ29sb3IgY29tbW9uQ29s b3I7Cg== 174464 2012-11-15 09:23:20 -0800 2012-11-19 04:24:09 -0800 Patch bug-98660-20121115172117.patch text/plain 5788 tomhudson U3VidmVyc2lvbiBSZXZpc2lvbjogMTM0NjAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYThiMmRmNWU4NjNmNGEy YjVmYjEzN2VmZDZjZjc4ZjY5NjUwMGVmZi4uZmYxODQyN2VkMDE0ZWFjZWY0ZWZkMjI0N2ZkMDli MWNkYTU2N2NkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTExLTE1ICBTaGVy aWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KKworICAgICAgICBJbXByb3Zl IHBlcmZvcm1hbmNlIG9mIFJlbmRlckJveE1vZGVsT2JqZWN0IDo6cGFpbnRUcmFuc2x1Y2VudEJv cmRlclNpZGVzKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTk4NjYwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZLgorCisgICAgICAgIENoZWNr IGVkZ2VzW2ldLnNob3VsZFJlbmRlcigpIGFuZCBwYXNzIGEgZmxhZyBmaWVsZCB0byBib3RoIHBh aW50Qm9yZGVyU2lkZXMoKQorICAgICAgICBhbmQgcGFpbnRUcmFuc2x1Y2VudEJvcmRlclNpZGVz KCkgc28gdGhhdCB3ZSBkb24ndCBzZXQgdXAgYW5kIHRlYXIgZG93biBhCisgICAgICAgIHRyYW5z bHVjZW50IGxheWVyIGlmIHBhaW50Qm9yZGVycygpIGlzbid0IGdvaW5nIHRvIGRyYXcgYW55dGhp bmcuCisKKyAgICAgICAgT24gbW9iaWxlIHBsYXRmb3JtcyB2aWV3aW5nIHNpdGVzIHdpdGggdGhl IERpc3F1cyBjb21tZW50IHN5c3RlbQorICAgICAgICB3ZSdyZSBzZWVpbmcgdW5uZWNlc3Nhcnkg dHJhbnNwYXJlbnQgbGF5ZXIgY3JlYXRpb24gYWRkaW5nIDMwbXMgb3IKKyAgICAgICAgbW9yZSB0 byBwYWludCB0aW1lczsgdGhpcyBwYXRjaCBmaXhlcyB0aGF0IHByb2JsZW0uCisKKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuaDoKKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyQm94TW9kZWxPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94TW9k ZWxPYmplY3Q6OnBhaW50Qm9yZGVyKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveE1vZGVs T2JqZWN0OjpwYWludFRyYW5zbHVjZW50Qm9yZGVyU2lkZXMpOgorCiAyMDEyLTExLTE0ICBTaGVy aWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmll d2VkLCByb2xsaW5nIG91dCByMTM0NTIzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAKaW5kZXggMTI3N2E3YzdmNWM1MmU3MzFlOGMyMTc4 YTljMGQ2YWI1YzEwZmQ4Yy4uNmEzYjk2M2MzZmNmNzUyMzE3NDY2NjNiN2UwYTA4Yjg4YWY0ZWY1 NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2Jq ZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmpl Y3QuY3BwCkBAIC0xNzcxLDEwICsxNzcxLDggQEAgdm9pZCBSZW5kZXJCb3hNb2RlbE9iamVjdDo6 cGFpbnRCb3JkZXJTaWRlcyhHcmFwaGljc0NvbnRleHQqIGdyYXBoaWNzQ29udGV4dCwgY28KICAg ICB9CiB9CiAKLXZvaWQgUmVuZGVyQm94TW9kZWxPYmplY3Q6OnBhaW50VHJhbnNsdWNlbnRCb3Jk ZXJTaWRlcyhHcmFwaGljc0NvbnRleHQqIGdyYXBoaWNzQ29udGV4dCwgY29uc3QgUmVuZGVyU3R5 bGUqIHN0eWxlLCBjb25zdCBSb3VuZGVkUmVjdCYgb3V0ZXJCb3JkZXIsIGNvbnN0IFJvdW5kZWRS ZWN0JiBpbm5lckJvcmRlciwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBjb25zdCBCb3JkZXJFZGdlIGVkZ2VzW10sIEJhY2tncm91bmRCbGVl ZEF2b2lkYW5jZSBibGVlZEF2b2lkYW5jZSwgYm9vbCBpbmNsdWRlTG9naWNhbExlZnRFZGdlLCBi b29sIGluY2x1ZGVMb2dpY2FsUmlnaHRFZGdlLCBib29sIGFudGlhbGlhcykKK3ZvaWQgUmVuZGVy Qm94TW9kZWxPYmplY3Q6OnBhaW50VHJhbnNsdWNlbnRCb3JkZXJTaWRlcyhHcmFwaGljc0NvbnRl eHQqIGdyYXBoaWNzQ29udGV4dCwgY29uc3QgUmVuZGVyU3R5bGUqIHN0eWxlLCBjb25zdCBSb3Vu ZGVkUmVjdCYgb3V0ZXJCb3JkZXIsIGNvbnN0IFJvdW5kZWRSZWN0JiBpbm5lckJvcmRlciwgY29u c3QgQm9yZGVyRWRnZSBlZGdlc1tdLCBCb3JkZXJFZGdlRmxhZ3MgZWRnZXNUb0RyYXcsIEJhY2tn cm91bmRCbGVlZEF2b2lkYW5jZSBibGVlZEF2b2lkYW5jZSwgYm9vbCBpbmNsdWRlTG9naWNhbExl ZnRFZGdlLCBib29sIGluY2x1ZGVMb2dpY2FsUmlnaHRFZGdlLCBib29sIGFudGlhbGlhcykKIHsK LSAgICBCb3JkZXJFZGdlRmxhZ3MgZWRnZXNUb0RyYXcgPSBBbGxCb3JkZXJFZGdlczsKICAgICB3 aGlsZSAoZWRnZXNUb0RyYXcpIHsKICAgICAgICAgLy8gRmluZCB1bmRyYXduIGVkZ2VzIHNoYXJp bmcgYSBjb2xvci4KICAgICAgICAgQ29sb3IgY29tbW9uQ29sb3I7CkBAIC0xOTU5LDEyICsxOTU3 LDE3IEBAIHZvaWQgUmVuZGVyQm94TW9kZWxPYmplY3Q6OnBhaW50Qm9yZGVyKGNvbnN0IFBhaW50 SW5mbyYgaW5mbywgY29uc3QgTGF5b3V0UmVjdCYKICAgICAgICAgICAgIGdyYXBoaWNzQ29udGV4 dC0+Y2xpcE91dFJvdW5kZWRSZWN0KGlubmVyQm9yZGVyKTsKICAgICB9CiAKKyAgICBCb3JkZXJF ZGdlRmxhZ3MgZWRnZXNUb0RyYXcgPSAwOworICAgIGZvciAoaW50IGkgPSBCU1RvcDsgaSA8PSBC U0xlZnQ7ICsraSkKKyAgICAgICAgaWYgKGVkZ2VzW2ldLnNob3VsZFJlbmRlcigpKQorICAgICAg ICAgICAgZWRnZXNUb0RyYXcgfD0gZWRnZUZsYWdGb3JTaWRlKHN0YXRpY19jYXN0PEJveFNpZGU+ KGkpKTsKKwogICAgIC8vIElmIG9ubHkgb25lIGVkZ2UgdmlzaWJsZSBhbnRpYWxpYXNpbmcgZG9l c24ndCBjcmVhdGUgc2VhbXMKICAgICBib29sIGFudGlhbGlhcyA9IHNob3VsZEFudGlhbGlhc0xp bmVzKGdyYXBoaWNzQ29udGV4dCkgfHwgbnVtRWRnZXNWaXNpYmxlID09IDE7CiAgICAgaWYgKGhh dmVBbHBoYUNvbG9yKQotICAgICAgICBwYWludFRyYW5zbHVjZW50Qm9yZGVyU2lkZXMoZ3JhcGhp Y3NDb250ZXh0LCBzdHlsZSwgb3V0ZXJCb3JkZXIsIGlubmVyQm9yZGVyLCBlZGdlcywgYmxlZWRB dm9pZGFuY2UsIGluY2x1ZGVMb2dpY2FsTGVmdEVkZ2UsIGluY2x1ZGVMb2dpY2FsUmlnaHRFZGdl LCBhbnRpYWxpYXMpOworICAgICAgICBwYWludFRyYW5zbHVjZW50Qm9yZGVyU2lkZXMoZ3JhcGhp Y3NDb250ZXh0LCBzdHlsZSwgb3V0ZXJCb3JkZXIsIGlubmVyQm9yZGVyLCBlZGdlcywgZWRnZXNU b0RyYXcsIGJsZWVkQXZvaWRhbmNlLCBpbmNsdWRlTG9naWNhbExlZnRFZGdlLCBpbmNsdWRlTG9n aWNhbFJpZ2h0RWRnZSwgYW50aWFsaWFzKTsKICAgICBlbHNlCi0gICAgICAgIHBhaW50Qm9yZGVy U2lkZXMoZ3JhcGhpY3NDb250ZXh0LCBzdHlsZSwgb3V0ZXJCb3JkZXIsIGlubmVyQm9yZGVyLCBl ZGdlcywgQWxsQm9yZGVyRWRnZXMsIGJsZWVkQXZvaWRhbmNlLCBpbmNsdWRlTG9naWNhbExlZnRF ZGdlLCBpbmNsdWRlTG9naWNhbFJpZ2h0RWRnZSwgYW50aWFsaWFzKTsKKyAgICAgICAgcGFpbnRC b3JkZXJTaWRlcyhncmFwaGljc0NvbnRleHQsIHN0eWxlLCBvdXRlckJvcmRlciwgaW5uZXJCb3Jk ZXIsIGVkZ2VzLCBlZGdlc1RvRHJhdywgYmxlZWRBdm9pZGFuY2UsIGluY2x1ZGVMb2dpY2FsTGVm dEVkZ2UsIGluY2x1ZGVMb2dpY2FsUmlnaHRFZGdlLCBhbnRpYWxpYXMpOwogfQogCiB2b2lkIFJl bmRlckJveE1vZGVsT2JqZWN0OjpkcmF3Qm94U2lkZUZyb21QYXRoKEdyYXBoaWNzQ29udGV4dCog Z3JhcGhpY3NDb250ZXh0LCBjb25zdCBMYXlvdXRSZWN0JiBib3JkZXJSZWN0LCBjb25zdCBQYXRo JiBib3JkZXJQYXRoLCBjb25zdCBCb3JkZXJFZGdlIGVkZ2VzW10sCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuaCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5oCmluZGV4IDFjZmU0MTIzZTQ2ZjM1 Y2VlNzQ3YmY4N2RkNzExZmU3MDIyYjY2OGUuLjA1N2I1ZDU1ZDY0NzEzYTU4MTQ4YjZmZWNmYjY5 YTFhNWU4OGJmNWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC b3hNb2RlbE9iamVjdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hN b2RlbE9iamVjdC5oCkBAIC0yOTQsOCArMjk0LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIHBhaW50 T25lQm9yZGVyU2lkZShHcmFwaGljc0NvbnRleHQqLCBjb25zdCBSZW5kZXJTdHlsZSosIGNvbnN0 IFJvdW5kZWRSZWN0JiBvdXRlckJvcmRlciwgY29uc3QgUm91bmRlZFJlY3QmIGlubmVyQm9yZGVy LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBJbnRSZWN0JiBzaWRlUmVj dCwgQm94U2lkZSwgQm94U2lkZSBhZGphY2VudFNpZGUxLCBCb3hTaWRlIGFkamFjZW50U2lkZTIs IGNvbnN0IGNsYXNzIEJvcmRlckVkZ2VbXSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgY29uc3QgUGF0aCosIEJhY2tncm91bmRCbGVlZEF2b2lkYW5jZSwgYm9vbCBpbmNsdWRlTG9n aWNhbExlZnRFZGdlLCBib29sIGluY2x1ZGVMb2dpY2FsUmlnaHRFZGdlLCBib29sIGFudGlhbGlh cywgY29uc3QgQ29sb3IqIG92ZXJyaWRlQ29sb3IgPSAwKTsKLSAgICB2b2lkIHBhaW50VHJhbnNs dWNlbnRCb3JkZXJTaWRlcyhHcmFwaGljc0NvbnRleHQqLCBjb25zdCBSZW5kZXJTdHlsZSosIGNv bnN0IFJvdW5kZWRSZWN0JiBvdXRlckJvcmRlciwgY29uc3QgUm91bmRlZFJlY3QmIGlubmVyQm9y ZGVyLAotICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBjbGFzcyBCb3JkZXJFZGdlW10s IEJhY2tncm91bmRCbGVlZEF2b2lkYW5jZSwgYm9vbCBpbmNsdWRlTG9naWNhbExlZnRFZGdlLCBi b29sIGluY2x1ZGVMb2dpY2FsUmlnaHRFZGdlLCBib29sIGFudGlhbGlhcyA9IGZhbHNlKTsKKyAg ICB2b2lkIHBhaW50VHJhbnNsdWNlbnRCb3JkZXJTaWRlcyhHcmFwaGljc0NvbnRleHQqLCBjb25z dCBSZW5kZXJTdHlsZSosIGNvbnN0IFJvdW5kZWRSZWN0JiBvdXRlckJvcmRlciwgY29uc3QgUm91 bmRlZFJlY3QmIGlubmVyQm9yZGVyLCBjb25zdCBjbGFzcyBCb3JkZXJFZGdlW10sIEJvcmRlckVk Z2VGbGFncywgQmFja2dyb3VuZEJsZWVkQXZvaWRhbmNlLCBib29sIGluY2x1ZGVMb2dpY2FsTGVm dEVkZ2UsIGJvb2wgaW5jbHVkZUxvZ2ljYWxSaWdodEVkZ2UsIGJvb2wgYW50aWFsaWFzID0gZmFs c2UpOwogICAgIHZvaWQgcGFpbnRCb3JkZXJTaWRlcyhHcmFwaGljc0NvbnRleHQqLCBjb25zdCBS ZW5kZXJTdHlsZSosIGNvbnN0IFJvdW5kZWRSZWN0JiBvdXRlckJvcmRlciwgY29uc3QgUm91bmRl ZFJlY3QmIGlubmVyQm9yZGVyLAogICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBjbGFz cyBCb3JkZXJFZGdlW10sIEJvcmRlckVkZ2VGbGFncywgQmFja2dyb3VuZEJsZWVkQXZvaWRhbmNl LAogICAgICAgICAgICAgICAgICAgICAgICAgICBib29sIGluY2x1ZGVMb2dpY2FsTGVmdEVkZ2Us IGJvb2wgaW5jbHVkZUxvZ2ljYWxSaWdodEVkZ2UsIGJvb2wgYW50aWFsaWFzID0gZmFsc2UsIGNv bnN0IENvbG9yKiBvdmVycmlkZUNvbG9yID0gMCk7Cg== 174948 2012-11-19 04:24:13 -0800 2012-11-19 08:57:25 -0800 Patch bug-98660-20121119122203.patch text/plain 5620 tomhudson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzNTEzOCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDEyLTExLTE5ICBUb20gSHVk c29uICA8dG9taHVkc29uQGNocm9taXVtLm9yZz4KKworICAgICAgICBJbXByb3ZlIHBlcmZvcm1h bmNlIG9mIFJlbmRlckJveE1vZGVsT2JqZWN0OjpwYWludFRyYW5zbHVjZW50Qm9yZGVyU2lkZXMo KQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTg2NjAK KworICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBGcmFzZXIuCisKKyAgICAgICAgQWNjdW11bGF0 ZSBlZGdlc1tpXS5zaG91bGRSZW5kZXIoKSBpbiBhIGZsYWcgZmllbGQgYW5kIHBhc3MgdGhhdCB0 byBwYWludEJvcmRlclNpZGVzKCkKKyAgICAgICAgYW5kIHBhaW50VHJhbnNsdWNlbnRCb3JkZXJT aWRlcygpIHNvIHRoYXQgd2UgZG9uJ3QgZG8gdW5uZWNlc3Nhcnkgd29yay4KKworICAgICAgICBJ ZiB3ZSBjYW4gYXZvaWQgc2V0dGluZyB1cCBhbmQgdGVhcmluZyBkb3duIGFuIHVubmVjZXNzYXJ5 IHRyYW5zcGFyZW50IGxheWVyIHdlIHNhdmUKKyAgICAgICAgMzBtcyBvbiBzb21lIG1vYmlsZSBw bGF0Zm9ybXMuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuaDoK KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3BwOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyQm94TW9kZWxPYmplY3Q6OnBhaW50Qm9yZGVyKToKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckJveE1vZGVsT2JqZWN0OjpwYWludFRyYW5zbHVjZW50Qm9yZGVyU2lkZXMp OgorCiAyMDEyLTExLTE5ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgog CiAgICAgICAgIFVucmV2aWV3ZWQsIHVudGVzdGVkIGJ1aWxkIGZpeC4KSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcAkocmV2aXNp b24gMTM1MTM4KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2Jq ZWN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTc5MCw5ICsxNzkwLDggQEAgdm9pZCBSZW5kZXJC b3hNb2RlbE9iamVjdDo6cGFpbnRCb3JkZXJTaQogfQogCiB2b2lkIFJlbmRlckJveE1vZGVsT2Jq ZWN0OjpwYWludFRyYW5zbHVjZW50Qm9yZGVyU2lkZXMoR3JhcGhpY3NDb250ZXh0KiBncmFwaGlj c0NvbnRleHQsIGNvbnN0IFJlbmRlclN0eWxlKiBzdHlsZSwgY29uc3QgUm91bmRlZFJlY3QmIG91 dGVyQm9yZGVyLCBjb25zdCBSb3VuZGVkUmVjdCYgaW5uZXJCb3JkZXIsIGNvbnN0IEludFBvaW50 JiBpbm5lckJvcmRlckFkanVzdG1lbnQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgQm9yZGVyRWRnZSBlZGdlc1tdLCBCYWNrZ3Jv dW5kQmxlZWRBdm9pZGFuY2UgYmxlZWRBdm9pZGFuY2UsIGJvb2wgaW5jbHVkZUxvZ2ljYWxMZWZ0 RWRnZSwgYm9vbCBpbmNsdWRlTG9naWNhbFJpZ2h0RWRnZSwgYm9vbCBhbnRpYWxpYXMpCisgICAg Y29uc3QgQm9yZGVyRWRnZSBlZGdlc1tdLCBCb3JkZXJFZGdlRmxhZ3MgZWRnZXNUb0RyYXcsIEJh Y2tncm91bmRCbGVlZEF2b2lkYW5jZSBibGVlZEF2b2lkYW5jZSwgYm9vbCBpbmNsdWRlTG9naWNh bExlZnRFZGdlLCBib29sIGluY2x1ZGVMb2dpY2FsUmlnaHRFZGdlLCBib29sIGFudGlhbGlhcykK IHsKLSAgICBCb3JkZXJFZGdlRmxhZ3MgZWRnZXNUb0RyYXcgPSBBbGxCb3JkZXJFZGdlczsKICAg ICB3aGlsZSAoZWRnZXNUb0RyYXcpIHsKICAgICAgICAgLy8gRmluZCB1bmRyYXduIGVkZ2VzIHNo YXJpbmcgYSBjb2xvci4KICAgICAgICAgQ29sb3IgY29tbW9uQ29sb3I7CkBAIC0xODUxLDkgKzE4 NTAsMTQgQEAgdm9pZCBSZW5kZXJCb3hNb2RlbE9iamVjdDo6cGFpbnRCb3JkZXIoYwogICAgIGlu dCBudW1FZGdlc1Zpc2libGUgPSA0OwogICAgIGJvb2wgYWxsRWRnZXNTaGFyZUNvbG9yID0gdHJ1 ZTsKICAgICBpbnQgZmlyc3RWaXNpYmxlRWRnZSA9IC0xOworICAgIEJvcmRlckVkZ2VGbGFncyBl ZGdlc1RvRHJhdyA9IDA7CiAKICAgICBmb3IgKGludCBpID0gQlNUb3A7IGkgPD0gQlNMZWZ0OyAr K2kpIHsKICAgICAgICAgY29uc3QgQm9yZGVyRWRnZSYgY3VyckVkZ2UgPSBlZGdlc1tpXTsKKwor ICAgICAgICBpZiAoZWRnZXNbaV0uc2hvdWxkUmVuZGVyKCkpCisgICAgICAgICAgICBlZGdlc1Rv RHJhdyB8PSBlZGdlRmxhZ0ZvclNpZGUoc3RhdGljX2Nhc3Q8Qm94U2lkZT4oaSkpOworCiAgICAg ICAgIGlmIChjdXJyRWRnZS5wcmVzZW50QnV0SW52aXNpYmxlKCkpIHsKICAgICAgICAgICAgIC0t bnVtRWRnZXNWaXNpYmxlOwogICAgICAgICAgICAgYWxsRWRnZXNTaGFyZUNvbG9yID0gZmFsc2U7 CkBAIC0xOTgyLDkgKzE5ODYsOSBAQCB2b2lkIFJlbmRlckJveE1vZGVsT2JqZWN0OjpwYWludEJv cmRlcihjCiAgICAgUm91bmRlZFJlY3QgdW5hZGp1c3RlZElubmVyQm9yZGVyID0gKGJsZWVkQXZv aWRhbmNlID09IEJhY2tncm91bmRCbGVlZEJhY2tncm91bmRPdmVyQm9yZGVyKSA/IHN0eWxlLT5n ZXRSb3VuZGVkSW5uZXJCb3JkZXJGb3IocmVjdCwgaW5jbHVkZUxvZ2ljYWxMZWZ0RWRnZSwgaW5j bHVkZUxvZ2ljYWxSaWdodEVkZ2UpIDogaW5uZXJCb3JkZXI7CiAgICAgSW50UG9pbnQgaW5uZXJC b3JkZXJBZGp1c3RtZW50KGlubmVyQm9yZGVyLnJlY3QoKS54KCkgLSB1bmFkanVzdGVkSW5uZXJC b3JkZXIucmVjdCgpLngoKSwgaW5uZXJCb3JkZXIucmVjdCgpLnkoKSAtIHVuYWRqdXN0ZWRJbm5l ckJvcmRlci5yZWN0KCkueSgpKTsKICAgICBpZiAoaGF2ZUFscGhhQ29sb3IpCi0gICAgICAgIHBh aW50VHJhbnNsdWNlbnRCb3JkZXJTaWRlcyhncmFwaGljc0NvbnRleHQsIHN0eWxlLCBvdXRlckJv cmRlciwgdW5hZGp1c3RlZElubmVyQm9yZGVyLCBpbm5lckJvcmRlckFkanVzdG1lbnQsIGVkZ2Vz LCBibGVlZEF2b2lkYW5jZSwgaW5jbHVkZUxvZ2ljYWxMZWZ0RWRnZSwgaW5jbHVkZUxvZ2ljYWxS aWdodEVkZ2UsIGFudGlhbGlhcyk7CisgICAgICAgIHBhaW50VHJhbnNsdWNlbnRCb3JkZXJTaWRl cyhncmFwaGljc0NvbnRleHQsIHN0eWxlLCBvdXRlckJvcmRlciwgdW5hZGp1c3RlZElubmVyQm9y ZGVyLCBpbm5lckJvcmRlckFkanVzdG1lbnQsIGVkZ2VzLCBlZGdlc1RvRHJhdywgYmxlZWRBdm9p ZGFuY2UsIGluY2x1ZGVMb2dpY2FsTGVmdEVkZ2UsIGluY2x1ZGVMb2dpY2FsUmlnaHRFZGdlLCBh bnRpYWxpYXMpOwogICAgIGVsc2UKLSAgICAgICAgcGFpbnRCb3JkZXJTaWRlcyhncmFwaGljc0Nv bnRleHQsIHN0eWxlLCBvdXRlckJvcmRlciwgdW5hZGp1c3RlZElubmVyQm9yZGVyLCBpbm5lckJv cmRlckFkanVzdG1lbnQsIGVkZ2VzLCBBbGxCb3JkZXJFZGdlcywgYmxlZWRBdm9pZGFuY2UsIGlu Y2x1ZGVMb2dpY2FsTGVmdEVkZ2UsIGluY2x1ZGVMb2dpY2FsUmlnaHRFZGdlLCBhbnRpYWxpYXMp OworICAgICAgICBwYWludEJvcmRlclNpZGVzKGdyYXBoaWNzQ29udGV4dCwgc3R5bGUsIG91dGVy Qm9yZGVyLCB1bmFkanVzdGVkSW5uZXJCb3JkZXIsIGlubmVyQm9yZGVyQWRqdXN0bWVudCwgZWRn ZXMsIGVkZ2VzVG9EcmF3LCBibGVlZEF2b2lkYW5jZSwgaW5jbHVkZUxvZ2ljYWxMZWZ0RWRnZSwg aW5jbHVkZUxvZ2ljYWxSaWdodEVkZ2UsIGFudGlhbGlhcyk7CiB9CiAKIHZvaWQgUmVuZGVyQm94 TW9kZWxPYmplY3Q6OmRyYXdCb3hTaWRlRnJvbVBhdGgoR3JhcGhpY3NDb250ZXh0KiBncmFwaGlj c0NvbnRleHQsIGNvbnN0IExheW91dFJlY3QmIGJvcmRlclJlY3QsIGNvbnN0IFBhdGgmIGJvcmRl clBhdGgsIGNvbnN0IEJvcmRlckVkZ2UgZWRnZXNbXSwKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5oCShyZXZpc2lvbiAxMzUxMzgpCisr KyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuaAkod29ya2lu ZyBjb3B5KQpAQCAtMjk4LDcgKzI5OCw3IEBAIHByaXZhdGU6CiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGNvbnN0IEludFJlY3QmIHNpZGVSZWN0LCBCb3hTaWRlLCBCb3hTaWRlIGFk amFjZW50U2lkZTEsIEJveFNpZGUgYWRqYWNlbnRTaWRlMiwgY29uc3QgY2xhc3MgQm9yZGVyRWRn ZVtdLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBQYXRoKiwgQmFja2dy b3VuZEJsZWVkQXZvaWRhbmNlLCBib29sIGluY2x1ZGVMb2dpY2FsTGVmdEVkZ2UsIGJvb2wgaW5j bHVkZUxvZ2ljYWxSaWdodEVkZ2UsIGJvb2wgYW50aWFsaWFzLCBjb25zdCBDb2xvciogb3ZlcnJp ZGVDb2xvciA9IDApOwogICAgIHZvaWQgcGFpbnRUcmFuc2x1Y2VudEJvcmRlclNpZGVzKEdyYXBo aWNzQ29udGV4dCosIGNvbnN0IFJlbmRlclN0eWxlKiwgY29uc3QgUm91bmRlZFJlY3QmIG91dGVy Qm9yZGVyLCBjb25zdCBSb3VuZGVkUmVjdCYgaW5uZXJCb3JkZXIsIGNvbnN0IEludFBvaW50JiBp bm5lckJvcmRlckFkanVzdG1lbnQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGNs YXNzIEJvcmRlckVkZ2VbXSwgQmFja2dyb3VuZEJsZWVkQXZvaWRhbmNlLCBib29sIGluY2x1ZGVM b2dpY2FsTGVmdEVkZ2UsIGJvb2wgaW5jbHVkZUxvZ2ljYWxSaWdodEVkZ2UsIGJvb2wgYW50aWFs aWFzID0gZmFsc2UpOworICAgICAgICBjb25zdCBjbGFzcyBCb3JkZXJFZGdlW10sIEJvcmRlckVk Z2VGbGFncywgQmFja2dyb3VuZEJsZWVkQXZvaWRhbmNlLCBib29sIGluY2x1ZGVMb2dpY2FsTGVm dEVkZ2UsIGJvb2wgaW5jbHVkZUxvZ2ljYWxSaWdodEVkZ2UsIGJvb2wgYW50aWFsaWFzID0gZmFs c2UpOwogICAgIHZvaWQgcGFpbnRCb3JkZXJTaWRlcyhHcmFwaGljc0NvbnRleHQqLCBjb25zdCBS ZW5kZXJTdHlsZSosIGNvbnN0IFJvdW5kZWRSZWN0JiBvdXRlckJvcmRlciwgY29uc3QgUm91bmRl ZFJlY3QmIGlubmVyQm9yZGVyLAogICAgICAgICBjb25zdCBJbnRQb2ludCYgaW5uZXJCb3JkZXJB ZGp1c3RtZW50LCBjb25zdCBjbGFzcyBCb3JkZXJFZGdlW10sIEJvcmRlckVkZ2VGbGFncywgQmFj a2dyb3VuZEJsZWVkQXZvaWRhbmNlLAogICAgICAgICBib29sIGluY2x1ZGVMb2dpY2FsTGVmdEVk Z2UsIGJvb2wgaW5jbHVkZUxvZ2ljYWxSaWdodEVkZ2UsIGJvb2wgYW50aWFsaWFzID0gZmFsc2Us IGNvbnN0IENvbG9yKiBvdmVycmlkZUNvbG9yID0gMCk7Cg==