79678 2012-02-27 09:30:51 -0800 SVG transform-origin presentation attribute 2012-03-06 07:05:55 -0800 1 1 1 Unclassified WebKit SVG 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 giles_joplin giles_joplin krit webkit.review.bot zimmermann oldest_to_newest 565734 0 giles_joplin 2012-02-27 09:30:51 -0800 Add support for an SVG transform-origin attribute with the same semantics as the -webkit-transform-origin CSS property. 567995 1 129531 giles_joplin 2012-02-29 15:20:00 -0800 Created attachment 129531 Patch 568722 2 129716 giles_joplin 2012-03-01 09:36:20 -0800 Created attachment 129716 Patch 568727 3 129716 krit 2012-03-01 09:47:38 -0800 Comment on attachment 129716 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=129716&action=review > Source/WebCore/svg/SVGStyledElement.cpp:65 > + if (!propertyId && attrName == transform_originAttr) > + propertyId = CSSPropertyWebkitTransformOrigin; // cssPropertyID("-webkit-transform-origin") We assert 'propertyId > 0' afterwards. Is it guaranteed that we get 0 back for -webkit-transform-origin? 568735 4 giles_joplin 2012-03-01 09:53:42 -0800 (In reply to comment #3) > (From update of attachment 129716 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=129716&action=review > > > Source/WebCore/svg/SVGStyledElement.cpp:65 > > + if (!propertyId && attrName == transform_originAttr) > > + propertyId = CSSPropertyWebkitTransformOrigin; // cssPropertyID("-webkit-transform-origin") > > We assert 'propertyId > 0' afterwards. Is it guaranteed that we get 0 back for -webkit-transform-origin? Yes, the cssPropertyId() function returns 0 if a match can't be found. 568861 5 129716 zimmermann 2012-03-01 13:28:01 -0800 Comment on attachment 129716 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=129716&action=review Sorry, I have to r- this patch. > Source/WebCore/svg/SVGStyledElement.cpp:64 > + if (!propertyId && attrName == transform_originAttr) Hm, seems high impact for this special case. Why not change the singe call-site that calls mapAttributetoCSSProperty with transform_originAttr?? Add a new mapWebKitTransformOriginAttrToCSSProperty(..) method. Also are you sure we want to add this unprefixed for SVG? Is there agreement that a transform-origin pres attr should exist? Where is it specified? 568863 6 zimmermann 2012-03-01 13:29:17 -0800 I'd like to hear some background info first - where is this specified? We add -webkit- prefixed CSS props, but unprefixed, unspecified SVG attrs? That's weird, please explain. 568967 7 krit 2012-03-01 15:17:51 -0800 (In reply to comment #6) > I'd like to hear some background info first - where is this specified? We add -webkit- prefixed CSS props, but unprefixed, unspecified SVG attrs? That's weird, please explain. That are absolutely reasonable concerns. At first this is part of CSS3 Transforms [1]. A merged specification for CSS 2D Transforms, CSS 3D Transforms and SVG Transforms (in SVG 1.1 and the single module). This specifies that all new CSS properties introduced with this specification will be available as presentation attributes in SVG. To your concerns about prefixed attributes. I can absolutely understand this. We discussed this internally as well: 1) "-webkit-" is not valid as an attribute name according to the XML syntax. So the only way would be to use webkit-transform-origin or webkitTransform-origin which doesn't look like an prefixed attribute but more as a proprietary attribute (which it is not). 2) There is no specification for prefixed attributes. This just does not happen :) 3) We had to take into account the time frame and the cost to change the attribute name when the property names get unprefixed. The current plan of the CSS WG is, that CSS3 Transform properties get unprefixed in May - independent of the state of the spec (what is kind of weird). Therefore we thought it is better to add the attribute name directly, even if the specification is not in CR. The current hack can get removed in 2 months and a prefix wouldn't be covered by any specification anyway. [1] http://dev.w3.org/csswg/css3-transforms/#svg-transform 568970 8 129716 krit 2012-03-01 15:18:28 -0800 Comment on attachment 129716 Patch Removing cq+ to give others time to comment. 569056 9 krit 2012-03-01 16:41:44 -0800 (In reply to comment #5) > (From update of attachment 129716 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=129716&action=review > > Sorry, I have to r- this patch. > > > Source/WebCore/svg/SVGStyledElement.cpp:64 > > + if (!propertyId && attrName == transform_originAttr) > > Hm, seems high impact for this special case. > Why not change the singe call-site that calls mapAttributetoCSSProperty with transform_originAttr?? > Add a new mapWebKitTransformOriginAttrToCSSProperty(..) method. > I'd like to mention that the map gets filled once during the whole runtime! The code will just stay as long as 'transform-origin' is prefixed (which won't be long). So adding new functions might be a bit heavy. What do you think? 571802 10 129716 zimmermann 2012-03-06 06:31:20 -0800 Comment on attachment 129716 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=129716&action=review >>> Source/WebCore/svg/SVGStyledElement.cpp:64 >>> + if (!propertyId && attrName == transform_originAttr) >> >> Hm, seems high impact for this special case. >> Why not change the singe call-site that calls mapAttributetoCSSProperty with transform_originAttr?? >> Add a new mapWebKitTransformOriginAttrToCSSProperty(..) method. >> >> Also are you sure we want to add this unprefixed for SVG? Is there agreement that a transform-origin pres attr should exist? Where is it specified? > > I'd like to mention that the map gets filled once during the whole runtime! The code will just stay as long as 'transform-origin' is prefixed (which won't be long). So adding new functions might be a bit heavy. What do you think? Good point, I think its fine as-is! 571818 11 129716 webkit.review.bot 2012-03-06 07:05:50 -0800 Comment on attachment 129716 Patch Clearing flags on attachment: 129716 Committed r109916: <http://trac.webkit.org/changeset/109916> 571819 12 webkit.review.bot 2012-03-06 07:05:55 -0800 All reviewed patches have been landed. Closing bug. 129531 2012-02-29 15:20:00 -0800 2012-03-01 09:36:16 -0800 Patch bug-79678-20120229151957.patch text/plain 6336 giles_joplin U3VidmVyc2lvbiBSZXZpc2lvbjogMTA5MjI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjNmMmU3NmM1OWNkMmU1 MTJkYTdkNmExMWJjNmJlODU3NmFhYTI1YS4uMjg2MGY4ZmUyYzMyNmQ3YjU2Mjk3ODUyNjc5M2Q2 MmJmZmI4M2I3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTAyLTI5ICBIYW5z IE11bGxlciAgPGhtdWxsZXJAYWRvYmUuY29tPgorCisgICAgICAgIFNWRyB0cmFuc2Zvcm0tb3Jp Z2luIHByZXNlbnRhdGlvbiBhdHRyaWJ1dGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTc5Njc4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgQWRkZWQgdGhlIFNWRyB0cmFuc2Zvcm0tb3JpZ2luIHByZXNlbnRh dGlvbiBhdHRyaWJ1dGUuICBDdXJyZW50bHkgV2ViQ29yZTo6bWFwQXR0cmlidXRlVG9DU1NQcm9w ZXJ0eSgpCisgICAgICAgIGp1c3QgbWFwcyBpdCB0byAtd2Via2l0LXRyYW5zZm9ybS1vcmlnaW4u ICBXaGVuIHRoZSB0cmFuc2Zvcm0tb3JpZ2luIENTUyBwcm9wZXJ0eSBpcyBzdXBwb3J0ZWQsIHRo aXMKKyAgICAgICAgcGFydCBvZiB0aGUgY2hhbmdlIGNhbiBiZSByZW1vdmVkLgorCisgICAgICAg IFRlc3Q6IHN2Zy90cmFuc2Zvcm1zL3RyYW5zZm9ybS1vcmlnaW4tcHJlc2VudGF0aW9uLWF0dHJp YnV0ZS54aHRtbAorCisgICAgICAgICogc3ZnL1NWR1N0eWxlZEVsZW1lbnQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6bWFwQXR0cmlidXRlVG9DU1NQcm9wZXJ0eSk6CisgICAgICAgIChXZWJDb3Jl OjpTVkdTdHlsZWRFbGVtZW50Ojpjc3NQcm9wZXJ0eUlkRm9yU1ZHQXR0cmlidXRlTmFtZSk6Cisg ICAgICAgICogc3ZnL3N2Z2F0dHJzLmluOgorCiAyMDEyLTAyLTI5ICBBbnR0aSBLb2l2aXN0byAg PGFudHRpQGFwcGxlLmNvbT4KIAogICAgICAgICBBcHBseWluZyByZWdpb24gc3R5bGUgc2hvdWxk IG5vdCBuZWVkIHRvIGFjY2VzcyBwYXJlbnQgcnVsZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3N2Zy9TVkdTdHlsZWRFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdTdHls ZWRFbGVtZW50LmNwcAppbmRleCBjYjU4YjY1ZDg2YmRlYTRiN2RmOWEzNWVmMjYyYTc2YjM1MjQz ZGIwLi41YjBiNWJhODQ0YjQwYmNjYjAxYjc5M2JiMzI1ZTZkNzZkZmVmYjVmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHU3R5bGVkRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvc3ZnL1NWR1N0eWxlZEVsZW1lbnQuY3BwCkBAIC01OSw3ICs1OSw4IEBAIHVzaW5nIG5h bWVzcGFjZSBTVkdOYW1lczsKIAogdm9pZCBtYXBBdHRyaWJ1dGVUb0NTU1Byb3BlcnR5KEhhc2hN YXA8QXRvbWljU3RyaW5nSW1wbCosIGludD4qIHByb3BlcnR5TmFtZVRvSWRNYXAsIGNvbnN0IFF1 YWxpZmllZE5hbWUmIGF0dHJOYW1lKQogewotICAgIGludCBwcm9wZXJ0eUlkID0gY3NzUHJvcGVy dHlJRChhdHRyTmFtZS5sb2NhbE5hbWUoKSk7CisgICAgLy8gRklYTUU6IHdoZW4gQ1NTIHN1cHBv cnRzICJ0cmFuc2Zvcm0tb3JpZ2luIiB0aGUgc3BlY2lhbCBjYXNlIGZvciB0cmFuc2Zvcm1fb3Jp Z2luQXR0ciBjYW4gYmUgcmVtb3ZlZC4KKyAgICBpbnQgcHJvcGVydHlJZCA9IChhdHRyTmFtZSA9 PSB0cmFuc2Zvcm1fb3JpZ2luQXR0cikgPyBjc3NQcm9wZXJ0eUlEKCItd2Via2l0LXRyYW5zZm9y bS1vcmlnaW4iKSA6IGNzc1Byb3BlcnR5SUQoYXR0ck5hbWUubG9jYWxOYW1lKCkpOwogICAgIEFT U0VSVChwcm9wZXJ0eUlkID4gMCk7CiAgICAgcHJvcGVydHlOYW1lVG9JZE1hcC0+c2V0KGF0dHJO YW1lLmxvY2FsTmFtZSgpLmltcGwoKSwgcHJvcGVydHlJZCk7CiB9CkBAIC0xODgsNiArMTg5LDcg QEAgaW50IFNWR1N0eWxlZEVsZW1lbnQ6OmNzc1Byb3BlcnR5SWRGb3JTVkdBdHRyaWJ1dGVOYW1l KGNvbnN0IFF1YWxpZmllZE5hbWUmIGF0dHIKICAgICAgICAgbWFwQXR0cmlidXRlVG9DU1NQcm9w ZXJ0eShwcm9wZXJ0eU5hbWVUb0lkTWFwLCB0ZXh0X2FuY2hvckF0dHIpOwogICAgICAgICBtYXBB dHRyaWJ1dGVUb0NTU1Byb3BlcnR5KHByb3BlcnR5TmFtZVRvSWRNYXAsIHRleHRfZGVjb3JhdGlv bkF0dHIpOwogICAgICAgICBtYXBBdHRyaWJ1dGVUb0NTU1Byb3BlcnR5KHByb3BlcnR5TmFtZVRv SWRNYXAsIHRleHRfcmVuZGVyaW5nQXR0cik7CisgICAgICAgIG1hcEF0dHJpYnV0ZVRvQ1NTUHJv cGVydHkocHJvcGVydHlOYW1lVG9JZE1hcCwgdHJhbnNmb3JtX29yaWdpbkF0dHIpOwogICAgICAg ICBtYXBBdHRyaWJ1dGVUb0NTU1Byb3BlcnR5KHByb3BlcnR5TmFtZVRvSWRNYXAsIHVuaWNvZGVf YmlkaUF0dHIpOwogICAgICAgICBtYXBBdHRyaWJ1dGVUb0NTU1Byb3BlcnR5KHByb3BlcnR5TmFt ZVRvSWRNYXAsIHZlY3Rvcl9lZmZlY3RBdHRyKTsKICAgICAgICAgbWFwQXR0cmlidXRlVG9DU1NQ cm9wZXJ0eShwcm9wZXJ0eU5hbWVUb0lkTWFwLCB2aXNpYmlsaXR5QXR0cik7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9zdmcvc3ZnYXR0cnMuaW4gYi9Tb3VyY2UvV2ViQ29yZS9zdmcvc3Zn YXR0cnMuaW4KaW5kZXggNjg4ZjI1MDM0MTgzZjY4ZTE2YTczNTZjNTU0ZTYyMmM4NWMxZGNmMC4u YzIyMGI2N2I4YzM1NDNjNmZlMThiODZiMDVmNjUyZTQ1Yjg2ZTNhNiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvc3ZnL3N2Z2F0dHJzLmluCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9zdmdh dHRycy5pbgpAQCAtMjA5LDYgKzIwOSw3IEBAIHRleHRMZW5ndGgKIHRpdGxlCiB0bwogdHJhbnNm b3JtCit0cmFuc2Zvcm0tb3JpZ2luCiB0eXBlCiB1MQogdTIKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA1M2ZmY2MzYmIxMmE1 M2FkN2I2NjgyZGY1MmNjYzBhNDViMTBkMmE5Li5jNDE2N2I1YzliMTM5NmYyYmY4YmQ4ZDhhYjVk MzY5ZDkyMDY0MzkyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTItMDItMjkgIEhhbnMgTXVs bGVyICA8aG11bGxlckBhZG9iZS5jb20+CisKKyAgICAgICAgU1ZHIHRyYW5zZm9ybS1vcmlnaW4g cHJlc2VudGF0aW9uIGF0dHJpYnV0ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9Nzk2NzgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUZXN0IGNhc2UganVzdCB2ZXJpZmllcyB0aGF0IHRoZSB0cmFuc2Zvcm0t b3JpZ2luIHByZXNlbnRhdGlvbiBhdHRyaWJ1dGUKKyAgICAgICAgY2hhbmdlcyBhbiBTVkcgZWxl bWVudCdzIGdldENvbXB1dGVkU3R5bGUoKSBhcyBleHBlY3RlZC4KKworICAgICAgICAqIHN2Zy90 cmFuc2Zvcm1zL3RyYW5zZm9ybS1vcmlnaW4tcHJlc2VudGF0aW9uLWF0dHJpYnV0ZS1leHBlY3Rl ZC50eHQ6IEFkZGVkLgorICAgICAgICAqIHN2Zy90cmFuc2Zvcm1zL3RyYW5zZm9ybS1vcmlnaW4t cHJlc2VudGF0aW9uLWF0dHJpYnV0ZS54aHRtbDogQWRkZWQuCisKIDIwMTItMDItMjkgIFBhcmFn IFJhZGtlICA8cGFyYWdAbW90b3JvbGEuY29tPgogCiAgICAgICAgIENyYXNoIGluIFdlYkNvcmU6 OkNvbXBvc2l0ZUVkaXRDb21tYW5kOjppbnNlcnROb2RlQXQKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL3N2Zy90cmFuc2Zvcm1zL3RyYW5zZm9ybS1vcmlnaW4tcHJlc2VudGF0aW9uLWF0dHJpYnV0 ZS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9zdmcvdHJhbnNmb3Jtcy90cmFuc2Zvcm0tb3Jp Z2luLXByZXNlbnRhdGlvbi1hdHRyaWJ1dGUtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAw NjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjY4MDE2 NTM0MTVhZGRhMWViMDY4NTk1MzdmZTc1ZTAzNGYwMzQ1OTYKLS0tIC9kZXYvbnVsbAorKysgYi9M YXlvdXRUZXN0cy9zdmcvdHJhbnNmb3Jtcy90cmFuc2Zvcm0tb3JpZ2luLXByZXNlbnRhdGlvbi1h dHRyaWJ1dGUtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsNyBAQAorVGVzdCBmb3IgYnVnIDc5Njc4 IC0gU1ZHIHRyYW5zZm9ybS1vcmlnaW4gcHJlc2VudGF0aW9uIGF0dHJpYnV0ZS4gVmVyaWZ5IHRo YXQgZ2V0Q29tcHV0ZWRTdHlsZSgpIHJlZmxlY3RzIGFuIFNWRyBlbGVtZW50J3MgdHJhbnNmb3Jt LW9yaWdpbi4KKworT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBt ZXNzYWdlcworCitQQVNTIHJlY3QxIHRyYW5zZm9ybU9yaWdpbiwgZXhwZWN0ZWQgIjUwcHggMTAw cHgiIGFjdHVhbCAiNTBweCAxMDBweCIKK1BBU1MgcmVjdDIgdHJhbnNmb3JtT3JpZ2luLCBleHBl Y3RlZCAiMHB4IDBweCIgYWN0dWFsICIwcHggMHB4IgorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9zdmcvdHJhbnNmb3Jtcy90cmFuc2Zvcm0tb3JpZ2luLXByZXNlbnRhdGlvbi1hdHRyaWJ1dGUu eGh0bWwgYi9MYXlvdXRUZXN0cy9zdmcvdHJhbnNmb3Jtcy90cmFuc2Zvcm0tb3JpZ2luLXByZXNl bnRhdGlvbi1hdHRyaWJ1dGUueGh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYWQ2ZmEwYzJjMzc2YTMyMzBmMjY4 Y2Y1ZTg4ODE4M2E0ZmFjZDk1MgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3N2Zy90 cmFuc2Zvcm1zL3RyYW5zZm9ybS1vcmlnaW4tcHJlc2VudGF0aW9uLWF0dHJpYnV0ZS54aHRtbApA QCAtMCwwICsxLDMwIEBACis8aHRtbCB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94aHRt bCI+CisgIDxib2R5PgorICAgIDxwPlRlc3QgZm9yIGJ1ZyA3OTY3OCAtIFNWRyB0cmFuc2Zvcm0t b3JpZ2luIHByZXNlbnRhdGlvbiBhdHRyaWJ1dGUuICBWZXJpZnkgdGhhdCBnZXRDb21wdXRlZFN0 eWxlKCkgcmVmbGVjdHMgYW4gU1ZHIGVsZW1lbnQncyB0cmFuc2Zvcm0tb3JpZ2luLjwvcD4KKyAg ICA8cD5PbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2Vz PC9wPgorICAgIDxwcmUgaWQ9ImNvbnNvbGUiPjwvcHJlPgorICAgIDxzdmcgeG1sbnM9Imh0dHA6 Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5 OS94bGluayI+CisgICAgICAgIDxyZWN0IGlkPSJyZWN0MSIgdHJhbnNmb3JtLW9yaWdpbj0iNTAg MTAwIiB3aWR0aD0iMTAwIiBoZWlnaHQ9IjEwMCIgLz4KKyAgICAgICAgPHJlY3QgaWQ9InJlY3Qy IiB3aWR0aD0iMTAwIiBoZWlnaHQ9IjEwMCIgZmlsbD0icmVkIiAvPgorICAgIDwvc3ZnPgorICAg IDxzY3JpcHQ+PCFbQ0RBVEFbCisgICAgICBpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVy KQorICAgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1RleHQoKTsKKworICAgICAg dmFyIHJlc3VsdFN0cmluZyA9ICIiOworCisgICAgICBmdW5jdGlvbiBjaGVja1RyYW5zZm9ybU9y aWdpbihlbHRJRCwgZXhwZWN0ZWRWYWx1ZSkgeworICAgICAgICAgIHZhciByZWN0ID0gZG9jdW1l bnQuZ2V0RWxlbWVudEJ5SWQoZWx0SUQpOworICAgICAgICAgIHZhciBjc3NWYWx1ZSA9IHdpbmRv dy5nZXRDb21wdXRlZFN0eWxlKHJlY3QsIG51bGwpLmdldFByb3BlcnR5Q1NTVmFsdWUoIi13ZWJr aXQtdHJhbnNmb3JtLW9yaWdpbiIpOworICAgICAgICAgIHZhciBhY3R1YWxWYWx1ZSA9ICAoY3Nz VmFsdWUpID8gY3NzVmFsdWUuY3NzVGV4dCA6ICI8bm8gdmFsdWU+IjsKKyAgICAgICAgICByZXN1 bHRTdHJpbmcgKz0gKGFjdHVhbFZhbHVlID09IGV4cGVjdGVkVmFsdWUpID8gIlBBU1MgIiA6ICJG QUlMICI7CisgICAgICAgICAgcmVzdWx0U3RyaW5nICs9IGVsdElEICsgIiB0cmFuc2Zvcm1Pcmln aW4sIGV4cGVjdGVkIFwiIiArIGV4cGVjdGVkVmFsdWUgKyAiXCIgYWN0dWFsIFwiIiArIGFjdHVh bFZhbHVlICsgIlwiXG4iOworICAgICAgfQorCisgICAgICBjaGVja1RyYW5zZm9ybU9yaWdpbigi cmVjdDEiLCAiNTBweCAxMDBweCIpOworICAgICAgY2hlY2tUcmFuc2Zvcm1PcmlnaW4oInJlY3Qy IiwgIjBweCAwcHgiKTsKKworICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImNvbnNvbGUi KS5pbm5lckhUTUwgPSByZXN1bHRTdHJpbmc7CisgICAgXV0+PC9zY3JpcHQ+CisgIDwvYm9keT4K KzwvaHRtbD4K 129716 2012-03-01 09:36:20 -0800 2012-03-06 07:05:50 -0800 Patch bug-79678-20120301093622.patch text/plain 6356 giles_joplin U3VidmVyc2lvbiBSZXZpc2lvbjogMTA5MjI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjNmMmU3NmM1OWNkMmU1 MTJkYTdkNmExMWJjNmJlODU3NmFhYTI1YS4uMjg2MGY4ZmUyYzMyNmQ3YjU2Mjk3ODUyNjc5M2Q2 MmJmZmI4M2I3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTAyLTI5ICBIYW5z IE11bGxlciAgPGhtdWxsZXJAYWRvYmUuY29tPgorCisgICAgICAgIFNWRyB0cmFuc2Zvcm0tb3Jp Z2luIHByZXNlbnRhdGlvbiBhdHRyaWJ1dGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTc5Njc4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgQWRkZWQgdGhlIFNWRyB0cmFuc2Zvcm0tb3JpZ2luIHByZXNlbnRh dGlvbiBhdHRyaWJ1dGUuICBDdXJyZW50bHkgV2ViQ29yZTo6bWFwQXR0cmlidXRlVG9DU1NQcm9w ZXJ0eSgpCisgICAgICAgIGp1c3QgbWFwcyBpdCB0byAtd2Via2l0LXRyYW5zZm9ybS1vcmlnaW4u ICBXaGVuIHRoZSB0cmFuc2Zvcm0tb3JpZ2luIENTUyBwcm9wZXJ0eSBpcyBzdXBwb3J0ZWQsIHRo aXMKKyAgICAgICAgcGFydCBvZiB0aGUgY2hhbmdlIGNhbiBiZSByZW1vdmVkLgorCisgICAgICAg IFRlc3Q6IHN2Zy90cmFuc2Zvcm1zL3RyYW5zZm9ybS1vcmlnaW4tcHJlc2VudGF0aW9uLWF0dHJp YnV0ZS54aHRtbAorCisgICAgICAgICogc3ZnL1NWR1N0eWxlZEVsZW1lbnQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6bWFwQXR0cmlidXRlVG9DU1NQcm9wZXJ0eSk6CisgICAgICAgIChXZWJDb3Jl OjpTVkdTdHlsZWRFbGVtZW50Ojpjc3NQcm9wZXJ0eUlkRm9yU1ZHQXR0cmlidXRlTmFtZSk6Cisg ICAgICAgICogc3ZnL3N2Z2F0dHJzLmluOgorCiAyMDEyLTAyLTI5ICBBbnR0aSBLb2l2aXN0byAg PGFudHRpQGFwcGxlLmNvbT4KIAogICAgICAgICBBcHBseWluZyByZWdpb24gc3R5bGUgc2hvdWxk IG5vdCBuZWVkIHRvIGFjY2VzcyBwYXJlbnQgcnVsZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3N2Zy9TVkdTdHlsZWRFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdTdHls ZWRFbGVtZW50LmNwcAppbmRleCBjYjU4YjY1ZDg2YmRlYTRiN2RmOWEzNWVmMjYyYTc2YjM1MjQz ZGIwLi43NTQyODJmNWVkZTM0YTZiODA2YmU3NmJjM2U1ZjQ0NzQ5ODJmODgyIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHU3R5bGVkRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvc3ZnL1NWR1N0eWxlZEVsZW1lbnQuY3BwCkBAIC01OSw3ICs1OSwxMCBAQCB1c2luZyBu YW1lc3BhY2UgU1ZHTmFtZXM7CiAKIHZvaWQgbWFwQXR0cmlidXRlVG9DU1NQcm9wZXJ0eShIYXNo TWFwPEF0b21pY1N0cmluZ0ltcGwqLCBpbnQ+KiBwcm9wZXJ0eU5hbWVUb0lkTWFwLCBjb25zdCBR dWFsaWZpZWROYW1lJiBhdHRyTmFtZSkKIHsKKyAgICAvLyBGSVhNRTogd2hlbiBDU1Mgc3VwcG9y dHMgInRyYW5zZm9ybS1vcmlnaW4iIHRoZSBzcGVjaWFsIGNhc2UgZm9yIHRyYW5zZm9ybV9vcmln aW5BdHRyIGNhbiBiZSByZW1vdmVkLgogICAgIGludCBwcm9wZXJ0eUlkID0gY3NzUHJvcGVydHlJ RChhdHRyTmFtZS5sb2NhbE5hbWUoKSk7CisgICAgaWYgKCFwcm9wZXJ0eUlkICYmIGF0dHJOYW1l ID09IHRyYW5zZm9ybV9vcmlnaW5BdHRyKQorICAgICAgICBwcm9wZXJ0eUlkID0gQ1NTUHJvcGVy dHlXZWJraXRUcmFuc2Zvcm1PcmlnaW47IC8vIGNzc1Byb3BlcnR5SUQoIi13ZWJraXQtdHJhbnNm b3JtLW9yaWdpbiIpCiAgICAgQVNTRVJUKHByb3BlcnR5SWQgPiAwKTsKICAgICBwcm9wZXJ0eU5h bWVUb0lkTWFwLT5zZXQoYXR0ck5hbWUubG9jYWxOYW1lKCkuaW1wbCgpLCBwcm9wZXJ0eUlkKTsK IH0KQEAgLTE4OCw2ICsxOTEsNyBAQCBpbnQgU1ZHU3R5bGVkRWxlbWVudDo6Y3NzUHJvcGVydHlJ ZEZvclNWR0F0dHJpYnV0ZU5hbWUoY29uc3QgUXVhbGlmaWVkTmFtZSYgYXR0cgogICAgICAgICBt YXBBdHRyaWJ1dGVUb0NTU1Byb3BlcnR5KHByb3BlcnR5TmFtZVRvSWRNYXAsIHRleHRfYW5jaG9y QXR0cik7CiAgICAgICAgIG1hcEF0dHJpYnV0ZVRvQ1NTUHJvcGVydHkocHJvcGVydHlOYW1lVG9J ZE1hcCwgdGV4dF9kZWNvcmF0aW9uQXR0cik7CiAgICAgICAgIG1hcEF0dHJpYnV0ZVRvQ1NTUHJv cGVydHkocHJvcGVydHlOYW1lVG9JZE1hcCwgdGV4dF9yZW5kZXJpbmdBdHRyKTsKKyAgICAgICAg bWFwQXR0cmlidXRlVG9DU1NQcm9wZXJ0eShwcm9wZXJ0eU5hbWVUb0lkTWFwLCB0cmFuc2Zvcm1f b3JpZ2luQXR0cik7CiAgICAgICAgIG1hcEF0dHJpYnV0ZVRvQ1NTUHJvcGVydHkocHJvcGVydHlO YW1lVG9JZE1hcCwgdW5pY29kZV9iaWRpQXR0cik7CiAgICAgICAgIG1hcEF0dHJpYnV0ZVRvQ1NT UHJvcGVydHkocHJvcGVydHlOYW1lVG9JZE1hcCwgdmVjdG9yX2VmZmVjdEF0dHIpOwogICAgICAg ICBtYXBBdHRyaWJ1dGVUb0NTU1Byb3BlcnR5KHByb3BlcnR5TmFtZVRvSWRNYXAsIHZpc2liaWxp dHlBdHRyKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N2Zy9zdmdhdHRycy5pbiBiL1Nv dXJjZS9XZWJDb3JlL3N2Zy9zdmdhdHRycy5pbgppbmRleCA2ODhmMjUwMzQxODNmNjhlMTZhNzM1 NmM1NTRlNjIyYzg1YzFkY2YwLi5jMjIwYjY3YjhjMzU0M2M2ZmUxOGI4NmIwNWY2NTJlNDViODZl M2E2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdmcvc3ZnYXR0cnMuaW4KKysrIGIvU291 cmNlL1dlYkNvcmUvc3ZnL3N2Z2F0dHJzLmluCkBAIC0yMDksNiArMjA5LDcgQEAgdGV4dExlbmd0 aAogdGl0bGUKIHRvCiB0cmFuc2Zvcm0KK3RyYW5zZm9ybS1vcmlnaW4KIHR5cGUKIHUxCiB1Mgpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CmluZGV4IDUzZmZjYzNiYjEyYTUzYWQ3YjY2ODJkZjUyY2NjMGE0NWIxMGQyYTkuLmM0MTY3YjVj OWIxMzk2ZjJiZjhiZDhkOGFiNWQzNjlkOTIwNjQzOTIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAor MjAxMi0wMi0yOSAgSGFucyBNdWxsZXIgIDxobXVsbGVyQGFkb2JlLmNvbT4KKworICAgICAgICBT VkcgdHJhbnNmb3JtLW9yaWdpbiBwcmVzZW50YXRpb24gYXR0cmlidXRlCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03OTY3OAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3QgY2FzZSBqdXN0IHZlcmlmaWVz IHRoYXQgdGhlIHRyYW5zZm9ybS1vcmlnaW4gcHJlc2VudGF0aW9uIGF0dHJpYnV0ZQorICAgICAg ICBjaGFuZ2VzIGFuIFNWRyBlbGVtZW50J3MgZ2V0Q29tcHV0ZWRTdHlsZSgpIGFzIGV4cGVjdGVk LgorCisgICAgICAgICogc3ZnL3RyYW5zZm9ybXMvdHJhbnNmb3JtLW9yaWdpbi1wcmVzZW50YXRp b24tYXR0cmlidXRlLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogc3ZnL3RyYW5zZm9y bXMvdHJhbnNmb3JtLW9yaWdpbi1wcmVzZW50YXRpb24tYXR0cmlidXRlLnhodG1sOiBBZGRlZC4K KwogMjAxMi0wMi0yOSAgUGFyYWcgUmFka2UgIDxwYXJhZ0Btb3Rvcm9sYS5jb20+CiAKICAgICAg ICAgQ3Jhc2ggaW4gV2ViQ29yZTo6Q29tcG9zaXRlRWRpdENvbW1hbmQ6Omluc2VydE5vZGVBdApk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvc3ZnL3RyYW5zZm9ybXMvdHJhbnNmb3JtLW9yaWdpbi1w cmVzZW50YXRpb24tYXR0cmlidXRlLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL3N2Zy90cmFu c2Zvcm1zL3RyYW5zZm9ybS1vcmlnaW4tcHJlc2VudGF0aW9uLWF0dHJpYnV0ZS1leHBlY3RlZC50 eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMC4uNjgwMTY1MzQxNWFkZGExZWIwNjg1OTUzN2ZlNzVlMDM0ZjAzNDU5Ngot LS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3N2Zy90cmFuc2Zvcm1zL3RyYW5zZm9ybS1v cmlnaW4tcHJlc2VudGF0aW9uLWF0dHJpYnV0ZS1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw3IEBA CitUZXN0IGZvciBidWcgNzk2NzggLSBTVkcgdHJhbnNmb3JtLW9yaWdpbiBwcmVzZW50YXRpb24g YXR0cmlidXRlLiBWZXJpZnkgdGhhdCBnZXRDb21wdXRlZFN0eWxlKCkgcmVmbGVjdHMgYW4gU1ZH IGVsZW1lbnQncyB0cmFuc2Zvcm0tb3JpZ2luLgorCitPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUg YSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzCisKK1BBU1MgcmVjdDEgdHJhbnNmb3JtT3JpZ2lu LCBleHBlY3RlZCAiNTBweCAxMDBweCIgYWN0dWFsICI1MHB4IDEwMHB4IgorUEFTUyByZWN0MiB0 cmFuc2Zvcm1PcmlnaW4sIGV4cGVjdGVkICIwcHggMHB4IiBhY3R1YWwgIjBweCAwcHgiCisKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL3N2Zy90cmFuc2Zvcm1zL3RyYW5zZm9ybS1vcmlnaW4tcHJl c2VudGF0aW9uLWF0dHJpYnV0ZS54aHRtbCBiL0xheW91dFRlc3RzL3N2Zy90cmFuc2Zvcm1zL3Ry YW5zZm9ybS1vcmlnaW4tcHJlc2VudGF0aW9uLWF0dHJpYnV0ZS54aHRtbApuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5h ZDZmYTBjMmMzNzZhMzIzMGYyNjhjZjVlODg4MTgzYTRmYWNkOTUyCi0tLSAvZGV2L251bGwKKysr IGIvTGF5b3V0VGVzdHMvc3ZnL3RyYW5zZm9ybXMvdHJhbnNmb3JtLW9yaWdpbi1wcmVzZW50YXRp b24tYXR0cmlidXRlLnhodG1sCkBAIC0wLDAgKzEsMzAgQEAKKzxodG1sIHhtbG5zPSJodHRwOi8v d3d3LnczLm9yZy8xOTk5L3hodG1sIj4KKyAgPGJvZHk+CisgICAgPHA+VGVzdCBmb3IgYnVnIDc5 Njc4IC0gU1ZHIHRyYW5zZm9ybS1vcmlnaW4gcHJlc2VudGF0aW9uIGF0dHJpYnV0ZS4gIFZlcmlm eSB0aGF0IGdldENvbXB1dGVkU3R5bGUoKSByZWZsZWN0cyBhbiBTVkcgZWxlbWVudCdzIHRyYW5z Zm9ybS1vcmlnaW4uPC9wPgorICAgIDxwPk9uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNlcmll cyBvZiAiUEFTUyIgbWVzc2FnZXM8L3A+CisgICAgPHByZSBpZD0iY29uc29sZSI+PC9wcmU+Cisg ICAgPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJo dHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIj4KKyAgICAgICAgPHJlY3QgaWQ9InJlY3QxIiB0 cmFuc2Zvcm0tb3JpZ2luPSI1MCAxMDAiIHdpZHRoPSIxMDAiIGhlaWdodD0iMTAwIiAvPgorICAg ICAgICA8cmVjdCBpZD0icmVjdDIiIHdpZHRoPSIxMDAiIGhlaWdodD0iMTAwIiBmaWxsPSJyZWQi IC8+CisgICAgPC9zdmc+CisgICAgPHNjcmlwdD48IVtDREFUQVsKKyAgICAgIGlmICh3aW5kb3cu bGF5b3V0VGVzdENvbnRyb2xsZXIpCisgICAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVt cEFzVGV4dCgpOworCisgICAgICB2YXIgcmVzdWx0U3RyaW5nID0gIiI7CisKKyAgICAgIGZ1bmN0 aW9uIGNoZWNrVHJhbnNmb3JtT3JpZ2luKGVsdElELCBleHBlY3RlZFZhbHVlKSB7CisgICAgICAg ICAgdmFyIHJlY3QgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZChlbHRJRCk7CisgICAgICAgICAg dmFyIGNzc1ZhbHVlID0gd2luZG93LmdldENvbXB1dGVkU3R5bGUocmVjdCwgbnVsbCkuZ2V0UHJv cGVydHlDU1NWYWx1ZSgiLXdlYmtpdC10cmFuc2Zvcm0tb3JpZ2luIik7CisgICAgICAgICAgdmFy IGFjdHVhbFZhbHVlID0gIChjc3NWYWx1ZSkgPyBjc3NWYWx1ZS5jc3NUZXh0IDogIjxubyB2YWx1 ZT4iOworICAgICAgICAgIHJlc3VsdFN0cmluZyArPSAoYWN0dWFsVmFsdWUgPT0gZXhwZWN0ZWRW YWx1ZSkgPyAiUEFTUyAiIDogIkZBSUwgIjsKKyAgICAgICAgICByZXN1bHRTdHJpbmcgKz0gZWx0 SUQgKyAiIHRyYW5zZm9ybU9yaWdpbiwgZXhwZWN0ZWQgXCIiICsgZXhwZWN0ZWRWYWx1ZSArICJc IiBhY3R1YWwgXCIiICsgYWN0dWFsVmFsdWUgKyAiXCJcbiI7CisgICAgICB9CisKKyAgICAgIGNo ZWNrVHJhbnNmb3JtT3JpZ2luKCJyZWN0MSIsICI1MHB4IDEwMHB4Iik7CisgICAgICBjaGVja1Ry YW5zZm9ybU9yaWdpbigicmVjdDIiLCAiMHB4IDBweCIpOworCisgICAgICBkb2N1bWVudC5nZXRF bGVtZW50QnlJZCgiY29uc29sZSIpLmlubmVySFRNTCA9IHJlc3VsdFN0cmluZzsKKyAgICBdXT48 L3NjcmlwdD4KKyAgPC9ib2R5PgorPC9odG1sPgo=