128929 2014-02-17 12:43:01 -0800 border-box clip-paths jump around when outline changes 2014-02-18 23:10:57 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser bjonesbe commit-queue esprehn+autocc glenn kondapallykalyan krit simon.fraser oldest_to_newest 981619 0 simon.fraser 2014-02-17 12:43:01 -0800 The reference box for clip paths is being computed incorrectly, resulting in the clip path changing when outlines change. This is breaking a test: http://build.webkit.org/results/Apple%20Mavericks%20Debug%20WK1%20(Tests)/r164236%20(3035)/results.html 981620 1 simon.fraser 2014-02-17 12:43:36 -0800 In computeReferenceBox(), rootRelativeBounds() is probably the wrong box to use; it takes outlines into account. 981622 2 224414 simon.fraser 2014-02-17 12:56:55 -0800 Created attachment 224414 Testcase; path changes on hover 981632 3 224418 simon.fraser 2014-02-17 13:46:32 -0800 Created attachment 224418 Patch 981797 4 224418 krit 2014-02-17 22:30:57 -0800 Comment on attachment 224418 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=224418&action=review > Source/WebCore/rendering/RenderLayer.cpp:3844 > + LayoutRect referenceBox = computeReferenceBox(renderer(), clippingPath, offsetFromRoot, rootRelativeBounds); I don't understand. If rootRelativeBounds takes outline into account (which makes sense, didn't think about that before) why does this not affect the dimension of rootRelativeBounds? Shouldn't the width and height of rootRelativeBounds have the outline as well? I assume your test passes so it seems not the case. I would just like to know why. This doesn't seem logical. 981800 5 224418 krit 2014-02-17 23:03:40 -0800 Comment on attachment 224418 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=224418&action=review > LayoutTests/css3/masking/clip-path-root-relative-bounds-expected.html:8 > + -webkit-clip-path: circle(50%, 50%, 50%) border-box; Could you use the new syntax please? This is the deprecated syntax that I would very much like to remove. New syntax is circle(<radius> at <position>) and to archive the same as you did, just circle() :) Anyway. Still don't understand why rootRelativeBounds takes the offset of outline but not the dimension. 981961 6 224418 simon.fraser 2014-02-18 09:13:39 -0800 Comment on attachment 224418 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=224418&action=review >> Source/WebCore/rendering/RenderLayer.cpp:3844 >> + LayoutRect referenceBox = computeReferenceBox(renderer(), clippingPath, offsetFromRoot, rootRelativeBounds); > > I don't understand. If rootRelativeBounds takes outline into account (which makes sense, didn't think about that before) why does this not affect the dimension of rootRelativeBounds? Shouldn't the width and height of rootRelativeBounds have the outline as well? > > I assume your test passes so it seems not the case. I would just like to know why. This doesn't seem logical. rootRelativeBounds is just a bounding box for drawing, since it encompasses outlines and positioned descendants (which might be positioned to your top/left). So it's location is not the right thing to use to offset the border box. The size of rootRelativeBounds IS affected by outline, but that only get used in the to-be-removed "BoxMissing" state. 982176 7 224569 simon.fraser 2014-02-18 17:19:23 -0800 Created attachment 224569 Patch 982186 8 224569 simon.fraser 2014-02-18 17:45:55 -0800 Comment on attachment 224569 Patch Dirk gave a review on webkit-dev 982188 9 simon.fraser 2014-02-18 17:50:55 -0800 https://trac.webkit.org/r164336 982258 10 krit 2014-02-18 23:10:57 -0800 (In reply to comment #8) > (From update of attachment 224569 [details]) > Dirk gave a review on webkit-dev Confirmative :) 224414 2014-02-17 12:56:55 -0800 2014-02-17 12:56:55 -0800 Testcase; path changes on hover clip-path-hover.html text/html 250 simon.fraser PHN0eWxlPgojcGFyZW50IHsKICAgIHdpZHRoOiA1MDBweDsKCWhlaWdodDogMjAwcHg7CgltYXJn aW46IDIwcHg7CgliYWNrZ3JvdW5kOiBibHVlOwoJYm9yZGVyOiBzb2xpZCByZWQgMjBweDsKCS13 ZWJraXQtY2xpcC1wYXRoOiBjaXJjbGUoNTAlLCA1MCUsIDUwJSkgYm9yZGVyLWJveDsKfQoKI3Bh cmVudDpob3ZlciB7CiAgICBvdXRsaW5lOiAyMHB4IHNvbGlkIHNpbHZlcgp9Cjwvc3R5bGU+Cjxk aXYgaWQ9InBhcmVudCI+PC9kaXY+Cg== 224418 2014-02-17 13:46:32 -0800 2014-02-18 17:19:20 -0800 Patch bug-128929-20140217134631.patch text/plain 6748 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTY0MjQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDQ2MTY1MTlmMGU1Y2M3 ZTE0YmZmOTQ5Y2MxMjNlNTExY2E5ZmEwNC4uMmRlODM0YWI2M2Y0ODBhYzM0Y2VhNDIxNzFkYzk3 Y2VmMjc2ZGI3YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE0LTAyLTE3ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIGJvcmRlci1ib3gg Y2xpcC1wYXRocyBqdW1wIGFyb3VuZCB3aGVuIG91dGxpbmUgY2hhbmdlcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI4OTI5CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIAorICAgICAgICBjb21wdXRlUmVmZXJl bmNlQm94KCkgZm9yIGNsaXAgcGF0aHMgd2FzIHVzaW5nICJyb290UmVsYXRpdmVCb3VuZHMiCisg ICAgICAgIHRvIHBvc2l0aW9uIHRoZSBib3JkZXItYm94LiBUaGlzIGJvdW5kcyBpcyBhbiBlbmNs b3NpbmcgYm91bmRzIGZvcgorICAgICAgICB0aGUgbGF5ZXIgYW5kIGl0cyBkZXNjZW5kYW50cywg aW5jbHVkaW5nIG91dGxpbmVzIGFuZCBhYnNvbHV0ZSBkZXNjZW5kYW50cywKKyAgICAgICAgc28g aXQgaXMgbm90IHRoZSBjb3JyZWN0IGJveCB0byB1c2UgdG8gb2Zmc2V0IHRoZSBib3JkZXItYm94 LgorICAgICAgICAKKyAgICAgICAgVGhlIGNhbGxlciBoYXMgb2Zmc2V0RnJvbVJvb3QoKSwgd2hp Y2ggaXMgdGhlIGNvcnJlY3QgdGhpbmcgdG8gdXNlLAorICAgICAgICBzbyB1c2UgaXQuCisKKyAg ICAgICAgVGVzdDogY3NzMy9tYXNraW5nL2NsaXAtcGF0aC1yb290LXJlbGF0aXZlLWJvdW5kcy5o dG1sCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6Y29tcHV0ZVJlZmVyZW5jZUJveCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXll cjo6c2V0dXBDbGlwUGF0aCk6CisKIDIwMTQtMDItMTcgIFNlcmdpbyBDb3JyZWlhICA8c2VyZ2lv LmNvcnJlaWFAb3BlbmJvc3NhLm9yZz4KIAogICAgICAgICBSZXBsYWNlIHVzZXMgb2YgUGFzc093 blB0ci9Pd25QdHIgd2l0aCBzdGQ6OnVuaXF1ZV9wdHIgaW4gV2ViQ29yZS9pbnNwZWN0b3IKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCmluZGV4IDM2ZjNhYmQ3NTZjZmM2 NGZhODMyMDVhODBkMDU3NWFlYjYzNjMwOWQuLjIxNTE3NTllODEyODZiZGRhZDU2ZDFlZTllYWUx YmVhMmJkNGMxMDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJM YXllci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcApA QCAtMzc4OCw3ICszNzg4LDcgQEAgYm9vbCBSZW5kZXJMYXllcjo6c2V0dXBGb250U3VicGl4ZWxR dWFudGl6YXRpb24oR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBib29sJgogfQogCiB0ZW1wbGF0 ZSA8Y2xhc3MgUmVmZXJlbmNlQm94Q2xpcFBhdGhPcGVyYXRpb24+Ci1zdGF0aWMgaW5saW5lIExh eW91dFJlY3QgY29tcHV0ZVJlZmVyZW5jZUJveChjb25zdCBSZW5kZXJPYmplY3QmIHJlbmRlcmVy LCBjb25zdCBSZWZlcmVuY2VCb3hDbGlwUGF0aE9wZXJhdGlvbiYgY2xpcHBpbmdQYXRoLCBjb25z dCBMYXlvdXRSZWN0JiByb290UmVsYXRpdmVCb3VuZHMpCitzdGF0aWMgaW5saW5lIExheW91dFJl Y3QgY29tcHV0ZVJlZmVyZW5jZUJveChjb25zdCBSZW5kZXJPYmplY3QmIHJlbmRlcmVyLCBjb25z dCBSZWZlcmVuY2VCb3hDbGlwUGF0aE9wZXJhdGlvbiYgY2xpcHBpbmdQYXRoLCBjb25zdCBMYXlv dXRQb2ludCYgb2Zmc2V0RnJvbVJvb3QsIGNvbnN0IExheW91dFJlY3QmIHJvb3RSZWxhdGl2ZUJv dW5kcykKIHsKICAgICBMYXlvdXRSZWN0IHJlZmVyZW5jZUJveDsKICAgICBpZiAocmVuZGVyZXIu aXNCb3goKSkgewpAQCAtMzc5NiwxMSArMzc5NiwxMSBAQCBzdGF0aWMgaW5saW5lIExheW91dFJl Y3QgY29tcHV0ZVJlZmVyZW5jZUJveChjb25zdCBSZW5kZXJPYmplY3QmIHJlbmRlcmVyLCBjb25z dAogICAgICAgICBzd2l0Y2ggKGNsaXBwaW5nUGF0aC5yZWZlcmVuY2VCb3goKSkgewogICAgICAg ICAgICAgY2FzZSBDb250ZW50Qm94OgogICAgICAgICAgICAgICAgIHJlZmVyZW5jZUJveCA9IGJv eC5jb250ZW50Qm94UmVjdCgpOwotICAgICAgICAgICAgICAgIHJlZmVyZW5jZUJveC5tb3ZlQnko cm9vdFJlbGF0aXZlQm91bmRzLmxvY2F0aW9uKCkpOworICAgICAgICAgICAgICAgIHJlZmVyZW5j ZUJveC5tb3ZlQnkob2Zmc2V0RnJvbVJvb3QpOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAg ICAgICAgICAgY2FzZSBQYWRkaW5nQm94OgogICAgICAgICAgICAgICAgIHJlZmVyZW5jZUJveCA9 IGJveC5wYWRkaW5nQm94UmVjdCgpOwotICAgICAgICAgICAgICAgIHJlZmVyZW5jZUJveC5tb3Zl Qnkocm9vdFJlbGF0aXZlQm91bmRzLmxvY2F0aW9uKCkpOworICAgICAgICAgICAgICAgIHJlZmVy ZW5jZUJveC5tb3ZlQnkob2Zmc2V0RnJvbVJvb3QpOwogICAgICAgICAgICAgICAgIGJyZWFrOwog ICAgICAgICAgICAgLy8gZmlsbCwgc3Ryb2tlLCB2aWV3LWJveCBjb21wdXRlIHRvIGJvcmRlci1i b3ggZm9yIEhUTUwgZWxlbWVudHMuCiAgICAgICAgICAgICBjYXNlIEZpbGw6CkBAIC0zODA4LDcg KzM4MDgsNyBAQCBzdGF0aWMgaW5saW5lIExheW91dFJlY3QgY29tcHV0ZVJlZmVyZW5jZUJveChj b25zdCBSZW5kZXJPYmplY3QmIHJlbmRlcmVyLCBjb25zdAogICAgICAgICAgICAgY2FzZSBWaWV3 Qm94OgogICAgICAgICAgICAgY2FzZSBCb3JkZXJCb3g6CiAgICAgICAgICAgICAgICAgcmVmZXJl bmNlQm94ID0gYm94LmJvcmRlckJveFJlY3QoKTsKLSAgICAgICAgICAgICAgICByZWZlcmVuY2VC b3gubW92ZUJ5KHJvb3RSZWxhdGl2ZUJvdW5kcy5sb2NhdGlvbigpKTsKKyAgICAgICAgICAgICAg ICByZWZlcmVuY2VCb3gubW92ZUJ5KG9mZnNldEZyb21Sb290KTsKICAgICAgICAgICAgICAgICBi cmVhazsKICAgICAgICAgICAgIGNhc2UgTWFyZ2luQm94OgogICAgICAgICAgICAgICAgIC8vIEZJ WE1FOiBTdXBwb3J0IG1hcmdpbi1ib3guIFVzZSBib3VuZGluZyBjbGllbnQgcmVjdCBmb3Igbm93 LgpAQCAtMzg0MSw3ICszODQxLDcgQEAgYm9vbCBSZW5kZXJMYXllcjo6c2V0dXBDbGlwUGF0aChH cmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IExheWVyUGFpbnRpbmdJbmYKICAgICBpZiAo c3R5bGUuY2xpcFBhdGgoKS0+dHlwZSgpID09IENsaXBQYXRoT3BlcmF0aW9uOjpTaGFwZSkgewog ICAgICAgICBTaGFwZUNsaXBQYXRoT3BlcmF0aW9uJiBjbGlwcGluZ1BhdGggPSB0b1NoYXBlQ2xp cFBhdGhPcGVyYXRpb24oKihzdHlsZS5jbGlwUGF0aCgpKSk7CiAKLSAgICAgICAgTGF5b3V0UmVj dCByZWZlcmVuY2VCb3ggPSBjb21wdXRlUmVmZXJlbmNlQm94KHJlbmRlcmVyKCksIGNsaXBwaW5n UGF0aCwgcm9vdFJlbGF0aXZlQm91bmRzKTsKKyAgICAgICAgTGF5b3V0UmVjdCByZWZlcmVuY2VC b3ggPSBjb21wdXRlUmVmZXJlbmNlQm94KHJlbmRlcmVyKCksIGNsaXBwaW5nUGF0aCwgb2Zmc2V0 RnJvbVJvb3QsIHJvb3RSZWxhdGl2ZUJvdW5kcyk7CiAgICAgICAgIGNvbnRleHQtPnNhdmUoKTsK ICAgICAgICAgY29udGV4dC0+Y2xpcFBhdGgoY2xpcHBpbmdQYXRoLnBhdGhGb3JSZWZlcmVuY2VS ZWN0KHJlZmVyZW5jZUJveCksIGNsaXBwaW5nUGF0aC53aW5kUnVsZSgpKTsKICAgICAgICAgcmV0 dXJuIHRydWU7CkBAIC0zODUwLDcgKzM4NTAsNyBAQCBib29sIFJlbmRlckxheWVyOjpzZXR1cENs aXBQYXRoKEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgTGF5ZXJQYWludGluZ0luZgog ICAgIGlmIChzdHlsZS5jbGlwUGF0aCgpLT50eXBlKCkgPT0gQ2xpcFBhdGhPcGVyYXRpb246OkJv eCkgewogICAgICAgICBCb3hDbGlwUGF0aE9wZXJhdGlvbiYgY2xpcHBpbmdQYXRoID0gdG9Cb3hD bGlwUGF0aE9wZXJhdGlvbigqKHN0eWxlLmNsaXBQYXRoKCkpKTsKIAotICAgICAgICBMYXlvdXRS ZWN0IHJlZmVyZW5jZUJveCA9IGNvbXB1dGVSZWZlcmVuY2VCb3gocmVuZGVyZXIoKSwgY2xpcHBp bmdQYXRoLCByb290UmVsYXRpdmVCb3VuZHMpOworICAgICAgICBMYXlvdXRSZWN0IHJlZmVyZW5j ZUJveCA9IGNvbXB1dGVSZWZlcmVuY2VCb3gocmVuZGVyZXIoKSwgY2xpcHBpbmdQYXRoLCBvZmZz ZXRGcm9tUm9vdCwgcm9vdFJlbGF0aXZlQm91bmRzKTsKICAgICAgICAgLy8gRklYTUUgVGhpcyBk b2VzIG5vdCBwcm9wZXJseSBjb21wdXRlIHRoZSByb3VuZGVkIGNvcm5lcnMgYXMgc3BlY2lmaWVk IGluIGFsbCBjb25kaXRpb25zLgogICAgICAgICAvLyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTI3OTgyCiAgICAgICAgIGNvbnN0IFJvdW5kZWRSZWN0JiBzaGFwZVJl Y3QgPSByZW5kZXJlcigpLnN0eWxlKCkuZ2V0Um91bmRlZEJvcmRlckZvcihyZWZlcmVuY2VCb3gs ICYocmVuZGVyZXIoKS52aWV3KCkpKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxv ZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA4ZDBmNmZiZGE4YmI3YTY0MDg2ZjllMzMx YTJmNmIzZDY0NDVlMDU1Li5hNzJlMTQyNWMxNTUwMzExNmMzZTZhODQxODhhNmYzNjI3YjIxMjgz IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCkBAIC0xLDUgKzEsMTcgQEAKIDIwMTQtMDItMTcgIFNpbW9uIEZyYXNlciAgPHNpbW9u LmZyYXNlckBhcHBsZS5jb20+CiAKKyAgICAgICAgYm9yZGVyLWJveCBjbGlwLXBhdGhzIGp1bXAg YXJvdW5kIHdoZW4gb3V0bGluZSBjaGFuZ2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMjg5MjkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIFRlc3QgY29tcGFyaW5nIGEgYm9yZGVyLWJveCBj bGlwIHBhdGggd2l0aCBhbmQgd2l0aG91dCBhbiBvdXRsaW5lLgorCisgICAgICAgICogY3NzMy9t YXNraW5nL2NsaXAtcGF0aC1yb290LXJlbGF0aXZlLWJvdW5kcy1leHBlY3RlZC5odG1sOiBBZGRl ZC4KKyAgICAgICAgKiBjc3MzL21hc2tpbmcvY2xpcC1wYXRoLXJvb3QtcmVsYXRpdmUtYm91bmRz Lmh0bWw6IEFkZGVkLgorCisyMDE0LTAyLTE3ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJA YXBwbGUuY29tPgorCiAgICAgICAgIEZpeCBsYXlvdXQgdGVzdCBhZGRlZCBpbiByMTY0MjMyIHRv IGF2b2lkIGJ1ZyAxMjg5MjkKICAgICAgICAgYW5kIHVzZSByZWN0cyB3aGljaCBkb24ndCBoYXZl IG1pbm9yIHJlbmRlcmluZyBkaWZmZXJlbmNlcyB3aGVuCiAgICAgICAgIGRyYXduIGludG8gY29t cG9zaXRpbmcgbGF5ZXJzLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY3NzMy9tYXNraW5nL2Ns aXAtcGF0aC1yb290LXJlbGF0aXZlLWJvdW5kcy1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMv Y3NzMy9tYXNraW5nL2NsaXAtcGF0aC1yb290LXJlbGF0aXZlLWJvdW5kcy1leHBlY3RlZC5odG1s Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAuLmVhOGI1NWIwMzdkMzcwNWYxMWUwNDQyN2VjMzlkOTViYmU4ZDQ1ZjIKLS0t IC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9jc3MzL21hc2tpbmcvY2xpcC1wYXRoLXJvb3Qt cmVsYXRpdmUtYm91bmRzLWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSwxMSBAQAorPHN0eWxlPgor ZGl2IHsKKyAgICB3aWR0aDogNTAwcHg7CisJaGVpZ2h0OiAyMDBweDsKKwltYXJnaW46IDIwcHg7 CisJYmFja2dyb3VuZDogYmx1ZTsKKwlib3JkZXI6IHNvbGlkIHJlZCAyMHB4OworCS13ZWJraXQt Y2xpcC1wYXRoOiBjaXJjbGUoNTAlLCA1MCUsIDUwJSkgYm9yZGVyLWJveDsKK30KKzwvc3R5bGU+ Cis8ZGl2PjwvZGl2PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY3NzMy9tYXNraW5nL2NsaXAt cGF0aC1yb290LXJlbGF0aXZlLWJvdW5kcy5odG1sIGIvTGF5b3V0VGVzdHMvY3NzMy9tYXNraW5n L2NsaXAtcGF0aC1yb290LXJlbGF0aXZlLWJvdW5kcy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmQ1ZDRmNTM5 ZjFkYjhjZTA3YTE0MjQxZjE0OTAzYmNjNTcxYzI4ZmUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlv dXRUZXN0cy9jc3MzL21hc2tpbmcvY2xpcC1wYXRoLXJvb3QtcmVsYXRpdmUtYm91bmRzLmh0bWwK QEAgLTAsMCArMSwxMiBAQAorPHN0eWxlPgorZGl2IHsKKyAgICB3aWR0aDogNTAwcHg7CisJaGVp Z2h0OiAyMDBweDsKKwltYXJnaW46IDIwcHg7CisJYmFja2dyb3VuZDogYmx1ZTsKKwlib3JkZXI6 IHNvbGlkIHJlZCAyMHB4OworCS13ZWJraXQtY2xpcC1wYXRoOiBjaXJjbGUoNTAlLCA1MCUsIDUw JSkgYm9yZGVyLWJveDsKKyAgICBvdXRsaW5lOiAyMHB4IHNvbGlkIHRyYW5zcGFyZW50OworfQor PC9zdHlsZT4KKzxkaXY+PC9kaXY+Cg== 224569 2014-02-18 17:19:23 -0800 2014-02-18 17:45:55 -0800 Patch bug-128929-20140218171918.patch text/plain 6740 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTY0MzMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWU3Y2M3ZjUwNGFlMzUw Mjg3ZDFlMDU1ZDkyMWRhYWU1MjI2Mjc2ZC4uZTZlMGFmMzNhODgzNGQwZWU4NDg2YTYyN2U4OTUy ZGJkOTQ0YTFiNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE0LTAyLTE4ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIGJvcmRlci1ib3gg Y2xpcC1wYXRocyBqdW1wIGFyb3VuZCB3aGVuIG91dGxpbmUgY2hhbmdlcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI4OTI5CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIAorICAgICAgICBjb21wdXRlUmVmZXJl bmNlQm94KCkgZm9yIGNsaXAgcGF0aHMgd2FzIHVzaW5nICJyb290UmVsYXRpdmVCb3VuZHMiCisg ICAgICAgIHRvIHBvc2l0aW9uIHRoZSBib3JkZXItYm94LiBUaGlzIGJvdW5kcyBpcyBhbiBlbmNs b3NpbmcgYm91bmRzIGZvcgorICAgICAgICB0aGUgbGF5ZXIgYW5kIGl0cyBkZXNjZW5kYW50cywg aW5jbHVkaW5nIG91dGxpbmVzIGFuZCBhYnNvbHV0ZSBkZXNjZW5kYW50cywKKyAgICAgICAgc28g aXQgaXMgbm90IHRoZSBjb3JyZWN0IGJveCB0byB1c2UgdG8gb2Zmc2V0IHRoZSBib3JkZXItYm94 LgorICAgICAgICAKKyAgICAgICAgVGhlIGNhbGxlciBoYXMgb2Zmc2V0RnJvbVJvb3QoKSwgd2hp Y2ggaXMgdGhlIGNvcnJlY3QgdGhpbmcgdG8gdXNlLAorICAgICAgICBzbyB1c2UgaXQuCisKKyAg ICAgICAgVGVzdDogY3NzMy9tYXNraW5nL2NsaXAtcGF0aC1yb290LXJlbGF0aXZlLWJvdW5kcy5o dG1sCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6Y29tcHV0ZVJlZmVyZW5jZUJveCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXll cjo6c2V0dXBDbGlwUGF0aCk6CisKIDIwMTQtMDItMTggIEphbWVzIENyYWlnICA8amNyYWlnQGFw cGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBBWDogbW9yZSBwcm9wZXJ0aWVzOiBl eGlzdHMsIHJlcXVpcmVkLCBhbmQgaW52YWxpZCAoZXhpc3RzIHdhcyBwcmV2aW91c2x5IGNvbWJp bmVkIHdpdGggaWdub3JlZCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJMYXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3Bw CmluZGV4IDQxN2U4MjVlN2VhMmU5MWU2YTU2ZWZlMjA1YzIwOWZhNWM3ZjRjOTEuLjZjYjJlN2E1 MTU3YzEyZDUyY2VhNjhhNWM4MDMwYmI2M2M3ZjdkMmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxheWVyLmNwcApAQCAtMzc4OCw3ICszNzg4LDcgQEAgYm9vbCBSZW5kZXJMYXll cjo6c2V0dXBGb250U3VicGl4ZWxRdWFudGl6YXRpb24oR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0 LCBib29sJgogfQogCiB0ZW1wbGF0ZSA8Y2xhc3MgUmVmZXJlbmNlQm94Q2xpcFBhdGhPcGVyYXRp b24+Ci1zdGF0aWMgaW5saW5lIExheW91dFJlY3QgY29tcHV0ZVJlZmVyZW5jZUJveChjb25zdCBS ZW5kZXJPYmplY3QmIHJlbmRlcmVyLCBjb25zdCBSZWZlcmVuY2VCb3hDbGlwUGF0aE9wZXJhdGlv biYgY2xpcHBpbmdQYXRoLCBjb25zdCBMYXlvdXRSZWN0JiByb290UmVsYXRpdmVCb3VuZHMpCitz dGF0aWMgaW5saW5lIExheW91dFJlY3QgY29tcHV0ZVJlZmVyZW5jZUJveChjb25zdCBSZW5kZXJP YmplY3QmIHJlbmRlcmVyLCBjb25zdCBSZWZlcmVuY2VCb3hDbGlwUGF0aE9wZXJhdGlvbiYgY2xp cHBpbmdQYXRoLCBjb25zdCBMYXlvdXRQb2ludCYgb2Zmc2V0RnJvbVJvb3QsIGNvbnN0IExheW91 dFJlY3QmIHJvb3RSZWxhdGl2ZUJvdW5kcykKIHsKICAgICBMYXlvdXRSZWN0IHJlZmVyZW5jZUJv eDsKICAgICBpZiAocmVuZGVyZXIuaXNCb3goKSkgewpAQCAtMzc5NiwxMSArMzc5NiwxMSBAQCBz dGF0aWMgaW5saW5lIExheW91dFJlY3QgY29tcHV0ZVJlZmVyZW5jZUJveChjb25zdCBSZW5kZXJP YmplY3QmIHJlbmRlcmVyLCBjb25zdAogICAgICAgICBzd2l0Y2ggKGNsaXBwaW5nUGF0aC5yZWZl cmVuY2VCb3goKSkgewogICAgICAgICAgICAgY2FzZSBDb250ZW50Qm94OgogICAgICAgICAgICAg ICAgIHJlZmVyZW5jZUJveCA9IGJveC5jb250ZW50Qm94UmVjdCgpOwotICAgICAgICAgICAgICAg IHJlZmVyZW5jZUJveC5tb3ZlQnkocm9vdFJlbGF0aXZlQm91bmRzLmxvY2F0aW9uKCkpOworICAg ICAgICAgICAgICAgIHJlZmVyZW5jZUJveC5tb3ZlQnkob2Zmc2V0RnJvbVJvb3QpOwogICAgICAg ICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgY2FzZSBQYWRkaW5nQm94OgogICAgICAgICAg ICAgICAgIHJlZmVyZW5jZUJveCA9IGJveC5wYWRkaW5nQm94UmVjdCgpOwotICAgICAgICAgICAg ICAgIHJlZmVyZW5jZUJveC5tb3ZlQnkocm9vdFJlbGF0aXZlQm91bmRzLmxvY2F0aW9uKCkpOwor ICAgICAgICAgICAgICAgIHJlZmVyZW5jZUJveC5tb3ZlQnkob2Zmc2V0RnJvbVJvb3QpOwogICAg ICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgLy8gZmlsbCwgc3Ryb2tlLCB2aWV3LWJv eCBjb21wdXRlIHRvIGJvcmRlci1ib3ggZm9yIEhUTUwgZWxlbWVudHMuCiAgICAgICAgICAgICBj YXNlIEZpbGw6CkBAIC0zODA4LDcgKzM4MDgsNyBAQCBzdGF0aWMgaW5saW5lIExheW91dFJlY3Qg Y29tcHV0ZVJlZmVyZW5jZUJveChjb25zdCBSZW5kZXJPYmplY3QmIHJlbmRlcmVyLCBjb25zdAog ICAgICAgICAgICAgY2FzZSBWaWV3Qm94OgogICAgICAgICAgICAgY2FzZSBCb3JkZXJCb3g6CiAg ICAgICAgICAgICAgICAgcmVmZXJlbmNlQm94ID0gYm94LmJvcmRlckJveFJlY3QoKTsKLSAgICAg ICAgICAgICAgICByZWZlcmVuY2VCb3gubW92ZUJ5KHJvb3RSZWxhdGl2ZUJvdW5kcy5sb2NhdGlv bigpKTsKKyAgICAgICAgICAgICAgICByZWZlcmVuY2VCb3gubW92ZUJ5KG9mZnNldEZyb21Sb290 KTsKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIGNhc2UgTWFyZ2luQm94Ogog ICAgICAgICAgICAgICAgIC8vIEZJWE1FOiBTdXBwb3J0IG1hcmdpbi1ib3guIFVzZSBib3VuZGlu ZyBjbGllbnQgcmVjdCBmb3Igbm93LgpAQCAtMzg0MSw3ICszODQxLDcgQEAgYm9vbCBSZW5kZXJM YXllcjo6c2V0dXBDbGlwUGF0aChHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IExheWVy UGFpbnRpbmdJbmYKICAgICBpZiAoc3R5bGUuY2xpcFBhdGgoKS0+dHlwZSgpID09IENsaXBQYXRo T3BlcmF0aW9uOjpTaGFwZSkgewogICAgICAgICBTaGFwZUNsaXBQYXRoT3BlcmF0aW9uJiBjbGlw cGluZ1BhdGggPSB0b1NoYXBlQ2xpcFBhdGhPcGVyYXRpb24oKihzdHlsZS5jbGlwUGF0aCgpKSk7 CiAKLSAgICAgICAgTGF5b3V0UmVjdCByZWZlcmVuY2VCb3ggPSBjb21wdXRlUmVmZXJlbmNlQm94 KHJlbmRlcmVyKCksIGNsaXBwaW5nUGF0aCwgcm9vdFJlbGF0aXZlQm91bmRzKTsKKyAgICAgICAg TGF5b3V0UmVjdCByZWZlcmVuY2VCb3ggPSBjb21wdXRlUmVmZXJlbmNlQm94KHJlbmRlcmVyKCks IGNsaXBwaW5nUGF0aCwgb2Zmc2V0RnJvbVJvb3QsIHJvb3RSZWxhdGl2ZUJvdW5kcyk7CiAgICAg ICAgIGNvbnRleHQtPnNhdmUoKTsKICAgICAgICAgY29udGV4dC0+Y2xpcFBhdGgoY2xpcHBpbmdQ YXRoLnBhdGhGb3JSZWZlcmVuY2VSZWN0KHJlZmVyZW5jZUJveCksIGNsaXBwaW5nUGF0aC53aW5k UnVsZSgpKTsKICAgICAgICAgcmV0dXJuIHRydWU7CkBAIC0zODUwLDcgKzM4NTAsNyBAQCBib29s IFJlbmRlckxheWVyOjpzZXR1cENsaXBQYXRoKEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29u c3QgTGF5ZXJQYWludGluZ0luZgogICAgIGlmIChzdHlsZS5jbGlwUGF0aCgpLT50eXBlKCkgPT0g Q2xpcFBhdGhPcGVyYXRpb246OkJveCkgewogICAgICAgICBCb3hDbGlwUGF0aE9wZXJhdGlvbiYg Y2xpcHBpbmdQYXRoID0gdG9Cb3hDbGlwUGF0aE9wZXJhdGlvbigqKHN0eWxlLmNsaXBQYXRoKCkp KTsKIAotICAgICAgICBMYXlvdXRSZWN0IHJlZmVyZW5jZUJveCA9IGNvbXB1dGVSZWZlcmVuY2VC b3gocmVuZGVyZXIoKSwgY2xpcHBpbmdQYXRoLCByb290UmVsYXRpdmVCb3VuZHMpOworICAgICAg ICBMYXlvdXRSZWN0IHJlZmVyZW5jZUJveCA9IGNvbXB1dGVSZWZlcmVuY2VCb3gocmVuZGVyZXIo KSwgY2xpcHBpbmdQYXRoLCBvZmZzZXRGcm9tUm9vdCwgcm9vdFJlbGF0aXZlQm91bmRzKTsKICAg ICAgICAgLy8gRklYTUUgVGhpcyBkb2VzIG5vdCBwcm9wZXJseSBjb21wdXRlIHRoZSByb3VuZGVk IGNvcm5lcnMgYXMgc3BlY2lmaWVkIGluIGFsbCBjb25kaXRpb25zLgogICAgICAgICAvLyBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI3OTgyCiAgICAgICAgIGNvbnN0 IFJvdW5kZWRSZWN0JiBzaGFwZVJlY3QgPSByZW5kZXJlcigpLnN0eWxlKCkuZ2V0Um91bmRlZEJv cmRlckZvcihyZWZlcmVuY2VCb3gsICYocmVuZGVyZXIoKS52aWV3KCkpKTsKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAyZDE3 MWZlNWQxZWMzYmY0MjRlODQ3ODI4NmRhMzJiODM4YWU4YjExLi5jYjYyNGFiNWY2NGE5Y2RjNDg2 OGU1ZGMxYTgxZGRiODkzMjUyMDk4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK KysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTQtMDItMTgg IFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgYm9yZGVy LWJveCBjbGlwLXBhdGhzIGp1bXAgYXJvdW5kIHdoZW4gb3V0bGluZSBjaGFuZ2VzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjg5MjkKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIFRlc3QgY29t cGFyaW5nIGEgYm9yZGVyLWJveCBjbGlwIHBhdGggd2l0aCBhbmQgd2l0aG91dCBhbiBvdXRsaW5l LgorCisgICAgICAgICogY3NzMy9tYXNraW5nL2NsaXAtcGF0aC1yb290LXJlbGF0aXZlLWJvdW5k cy1leHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBjc3MzL21hc2tpbmcvY2xpcC1wYXRo LXJvb3QtcmVsYXRpdmUtYm91bmRzLmh0bWw6IEFkZGVkLgorCiAyMDE0LTAyLTE4ICBKYW1lcyBD cmFpZyAgPGpjcmFpZ0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogQVg6IG1v cmUgcHJvcGVydGllczogZXhpc3RzLCByZXF1aXJlZCwgYW5kIGludmFsaWQgKGV4aXN0cyB3YXMg cHJldmlvdXNseSBjb21iaW5lZCB3aXRoIGlnbm9yZWQpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9jc3MzL21hc2tpbmcvY2xpcC1wYXRoLXJvb3QtcmVsYXRpdmUtYm91bmRzLWV4cGVjdGVkLmh0 bWwgYi9MYXlvdXRUZXN0cy9jc3MzL21hc2tpbmcvY2xpcC1wYXRoLXJvb3QtcmVsYXRpdmUtYm91 bmRzLWV4cGVjdGVkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMTg2ODQ3MWIwOWMxNzI1ZGM0NWQ0NWZkYjEz ZmRhZWE2ZDI0M2U3NwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2NzczMvbWFza2lu Zy9jbGlwLXBhdGgtcm9vdC1yZWxhdGl2ZS1ib3VuZHMtZXhwZWN0ZWQuaHRtbApAQCAtMCwwICsx LDExIEBACis8c3R5bGU+CitkaXYgeworICAgIHdpZHRoOiA1MDBweDsKKyAgICBoZWlnaHQ6IDIw MHB4OworICAgIG1hcmdpbjogMjBweDsKKyAgICBiYWNrZ3JvdW5kOiBibHVlOworICAgIGJvcmRl cjogc29saWQgcmVkIDIwcHg7CisgICAgLXdlYmtpdC1jbGlwLXBhdGg6IGNpcmNsZSg1MCUgYXQg NTAlIDUwJSkgYm9yZGVyLWJveDsKK30KKzwvc3R5bGU+Cis8ZGl2PjwvZGl2PgpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvY3NzMy9tYXNraW5nL2NsaXAtcGF0aC1yb290LXJlbGF0aXZlLWJvdW5k cy5odG1sIGIvTGF5b3V0VGVzdHMvY3NzMy9tYXNraW5nL2NsaXAtcGF0aC1yb290LXJlbGF0aXZl LWJvdW5kcy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjA5Yjc3MWRjYzI1ZWQ0YTVmOGYzMzA2YmQyMzk3ZmVk ZDA3MjkzMmIKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9jc3MzL21hc2tpbmcvY2xp cC1wYXRoLXJvb3QtcmVsYXRpdmUtYm91bmRzLmh0bWwKQEAgLTAsMCArMSwxMiBAQAorPHN0eWxl PgorZGl2IHsKKyAgICB3aWR0aDogNTAwcHg7CisgICAgaGVpZ2h0OiAyMDBweDsKKyAgICBtYXJn aW46IDIwcHg7CisgICAgYmFja2dyb3VuZDogYmx1ZTsKKyAgICBib3JkZXI6IHNvbGlkIHJlZCAy MHB4OworICAgIC13ZWJraXQtY2xpcC1wYXRoOiBjaXJjbGUoNTAlIGF0IDUwJSA1MCUpIGJvcmRl ci1ib3g7CisgICAgb3V0bGluZTogMjBweCBzb2xpZCB0cmFuc3BhcmVudDsKK30KKzwvc3R5bGU+ Cis8ZGl2PjwvZGl2Pgo=