29314 2009-09-16 14:40:54 -0700 Elements appear behind <video> when they should be in front sometimes 2009-09-17 09:56:59 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser oldest_to_newest 147630 0 simon.fraser 2009-09-16 14:40:54 -0700 Certain configurations of content layer incorrectly with <video> when accelerated compositing is enabled. This is fallout from bug 27021. 147631 1 simon.fraser 2009-09-16 14:41:19 -0700 <rdar://problem/7186095> 147687 2 39669 simon.fraser 2009-09-16 17:22:03 -0700 Created attachment 39669 Patch, testcase, changelog 147724 3 39677 simon.fraser 2009-09-16 19:50:10 -0700 Created attachment 39677 Simpler patch 147815 4 39677 mitz 2009-09-17 09:28:25 -0700 Comment on attachment 39677 Simpler patch > + if (overlapMap && overlapMap->size()) { This is better expressed as !overlapMap.isEmpty() 147824 5 simon.fraser 2009-09-17 09:56:59 -0700 http://trac.webkit.org/changeset/48470 39669 2009-09-16 17:22:03 -0700 2009-09-16 19:50:10 -0700 Patch, testcase, changelog 29314_patch.txt text/plain 8716 simon.fraser ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA2ODAyMTViLi5jODBkOWJlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMDktMDkt MTYgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRWxlbWVudHMgYXBwZWFyIGJlaGlu ZCA8dmlkZW8+IHdoZW4gdGhleSBzaG91bGQgYmUgaW4gZnJvbnQgc29tZXRpbWVzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yOTMxNAorICAgICAgICAK KyAgICAgICAgVGVzdGNhc2UgZm9yIGEgZGl2IGxheWVyZWQgb24gdG9wIG9mIGEgdmlkZW8gZWxl bWVudCwgd2l0aCBhIHBhcnRpY3VsYXIgY29uZmlndXJhdGlvbgorICAgICAgICBvZiBwb3NpdGlv biBhbmQgb3BhY2l0eS4KKworICAgICAgICAqIGNvbXBvc2l0aW5nL2dlb21ldHJ5L3ZpZGVvLW9w YWNpdHktb3ZlcmxheS5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvY29tcG9z aXRpbmcvZ2VvbWV0cnkvdmlkZW8tb3BhY2l0eS1vdmVybGF5LWV4cGVjdGVkLmNoZWNrc3VtOiBB ZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvY29tcG9zaXRpbmcvZ2VvbWV0cnkvdmlkZW8t b3BhY2l0eS1vdmVybGF5LWV4cGVjdGVkLnBuZzogQWRkZWQuCisgICAgICAgICogcGxhdGZvcm0v bWFjL2NvbXBvc2l0aW5nL2dlb21ldHJ5L3ZpZGVvLW9wYWNpdHktb3ZlcmxheS1leHBlY3RlZC50 eHQ6IEFkZGVkLgorCiAyMDA5LTA5LTE0ICBBbmRyZXcgUmljaGFyZHMgIDxyYW5kcmV3QGdtYWls LmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTYW0gV2VpbmlnLgpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvY29tcG9zaXRpbmcvZ2VvbWV0cnkvdmlkZW8tb3BhY2l0eS1vdmVybGF5Lmh0bWwg Yi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9nZW9tZXRyeS92aWRlby1vcGFjaXR5LW92ZXJsYXku aHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi45MTgyOGU4Ci0tLSAvZGV2 L251bGwKKysrIGIvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvZ2VvbWV0cnkvdmlkZW8tb3BhY2l0 eS1vdmVybGF5Lmh0bWwKQEAgLTAsMCArMSw1NyBAQAorPCFET0NUWVBFIEhUTUwgUFVCTElDICIt Ly9XM0MvL0RURCBIVE1MIDQuMDEvL0VOIgorICAiaHR0cDovL3d3dy53My5vcmcvVFIvaHRtbDQv c3RyaWN0LmR0ZCI+Cis8aHRtbD4KKzxoZWFkPgorICA8bWV0YSBodHRwLWVxdWl2PSJDb250ZW50 LVR5cGUiIGNvbnRlbnQ9InRleHQvaHRtbDsgY2hhcnNldD11dGYtOCI+CisgIDx0aXRsZT5WaWRl byBvdmVybGF5PC90aXRsZT4KKyAgPHN0eWxlIHR5cGU9InRleHQvY3NzIiBtZWRpYT0ic2NyZWVu Ij4KKyAgICB2aWRlbyB7CisgICAgICB3aWR0aDogMTAwJTsKKyAgICAgIGhlaWdodDogMTAwJTsK KyAgICB9CisgICAgCisgICAgLmNvbnRhaW5lciB7CisgICAgICBwb3NpdGlvbjogcmVsYXRpdmU7 CisgICAgICB3aWR0aDogNDAwcHg7CisgICAgICBoZWlnaHQ6IDMwMHB4OworICAgICAgYm9yZGVy OiAxcHggc29saWQgYmxhY2s7CisgICAgfQorICAgIAorICAgIC5jb250cm9scyB7CisgICAgICBv cGFjaXR5OiAwLjg7CisgICAgICBoZWlnaHQ6IDEwcHg7CisgICAgICB3aWR0aDogMTBweDsKKyAg ICAgIGJhY2tncm91bmQtY29sb3I6IGdyZWVuOworICAgIH0KKyAgICAKKyAgICAjY29udHJvbC1i YXIgeworICAgICAgcG9zaXRpb246IGFic29sdXRlOworICAgICAgbGVmdDogMDsKKyAgICAgIGJv dHRvbTogMHB4OworICAgICAgd2lkdGg6IDEwMCU7CisgICAgICBoZWlnaHQ6IDYwcHg7CisgICAg ICBiYWNrZ3JvdW5kLWNvbG9yOiBvcmFuZ2U7CisgICAgfQorICA8L3N0eWxlPgorICA8c2NyaXB0 IHR5cGU9InRleHQvamF2YXNjcmlwdCIgY2hhcnNldD0idXRmLTgiPgorICAgIGlmICh3aW5kb3cu bGF5b3V0VGVzdENvbnRyb2xsZXIpCisgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci53YWl0VW50 aWxEb25lKCk7CisgIDwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+CisgIDxwPlRoZSBvcmFuZ2Ug YmFyIHNob3VsZCBiZSBpbiBmcm9udCBvZiB0aGUgdmlkZW8uPC9wPgorICA8ZGl2IGNsYXNzPSJj b250YWluZXIiPgorICAgIDx2aWRlbyBzcmM9Ii4uL3Jlc291cmNlcy92aWRlby5tcDQiPjwvdmlk ZW8+CisgICAgPGRpdiBjbGFzcz0iY29udHJvbHMiIGlkPSJjb250cm9scyI+CisgICAgICA8ZGl2 IGlkPSJjb250cm9sLWJhciI+PC9kaXY+CisgICAgPC9kaXY+CisgIDwvZGl2PgorICA8c2NyaXB0 IHR5cGU9InRleHQvamF2YXNjcmlwdCIgY2hhcnNldD0idXRmLTgiPgorICAgIHZhciB2aWRlbyA9 IGRvY3VtZW50LmdldEVsZW1lbnRzQnlUYWdOYW1lKCd2aWRlbycpWzBdOworICAgIHZpZGVvLmFk ZEV2ZW50TGlzdGVuZXIoJ2NhbnBsYXl0aHJvdWdoJywgZnVuY3Rpb24oKSB7CisgICAgICBpZiAo d2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKQorICAgICAgICBsYXlvdXRUZXN0Q29udHJvbGxl ci5ub3RpZnlEb25lKCk7CisgICAgfSwgZmFsc2UpOworICA8L3NjcmlwdD4KKzwvYm9keT4KKzwv aHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9jb21wb3NpdGluZy9n ZW9tZXRyeS92aWRlby1vcGFjaXR5LW92ZXJsYXktZXhwZWN0ZWQuY2hlY2tzdW0gYi9MYXlvdXRU ZXN0cy9wbGF0Zm9ybS9tYWMvY29tcG9zaXRpbmcvZ2VvbWV0cnkvdmlkZW8tb3BhY2l0eS1vdmVy bGF5LWV4cGVjdGVkLmNoZWNrc3VtCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAu LjUzNjBjNWYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvY29t cG9zaXRpbmcvZ2VvbWV0cnkvdmlkZW8tb3BhY2l0eS1vdmVybGF5LWV4cGVjdGVkLmNoZWNrc3Vt CkBAIC0wLDAgKzEgQEAKK2U2MWI4MDkxOWVkZWZkMTI3YjJkMTFkM2Y4YTY1YWRmClwgTm8gbmV3 bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFj L2NvbXBvc2l0aW5nL2dlb21ldHJ5L3ZpZGVvLW9wYWNpdHktb3ZlcmxheS1leHBlY3RlZC5wbmcg Yi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvY29tcG9zaXRpbmcvZ2VvbWV0cnkvdmlkZW8tb3Bh Y2l0eS1vdmVybGF5LWV4cGVjdGVkLnBuZwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwLi5kNGM5ZjdiCkJpbmFyeSBmaWxlcyAvZGV2L251bGwgYW5kIGIvTGF5b3V0VGVzdHMvcGxh dGZvcm0vbWFjL2NvbXBvc2l0aW5nL2dlb21ldHJ5L3ZpZGVvLW9wYWNpdHktb3ZlcmxheS1leHBl Y3RlZC5wbmcgZGlmZmVyCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvY29t cG9zaXRpbmcvZ2VvbWV0cnkvdmlkZW8tb3BhY2l0eS1vdmVybGF5LWV4cGVjdGVkLnR4dCBiL0xh eW91dFRlc3RzL3BsYXRmb3JtL21hYy9jb21wb3NpdGluZy9nZW9tZXRyeS92aWRlby1vcGFjaXR5 LW92ZXJsYXktZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAu LjMyMDcyMzkKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvY29t cG9zaXRpbmcvZ2VvbWV0cnkvdmlkZW8tb3BhY2l0eS1vdmVybGF5LWV4cGVjdGVkLnR4dApAQCAt MCwwICsxLDE4IEBACitsYXllciBhdCAoMCwwKSBzaXplIDgwMHg2MDAKKyAgUmVuZGVyVmlldyBh dCAoMCwwKSBzaXplIDgwMHg2MDAKK2xheWVyIGF0ICgwLDApIHNpemUgODAweDM2MAorICBSZW5k ZXJCbG9jayB7SFRNTH0gYXQgKDAsMCkgc2l6ZSA4MDB4MzYwCisgICAgUmVuZGVyQm9keSB7Qk9E WX0gYXQgKDgsMTYpIHNpemUgNzg0eDMzNgorICAgICAgUmVuZGVyQmxvY2sge1B9IGF0ICgwLDAp IHNpemUgNzg0eDE4CisgICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoMCwwKSBzaXplIDI5 NHgxOAorICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDApIHdpZHRoIDI5NDogIlRoZSBvcmFuZ2Ug YmFyIHNob3VsZCBiZSBpbiBmcm9udCBvZiB0aGUgdmlkZW8uIgorbGF5ZXIgYXQgKDgsNTApIHNp emUgNDAyeDMwNQorICBSZW5kZXJCbG9jayAocmVsYXRpdmUgcG9zaXRpb25lZCkge0RJVn0gYXQg KDAsMzQpIHNpemUgNDAyeDMwMiBbYm9yZGVyOiAoMXB4IHNvbGlkICMwMDAwMDApXQorICAgIFJl bmRlckJsb2NrIChhbm9ueW1vdXMpIGF0ICgxLDEpIHNpemUgNDAweDMwNAorICAgICAgUmVuZGVy VGV4dCB7I3RleHR9IGF0ICgwLDApIHNpemUgMHgwCitsYXllciBhdCAoOSw1MSkgc2l6ZSA0MDB4 MzAwCisgIFJlbmRlclZpZGVvIHtWSURFT30gYXQgKDAsMCkgc2l6ZSA0MDB4MzAwCitsYXllciBh dCAoOSwzNTUpIHNpemUgMTB4MTAKKyAgUmVuZGVyQmxvY2sge0RJVn0gYXQgKDEsMzA1KSBzaXpl IDEweDEwIFtiZ2NvbG9yPSMwMDgwMDBdCitsYXllciBhdCAoOSwyOTEpIHNpemUgNDAweDYwCisg IFJlbmRlckJsb2NrIChwb3NpdGlvbmVkKSB7RElWfSBhdCAoMSwyNDEpIHNpemUgNDAweDYwIFti Z2NvbG9yPSNGRkE1MDBdCmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUv Q2hhbmdlTG9nCmluZGV4IDQ2YjE3NTEuLmYzNzQ3YjkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hh bmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMDktMDkt MTYgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRWxlbWVudHMgYXBwZWFyIGJlaGlu ZCA8dmlkZW8+IHdoZW4gdGhleSBzaG91bGQgYmUgaW4gZnJvbnQgc29tZXRpbWVzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yOTMxNAorICAgICAgICAK KyAgICAgICAgcjQ1NTk4IGFkZGVkIGxvZ2ljIHRoYXQgdGVzdHMgZm9yIG92ZXJsYXAgd2l0aCA8 dmlkZW8+IHRvIGRldGVybWluZSB3aGVuIHRvIHRocm93CisgICAgICAgIGEgbGF5ZXIgaW50byBj b21wb3NpdGluZyBtb2RlLiBUaGF0IGxvZ2ljIHdhcyBpbmNvcnJlY3QgaW4gc29tZSBjYXNlcywg YW5kIHRoaXMgcGF0Y2gKKyAgICAgICAgZml4ZXMgaXQuIFdoZW4gdGVzdGluZyBvdmVybGFwLCB0 aGUgbGF5ZXIgbmVlZHMgdG8gYmUgY29tcG9zaXRlZCBpZmYgc29tZSBwcmV2aW91cyBsYXllcgor ICAgICAgICBpcyBjb21wb3NpdGVkICh3aGljaCBhZGRzIGEgcmVjdCB0byB0aGUgb3ZlcmxheSBt YXApLCBhbmQgdGhlcmUgaXMgb3ZlcmxhcC4KKworICAgICAgICBUZXN0OiBjb21wb3NpdGluZy9n ZW9tZXRyeS92aWRlby1vcGFjaXR5LW92ZXJsYXkuaHRtbAorCisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDb21wb3NpdGlu Z1N0YXRlOjpDb21wb3NpdGluZ1N0YXRlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVy Q29tcG9zaXRvcjo6Y29tcHV0ZUNvbXBvc2l0aW5nUmVxdWlyZW1lbnRzKToKKwogMjAwOS0wOS0x NSAgQWxleCBNaWxvd3NraSAgPGFsZXhAbWlsb3dza2kuY29tPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IFRvciBBcm5lIFZlc3Riw7guCmRpZmYgLS1naXQgYS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJMYXllckNvbXBvc2l0b3IuY3BwIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21w b3NpdG9yLmNwcAppbmRleCA2NWE5YzRhLi42MDVhY2M2IDEwMDY0NAotLS0gYS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKQEAgLTU5LDkgKzU5LDEwIEBAIGJvb2wgV2ViQ29y ZUhhczNEUmVuZGVyaW5nID0gdHJ1ZTsKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogc3RydWN0IENv bXBvc2l0aW5nU3RhdGUgewotICAgIENvbXBvc2l0aW5nU3RhdGUoUmVuZGVyTGF5ZXIqIGNvbXBB bmNlc3RvcikKKyAgICBDb21wb3NpdGluZ1N0YXRlKFJlbmRlckxheWVyKiBjb21wQW5jZXN0b3Is IGJvb2wgZWFybGllckxheWVySXNDb21wb3NpdGluZyA9IGZhbHNlKQogICAgICAgICA6IG1fY29t cG9zaXRpbmdBbmNlc3Rvcihjb21wQW5jZXN0b3IpCiAgICAgICAgICwgbV9zdWJ0cmVlSXNDb21w b3NpdGluZyhmYWxzZSkKKyAgICAgICAgLCBtX2VhcmxpZXJMYXllcklzQ29tcG9zaXRpbmcoZWFy bGllckxheWVySXNDb21wb3NpdGluZykKICNpZm5kZWYgTkRFQlVHCiAgICAgICAgICwgbV9kZXB0 aCgwKQogI2VuZGlmCkBAIC02OSw3ICs3MCw4IEBAIHN0cnVjdCBDb21wb3NpdGluZ1N0YXRlIHsK ICAgICB9CiAgICAgCiAgICAgUmVuZGVyTGF5ZXIqIG1fY29tcG9zaXRpbmdBbmNlc3RvcjsKLSAg ICBib29sIG1fc3VidHJlZUlzQ29tcG9zaXRpbmc7CisgICAgYm9vbCBtX3N1YnRyZWVJc0NvbXBv c2l0aW5nOyAgICAgICAgLy8gd2hldGhlciB0aGUgY3VycmVudCBzdWJ0cmVlIGlzIGNvbXBvc2l0 aW5nCisgICAgYm9vbCBtX2VhcmxpZXJMYXllcklzQ29tcG9zaXRpbmc7ICAgLy8gd2hldGhlciBz b21lIGxheWVyIGVhcmxpZXIgaW4gdGhlIHotb3JkZXIgaGllcmFyY2h5IGlzIGNvbXBvc2l0aW5n CiAjaWZuZGVmIE5ERUJVRwogICAgIGludCBtX2RlcHRoOwogI2VuZGlmCkBAIC00MzEsMTEgKzQz MywxMSBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6Y29tcHV0ZUNvbXBvc2l0aW5nUmVx dWlyZW1lbnRzKFJlbmRlckxheWVyKiBsYXllciwgTwogCiAgICAgYm9vbCBoYXZlQ29tcHV0ZWRC b3VuZHMgPSBmYWxzZTsKICAgICBJbnRSZWN0IGFic0JvdW5kczsKLSAgICBpZiAob3ZlcmxhcE1h cCAmJiBtdXN0T3ZlcmxhcENvbXBvc2l0ZWRMYXllcnMpIHsKKyAgICBpZiAob3ZlcmxhcE1hcCAm JiBjb21wb3NpdGluZ1N0YXRlLm1fZWFybGllckxheWVySXNDb21wb3NpdGluZykgewogICAgICAg ICAvLyBJZiB3ZSdyZSB0ZXN0aW5nIGZvciBvdmVybGFwLCB3ZSBvbmx5IG5lZWQgdG8gY29tcG9z aXRlIGlmIHdlIG92ZXJsYXAgc29tZXRoaW5nIHRoYXQgaXMgYWxyZWFkeSBjb21wb3NpdGVkLgog ICAgICAgICBhYnNCb3VuZHMgPSBsYXllci0+cmVuZGVyZXIoKS0+bG9jYWxUb0Fic29sdXRlUXVh ZChGbG9hdFJlY3QobGF5ZXItPmxvY2FsQm91bmRpbmdCb3goKSkpLmVuY2xvc2luZ0JvdW5kaW5n Qm94KCk7CiAgICAgICAgIGhhdmVDb21wdXRlZEJvdW5kcyA9IHRydWU7Ci0gICAgICAgIG11c3RP dmVybGFwQ29tcG9zaXRlZExheWVycyAmPSBvdmVybGFwc0NvbXBvc2l0ZWRMYXllcnMoKm92ZXJs YXBNYXAsIGFic0JvdW5kcyk7CisgICAgICAgIG11c3RPdmVybGFwQ29tcG9zaXRlZExheWVycyA9 IG92ZXJsYXBzQ29tcG9zaXRlZExheWVycygqb3ZlcmxhcE1hcCwgYWJzQm91bmRzKTsKICAgICB9 CiAgICAgCiAgICAgbGF5ZXItPnNldE11c3RPdmVybGFwQ29tcG9zaXRlZExheWVycyhtdXN0T3Zl cmxhcENvbXBvc2l0ZWRMYXllcnMpOwpAQCAtNDQzLDcgKzQ0NSw3IEBAIHZvaWQgUmVuZGVyTGF5 ZXJDb21wb3NpdG9yOjpjb21wdXRlQ29tcG9zaXRpbmdSZXF1aXJlbWVudHMoUmVuZGVyTGF5ZXIq IGxheWVyLCBPCiAgICAgLy8gVGhlIGNoaWxkcmVuIG9mIHRoaXMgbGF5ZXIgZG9uJ3QgbmVlZCB0 byBjb21wb3NpdGUsIHVubGVzcyB0aGVyZSBpcwogICAgIC8vIGEgY29tcG9zaXRpbmcgbGF5ZXIg YW1vbmcgdGhlbSwgc28gc3RhcnQgYnkgaW5oZXJpdGluZyB0aGUgY29tcG9zaXRpbmcKICAgICAv LyBhbmNlc3RvciB3aXRoIG1fc3VidHJlZUlzQ29tcG9zaXRpbmcgc2V0IHRvIGZhbHNlLgotICAg IENvbXBvc2l0aW5nU3RhdGUgY2hpbGRTdGF0ZShjb21wb3NpdGluZ1N0YXRlLm1fY29tcG9zaXRp bmdBbmNlc3Rvcik7CisgICAgQ29tcG9zaXRpbmdTdGF0ZSBjaGlsZFN0YXRlKGNvbXBvc2l0aW5n U3RhdGUubV9jb21wb3NpdGluZ0FuY2VzdG9yLCBjb21wb3NpdGluZ1N0YXRlLm1fZWFybGllckxh eWVySXNDb21wb3NpdGluZyk7CiAjaWZuZGVmIE5ERUJVRwogICAgICsrY2hpbGRTdGF0ZS5tX2Rl cHRoOwogI2VuZGlmCkBAIC01MTYsOCArNTE4LDEwIEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3Np dG9yOjpjb21wdXRlQ29tcG9zaXRpbmdSZXF1aXJlbWVudHMoUmVuZGVyTGF5ZXIqIGxheWVyLCBP CiAgICAgfQogCiAgICAgLy8gU3Vic2VxdWVudCBsYXllcnMgaW4gdGhlIHBhcmVudCBzdGFja2lu ZyBjb250ZXh0IGFsc28gbmVlZCB0byBjb21wb3NpdGUuCi0gICAgaWYgKGNoaWxkU3RhdGUubV9z dWJ0cmVlSXNDb21wb3NpdGluZykKKyAgICBpZiAoY2hpbGRTdGF0ZS5tX3N1YnRyZWVJc0NvbXBv c2l0aW5nKSB7CiAgICAgICAgIGNvbXBvc2l0aW5nU3RhdGUubV9zdWJ0cmVlSXNDb21wb3NpdGlu ZyA9IHRydWU7CisgICAgICAgIGNvbXBvc2l0aW5nU3RhdGUubV9lYXJsaWVyTGF5ZXJJc0NvbXBv c2l0aW5nID0gdHJ1ZTsKKyAgICB9CiAKICAgICAvLyBJZiB0aGUgbGF5ZXIgaXMgZ29pbmcgaW50 byBjb21wb3NpdGluZyBtb2RlLCByZXBhaW50IGl0cyBvbGQgbG9jYXRpb24uCiAgICAgaWYgKCFs YXllci0+aXNDb21wb3NpdGVkKCkgJiYgbmVlZHNUb0JlQ29tcG9zaXRlZChsYXllcikpCg== 39677 2009-09-16 19:50:10 -0700 2009-09-17 09:28:25 -0700 Simpler patch 29314_patch.txt text/plain 6700 simon.fraser ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBlNzlmNDQxLi43M2EyODVlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMDktMDkt MTYgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRWxlbWVudHMgYXBwZWFyIGJlaGlu ZCA8dmlkZW8+IHdoZW4gdGhleSBzaG91bGQgYmUgaW4gZnJvbnQgc29tZXRpbWVzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yOTMxNAorICAgICAgICAK KyAgICAgICAgVGVzdGNhc2UgZm9yIGEgZGl2IGxheWVyZWQgb24gdG9wIG9mIGEgdmlkZW8gZWxl bWVudCwgd2l0aCBhIHBhcnRpY3VsYXIgY29uZmlndXJhdGlvbgorICAgICAgICBvZiBwb3NpdGlv biBhbmQgb3BhY2l0eS4KKworICAgICAgICAqIGNvbXBvc2l0aW5nL2dlb21ldHJ5L3ZpZGVvLW9w YWNpdHktb3ZlcmxheS5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvY29tcG9z aXRpbmcvZ2VvbWV0cnkvdmlkZW8tb3BhY2l0eS1vdmVybGF5LWV4cGVjdGVkLmNoZWNrc3VtOiBB ZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvY29tcG9zaXRpbmcvZ2VvbWV0cnkvdmlkZW8t b3BhY2l0eS1vdmVybGF5LWV4cGVjdGVkLnBuZzogQWRkZWQuCisgICAgICAgICogcGxhdGZvcm0v bWFjL2NvbXBvc2l0aW5nL2dlb21ldHJ5L3ZpZGVvLW9wYWNpdHktb3ZlcmxheS1leHBlY3RlZC50 eHQ6IEFkZGVkLgorCiAyMDA5LTA5LTE1ICBLZW50IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9y Zz4KIAogICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2NvbXBvc2l0aW5nL2dlb21ldHJ5L3ZpZGVvLW9wYWNpdHktb3ZlcmxheS5odG1sIGIv TGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvZ2VvbWV0cnkvdmlkZW8tb3BhY2l0eS1vdmVybGF5Lmh0 bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uOTE4MjhlOAotLS0gL2Rldi9u dWxsCisrKyBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL2dlb21ldHJ5L3ZpZGVvLW9wYWNpdHkt b3ZlcmxheS5odG1sCkBAIC0wLDAgKzEsNTcgQEAKKzwhRE9DVFlQRSBIVE1MIFBVQkxJQyAiLS8v VzNDLy9EVEQgSFRNTCA0LjAxLy9FTiIKKyAgImh0dHA6Ly93d3cudzMub3JnL1RSL2h0bWw0L3N0 cmljdC5kdGQiPgorPGh0bWw+Cis8aGVhZD4KKyAgPG1ldGEgaHR0cC1lcXVpdj0iQ29udGVudC1U eXBlIiBjb250ZW50PSJ0ZXh0L2h0bWw7IGNoYXJzZXQ9dXRmLTgiPgorICA8dGl0bGU+VmlkZW8g b3ZlcmxheTwvdGl0bGU+CisgIDxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyIgbWVkaWE9InNjcmVlbiI+ CisgICAgdmlkZW8geworICAgICAgd2lkdGg6IDEwMCU7CisgICAgICBoZWlnaHQ6IDEwMCU7Cisg ICAgfQorICAgIAorICAgIC5jb250YWluZXIgeworICAgICAgcG9zaXRpb246IHJlbGF0aXZlOwor ICAgICAgd2lkdGg6IDQwMHB4OworICAgICAgaGVpZ2h0OiAzMDBweDsKKyAgICAgIGJvcmRlcjog MXB4IHNvbGlkIGJsYWNrOworICAgIH0KKyAgICAKKyAgICAuY29udHJvbHMgeworICAgICAgb3Bh Y2l0eTogMC44OworICAgICAgaGVpZ2h0OiAxMHB4OworICAgICAgd2lkdGg6IDEwcHg7CisgICAg ICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKKyAgICB9CisgICAgCisgICAgI2NvbnRyb2wtYmFy IHsKKyAgICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKKyAgICAgIGxlZnQ6IDA7CisgICAgICBib3R0 b206IDBweDsKKyAgICAgIHdpZHRoOiAxMDAlOworICAgICAgaGVpZ2h0OiA2MHB4OworICAgICAg YmFja2dyb3VuZC1jb2xvcjogb3JhbmdlOworICAgIH0KKyAgPC9zdHlsZT4KKyAgPHNjcmlwdCB0 eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIGNoYXJzZXQ9InV0Zi04Ij4KKyAgICBpZiAod2luZG93Lmxh eW91dFRlc3RDb250cm9sbGVyKQorICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIud2FpdFVudGls RG9uZSgpOworICA8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorICA8cD5UaGUgb3JhbmdlIGJh ciBzaG91bGQgYmUgaW4gZnJvbnQgb2YgdGhlIHZpZGVvLjwvcD4KKyAgPGRpdiBjbGFzcz0iY29u dGFpbmVyIj4KKyAgICA8dmlkZW8gc3JjPSIuLi9yZXNvdXJjZXMvdmlkZW8ubXA0Ij48L3ZpZGVv PgorICAgIDxkaXYgY2xhc3M9ImNvbnRyb2xzIiBpZD0iY29udHJvbHMiPgorICAgICAgPGRpdiBp ZD0iY29udHJvbC1iYXIiPjwvZGl2PgorICAgIDwvZGl2PgorICA8L2Rpdj4KKyAgPHNjcmlwdCB0 eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIGNoYXJzZXQ9InV0Zi04Ij4KKyAgICB2YXIgdmlkZW8gPSBk b2N1bWVudC5nZXRFbGVtZW50c0J5VGFnTmFtZSgndmlkZW8nKVswXTsKKyAgICB2aWRlby5hZGRF dmVudExpc3RlbmVyKCdjYW5wbGF5dGhyb3VnaCcsIGZ1bmN0aW9uKCkgeworICAgICAgaWYgKHdp bmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikKKyAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIu bm90aWZ5RG9uZSgpOworICAgIH0sIGZhbHNlKTsKKyAgPC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0 bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvY29tcG9zaXRpbmcvZ2Vv bWV0cnkvdmlkZW8tb3BhY2l0eS1vdmVybGF5LWV4cGVjdGVkLmNoZWNrc3VtIGIvTGF5b3V0VGVz dHMvcGxhdGZvcm0vbWFjL2NvbXBvc2l0aW5nL2dlb21ldHJ5L3ZpZGVvLW9wYWNpdHktb3Zlcmxh eS1leHBlY3RlZC5jaGVja3N1bQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4x NDBkNTlmCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2NvbXBv c2l0aW5nL2dlb21ldHJ5L3ZpZGVvLW9wYWNpdHktb3ZlcmxheS1leHBlY3RlZC5jaGVja3N1bQpA QCAtMCwwICsxIEBACis3OWZjMzU1YzY2M2M4Y2Q4Zjk5M2EwNDg5YWVlYjBlNApcIE5vIG5ld2xp bmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9j b21wb3NpdGluZy9nZW9tZXRyeS92aWRlby1vcGFjaXR5LW92ZXJsYXktZXhwZWN0ZWQucG5nIGIv TGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2NvbXBvc2l0aW5nL2dlb21ldHJ5L3ZpZGVvLW9wYWNp dHktb3ZlcmxheS1leHBlY3RlZC5wbmcKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MC4uZTg2NThmNApCaW5hcnkgZmlsZXMgL2Rldi9udWxsIGFuZCBiL0xheW91dFRlc3RzL3BsYXRm b3JtL21hYy9jb21wb3NpdGluZy9nZW9tZXRyeS92aWRlby1vcGFjaXR5LW92ZXJsYXktZXhwZWN0 ZWQucG5nIGRpZmZlcgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2NvbXBv c2l0aW5nL2dlb21ldHJ5L3ZpZGVvLW9wYWNpdHktb3ZlcmxheS1leHBlY3RlZC50eHQgYi9MYXlv dXRUZXN0cy9wbGF0Zm9ybS9tYWMvY29tcG9zaXRpbmcvZ2VvbWV0cnkvdmlkZW8tb3BhY2l0eS1v dmVybGF5LWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4z MjA3MjM5Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2NvbXBv c2l0aW5nL2dlb21ldHJ5L3ZpZGVvLW9wYWNpdHktb3ZlcmxheS1leHBlY3RlZC50eHQKQEAgLTAs MCArMSwxOCBAQAorbGF5ZXIgYXQgKDAsMCkgc2l6ZSA4MDB4NjAwCisgIFJlbmRlclZpZXcgYXQg KDAsMCkgc2l6ZSA4MDB4NjAwCitsYXllciBhdCAoMCwwKSBzaXplIDgwMHgzNjAKKyAgUmVuZGVy QmxvY2sge0hUTUx9IGF0ICgwLDApIHNpemUgODAweDM2MAorICAgIFJlbmRlckJvZHkge0JPRFl9 IGF0ICg4LDE2KSBzaXplIDc4NHgzMzYKKyAgICAgIFJlbmRlckJsb2NrIHtQfSBhdCAoMCwwKSBz aXplIDc4NHgxOAorICAgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDAsMCkgc2l6ZSAyOTR4 MTgKKyAgICAgICAgICB0ZXh0IHJ1biBhdCAoMCwwKSB3aWR0aCAyOTQ6ICJUaGUgb3JhbmdlIGJh ciBzaG91bGQgYmUgaW4gZnJvbnQgb2YgdGhlIHZpZGVvLiIKK2xheWVyIGF0ICg4LDUwKSBzaXpl IDQwMngzMDUKKyAgUmVuZGVyQmxvY2sgKHJlbGF0aXZlIHBvc2l0aW9uZWQpIHtESVZ9IGF0ICgw LDM0KSBzaXplIDQwMngzMDIgW2JvcmRlcjogKDFweCBzb2xpZCAjMDAwMDAwKV0KKyAgICBSZW5k ZXJCbG9jayAoYW5vbnltb3VzKSBhdCAoMSwxKSBzaXplIDQwMHgzMDQKKyAgICAgIFJlbmRlclRl eHQgeyN0ZXh0fSBhdCAoMCwwKSBzaXplIDB4MAorbGF5ZXIgYXQgKDksNTEpIHNpemUgNDAweDMw MAorICBSZW5kZXJWaWRlbyB7VklERU99IGF0ICgwLDApIHNpemUgNDAweDMwMAorbGF5ZXIgYXQg KDksMzU1KSBzaXplIDEweDEwCisgIFJlbmRlckJsb2NrIHtESVZ9IGF0ICgxLDMwNSkgc2l6ZSAx MHgxMCBbYmdjb2xvcj0jMDA4MDAwXQorbGF5ZXIgYXQgKDksMjkxKSBzaXplIDQwMHg2MAorICBS ZW5kZXJCbG9jayAocG9zaXRpb25lZCkge0RJVn0gYXQgKDEsMjQxKSBzaXplIDQwMHg2MCBbYmdj b2xvcj0jRkZBNTAwXQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA5NmU1NWE2Li5hYjUyZTQwIDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5n ZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDA5LTA5LTE2 ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVsZW1lbnRzIGFwcGVhciBiZWhpbmQg PHZpZGVvPiB3aGVuIHRoZXkgc2hvdWxkIGJlIGluIGZyb250IHNvbWV0aW1lcworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjkzMTQKKyAgICAgICAgCisg ICAgICAgIHI0NTU5OCBhZGRlZCBsb2dpYyB0aGF0IHRlc3RzIGZvciBvdmVybGFwIHdpdGggPHZp ZGVvPiB0byBkZXRlcm1pbmUgd2hlbiB0byB0aHJvdworICAgICAgICBhIGxheWVyIGludG8gY29t cG9zaXRpbmcgbW9kZS4gVGhhdCBsb2dpYyB3YXMgaW5jb3JyZWN0IGluIHNvbWUgY2FzZXMsIGFu ZCB0aGlzIHBhdGNoCisgICAgICAgIGZpeGVzIGl0LiBXaGVuIHRlc3Rpbmcgb3ZlcmxhcCwgdGhl IGxheWVyIG5lZWRzIHRvIGJlIGNvbXBvc2l0ZWQgaWZmIHNvbWUgcHJldmlvdXMgbGF5ZXIKKyAg ICAgICAgaXMgY29tcG9zaXRlZCAod2hpY2ggYWRkcyBhIHJlY3QgdG8gdGhlIG92ZXJsYXkgbWFw KSwgYW5kIHRoZXJlIGlzIG92ZXJsYXAuCisKKyAgICAgICAgVGVzdDogY29tcG9zaXRpbmcvZ2Vv bWV0cnkvdmlkZW8tb3BhY2l0eS1vdmVybGF5Lmh0bWwKKworICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJD b21wb3NpdG9yOjpjb21wdXRlQ29tcG9zaXRpbmdSZXF1aXJlbWVudHMpOgorCiAyMDA5LTA5LTE1 ICBLZW50IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBi eSBFcmljIFNlaWRlbC4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy Q29tcG9zaXRvci5jcHAgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3Iu Y3BwCmluZGV4IDY1YTljNGEuLjk2MmRkYmQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKKysrIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TGF5ZXJDb21wb3NpdG9yLmNwcApAQCAtNDMxLDExICs0MzEsMTEgQEAgdm9pZCBSZW5kZXJMYXll ckNvbXBvc2l0b3I6OmNvbXB1dGVDb21wb3NpdGluZ1JlcXVpcmVtZW50cyhSZW5kZXJMYXllciog bGF5ZXIsIE8KIAogICAgIGJvb2wgaGF2ZUNvbXB1dGVkQm91bmRzID0gZmFsc2U7CiAgICAgSW50 UmVjdCBhYnNCb3VuZHM7Ci0gICAgaWYgKG92ZXJsYXBNYXAgJiYgbXVzdE92ZXJsYXBDb21wb3Np dGVkTGF5ZXJzKSB7CisgICAgaWYgKG92ZXJsYXBNYXAgJiYgb3ZlcmxhcE1hcC0+c2l6ZSgpKSB7 CiAgICAgICAgIC8vIElmIHdlJ3JlIHRlc3RpbmcgZm9yIG92ZXJsYXAsIHdlIG9ubHkgbmVlZCB0 byBjb21wb3NpdGUgaWYgd2Ugb3ZlcmxhcCBzb21ldGhpbmcgdGhhdCBpcyBhbHJlYWR5IGNvbXBv c2l0ZWQuCiAgICAgICAgIGFic0JvdW5kcyA9IGxheWVyLT5yZW5kZXJlcigpLT5sb2NhbFRvQWJz b2x1dGVRdWFkKEZsb2F0UmVjdChsYXllci0+bG9jYWxCb3VuZGluZ0JveCgpKSkuZW5jbG9zaW5n Qm91bmRpbmdCb3goKTsKICAgICAgICAgaGF2ZUNvbXB1dGVkQm91bmRzID0gdHJ1ZTsKLSAgICAg ICAgbXVzdE92ZXJsYXBDb21wb3NpdGVkTGF5ZXJzICY9IG92ZXJsYXBzQ29tcG9zaXRlZExheWVy cygqb3ZlcmxhcE1hcCwgYWJzQm91bmRzKTsKKyAgICAgICAgbXVzdE92ZXJsYXBDb21wb3NpdGVk TGF5ZXJzID0gb3ZlcmxhcHNDb21wb3NpdGVkTGF5ZXJzKCpvdmVybGFwTWFwLCBhYnNCb3VuZHMp OwogICAgIH0KICAgICAKICAgICBsYXllci0+c2V0TXVzdE92ZXJsYXBDb21wb3NpdGVkTGF5ZXJz KG11c3RPdmVybGFwQ29tcG9zaXRlZExheWVycyk7Cg==