86444 2012-05-14 22:38:54 -0700 Guard some AppKit-specific code in WebKit2 with USE(APPKIT) 2012-05-15 09:37:22 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 aestes aestes oldest_to_newest 623650 0 aestes 2012-05-14 22:38:54 -0700 Guard some AppKit-specific code in WebKit2 with USE(APPKIT) 623660 1 141857 aestes 2012-05-14 22:49:33 -0700 Created attachment 141857 Patch 624185 2 aestes 2012-05-15 09:37:22 -0700 Committed r117085: <http://trac.webkit.org/changeset/117085> 141857 2012-05-14 22:49:33 -0700 2012-05-15 09:29:36 -0700 Patch bug-86444-20120514224932.patch text/plain 11945 aestes U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3MDI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggODZhYmEyZDBmMmVkMDIx NjYxN2U2YTk5MmI5OGY1NTQxNWU0OGEwMi4uYzQ2ODZiMzE4MzQyYjM1OTRmYTY0YWYxMzJlNWM4 M2RlZDkwNGYzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEyLTA1LTE0ICBBbmR5 IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBHdWFyZCBzb21lIEFwcEtpdC1z cGVjaWZpYyBjb2RlIGluIFdlYktpdDIgd2l0aCBVU0UoQVBQS0lUKQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODY0NDQKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNoYXJlZC9OYXRpdmVXZWJLZXlib2Fy ZEV2ZW50Lmg6CisgICAgICAgIChOYXRpdmVXZWJLZXlib2FyZEV2ZW50KToKKyAgICAgICAgKFdl YktpdDo6TmF0aXZlV2ViS2V5Ym9hcmRFdmVudDo6bmF0aXZlRXZlbnQpOgorICAgICAgICAqIFNo YXJlZC9OYXRpdmVXZWJNb3VzZUV2ZW50Lmg6CisgICAgICAgIChOYXRpdmVXZWJNb3VzZUV2ZW50 KToKKyAgICAgICAgKFdlYktpdDo6TmF0aXZlV2ViTW91c2VFdmVudDo6bmF0aXZlRXZlbnQpOgor ICAgICAgICAqIFNoYXJlZC9OYXRpdmVXZWJXaGVlbEV2ZW50Lmg6CisgICAgICAgIChOYXRpdmVX ZWJXaGVlbEV2ZW50KToKKyAgICAgICAgKFdlYktpdDo6TmF0aXZlV2ViV2hlZWxFdmVudDo6bmF0 aXZlRXZlbnQpOgorICAgICAgICAqIFNoYXJlZC9tYWMvQXJndW1lbnRDb2RlcnNNYWMuaDoKKyAg ICAgICAgKENvcmVJUEMpOgorICAgICAgICAqIFNoYXJlZC9tYWMvQXJndW1lbnRDb2RlcnNNYWMu bW06CisgICAgICAgIChDb3JlSVBDOjp0eXBlRnJvbU9iamVjdCk6CisgICAgICAgIChDb3JlSVBD OjplbmNvZGUpOgorICAgICAgICAoQ29yZUlQQzo6ZGVjb2RlKToKKyAgICAgICAgKiBTaGFyZWQv bWFjL1dlYkV2ZW50RmFjdG9yeS5tbToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBw b3J0L21hYy9XZWJQb3B1cE1lbnVNYWMubW06CisgICAgICAgIChXZWJLaXQ6OldlYlBvcHVwTWVu dTo6c2V0VXBQbGF0Zm9ybURhdGEpOgorICAgICAgICAqIFdlYlByb2Nlc3MvbWFjL1dlYlByb2Nl c3NNYWluTWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzTWFpbik6CisKIDIwMTIt MDUtMTQgIE1pY2hhZWwgU2Fib2ZmICA8bXNhYm9mZkBhcHBsZS5jb20+CiAKICAgICAgICAgRW5o OiBBZGQgdGhlIEFiaWxpdHkgdG8gRGlzYWJsZSAvIEVuYWJsZSBKYXZhU2NyaXB0IEdDIFRpbWVy CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvTmF0aXZlV2ViS2V5Ym9hcmRFdmVu dC5oIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL05hdGl2ZVdlYktleWJvYXJkRXZlbnQuaAppbmRl eCA3NzhjMGYyN2I0OTM0NGUzMTVlMDNiZTY3NWUyOTYwM2U4OTc0ODM1Li4yZDNiYjEwZDJiNjY4 Zjk3ODk4ZmRjMzFjNzkzMzg1MDJhYjQzNzdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9T aGFyZWQvTmF0aXZlV2ViS2V5Ym9hcmRFdmVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJl ZC9OYXRpdmVXZWJLZXlib2FyZEV2ZW50LmgKQEAgLTQ2LDcgKzQ2LDcgQEAgbmFtZXNwYWNlIFdl YktpdCB7CiAKIGNsYXNzIE5hdGl2ZVdlYktleWJvYXJkRXZlbnQgOiBwdWJsaWMgV2ViS2V5Ym9h cmRFdmVudCB7CiBwdWJsaWM6Ci0jaWYgUExBVEZPUk0oTUFDKQorI2lmIFVTRShBUFBLSVQpCiAg ICAgTmF0aXZlV2ViS2V5Ym9hcmRFdmVudChOU0V2ZW50ICosIE5TVmlldyAqKTsKICNlbGlmIFBM QVRGT1JNKFdJTikKICAgICBOYXRpdmVXZWJLZXlib2FyZEV2ZW50KEhXTkQsIFVJTlQgbWVzc2Fn ZSwgV1BBUkFNLCBMUEFSQU0pOwpAQCAtNjAsNyArNjAsNyBAQCBwdWJsaWM6CiAgICAgTmF0aXZl V2ViS2V5Ym9hcmRFdmVudChjb25zdCBFdmFzX0V2ZW50X0tleV9VcCopOwogI2VuZGlmCiAKLSNp ZiBQTEFURk9STShNQUMpCisjaWYgVVNFKEFQUEtJVCkKICAgICBOU0V2ZW50ICpuYXRpdmVFdmVu dCgpIGNvbnN0IHsgcmV0dXJuIG1fbmF0aXZlRXZlbnQuZ2V0KCk7IH0KICNlbGlmIFBMQVRGT1JN KFdJTikKICAgICBjb25zdCBNU0cqIG5hdGl2ZUV2ZW50KCkgY29uc3QgeyByZXR1cm4gJm1fbmF0 aXZlRXZlbnQ7IH0KQEAgLTczLDcgKzczLDcgQEAgcHVibGljOgogI2VuZGlmCiAKIHByaXZhdGU6 Ci0jaWYgUExBVEZPUk0oTUFDKQorI2lmIFVTRShBUFBLSVQpCiAgICAgUmV0YWluUHRyPE5TRXZl bnQ+IG1fbmF0aXZlRXZlbnQ7CiAjZWxpZiBQTEFURk9STShXSU4pCiAgICAgTVNHIG1fbmF0aXZl RXZlbnQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvTmF0aXZlV2ViTW91c2VF dmVudC5oIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL05hdGl2ZVdlYk1vdXNlRXZlbnQuaAppbmRl eCBiN2JiYWRiZDAyZDNlMDg4YjVlNjMzYjJjYWJjZTJhNWU2Y2E0N2JiLi4yZGU1YzZjZTcwYjc3 MjM3YzllYTdiNzE1MDFkMjE4NDA0ZWM1NDgzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9T aGFyZWQvTmF0aXZlV2ViTW91c2VFdmVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9O YXRpdmVXZWJNb3VzZUV2ZW50LmgKQEAgLTQ0LDcgKzQ0LDcgQEAgbmFtZXNwYWNlIFdlYktpdCB7 CiAKIGNsYXNzIE5hdGl2ZVdlYk1vdXNlRXZlbnQgOiBwdWJsaWMgV2ViTW91c2VFdmVudCB7CiBw dWJsaWM6Ci0jaWYgUExBVEZPUk0oTUFDKQorI2lmIFVTRShBUFBLSVQpCiAgICAgTmF0aXZlV2Vi TW91c2VFdmVudChOU0V2ZW50ICosIE5TVmlldyAqKTsKICNlbGlmIFBMQVRGT1JNKFdJTikKICAg ICBOYXRpdmVXZWJNb3VzZUV2ZW50KEhXTkQsIFVJTlQgbWVzc2FnZSwgV1BBUkFNLCBMUEFSQU0s IGJvb2wpOwpAQCAtNTksNyArNTksNyBAQCBwdWJsaWM6CiAgICAgTmF0aXZlV2ViTW91c2VFdmVu dChjb25zdCBFdmFzX0V2ZW50X01vdXNlX01vdmUqLCBjb25zdCBFdmFzX1BvaW50Kik7CiAjZW5k aWYKIAotI2lmIFBMQVRGT1JNKE1BQykKKyNpZiBVU0UoQVBQS0lUKQogICAgIE5TRXZlbnQqIG5h dGl2ZUV2ZW50KCkgY29uc3QgeyByZXR1cm4gbV9uYXRpdmVFdmVudC5nZXQoKTsgfQogI2VsaWYg UExBVEZPUk0oV0lOKQogICAgIGNvbnN0IE1TRyogbmF0aXZlRXZlbnQoKSBjb25zdCB7IHJldHVy biAmbV9uYXRpdmVFdmVudDsgfQpAQCAtNzIsNyArNzIsNyBAQCBwdWJsaWM6CiAjZW5kaWYKIAog cHJpdmF0ZToKLSNpZiBQTEFURk9STShNQUMpCisjaWYgVVNFKEFQUEtJVCkKICAgICBSZXRhaW5Q dHI8TlNFdmVudD4gbV9uYXRpdmVFdmVudDsKICNlbGlmIFBMQVRGT1JNKFdJTikKICAgICBNU0cg bV9uYXRpdmVFdmVudDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9OYXRpdmVX ZWJXaGVlbEV2ZW50LmggYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvTmF0aXZlV2ViV2hlZWxFdmVu dC5oCmluZGV4IGYwY2ZhNjU4MWM5YzYyZjA0ZWQ1ZGE2NDZlZTgxNjUxYzJiOWE0ZjIuLjM3MjFl OTQxYjY3YmI0NzMwNWI3MDA2ZmI4ZmZmY2Q2YjdhZjMzNDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1NoYXJlZC9OYXRpdmVXZWJXaGVlbEV2ZW50LmgKKysrIGIvU291cmNlL1dlYktpdDIv U2hhcmVkL05hdGl2ZVdlYldoZWVsRXZlbnQuaApAQCAtNDQsNyArNDQsNyBAQCBuYW1lc3BhY2Ug V2ViS2l0IHsKIAogY2xhc3MgTmF0aXZlV2ViV2hlZWxFdmVudCA6IHB1YmxpYyBXZWJXaGVlbEV2 ZW50IHsKIHB1YmxpYzoKLSNpZiBQTEFURk9STShNQUMpCisjaWYgVVNFKEFQUEtJVCkKICAgICBO YXRpdmVXZWJXaGVlbEV2ZW50KE5TRXZlbnQgKiwgTlNWaWV3ICopOwogI2VsaWYgUExBVEZPUk0o V0lOKQogICAgIE5hdGl2ZVdlYldoZWVsRXZlbnQoSFdORCwgVUlOVCBtZXNzYWdlLCBXUEFSQU0s IExQQVJBTSk7CkBAIC01Nyw3ICs1Nyw3IEBAIHB1YmxpYzoKICAgICBOYXRpdmVXZWJXaGVlbEV2 ZW50KGNvbnN0IEV2YXNfRXZlbnRfTW91c2VfV2hlZWwqLCBjb25zdCBFdmFzX1BvaW50Kik7CiAj ZW5kaWYKIAotI2lmIFBMQVRGT1JNKE1BQykKKyNpZiBVU0UoQVBQS0lUKQogICAgIE5TRXZlbnQq IG5hdGl2ZUV2ZW50KCkgY29uc3QgeyByZXR1cm4gbV9uYXRpdmVFdmVudC5nZXQoKTsgfQogI2Vs aWYgUExBVEZPUk0oV0lOKQogICAgIGNvbnN0IE1TRyogbmF0aXZlRXZlbnQoKSBjb25zdCB7IHJl dHVybiAmbV9uYXRpdmVFdmVudDsgfQpAQCAtNzAsNyArNzAsNyBAQCBwdWJsaWM6CiAjZW5kaWYK IAogcHJpdmF0ZToKLSNpZiBQTEFURk9STShNQUMpCisjaWYgVVNFKEFQUEtJVCkKICAgICBSZXRh aW5QdHI8TlNFdmVudD4gbV9uYXRpdmVFdmVudDsKICNlbGlmIFBMQVRGT1JNKFdJTikKICAgICBN U0cgbV9uYXRpdmVFdmVudDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMv QXJndW1lbnRDb2RlcnNNYWMuaCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvQXJndW1lbnRD b2RlcnNNYWMuaAppbmRleCAxZmQxMDEyOGJhNGZiNjhhZTM0YmFiZGMzNGFkYjk3NjQ2MjJjNmQz Li4xNGYxZGVlOTg1MTY2ODNlMWIzMDYyYzQxMjc3MzgxZDBmMzA1NGI1IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9TaGFyZWQvbWFjL0FyZ3VtZW50Q29kZXJzTWFjLmgKKysrIGIvU291cmNl L1dlYktpdDIvU2hhcmVkL21hYy9Bcmd1bWVudENvZGVyc01hYy5oCkBAIC0zNywxNyArMzcsMjEg QEAgY2xhc3MgQXJndW1lbnREZWNvZGVyOwogdm9pZCBlbmNvZGUoQXJndW1lbnRFbmNvZGVyKiwg TlNBdHRyaWJ1dGVkU3RyaW5nICopOwogYm9vbCBkZWNvZGUoQXJndW1lbnREZWNvZGVyKiwgUmV0 YWluUHRyPE5TQXR0cmlidXRlZFN0cmluZz4mKTsKIAorI2lmIFVTRShBUFBLSVQpCiAvLyBOU0Nv bG9yCiB2b2lkIGVuY29kZShBcmd1bWVudEVuY29kZXIqLCBOU0NvbG9yICopOwogYm9vbCBkZWNv ZGUoQXJndW1lbnREZWNvZGVyKiwgUmV0YWluUHRyPE5TQ29sb3I+Jik7CisjZW5kaWYKIAogLy8g TlNEaWN0aW9uYXJ5CiB2b2lkIGVuY29kZShBcmd1bWVudEVuY29kZXIqLCBOU0RpY3Rpb25hcnkg Kik7CiBib29sIGRlY29kZShBcmd1bWVudERlY29kZXIqLCBSZXRhaW5QdHI8TlNEaWN0aW9uYXJ5 PiYpOwogCisjaWYgVVNFKEFQUEtJVCkKIC8vIE5TRm9udAogdm9pZCBlbmNvZGUoQXJndW1lbnRF bmNvZGVyKiwgTlNGb250ICopOwogYm9vbCBkZWNvZGUoQXJndW1lbnREZWNvZGVyKiwgUmV0YWlu UHRyPE5TRm9udD4mKTsKKyNlbmRpZgogCiAvLyBOU051bWJlcgogdm9pZCBlbmNvZGUoQXJndW1l bnRFbmNvZGVyKiwgTlNOdW1iZXIgKik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFy ZWQvbWFjL0FyZ3VtZW50Q29kZXJzTWFjLm1tIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9B cmd1bWVudENvZGVyc01hYy5tbQppbmRleCAxZjdjNDIzMzJiYTMzNzNjYmFkZjY4MTBiYTNkYmM2 ZTM4MDE1MTllLi43ZTA2YWEzODliOWJlMWJkN2VmMmU1MThlYWYyNTljOTc0MzQ5ZmRhIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvbWFjL0FyZ3VtZW50Q29kZXJzTWFjLm1tCisr KyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvQXJndW1lbnRDb2RlcnNNYWMubW0KQEAgLTM5 LDkgKzM5LDEzIEBAIG5hbWVzcGFjZSBDb3JlSVBDIHsKIAogZW51bSBOU1R5cGUgewogICAgIE5T QXR0cmlidXRlZFN0cmluZ1R5cGUsCisjaWYgVVNFKEFQUEtJVCkKICAgICBOU0NvbG9yVHlwZSwK KyNlbmRpZgogICAgIE5TRGljdGlvbmFyeVR5cGUsCisjaWYgVVNFKEFQUEtJVCkKICAgICBOU0Zv bnRUeXBlLAorI2VuZGlmCiAgICAgTlNOdW1iZXJUeXBlLAogICAgIE5TU3RyaW5nVHlwZSwKICAg ICBVbmtub3duLApAQCAtNTMsMTIgKzU3LDE2IEBAIHN0YXRpYyBOU1R5cGUgdHlwZUZyb21PYmpl Y3QoaWQgb2JqZWN0KQogCiAgICAgaWYgKFtvYmplY3QgaXNLaW5kT2ZDbGFzczpbTlNBdHRyaWJ1 dGVkU3RyaW5nIGNsYXNzXV0pCiAgICAgICAgIHJldHVybiBOU0F0dHJpYnV0ZWRTdHJpbmdUeXBl OworI2lmIFVTRShBUFBLSVQpCiAgICAgaWYgKFtvYmplY3QgaXNLaW5kT2ZDbGFzczpbTlNDb2xv ciBjbGFzc11dKQogICAgICAgICByZXR1cm4gTlNDb2xvclR5cGU7CisjZW5kaWYKICAgICBpZiAo W29iamVjdCBpc0tpbmRPZkNsYXNzOltOU0RpY3Rpb25hcnkgY2xhc3NdXSkKICAgICAgICAgcmV0 dXJuIE5TRGljdGlvbmFyeVR5cGU7CisjaWYgVVNFKEFQUEtJVCkKICAgICBpZiAoW29iamVjdCBp c0tpbmRPZkNsYXNzOltOU0ZvbnQgY2xhc3NdXSkKICAgICAgICAgcmV0dXJuIE5TRm9udFR5cGU7 CisjZW5kaWYKICAgICBpZiAoW29iamVjdCBpc0tpbmRPZkNsYXNzOltOU051bWJlciBjbGFzc11d KQogICAgICAgICByZXR1cm4gTlNOdW1iZXJUeXBlOwogICAgIGlmIChbb2JqZWN0IGlzS2luZE9m Q2xhc3M6W05TU3RyaW5nIGNsYXNzXV0pCkBAIC03NywxNSArODUsMTkgQEAgc3RhdGljIHZvaWQg ZW5jb2RlKEFyZ3VtZW50RW5jb2RlciogZW5jb2RlciwgaWQgb2JqZWN0KQogICAgIGNhc2UgTlNB dHRyaWJ1dGVkU3RyaW5nVHlwZToKICAgICAgICAgZW5jb2RlKGVuY29kZXIsIHN0YXRpY19jYXN0 PE5TQXR0cmlidXRlZFN0cmluZyAqPihvYmplY3QpKTsKICAgICAgICAgcmV0dXJuOworI2lmIFVT RShBUFBLSVQpCiAgICAgY2FzZSBOU0NvbG9yVHlwZToKICAgICAgICAgZW5jb2RlKGVuY29kZXIs IHN0YXRpY19jYXN0PE5TQ29sb3IgKj4ob2JqZWN0KSk7CiAgICAgICAgIHJldHVybjsKKyNlbmRp ZgogICAgIGNhc2UgTlNEaWN0aW9uYXJ5VHlwZToKICAgICAgICAgZW5jb2RlKGVuY29kZXIsIHN0 YXRpY19jYXN0PE5TRGljdGlvbmFyeSAqPihvYmplY3QpKTsKICAgICAgICAgcmV0dXJuOworI2lm IFVTRShBUFBLSVQpCiAgICAgY2FzZSBOU0ZvbnRUeXBlOgogICAgICAgICBlbmNvZGUoZW5jb2Rl ciwgc3RhdGljX2Nhc3Q8TlNGb250ICo+KG9iamVjdCkpOwogICAgICAgICByZXR1cm47CisjZW5k aWYKICAgICBjYXNlIE5TTnVtYmVyVHlwZToKICAgICAgICAgZW5jb2RlKGVuY29kZXIsIHN0YXRp Y19jYXN0PE5TTnVtYmVyICo+KG9iamVjdCkpOwogICAgICAgICByZXR1cm47CkBAIC0xMTMsNiAr MTI1LDcgQEAgc3RhdGljIGJvb2wgZGVjb2RlKEFyZ3VtZW50RGVjb2RlciogZGVjb2RlciwgUmV0 YWluUHRyPGlkPiYgcmVzdWx0KQogICAgICAgICByZXN1bHQgPSBzdHJpbmc7CiAgICAgICAgIHJl dHVybiB0cnVlOwogICAgIH0KKyNpZiBVU0UoQVBQS0lUKQogICAgIGNhc2UgTlNDb2xvclR5cGU6 IHsKICAgICAgICAgUmV0YWluUHRyPE5TQ29sb3I+IGNvbG9yOwogICAgICAgICBpZiAoIWRlY29k ZShkZWNvZGVyLCBjb2xvcikpCkBAIC0xMjAsNiArMTMzLDcgQEAgc3RhdGljIGJvb2wgZGVjb2Rl KEFyZ3VtZW50RGVjb2RlciogZGVjb2RlciwgUmV0YWluUHRyPGlkPiYgcmVzdWx0KQogICAgICAg ICByZXN1bHQgPSBjb2xvcjsKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQorI2VuZGlmCiAg ICAgY2FzZSBOU0RpY3Rpb25hcnlUeXBlOiB7CiAgICAgICAgIFJldGFpblB0cjxOU0RpY3Rpb25h cnk+IGRpY3Rpb25hcnk7CiAgICAgICAgIGlmICghZGVjb2RlKGRlY29kZXIsIGRpY3Rpb25hcnkp KQpAQCAtMTI3LDYgKzE0MSw3IEBAIHN0YXRpYyBib29sIGRlY29kZShBcmd1bWVudERlY29kZXIq IGRlY29kZXIsIFJldGFpblB0cjxpZD4mIHJlc3VsdCkKICAgICAgICAgcmVzdWx0ID0gZGljdGlv bmFyeTsKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQorI2lmIFVTRShBUFBLSVQpCiAgICAg Y2FzZSBOU0ZvbnRUeXBlOiB7CiAgICAgICAgIFJldGFpblB0cjxOU0ZvbnQ+IGZvbnQ7CiAgICAg ICAgIGlmICghZGVjb2RlKGRlY29kZXIsIGZvbnQpKQpAQCAtMTM0LDYgKzE0OSw3IEBAIHN0YXRp YyBib29sIGRlY29kZShBcmd1bWVudERlY29kZXIqIGRlY29kZXIsIFJldGFpblB0cjxpZD4mIHJl c3VsdCkKICAgICAgICAgcmVzdWx0ID0gZm9udDsKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAg fQorI2VuZGlmCiAgICAgY2FzZSBOU051bWJlclR5cGU6IHsKICAgICAgICAgUmV0YWluUHRyPE5T TnVtYmVyPiBudW1iZXI7CiAgICAgICAgIGlmICghZGVjb2RlKGRlY29kZXIsIG51bWJlcikpCkBA IC0yMjYsNiArMjQyLDcgQEAgYm9vbCBkZWNvZGUoQXJndW1lbnREZWNvZGVyKiBkZWNvZGVyLCBS ZXRhaW5QdHI8TlNBdHRyaWJ1dGVkU3RyaW5nPiYgcmVzdWx0KQogICAgIHJldHVybiB0cnVlOwog fQogCisjaWYgVVNFKEFQUEtJVCkKIHZvaWQgZW5jb2RlKEFyZ3VtZW50RW5jb2RlciogZW5jb2Rl ciwgTlNDb2xvciAqY29sb3IpCiB7CiAgICAgZW5jb2Rlci0+ZW5jb2RlKGNvbG9yRnJvbU5TQ29s b3IoY29sb3IpKTsKQEAgLTI0MCw2ICsyNTcsNyBAQCBib29sIGRlY29kZShBcmd1bWVudERlY29k ZXIqIGRlY29kZXIsIFJldGFpblB0cjxOU0NvbG9yPiYgcmVzdWx0KQogICAgIHJlc3VsdCA9IG5z Q29sb3IoY29sb3IpOwogICAgIHJldHVybiB0cnVlOwogfQorI2VuZGlmCiAKIHZvaWQgZW5jb2Rl KEFyZ3VtZW50RW5jb2RlciogZW5jb2RlciwgTlNEaWN0aW9uYXJ5ICpkaWN0aW9uYXJ5KQogewpA QCAtMjkxLDcgKzMwOSw3IEBAIGJvb2wgZGVjb2RlKEFyZ3VtZW50RGVjb2RlciogZGVjb2Rlciwg UmV0YWluUHRyPE5TRGljdGlvbmFyeT4mIHJlc3VsdCkKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAot CisjaWYgVVNFKEFQUEtJVCkKIHZvaWQgZW5jb2RlKEFyZ3VtZW50RW5jb2RlciogZW5jb2Rlciwg TlNGb250ICpmb250KQogewogICAgIC8vIE5TRm9udCBjb3VsZCB1c2UgQ1RGb250UmVmIGNvZGUg aWYgd2UgaGFkIGl0IGluIEFyZ3VtZW50Q29kZXJzQ0YuCkBAIC0zMDksNiArMzI3LDcgQEAgYm9v bCBkZWNvZGUoQXJndW1lbnREZWNvZGVyKiBkZWNvZGVyLCBSZXRhaW5QdHI8TlNGb250PiYgcmVz dWx0KQogCiAgICAgcmV0dXJuIHRydWU7CiB9CisjZW5kaWYKIAogdm9pZCBlbmNvZGUoQXJndW1l bnRFbmNvZGVyKiBlbmNvZGVyLCBOU051bWJlciAqbnVtYmVyKQogewpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvU2hhcmVkL21hYy9XZWJFdmVudEZhY3RvcnkubW0gYi9Tb3VyY2UvV2ViS2l0 Mi9TaGFyZWQvbWFjL1dlYkV2ZW50RmFjdG9yeS5tbQppbmRleCA1OWQ2ZTlkNWExYTk5MDVlM2Fj ZGRiYjJjN2QzOGQ5NmUzMzQzMDQ5Li4yYzc3M2IyNmJhZWZkNGM5Y2Q2OWU4NWViNGI0MmM2NDRj NzQ0NGQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvbWFjL1dlYkV2ZW50RmFj dG9yeS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvbWFjL1dlYkV2ZW50RmFjdG9yeS5t bQpAQCAtMjYsNiArMjYsOCBAQAogI2ltcG9ydCAiY29uZmlnLmgiCiAjaW1wb3J0ICJXZWJFdmVu dEZhY3RvcnkuaCIKIAorI2lmIFVTRShBUFBLSVQpCisKICNpbXBvcnQgIldlYktpdFN5c3RlbUlu dGVyZmFjZS5oIgogI2ltcG9ydCA8d3RmL0FTQ0lJQ1R5cGUuaD4KICNpbXBvcnQgPFdlYkNvcmUv UGxhdGZvcm1FdmVudEZhY3RvcnlNYWMuaD4KQEAgLTQ3MCwzICs0NzIsNSBAQCBXZWJHZXN0dXJl RXZlbnQgV2ViRXZlbnRGYWN0b3J5OjpjcmVhdGVXZWJHZXN0dXJlRXZlbnQoTlNFdmVudCAqZXZl bnQsIE5TVmlldyAqdwogI2VuZGlmCiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAorCisjZW5kaWYg Ly8gVVNFKEFQUEtJVCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi Q29yZVN1cHBvcnQvbWFjL1dlYlBvcHVwTWVudU1hYy5tbSBiL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViQ29yZVN1cHBvcnQvbWFjL1dlYlBvcHVwTWVudU1hYy5tbQppbmRleCAxYzlkN2I2 YzNkNTcyYjYwMjIwZjRiYjA3NTgzZTQxYzc5NmEzZDQ2Li43NTcwZjNkZDM2ZTE4NTQ2M2UyOTAy NmMxZTc2Yjk0N2Q4ODc4MjdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYkNvcmVTdXBwb3J0L21hYy9XZWJQb3B1cE1lbnVNYWMubW0KKysrIGIvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9tYWMvV2ViUG9wdXBNZW51TWFjLm1tCkBAIC0z Nyw2ICszNyw3IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogCiB2b2lkIFdlYlBvcHVwTWVudTo6c2V0 VXBQbGF0Zm9ybURhdGEoY29uc3QgSW50UmVjdCYsIFBsYXRmb3JtUG9wdXBNZW51RGF0YSYgZGF0 YSkKIHsKKyNpZiBVU0UoQVBQS0lUKQogICAgIC8vIEZJWE1FOiBmb250IHdpbGwgYmUgbmlsIGhl cmUgZm9yIGN1c3RvbSBmb250cywgd2Ugc2hvdWxkIGZpeCB0aGF0LgogICAgIE5TRm9udCAqZm9u dCA9IG1fcG9wdXBDbGllbnQtPm1lbnVTdHlsZSgpLmZvbnQoKS5wcmltYXJ5Rm9udCgpLT5nZXRO U0ZvbnQoKTsKICAgICBpZiAoIWZvbnQpCkBAIC00OCw2ICs0OSw5IEBAIHZvaWQgV2ViUG9wdXBN ZW51OjpzZXRVcFBsYXRmb3JtRGF0YShjb25zdCBJbnRSZWN0JiwgUGxhdGZvcm1Qb3B1cE1lbnVE YXRhJiBkYXRhCiAgICAgCiAgICAgZGF0YS5mb250SW5mby5mb250QXR0cmlidXRlRGljdGlvbmFy eSA9IGZvbnREZXNjcmlwdG9yQXR0cmlidXRlczsKICAgICBkYXRhLnNob3VsZFBvcE92ZXIgPSBt X3BvcHVwQ2xpZW50LT5zaG91bGRQb3BPdmVyKCk7CisjZWxzZQorICAgIFVOVVNFRF9QQVJBTShk YXRhKTsKKyNlbmRpZgogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvbWFjL1dlYlByb2Nlc3NNYWluTWFjLm1tIGIvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9tYWMvV2ViUHJvY2Vzc01haW5NYWMubW0KaW5kZXggZGRiYmE5 ZjE1MGQ3NGVkODcwZWVkMmFhYjE1MWVjZTQwNWE2MjM1ZS4uNjNlN2JhNWQxYjJiZWY4ZWYwNDc5 ZTUyMTQ0OWU5ZjFiYzQ4MTRiZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9tYWMvV2ViUHJvY2Vzc01haW5NYWMubW0KKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9tYWMvV2ViUHJvY2Vzc01haW5NYWMubW0KQEAgLTUyLDkgKzUyLDExIEBACiBleHRlcm4gIkMi IGtlcm5fcmV0dXJuX3QgYm9vdHN0cmFwX3JlZ2lzdGVyMihtYWNoX3BvcnRfdCwgbmFtZV90LCBt YWNoX3BvcnRfdCwgdWludDY0X3QpOwogI2VuZGlmCiAKKyNpZiBVU0UoQVBQS0lUKQogQGludGVy ZmFjZSBOU0FwcGxpY2F0aW9uIChXZWJOU0FwcGxpY2F0aW9uRGV0YWlscykKIC0odm9pZClfaW5z dGFsbEF1dG9yZWxlYXNlUG9vbHNPbkN1cnJlbnRUaHJlYWRJZk5lY2Vzc2FyeTsKIEBlbmQKKyNl bmRpZgogCiAjZGVmaW5lIFNIT1dfQ1JBU0hfUkVQT1JURVIgMQogCkBAIC0xNjgsMTIgKzE3MCwx NCBAQCBpbnQgV2ViUHJvY2Vzc01haW4oY29uc3QgQ29tbWFuZExpbmUmIGNvbW1hbmRMaW5lKQog CiAgICAgW3Bvb2wgZHJhaW5dOwogCisjaWYgVVNFKEFQUEtJVCkKICAgICAgLy8gSW5pdGlhbGl6 ZSBBcHBLaXQuCiAgICAgW05TQXBwbGljYXRpb24gc2hhcmVkQXBwbGljYXRpb25dOwogCiAgICAg Ly8gSW5zdGFsbHMgYXV0b3JlbGVhc2UgcG9vbHMgb24gdGhlIGN1cnJlbnQgQ0ZSdW5Mb29wIHdo aWNoIHByZXZlbnRzIG1lbW9yeSBmcm9tIGFjY3VtdWxhdGluZyBiZXR3ZWVuIHVzZXIgZXZlbnRz LgogICAgIC8vIEZJWE1FOiBSZW1vdmUgd2hlbiA8cmRhcjovL3Byb2JsZW0vODkyOTQyNj4gaXMg Zml4ZWQuCiAgICAgW1tOU0FwcGxpY2F0aW9uIHNoYXJlZEFwcGxpY2F0aW9uXSBfaW5zdGFsbEF1 dG9yZWxlYXNlUG9vbHNPbkN1cnJlbnRUaHJlYWRJZk5lY2Vzc2FyeV07CisjZW5kaWYKIAogICAg IFdLQVhSZWdpc3RlclJlbW90ZUFwcCgpOwogICAgIAo=