119491 2013-08-05 11:59:51 -0700 [CSS Shapes] New positioning model: scripted shape-margin tests 2013-08-06 15:15:10 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 117898 1 bjonesbe giles_joplin commit-queue oldest_to_newest 914637 0 bjonesbe 2013-08-05 11:59:51 -0700 Update the shape-margin script tests to work with the new positioning model. They are the following tests: shape-outside-floats-diamond-margin-polygon.html shape-outside-floats-ellipse-margin-bottom.html (strictly speaking not a script test, but including it here anyways) shape-outside-floats-ellipse-margin-left.html shape-outside-floats-ellipse-margin-right.html 914877 1 208193 giles_joplin 2013-08-06 08:40:21 -0700 Created attachment 208193 Patch Update some of the shape-margin tests to work with the new positioning model. Floats that specify shape-outside are now positioned according to their margin box, not the bounding box of the shape-outside shape. The tests have been revised to reflect the change. 914912 2 208193 achicu 2013-08-06 11:23:11 -0700 Comment on attachment 208193 Patch r=me 914941 3 208217 giles_joplin 2013-08-06 13:57:23 -0700 Created attachment 208217 Patch 914966 4 208217 commit-queue 2013-08-06 15:15:08 -0700 Comment on attachment 208217 Patch Clearing flags on attachment: 208217 Committed r153769: <http://trac.webkit.org/changeset/153769> 914967 5 commit-queue 2013-08-06 15:15:10 -0700 All reviewed patches have been landed. Closing bug. 208193 2013-08-06 08:40:21 -0700 2013-08-06 13:57:23 -0700 Patch tmp.patch text/plain 7439 giles_joplin ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBiOGJjOWZkLi5jMWMwM2NjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTMtMDgt MDUgIEhhbnMgTXVsbGVyICA8aG11bGxlckBhZG9iZS5jb20+CisKKyAgICAgICAgW0NTUyBTaGFw ZXNdIE5ldyBwb3NpdGlvbmluZyBtb2RlbDogc2NyaXB0ZWQgc2hhcGUtbWFyZ2luIHRlc3RzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTk0OTEKKwor ICAgICAgICBVcGRhdGUgc29tZSBvZiB0aGUgc2hhcGUtbWFyZ2luIHRlc3RzIHRvIHdvcmsgd2l0 aCB0aGUgbmV3IHBvc2l0aW9uaW5nIG1vZGVsLiBGbG9hdHMKKyAgICAgICAgdGhhdCBzcGVjaWZ5 IHNoYXBlLW91dHNpZGUgYXJlIG5vdyBwb3NpdGlvbmVkIGFjY29yZGluZyB0byB0aGVpciBtYXJn aW4gYm94LCBub3QgdGhlCisgICAgICAgIGJvdW5kaW5nIGJveCBvZiB0aGUgc2hhcGUtb3V0c2lk ZSBzaGFwZS4gVGhlIHRlc3RzIGhhdmUgYmVlbiByZXZpc2VkIHRvIHJlZmxlY3QgdGhlCisgICAg ICAgIGNoYW5nZS4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6CisgICAgICAgICogZmFzdC9zaGFwZXMvc2hhcGUtb3V0 c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1mbG9hdHMtZGlhbW9uZC1tYXJnaW4tcG9seWdvbi5o dG1sOgorICAgICAgICAqIGZhc3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91 dHNpZGUtZmxvYXRzLWVsbGlwc2UtbWFyZ2luLWJvdHRvbS5odG1sOgorICAgICAgICAqIGZhc3Qv c2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtZmxvYXRzLWVsbGlwc2Ut bWFyZ2luLWxlZnQuaHRtbDoKKyAgICAgICAgKiBmYXN0L3NoYXBlcy9zaGFwZS1vdXRzaWRlLWZs b2F0cy9zaGFwZS1vdXRzaWRlLWZsb2F0cy1lbGxpcHNlLW1hcmdpbi1yaWdodC5odG1sOgorCiAy MDEzLTA4LTA1ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgogCiAgICAgICAg IDxyZGFyOi8vcHJvYmxlbS8xMzEyODk5MD4gY2h1bmtlZC1wcm9ncmVzcy1ldmVudC1leHBlY3Rl ZExlbmd0aC5odG1sIGlzIGZsYWt5IG9uIE1hYwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVz dEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggN2NkN2I5 NC4uMGI2ZGY4YSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysg Yi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC0zNCwxMCArMzQsNiBAQCB3ZWJraXQu b3JnL2IvMTE5MzI1IGRvbS94aHRtbC9sZXZlbDMvY29yZS9ub2RlY29tcGFyZWRvY3VtZW50cG9z aXRpb24zOC54aHRtbCBbCiAjIFRoZSBDU1MgU2hhcGVzIHNwZWMgaGFzIGNoYW5nZWQgdGhlIHBv c2l0aW9uaW5nIG1vZGVsIGZvciBmbG9hdHMgd2l0aCBzaGFwZS1vdXRzaWRlLgogIyBUaHVzIGFs bCBvZiB0aGUgdGVzdHMgbmVlZCB0byBiZSByZXdpdHRlbiB0byB3b3JrIGFzIHRoZSBpbXBsZW1l bnRhdGlvbiBvZgogIyB0aGUgbmV3IG1vZGVsIGlzIGNvbXBsZXRlZC4KLXdlYmtpdC5vcmcvYi8x MTgwODggZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1mbG9h dHMtZGlhbW9uZC1tYXJnaW4tcG9seWdvbi5odG1sIFsgU2tpcCBdCi13ZWJraXQub3JnL2IvMTE4 MDg4IGZhc3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtZmxvYXRz LWVsbGlwc2UtbWFyZ2luLWJvdHRvbS5odG1sIFsgU2tpcCBdCi13ZWJraXQub3JnL2IvMTE4MDg4 IGZhc3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtZmxvYXRzLWVs bGlwc2UtbWFyZ2luLWxlZnQuaHRtbCBbIFNraXAgXQotd2Via2l0Lm9yZy9iLzExODA4OCBmYXN0 L3NoYXBlcy9zaGFwZS1vdXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRlLWZsb2F0cy1lbGxpcHNl LW1hcmdpbi1yaWdodC5odG1sIFsgU2tpcCBdCiB3ZWJraXQub3JnL2IvMTE4MDg4IGZhc3Qvc2hh cGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtZmxvYXRzLWxlZnQtbWFyZ2lu LXBvbHlnb24uaHRtbCBbIFNraXAgXQogd2Via2l0Lm9yZy9iLzExODA4OCBmYXN0L3NoYXBlcy9z aGFwZS1vdXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRlLWZsb2F0cy1yaWdodC1tYXJnaW4tcG9s eWdvbi5odG1sIFsgU2tpcCBdCiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qvc2hhcGVz L3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtZmxvYXRzLWRpYW1vbmQtbWFyZ2lu LXBvbHlnb24uaHRtbCBiL0xheW91dFRlc3RzL2Zhc3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxv YXRzL3NoYXBlLW91dHNpZGUtZmxvYXRzLWRpYW1vbmQtbWFyZ2luLXBvbHlnb24uaHRtbAppbmRl eCA0MmY2ZmZiLi5lZTRmYjM2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9z aGFwZS1vdXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRlLWZsb2F0cy1kaWFtb25kLW1hcmdpbi1w b2x5Z29uLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1m bG9hdHMvc2hhcGUtb3V0c2lkZS1mbG9hdHMtZGlhbW9uZC1tYXJnaW4tcG9seWdvbi5odG1sCkBA IC0xOSw4ICsxOSwxMCBAQAogICAgIGZsb2F0OiBsZWZ0OwogICAgIHBvc2l0aW9uOiByZWxhdGl2 ZTsKICAgICBvdmVyZmxvdzogdmlzaWJsZTsKLSAgICAtd2Via2l0LXNoYXBlLW91dHNpZGU6IHBv bHlnb24oNTBweCAwcHgsIDEwMHB4IDUwcHgsIDUwcHggMTAwcHgsIDBweCA1MHB4KTsKKyAgICAt d2Via2l0LXNoYXBlLW91dHNpZGU6IHBvbHlnb24oNzBweCAyMHB4LCAxMjBweCA3MHB4LCA3MHB4 IDEyMHB4LCAyMHB4IDcwcHgpOwogICAgIC13ZWJraXQtc2hhcGUtbWFyZ2luOiAyMHB4OworICAg IHdpZHRoOiAxNDBweDsKKyAgICBoZWlnaHQ6IDE0MHB4OwogfQogCiAjc3ZnLXNoYXBlIHsKQEAg LTMwLDYgKzMyLDcgQEAKICAgICBsZWZ0OiAwcHg7CiAgICAgd2lkdGg6IDEwMHB4OwogICAgIGhl aWdodDogMTAwcHg7CisgICAgbWFyZ2luOiAyMHB4OwogfQogPC9zdHlsZT4KIDxib2R5PgpAQCAt NTEsMTEgKzU0LDE2IEBAIGZ1bmN0aW9uIGVsZW1lbnRSZWN0KGVsZW1lbnRJZCkKICAgICByZXR1 cm4ge2xlZnQ6IHIubGVmdCAtIHMubGVmdCwgdG9wOiByLnRvcCAtIHMudG9wLCB3aWR0aDogci53 aWR0aCwgaGVpZ2h0OiByLmhlaWdodH07CiB9CiAKLS8vIFRoZSBwb2x5Z29uJ3MgWCBjb29yZGlu YXRlcyBhcmUgMCwgNTAsIDEwMCwgc3BlY2lmaWVkIHJlbGF0aXZlIHRvIHRoZSAiZmxvYXQtbGVm dCIgZWxlbWVudC4gIEl0cyBzaGFwZS1tYXJpZ24gaXMgMjBweC4KLS8vIFRoZSBob3Jpem9udGFs IGNlbnRlciBvZiB0aGUgbWFyZ2luIHBvbHlnb24sIHJlbGF0aXZlIHRvIHRoZSBjb250YWluZXIg ZWxlbWVudCBpcyAyMCpzcXJ0KDIpICsgNTAuIFNvIHRoZSBsZWZ0Ci0vLyBlZGdlIG9mIHRoZSAo MjBweCBzcXVhcmUpIEFoZW0gY2hhcmFjdGVyIG9uIHRoZSBmaXJzdCAibDEiIGxpbmUgKHkgPT0g MjApIGlzOiAyMCArICgyMCpzcXJ0KDIpICsgNTApID0gOTguMjguCi0vLyBUaGUgc2Vjb25kIGFu ZCB0aGlyZCBsaW5lcywgImwyIiBhbmQgImwzIiBhcmUgc2ltaWxhciwgZWFjaCBvbmUgYmVnaW5z IDIwIHBpeGVscyBmYXJ0aGVyIHRvIHRoZSByaWdodC4KLS8vIFRoZSBsZWZ0IGVkZ2VzIG9mICJs NC1sNiIgYXJlIHRoZSBzYW1lIGFzIHRoZSBmaXJzdCB0aHJlZSwganVzdCBpbiByZXZlcnNlIG9y ZGVyLgorLy8gVGhlIHNoYXBlLW91dHNpZGUgcG9seWdvbidzIFggYW5kIFkgY29vcmRpbmF0ZXMg YXJlIDIwLCA3MCwgMTIwLCBzcGVjaWZpZWQgcmVsYXRpdmUgdG8gdGhlCisvLyAiZmxvYXQtbGVm dCIgZWxlbWVudC4gSXRzIHNoYXBlLW1hcmlnbiBpcyAyMHB4LCB3aGljaCBtZWFucyB0aGF0IHRo ZSBYIGFuZCBZIGxpbWl0cyBvZiB0aGUKKy8vIG1hcmdpbiBib3VuZGFyeSBhcmUgMCwgYW5kIDE0 MC4gVGhpcyBpcyBiZWNhdXNlIHRoZSBtYXJnaW4gYm91bmRhcnkgaGFzIGNpcmN1bGFyIGFyYyBz ZWdtZW50cworLy8gYXQgdGhlIHZlcnRpY2VzLCBpLmUuIGl0J3MgYSByb3VuZGVkIHJlY3Rhbmds ZSByb3RhdGVkIGJ5IDQ1IGRlZ3JlZXMuIE5vbmUgb2YgdGhlIGNoYXJhY3RlcgorLy8gcG9zaXRp b25zIGluIHRoaXMgdGVzdCBhcmUgZGVmaW5lZCBieSB0aGUgYXJjIHNlZ21lbnRzLgorLy8gCisv LyBUaGUgbGVmdCBlZGdlIG9mIHRoZSAoMjBweCBzcXVhcmUpIEFoZW0gY2hhcmFjdGVyIG9uIHRo ZSBmaXJzdCAibDEiIGxpbmUgKHkgPT0gMjApIGlzOiAKKy8vIDIwICsgKDIwKnNxcnQoMikgKyA1 MCkgPSA5OC4yOC4gVGhlIHNlY29uZCBhbmQgdGhpcmQgbGluZXMsICJsMiIgYW5kICJsMyIgYXJl IHNpbWlsYXIsIGVhY2gKKy8vIG9uZSBiZWdpbnMgMjAgcGl4ZWxzIGZhcnRoZXIgdG8gdGhlIHJp Z2h0LiBUaGUgbGVmdCBlZGdlcyBvZiAibDQtbDYiIGFyZSB0aGUgc2FtZSBhcyB0aGUgZmlyc3Qg dGhyZWUsCisvLyBqdXN0IGluIHJldmVyc2Ugb3JkZXIuCiAKIGZ1bmN0aW9uIG1hcmdpbkxlZnRY SW50ZXJjZXB0KGxpbmVOdW1iZXIpCiB7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3No YXBlcy9zaGFwZS1vdXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRlLWZsb2F0cy1lbGxpcHNlLW1h cmdpbi1ib3R0b20uaHRtbCBiL0xheW91dFRlc3RzL2Zhc3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUt ZmxvYXRzL3NoYXBlLW91dHNpZGUtZmxvYXRzLWVsbGlwc2UtbWFyZ2luLWJvdHRvbS5odG1sCmlu ZGV4IGZlOGI1NDQuLmVhOTVlZmQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3Qvc2hhcGVz L3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtZmxvYXRzLWVsbGlwc2UtbWFyZ2lu LWJvdHRvbS5odG1sCisrKyBiL0xheW91dFRlc3RzL2Zhc3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUt ZmxvYXRzL3NoYXBlLW91dHNpZGUtZmxvYXRzLWVsbGlwc2UtbWFyZ2luLWJvdHRvbS5odG1sCkBA IC0yNSwxNSArMjUsMTcgQEAKICAgICBmbG9hdDogbGVmdDsKICAgICBwb3NpdGlvbjogcmVsYXRp dmU7CiAgICAgb3ZlcmZsb3c6IHZpc2libGU7Ci0gICAgLXdlYmtpdC1zaGFwZS1vdXRzaWRlOiBl bGxpcHNlKDIwMHB4LCAxMDBweCwgMjAwcHgsIDEwMHB4KTsKKyAgICAtd2Via2l0LXNoYXBlLW91 dHNpZGU6IGVsbGlwc2UoMjI1cHgsIDEyNXB4LCAyMDBweCwgMTAwcHgpOwogICAgIC13ZWJraXQt c2hhcGUtbWFyZ2luOiAyNXB4OworICAgIHdpZHRoOiA0NTBweDsKKyAgICBoZWlnaHQ6IDI1MHB4 OwogfQogCiAjc3ZnLXNoYXBlLWVsbGlwc2UgewogICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKICAg ICBkaXNwbGF5OmJsb2NrOwotICAgIHRvcDogLTI1cHg7Ci0gICAgbGVmdDogLTI1cHg7CisgICAg dG9wOiAwcHg7CisgICAgbGVmdDogMHB4OwogICAgIHdpZHRoOiA1MDBweDsKICAgICBoZWlnaHQ6 IDMwMHB4OwogfQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0 c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1mbG9hdHMtZWxsaXBzZS1tYXJnaW4tbGVmdC5odG1s IGIvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0 c2lkZS1mbG9hdHMtZWxsaXBzZS1tYXJnaW4tbGVmdC5odG1sCmluZGV4IDEzNThjMDkuLjRjOTdl MTEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxv YXRzL3NoYXBlLW91dHNpZGUtZmxvYXRzLWVsbGlwc2UtbWFyZ2luLWxlZnQuaHRtbAorKysgYi9M YXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9zaGFwZS1vdXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRl LWZsb2F0cy1lbGxpcHNlLW1hcmdpbi1sZWZ0Lmh0bWwKQEAgLTI1LDE1ICsyNSwxNyBAQAogICAg IGZsb2F0OiBsZWZ0OwogICAgIHBvc2l0aW9uOiByZWxhdGl2ZTsKICAgICBvdmVyZmxvdzogdmlz aWJsZTsKLSAgICAtd2Via2l0LXNoYXBlLW91dHNpZGU6IGVsbGlwc2UoMjAwcHgsIDEwMHB4LCAy MDBweCwgMTAwcHgpOworICAgIC13ZWJraXQtc2hhcGUtb3V0c2lkZTogZWxsaXBzZSgyMjVweCwg MTI1cHgsIDIwMHB4LCAxMDBweCk7CiAgICAgLXdlYmtpdC1zaGFwZS1tYXJnaW46IDI1cHg7Cisg ICAgd2lkdGg6IDQ1MHB4OworICAgIGhlaWdodDogMjUwcHg7CiB9CiAKICNzdmctc2hhcGUtZWxs aXBzZSB7CiAgICAgcG9zaXRpb246IGFic29sdXRlOwogICAgIGRpc3BsYXk6YmxvY2s7Ci0gICAg dG9wOiAtMjVweDsKLSAgICBsZWZ0OiAtMjVweDsKKyAgICB0b3A6IDBweDsKKyAgICBsZWZ0OiAw cHg7CiAgICAgd2lkdGg6IDUwMHB4OwogICAgIGhlaWdodDogMzAwcHg7CiB9CmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9zaGFwZS1vdXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRz aWRlLWZsb2F0cy1lbGxpcHNlLW1hcmdpbi1yaWdodC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9z aGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1mbG9hdHMtZWxsaXBzZS1t YXJnaW4tcmlnaHQuaHRtbAppbmRleCA2MzJlYzFhLi44NmU1NWY4IDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9mYXN0L3NoYXBlcy9zaGFwZS1vdXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRlLWZs b2F0cy1lbGxpcHNlLW1hcmdpbi1yaWdodC5odG1sCisrKyBiL0xheW91dFRlc3RzL2Zhc3Qvc2hh cGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtZmxvYXRzLWVsbGlwc2UtbWFy Z2luLXJpZ2h0Lmh0bWwKQEAgLTI2LDE1ICsyNiwxNyBAQAogICAgIGZsb2F0OiByaWdodDsKICAg ICBwb3NpdGlvbjogcmVsYXRpdmU7CiAgICAgb3ZlcmZsb3c6IHZpc2libGU7Ci0gICAgLXdlYmtp dC1zaGFwZS1vdXRzaWRlOiBlbGxpcHNlKDIwMHB4LCAxMDBweCwgMjAwcHgsIDEwMHB4KTsKKyAg ICAtd2Via2l0LXNoYXBlLW91dHNpZGU6IGVsbGlwc2UoMjI1cHgsIDEyNXB4LCAyMDBweCwgMTAw cHgpOwogICAgIC13ZWJraXQtc2hhcGUtbWFyZ2luOiAyNXB4OworICAgIHdpZHRoOiA0NTBweDsK KyAgICBoZWlnaHQ6IDI1MHB4OwogfQogCiAjc3ZnLXNoYXBlLWVsbGlwc2UgewogICAgIHBvc2l0 aW9uOiBhYnNvbHV0ZTsKICAgICBkaXNwbGF5OmJsb2NrOwotICAgIHRvcDogLTI1cHg7Ci0gICAg bGVmdDogLTI1cHg7CisgICAgdG9wOiAwcHg7CisgICAgbGVmdDogMHB4OwogICAgIHdpZHRoOiA1 MDBweDsKICAgICBoZWlnaHQ6IDMwMHB4OwogfQo= 208217 2013-08-06 13:57:23 -0700 2013-08-06 15:15:08 -0700 Patch tmp.patch text/plain 7541 giles_joplin ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAzNDM3ZjM3Li4zMTliMDcwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTMtMDgt MDUgIEhhbnMgTXVsbGVyICA8aG11bGxlckBhZG9iZS5jb20+CisKKyAgICAgICAgW0NTUyBTaGFw ZXNdIE5ldyBwb3NpdGlvbmluZyBtb2RlbDogc2NyaXB0ZWQgc2hhcGUtbWFyZ2luIHRlc3RzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTk0OTEKKwor ICAgICAgICBVcGRhdGUgc29tZSBvZiB0aGUgc2hhcGUtbWFyZ2luIHRlc3RzIHRvIHdvcmsgd2l0 aCB0aGUgbmV3IHBvc2l0aW9uaW5nIG1vZGVsLiBGbG9hdHMKKyAgICAgICAgdGhhdCBzcGVjaWZ5 IHNoYXBlLW91dHNpZGUgYXJlIG5vdyBwb3NpdGlvbmVkIGFjY29yZGluZyB0byB0aGVpciBtYXJn aW4gYm94LCBub3QgdGhlCisgICAgICAgIGJvdW5kaW5nIGJveCBvZiB0aGUgc2hhcGUtb3V0c2lk ZSBzaGFwZS4gVGhlIHRlc3RzIGhhdmUgYmVlbiByZXZpc2VkIHRvIHJlZmxlY3QgdGhlCisgICAg ICAgIGNoYW5nZS4KKworICAgICAgICBSZXZpZXdlZCBieSBBbGV4YW5kcnUgQ2hpY3VsaXRhLgor CisgICAgICAgICogVGVzdEV4cGVjdGF0aW9uczoKKyAgICAgICAgKiBmYXN0L3NoYXBlcy9zaGFw ZS1vdXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRlLWZsb2F0cy1kaWFtb25kLW1hcmdpbi1wb2x5 Z29uLmh0bWw6CisgICAgICAgICogZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hh cGUtb3V0c2lkZS1mbG9hdHMtZWxsaXBzZS1tYXJnaW4tYm90dG9tLmh0bWw6CisgICAgICAgICog ZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1mbG9hdHMtZWxs aXBzZS1tYXJnaW4tbGVmdC5odG1sOgorICAgICAgICAqIGZhc3Qvc2hhcGVzL3NoYXBlLW91dHNp ZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtZmxvYXRzLWVsbGlwc2UtbWFyZ2luLXJpZ2h0Lmh0bWw6 CisKIDIwMTMtMDgtMDYgIEJlbSBKb25lcy1CZXkgIDxiam9uZXNiZUBhZG9iZS5jb20+CiAKICAg ICAgICAgW0NTUyBTaGFwZXNdIE5ldyBwb3NpdGlvbmluZyBtb2RlbDogc3VwcG9ydCBmb3Igc2hh cGUtbWFyZ2luCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5 b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwppbmRleCAwYjc5NTgzLi5lODM1ZDQ4IDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL1Rlc3RF eHBlY3RhdGlvbnMKQEAgLTMxLDE0ICszMSw2IEBAIGRvbS94aHRtbC9sZXZlbDMvY29yZS9ub2Rl Y29tcGFyZWRvY3VtZW50cG9zaXRpb24zMy54aHRtbCBbIFdvbnRGaXggXQogIyBOb2RlOjpjb21w YXJlRG9jdW1lbnRQb3NpdGlvbigpIHdyb25nbHkgcmVwb3J0cyBhbiBhdHRyaWJ1dGUgYW5kIGl0 cyBjb250ZW50IGFzIGRpc2Nvbm5lY3RlZC4KIHdlYmtpdC5vcmcvYi8xMTkzMjUgZG9tL3hodG1s L2xldmVsMy9jb3JlL25vZGVjb21wYXJlZG9jdW1lbnRwb3NpdGlvbjM4LnhodG1sIFsgRmFpbHVy ZSBdCiAKLSMgVGhlIENTUyBTaGFwZXMgc3BlYyBoYXMgY2hhbmdlZCB0aGUgcG9zaXRpb25pbmcg bW9kZWwgZm9yIGZsb2F0cyB3aXRoIHNoYXBlLW91dHNpZGUuCi0jIFRodXMgYWxsIG9mIHRoZSB0 ZXN0cyBuZWVkIHRvIGJlIHJld2l0dGVuIHRvIHdvcmsgYXMgdGhlIGltcGxlbWVudGF0aW9uIG9m Ci0jIHRoZSBuZXcgbW9kZWwgaXMgY29tcGxldGVkLgotd2Via2l0Lm9yZy9iLzExOTQ5MSBmYXN0 L3NoYXBlcy9zaGFwZS1vdXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRlLWZsb2F0cy1kaWFtb25k LW1hcmdpbi1wb2x5Z29uLmh0bWwgWyBTa2lwIF0KLXdlYmtpdC5vcmcvYi8xMTk0OTEgZmFzdC9z aGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1mbG9hdHMtZWxsaXBzZS1t YXJnaW4tYm90dG9tLmh0bWwgWyBTa2lwIF0KLXdlYmtpdC5vcmcvYi8xMTk0OTEgZmFzdC9zaGFw ZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1mbG9hdHMtZWxsaXBzZS1tYXJn aW4tbGVmdC5odG1sIFsgU2tpcCBdCi13ZWJraXQub3JnL2IvMTE5NDkxIGZhc3Qvc2hhcGVzL3No YXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtZmxvYXRzLWVsbGlwc2UtbWFyZ2luLXJp Z2h0Lmh0bWwgWyBTa2lwIF0KLQogd2Via2l0Lm9yZy9iLzExODMwMSBmYXN0L2RvbS90aW1lci10 aHJvdHRsaW5nLWhpZGRlbi1wYWdlLmh0bWwgWyBTa2lwIF0KIAogd2Via2l0Lm9yZy9iLzExOTA5 NCBmYXN0L2Zvcm1zL2NvbG9yL2lucHV0LWNvbG9yLW9uY2hhbmdlLWV2ZW50Lmh0bWwgWyBDcmFz aCBQYXNzIF0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qvc2hhcGVzL3NoYXBlLW91dHNp ZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtZmxvYXRzLWRpYW1vbmQtbWFyZ2luLXBvbHlnb24uaHRt bCBiL0xheW91dFRlc3RzL2Zhc3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91 dHNpZGUtZmxvYXRzLWRpYW1vbmQtbWFyZ2luLXBvbHlnb24uaHRtbAppbmRleCA0MmY2ZmZiLi5l ZTRmYjM2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9zaGFwZS1vdXRzaWRl LWZsb2F0cy9zaGFwZS1vdXRzaWRlLWZsb2F0cy1kaWFtb25kLW1hcmdpbi1wb2x5Z29uLmh0bWwK KysrIGIvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUt b3V0c2lkZS1mbG9hdHMtZGlhbW9uZC1tYXJnaW4tcG9seWdvbi5odG1sCkBAIC0xOSw4ICsxOSwx MCBAQAogICAgIGZsb2F0OiBsZWZ0OwogICAgIHBvc2l0aW9uOiByZWxhdGl2ZTsKICAgICBvdmVy ZmxvdzogdmlzaWJsZTsKLSAgICAtd2Via2l0LXNoYXBlLW91dHNpZGU6IHBvbHlnb24oNTBweCAw cHgsIDEwMHB4IDUwcHgsIDUwcHggMTAwcHgsIDBweCA1MHB4KTsKKyAgICAtd2Via2l0LXNoYXBl LW91dHNpZGU6IHBvbHlnb24oNzBweCAyMHB4LCAxMjBweCA3MHB4LCA3MHB4IDEyMHB4LCAyMHB4 IDcwcHgpOwogICAgIC13ZWJraXQtc2hhcGUtbWFyZ2luOiAyMHB4OworICAgIHdpZHRoOiAxNDBw eDsKKyAgICBoZWlnaHQ6IDE0MHB4OwogfQogCiAjc3ZnLXNoYXBlIHsKQEAgLTMwLDYgKzMyLDcg QEAKICAgICBsZWZ0OiAwcHg7CiAgICAgd2lkdGg6IDEwMHB4OwogICAgIGhlaWdodDogMTAwcHg7 CisgICAgbWFyZ2luOiAyMHB4OwogfQogPC9zdHlsZT4KIDxib2R5PgpAQCAtNTEsMTEgKzU0LDE2 IEBAIGZ1bmN0aW9uIGVsZW1lbnRSZWN0KGVsZW1lbnRJZCkKICAgICByZXR1cm4ge2xlZnQ6IHIu bGVmdCAtIHMubGVmdCwgdG9wOiByLnRvcCAtIHMudG9wLCB3aWR0aDogci53aWR0aCwgaGVpZ2h0 OiByLmhlaWdodH07CiB9CiAKLS8vIFRoZSBwb2x5Z29uJ3MgWCBjb29yZGluYXRlcyBhcmUgMCwg NTAsIDEwMCwgc3BlY2lmaWVkIHJlbGF0aXZlIHRvIHRoZSAiZmxvYXQtbGVmdCIgZWxlbWVudC4g IEl0cyBzaGFwZS1tYXJpZ24gaXMgMjBweC4KLS8vIFRoZSBob3Jpem9udGFsIGNlbnRlciBvZiB0 aGUgbWFyZ2luIHBvbHlnb24sIHJlbGF0aXZlIHRvIHRoZSBjb250YWluZXIgZWxlbWVudCBpcyAy MCpzcXJ0KDIpICsgNTAuIFNvIHRoZSBsZWZ0Ci0vLyBlZGdlIG9mIHRoZSAoMjBweCBzcXVhcmUp IEFoZW0gY2hhcmFjdGVyIG9uIHRoZSBmaXJzdCAibDEiIGxpbmUgKHkgPT0gMjApIGlzOiAyMCAr ICgyMCpzcXJ0KDIpICsgNTApID0gOTguMjguCi0vLyBUaGUgc2Vjb25kIGFuZCB0aGlyZCBsaW5l cywgImwyIiBhbmQgImwzIiBhcmUgc2ltaWxhciwgZWFjaCBvbmUgYmVnaW5zIDIwIHBpeGVscyBm YXJ0aGVyIHRvIHRoZSByaWdodC4KLS8vIFRoZSBsZWZ0IGVkZ2VzIG9mICJsNC1sNiIgYXJlIHRo ZSBzYW1lIGFzIHRoZSBmaXJzdCB0aHJlZSwganVzdCBpbiByZXZlcnNlIG9yZGVyLgorLy8gVGhl IHNoYXBlLW91dHNpZGUgcG9seWdvbidzIFggYW5kIFkgY29vcmRpbmF0ZXMgYXJlIDIwLCA3MCwg MTIwLCBzcGVjaWZpZWQgcmVsYXRpdmUgdG8gdGhlCisvLyAiZmxvYXQtbGVmdCIgZWxlbWVudC4g SXRzIHNoYXBlLW1hcmlnbiBpcyAyMHB4LCB3aGljaCBtZWFucyB0aGF0IHRoZSBYIGFuZCBZIGxp bWl0cyBvZiB0aGUKKy8vIG1hcmdpbiBib3VuZGFyeSBhcmUgMCwgYW5kIDE0MC4gVGhpcyBpcyBi ZWNhdXNlIHRoZSBtYXJnaW4gYm91bmRhcnkgaGFzIGNpcmN1bGFyIGFyYyBzZWdtZW50cworLy8g YXQgdGhlIHZlcnRpY2VzLCBpLmUuIGl0J3MgYSByb3VuZGVkIHJlY3RhbmdsZSByb3RhdGVkIGJ5 IDQ1IGRlZ3JlZXMuIE5vbmUgb2YgdGhlIGNoYXJhY3RlcgorLy8gcG9zaXRpb25zIGluIHRoaXMg dGVzdCBhcmUgZGVmaW5lZCBieSB0aGUgYXJjIHNlZ21lbnRzLgorLy8gCisvLyBUaGUgbGVmdCBl ZGdlIG9mIHRoZSAoMjBweCBzcXVhcmUpIEFoZW0gY2hhcmFjdGVyIG9uIHRoZSBmaXJzdCAibDEi IGxpbmUgKHkgPT0gMjApIGlzOiAKKy8vIDIwICsgKDIwKnNxcnQoMikgKyA1MCkgPSA5OC4yOC4g VGhlIHNlY29uZCBhbmQgdGhpcmQgbGluZXMsICJsMiIgYW5kICJsMyIgYXJlIHNpbWlsYXIsIGVh Y2gKKy8vIG9uZSBiZWdpbnMgMjAgcGl4ZWxzIGZhcnRoZXIgdG8gdGhlIHJpZ2h0LiBUaGUgbGVm dCBlZGdlcyBvZiAibDQtbDYiIGFyZSB0aGUgc2FtZSBhcyB0aGUgZmlyc3QgdGhyZWUsCisvLyBq dXN0IGluIHJldmVyc2Ugb3JkZXIuCiAKIGZ1bmN0aW9uIG1hcmdpbkxlZnRYSW50ZXJjZXB0KGxp bmVOdW1iZXIpCiB7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9zaGFwZS1v dXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRlLWZsb2F0cy1lbGxpcHNlLW1hcmdpbi1ib3R0b20u aHRtbCBiL0xheW91dFRlc3RzL2Zhc3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBl LW91dHNpZGUtZmxvYXRzLWVsbGlwc2UtbWFyZ2luLWJvdHRvbS5odG1sCmluZGV4IGZlOGI1NDQu LmVhOTVlZmQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3Qvc2hhcGVzL3NoYXBlLW91dHNp ZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtZmxvYXRzLWVsbGlwc2UtbWFyZ2luLWJvdHRvbS5odG1s CisrKyBiL0xheW91dFRlc3RzL2Zhc3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBl LW91dHNpZGUtZmxvYXRzLWVsbGlwc2UtbWFyZ2luLWJvdHRvbS5odG1sCkBAIC0yNSwxNSArMjUs MTcgQEAKICAgICBmbG9hdDogbGVmdDsKICAgICBwb3NpdGlvbjogcmVsYXRpdmU7CiAgICAgb3Zl cmZsb3c6IHZpc2libGU7Ci0gICAgLXdlYmtpdC1zaGFwZS1vdXRzaWRlOiBlbGxpcHNlKDIwMHB4 LCAxMDBweCwgMjAwcHgsIDEwMHB4KTsKKyAgICAtd2Via2l0LXNoYXBlLW91dHNpZGU6IGVsbGlw c2UoMjI1cHgsIDEyNXB4LCAyMDBweCwgMTAwcHgpOwogICAgIC13ZWJraXQtc2hhcGUtbWFyZ2lu OiAyNXB4OworICAgIHdpZHRoOiA0NTBweDsKKyAgICBoZWlnaHQ6IDI1MHB4OwogfQogCiAjc3Zn LXNoYXBlLWVsbGlwc2UgewogICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKICAgICBkaXNwbGF5OmJs b2NrOwotICAgIHRvcDogLTI1cHg7Ci0gICAgbGVmdDogLTI1cHg7CisgICAgdG9wOiAwcHg7Cisg ICAgbGVmdDogMHB4OwogICAgIHdpZHRoOiA1MDBweDsKICAgICBoZWlnaHQ6IDMwMHB4OwogfQpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMv c2hhcGUtb3V0c2lkZS1mbG9hdHMtZWxsaXBzZS1tYXJnaW4tbGVmdC5odG1sIGIvTGF5b3V0VGVz dHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1mbG9hdHMt ZWxsaXBzZS1tYXJnaW4tbGVmdC5odG1sCmluZGV4IDEzNThjMDkuLjRjOTdlMTEgMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL2Zhc3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91 dHNpZGUtZmxvYXRzLWVsbGlwc2UtbWFyZ2luLWxlZnQuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9m YXN0L3NoYXBlcy9zaGFwZS1vdXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRlLWZsb2F0cy1lbGxp cHNlLW1hcmdpbi1sZWZ0Lmh0bWwKQEAgLTI1LDE1ICsyNSwxNyBAQAogICAgIGZsb2F0OiBsZWZ0 OwogICAgIHBvc2l0aW9uOiByZWxhdGl2ZTsKICAgICBvdmVyZmxvdzogdmlzaWJsZTsKLSAgICAt d2Via2l0LXNoYXBlLW91dHNpZGU6IGVsbGlwc2UoMjAwcHgsIDEwMHB4LCAyMDBweCwgMTAwcHgp OworICAgIC13ZWJraXQtc2hhcGUtb3V0c2lkZTogZWxsaXBzZSgyMjVweCwgMTI1cHgsIDIwMHB4 LCAxMDBweCk7CiAgICAgLXdlYmtpdC1zaGFwZS1tYXJnaW46IDI1cHg7CisgICAgd2lkdGg6IDQ1 MHB4OworICAgIGhlaWdodDogMjUwcHg7CiB9CiAKICNzdmctc2hhcGUtZWxsaXBzZSB7CiAgICAg cG9zaXRpb246IGFic29sdXRlOwogICAgIGRpc3BsYXk6YmxvY2s7Ci0gICAgdG9wOiAtMjVweDsK LSAgICBsZWZ0OiAtMjVweDsKKyAgICB0b3A6IDBweDsKKyAgICBsZWZ0OiAwcHg7CiAgICAgd2lk dGg6IDUwMHB4OwogICAgIGhlaWdodDogMzAwcHg7CiB9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9mYXN0L3NoYXBlcy9zaGFwZS1vdXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRlLWZsb2F0cy1l bGxpcHNlLW1hcmdpbi1yaWdodC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUt b3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1mbG9hdHMtZWxsaXBzZS1tYXJnaW4tcmlnaHQu aHRtbAppbmRleCA2MzJlYzFhLi44NmU1NWY4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0 L3NoYXBlcy9zaGFwZS1vdXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRlLWZsb2F0cy1lbGxpcHNl LW1hcmdpbi1yaWdodC5odG1sCisrKyBiL0xheW91dFRlc3RzL2Zhc3Qvc2hhcGVzL3NoYXBlLW91 dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtZmxvYXRzLWVsbGlwc2UtbWFyZ2luLXJpZ2h0Lmh0 bWwKQEAgLTI2LDE1ICsyNiwxNyBAQAogICAgIGZsb2F0OiByaWdodDsKICAgICBwb3NpdGlvbjog cmVsYXRpdmU7CiAgICAgb3ZlcmZsb3c6IHZpc2libGU7Ci0gICAgLXdlYmtpdC1zaGFwZS1vdXRz aWRlOiBlbGxpcHNlKDIwMHB4LCAxMDBweCwgMjAwcHgsIDEwMHB4KTsKKyAgICAtd2Via2l0LXNo YXBlLW91dHNpZGU6IGVsbGlwc2UoMjI1cHgsIDEyNXB4LCAyMDBweCwgMTAwcHgpOwogICAgIC13 ZWJraXQtc2hhcGUtbWFyZ2luOiAyNXB4OworICAgIHdpZHRoOiA0NTBweDsKKyAgICBoZWlnaHQ6 IDI1MHB4OwogfQogCiAjc3ZnLXNoYXBlLWVsbGlwc2UgewogICAgIHBvc2l0aW9uOiBhYnNvbHV0 ZTsKICAgICBkaXNwbGF5OmJsb2NrOwotICAgIHRvcDogLTI1cHg7Ci0gICAgbGVmdDogLTI1cHg7 CisgICAgdG9wOiAwcHg7CisgICAgbGVmdDogMHB4OwogICAgIHdpZHRoOiA1MDBweDsKICAgICBo ZWlnaHQ6IDMwMHB4OwogfQo=