112395 2013-03-14 17:04:30 -0700 Convert <select> to new-flexbox 2013-05-28 16:01:12 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 112559 1 cbiesinger cbiesinger ojan roger_fong oldest_to_newest 855582 0 cbiesinger 2013-03-14 17:04:30 -0700 Convert <select> to new-flexbox 855590 1 193206 cbiesinger 2013-03-14 17:12:06 -0700 Created attachment 193206 Patch 856282 2 193206 ojan 2013-03-15 14:18:26 -0700 Comment on attachment 193206 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=193206&action=review > Source/WebCore/rendering/RenderMenuList.h:123 > + virtual int baselinePosition(FontBaseline baseline, bool firstLine, LineDirectionMode direction, LinePositionMode position) const OVERRIDE > + { > + return RenderBlock::baselinePosition(baseline, firstLine, direction, position); > + } > + virtual int firstLineBoxBaseline() const OVERRIDE { return RenderBlock::firstLineBoxBaseline(); } > + virtual int inlineBlockBaseline(LineDirectionMode direction) const OVERRIDE { return RenderBlock::inlineBlockBaseline(direction); } I think this deserves a comment in the code explaining *why* we need to override these. Something like... // Flexbox defines baselines differently than regular blocks. // For backwards compatibility, menulists need to do the regular block behavior. 856350 3 193384 cbiesinger 2013-03-15 15:36:08 -0700 Created attachment 193384 Patch 856385 4 193384 webkit.review.bot 2013-03-15 16:17:10 -0700 Comment on attachment 193384 Patch Clearing flags on attachment: 193384 Committed r145959: <http://trac.webkit.org/changeset/145959> 893418 5 roger_fong 2013-05-24 12:57:59 -0700 > // Flexbox defines baselines differently than regular blocks. > // For backwards compatibility, menulists need to do the regular block behavior. Hello, I was hoping I could get some details on what this backwards compatibility thing is for? I'm run across some bugs that a result of this override. What I've found is that if ignoreBaseline is RenderBlock::baselinePosition is true, the wrong baselinePosition for the select element is returned. Thanks! 893427 6 cbiesinger 2013-05-24 13:58:54 -0700 I'm confused. <select> has always used RenderBlock::baselinePosition to calculate its baseline, the override was added so that it keeps doing that. Do you have a specific testcase that now fails but used to work? 893430 7 202846 roger_fong 2013-05-24 14:00:59 -0700 Created attachment 202846 test case Here it is. When you first load the document everything seems fine. As soon as you resize the document things go haywire and the red box get's shifted down. 893434 8 cbiesinger 2013-05-24 14:05:30 -0700 Hm, I don't see any change in behavior when I resize my (Chrome) window. But it also looks like this requires use of the deprecated flexbox? 893438 9 roger_fong 2013-05-24 14:11:05 -0700 (In reply to comment #8) > Hm, I don't see any change in behavior when I resize my (Chrome) window. Hmm, I can get it to repro if I resize from the left side. Alternatively if I click on that select element, the box also shifts. > But it also looks like this requires use of the deprecated flexbox? Not sure what the difference is. This change moved select from using the DeprecatedFlexbox to the new one right? 893443 10 roger_fong 2013-05-24 14:18:00 -0700 I guess what I could do is revert to right before this change and see if that ignoreBaseline is being set to true there as well. From what I can tell, (layer()->verticalScrollbar() || layer()->scrollYOffset() != 0) are both true for the select element when resizing or clicking the select element. Perhaps, the real problem is that these are being set incorrectly now somehow. 894443 11 roger_fong 2013-05-28 11:56:16 -0700 (In reply to comment #5) > > // Flexbox defines baselines differently than regular blocks. > > // For backwards compatibility, menulists need to do the regular block behavior. > Hi, is there a test that fails if we don't use these RenderBlock overrides? If so, could you point me to it so I can take a look at it? Thanks! 894480 12 cbiesinger 2013-05-28 13:30:34 -0700 fast/forms/basic-selects.html is one of the failing tests. I think there were others but I don't have the full list anymore. But you could just remove it and run the tests yourself. 894482 13 cbiesinger 2013-05-28 13:32:17 -0700 I wonder if this is mac only? I can't reproduce the bug with either resizing or clicking on Linux. Why not just make the content use new-flexbox? (-webkit-flex instead of -webkit-box, and the related properties) 894588 14 roger_fong 2013-05-28 16:01:12 -0700 (In reply to comment #12) > fast/forms/basic-selects.html is one of the failing tests. I think there were others but I don't have the full list anymore. But you could just remove it and run the tests yourself. The reason I ask is because after reverting the change I don't actually see any new tests failing. Perhaps it's skipped on my machine, I'll run it explicitly. > I wonder if this is mac only? I can't reproduce the bug with either resizing or clicking on Linux. > Why not just make the content use new-flexbox? (-webkit-flex instead of -webkit-box, and the related properties) Hrmm strange. Well, since the problem does seem to exist for me I'd rather not try to fix it via content changes and try to get to the root of it. I'll keep digging though, thx for the help! 193206 2013-03-14 17:12:06 -0700 2013-03-15 15:36:07 -0700 Patch bug-112395-20130314170802.patch text/plain 6325 cbiesinger U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1ODUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmVhYzA1NTQ1MWRiMTI1 ODFiNjhlOGJiN2Q2YjE3YTc4YWRmYWZiYS4uYzcxOWJmZDdiOWI0ZTUzYzlhZGNhNzE5MmIwZTRl N2IwMGJjMjgxMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEzLTAzLTE0ICBDaHJp c3RpYW4gQmllc2luZ2VyICA8Y2JpZXNpbmdlckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgQ29u dmVydCA8c2VsZWN0PiB0byBuZXctZmxleGJveAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEyMzk1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgQ292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKworICAgICAg ICAqIGNzcy9odG1sLmNzczoKKyAgICAgICAgKHNlbGVjdCk6CisgICAgICAgIChzZWxlY3Rbc2l6 ZV1bbXVsdGlwbGVdKToKKyAgICAgICAgKHNlbGVjdFtzaXplPSIxIl0pOgorICAgICAgICBVc2Ug bmV3LXN0eWxlIGZsZXhib3ggcHJvcGVydGllcy4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy TWVudUxpc3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTWVudUxpc3Q6OlJlbmRlck1l bnVMaXN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck1lbnVMaXN0OjpjcmVhdGVJbm5lckJs b2NrKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck1lbnVMaXN0OjphZGp1c3RJbm5lclN0eWxl KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck1lbnVMaXN0OjpyZW1vdmVDaGlsZCk6CisgICAg ICAgIFJlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveCAtPiBSZW5kZXJGbGV4aWJsZUJveCwgYW5k IHVzZSB0aGUKKyAgICAgICAgbmV3LXN0eWxlIGZsZXhib3ggcHJvcGVydGllcy4gVXNlIG1hcmdp bjphdXRvIGZvciBjZW50ZXJpbmcgdG8gZ2V0CisgICAgICAgIHRoZSBvbGQgc2FmZS1jZW50ZXJp bmcgYmVoYXZpb3IuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck1lbnVMaXN0Lmg6CisgICAg ICAgIEluaGVyaXQgZnJvbSBSZW5kZXJGbGV4aWJsZUJveC4gT3ZlcnJpZGUgYmFzZWxpbmUgbWV0 aG9kcyB0byBjYWxsIHRoZQorICAgICAgICBSZW5kZXJCbG9jayBtZXRob2RzCisKIDIwMTMtMDMt MTQgIE1hbnVlbCBSZWdvIENhc2Fzbm92YXMgIDxyZWdvQGlnYWxpYS5jb20+CiAKICAgICAgICAg QWRkIHNlbGVjdFRyYWlsaW5nV2hpdGVzcGFjZUVuYWJsZWQgc2V0dGluZyB0byBXZWJDb3JlOjpQ YWdlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvaHRtbC5jc3MgYi9Tb3VyY2UvV2Vi Q29yZS9jc3MvaHRtbC5jc3MKaW5kZXggODVmMWExMTg2MmExYTk2MjEwZGEzNzE4NzU0YzkyNGFj OTVlN2RhNi4uYmI1YzdhNjFmNGVmY2FiMjNhY2FjOWQzZTE2ZmVmMTJjNmQyMWY3MCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL2h0bWwuY3NzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nz cy9odG1sLmNzcwpAQCAtOTM3LDcgKzkzNyw3IEBAIGlucHV0Ojotd2Via2l0LWNhbGVuZGFyLXBp Y2tlci1pbmRpY2F0b3I6aG92ZXIgewogc2VsZWN0IHsKICAgICAtd2Via2l0LWFwcGVhcmFuY2U6 IG1lbnVsaXN0OwogICAgIGJveC1zaXppbmc6IGJvcmRlci1ib3g7Ci0gICAgLXdlYmtpdC1ib3gt YWxpZ246IGNlbnRlcjsKKyAgICAtd2Via2l0LWFsaWduLWl0ZW1zOiBjZW50ZXI7CiAgICAgYm9y ZGVyOiAxcHggc29saWQ7CiAgICAgd2hpdGUtc3BhY2U6IHByZTsKICAgICAtd2Via2l0LXJ0bC1v cmRlcmluZzogbG9naWNhbDsKQEAgLTk1MCw3ICs5NTAsNyBAQCBzZWxlY3Rbc2l6ZV0sCiBzZWxl Y3RbbXVsdGlwbGVdLAogc2VsZWN0W3NpemVdW211bHRpcGxlXSB7CiAgICAgLXdlYmtpdC1hcHBl YXJhbmNlOiBsaXN0Ym94OwotICAgIC13ZWJraXQtYm94LWFsaWduOiBzdGFydDsKKyAgICAtd2Vi a2l0LWFsaWduLWl0ZW1zOiBmbGV4LXN0YXJ0OwogICAgIGJvcmRlcjogMXB4IGluc2V0IGdyYXk7 CiAgICAgYm9yZGVyLXJhZGl1czogaW5pdGlhbDsKICAgICB3aGl0ZS1zcGFjZTogaW5pdGlhbDsK QEAgLTk1OSw3ICs5NTksNyBAQCBzZWxlY3Rbc2l6ZV1bbXVsdGlwbGVdIHsKIHNlbGVjdFtzaXpl PSIwIl0sCiBzZWxlY3Rbc2l6ZT0iMSJdIHsKICAgICAtd2Via2l0LWFwcGVhcmFuY2U6IG1lbnVs aXN0OwotICAgIC13ZWJraXQtYm94LWFsaWduOiBjZW50ZXI7CisgICAgLXdlYmtpdC1hbGlnbi1p dGVtczogY2VudGVyOwogICAgIGJvcmRlcjogMXB4IHNvbGlkOwogICAgIGJvcmRlci1yYWRpdXM6 IDVweDsKICAgICB3aGl0ZS1zcGFjZTogcHJlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlck1lbnVMaXN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJNZW51TGlzdC5jcHAKaW5kZXggNTQ4Y2U4NTAwY2U1ZTM0ZjdhOWU2ODFiMjRhNTM1N2Zk MmY3ZmI4Yi4uMmRjODlmZTUyYWNjN2QxMTFiZjhhYWQxZDcyNDJmNmNiYmM1NWNkNCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck1lbnVMaXN0LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTWVudUxpc3QuY3BwCkBAIC01NCw3ICs1NCw3 IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIHVzaW5nIG5hbWVzcGFjZSBIVE1MTmFtZXM7CiAKIFJl bmRlck1lbnVMaXN0OjpSZW5kZXJNZW51TGlzdChFbGVtZW50KiBlbGVtZW50KQotICAgIDogUmVu ZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94KGVsZW1lbnQpCisgICAgOiBSZW5kZXJGbGV4aWJsZUJv eChlbGVtZW50KQogICAgICwgbV9idXR0b25UZXh0KDApCiAgICAgLCBtX2lubmVyQmxvY2soMCkK ICAgICAsIG1fb3B0aW9uc0NoYW5nZWQodHJ1ZSkKQEAgLTkxLDE0ICs5MSwyNiBAQCB2b2lkIFJl bmRlck1lbnVMaXN0OjpjcmVhdGVJbm5lckJsb2NrKCkKICAgICBBU1NFUlQoIWZpcnN0Q2hpbGQo KSk7CiAgICAgbV9pbm5lckJsb2NrID0gY3JlYXRlQW5vbnltb3VzQmxvY2soKTsKICAgICBhZGp1 c3RJbm5lclN0eWxlKCk7Ci0gICAgUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94OjphZGRDaGls ZChtX2lubmVyQmxvY2spOworICAgIFJlbmRlckZsZXhpYmxlQm94OjphZGRDaGlsZChtX2lubmVy QmxvY2spOwogfQogCiB2b2lkIFJlbmRlck1lbnVMaXN0OjphZGp1c3RJbm5lclN0eWxlKCkKIHsK ICAgICBSZW5kZXJTdHlsZSogaW5uZXJTdHlsZSA9IG1faW5uZXJCbG9jay0+c3R5bGUoKTsKLSAg ICBpbm5lclN0eWxlLT5zZXRCb3hGbGV4KDEpOwotICAgIAorICAgIGlubmVyU3R5bGUtPnNldEZs ZXhHcm93KDEpOworICAgIGlubmVyU3R5bGUtPnNldEZsZXhTaHJpbmsoMSk7CisgICAgLy8gbWlu LXdpZHRoOiAwOyBpcyBuZWVkZWQgZm9yIGNvcnJlY3Qgc2hyaW5raW5nLgorICAgIC8vIEZJWE1F OiBSZW1vdmUgdGhpcyBsaW5lIHdoZW4gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTExMTc5MCBpcyBmaXhlZC4KKyAgICBpbm5lclN0eWxlLT5zZXRNaW5XaWR0aChMZW5n dGgoMCwgRml4ZWQpKTsKKyAgICAvLyBVc2UgbWFyZ2luOmF1dG8gaW5zdGVhZCBvZiBhbGlnbi1p dGVtczpjZW50ZXIgdG8gZ2V0IHNhZmUgY2VudGVyaW5nLCBpLmUuCisgICAgLy8gd2hlbiB0aGUg Y29udGVudCBvdmVyZmxvd3MsIHRyZWF0IGl0IHRoZSBzYW1lIGFzIGFsaWduLWl0ZW1zOiBmbGV4 LXN0YXJ0LgorICAgIC8vIEJ1dCB3ZSBvbmx5IGRvIHRoYXQgZm9yIHRoZSBjYXNlcyB3aGVyZSBo dG1sLmNzcyB3b3VsZCBvdGhlcndpc2UgdXNlIGNlbnRlci4KKyAgICBpZiAoc3R5bGUoKS0+YWxp Z25JdGVtcygpID09IEFsaWduQ2VudGVyKSB7CisgICAgICAgIGlubmVyU3R5bGUtPnNldE1hcmdp blRvcChMZW5ndGgoKSk7CisgICAgICAgIGlubmVyU3R5bGUtPnNldE1hcmdpbkJvdHRvbShMZW5n dGgoKSk7CisgICAgICAgIGlubmVyU3R5bGUtPnNldEFsaWduU2VsZihBbGlnbkZsZXhTdGFydCk7 CisgICAgfQorCiAgICAgaW5uZXJTdHlsZS0+c2V0UGFkZGluZ0xlZnQoTGVuZ3RoKHRoZW1lKCkt PnBvcHVwSW50ZXJuYWxQYWRkaW5nTGVmdChzdHlsZSgpKSwgRml4ZWQpKTsKICAgICBpbm5lclN0 eWxlLT5zZXRQYWRkaW5nUmlnaHQoTGVuZ3RoKHRoZW1lKCktPnBvcHVwSW50ZXJuYWxQYWRkaW5n UmlnaHQoc3R5bGUoKSksIEZpeGVkKSk7CiAgICAgaW5uZXJTdHlsZS0+c2V0UGFkZGluZ1RvcChM ZW5ndGgodGhlbWUoKS0+cG9wdXBJbnRlcm5hbFBhZGRpbmdUb3Aoc3R5bGUoKSksIEZpeGVkKSk7 CkBAIC0xMzcsNyArMTQ5LDcgQEAgdm9pZCBSZW5kZXJNZW51TGlzdDo6YWRkQ2hpbGQoUmVuZGVy T2JqZWN0KiBuZXdDaGlsZCwgUmVuZGVyT2JqZWN0KiBiZWZvcmVDaGlsZCkKIHZvaWQgUmVuZGVy TWVudUxpc3Q6OnJlbW92ZUNoaWxkKFJlbmRlck9iamVjdCogb2xkQ2hpbGQpCiB7CiAgICAgaWYg KG9sZENoaWxkID09IG1faW5uZXJCbG9jayB8fCAhbV9pbm5lckJsb2NrKSB7Ci0gICAgICAgIFJl bmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveDo6cmVtb3ZlQ2hpbGQob2xkQ2hpbGQpOworICAgICAg ICBSZW5kZXJGbGV4aWJsZUJveDo6cmVtb3ZlQ2hpbGQob2xkQ2hpbGQpOwogICAgICAgICBtX2lu bmVyQmxvY2sgPSAwOwogICAgIH0gZWxzZQogICAgICAgICBtX2lubmVyQmxvY2stPnJlbW92ZUNo aWxkKG9sZENoaWxkKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJNZW51TGlzdC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck1lbnVMaXN0LmgK aW5kZXggYTdjNWRlZTE0MDkxYTBjMTY4YmY3ZjU5MDkxOTdkNWYzZjJhMGM3OS4uZjVjMDkzYWQw ODUwMGM4OTE1YTRjMjk4YTVmNTkxYTAwMjVhNzE1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlck1lbnVMaXN0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlck1lbnVMaXN0LmgKQEAgLTI3LDcgKzI3LDcgQEAKICNpbmNsdWRlICJMYXlvdXRS ZWN0LmgiCiAjaW5jbHVkZSAiUG9wdXBNZW51LmgiCiAjaW5jbHVkZSAiUG9wdXBNZW51Q2xpZW50 LmgiCi0jaW5jbHVkZSAiUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94LmgiCisjaW5jbHVkZSAi UmVuZGVyRmxleGlibGVCb3guaCIKIAogI2lmIFBMQVRGT1JNKE1BQykKICNkZWZpbmUgUE9QVVBf TUVOVV9QVUxMU19ET1dOIDAKQEAgLTQwLDcgKzQwLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewog Y2xhc3MgSFRNTFNlbGVjdEVsZW1lbnQ7CiBjbGFzcyBSZW5kZXJUZXh0OwogCi1jbGFzcyBSZW5k ZXJNZW51TGlzdCA6IHB1YmxpYyBSZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3gsIHByaXZhdGUg UG9wdXBNZW51Q2xpZW50IHsKK2NsYXNzIFJlbmRlck1lbnVMaXN0IDogcHVibGljIFJlbmRlckZs ZXhpYmxlQm94LCBwcml2YXRlIFBvcHVwTWVudUNsaWVudCB7CiAKIHB1YmxpYzoKICAgICBSZW5k ZXJNZW51TGlzdChFbGVtZW50Kik7CkBAIC0xMTUsNiArMTE1LDEzIEBAIHByaXZhdGU6CiAKICAg ICB2aXJ0dWFsIGJvb2wgaGFzTGluZUlmRW1wdHkoKSBjb25zdCB7IHJldHVybiB0cnVlOyB9CiAK KyAgICB2aXJ0dWFsIGludCBiYXNlbGluZVBvc2l0aW9uKEZvbnRCYXNlbGluZSBiYXNlbGluZSwg Ym9vbCBmaXJzdExpbmUsIExpbmVEaXJlY3Rpb25Nb2RlIGRpcmVjdGlvbiwgTGluZVBvc2l0aW9u TW9kZSBwb3NpdGlvbikgY29uc3QgT1ZFUlJJREUKKyAgICB7CisgICAgICAgIHJldHVybiBSZW5k ZXJCbG9jazo6YmFzZWxpbmVQb3NpdGlvbihiYXNlbGluZSwgZmlyc3RMaW5lLCBkaXJlY3Rpb24s IHBvc2l0aW9uKTsKKyAgICB9CisgICAgdmlydHVhbCBpbnQgZmlyc3RMaW5lQm94QmFzZWxpbmUo KSBjb25zdCBPVkVSUklERSB7IHJldHVybiBSZW5kZXJCbG9jazo6Zmlyc3RMaW5lQm94QmFzZWxp bmUoKTsgfQorICAgIHZpcnR1YWwgaW50IGlubGluZUJsb2NrQmFzZWxpbmUoTGluZURpcmVjdGlv bk1vZGUgZGlyZWN0aW9uKSBjb25zdCBPVkVSUklERSB7IHJldHVybiBSZW5kZXJCbG9jazo6aW5s aW5lQmxvY2tCYXNlbGluZShkaXJlY3Rpb24pOyB9CisKICAgICB2b2lkIGdldEl0ZW1CYWNrZ3Jv dW5kQ29sb3IodW5zaWduZWQgbGlzdEluZGV4LCBDb2xvciYsIGJvb2wmIGl0ZW1IYXNDdXN0b21C YWNrZ3JvdW5kQ29sb3IpIGNvbnN0OwogCiAgICAgdm9pZCBjcmVhdGVJbm5lckJsb2NrKCk7Cg== 193384 2013-03-15 15:36:08 -0700 2013-03-15 16:17:10 -0700 Patch bug-112395-20130315153203.patch text/plain 6501 cbiesinger U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1ODUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmVhYzA1NTQ1MWRiMTI1 ODFiNjhlOGJiN2Q2YjE3YTc4YWRmYWZiYS4uYWRkYzg0Y2JjNmIxMjJiOTFlYjY5ZGNiZDAyODlm YzNlODE2Mjk5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEzLTAzLTE1ICBDaHJp c3RpYW4gQmllc2luZ2VyICA8Y2JpZXNpbmdlckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgQ29u dmVydCA8c2VsZWN0PiB0byBuZXctZmxleGJveAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEyMzk1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgT2phbiBW YWZhaS4KKworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICog Y3NzL2h0bWwuY3NzOgorICAgICAgICAoc2VsZWN0KToKKyAgICAgICAgKHNlbGVjdFtzaXplXVtt dWx0aXBsZV0pOgorICAgICAgICAoc2VsZWN0W3NpemU9IjEiXSk6CisgICAgICAgIFVzZSBuZXct c3R5bGUgZmxleGJveCBwcm9wZXJ0aWVzLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJNZW51 TGlzdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJNZW51TGlzdDo6UmVuZGVyTWVudUxp c3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTWVudUxpc3Q6OmNyZWF0ZUlubmVyQmxvY2sp OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTWVudUxpc3Q6OmFkanVzdElubmVyU3R5bGUpOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTWVudUxpc3Q6OnJlbW92ZUNoaWxkKToKKyAgICAgICAg UmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94IC0+IFJlbmRlckZsZXhpYmxlQm94LCBhbmQgdXNl IHRoZQorICAgICAgICBuZXctc3R5bGUgZmxleGJveCBwcm9wZXJ0aWVzLiBVc2UgbWFyZ2luOmF1 dG8gZm9yIGNlbnRlcmluZyB0byBnZXQKKyAgICAgICAgdGhlIG9sZCBzYWZlLWNlbnRlcmluZyBi ZWhhdmlvci4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTWVudUxpc3QuaDoKKyAgICAgICAg KFJlbmRlck1lbnVMaXN0KToKKyAgICAgICAgSW5oZXJpdCBmcm9tIFJlbmRlckZsZXhpYmxlQm94 LiBPdmVycmlkZSBiYXNlbGluZSBtZXRob2RzIHRvIGNhbGwgdGhlCisgICAgICAgIFJlbmRlckJs b2NrIG1ldGhvZHMKKwogMjAxMy0wMy0xNCAgTWFudWVsIFJlZ28gQ2FzYXNub3ZhcyAgPHJlZ29A aWdhbGlhLmNvbT4KIAogICAgICAgICBBZGQgc2VsZWN0VHJhaWxpbmdXaGl0ZXNwYWNlRW5hYmxl ZCBzZXR0aW5nIHRvIFdlYkNvcmU6OlBhZ2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nz cy9odG1sLmNzcyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9odG1sLmNzcwppbmRleCA4NWYxYTExODYy YTFhOTYyMTBkYTM3MTg3NTRjOTI0YWM5NWU3ZGE2Li5iYjVjN2E2MWY0ZWZjYWIyM2FjYWM5ZDNl MTZmZWYxMmM2ZDIxZjcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvaHRtbC5jc3MK KysrIGIvU291cmNlL1dlYkNvcmUvY3NzL2h0bWwuY3NzCkBAIC05MzcsNyArOTM3LDcgQEAgaW5w dXQ6Oi13ZWJraXQtY2FsZW5kYXItcGlja2VyLWluZGljYXRvcjpob3ZlciB7CiBzZWxlY3Qgewog ICAgIC13ZWJraXQtYXBwZWFyYW5jZTogbWVudWxpc3Q7CiAgICAgYm94LXNpemluZzogYm9yZGVy LWJveDsKLSAgICAtd2Via2l0LWJveC1hbGlnbjogY2VudGVyOworICAgIC13ZWJraXQtYWxpZ24t aXRlbXM6IGNlbnRlcjsKICAgICBib3JkZXI6IDFweCBzb2xpZDsKICAgICB3aGl0ZS1zcGFjZTog cHJlOwogICAgIC13ZWJraXQtcnRsLW9yZGVyaW5nOiBsb2dpY2FsOwpAQCAtOTUwLDcgKzk1MCw3 IEBAIHNlbGVjdFtzaXplXSwKIHNlbGVjdFttdWx0aXBsZV0sCiBzZWxlY3Rbc2l6ZV1bbXVsdGlw bGVdIHsKICAgICAtd2Via2l0LWFwcGVhcmFuY2U6IGxpc3Rib3g7Ci0gICAgLXdlYmtpdC1ib3gt YWxpZ246IHN0YXJ0OworICAgIC13ZWJraXQtYWxpZ24taXRlbXM6IGZsZXgtc3RhcnQ7CiAgICAg Ym9yZGVyOiAxcHggaW5zZXQgZ3JheTsKICAgICBib3JkZXItcmFkaXVzOiBpbml0aWFsOwogICAg IHdoaXRlLXNwYWNlOiBpbml0aWFsOwpAQCAtOTU5LDcgKzk1OSw3IEBAIHNlbGVjdFtzaXplXVtt dWx0aXBsZV0gewogc2VsZWN0W3NpemU9IjAiXSwKIHNlbGVjdFtzaXplPSIxIl0gewogICAgIC13 ZWJraXQtYXBwZWFyYW5jZTogbWVudWxpc3Q7Ci0gICAgLXdlYmtpdC1ib3gtYWxpZ246IGNlbnRl cjsKKyAgICAtd2Via2l0LWFsaWduLWl0ZW1zOiBjZW50ZXI7CiAgICAgYm9yZGVyOiAxcHggc29s aWQ7CiAgICAgYm9yZGVyLXJhZGl1czogNXB4OwogICAgIHdoaXRlLXNwYWNlOiBwcmU7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTWVudUxpc3QuY3BwIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck1lbnVMaXN0LmNwcAppbmRleCA1NDhjZTg1MDBj ZTVlMzRmN2E5ZTY4MWIyNGE1MzU3ZmQyZjdmYjhiLi4yZGM4OWZlNTJhY2M3ZDExMWJmOGFhZDFk NzI0MmY2Y2JiYzU1Y2Q0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTWVudUxpc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNZW51 TGlzdC5jcHAKQEAgLTU0LDcgKzU0LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogdXNpbmcgbmFt ZXNwYWNlIEhUTUxOYW1lczsKIAogUmVuZGVyTWVudUxpc3Q6OlJlbmRlck1lbnVMaXN0KEVsZW1l bnQqIGVsZW1lbnQpCi0gICAgOiBSZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3goZWxlbWVudCkK KyAgICA6IFJlbmRlckZsZXhpYmxlQm94KGVsZW1lbnQpCiAgICAgLCBtX2J1dHRvblRleHQoMCkK ICAgICAsIG1faW5uZXJCbG9jaygwKQogICAgICwgbV9vcHRpb25zQ2hhbmdlZCh0cnVlKQpAQCAt OTEsMTQgKzkxLDI2IEBAIHZvaWQgUmVuZGVyTWVudUxpc3Q6OmNyZWF0ZUlubmVyQmxvY2soKQog ICAgIEFTU0VSVCghZmlyc3RDaGlsZCgpKTsKICAgICBtX2lubmVyQmxvY2sgPSBjcmVhdGVBbm9u eW1vdXNCbG9jaygpOwogICAgIGFkanVzdElubmVyU3R5bGUoKTsKLSAgICBSZW5kZXJEZXByZWNh dGVkRmxleGlibGVCb3g6OmFkZENoaWxkKG1faW5uZXJCbG9jayk7CisgICAgUmVuZGVyRmxleGli bGVCb3g6OmFkZENoaWxkKG1faW5uZXJCbG9jayk7CiB9CiAKIHZvaWQgUmVuZGVyTWVudUxpc3Q6 OmFkanVzdElubmVyU3R5bGUoKQogewogICAgIFJlbmRlclN0eWxlKiBpbm5lclN0eWxlID0gbV9p bm5lckJsb2NrLT5zdHlsZSgpOwotICAgIGlubmVyU3R5bGUtPnNldEJveEZsZXgoMSk7Ci0gICAg CisgICAgaW5uZXJTdHlsZS0+c2V0RmxleEdyb3coMSk7CisgICAgaW5uZXJTdHlsZS0+c2V0Rmxl eFNocmluaygxKTsKKyAgICAvLyBtaW4td2lkdGg6IDA7IGlzIG5lZWRlZCBmb3IgY29ycmVjdCBz aHJpbmtpbmcuCisgICAgLy8gRklYTUU6IFJlbW92ZSB0aGlzIGxpbmUgd2hlbiBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTExNzkwIGlzIGZpeGVkLgorICAgIGlubmVy U3R5bGUtPnNldE1pbldpZHRoKExlbmd0aCgwLCBGaXhlZCkpOworICAgIC8vIFVzZSBtYXJnaW46 YXV0byBpbnN0ZWFkIG9mIGFsaWduLWl0ZW1zOmNlbnRlciB0byBnZXQgc2FmZSBjZW50ZXJpbmcs IGkuZS4KKyAgICAvLyB3aGVuIHRoZSBjb250ZW50IG92ZXJmbG93cywgdHJlYXQgaXQgdGhlIHNh bWUgYXMgYWxpZ24taXRlbXM6IGZsZXgtc3RhcnQuCisgICAgLy8gQnV0IHdlIG9ubHkgZG8gdGhh dCBmb3IgdGhlIGNhc2VzIHdoZXJlIGh0bWwuY3NzIHdvdWxkIG90aGVyd2lzZSB1c2UgY2VudGVy LgorICAgIGlmIChzdHlsZSgpLT5hbGlnbkl0ZW1zKCkgPT0gQWxpZ25DZW50ZXIpIHsKKyAgICAg ICAgaW5uZXJTdHlsZS0+c2V0TWFyZ2luVG9wKExlbmd0aCgpKTsKKyAgICAgICAgaW5uZXJTdHls ZS0+c2V0TWFyZ2luQm90dG9tKExlbmd0aCgpKTsKKyAgICAgICAgaW5uZXJTdHlsZS0+c2V0QWxp Z25TZWxmKEFsaWduRmxleFN0YXJ0KTsKKyAgICB9CisKICAgICBpbm5lclN0eWxlLT5zZXRQYWRk aW5nTGVmdChMZW5ndGgodGhlbWUoKS0+cG9wdXBJbnRlcm5hbFBhZGRpbmdMZWZ0KHN0eWxlKCkp LCBGaXhlZCkpOwogICAgIGlubmVyU3R5bGUtPnNldFBhZGRpbmdSaWdodChMZW5ndGgodGhlbWUo KS0+cG9wdXBJbnRlcm5hbFBhZGRpbmdSaWdodChzdHlsZSgpKSwgRml4ZWQpKTsKICAgICBpbm5l clN0eWxlLT5zZXRQYWRkaW5nVG9wKExlbmd0aCh0aGVtZSgpLT5wb3B1cEludGVybmFsUGFkZGlu Z1RvcChzdHlsZSgpKSwgRml4ZWQpKTsKQEAgLTEzNyw3ICsxNDksNyBAQCB2b2lkIFJlbmRlck1l bnVMaXN0OjphZGRDaGlsZChSZW5kZXJPYmplY3QqIG5ld0NoaWxkLCBSZW5kZXJPYmplY3QqIGJl Zm9yZUNoaWxkKQogdm9pZCBSZW5kZXJNZW51TGlzdDo6cmVtb3ZlQ2hpbGQoUmVuZGVyT2JqZWN0 KiBvbGRDaGlsZCkKIHsKICAgICBpZiAob2xkQ2hpbGQgPT0gbV9pbm5lckJsb2NrIHx8ICFtX2lu bmVyQmxvY2spIHsKLSAgICAgICAgUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94OjpyZW1vdmVD aGlsZChvbGRDaGlsZCk7CisgICAgICAgIFJlbmRlckZsZXhpYmxlQm94OjpyZW1vdmVDaGlsZChv bGRDaGlsZCk7CiAgICAgICAgIG1faW5uZXJCbG9jayA9IDA7CiAgICAgfSBlbHNlCiAgICAgICAg IG1faW5uZXJCbG9jay0+cmVtb3ZlQ2hpbGQob2xkQ2hpbGQpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck1lbnVMaXN0LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTWVudUxpc3QuaAppbmRleCBhN2M1ZGVlMTQwOTFhMGMxNjhiZjdmNTkwOTE5 N2Q1ZjNmMmEwYzc5Li4zNTNjMmE4OGUwNDNhYTgxOTIwZTdjMzk0MzhlMjQ0NTc5YWUwMWI4IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTWVudUxpc3QuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTWVudUxpc3QuaApAQCAtMjcsNyArMjcs NyBAQAogI2luY2x1ZGUgIkxheW91dFJlY3QuaCIKICNpbmNsdWRlICJQb3B1cE1lbnUuaCIKICNp bmNsdWRlICJQb3B1cE1lbnVDbGllbnQuaCIKLSNpbmNsdWRlICJSZW5kZXJEZXByZWNhdGVkRmxl eGlibGVCb3guaCIKKyNpbmNsdWRlICJSZW5kZXJGbGV4aWJsZUJveC5oIgogCiAjaWYgUExBVEZP Uk0oTUFDKQogI2RlZmluZSBQT1BVUF9NRU5VX1BVTExTX0RPV04gMApAQCAtNDAsNyArNDAsNyBA QCBuYW1lc3BhY2UgV2ViQ29yZSB7CiBjbGFzcyBIVE1MU2VsZWN0RWxlbWVudDsKIGNsYXNzIFJl bmRlclRleHQ7CiAKLWNsYXNzIFJlbmRlck1lbnVMaXN0IDogcHVibGljIFJlbmRlckRlcHJlY2F0 ZWRGbGV4aWJsZUJveCwgcHJpdmF0ZSBQb3B1cE1lbnVDbGllbnQgeworY2xhc3MgUmVuZGVyTWVu dUxpc3QgOiBwdWJsaWMgUmVuZGVyRmxleGlibGVCb3gsIHByaXZhdGUgUG9wdXBNZW51Q2xpZW50 IHsKIAogcHVibGljOgogICAgIFJlbmRlck1lbnVMaXN0KEVsZW1lbnQqKTsKQEAgLTExNSw2ICsx MTUsMTUgQEAgcHJpdmF0ZToKIAogICAgIHZpcnR1YWwgYm9vbCBoYXNMaW5lSWZFbXB0eSgpIGNv bnN0IHsgcmV0dXJuIHRydWU7IH0KIAorICAgIC8vIEZsZXhib3ggZGVmaW5lcyBiYXNlbGluZXMg ZGlmZmVyZW50bHkgdGhhbiByZWd1bGFyIGJsb2Nrcy4KKyAgICAvLyBGb3IgYmFja3dhcmRzIGNv bXBhdGliaWxpdHksIG1lbnVsaXN0cyBuZWVkIHRvIGRvIHRoZSByZWd1bGFyIGJsb2NrIGJlaGF2 aW9yLgorICAgIHZpcnR1YWwgaW50IGJhc2VsaW5lUG9zaXRpb24oRm9udEJhc2VsaW5lIGJhc2Vs aW5lLCBib29sIGZpcnN0TGluZSwgTGluZURpcmVjdGlvbk1vZGUgZGlyZWN0aW9uLCBMaW5lUG9z aXRpb25Nb2RlIHBvc2l0aW9uKSBjb25zdCBPVkVSUklERQorICAgIHsKKyAgICAgICAgcmV0dXJu IFJlbmRlckJsb2NrOjpiYXNlbGluZVBvc2l0aW9uKGJhc2VsaW5lLCBmaXJzdExpbmUsIGRpcmVj dGlvbiwgcG9zaXRpb24pOworICAgIH0KKyAgICB2aXJ0dWFsIGludCBmaXJzdExpbmVCb3hCYXNl bGluZSgpIGNvbnN0IE9WRVJSSURFIHsgcmV0dXJuIFJlbmRlckJsb2NrOjpmaXJzdExpbmVCb3hC YXNlbGluZSgpOyB9CisgICAgdmlydHVhbCBpbnQgaW5saW5lQmxvY2tCYXNlbGluZShMaW5lRGly ZWN0aW9uTW9kZSBkaXJlY3Rpb24pIGNvbnN0IE9WRVJSSURFIHsgcmV0dXJuIFJlbmRlckJsb2Nr OjppbmxpbmVCbG9ja0Jhc2VsaW5lKGRpcmVjdGlvbik7IH0KKwogICAgIHZvaWQgZ2V0SXRlbUJh Y2tncm91bmRDb2xvcih1bnNpZ25lZCBsaXN0SW5kZXgsIENvbG9yJiwgYm9vbCYgaXRlbUhhc0N1 c3RvbUJhY2tncm91bmRDb2xvcikgY29uc3Q7CiAKICAgICB2b2lkIGNyZWF0ZUlubmVyQmxvY2so KTsK 202846 2013-05-24 14:00:59 -0700 2013-05-24 14:00:59 -0700 test case tester.html text/html 339 roger_fong PGh0bWw+CjxoZWFkPgo8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoKc2VsZWN0IHsgCiAgICB0ZXh0 LWluZGVudDogLTk5OTlweDsKICAgIG92ZXJmbG93OiBoaWRkZW47Cgktd2Via2l0LWFwcGVhcmFu Y2U6IG5vbmU7Cn0KCnNwYW4gewogICAgYmFja2dyb3VuZC1jb2xvcjogcmVkOwogICAgd2lkdGg6 IDEwcHg7CiAgICBoZWlnaHQ6IDEwcHg7CiAgICBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7Cn0KCmJv ZHkgewogICAgZGlzcGxheTogLXdlYmtpdC1ib3g7Cn0KCjwvc3R5bGU+CjwvaGVhZD4KPGJvZHk+ Cgk8c2VsZWN0PgoJPC9zZWxlY3Q+Cgk8c3Bhbj4KCTwvc3Bhbj4KPC9ib2R5Pgo8L2h0bWw+