43014 2010-07-26 15:57:32 -0700 REGRESSION (r63452): Google image search results broken on pages with Flash 2010-07-26 17:30:23 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All All RESOLVED FIXED http://www.google.com/imgres?imgurl=http://www.modelstationarysteamengine.com/Photos/Stuart%2520Beam.jpg&imgrefurl=http://www.modelstationarysteamengine.com/Stuart%2520engines.html&usg=__bgN3NiAgEdCtoG7vsdEMwrM9zVY=&h=479&w=638&sz=46&hl=en&start=0&tbnid=H9dbqD9NzkK0cM:&tbnh=159&tbnw=204&prev=/images%3Fq%3Dstuart%2Bbeam%26hl%3Den%26safe%3Doff%26client%3Dsafari%26sa%3DX%26rls%3Den%26biw%3D1122%26bih%3D980%26tbs%3Disch:1&itbs=1&iact=hc&vpx=568&vpy=90&dur=1038&hovh=194&hovw=259&tx=210&ty=94&ei=RqNLTKvDI4q8sQPOp9hI&page=1&ndsp=22&ved=1t:429,r:2,s:0 InRadar, Regression P2 Normal --- 1 simon.fraser simon.fraser mitz oldest_to_newest 256309 0 simon.fraser 2010-07-26 15:57:32 -0700 When you search Google images, then click on one of the image results, if the page containing the image also contains a Flash plugin, and you have Flash 10.1 installed, then the image overlay and the sidebar are missing. <rdar://problem/8232081> 256311 1 simon.fraser 2010-07-26 16:00:24 -0700 This was broken by bug 42338, http://trac.webkit.org/changeset/63452 256315 2 62628 simon.fraser 2010-07-26 16:05:23 -0700 Created attachment 62628 Patch 256351 3 simon.fraser 2010-07-26 17:30:23 -0700 http://trac.webkit.org/changeset/64095 62628 2010-07-26 16:05:23 -0700 2010-07-26 17:18:56 -0700 Patch bug-43014-20100726160522.patch text/plain 12039 simon.fraser ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA0MDVhZmE3YzY2MzA4ZDQ2MGEwYmNlOTE0YTBmNTgyM2Y2MzhjNjcxLi4xN2UwNzVm ZDU2OTY0Y2NmNTY4MmNkYmQ3ODU4NThmODY1YjVkZDE4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTcgQEAK IDIwMTAtMDctMjYgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgR29vZ2xlIGltYWdl IHNlYXJjaCByZXN1bHRzIGJyb2tlbiBvbiBwYWdlcyB3aXRoIEZsYXNoCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MzAxNAorICAgICAgICAKKyAgICAg ICAgVGVzdCB3aXRoIG92ZXJmbG93OmhpZGRlbiBvbiBlbXB0eSByb290LCBhbmQgYWJzb2x1dGVs eSBwb3NpdGlvbmVkIGVsZW1lbnRzIHdpdGggY29tcG9zaXRpbmcuCisKKyAgICAgICAgKiBjb21w b3NpdGluZy9nZW9tZXRyeS9saW1pdC1sYXllci1ib3VuZHMtb3ZlcmZsb3ctcm9vdC1leHBlY3Rl ZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGNvbXBvc2l0aW5nL2dlb21ldHJ5L2xpbWl0LWxheWVy LWJvdW5kcy1vdmVyZmxvdy1yb290Lmh0bWw6IEFkZGVkLgorCisyMDEwLTA3LTI2ICBTaW1vbiBG cmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCiAgICAgICAgIFJldmlld2VkIGJ5IEFu ZGVycyBDYXJsc3Nvbi4KIAogICAgICAgICBHbWFpbCBjb21wb3NlIGlzIHVwc2lkZS1kb3duIGFm dGVyIHI2NDA1NApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvZ2VvbWV0cnkv bGltaXQtbGF5ZXItYm91bmRzLW92ZXJmbG93LXJvb3QtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVz dHMvY29tcG9zaXRpbmcvZ2VvbWV0cnkvbGltaXQtbGF5ZXItYm91bmRzLW92ZXJmbG93LXJvb3Qt ZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmM3ZGY3YTQ2NTczNTkxZWVjOGRlNzQ2ZGU4MWMyNmI0 MjU0NzU2ODQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9nZW9t ZXRyeS9saW1pdC1sYXllci1ib3VuZHMtb3ZlcmZsb3ctcm9vdC1leHBlY3RlZC50eHQKQEAgLTAs MCArMSw5OCBAQAorCisoR3JhcGhpY3NMYXllcgorICAocG9zaXRpb24gMC4wMCAwLjAwKQorICAo YW5jaG9yIDAuNTAgMC41MCkKKyAgKGJvdW5kcyA4MDAuMDAgNjAwLjAwKQorICAob3BhY2l0eSAx LjAwKQorICAodXNpbmdUaWxlZExheWVyIDApCisgIChwcmVzZXJ2ZXMzRCAwKQorICAoZHJhd3ND b250ZW50IDApCisgIChiYWNrZmFjZVZpc2liaWxpdHkgdmlzaWJsZSkKKyAgKGJhY2tncm91bmRD b2xvciBub25lKQorICAodHJhbnNmb3JtIGlkZW50aXR5KQorICAoY2hpbGRyZW4gMQorICAgIChH cmFwaGljc0xheWVyCisgICAgICAocG9zaXRpb24gMC4wMCAwLjAwKQorICAgICAgKGFuY2hvciAw LjUwIDAuNTApCisgICAgICAoYm91bmRzIDgwMC4wMCA2MDAuMDApCisgICAgICAob3BhY2l0eSAx LjAwKQorICAgICAgKHVzaW5nVGlsZWRMYXllciAwKQorICAgICAgKHByZXNlcnZlczNEIDApCisg ICAgICAoZHJhd3NDb250ZW50IDApCisgICAgICAoYmFja2ZhY2VWaXNpYmlsaXR5IHZpc2libGUp CisgICAgICAoYmFja2dyb3VuZENvbG9yIG5vbmUpCisgICAgICAodHJhbnNmb3JtIGlkZW50aXR5 KQorICAgICAgKGNoaWxkcmVuVHJhbnNmb3JtIGlkZW50aXR5KQorICAgICAgKGNoaWxkcmVuIDQK KyAgICAgICAgKEdyYXBoaWNzTGF5ZXIKKyAgICAgICAgICAocG9zaXRpb24gMjEuMDAgMjEuMDAp CisgICAgICAgICAgKGFuY2hvciAwLjUwIDAuNTApCisgICAgICAgICAgKGJvdW5kcyAxMDAuMDAg MTAwLjAwKQorICAgICAgICAgIChvcGFjaXR5IDEuMDApCisgICAgICAgICAgKHVzaW5nVGlsZWRM YXllciAwKQorICAgICAgICAgIChwcmVzZXJ2ZXMzRCAwKQorICAgICAgICAgIChkcmF3c0NvbnRl bnQgMSkKKyAgICAgICAgICAoYmFja2ZhY2VWaXNpYmlsaXR5IHZpc2libGUpCisgICAgICAgICAg KGJhY2tncm91bmRDb2xvciBub25lKQorICAgICAgICAgICh0cmFuc2Zvcm0gaWRlbnRpdHkpCisg ICAgICAgICAgKGNoaWxkcmVuVHJhbnNmb3JtIGlkZW50aXR5KQorICAgICAgICApCisgICAgICAg IChHcmFwaGljc0xheWVyCisgICAgICAgICAgKHBvc2l0aW9uIDIxLjAwIDIxLjAwKQorICAgICAg ICAgIChhbmNob3IgMC41MCAwLjUwKQorICAgICAgICAgIChib3VuZHMgMTAwLjAwIDEwMC4wMCkK KyAgICAgICAgICAob3BhY2l0eSAxLjAwKQorICAgICAgICAgICh1c2luZ1RpbGVkTGF5ZXIgMCkK KyAgICAgICAgICAocHJlc2VydmVzM0QgMCkKKyAgICAgICAgICAoZHJhd3NDb250ZW50IDEpCisg ICAgICAgICAgKGJhY2tmYWNlVmlzaWJpbGl0eSB2aXNpYmxlKQorICAgICAgICAgIChiYWNrZ3Jv dW5kQ29sb3Igbm9uZSkKKyAgICAgICAgICAodHJhbnNmb3JtIGlkZW50aXR5KQorICAgICAgICAg IChjaGlsZHJlblRyYW5zZm9ybSBpZGVudGl0eSkKKyAgICAgICAgKQorICAgICAgICAoR3JhcGhp Y3NMYXllcgorICAgICAgICAgIChwb3NpdGlvbiAwLjAwIDAuMDApCisgICAgICAgICAgKGFuY2hv ciAwLjUwIDAuNTApCisgICAgICAgICAgKGJvdW5kcyAxNDIuMDAgMTQyLjAwKQorICAgICAgICAg IChvcGFjaXR5IDEuMDApCisgICAgICAgICAgKHVzaW5nVGlsZWRMYXllciAwKQorICAgICAgICAg IChwcmVzZXJ2ZXMzRCAwKQorICAgICAgICAgIChkcmF3c0NvbnRlbnQgMSkKKyAgICAgICAgICAo YmFja2ZhY2VWaXNpYmlsaXR5IHZpc2libGUpCisgICAgICAgICAgKGJhY2tncm91bmRDb2xvciBu b25lKQorICAgICAgICAgICh0cmFuc2Zvcm0gaWRlbnRpdHkpCisgICAgICAgICAgKGNoaWxkcmVu VHJhbnNmb3JtIGlkZW50aXR5KQorICAgICAgICAgIChjaGlsZHJlbiAxCisgICAgICAgICAgICAo R3JhcGhpY3NMYXllcgorICAgICAgICAgICAgICAocG9zaXRpb24gMjEuMDAgMjEuMDApCisgICAg ICAgICAgICAgIChhbmNob3IgMC41MCAwLjUwKQorICAgICAgICAgICAgICAoYm91bmRzIDEwMC4w MCAxMDAuMDApCisgICAgICAgICAgICAgIChvcGFjaXR5IDEuMDApCisgICAgICAgICAgICAgICh1 c2luZ1RpbGVkTGF5ZXIgMCkKKyAgICAgICAgICAgICAgKHByZXNlcnZlczNEIDApCisgICAgICAg ICAgICAgIChkcmF3c0NvbnRlbnQgMSkKKyAgICAgICAgICAgICAgKGJhY2tmYWNlVmlzaWJpbGl0 eSB2aXNpYmxlKQorICAgICAgICAgICAgICAoYmFja2dyb3VuZENvbG9yIG5vbmUpCisgICAgICAg ICAgICAgICh0cmFuc2Zvcm0gaWRlbnRpdHkpCisgICAgICAgICAgICAgIChjaGlsZHJlblRyYW5z Zm9ybSBpZGVudGl0eSkKKyAgICAgICAgICAgICkKKyAgICAgICAgICApCisgICAgICAgICkKKyAg ICAgICAgKEdyYXBoaWNzTGF5ZXIKKyAgICAgICAgICAocG9zaXRpb24gMC4wMCAxMy4wMCkKKyAg ICAgICAgICAoYW5jaG9yIDAuNTAgMC41MCkKKyAgICAgICAgICAoYm91bmRzIDIxNi4wMCAxNS4w MCkKKyAgICAgICAgICAob3BhY2l0eSAxLjAwKQorICAgICAgICAgICh1c2luZ1RpbGVkTGF5ZXIg MCkKKyAgICAgICAgICAocHJlc2VydmVzM0QgMCkKKyAgICAgICAgICAoZHJhd3NDb250ZW50IDEp CisgICAgICAgICAgKGJhY2tmYWNlVmlzaWJpbGl0eSB2aXNpYmxlKQorICAgICAgICAgIChiYWNr Z3JvdW5kQ29sb3Igbm9uZSkKKyAgICAgICAgICAodHJhbnNmb3JtIGlkZW50aXR5KQorICAgICAg ICAgIChjaGlsZHJlblRyYW5zZm9ybSBpZGVudGl0eSkKKyAgICAgICAgKQorICAgICAgKQorICAg ICkKKyAgKQorKQorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9nZW9tZXRy eS9saW1pdC1sYXllci1ib3VuZHMtb3ZlcmZsb3ctcm9vdC5odG1sIGIvTGF5b3V0VGVzdHMvY29t cG9zaXRpbmcvZ2VvbWV0cnkvbGltaXQtbGF5ZXItYm91bmRzLW92ZXJmbG93LXJvb3QuaHRtbApu ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwLi5lYjg5Nzc5MTdkYWM1ZjA2NTMwNjBmY2E4NjRkZmQ3NmRiNzA2NDgyCi0tLSAv ZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvZ2VvbWV0cnkvbGltaXQtbGF5 ZXItYm91bmRzLW92ZXJmbG93LXJvb3QuaHRtbApAQCAtMCwwICsxLDgyIEBACis8IURPQ1RZUEUg aHRtbD4KKworPGh0bWw+Cis8aGVhZD4KKyAgPHN0eWxlIHR5cGU9InRleHQvY3NzIiBtZWRpYT0i c2NyZWVuIj4KKyAgICBodG1sLCBib2R5IHsKKyAgICAgIG92ZXJmbG93OiBoaWRkZW47CisgICAg ICBtYXJnaW46IDA7CisgICAgfQorCisgICAgLmNvbnRhaW5lciB7CisgICAgICBwb3NpdGlvbjog YWJzb2x1dGU7CisgICAgICB3aWR0aDogMTAwcHg7CisgICAgICBoZWlnaHQ6IDEwMHB4OworICAg ICAgcGFkZGluZzogMjBweDsKKyAgICAgIHotaW5kZXg6IDA7CisgICAgICBib3JkZXI6IDFweCBz b2xpZCBibGFjazsKKyAgICB9CisgICAgCisgICAgZW1iZWQgeworICAgICAgcG9zaXRpb246IGFi c29sdXRlOworICAgICAgdG9wOiAyMXB4OworICAgICAgbGVmdDogMjFweDsKKyAgICAgIHdpZHRo OiAxMDBweDsKKyAgICAgIGhlaWdodDogMTAwcHg7CisgICAgfQorICAgIAorICAgIC50ZXN0IHsK KyAgICAgIHBvc2l0aW9uOiByZWxhdGl2ZTsKKyAgICAgIHdpZHRoOiAxMDBweDsKKyAgICAgIGhl aWdodDogMTAwcHg7CisgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKKyAgICB9CisgICAg CisgICAgLmluZGljYXRvciB7CisgICAgICBwb3NpdGlvbjogYWJzb2x1dGU7CisgICAgICB0b3A6 IDIxcHg7CisgICAgICBsZWZ0OiAyMXB4OworICAgICAgd2lkdGg6IDEwMHB4OworICAgICAgaGVp Z2h0OiAxMDBweDsKKyAgICAgIGJhY2tncm91bmQtY29sb3I6IHJlZDsKKyAgICB9CisgICAgCisg ICAgI2xheWVycyB7CisgICAgICBwb3NpdGlvbjogYWJzb2x1dGU7CisgICAgfQorICA8L3N0eWxl PgorICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIgY2hhcnNldD0idXRmLTgiPgorICAg IGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpIHsKKyAgICAgIGxheW91dFRlc3RDb250 cm9sbGVyLmR1bXBBc1RleHQoKTsKKyAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLndhaXRVbnRp bERvbmUoKTsKKyAgICB9CisKKyAgICBmdW5jdGlvbiBkb1Rlc3QoKQorICAgIHsKKyAgICAgIGlm ICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpIHsKKyAgICAgICAgZG9jdW1lbnQuZ2V0RWxl bWVudEJ5SWQoJ2xheWVycycpLmlubmVyVGV4dCA9IGxheW91dFRlc3RDb250cm9sbGVyLmxheWVy VHJlZUFzVGV4dCgpOworICAgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5ub3RpZnlEb25lKCk7 CisgICAgICB9CisgICAgfQorCisgICAgd2luZG93LmFkZEV2ZW50TGlzdGVuZXIoJ2xvYWQnLCBk b1Rlc3QsIGZhbHNlKTsKKyAgPC9zY3JpcHQ+Cis8L2hlYWQ+CisKKzxib2R5PgorICAKKyAgPCEt LSBHbyBpbnRvIGNvbXBvc2l0aW5nIHdpdGhvdXQgdHJhbnNmb3Jtcy4gLS0+CisgIDxlbWJlZCB0 eXBlPSJhcHBsaWNhdGlvbi94LXdlYmtpdC10ZXN0LW5ldHNjYXBlIiBkcmF3aW5nbW9kZWw9ImNv cmVhbmltYXRpb24iPgorCisgIDxkaXYgY2xhc3M9ImluZGljYXRvciI+PC9kaXY+CisKKyAgPCEt LSBUZXN0cyB3aXRoIGFic29sdXRlIHBvc2l0aW9uaW5nIGJldHdlZW4gdGhlIGNvbXBvc2l0aW5n IGxheWVyIGFuZCB0aGUgZWxlbWVudCB3aXRoIG92ZXJmbG93LiAtLT4KKyAgPCEtLSBZb3Ugc2hv dWxkIHNlZSBhIGdyZWVuIHNxdWFyZS4gLS0+CisgIDxkaXYgY2xhc3M9ImNvbnRhaW5lciI+Cisg ICAgPGRpdiBjbGFzcz0idGVzdCI+CisgICAgPC9kaXY+CisgIDwvZGl2PgorICA8cHJlIGlkPSJs YXllcnMiPkxheWVyIHRyZWUgZ29lcyBoZXJlIGluIERSVDwvcHJlPgorPC9ib2R5PgorPC9odG1s PgorCmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmlu ZGV4IDEwZjYyMTA5NDNkMzQ4OWI4ZDU3NThiNTE2NjJiZTIwMDRlYTYzOGIuLjFmZjFlZTFlNjU4 OGYzYTE5ZDVhNDBlNWMxMzJiMGQxMTZmMGNlMjIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdl TG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjQgQEAKIDIwMTAtMDctMjYg IFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgR29vZ2xlIGltYWdlIHNlYXJjaCByZXN1 bHRzIGJyb2tlbiBvbiBwYWdlcyB3aXRoIEZsYXNoCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MzAxNAorCisgICAgICAgIFRoZSB0ZXN0IGZvciBvdmVy ZmxvdyBhZGRlZCBpbiByNjM0NTIgaXMgd3JvbmcgaW4gdGhhdCBpdCBpZ25vcmVzIHRoZSBlZmZl Y3RzCisgICAgICAgIG9mIHBvc2l0aW9uaW5nIG9uIG92ZXJmbG93LgorICAgICAgICAKKyAgICAg ICAgVGhlIGNvcnJlY3QgYXBwcm9hY2ggaXMgdG8gc3RhcnQgYnkgdXNpbmcgUmVuZGVyVmlldydz IGxheW91dE92ZXJmbG93UmVjdCBhcyB0aGUgbGFyZ2VzdCBib3VuZHMsCisgICAgICAgIHRoZW4g Z2V0dGluZyB0aGUgb3ZlZmxvdyByZWN0IHZpYSBiYWNrZ3JvdW5kQ2xpcFJlY3QoKSByZWxhdGl2 ZSB0byB0aGUgcm9vdCBsYXllci4KKyAgICAgICAgCisgICAgICAgIFRlc3Q6IGNvbXBvc2l0aW5n L2dlb21ldHJ5L2xpbWl0LWxheWVyLWJvdW5kcy1vdmVyZmxvdy1yb290Lmh0bWwKKworICAgICAg ICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 bGF5ZXJPckFuY2VzdG9ySXNUcmFuc2Zvcm1lZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJM YXllckJhY2tpbmc6OnVwZGF0ZUNvbXBvc2l0ZWRCb3VuZHMpOgorCisyMDEwLTA3LTI2ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCiAgICAgICAgIFJldmlld2VkIGJ5 IEFuZGVycyBDYXJsc3Nvbi4KIAogICAgICAgICBHbWFpbCBjb21wb3NlIGlzIHVwc2lkZS1kb3du IGFmdGVyIHI2NDA1NApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9q ZWN0LnBieHByb2ogYi9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpp bmRleCBmYmRlZWMyY2IyZDJlMGUzMzgyODA4MjhlY2JiODU3MzgzYTIzZGM2Li45NzVmYjM2NTAy NzFkMmI4OWJjZWU4NjA5MzkzYzg3OGQ5OGE4ZGNlIDEwMDY0NAotLS0gYS9XZWJDb3JlL1dlYkNv cmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagorKysgYi9XZWJDb3JlL1dlYkNvcmUueGNvZGVw cm9qL3Byb2plY3QucGJ4cHJvagpAQCAtMTk5MTksNiArMTk5MTksNyBAQAogCQkJaXNhID0gUEJY UHJvamVjdDsKIAkJCWJ1aWxkQ29uZmlndXJhdGlvbkxpc3QgPSAxNDlDMjg0MzA4OTAyQjExMDA4 QTlFRkMgLyogQnVpbGQgY29uZmlndXJhdGlvbiBsaXN0IGZvciBQQlhQcm9qZWN0ICJXZWJDb3Jl IiAqLzsKIAkJCWNvbXBhdGliaWxpdHlWZXJzaW9uID0gIlhjb2RlIDIuNCI7CisJCQlkZXZlbG9w bWVudFJlZ2lvbiA9IEVuZ2xpc2g7CiAJCQloYXNTY2FubmVkRm9yRW5jb2RpbmdzID0gMTsKIAkJ CWtub3duUmVnaW9ucyA9ICgKIAkJCQlFbmdsaXNoLApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcCBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxh eWVyQmFja2luZy5jcHAKaW5kZXggODg4ZmUzMjk3MWVhMDBmZTVkNmI2MWRiOTQ2OTQ0NTY2YzMz Y2JlZC4uZWE3MTE0YThhZDhhYzRjZWYyZGE1YWM3YjVmZWMyOTEzYWQ1MjA4NyAxMDA2NDQKLS0t IGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcAorKysgYi9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCkBAIC0xNDAsMTkgKzE0MCwxNCBAQCBz dGF0aWMgYm9vbCBoYXNOb25aZXJvVHJhbnNmb3JtT3JpZ2luKGNvbnN0IFJlbmRlck9iamVjdCog cmVuZGVyZXIpCiAgICAgICAgIHx8IChzdHlsZS0+dHJhbnNmb3JtT3JpZ2luWSgpLnR5cGUoKSA9 PSBGaXhlZCAmJiBzdHlsZS0+dHJhbnNmb3JtT3JpZ2luWSgpLnZhbHVlKCkpOwogfQogCi1zdGF0 aWMgUmVuZGVyTGF5ZXIqIGVuY2xvc2luZ092ZXJmbG93Q2xpcEFuY2VzdG9yKFJlbmRlckxheWVy KiBsYXllciwgYm9vbCYgY3Jvc3Nlc1RyYW5zZm9ybSkKK3N0YXRpYyBib29sIGxheWVyT3JBbmNl c3RvcklzVHJhbnNmb3JtZWQoUmVuZGVyTGF5ZXIqIGxheWVyKQogewotICAgIGNyb3NzZXNUcmFu c2Zvcm0gPSBmYWxzZTsKLQotICAgIGZvciAoUmVuZGVyTGF5ZXIqIGN1cnIgPSBsYXllci0+cGFy ZW50KCk7IGN1cnI7IGN1cnIgPSBjdXJyLT5wYXJlbnQoKSkgewotICAgICAgICBpZiAoY3Vyci0+ cmVuZGVyZXIoKS0+aGFzT3ZlcmZsb3dDbGlwKCkpCi0gICAgICAgICAgICByZXR1cm4gY3VycjsK LQorICAgIGZvciAoUmVuZGVyTGF5ZXIqIGN1cnIgPSBsYXllcjsgY3VycjsgY3VyciA9IGN1cnIt PnBhcmVudCgpKSB7CiAgICAgICAgIGlmIChjdXJyLT5oYXNUcmFuc2Zvcm0oKSkKLSAgICAgICAg ICAgIGNyb3NzZXNUcmFuc2Zvcm0gPSB0cnVlOworICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAg ICAgfQogICAgIAotICAgIHJldHVybiAwOworICAgIHJldHVybiBmYWxzZTsKIH0KIAogdm9pZCBS ZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0ZUNvbXBvc2l0ZWRCb3VuZHMoKQpAQCAtMTYwLDM4ICsx NTUsMjQgQEAgdm9pZCBSZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0ZUNvbXBvc2l0ZWRCb3VuZHMo KQogICAgIEludFJlY3QgbGF5ZXJCb3VuZHMgPSBjb21wb3NpdG9yKCktPmNhbGN1bGF0ZUNvbXBv c2l0ZWRCb3VuZHMobV9vd25pbmdMYXllciwgbV9vd25pbmdMYXllcik7CiAKICAgICAvLyBDbGlw IHRvIHRoZSBzaXplIG9mIHRoZSBkb2N1bWVudCBvciBlbmNsb3Npbmcgb3ZlcmZsb3ctc2Nyb2xs IGxheWVyLgotICAgIGlmIChjb21wb3NpdG9yKCktPmNvbXBvc2l0aW5nQ29uc3VsdHNPdmVybGFw KCkgJiYgIW1fb3duaW5nTGF5ZXItPmhhc1RyYW5zZm9ybSgpKSB7Ci0gICAgICAgIGJvb2wgY3Jv c3Nlc1RyYW5zZm9ybTsKLSAgICAgICAgUmVuZGVyTGF5ZXIqIG92ZXJmbG93QW5jZXN0b3IgPSBl bmNsb3NpbmdPdmVyZmxvd0NsaXBBbmNlc3RvcihtX293bmluZ0xheWVyLCBjcm9zc2VzVHJhbnNm b3JtKTsKLSAgICAgICAgLy8gSWYgYW4gYW5jZXN0b3IgaXMgdHJhbnNmb3JtZWQsIHdlIGNhbid0 IGN1cnJlbnRseSBjb21wdXRlIHRoZSBjb3JyZWN0IHJlY3QgdG8gaW50ZXJzZWN0IHdpdGguCi0g ICAgICAgIC8vIFdlJ2QgbmVlZCBSZW5kZXJPYmplY3Q6OmNvbnZlcnRDb250YWluZXJUb0xvY2Fs UXVhZCgpLCB3aGljaCBkb2Vzbid0IHlldCBleGlzdC4KLSAgICAgICAgaWYgKCFjcm9zc2VzVHJh bnNmb3JtKSB7Ci0gICAgICAgICAgICBJbnRSZWN0IGNsaXBwaW5nQm91bmRzOwotICAgICAgICAg ICAgUmVuZGVyTGF5ZXIqIGJvdW5kc1JlbGF0aXZlTGF5ZXI7Ci0KLSAgICAgICAgICAgIGlmIChv dmVyZmxvd0FuY2VzdG9yKSB7Ci0gICAgICAgICAgICAgICAgUmVuZGVyQm94KiBvdmVyZmxvd0Jv eCA9IHRvUmVuZGVyQm94KG92ZXJmbG93QW5jZXN0b3ItPnJlbmRlcmVyKCkpOwotICAgICAgICAg ICAgICAgIC8vIElmIHNjcm9sbGJhcnMgYXJlIHZpc2libGUsIHRoZW4gY29uc3RyYWluIHRoZSBs YXllciB0byB0aGUgc2Nyb2xsYWJsZSBhcmVhLCBzbyB3ZSBjYW4gYXZvaWQgcmVkcmF3cwotICAg ICAgICAgICAgICAgIC8vIG9uIHNjcm9sbGluZy4gT3RoZXJ3aXNlIGp1c3QgY2xpcCB0byB0aGUg dmlzaWJsZSBhcmVhIChpdCBjYW4gc3RpbGwgYmUgc2Nyb2xsZWQgdmlhIEpTLCBidXQgd2UnbGwg Y29tZQotICAgICAgICAgICAgICAgIC8vIGJhY2sgdGhyb3VnaCB0aGlzIGNvZGUgd2hlbiB0aGUg c2Nyb2xsIG9mZnNldCBjaGFuZ2VzKS4KLSAgICAgICAgICAgICAgICBpZiAob3ZlcmZsb3dCb3gt PnNjcm9sbHNPdmVyZmxvdygpKQotICAgICAgICAgICAgICAgICAgICBjbGlwcGluZ0JvdW5kcyA9 IEludFJlY3QoLW92ZXJmbG93QW5jZXN0b3ItPnNjcm9sbFhPZmZzZXQoKSwgLW92ZXJmbG93QW5j ZXN0b3ItPnNjcm9sbFlPZmZzZXQoKSwgb3ZlcmZsb3dCb3gtPnNjcm9sbFdpZHRoKCksIG92ZXJm bG93Qm94LT5zY3JvbGxIZWlnaHQoKSk7Ci0gICAgICAgICAgICAgICAgZWxzZQotICAgICAgICAg ICAgICAgICAgICBjbGlwcGluZ0JvdW5kcyA9IGNsaXBCb3gob3ZlcmZsb3dCb3gpOwotCi0gICAg ICAgICAgICAgICAgYm91bmRzUmVsYXRpdmVMYXllciA9IG92ZXJmbG93QW5jZXN0b3I7Ci0gICAg ICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgICAgIFJlbmRlclZpZXcqIHZpZXcgPSBtX293 bmluZ0xheWVyLT5yZW5kZXJlcigpLT52aWV3KCk7Ci0gICAgICAgICAgICAgICAgY2xpcHBpbmdC b3VuZHMgPSB2aWV3LT5sYXlvdXRPdmVyZmxvd1JlY3QoKTsKLSAgICAgICAgICAgICAgICBib3Vu ZHNSZWxhdGl2ZUxheWVyID0gdmlldy0+bGF5ZXIoKTsKLSAgICAgICAgICAgIH0KLSAgICAgICAg ICAgIAotICAgICAgICAgICAgaW50IGRlbHRhWCA9IDA7Ci0gICAgICAgICAgICBpbnQgZGVsdGFZ ID0gMDsKLSAgICAgICAgICAgIG1fb3duaW5nTGF5ZXItPmNvbnZlcnRUb0xheWVyQ29vcmRzKGJv dW5kc1JlbGF0aXZlTGF5ZXIsIGRlbHRhWCwgZGVsdGFZKTsKLSAgICAgICAgICAgIGNsaXBwaW5n Qm91bmRzLm1vdmUoLWRlbHRhWCwgLWRlbHRhWSk7Ci0gICAgICAgICAgICBsYXllckJvdW5kcy5p bnRlcnNlY3QoY2xpcHBpbmdCb3VuZHMpOwotICAgICAgICB9CisgICAgLy8gSWYgdGhpcyBvciBh biBhbmNlc3RvciBpcyB0cmFuc2Zvcm1lZCwgd2UgY2FuJ3QgY3VycmVudGx5IGNvbXB1dGUgdGhl IGNvcnJlY3QgcmVjdCB0byBpbnRlcnNlY3Qgd2l0aC4KKyAgICAvLyBXZSdkIG5lZWQgUmVuZGVy T2JqZWN0Ojpjb252ZXJ0Q29udGFpbmVyVG9Mb2NhbFF1YWQoKSwgd2hpY2ggZG9lc24ndCB5ZXQg ZXhpc3QuCisgICAgaWYgKGNvbXBvc2l0b3IoKS0+Y29tcG9zaXRpbmdDb25zdWx0c092ZXJsYXAo KSAmJiAhbGF5ZXJPckFuY2VzdG9ySXNUcmFuc2Zvcm1lZChtX293bmluZ0xheWVyKSkgeworICAg ICAgICBSZW5kZXJWaWV3KiB2aWV3ID0gbV9vd25pbmdMYXllci0+cmVuZGVyZXIoKS0+dmlldygp OworICAgICAgICBSZW5kZXJMYXllciogcm9vdExheWVyID0gdmlldy0+bGF5ZXIoKTsKKworICAg ICAgICAvLyBTdGFydCBieSBjbGlwcGluZyB0byB0aGUgdmlldydzIGJvdW5kcy4KKyAgICAgICAg SW50UmVjdCBjbGlwcGluZ0JvdW5kcyA9IHZpZXctPmxheW91dE92ZXJmbG93UmVjdCgpOworCisg ICAgICAgIGlmIChtX293bmluZ0xheWVyICE9IHJvb3RMYXllcikKKyAgICAgICAgICAgIGNsaXBw aW5nQm91bmRzLmludGVyc2VjdChtX293bmluZ0xheWVyLT5iYWNrZ3JvdW5kQ2xpcFJlY3Qocm9v dExheWVyLCB0cnVlKSk7CisKKyAgICAgICAgaW50IGRlbHRhWCA9IDA7CisgICAgICAgIGludCBk ZWx0YVkgPSAwOworICAgICAgICBtX293bmluZ0xheWVyLT5jb252ZXJ0VG9MYXllckNvb3Jkcyhy b290TGF5ZXIsIGRlbHRhWCwgZGVsdGFZKTsKKyAgICAgICAgY2xpcHBpbmdCb3VuZHMubW92ZSgt ZGVsdGFYLCAtZGVsdGFZKTsKKworICAgICAgICBsYXllckJvdW5kcy5pbnRlcnNlY3QoY2xpcHBp bmdCb3VuZHMpOwogICAgIH0KICAgICAKICAgICAvLyBJZiB0aGUgZWxlbWVudCBoYXMgYSB0cmFu c2Zvcm0tb3JpZ2luIHRoYXQgaGFzIGZpeGVkIGxlbmd0aHMsIGFuZCB0aGUgcmVuZGVyZXIgaGFz IHplcm8gc2l6ZSwK