55924 2011-03-07 22:18:31 -0800 [EFL] Adjust functions of WebCore's efl port to WebKit coding style 2011-03-07 23:33:56 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 gyuyoung.kim webkit-unassigned commit-queue kenneth leandro tkent tonikitoo oldest_to_newest 363818 0 gyuyoung.kim 2011-03-07 22:18:31 -0800 Adjust below files to WebKit coding style. - PlatformKeyboardEventEfl.cpp - PlatformMouseEventEfl.cpp - WidgetEfl.cpp 363819 1 85018 gyuyoung.kim 2011-03-07 22:20:42 -0800 Created attachment 85018 Patch 363852 2 85018 commit-queue 2011-03-07 23:33:50 -0800 Comment on attachment 85018 Patch Clearing flags on attachment: 85018 Committed r80543: <http://trac.webkit.org/changeset/80543> 363853 3 commit-queue 2011-03-07 23:33:56 -0800 All reviewed patches have been landed. Closing bug. 85018 2011-03-07 22:20:42 -0800 2011-03-07 23:33:50 -0800 Patch patch-style-webcore-efl.txt text/plain 9620 gyuyoung.kim ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmMDdhZDA2Li4wMWU4MjQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAg QEAKKzIwMTEtMDMtMDcgIEd5dXlvdW5nIEtpbSAgPGd5dXlvdW5nLmtpbUBzYW1zdW5nLmNvbT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbRUZMXSBB ZGp1c3QgZnVuY3Rpb25zIG9mIFdlYkNvcmUncyBlZmwgcG9ydCB0byBXZWJLaXQgY29kaW5nIHN0 eWxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NTky NAorCisgICAgICAgIEFkanVzdCB3ZWJraXQgc3R5bGUgdG8gUGxhdGZvcm1LZXlib2FyZEV2ZW50 RWZsLCBQbGF0Zm9ybU1vdXNlRXZlbnRFZmwgYW5kIFdpZGdldEVmbCBmaWxlcy4KKworICAgICAg ICAqIHBsYXRmb3JtL2VmbC9QbGF0Zm9ybUtleWJvYXJkRXZlbnRFZmwuY3BwOgorICAgICAgICAo V2ViQ29yZTo6UGxhdGZvcm1LZXlib2FyZEV2ZW50OjpQbGF0Zm9ybUtleWJvYXJkRXZlbnQpOgor ICAgICAgICAqIHBsYXRmb3JtL2VmbC9QbGF0Zm9ybU1vdXNlRXZlbnRFZmwuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UGxhdGZvcm1Nb3VzZUV2ZW50OjpQbGF0Zm9ybU1vdXNlRXZlbnQpOgorICAg ICAgICAqIHBsYXRmb3JtL2VmbC9XaWRnZXRFZmwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6V2lk Z2V0OjpmcmFtZVJlY3RzQ2hhbmdlZCk6CisgICAgICAgIChXZWJDb3JlOjpXaWRnZXQ6OnNldEV2 YXNPYmplY3QpOgorCiAyMDExLTAzLTA3ICBBbGljZSBCb3hoYWxsICA8YWJveGhhbGxAY2hyb21p dW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gQmFydGguCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lZmwvUGxhdGZvcm1LZXlib2FyZEV2ZW50RWZsLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9QbGF0Zm9ybUtleWJvYXJkRXZlbnRFZmwuY3Bw CmluZGV4IDI4ODhiMjIuLjEwMTIxZGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2VmbC9QbGF0Zm9ybUtleWJvYXJkRXZlbnRFZmwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2VmbC9QbGF0Zm9ybUtleWJvYXJkRXZlbnRFZmwuY3BwCkBAIC0xODgsMTUgKzE4 OCwxNSBAQCBzdGF0aWMgaW50IHdpbmRvd3NLZXlDb2RlRm9yRXZhc0tleU5hbWUoU3RyaW5nJiBr ZXlOYW1lKQogICAgIHJldHVybiAwOwogfQogCi1QbGF0Zm9ybUtleWJvYXJkRXZlbnQ6OlBsYXRm b3JtS2V5Ym9hcmRFdmVudChjb25zdCBFdmFzX0V2ZW50X0tleV9Eb3duKiBldikKK1BsYXRmb3Jt S2V5Ym9hcmRFdmVudDo6UGxhdGZvcm1LZXlib2FyZEV2ZW50KGNvbnN0IEV2YXNfRXZlbnRfS2V5 X0Rvd24qIGV2ZW50KQogICAgIDogbV90eXBlKEtleURvd24pCi0gICAgLCBtX3RleHQoU3RyaW5n Ojpmcm9tVVRGOChldi0+c3RyaW5nKSkKLSAgICAsIG1fc2hpZnRLZXkoZXZhc19rZXlfbW9kaWZp ZXJfaXNfc2V0KGV2LT5tb2RpZmllcnMsICJTaGlmdCIpKQotICAgICwgbV9jdHJsS2V5KGV2YXNf a2V5X21vZGlmaWVyX2lzX3NldChldi0+bW9kaWZpZXJzLCAiQ29udHJvbCIpKQotICAgICwgbV9h bHRLZXkoZXZhc19rZXlfbW9kaWZpZXJfaXNfc2V0KGV2LT5tb2RpZmllcnMsICJBbHQiKSkKLSAg ICAsIG1fbWV0YUtleShldmFzX2tleV9tb2RpZmllcl9pc19zZXQoZXYtPm1vZGlmaWVycywgIk1l dGEiKSkKKyAgICAsIG1fdGV4dChTdHJpbmc6OmZyb21VVEY4KGV2ZW50LT5zdHJpbmcpKQorICAg ICwgbV9zaGlmdEtleShldmFzX2tleV9tb2RpZmllcl9pc19zZXQoZXZlbnQtPm1vZGlmaWVycywg IlNoaWZ0IikpCisgICAgLCBtX2N0cmxLZXkoZXZhc19rZXlfbW9kaWZpZXJfaXNfc2V0KGV2ZW50 LT5tb2RpZmllcnMsICJDb250cm9sIikpCisgICAgLCBtX2FsdEtleShldmFzX2tleV9tb2RpZmll cl9pc19zZXQoZXZlbnQtPm1vZGlmaWVycywgIkFsdCIpKQorICAgICwgbV9tZXRhS2V5KGV2YXNf a2V5X21vZGlmaWVyX2lzX3NldChldmVudC0+bW9kaWZpZXJzLCAiTWV0YSIpKQogewotICAgIFN0 cmluZyBrZXlOYW1lID0gU3RyaW5nKGV2LT5rZXkpOworICAgIFN0cmluZyBrZXlOYW1lID0gU3Ry aW5nKGV2ZW50LT5rZXkpOwogICAgIG1fa2V5SWRlbnRpZmllciA9IGtleUlkZW50aWZpZXJGb3JF dmFzS2V5TmFtZShrZXlOYW1lKTsKICAgICBtX3dpbmRvd3NWaXJ0dWFsS2V5Q29kZSA9IHdpbmRv d3NLZXlDb2RlRm9yRXZhc0tleU5hbWUoa2V5TmFtZSk7CiAKQEAgLTIwNSwxNSArMjA1LDE1IEBA IFBsYXRmb3JtS2V5Ym9hcmRFdmVudDo6UGxhdGZvcm1LZXlib2FyZEV2ZW50KGNvbnN0IEV2YXNf RXZlbnRfS2V5X0Rvd24qIGV2KQogICAgIG1fYXV0b1JlcGVhdCA9IGZhbHNlOwogfQogCi1QbGF0 Zm9ybUtleWJvYXJkRXZlbnQ6OlBsYXRmb3JtS2V5Ym9hcmRFdmVudChjb25zdCBFdmFzX0V2ZW50 X0tleV9VcCogZXYpCitQbGF0Zm9ybUtleWJvYXJkRXZlbnQ6OlBsYXRmb3JtS2V5Ym9hcmRFdmVu dChjb25zdCBFdmFzX0V2ZW50X0tleV9VcCogZXZlbnQpCiAgICAgOiBtX3R5cGUoS2V5VXApCi0g ICAgLCBtX3RleHQoU3RyaW5nOjpmcm9tVVRGOChldi0+c3RyaW5nKSkKLSAgICAsIG1fc2hpZnRL ZXkoZXZhc19rZXlfbW9kaWZpZXJfaXNfc2V0KGV2LT5tb2RpZmllcnMsICJTaGlmdCIpKQotICAg ICwgbV9jdHJsS2V5KGV2YXNfa2V5X21vZGlmaWVyX2lzX3NldChldi0+bW9kaWZpZXJzLCAiQ29u dHJvbCIpKQotICAgICwgbV9hbHRLZXkoZXZhc19rZXlfbW9kaWZpZXJfaXNfc2V0KGV2LT5tb2Rp ZmllcnMsICJBbHQiKSkKLSAgICAsIG1fbWV0YUtleShldmFzX2tleV9tb2RpZmllcl9pc19zZXQo ZXYtPm1vZGlmaWVycywgIk1ldGEiKSkKKyAgICAsIG1fdGV4dChTdHJpbmc6OmZyb21VVEY4KGV2 ZW50LT5zdHJpbmcpKQorICAgICwgbV9zaGlmdEtleShldmFzX2tleV9tb2RpZmllcl9pc19zZXQo ZXZlbnQtPm1vZGlmaWVycywgIlNoaWZ0IikpCisgICAgLCBtX2N0cmxLZXkoZXZhc19rZXlfbW9k aWZpZXJfaXNfc2V0KGV2ZW50LT5tb2RpZmllcnMsICJDb250cm9sIikpCisgICAgLCBtX2FsdEtl eShldmFzX2tleV9tb2RpZmllcl9pc19zZXQoZXZlbnQtPm1vZGlmaWVycywgIkFsdCIpKQorICAg ICwgbV9tZXRhS2V5KGV2YXNfa2V5X21vZGlmaWVyX2lzX3NldChldmVudC0+bW9kaWZpZXJzLCAi TWV0YSIpKQogewotICAgIFN0cmluZyBrZXlOYW1lID0gU3RyaW5nKGV2LT5rZXkpOworICAgIFN0 cmluZyBrZXlOYW1lID0gU3RyaW5nKGV2ZW50LT5rZXkpOwogICAgIG1fa2V5SWRlbnRpZmllciA9 IGtleUlkZW50aWZpZXJGb3JFdmFzS2V5TmFtZShrZXlOYW1lKTsKICAgICBtX3dpbmRvd3NWaXJ0 dWFsS2V5Q29kZSA9IHdpbmRvd3NLZXlDb2RlRm9yRXZhc0tleU5hbWUoa2V5TmFtZSk7CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9QbGF0Zm9ybU1vdXNlRXZlbnRF ZmwuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL1BsYXRmb3JtTW91c2VFdmVudEVm bC5jcHAKaW5kZXggNTNkZTUyMi4uMTcyYjQ5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZWZsL1BsYXRmb3JtTW91c2VFdmVudEVmbC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZWZsL1BsYXRmb3JtTW91c2VFdmVudEVmbC5jcHAKQEAgLTQ3LDQ0ICs0Nyw0 NCBAQCB2b2lkIFBsYXRmb3JtTW91c2VFdmVudDo6c2V0Q2xpY2tDb3VudCh1bnNpZ25lZCBpbnQg ZmxhZ3MpCiAgICAgICAgIG1fY2xpY2tDb3VudCA9IDE7CiB9CiAKLVBsYXRmb3JtTW91c2VFdmVu dDo6UGxhdGZvcm1Nb3VzZUV2ZW50KGNvbnN0IEV2YXNfRXZlbnRfTW91c2VfRG93biogZXYsIElu dFBvaW50IHBvcykKLSAgICA6IG1fcG9zaXRpb24oSW50UG9pbnQoZXYtPmNhbnZhcy54IC0gcG9z LngoKSwgZXYtPmNhbnZhcy55IC0gcG9zLnkoKSkpCi0gICAgLCBtX2dsb2JhbFBvc2l0aW9uKElu dFBvaW50KGV2LT5jYW52YXMueCwgZXYtPmNhbnZhcy55KSkKLSAgICAsIG1fYnV0dG9uKE1vdXNl QnV0dG9uKGV2LT5idXR0b24gLSAxKSkKK1BsYXRmb3JtTW91c2VFdmVudDo6UGxhdGZvcm1Nb3Vz ZUV2ZW50KGNvbnN0IEV2YXNfRXZlbnRfTW91c2VfRG93biogZXZlbnQsIEludFBvaW50IHBvc2l0 aW9uKQorICAgIDogbV9wb3NpdGlvbihJbnRQb2ludChldmVudC0+Y2FudmFzLnggLSBwb3NpdGlv bi54KCksIGV2ZW50LT5jYW52YXMueSAtIHBvc2l0aW9uLnkoKSkpCisgICAgLCBtX2dsb2JhbFBv c2l0aW9uKEludFBvaW50KGV2ZW50LT5jYW52YXMueCwgZXZlbnQtPmNhbnZhcy55KSkKKyAgICAs IG1fYnV0dG9uKE1vdXNlQnV0dG9uKGV2ZW50LT5idXR0b24gLSAxKSkKICAgICAsIG1fZXZlbnRU eXBlKE1vdXNlRXZlbnRQcmVzc2VkKQotICAgICwgbV9zaGlmdEtleShldmFzX2tleV9tb2RpZmll cl9pc19zZXQoZXYtPm1vZGlmaWVycywgIlNoaWZ0IikpCi0gICAgLCBtX2N0cmxLZXkoZXZhc19r ZXlfbW9kaWZpZXJfaXNfc2V0KGV2LT5tb2RpZmllcnMsICJDb250cm9sIikpCi0gICAgLCBtX2Fs dEtleShldmFzX2tleV9tb2RpZmllcl9pc19zZXQoZXYtPm1vZGlmaWVycywgIkFsdCIpKQotICAg ICwgbV9tZXRhS2V5KGV2YXNfa2V5X21vZGlmaWVyX2lzX3NldChldi0+bW9kaWZpZXJzLCAiTWV0 YSIpKQorICAgICwgbV9zaGlmdEtleShldmFzX2tleV9tb2RpZmllcl9pc19zZXQoZXZlbnQtPm1v ZGlmaWVycywgIlNoaWZ0IikpCisgICAgLCBtX2N0cmxLZXkoZXZhc19rZXlfbW9kaWZpZXJfaXNf c2V0KGV2ZW50LT5tb2RpZmllcnMsICJDb250cm9sIikpCisgICAgLCBtX2FsdEtleShldmFzX2tl eV9tb2RpZmllcl9pc19zZXQoZXZlbnQtPm1vZGlmaWVycywgIkFsdCIpKQorICAgICwgbV9tZXRh S2V5KGV2YXNfa2V5X21vZGlmaWVyX2lzX3NldChldmVudC0+bW9kaWZpZXJzLCAiTWV0YSIpKQog ICAgICwgbV90aW1lc3RhbXAoY3VycmVudFRpbWUoKSkKIHsKLSAgICBzZXRDbGlja0NvdW50KGV2 LT5mbGFncyk7CisgICAgc2V0Q2xpY2tDb3VudChldmVudC0+ZmxhZ3MpOwogfQogCi1QbGF0Zm9y bU1vdXNlRXZlbnQ6OlBsYXRmb3JtTW91c2VFdmVudChjb25zdCBFdmFzX0V2ZW50X01vdXNlX1Vw KiBldiwgSW50UG9pbnQgcG9zKQotICAgIDogbV9wb3NpdGlvbihJbnRQb2ludChldi0+Y2FudmFz LnggLSBwb3MueCgpLCBldi0+Y2FudmFzLnkgLSBwb3MueSgpKSkKLSAgICAsIG1fZ2xvYmFsUG9z aXRpb24oSW50UG9pbnQoZXYtPmNhbnZhcy54LCBldi0+Y2FudmFzLnkpKQotICAgICwgbV9idXR0 b24oTW91c2VCdXR0b24oZXYtPmJ1dHRvbiAtIDEpKQorUGxhdGZvcm1Nb3VzZUV2ZW50OjpQbGF0 Zm9ybU1vdXNlRXZlbnQoY29uc3QgRXZhc19FdmVudF9Nb3VzZV9VcCogZXZlbnQsIEludFBvaW50 IHBvc2l0aW9uKQorICAgIDogbV9wb3NpdGlvbihJbnRQb2ludChldmVudC0+Y2FudmFzLnggLSBw b3NpdGlvbi54KCksIGV2ZW50LT5jYW52YXMueSAtIHBvc2l0aW9uLnkoKSkpCisgICAgLCBtX2ds b2JhbFBvc2l0aW9uKEludFBvaW50KGV2ZW50LT5jYW52YXMueCwgZXZlbnQtPmNhbnZhcy55KSkK KyAgICAsIG1fYnV0dG9uKE1vdXNlQnV0dG9uKGV2ZW50LT5idXR0b24gLSAxKSkKICAgICAsIG1f ZXZlbnRUeXBlKE1vdXNlRXZlbnRSZWxlYXNlZCkKLSAgICAsIG1fc2hpZnRLZXkoZXZhc19rZXlf bW9kaWZpZXJfaXNfc2V0KGV2LT5tb2RpZmllcnMsICJTaGlmdCIpKQotICAgICwgbV9jdHJsS2V5 KGV2YXNfa2V5X21vZGlmaWVyX2lzX3NldChldi0+bW9kaWZpZXJzLCAiQ29udHJvbCIpKQotICAg ICwgbV9hbHRLZXkoZXZhc19rZXlfbW9kaWZpZXJfaXNfc2V0KGV2LT5tb2RpZmllcnMsICJBbHQi KSkKLSAgICAsIG1fbWV0YUtleShldmFzX2tleV9tb2RpZmllcl9pc19zZXQoZXYtPm1vZGlmaWVy cywgIk1ldGEiKSkKKyAgICAsIG1fc2hpZnRLZXkoZXZhc19rZXlfbW9kaWZpZXJfaXNfc2V0KGV2 ZW50LT5tb2RpZmllcnMsICJTaGlmdCIpKQorICAgICwgbV9jdHJsS2V5KGV2YXNfa2V5X21vZGlm aWVyX2lzX3NldChldmVudC0+bW9kaWZpZXJzLCAiQ29udHJvbCIpKQorICAgICwgbV9hbHRLZXko ZXZhc19rZXlfbW9kaWZpZXJfaXNfc2V0KGV2ZW50LT5tb2RpZmllcnMsICJBbHQiKSkKKyAgICAs IG1fbWV0YUtleShldmFzX2tleV9tb2RpZmllcl9pc19zZXQoZXZlbnQtPm1vZGlmaWVycywgIk1l dGEiKSkKICAgICAsIG1fdGltZXN0YW1wKGN1cnJlbnRUaW1lKCkpCiB7Ci0gICAgc2V0Q2xpY2tD b3VudChldi0+ZmxhZ3MpOworICAgIHNldENsaWNrQ291bnQoZXZlbnQtPmZsYWdzKTsKIH0KIAot UGxhdGZvcm1Nb3VzZUV2ZW50OjpQbGF0Zm9ybU1vdXNlRXZlbnQoY29uc3QgRXZhc19FdmVudF9N b3VzZV9Nb3ZlKiBldiwgSW50UG9pbnQgcG9zKQotICAgIDogbV9wb3NpdGlvbihJbnRQb2ludChl di0+Y3VyLmNhbnZhcy54IC0gcG9zLngoKSwgZXYtPmN1ci5jYW52YXMueSAtIHBvcy55KCkpKQot ICAgICwgbV9nbG9iYWxQb3NpdGlvbihJbnRQb2ludChldi0+Y3VyLmNhbnZhcy54LCBldi0+Y3Vy LmNhbnZhcy55KSkKLSAgICAsIG1fYnV0dG9uKE1vdXNlQnV0dG9uKGV2LT5idXR0b25zIC0gMSkp CitQbGF0Zm9ybU1vdXNlRXZlbnQ6OlBsYXRmb3JtTW91c2VFdmVudChjb25zdCBFdmFzX0V2ZW50 X01vdXNlX01vdmUqIGV2ZW50LCBJbnRQb2ludCBwb3NpdGlvbikKKyAgICA6IG1fcG9zaXRpb24o SW50UG9pbnQoZXZlbnQtPmN1ci5jYW52YXMueCAtIHBvc2l0aW9uLngoKSwgZXZlbnQtPmN1ci5j YW52YXMueSAtIHBvc2l0aW9uLnkoKSkpCisgICAgLCBtX2dsb2JhbFBvc2l0aW9uKEludFBvaW50 KGV2ZW50LT5jdXIuY2FudmFzLngsIGV2ZW50LT5jdXIuY2FudmFzLnkpKQorICAgICwgbV9idXR0 b24oTW91c2VCdXR0b24oZXZlbnQtPmJ1dHRvbnMgLSAxKSkKICAgICAsIG1fZXZlbnRUeXBlKE1v dXNlRXZlbnRNb3ZlZCkKICAgICAsIG1fY2xpY2tDb3VudCgwKQotICAgICwgbV9zaGlmdEtleShl dmFzX2tleV9tb2RpZmllcl9pc19zZXQoZXYtPm1vZGlmaWVycywgIlNoaWZ0IikpCi0gICAgLCBt X2N0cmxLZXkoZXZhc19rZXlfbW9kaWZpZXJfaXNfc2V0KGV2LT5tb2RpZmllcnMsICJDb250cm9s IikpCi0gICAgLCBtX2FsdEtleShldmFzX2tleV9tb2RpZmllcl9pc19zZXQoZXYtPm1vZGlmaWVy cywgIkFsdCIpKQotICAgICwgbV9tZXRhS2V5KGV2YXNfa2V5X21vZGlmaWVyX2lzX3NldChldi0+ bW9kaWZpZXJzLCAiTWV0YSIpKQorICAgICwgbV9zaGlmdEtleShldmFzX2tleV9tb2RpZmllcl9p c19zZXQoZXZlbnQtPm1vZGlmaWVycywgIlNoaWZ0IikpCisgICAgLCBtX2N0cmxLZXkoZXZhc19r ZXlfbW9kaWZpZXJfaXNfc2V0KGV2ZW50LT5tb2RpZmllcnMsICJDb250cm9sIikpCisgICAgLCBt X2FsdEtleShldmFzX2tleV9tb2RpZmllcl9pc19zZXQoZXZlbnQtPm1vZGlmaWVycywgIkFsdCIp KQorICAgICwgbV9tZXRhS2V5KGV2YXNfa2V5X21vZGlmaWVyX2lzX3NldChldmVudC0+bW9kaWZp ZXJzLCAiTWV0YSIpKQogICAgICwgbV90aW1lc3RhbXAoY3VycmVudFRpbWUoKSkKIHsKIH0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9XaWRnZXRFZmwuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL1dpZGdldEVmbC5jcHAKaW5kZXggNjQwZTZlMy4uNDVk NDc5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL1dpZGdldEVmbC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL1dpZGdldEVmbC5jcHAKQEAgLTE4 MywxMCArMTgzLDEwIEBAIHZvaWQgV2lkZ2V0OjpzZXRGcmFtZVJlY3QoY29uc3QgSW50UmVjdCYg cmVjdCkKIAogdm9pZCBXaWRnZXQ6OmZyYW1lUmVjdHNDaGFuZ2VkKCkKIHsKLSAgICBFdmFzX09i amVjdCogbyA9IGV2YXNPYmplY3QoKTsKKyAgICBFdmFzX09iamVjdCogb2JqZWN0ID0gZXZhc09i amVjdCgpOwogICAgIEV2YXNfQ29vcmQgeCwgeTsKIAotICAgIGlmICghcGFyZW50KCkgfHwgIW8p CisgICAgaWYgKCFwYXJlbnQoKSB8fCAhb2JqZWN0KQogICAgICAgICByZXR1cm47CiAKICAgICBJ bnRSZWN0IHJlY3QgPSBmcmFtZVJlY3QoKTsKQEAgLTE5Niw4ICsxOTYsOCBAQCB2b2lkIFdpZGdl dDo6ZnJhbWVSZWN0c0NoYW5nZWQoKQogICAgICAgICByZWN0LnNldExvY2F0aW9uKHBhcmVudCgp LT5jb250ZW50c1RvV2luZG93KHJlY3QubG9jYXRpb24oKSkpOwogCiAgICAgZXZhc19vYmplY3Rf Z2VvbWV0cnlfZ2V0KHJvb3QoKS0+ZXZhc09iamVjdCgpLCAmeCwgJnksIDAsIDApOwotICAgIGV2 YXNfb2JqZWN0X21vdmUobywgeCArIHJlY3QueCgpLCB5ICsgcmVjdC55KCkpOwotICAgIGV2YXNf b2JqZWN0X3Jlc2l6ZShvLCByZWN0LndpZHRoKCksIHJlY3QuaGVpZ2h0KCkpOworICAgIGV2YXNf b2JqZWN0X21vdmUob2JqZWN0LCB4ICsgcmVjdC54KCksIHkgKyByZWN0LnkoKSk7CisgICAgZXZh c19vYmplY3RfcmVzaXplKG9iamVjdCwgcmVjdC53aWR0aCgpLCByZWN0LmhlaWdodCgpKTsKIH0K IAogdm9pZCBXaWRnZXQ6OnNldEZvY3VzKGJvb2wgZm9jdXNlZCkKQEAgLTMzMiwxNCArMzMyLDE0 IEBAIEVjb3JlX0V2YXMqIFdpZGdldDo6ZWNvcmVFdmFzKCkgY29uc3QKICAgICByZXR1cm4gc3Rh dGljX2Nhc3Q8RWNvcmVfRXZhcyo+KGV2YXNfZGF0YV9hdHRhY2hfZ2V0KGV2YXMoKSkpOwogfQog Ci12b2lkIFdpZGdldDo6c2V0RXZhc09iamVjdChFdmFzX09iamVjdCAqbykKK3ZvaWQgV2lkZ2V0 OjpzZXRFdmFzT2JqZWN0KEV2YXNfT2JqZWN0ICpvYmplY3QpCiB7CiAgICAgLy8gRklYTUU6IHN0 dWR5IHBsYXRmb3JtV2lkZ2V0KCkgYW5kIHVzZSBpdAogICAgIC8vIEZJWE1FOiByaWdodCBub3cg cGxhdGZvcm1XaWRnZXQoKSByZXF1aXJlcyBpbXBsZW1lbnRpbmcgdG9vIG11Y2gKLSAgICBpZiAo bV9kYXRhLT5tX2V2YXNPYmplY3QgPT0gbykKKyAgICBpZiAobV9kYXRhLT5tX2V2YXNPYmplY3Qg PT0gb2JqZWN0KQogICAgICAgICByZXR1cm47Ci0gICAgbV9kYXRhLT5tX2V2YXNPYmplY3QgPSBv OwotICAgIGlmICghbykgeworICAgIG1fZGF0YS0+bV9ldmFzT2JqZWN0ID0gb2JqZWN0OworICAg IGlmICghb2JqZWN0KSB7CiAgICAgICAgIG1fZGF0YS0+bV9ldmFzID0gMDsKICNpZmRlZiBIQVZF X0VDT1JFX1gKICAgICAgICAgbV9kYXRhLT5tX2lzVXNpbmdFY29yZVggPSBmYWxzZTsKQEAgLTM0 Nyw3ICszNDcsNyBAQCB2b2lkIFdpZGdldDo6c2V0RXZhc09iamVjdChFdmFzX09iamVjdCAqbykK ICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIG1fZGF0YS0+bV9ldmFzID0gZXZhc19vYmpl Y3RfZXZhc19nZXQobyk7CisgICAgbV9kYXRhLT5tX2V2YXMgPSBldmFzX29iamVjdF9ldmFzX2dl dChvYmplY3QpOwogCiAjaWZkZWYgSEFWRV9FQ09SRV9YCiAgICAgY29uc3QgY2hhciAqZW5naW5l ID0gZWNvcmVfZXZhc19lbmdpbmVfbmFtZV9nZXQoZWNvcmVFdmFzKCkpOwo=