3983 2005-07-13 10:28:53 -0700 outline:auto improperly puts outline around contained elements, not the actual div 2005-12-10 11:55:04 -0800 1 1 1 Unclassified WebKit CSS 420+ Mac OS X 10.4 RESOLVED FIXED P2 Normal --- 1 dwood hyatt ttalbot oldest_to_newest 14566 0 dwood 2005-07-13 10:28:53 -0700 Summary: When you set outline:auto on a div, it shows the "halo" outline around the elements *inside* the div, rather than the div itself To reproduce: see attached test case. Expected results: We should see a blue halo around the bottom-most rectangle, just like we see a solid blue halo around the div just above it. We should not see the outline around the contained text or image. Actual results: we see a halo around the text elements, and around the image (sometimes clipped), but not around the div itself. Regression: Nothing formal here, but I recall on older webkits (pre-10.4.2), I couldn't get the halo to show up at all if the div wasn't "focused". 14567 1 2945 dwood 2005-07-13 10:31:43 -0700 Created attachment 2945 HTML file showing problem with outline auto Note: I'm now noticing that I am not seeing the "halo" outline around the elements until you select the elements by dragging the mouse over them. 14825 2 dstorey 2005-07-18 12:09:36 -0700 I'm using 10.3.9. The outline shows as you state (it doesn't need to be in focus). However I'm not totally sure what correct behaviour is as no other browser I tested render it at all. outline: auto is a css 3 property so other browsers have not implemented it yet. Opera and IE Mac show outlines for the css 2 properties, but Gecko browsers do not show them at all. The css spec states "in CSS3, 'outline-style' accepts the value 'auto'. The 'auto' value permits the user agent to render a custom outline style, typically a style which is either a user interface default for the platform, or perhaps a style that is richer than can be described in detail in CSS, e.g. a rounded edge outline with semi-translucent outer pixels that appears to glow. As such, this specification does not define how the 'outline-color' is incorporated or used (if at all) when rendering 'auto' style outlines. User agents may treat 'auto' as 'solid'." It seems to not state what the correct rendering is, but I'd expect that it should render the same as other styles, just in an OS X look and feel, instead of a flat colour for example. So suspect it is a bug. I'll attach a further reduced test case with just a div that has outline-style: auto; applied to it. 14827 3 2995 dstorey 2005-07-18 12:11:59 -0700 Created attachment 2995 further reduced testcase 15047 4 oliver 2005-07-21 17:36:12 -0700 First testcase is good, second testcase doesn't match firefox/mac behaviour at all (ffx gives no outline). Confirmed in current ToT 25323 5 4894 kimmo.t.kinnunen 2005-12-01 07:56:03 -0800 Created attachment 4894 Patch that seems to fix the two testcases Here is a patch that draws the outlines in these two cases. How ever, since it's so simple and reduces "functionality", I'm not sure at all that it will fix the issue at hand fully and without side effects. However, somebody who wants to actually fix the bug (or is interested in the possible bounty) can perhaps make use of the information in this patch. 25420 6 hyatt 2005-12-02 17:23:09 -0800 The intent behind my implementation of focus ring outline was to encompass overflowed elements, producing irregular shapes that really fit around all content (even content that sticks out of the block). I think the real bug is in RenderFlow::addFocusRingRects, namely that the block's rect is never added to the set of rects as well. You just need to call the base class if you're a block I think. This completely bogus code: if (element() && element()->isContentEditable()) { if (element()->parentNode() && !element()->parentNode()->isContentEditable() && !element()- >hasTagName(bodyTag)) p->addFocusRingRect(_tx, _ty, width(), height()); return; } should be removed as well. I have no idea who put that there or why. It makes no sense. 25468 7 4922 Graham.Dennis 2005-12-03 18:21:01 -0800 Created attachment 4922 reduced testcase for non-rectangular outlines A further testcase to demonstrate the behaviour of an outline when it should be non-rectangular. Currently, both 'auto' and styled outlines are rectangular. 25469 8 4923 Graham.Dennis 2005-12-03 18:23:19 -0800 Created attachment 4923 patch This patch fixes addFocusRingRects to include the outermost rect in the focus ring. This has the effect of causing 'auto'-styled outlines to be non-rectangular, as in the previous testcase. However, styled outlines are still rectangular, and follow the outer-most element. 25471 9 4923 darin 2005-12-03 18:49:45 -0800 Comment on attachment 4923 patch Dave should review this. 25473 10 4923 hyatt 2005-12-03 22:36:07 -0800 Comment on attachment 4923 patch You definitely only want to add in the focus ring rects for block flows and not for inlines (RenderFlow is the base class of both). 25486 11 4931 Graham.Dennis 2005-12-04 03:23:05 -0800 Created attachment 4931 patch 2 Moved the addFocusRingRects function to RenderBlock. 25540 12 4931 hyatt 2005-12-04 22:23:52 -0800 Comment on attachment 4931 patch 2 I just meant that the new code only needed to be done for RenderBlocks. You want to still call through to the base class for the rest of the code (which should be in RenderFlow still and executed by both inlines and blocks). 25545 13 4954 Graham.Dennis 2005-12-05 00:09:04 -0800 Created attachment 4954 patch 3 Oops. I misunderstood. I added an if (isRenderBlock()) to patch 1. 25546 14 4954 Graham.Dennis 2005-12-05 00:11:23 -0800 Comment on attachment 4954 patch 3 I tried entering 'hyatt' as the requestee, but bugzilla just tells me that 'hyatt' doesn't match anything... 25571 15 4954 darin 2005-12-05 06:31:39 -0800 Comment on attachment 4954 patch 3 Need to enter "hyatt@apple.com" as the requestee. 25679 16 4954 hyatt 2005-12-07 15:05:28 -0800 Comment on attachment 4954 patch 3 r=me 25680 17 hyatt 2005-12-07 15:08:39 -0800 We should probably add some code to prevent the outlines from being drawn on focus for the body element. This could be done in html4.css. Instead of *:focus { outline ... } I think: :not(html):not(body):focus { outline ... } would work. 25774 18 darin 2005-12-10 11:17:49 -0800 Dave, html4.css already has this: :focus { outline: auto 3px #1f5ccf } html:focus, body:focus { outline: none } 2945 2005-07-13 10:31:43 -0700 2005-07-13 10:31:43 -0700 HTML file showing problem with outline auto default.html text/html 1071 dwood PGh0bWw+PGJvZHk+Cgo8ZGl2IGNvbnRlbnRFZGl0YWJsZT0idHJ1ZSIgaWQ9ImZpcnN0IiBzdHls ZT0iaGVpZ2h0OjEwMHB4OyB3aWR0aDo5MCU7IG1hcmdpbjoyMHB4OyBib3JkZXI6MXB4IGRvdHRl ZCBvcmFuZ2U7Ij4KClRoaXMgaXMgdGhlIGZpcnN0IGRpdiB0aGF0J3MgZWRpdGFibGUKCjwvZGl2 PgoKPGRpdiBzdHlsZT0iaGVpZ2h0OjUwcHg7IHdpZHRoOjkwJTsgbWFyZ2luOjIwcHg7IGJvcmRl cjoxcHggZG90dGVkIGJsdWU7IGJhY2tncm91bmQ6I0RFRjsiIGNvbnRlbnRFZGl0YWJsZT0iZmFs c2UiPlRoaXMgaXMgbm90IGVkaXRhYmxlPC9kaXY+Cgo8ZGl2IGNvbnRlbnRFZGl0YWJsZT0idHJ1 ZSIgaWQ9ImZpcnN0IiBzdHlsZT0iaGVpZ2h0OjEwMHB4OyB3aWR0aDo5MCU7IG1hcmdpbjoyMHB4 OyBib3JkZXI6MXB4IGRvdHRlZCBibHVlOyI+CgpUaGlzIGlzIHRoZSBzZWNvbmQgZGl2IHRoYXQn cyBlZGl0YWJsZQoKPC9kaXY+Cgo8ZGl2IHN0eWxlPSJvdXRsaW5lOnNvbGlkIDNweCAjMWY1Y2Nm OyBoZWlnaHQ6MjAwcHg7IHdpZHRoOjkwJTsgbWFyZ2luOjIwcHg7IGJvcmRlcjoxcHggZG90dGVk IGJsdWU7IGJhY2tncm91bmQ6I0RFRjsiIGNvbnRlbnRFZGl0YWJsZT0iZmFsc2UiPlRoaXMgaXMg bm90IGVkaXRhYmxlLCBhbmQgaXQgc2hvdWxkIGhhdmUgYSBibHVlIHNvbGlkIG91dGxpbmUKPHA+ SGkgdGhlcmUuPC9wPgo8aW1nIHNyYz0iaHR0cDovL3d3dy5rYXJlbGlhLmNvbS9pbWFnZXMvYXBw aWNvbl8xMjguanBnIiAvPgo8L2Rpdj4KCjxkaXYgc3R5bGU9Im91dGxpbmU6YXV0byAzcHggIzFm NWNjZjsgaGVpZ2h0OjIwMHB4OyB3aWR0aDo5MCU7IG1hcmdpbjoyMHB4OyBib3JkZXI6MXB4IGRv dHRlZCBibHVlOyBiYWNrZ3JvdW5kOiNERUY7IiBjb250ZW50RWRpdGFibGU9ImZhbHNlIj5UaGlz IGlzIG5vdCBlZGl0YWJsZSwgYW5kIGl0IHNob3VsZCBoYXZlIGEgYmx1ZSAiaGFsbyIgb3V0bGlu ZQo8cD5IaSB0aGVyZS48L3A+CjxpbWcgc3JjPSJodHRwOi8vd3d3LmthcmVsaWEuY29tL2ltYWdl cy9hcHBpY29uXzEyOC5qcGciIC8+CjwvZGl2PgoKPC9ib2R5PjwvaHRtbD4K 2995 2005-07-18 12:11:59 -0700 2005-07-18 12:12:48 -0700 further reduced testcase outline-auto.html text/html 202 dstorey 77u/PGh0bWw+Cgk8Ym9keT4KCQk8ZGl2IHN0eWxlPSJvdXRsaW5lLXN0eWxlOiBhdXRvOyBiYWNr Z3JvdW5kLWNvbG9yOiBsaWdodGJsdWUiPgoJCQk8cD5UaGVyZSBzaG91bGQgYmUgb25lIG91dGxp bmUgYXJvdW5kIHRoZSB3aG9sZSBkaXY8L3A+CgkJCTxwPk5vdCBhcm91bmQgZWFjaCBlbGVtZW50 PC9wPgoJCTwvZGl2PgoJPC9ib2R5Pgo8L2h0bWw+Cg== 4894 2005-12-01 07:56:03 -0800 2005-12-01 07:56:03 -0800 Patch that seems to fix the two testcases outline-fix.diff text/plain 885 kimmo.t.kinnunen SW5kZXg6IFdlYkNvcmUva2h0bWwvcmVuZGVyaW5nL3JlbmRlcl9vYmplY3QuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KUkNTIGZpbGU6IC9jdnMvcm9vdC9XZWJDb3JlL2todG1sL3JlbmRlcmluZy9yZW5kZXJfb2Jq ZWN0LmNwcCx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4yMjkKZGlmZiAtcCAtdSAtcjEuMjI5IFdl YkNvcmUva2h0bWwvcmVuZGVyaW5nL3JlbmRlcl9vYmplY3QuY3BwCi0tLSBXZWJDb3JlL2todG1s L3JlbmRlcmluZy9yZW5kZXJfb2JqZWN0LmNwcAkyOSBOb3YgMjAwNSAxMToyMDo0NiAtMDAwMAkx LjIyOQorKysgV2ViQ29yZS9raHRtbC9yZW5kZXJpbmcvcmVuZGVyX29iamVjdC5jcHAJMSBEZWMg MjAwNSAxNTo1MzoxMCAtMDAwMApAQCAtMTM1NSw3ICsxMzU1LDcgQEAgdm9pZCBSZW5kZXJPYmpl Y3Q6OnBhaW50T3V0bGluZShRUGFpbnRlcgogICAgICAgICAgICAgLy8gc3BlY2lmaWVkLiAgT3Ro ZXJ3aXNlIHdlIGxldCB0aGUgdGhlbWUgcGFpbnQgdGhlIGZvY3VzIHJpbmcsIHNpbmNlIHRoZSBy aW5nCiAgICAgICAgICAgICAvLyBtaWdodCBub3QgYmUgcmVjdGFuZ3VsYXIgKG9yIG1hdGNoIHRo ZSBkaW1lbnNpb25zIG9mIHRoZSBjb250cm9sIGV4YWN0bHkpLgogICAgICAgICAgICAgcC0+aW5p dEZvY3VzUmluZyhvdywgb2Zmc2V0LCBvYyk7Ci0gICAgICAgICAgICBhZGRGb2N1c1JpbmdSZWN0 cyhwLCBfdHgsIF90eSk7CisgICAgICAgICAgICBwLT5hZGRGb2N1c1JpbmdSZWN0KF90eCwgX3R5 LCB3LCBoKTsKICAgICAgICAgICAgIHAtPmRyYXdGb2N1c1JpbmcoKTsKICAgICAgICAgICAgIHAt PmNsZWFyRm9jdXNSaW5nKCk7CiAgICAgICAgIH0K 4922 2005-12-03 18:21:01 -0800 2005-12-03 18:21:01 -0800 reduced testcase for non-rectangular outlines outline-auto-offset.html text/html 454 Graham.Dennis PGh0bWw+Cgk8Ym9keT4KCQk8ZGl2IHN0eWxlPSJvdXRsaW5lOnNvbGlkIDNweCAjMWY1Y2NmOyBi YWNrZ3JvdW5kLWNvbG9yOiBsaWdodGJsdWU7IG1hcmdpbjogMjBweCI+CgkJCTxwPlRoZXJlIHNo b3VsZCBiZSBvbmUgb3V0bGluZSBhcm91bmQgdGhlIHdob2xlIGRpdjwvcD4KCQkJPHAgc3R5bGU9 Im1hcmdpbi1sZWZ0OiAtMjBweCI+Tm90IGFyb3VuZCBlYWNoIGVsZW1lbnQ8L3A+CgkJPC9kaXY+ CgkJPGRpdiBzdHlsZT0ib3V0bGluZS1zdHlsZTogYXV0bzsgYmFja2dyb3VuZC1jb2xvcjogbGln aHRibHVlOyBtYXJnaW46IDIwcHgiPgoJCQk8cD5UaGVyZSBzaG91bGQgYmUgb25lIG91dGxpbmUg YXJvdW5kIHRoZSB3aG9sZSBkaXY8L3A+CgkJCTxwIHN0eWxlPSJtYXJnaW4tbGVmdDogLTIwcHgi Pk5vdCBhcm91bmQgZWFjaCBlbGVtZW50PC9wPgoJCTwvZGl2PgoJPC9ib2R5Pgo8L2h0bWw+Cg== 4923 2005-12-03 18:23:19 -0800 2005-12-04 03:23:05 -0800 patch patch.diff text/plain 1045 Graham.Dennis SW5kZXg6IGtodG1sL3JlbmRlcmluZy9yZW5kZXJfZmxvdy5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmls ZTogL2N2cy9yb290L1dlYkNvcmUva2h0bWwvcmVuZGVyaW5nL3JlbmRlcl9mbG93LmNwcCx2CnJl dHJpZXZpbmcgcmV2aXNpb24gMS4xNzQKZGlmZiAtdSAtcjEuMTc0IHJlbmRlcl9mbG93LmNwcAot LS0ga2h0bWwvcmVuZGVyaW5nL3JlbmRlcl9mbG93LmNwcCAgICAgMjEgTm92IDIwMDUgMDE6MjA6 MjMgLTAwMDAgICAgICAxLjE3NAorKysga2h0bWwvcmVuZGVyaW5nL3JlbmRlcl9mbG93LmNwcCAg ICAgNCBEZWMgMjAwNSAwMjoyMzo0OSAtMDAwMApAQCAtNjU4LDEzICs2NTgsNyBAQAogCiB2b2lk IFJlbmRlckZsb3c6OmFkZEZvY3VzUmluZ1JlY3RzKFFQYWludGVyICpwLCBpbnQgX3R4LCBpbnQg X3R5KQogewotICAgIC8vIE9ubHkgcGFpbnQgZm9jdXMgcmluZyBhcm91bmQgb3V0ZXJtb3N0IGNv bnRlbnRlZGl0YWJsZSBlbGVtZW50LgotICAgIC8vIEJ1dCBza2lwIHRoZSBib2R5IGVsZW1lbnQg aWYgaXQgaXMgb3V0ZXJtb3N0LgotICAgIGlmIChlbGVtZW50KCkgJiYgZWxlbWVudCgpLT5pc0Nv bnRlbnRFZGl0YWJsZSgpKSB7Ci0gICAgICAgIGlmIChlbGVtZW50KCktPnBhcmVudE5vZGUoKSAm JiAhZWxlbWVudCgpLT5wYXJlbnROb2RlKCktPmlzQ29udGVudEVkaXRhYmxlKCkgJiYgIWVsZW1l bnQoKS0+aGFzVGFnTmFtZShib2R5VGFnKSkKLSAgICAgICAgICAgIHAtPmFkZEZvY3VzUmluZ1Jl Y3QoX3R4LCBfdHksIHdpZHRoKCksIGhlaWdodCgpKTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0K KyAgICBwLT5hZGRGb2N1c1JpbmdSZWN0KF90eCwgX3R5LCB3aWR0aCgpLCBoZWlnaHQoKSk7CiAK ICAgICBmb3IgKElubGluZVJ1bkJveCogY3VyciA9IGZpcnN0TGluZUJveCgpOyBjdXJyOyBjdXJy ID0gY3Vyci0+bmV4dExpbmVCb3goKSkgewogICAgICAgICBwLT5hZGRGb2N1c1JpbmdSZWN0KF90 eCArIGN1cnItPnhQb3MoKSwgCg== 4931 2005-12-04 03:23:05 -0800 2005-12-05 00:09:04 -0800 patch 2 patch2.diff text/plain 4716 Graham.Dennis SW5kZXg6IGtodG1sL3JlbmRlcmluZy9yZW5kZXJfYmxvY2suY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZp bGU6IC9jdnMvcm9vdC9XZWJDb3JlL2todG1sL3JlbmRlcmluZy9yZW5kZXJfYmxvY2suY3BwLHYK cmV0cmlldmluZyByZXZpc2lvbiAxLjIxOApkaWZmIC11IC1yMS4yMTggcmVuZGVyX2Jsb2NrLmNw cAotLS0ga2h0bWwvcmVuZGVyaW5nL3JlbmRlcl9ibG9jay5jcHAgICAgMiBEZWMgMjAwNSAwMzo0 ODowOCAtMDAwMCAgICAgICAxLjIxOAorKysga2h0bWwvcmVuZGVyaW5nL3JlbmRlcl9ibG9jay5j cHAgICAgNCBEZWMgMjAwNSAxMToyNToxMiAtMDAwMApAQCAtMTM5Nyw2ICsxMzk3LDI4IEBACiAg ICAgfQogfQogCit2b2lkIFJlbmRlckJsb2NrOjphZGRGb2N1c1JpbmdSZWN0cyhRUGFpbnRlciAq cCwgaW50IF90eCwgaW50IF90eSkKK3sKKyAgICBwLT5hZGRGb2N1c1JpbmdSZWN0KF90eCwgX3R5 LCB3aWR0aCgpLCBoZWlnaHQoKSk7CisKKyAgICBmb3IgKElubGluZVJ1bkJveCogY3VyciA9IGZp cnN0TGluZUJveCgpOyBjdXJyOyBjdXJyID0gY3Vyci0+bmV4dExpbmVCb3goKSkgeworICAgICAg ICBwLT5hZGRGb2N1c1JpbmdSZWN0KF90eCArIGN1cnItPnhQb3MoKSwgCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgX3R5ICsgY3Vyci0+eVBvcygpLCAKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICBjdXJyLT53aWR0aCgpLCAKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBjdXJy LT5oZWlnaHQoKSk7CisgICAgfQorICAgIAorICAgIGZvciAoUmVuZGVyT2JqZWN0KiBjdXJyID0g Zmlyc3RDaGlsZCgpOyBjdXJyOyBjdXJyID0gY3Vyci0+bmV4dFNpYmxpbmcoKSkgeworICAgICAg ICBpZiAoIWN1cnItPmlzVGV4dCgpKQorICAgICAgICAgICAgY3Vyci0+YWRkRm9jdXNSaW5nUmVj dHMocCwgX3R4ICsgY3Vyci0+eFBvcygpLCBfdHkgKyBjdXJyLT55UG9zKCkpOworICAgIH0KKyAg ICAKKyAgICBpZiAoY29udGludWF0aW9uKCkpCisgICAgICAgIGNvbnRpbnVhdGlvbigpLT5hZGRG b2N1c1JpbmdSZWN0cyhwLCAKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIF90eCAtIGNvbnRhaW5pbmdCbG9jaygpLT54UG9zKCkgKyBjb250aW51YXRpb24oKS0+eFBv cygpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgX3R5IC0gY29u dGFpbmluZ0Jsb2NrKCktPnlQb3MoKSArIGNvbnRpbnVhdGlvbigpLT55UG9zKCkpOworfQorCiB2 b2lkIFJlbmRlckJsb2NrOjpzZXRTZWxlY3Rpb25TdGF0ZShTZWxlY3Rpb25TdGF0ZSBzKQogewog ICAgIGlmIChtX3NlbGVjdGlvblN0YXRlID09IHMpCkluZGV4OiBraHRtbC9yZW5kZXJpbmcvcmVu ZGVyX2Jsb2NrLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2N2cy9yb290L1dlYkNvcmUva2h0bWwv cmVuZGVyaW5nL3JlbmRlcl9ibG9jay5oLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjczCmRpZmYg LXUgLXIxLjczIHJlbmRlcl9ibG9jay5oCi0tLSBraHRtbC9yZW5kZXJpbmcvcmVuZGVyX2Jsb2Nr LmggICAgICAyNyBOb3YgMjAwNSAyMjo1MjowOCAtMDAwMCAgICAgIDEuNzMKKysrIGtodG1sL3Jl bmRlcmluZy9yZW5kZXJfYmxvY2suaCAgICAgIDQgRGVjIDIwMDUgMTE6MjU6MTIgLTAwMDAKQEAg LTE0OSw3ICsxNDksOCBAQAogICAgIHZvaWQgcGFpbnRFbGxpcHNpc0JveGVzKFBhaW50SW5mbyYg aSwgaW50IF90eCwgaW50IF90eSk7CiAgICAgdm9pZCBwYWludFNlbGVjdGlvbihQYWludEluZm8m IGksIGludCBfdHgsIGludCBfdHkpOwogICAgIHZvaWQgcGFpbnRDYXJldChQYWludEluZm8mIGks IENhcmV0VHlwZSk7Ci0gICAgCisgICAgdmlydHVhbCB2b2lkIGFkZEZvY3VzUmluZ1JlY3RzKFFQ YWludGVyICpwYWludGVyLCBpbnQgX3R4LCBpbnQgX3R5KTsKKwogICAgIHZvaWQgaW5zZXJ0Rmxv YXRpbmdPYmplY3QoUmVuZGVyT2JqZWN0ICpvKTsKICAgICB2b2lkIHJlbW92ZUZsb2F0aW5nT2Jq ZWN0KFJlbmRlck9iamVjdCAqbyk7CiAKSW5kZXg6IGtodG1sL3JlbmRlcmluZy9yZW5kZXJfZmxv dy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2N2cy9yb290L1dlYkNvcmUva2h0bWwvcmVuZGVy aW5nL3JlbmRlcl9mbG93LmNwcCx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4xNzQKZGlmZiAtdSAt cjEuMTc0IHJlbmRlcl9mbG93LmNwcAotLS0ga2h0bWwvcmVuZGVyaW5nL3JlbmRlcl9mbG93LmNw cCAgICAgMjEgTm92IDIwMDUgMDE6MjA6MjMgLTAwMDAgICAgICAxLjE3NAorKysga2h0bWwvcmVu ZGVyaW5nL3JlbmRlcl9mbG93LmNwcCAgICAgNCBEZWMgMjAwNSAxMToyNToxMiAtMDAwMApAQCAt NjU2LDM0ICs2NTYsNiBAQAogICAgIHJldHVybiBRUmVjdChfeCwgX3ksIHdpZHRoLCBoZWlnaHQp OwogfQogCi12b2lkIFJlbmRlckZsb3c6OmFkZEZvY3VzUmluZ1JlY3RzKFFQYWludGVyICpwLCBp bnQgX3R4LCBpbnQgX3R5KQotewotICAgIC8vIE9ubHkgcGFpbnQgZm9jdXMgcmluZyBhcm91bmQg b3V0ZXJtb3N0IGNvbnRlbnRlZGl0YWJsZSBlbGVtZW50LgotICAgIC8vIEJ1dCBza2lwIHRoZSBi b2R5IGVsZW1lbnQgaWYgaXQgaXMgb3V0ZXJtb3N0LgotICAgIGlmIChlbGVtZW50KCkgJiYgZWxl bWVudCgpLT5pc0NvbnRlbnRFZGl0YWJsZSgpKSB7Ci0gICAgICAgIGlmIChlbGVtZW50KCktPnBh cmVudE5vZGUoKSAmJiAhZWxlbWVudCgpLT5wYXJlbnROb2RlKCktPmlzQ29udGVudEVkaXRhYmxl KCkgJiYgIWVsZW1lbnQoKS0+aGFzVGFnTmFtZShib2R5VGFnKSkKLSAgICAgICAgICAgIHAtPmFk ZEZvY3VzUmluZ1JlY3QoX3R4LCBfdHksIHdpZHRoKCksIGhlaWdodCgpKTsKLSAgICAgICAgcmV0 dXJuOwotICAgIH0KLQotICAgIGZvciAoSW5saW5lUnVuQm94KiBjdXJyID0gZmlyc3RMaW5lQm94 KCk7IGN1cnI7IGN1cnIgPSBjdXJyLT5uZXh0TGluZUJveCgpKSB7Ci0gICAgICAgIHAtPmFkZEZv Y3VzUmluZ1JlY3QoX3R4ICsgY3Vyci0+eFBvcygpLCAKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICBfdHkgKyBjdXJyLT55UG9zKCksIAotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGN1 cnItPndpZHRoKCksIAotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGN1cnItPmhlaWdodCgp KTsKLSAgICB9Ci0gICAgCi0gICAgZm9yIChSZW5kZXJPYmplY3QqIGN1cnIgPSBmaXJzdENoaWxk KCk7IGN1cnI7IGN1cnIgPSBjdXJyLT5uZXh0U2libGluZygpKSB7Ci0gICAgICAgIGlmICghY3Vy ci0+aXNUZXh0KCkpCi0gICAgICAgICAgICBjdXJyLT5hZGRGb2N1c1JpbmdSZWN0cyhwLCBfdHgg KyBjdXJyLT54UG9zKCksIF90eSArIGN1cnItPnlQb3MoKSk7Ci0gICAgfQotICAgIAotICAgIGlm IChjb250aW51YXRpb24oKSkKLSAgICAgICAgY29udGludWF0aW9uKCktPmFkZEZvY3VzUmluZ1Jl Y3RzKHAsIAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgX3R4IC0g Y29udGFpbmluZ0Jsb2NrKCktPnhQb3MoKSArIGNvbnRpbnVhdGlvbigpLT54UG9zKCksCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBfdHkgLSBjb250YWluaW5nQmxv Y2soKS0+eVBvcygpICsgY29udGludWF0aW9uKCktPnlQb3MoKSk7Ci19Ci0KIHZvaWQgUmVuZGVy Rmxvdzo6cGFpbnRGb2N1c1JpbmcoUVBhaW50ZXIgKnAsIGludCB0eCwgaW50IHR5KQogewogICAg IGludCBvdyA9IHN0eWxlKCktPm91dGxpbmVXaWR0aCgpOwpJbmRleDoga2h0bWwvcmVuZGVyaW5n L3JlbmRlcl9mbG93LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2N2cy9yb290L1dlYkNvcmUva2h0 bWwvcmVuZGVyaW5nL3JlbmRlcl9mbG93LmgsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuNjMKZGlm ZiAtdSAtcjEuNjMgcmVuZGVyX2Zsb3cuaAotLS0ga2h0bWwvcmVuZGVyaW5nL3JlbmRlcl9mbG93 LmggICAgICAgMjEgTm92IDIwMDUgMDE6MjA6MjQgLTAwMDAgICAgICAxLjYzCisrKyBraHRtbC9y ZW5kZXJpbmcvcmVuZGVyX2Zsb3cuaCAgICAgICA0IERlYyAyMDA1IDExOjI1OjEyIC0wMDAwCkBA IC04Myw3ICs4Myw2IEBACiAgICAgCiAgICAgdmlydHVhbCBRUmVjdCBjYXJldFJlY3QoaW50IG9m ZnNldCwgRUFmZmluaXR5IGFmZmluaXR5ID0gVVBTVFJFQU0sIGludCAqZXh0cmFXaWR0aFRvRW5k T2ZMaW5lID0gMCk7CiAKLSAgICB2aXJ0dWFsIHZvaWQgYWRkRm9jdXNSaW5nUmVjdHMoUVBhaW50 ZXIgKnBhaW50ZXIsIGludCBfdHgsIGludCBfdHkpOwogICAgIHZvaWQgcGFpbnRGb2N1c1Jpbmco UVBhaW50ZXIgKnAsIGludCB0eCwgaW50IHR5KTsKICAgICB2b2lkIHBhaW50T3V0bGluZUZvckxp bmUoUVBhaW50ZXIgKnAsIGludCB0eCwgaW50IHR5LCBjb25zdCBRUmVjdCAmcHJldkxpbmUsIGNv bnN0IFFSZWN0ICZ0aGlzTGluZSwgY29uc3QgUVJlY3QgJm5leHRMaW5lKTsKICAgICB2b2lkIHBh aW50T3V0bGluZXMoUVBhaW50ZXIgKnAsIGludCB0eCwgaW50IHR5KTsK 4954 2005-12-05 00:09:04 -0800 2005-12-07 15:05:28 -0800 patch 3 patch3.diff text/plain 1076 Graham.Dennis SW5kZXg6IGtodG1sL3JlbmRlcmluZy9yZW5kZXJfZmxvdy5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmls ZTogL2N2cy9yb290L1dlYkNvcmUva2h0bWwvcmVuZGVyaW5nL3JlbmRlcl9mbG93LmNwcCx2CnJl dHJpZXZpbmcgcmV2aXNpb24gMS4xNzQKZGlmZiAtdSAtcjEuMTc0IHJlbmRlcl9mbG93LmNwcAot LS0ga2h0bWwvcmVuZGVyaW5nL3JlbmRlcl9mbG93LmNwcCAgICAgMjEgTm92IDIwMDUgMDE6MjA6 MjMgLTAwMDAgICAgICAxLjE3NAorKysga2h0bWwvcmVuZGVyaW5nL3JlbmRlcl9mbG93LmNwcCAg ICAgNSBEZWMgMjAwNSAwODoxMzo1MiAtMDAwMApAQCAtNjU4LDEzICs2NTgsOCBAQAogCiB2b2lk IFJlbmRlckZsb3c6OmFkZEZvY3VzUmluZ1JlY3RzKFFQYWludGVyICpwLCBpbnQgX3R4LCBpbnQg X3R5KQogewotICAgIC8vIE9ubHkgcGFpbnQgZm9jdXMgcmluZyBhcm91bmQgb3V0ZXJtb3N0IGNv bnRlbnRlZGl0YWJsZSBlbGVtZW50LgotICAgIC8vIEJ1dCBza2lwIHRoZSBib2R5IGVsZW1lbnQg aWYgaXQgaXMgb3V0ZXJtb3N0LgotICAgIGlmIChlbGVtZW50KCkgJiYgZWxlbWVudCgpLT5pc0Nv bnRlbnRFZGl0YWJsZSgpKSB7Ci0gICAgICAgIGlmIChlbGVtZW50KCktPnBhcmVudE5vZGUoKSAm JiAhZWxlbWVudCgpLT5wYXJlbnROb2RlKCktPmlzQ29udGVudEVkaXRhYmxlKCkgJiYgIWVsZW1l bnQoKS0+aGFzVGFnTmFtZShib2R5VGFnKSkKLSAgICAgICAgICAgIHAtPmFkZEZvY3VzUmluZ1Jl Y3QoX3R4LCBfdHksIHdpZHRoKCksIGhlaWdodCgpKTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0K KyAgICAgICBpZihpc1JlbmRlckJsb2NrKCkpCisgICAgICAgcC0+YWRkRm9jdXNSaW5nUmVjdChf dHgsIF90eSwgd2lkdGgoKSwgaGVpZ2h0KCkpOwogCiAgICAgZm9yIChJbmxpbmVSdW5Cb3gqIGN1 cnIgPSBmaXJzdExpbmVCb3goKTsgY3VycjsgY3VyciA9IGN1cnItPm5leHRMaW5lQm94KCkpIHsK ICAgICAgICAgcC0+YWRkRm9jdXNSaW5nUmVjdChfdHggKyBjdXJyLT54UG9zKCksIAo=