60586 2011-05-10 14:55:27 -0700 Switch RenderBoxModelObject::paintNinePieceImage to use IntRect instead of four ints 2011-05-10 15:45:36 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 60490 1 leviw leviw eae eric hyatt jamesr mjs oldest_to_newest 401528 0 leviw 2011-05-10 14:55:27 -0700 The tx, ty, w, and h passed in are used directly for painting -- the render object's local position isn't added to tx/ty as it is elsewhere, so it really *is* representing a position, not an offset. 401567 1 93028 leviw 2011-05-10 15:31:25 -0700 Created attachment 93028 Patch 401588 2 93028 leviw 2011-05-10 15:45:33 -0700 Comment on attachment 93028 Patch Clearing flags on attachment: 93028 Committed r86188: <http://trac.webkit.org/changeset/86188> 401589 3 leviw 2011-05-10 15:45:36 -0700 All reviewed patches have been landed. Closing bug. 93028 2011-05-10 15:31:25 -0700 2011-05-10 15:45:33 -0700 Patch bug-60586-20110510153124.patch text/plain 13716 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg2MTgzKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMDUtMTAgIExldmkgV2Vp bnRyYXViICA8bGV2aXdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFN3aXRjaCBSZW5kZXJCb3hNb2RlbE9iamVjdDo6cGFpbnRO aW5lUGllY2VJbWFnZSB0byB1c2UgSW50UmVjdCBpbnN0ZWFkIG9mIGZvdXIgaW50cworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjA1ODYKKworICAgICAg ICBTd2l0Y2ggcGFpbnROaW5lUGllY2VJbWFnZSB0byB0YWtlIGFuIEludFJlY3QgaW5zdGVhZCBv ZiBmb3VyIGludHMgcmVwcmVzZW50aW5nIGFuIEludFJlY3QhCisKKyAgICAgICAgTm8gbmV3IHRl c3RzIGFzIHRoaXMgaXMgc2ltcGx5IHJlZmFjdG9yaW5nLgorCisgICAgICAgICogcmVuZGVyaW5n L0lubGluZUZsb3dCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lRmxvd0JveDo6cGFp bnRNYXNrKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckJveDo6cGFpbnRNYXNrSW1hZ2VzKToKKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyQm94TW9kZWxPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94TW9k ZWxPYmplY3Q6OnBhaW50TmluZVBpZWNlSW1hZ2UpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy Qm94TW9kZWxPYmplY3Q6OnBhaW50Qm9yZGVyKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy Qm94TW9kZWxPYmplY3QuaDoKKwogMjAxMS0wNS0xMCAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJr aXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhdmlkIExldmluLgpJbmRleDogU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZUZsb3dCb3guY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVGbG93Qm94LmNwcAkocmV2aXNpb24gODYxODEpCisr KyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lRmxvd0JveC5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTEyMTMsNyArMTIxMyw3IEBAIHZvaWQgSW5saW5lRmxvd0JveDo6cGFpbnRNYXNrKFBh aW50SW5mbyYKICAgICAvLyBUaGUgc2ltcGxlIGNhc2UgaXMgd2hlcmUgd2UgYXJlIHRoZSBvbmx5 IGJveCBmb3IgdGhpcyBvYmplY3QuICBJbiB0aG9zZQogICAgIC8vIGNhc2VzIG9ubHkgYSBzaW5n bGUgY2FsbCB0byBkcmF3IGlzIHJlcXVpcmVkLgogICAgIGlmICghcHJldkxpbmVCb3goKSAmJiAh bmV4dExpbmVCb3goKSkgewotICAgICAgICBib3hNb2RlbE9iamVjdCgpLT5wYWludE5pbmVQaWVj ZUltYWdlKHBhaW50SW5mby5jb250ZXh0LCB0eCwgdHksIHcsIGgsIHJlbmRlcmVyKCktPnN0eWxl KCksIG1hc2tOaW5lUGllY2VJbWFnZSwgY29tcG9zaXRlT3ApOworICAgICAgICBib3hNb2RlbE9i amVjdCgpLT5wYWludE5pbmVQaWVjZUltYWdlKHBhaW50SW5mby5jb250ZXh0LCBJbnRSZWN0KHR4 LCB0eSwgdywgaCksIHJlbmRlcmVyKCktPnN0eWxlKCksIG1hc2tOaW5lUGllY2VJbWFnZSwgY29t cG9zaXRlT3ApOwogICAgIH0gZWxzZSB7CiAgICAgICAgIC8vIFdlIGhhdmUgYSBtYXNrIGltYWdl IHRoYXQgc3BhbnMgbXVsdGlwbGUgbGluZXMuCiAgICAgICAgIC8vIFdlIG5lZWQgdG8gYWRqdXN0 IF90eCBhbmQgX3R5IGJ5IHRoZSB3aWR0aCBvZiBhbGwgcHJldmlvdXMgbGluZXMuCkBAIC0xMjMw LDcgKzEyMzAsNyBAQCB2b2lkIElubGluZUZsb3dCb3g6OnBhaW50TWFzayhQYWludEluZm8mCiAK ICAgICAgICAgR3JhcGhpY3NDb250ZXh0U3RhdGVTYXZlciBzdGF0ZVNhdmVyKCpwYWludEluZm8u Y29udGV4dCk7CiAgICAgICAgIHBhaW50SW5mby5jb250ZXh0LT5jbGlwKEludFJlY3QodHgsIHR5 LCB3LCBoKSk7Ci0gICAgICAgIGJveE1vZGVsT2JqZWN0KCktPnBhaW50TmluZVBpZWNlSW1hZ2Uo cGFpbnRJbmZvLmNvbnRleHQsIHN0cmlwWCwgc3RyaXBZLCBzdHJpcFdpZHRoLCBzdHJpcEhlaWdo dCwgcmVuZGVyZXIoKS0+c3R5bGUoKSwgbWFza05pbmVQaWVjZUltYWdlLCBjb21wb3NpdGVPcCk7 CisgICAgICAgIGJveE1vZGVsT2JqZWN0KCktPnBhaW50TmluZVBpZWNlSW1hZ2UocGFpbnRJbmZv LmNvbnRleHQsIEludFJlY3Qoc3RyaXBYLCBzdHJpcFksIHN0cmlwV2lkdGgsIHN0cmlwSGVpZ2h0 KSwgcmVuZGVyZXIoKS0+c3R5bGUoKSwgbWFza05pbmVQaWVjZUltYWdlLCBjb21wb3NpdGVPcCk7 CiAgICAgfQogICAgIAogICAgIGlmIChwdXNoVHJhbnNwYXJlbmN5TGF5ZXIpCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAkocmV2aXNpb24gODYxODEpCisrKyBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTUz LDcgKzk1Myw3IEBAIHZvaWQgUmVuZGVyQm94OjpwYWludE1hc2tJbWFnZXMoY29uc3QgUGEKIAog ICAgIGlmIChhbGxNYXNrSW1hZ2VzTG9hZGVkKSB7CiAgICAgICAgIHBhaW50RmlsbExheWVycyhw YWludEluZm8sIENvbG9yKCksIHN0eWxlKCktPm1hc2tMYXllcnMoKSwgdHgsIHR5LCB3LCBoLCBC YWNrZ3JvdW5kQmxlZWROb25lLCBjb21wb3NpdGVPcCk7Ci0gICAgICAgIHBhaW50TmluZVBpZWNl SW1hZ2UocGFpbnRJbmZvLmNvbnRleHQsIHR4LCB0eSwgdywgaCwgc3R5bGUoKSwgc3R5bGUoKS0+ bWFza0JveEltYWdlKCksIGNvbXBvc2l0ZU9wKTsKKyAgICAgICAgcGFpbnROaW5lUGllY2VJbWFn ZShwYWludEluZm8uY29udGV4dCwgSW50UmVjdCh0eCwgdHksIHcsIGgpLCBzdHlsZSgpLCBzdHls ZSgpLT5tYXNrQm94SW1hZ2UoKSwgY29tcG9zaXRlT3ApOwogICAgIH0KICAgICAKICAgICBpZiAo cHVzaFRyYW5zcGFyZW5jeUxheWVyKQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckJveE1vZGVsT2JqZWN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3BwCShyZXZpc2lvbiA4NjE4MSkKKysrIFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTkyMSw3ICs5MjEsNyBAQCB2b2lkIFJlbmRlckJveE1vZGVsT2JqZWN0OjpjYWxjdWxh dGVCYWNrCiAgICAgZGVzdFJlY3QuaW50ZXJzZWN0KEludFJlY3QodHgsIHR5LCB3LCBoKSk7CiB9 CiAKLWJvb2wgUmVuZGVyQm94TW9kZWxPYmplY3Q6OnBhaW50TmluZVBpZWNlSW1hZ2UoR3JhcGhp Y3NDb250ZXh0KiBncmFwaGljc0NvbnRleHQsIGludCB0eCwgaW50IHR5LCBpbnQgdywgaW50IGgs IGNvbnN0IFJlbmRlclN0eWxlKiBzdHlsZSwKK2Jvb2wgUmVuZGVyQm94TW9kZWxPYmplY3Q6OnBh aW50TmluZVBpZWNlSW1hZ2UoR3JhcGhpY3NDb250ZXh0KiBncmFwaGljc0NvbnRleHQsIGNvbnN0 IEludFJlY3QmIHJlY3QsIGNvbnN0IFJlbmRlclN0eWxlKiBzdHlsZSwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgTmluZVBpZWNlSW1hZ2UmIG5p bmVQaWVjZUltYWdlLCBDb21wb3NpdGVPcGVyYXRvciBvcCkKIHsKICAgICBTdHlsZUltYWdlKiBz dHlsZUltYWdlID0gbmluZVBpZWNlSW1hZ2UuaW1hZ2UoKTsKQEAgLTkzNiw3ICs5MzYsNyBAQCBi b29sIFJlbmRlckJveE1vZGVsT2JqZWN0OjpwYWludE5pbmVQaWVjCiAKICAgICAvLyBGSVhNRTog Ym9yZGVyLWltYWdlIGlzIGJyb2tlbiB3aXRoIGZ1bGwgcGFnZSB6b29taW5nIHdoZW4gdGlsaW5n IGhhcyB0byBoYXBwZW4sIHNpbmNlIHRoZSB0aWxpbmcgZnVuY3Rpb24KICAgICAvLyBkb2Vzbid0 IGhhdmUgYW55IHVuZGVyc3RhbmRpbmcgb2YgdGhlIHpvb20gdGhhdCBpcyBpbiBlZmZlY3Qgb24g dGhlIHRpbGUuCi0gICAgc3R5bGVJbWFnZS0+c2V0SW1hZ2VDb250YWluZXJTaXplKEludFNpemUo dywgaCkpOworICAgIHN0eWxlSW1hZ2UtPnNldEltYWdlQ29udGFpbmVyU2l6ZShyZWN0LnNpemUo KSk7CiAgICAgSW50U2l6ZSBpbWFnZVNpemUgPSBzdHlsZUltYWdlLT5pbWFnZVNpemUodGhpcywg MS4wZik7CiAgICAgaW50IGltYWdlV2lkdGggPSBpbWFnZVNpemUud2lkdGgoKTsKICAgICBpbnQg aW1hZ2VIZWlnaHQgPSBpbWFnZVNpemUuaGVpZ2h0KCk7CkBAIC05NjAsOCArOTYwLDggQEAgYm9v bCBSZW5kZXJCb3hNb2RlbE9iamVjdDo6cGFpbnROaW5lUGllYwogICAgIGJvb2wgZHJhd1RvcCA9 IHRvcFNsaWNlID4gMCAmJiB0b3BXaWR0aCA+IDA7CiAgICAgYm9vbCBkcmF3UmlnaHQgPSByaWdo dFNsaWNlID4gMCAmJiByaWdodFdpZHRoID4gMDsKICAgICBib29sIGRyYXdCb3R0b20gPSBib3R0 b21TbGljZSA+IDAgJiYgYm90dG9tV2lkdGggPiAwOwotICAgIGJvb2wgZHJhd01pZGRsZSA9IChp bWFnZVdpZHRoIC0gbGVmdFNsaWNlIC0gcmlnaHRTbGljZSkgPiAwICYmICh3IC0gbGVmdFdpZHRo IC0gcmlnaHRXaWR0aCkgPiAwICYmCi0gICAgICAgICAgICAgICAgICAgICAgKGltYWdlSGVpZ2h0 IC0gdG9wU2xpY2UgLSBib3R0b21TbGljZSkgPiAwICYmIChoIC0gdG9wV2lkdGggLSBib3R0b21X aWR0aCkgPiAwOworICAgIGJvb2wgZHJhd01pZGRsZSA9IChpbWFnZVdpZHRoIC0gbGVmdFNsaWNl IC0gcmlnaHRTbGljZSkgPiAwICYmIChyZWN0LndpZHRoKCkgLSBsZWZ0V2lkdGggLSByaWdodFdp ZHRoKSA+IDAKKyAgICAgICAgICAgICAgICAgICAgICAmJiAoaW1hZ2VIZWlnaHQgLSB0b3BTbGlj ZSAtIGJvdHRvbVNsaWNlKSA+IDAgJiYgKHJlY3QuaGVpZ2h0KCkgLSB0b3BXaWR0aCAtIGJvdHRv bVdpZHRoKSA+IDA7CiAKICAgICBSZWZQdHI8SW1hZ2U+IGltYWdlID0gc3R5bGVJbWFnZS0+aW1h Z2UodGhpcywgaW1hZ2VTaXplKTsKICAgICBDb2xvclNwYWNlIGNvbG9yU3BhY2UgPSBzdHlsZS0+ Y29sb3JTcGFjZSgpOwpAQCAtOTcyLDE5ICs5NzIsMTkgQEAgYm9vbCBSZW5kZXJCb3hNb2RlbE9i amVjdDo6cGFpbnROaW5lUGllYwogICAgICAgICAvLyBUaGUgdG9wIGxlZnQgY29ybmVyIHJlY3Qg aXMgKHR4LCB0eSwgbGVmdFdpZHRoLCB0b3BXaWR0aCkKICAgICAgICAgLy8gVGhlIHJlY3QgdG8g dXNlIGZyb20gd2l0aGluIHRoZSBpbWFnZSBpcyBvYnRhaW5lZCBmcm9tIG91ciBzbGljZSwgYW5k IGlzICgwLCAwLCBsZWZ0U2xpY2UsIHRvcFNsaWNlKQogICAgICAgICBpZiAoZHJhd1RvcCkKLSAg ICAgICAgICAgIGdyYXBoaWNzQ29udGV4dC0+ZHJhd0ltYWdlKGltYWdlLmdldCgpLCBjb2xvclNw YWNlLCBJbnRSZWN0KHR4LCB0eSwgbGVmdFdpZHRoLCB0b3BXaWR0aCksCisgICAgICAgICAgICBn cmFwaGljc0NvbnRleHQtPmRyYXdJbWFnZShpbWFnZS5nZXQoKSwgY29sb3JTcGFjZSwgSW50UmVj dChyZWN0LmxvY2F0aW9uKCksIEludFNpemUobGVmdFdpZHRoLCB0b3BXaWR0aCkpLAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgSW50UmVjdCgwLCAwLCBsZWZ0U2xpY2Us IHRvcFNsaWNlKSwgb3ApOwogCiAgICAgICAgIC8vIFRoZSBib3R0b20gbGVmdCBjb3JuZXIgcmVj dCBpcyAodHgsIHR5ICsgaCAtIGJvdHRvbVdpZHRoLCBsZWZ0V2lkdGgsIGJvdHRvbVdpZHRoKQog ICAgICAgICAvLyBUaGUgcmVjdCB0byB1c2UgZnJvbSB3aXRoaW4gdGhlIGltYWdlIGlzICgwLCBp bWFnZUhlaWdodCAtIGJvdHRvbVNsaWNlLCBsZWZ0U2xpY2UsIGJvdG9tU2xpY2UpCiAgICAgICAg IGlmIChkcmF3Qm90dG9tKQotICAgICAgICAgICAgZ3JhcGhpY3NDb250ZXh0LT5kcmF3SW1hZ2Uo aW1hZ2UuZ2V0KCksIGNvbG9yU3BhY2UsIEludFJlY3QodHgsIHR5ICsgaCAtIGJvdHRvbVdpZHRo LCBsZWZ0V2lkdGgsIGJvdHRvbVdpZHRoKSwKKyAgICAgICAgICAgIGdyYXBoaWNzQ29udGV4dC0+ ZHJhd0ltYWdlKGltYWdlLmdldCgpLCBjb2xvclNwYWNlLCBJbnRSZWN0KHJlY3QueCgpLCByZWN0 LnkoKSArIHJlY3QuaGVpZ2h0KCkgLSBib3R0b21XaWR0aCwgbGVmdFdpZHRoLCBib3R0b21XaWR0 aCksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBJbnRSZWN0KDAsIGlt YWdlSGVpZ2h0IC0gYm90dG9tU2xpY2UsIGxlZnRTbGljZSwgYm90dG9tU2xpY2UpLCBvcCk7CiAK ICAgICAgICAgLy8gUGFpbnQgdGhlIGxlZnQgZWRnZS4KICAgICAgICAgLy8gSGF2ZSB0byBzY2Fs ZSBhbmQgdGlsZSBpbnRvIHRoZSBib3JkZXIgcmVjdC4KLSAgICAgICAgZ3JhcGhpY3NDb250ZXh0 LT5kcmF3VGlsZWRJbWFnZShpbWFnZS5nZXQoKSwgY29sb3JTcGFjZSwgSW50UmVjdCh0eCwgdHkg KyB0b3BXaWR0aCwgbGVmdFdpZHRoLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGggLSB0b3BXaWR0aCAtIGJvdHRvbVdpZHRoKSwKKyAgICAgICAgZ3JhcGhpY3NDb250 ZXh0LT5kcmF3VGlsZWRJbWFnZShpbWFnZS5nZXQoKSwgY29sb3JTcGFjZSwgSW50UmVjdChyZWN0 LngoKSwgcmVjdC55KCkgKyB0b3BXaWR0aCwgbGVmdFdpZHRoLAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHJlY3QuaGVpZ2h0KCkgLSB0b3BXaWR0aCAtIGJvdHRvbVdp ZHRoKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBJbnRSZWN0KDAs IHRvcFNsaWNlLCBsZWZ0U2xpY2UsIGltYWdlSGVpZ2h0IC0gdG9wU2xpY2UgLSBib3R0b21TbGlj ZSksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgSW1hZ2U6OlN0cmV0 Y2hUaWxlLCAoSW1hZ2U6OlRpbGVSdWxlKXZSdWxlLCBvcCk7CiAgICAgfQpAQCAtOTk0LDM5ICs5 OTQsMzkgQEAgYm9vbCBSZW5kZXJCb3hNb2RlbE9iamVjdDo6cGFpbnROaW5lUGllYwogICAgICAg ICAvLyBUaGUgdG9wIHJpZ2h0IGNvcm5lciByZWN0IGlzICh0eCArIHcgLSByaWdodFdpZHRoLCB0 eSwgcmlnaHRXaWR0aCwgdG9wV2lkdGgpCiAgICAgICAgIC8vIFRoZSByZWN0IHRvIHVzZSBmcm9t IHdpdGhpbiB0aGUgaW1hZ2UgaXMgb2J0YWluZWQgZnJvbSBvdXIgc2xpY2UsIGFuZCBpcyAoaW1h Z2VXaWR0aCAtIHJpZ2h0U2xpY2UsIDAsIHJpZ2h0U2xpY2UsIHRvcFNsaWNlKQogICAgICAgICBp ZiAoZHJhd1RvcCkKLSAgICAgICAgICAgIGdyYXBoaWNzQ29udGV4dC0+ZHJhd0ltYWdlKGltYWdl LmdldCgpLCBjb2xvclNwYWNlLCBJbnRSZWN0KHR4ICsgdyAtIHJpZ2h0V2lkdGgsIHR5LCByaWdo dFdpZHRoLCB0b3BXaWR0aCksCisgICAgICAgICAgICBncmFwaGljc0NvbnRleHQtPmRyYXdJbWFn ZShpbWFnZS5nZXQoKSwgY29sb3JTcGFjZSwgSW50UmVjdChyZWN0LngoKSArIHJlY3Qud2lkdGgo KSAtIHJpZ2h0V2lkdGgsIHJlY3QueSgpLCByaWdodFdpZHRoLCB0b3BXaWR0aCksCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBJbnRSZWN0KGltYWdlV2lkdGggLSByaWdo dFNsaWNlLCAwLCByaWdodFNsaWNlLCB0b3BTbGljZSksIG9wKTsKIAogICAgICAgICAvLyBUaGUg Ym90dG9tIHJpZ2h0IGNvcm5lciByZWN0IGlzICh0eCArIHcgLSByaWdodFdpZHRoLCB0eSArIGgg LSBib3R0b21XaWR0aCwgcmlnaHRXaWR0aCwgYm90dG9tV2lkdGgpCiAgICAgICAgIC8vIFRoZSBy ZWN0IHRvIHVzZSBmcm9tIHdpdGhpbiB0aGUgaW1hZ2UgaXMgKGltYWdlV2lkdGggLSByaWdodFNs aWNlLCBpbWFnZUhlaWdodCAtIGJvdHRvbVNsaWNlLCByaWdodFNsaWNlLCBib3R0b21TbGljZSkK ICAgICAgICAgaWYgKGRyYXdCb3R0b20pCi0gICAgICAgICAgICBncmFwaGljc0NvbnRleHQtPmRy YXdJbWFnZShpbWFnZS5nZXQoKSwgY29sb3JTcGFjZSwgSW50UmVjdCh0eCArIHcgLSByaWdodFdp ZHRoLCB0eSArIGggLSBib3R0b21XaWR0aCwgcmlnaHRXaWR0aCwgYm90dG9tV2lkdGgpLAorICAg ICAgICAgICAgZ3JhcGhpY3NDb250ZXh0LT5kcmF3SW1hZ2UoaW1hZ2UuZ2V0KCksIGNvbG9yU3Bh Y2UsIEludFJlY3QocmVjdC54KCkgKyByZWN0LndpZHRoKCkgLSByaWdodFdpZHRoLCByZWN0Lnko KSArIHJlY3QuaGVpZ2h0KCkgLSBib3R0b21XaWR0aCwgcmlnaHRXaWR0aCwgYm90dG9tV2lkdGgp LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgSW50UmVjdChpbWFnZVdp ZHRoIC0gcmlnaHRTbGljZSwgaW1hZ2VIZWlnaHQgLSBib3R0b21TbGljZSwgcmlnaHRTbGljZSwg Ym90dG9tU2xpY2UpLCBvcCk7CiAKICAgICAgICAgLy8gUGFpbnQgdGhlIHJpZ2h0IGVkZ2UuCi0g ICAgICAgIGdyYXBoaWNzQ29udGV4dC0+ZHJhd1RpbGVkSW1hZ2UoaW1hZ2UuZ2V0KCksIGNvbG9y U3BhY2UsIEludFJlY3QodHggKyB3IC0gcmlnaHRXaWR0aCwgdHkgKyB0b3BXaWR0aCwgcmlnaHRX aWR0aCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBoIC0gdG9wV2lk dGggLSBib3R0b21XaWR0aCksCisgICAgICAgIGdyYXBoaWNzQ29udGV4dC0+ZHJhd1RpbGVkSW1h Z2UoaW1hZ2UuZ2V0KCksIGNvbG9yU3BhY2UsIEludFJlY3QocmVjdC54KCkgKyByZWN0LndpZHRo KCkgLSByaWdodFdpZHRoLCByZWN0LnkoKSArIHRvcFdpZHRoLCByaWdodFdpZHRoLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlY3QuaGVpZ2h0KCkgLSB0b3BXaWR0 aCAtIGJvdHRvbVdpZHRoKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBJbnRSZWN0KGltYWdlV2lkdGggLSByaWdodFNsaWNlLCB0b3BTbGljZSwgcmlnaHRTbGljZSwg aW1hZ2VIZWlnaHQgLSB0b3BTbGljZSAtIGJvdHRvbVNsaWNlKSwKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBJbWFnZTo6U3RyZXRjaFRpbGUsIChJbWFnZTo6VGlsZVJ1 bGUpdlJ1bGUsIG9wKTsKICAgICB9CiAKICAgICAvLyBQYWludCB0aGUgdG9wIGVkZ2UuCiAgICAg aWYgKGRyYXdUb3ApCi0gICAgICAgIGdyYXBoaWNzQ29udGV4dC0+ZHJhd1RpbGVkSW1hZ2UoaW1h Z2UuZ2V0KCksIGNvbG9yU3BhY2UsIEludFJlY3QodHggKyBsZWZ0V2lkdGgsIHR5LCB3IC0gbGVm dFdpZHRoIC0gcmlnaHRXaWR0aCwgdG9wV2lkdGgpLAorICAgICAgICBncmFwaGljc0NvbnRleHQt PmRyYXdUaWxlZEltYWdlKGltYWdlLmdldCgpLCBjb2xvclNwYWNlLCBJbnRSZWN0KHJlY3QueCgp ICsgbGVmdFdpZHRoLCByZWN0LnkoKSwgcmVjdC53aWR0aCgpIC0gbGVmdFdpZHRoIC0gcmlnaHRX aWR0aCwgdG9wV2lkdGgpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IEludFJlY3QobGVmdFNsaWNlLCAwLCBpbWFnZVdpZHRoIC0gcmlnaHRTbGljZSAtIGxlZnRTbGlj ZSwgdG9wU2xpY2UpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChJ bWFnZTo6VGlsZVJ1bGUpaFJ1bGUsIEltYWdlOjpTdHJldGNoVGlsZSwgb3ApOwogCiAgICAgLy8g UGFpbnQgdGhlIGJvdHRvbSBlZGdlLgogICAgIGlmIChkcmF3Qm90dG9tKQotICAgICAgICBncmFw aGljc0NvbnRleHQtPmRyYXdUaWxlZEltYWdlKGltYWdlLmdldCgpLCBjb2xvclNwYWNlLCBJbnRS ZWN0KHR4ICsgbGVmdFdpZHRoLCB0eSArIGggLSBib3R0b21XaWR0aCwKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICB3IC0gbGVmdFdpZHRoIC0gcmlnaHRXaWR0aCwgYm90 dG9tV2lkdGgpLAorICAgICAgICBncmFwaGljc0NvbnRleHQtPmRyYXdUaWxlZEltYWdlKGltYWdl LmdldCgpLCBjb2xvclNwYWNlLCBJbnRSZWN0KHJlY3QueCgpICsgbGVmdFdpZHRoLCByZWN0Lnko KSArIHJlY3QuaGVpZ2h0KCkgLSBib3R0b21XaWR0aCwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICByZWN0LndpZHRoKCkgLSBsZWZ0V2lkdGggLSByaWdodFdpZHRoLCBi b3R0b21XaWR0aCksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgSW50 UmVjdChsZWZ0U2xpY2UsIGltYWdlSGVpZ2h0IC0gYm90dG9tU2xpY2UsIGltYWdlV2lkdGggLSBy aWdodFNsaWNlIC0gbGVmdFNsaWNlLCBib3R0b21TbGljZSksCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgKEltYWdlOjpUaWxlUnVsZSloUnVsZSwgSW1hZ2U6OlN0cmV0 Y2hUaWxlLCBvcCk7CiAKICAgICAvLyBQYWludCB0aGUgbWlkZGxlLgogICAgIGlmIChkcmF3TWlk ZGxlKQotICAgICAgICBncmFwaGljc0NvbnRleHQtPmRyYXdUaWxlZEltYWdlKGltYWdlLmdldCgp LCBjb2xvclNwYWNlLCBJbnRSZWN0KHR4ICsgbGVmdFdpZHRoLCB0eSArIHRvcFdpZHRoLCB3IC0g bGVmdFdpZHRoIC0gcmlnaHRXaWR0aCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBoIC0gdG9wV2lkdGggLSBib3R0b21XaWR0aCksCisgICAgICAgIGdyYXBoaWNzQ29u dGV4dC0+ZHJhd1RpbGVkSW1hZ2UoaW1hZ2UuZ2V0KCksIGNvbG9yU3BhY2UsIEludFJlY3QocmVj dC54KCkgKyBsZWZ0V2lkdGgsIHJlY3QueSgpICsgdG9wV2lkdGgsIHJlY3Qud2lkdGgoKSAtIGxl ZnRXaWR0aCAtIHJpZ2h0V2lkdGgsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgcmVjdC5oZWlnaHQoKSAtIHRvcFdpZHRoIC0gYm90dG9tV2lkdGgpLAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEludFJlY3QobGVmdFNsaWNlLCB0b3BTbGlj ZSwgaW1hZ2VXaWR0aCAtIHJpZ2h0U2xpY2UgLSBsZWZ0U2xpY2UsIGltYWdlSGVpZ2h0IC0gdG9w U2xpY2UgLSBib3R0b21TbGljZSksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgKEltYWdlOjpUaWxlUnVsZSloUnVsZSwgKEltYWdlOjpUaWxlUnVsZSl2UnVsZSwgb3Ap OwogCkBAIC0xMzUwLDcgKzEzNTAsNyBAQCB2b2lkIFJlbmRlckJveE1vZGVsT2JqZWN0OjpwYWlu dEJvcmRlcihHCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBS ZW5kZXJTdHlsZSogc3R5bGUsIEJhY2tncm91bmRCbGVlZEF2b2lkYW5jZSBibGVlZEF2b2lkYW5j ZSwgYm9vbCBpbmNsdWRlTG9naWNhbExlZnRFZGdlLCBib29sIGluY2x1ZGVMb2dpY2FsUmlnaHRF ZGdlKQogewogICAgIC8vIGJvcmRlci1pbWFnZSBpcyBub3QgYWZmZWN0ZWQgYnkgYm9yZGVyLXJh ZGl1cy4KLSAgICBpZiAocGFpbnROaW5lUGllY2VJbWFnZShncmFwaGljc0NvbnRleHQsIHR4LCB0 eSwgdywgaCwgc3R5bGUsIHN0eWxlLT5ib3JkZXJJbWFnZSgpKSkKKyAgICBpZiAocGFpbnROaW5l UGllY2VJbWFnZShncmFwaGljc0NvbnRleHQsIEludFJlY3QodHgsIHR5LCB3LCBoKSwgc3R5bGUs IHN0eWxlLT5ib3JkZXJJbWFnZSgpKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgaWYgKGdyYXBo aWNzQ29udGV4dC0+cGFpbnRpbmdEaXNhYmxlZCgpKQpAQCAtMTU5Miw3ICsxNTkyLDcgQEAgdm9p ZCBSZW5kZXJCb3hNb2RlbE9iamVjdDo6cGFpbnRCb3JkZXIoRwogewogICAgIC8vIEZJWE1FOiBU aGlzIG9sZCB2ZXJzaW9uIG9mIHBhaW50Qm9yZGVyIHNob3VsZCBiZSByZW1vdmVkIHdoZW4gYWxs IHBvcnRzIGltcGxlbWVudCAKICAgICAvLyBHcmFwaGljc0NvbnRleHQ6OmNsaXBDb252ZXhQb2x5 Z29uKCkhISBUaGlzIHNob3VsZCBoYXBwZW4gc29vbi4KLSAgICBpZiAocGFpbnROaW5lUGllY2VJ bWFnZShncmFwaGljc0NvbnRleHQsIHR4LCB0eSwgdywgaCwgc3R5bGUsIHN0eWxlLT5ib3JkZXJJ bWFnZSgpKSkKKyAgICBpZiAocGFpbnROaW5lUGllY2VJbWFnZShncmFwaGljc0NvbnRleHQsIElu dFJlY3QodHgsIHR5LCB3LCBoKSwgc3R5bGUsIHN0eWxlLT5ib3JkZXJJbWFnZSgpKSkKICAgICAg ICAgcmV0dXJuOwogCiAgICAgY29uc3QgQ29sb3ImIHRvcENvbG9yID0gc3R5bGUtPnZpc2l0ZWRE ZXBlbmRlbnRDb2xvcihDU1NQcm9wZXJ0eUJvcmRlclRvcENvbG9yKTsKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5oCShyZXZpc2lvbiA4 NjE4MSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5o CSh3b3JraW5nIGNvcHkpCkBAIC0xMTksNyArMTE5LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwg dm9pZCBjaGlsZEJlY2FtZU5vbklubGluZShSZW5kZXJPYmplY3QqIC8qY2hpbGQqLykgeyB9CiAK ICAgICB2b2lkIHBhaW50Qm9yZGVyKEdyYXBoaWNzQ29udGV4dCosIGludCB0eCwgaW50IHR5LCBp bnQgdywgaW50IGgsIGNvbnN0IFJlbmRlclN0eWxlKiwgQmFja2dyb3VuZEJsZWVkQXZvaWRhbmNl ID0gQmFja2dyb3VuZEJsZWVkTm9uZSwgYm9vbCBpbmNsdWRlTG9naWNhbExlZnRFZGdlID0gdHJ1 ZSwgYm9vbCBpbmNsdWRlTG9naWNhbFJpZ2h0RWRnZSA9IHRydWUpOwotICAgIGJvb2wgcGFpbnRO aW5lUGllY2VJbWFnZShHcmFwaGljc0NvbnRleHQqLCBpbnQgdHgsIGludCB0eSwgaW50IHcsIGlu dCBoLCBjb25zdCBSZW5kZXJTdHlsZSosIGNvbnN0IE5pbmVQaWVjZUltYWdlJiwgQ29tcG9zaXRl T3BlcmF0b3IgPSBDb21wb3NpdGVTb3VyY2VPdmVyKTsKKyAgICBib29sIHBhaW50TmluZVBpZWNl SW1hZ2UoR3JhcGhpY3NDb250ZXh0KiwgY29uc3QgSW50UmVjdCYsIGNvbnN0IFJlbmRlclN0eWxl KiwgY29uc3QgTmluZVBpZWNlSW1hZ2UmLCBDb21wb3NpdGVPcGVyYXRvciA9IENvbXBvc2l0ZVNv dXJjZU92ZXIpOwogICAgIHZvaWQgcGFpbnRCb3hTaGFkb3coR3JhcGhpY3NDb250ZXh0KiwgaW50 IHR4LCBpbnQgdHksIGludCB3LCBpbnQgaCwgY29uc3QgUmVuZGVyU3R5bGUqLCBTaGFkb3dTdHls ZSwgYm9vbCBpbmNsdWRlTG9naWNhbExlZnRFZGdlID0gdHJ1ZSwgYm9vbCBpbmNsdWRlTG9naWNh bFJpZ2h0RWRnZSA9IHRydWUpOwogICAgIHZvaWQgcGFpbnRGaWxsTGF5ZXJFeHRlbmRlZChjb25z dCBQYWludEluZm8mLCBjb25zdCBDb2xvciYsIGNvbnN0IEZpbGxMYXllciosIGludCB0eCwgaW50 IHR5LCBpbnQgd2lkdGgsIGludCBoZWlnaHQsIEJhY2tncm91bmRCbGVlZEF2b2lkYW5jZSwgSW5s aW5lRmxvd0JveCogPSAwLCBpbnQgaW5saW5lQm94V2lkdGggPSAwLCBpbnQgaW5saW5lQm94SGVp Z2h0ID0gMCwgQ29tcG9zaXRlT3BlcmF0b3IgPSBDb21wb3NpdGVTb3VyY2VPdmVyLCBSZW5kZXJP YmplY3QqIGJhY2tncm91bmRPYmplY3QgPSAwKTsKICAgICAK