141050 2015-01-29 14:29:15 -0800 Remove more Mountain Lion code from WebKit 2015-01-29 16:02:56 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bdakin webkit-unassigned andersca ap bdakin mitz sam thorton oldest_to_newest 1065346 0 bdakin 2015-01-29 14:29:15 -0800 Remove more Mountain Lion code from WebKit 1065348 1 245650 bdakin 2015-01-29 14:30:40 -0800 Created attachment 245650 Patch 1065390 2 245650 andersca 2015-01-29 15:56:30 -0800 Comment on attachment 245650 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=245650&action=review > Source/WebKit/mac/WebView/WebFrameView.mm:103 > +#if !PLATFORM(IOS) I think this should be #if PLATFORM(MAC). > Source/WebKit/mac/WebView/WebFrameView.mm:549 > +#if !PLATFORM(IOS) I think this should be #if PLATFORM(MAC). > Source/WebKit/mac/WebView/WebPreferences.mm:2356 > +#if !PLATFORM(IOS) I think this should be #if PLATFORM(MAC). > Source/WebKit/mac/WebView/WebView.mm:2204 > +#if !PLATFORM(IOS) I think this should be #if PLATFORM(MAC). 1065397 3 bdakin 2015-01-29 16:02:56 -0800 Fixed all of these. Thanks! http://trac.webkit.org/changeset/179376 (In reply to comment #2) > Comment on attachment 245650 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=245650&action=review > > > Source/WebKit/mac/WebView/WebFrameView.mm:103 > > +#if !PLATFORM(IOS) > > I think this should be #if PLATFORM(MAC). > > > Source/WebKit/mac/WebView/WebFrameView.mm:549 > > +#if !PLATFORM(IOS) > > I think this should be #if PLATFORM(MAC). > > > Source/WebKit/mac/WebView/WebPreferences.mm:2356 > > +#if !PLATFORM(IOS) > > I think this should be #if PLATFORM(MAC). > > > Source/WebKit/mac/WebView/WebView.mm:2204 > > +#if !PLATFORM(IOS) > > I think this should be #if PLATFORM(MAC). 245650 2015-01-29 14:30:40 -0800 2015-01-29 15:56:30 -0800 Patch for-review.txt text/plain 11934 bdakin SW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3OTM2NykKKysrIFNvdXJjZS9XZWJLaXQv bWFjL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBACisyMDE1LTAxLTI5 ICBCZXRoIERha2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgbW9yZSBN b3VudGFpbiBMaW9uIGNvZGUgZnJvbSBXZWJLaXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MTA1MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogSGlzdG9yeS9XZWJIaXN0b3J5Lm1tOgorICAgICAgICAo Z2V0RGF5Qm91bmRhcmllcyk6CisgICAgICAgICogUGFuZWxzL1dlYkF1dGhlbnRpY2F0aW9uUGFu ZWwubToKKyAgICAgICAgKC1bV2ViQXV0aGVudGljYXRpb25QYW5lbCBjYW5jZWw6XSk6CisgICAg ICAgICgtW1dlYkF1dGhlbnRpY2F0aW9uUGFuZWwgbG9nSW46XSk6CisgICAgICAgICgtW1dlYkF1 dGhlbnRpY2F0aW9uUGFuZWwgcnVuQXNTaGVldE9uV2luZG93OndpdGhDaGFsbGVuZ2U6XSk6Cisg ICAgICAgICogV2ViQ29yZVN1cHBvcnQvV2ViU3lzdGVtSW50ZXJmYWNlLm1tOgorICAgICAgICAo SW5pdFdlYkNvcmVTeXN0ZW1JbnRlcmZhY2UpOgorICAgICAgICAqIFdlYlZpZXcvV2ViRnJhbWVW aWV3Lm1tOgorICAgICAgICAqIFdlYlZpZXcvV2ViUHJlZmVyZW5jZXMubW06CisgICAgICAgICgr W1dlYlByZWZlcmVuY2VzIGluaXRpYWxpemVdKToKKyAgICAgICAgKG5lZWRzU2NyZWVuRm9udHNF bmFibGVkUXVpcmspOgorICAgICAgICAqIFdlYlZpZXcvV2ViVmlldy5tbToKKyAgICAgICAgKCtb V2ViVmlldyByZWdpc3RlckZvck1lbW9yeU5vdGlmaWNhdGlvbnNdKToKKyAgICAgICAgKC1bV2Vi VmlldyBfcHJlZmVyZW5jZXNDaGFuZ2VkOl0pOgorICAgICAgICAoK1tXZWJWaWV3IGluaXRpYWxp emVdKToKKyAgICAgICAgKCtbV2ViVmlldyBfc2hvdWxkQXV0b21hdGljUXVvdGVTdWJzdGl0dXRp b25CZUVuYWJsZWRdKToKKyAgICAgICAgKCtbV2ViVmlldyBfc2hvdWxkQXV0b21hdGljRGFzaFN1 YnN0aXR1dGlvbkJlRW5hYmxlZF0pOgorICAgICAgICAoK1tXZWJWaWV3IF9kaWRDaGFuZ2VBdXRv bWF0aWNEYXNoU3Vic3RpdHV0aW9uRW5hYmxlZDpdKToKKwogMjAxNS0wMS0yOSAgQ2hyaXMgRHVt ZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIENsZWFuIHVwIC8gbW9kZXJuaXplIFBh Z2VDYWNoZSBjbGFzcwpJbmRleDogU291cmNlL1dlYktpdC9tYWMvSGlzdG9yeS9XZWJIaXN0b3J5 Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvbWFjL0hpc3RvcnkvV2ViSGlzdG9yeS5t bQkocmV2aXNpb24gMTc5MzY0KQorKysgU291cmNlL1dlYktpdC9tYWMvSGlzdG9yeS9XZWJIaXN0 b3J5Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xNTQsNyArMTU0LDYgQEAgLSAodm9pZClmaW5hbGl6 ZQogCiBzdGF0aWMgdm9pZCBnZXREYXlCb3VuZGFyaWVzKE5TVGltZUludGVydmFsIGludGVydmFs LCBOU1RpbWVJbnRlcnZhbCYgYmVnaW5uaW5nT2ZEYXksIE5TVGltZUludGVydmFsJiBiZWdpbm5p bmdPZk5leHREYXkpCiB7Ci0jaWYgKFBMQVRGT1JNKElPUykgJiYgX19JUEhPTkVfT1NfVkVSU0lP Tl9NSU5fUkVRVUlSRUQgPj0gODAwMDApIHx8IChQTEFURk9STShNQUMpICYmIF9fTUFDX09TX1hf VkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTA5MCkKICAgICBOU0RhdGUgKmRhdGUgPSBbTlNEYXRl IGRhdGVXaXRoVGltZUludGVydmFsU2luY2VSZWZlcmVuY2VEYXRlOmludGVydmFsXTsKICAgICAK ICAgICBOU0NhbGVuZGFyICpjYWxlbmRhciA9IFtOU0NhbGVuZGFyIGNhbGVuZGFyV2l0aElkZW50 aWZpZXI6TlNDYWxlbmRhcklkZW50aWZpZXJHcmVnb3JpYW5dOwpAQCAtMTY1LDE3ICsxNjQsNiBA QCBzdGF0aWMgdm9pZCBnZXREYXlCb3VuZGFyaWVzKE5TVGltZUludGVyCiAgICAgCiAgICAgYmVn aW5uaW5nT2ZEYXkgPSBiZWdpbm5pbmdPZkRheURhdGUudGltZUludGVydmFsU2luY2VSZWZlcmVu Y2VEYXRlOwogICAgIGJlZ2lubmluZ09mTmV4dERheSA9IGJlZ2lubmluZ09mRGF5ICsgZGF5TGVu Z3RoOwotI2Vsc2UKLSAgICBDRlRpbWVab25lUmVmIHRpbWVab25lID0gQ0ZUaW1lWm9uZUNvcHlE ZWZhdWx0KCk7Ci0gICAgQ0ZHcmVnb3JpYW5EYXRlIGRhdGUgPSBDRkFic29sdXRlVGltZUdldEdy ZWdvcmlhbkRhdGUoaW50ZXJ2YWwsIHRpbWVab25lKTsKLSAgICBkYXRlLmhvdXIgPSAwOwotICAg IGRhdGUubWludXRlID0gMDsKLSAgICBkYXRlLnNlY29uZCA9IDA7Ci0gICAgYmVnaW5uaW5nT2ZE YXkgPSBDRkdyZWdvcmlhbkRhdGVHZXRBYnNvbHV0ZVRpbWUoZGF0ZSwgdGltZVpvbmUpOwotICAg IGRhdGUuZGF5ICs9IDE7Ci0gICAgYmVnaW5uaW5nT2ZOZXh0RGF5ID0gQ0ZHcmVnb3JpYW5EYXRl R2V0QWJzb2x1dGVUaW1lKGRhdGUsIHRpbWVab25lKTsKLSAgICBDRlJlbGVhc2UodGltZVpvbmUp OwotI2VuZGlmCiB9CiAKIHN0YXRpYyBpbmxpbmUgTlNUaW1lSW50ZXJ2YWwgYmVnaW5uaW5nT2ZE YXkoTlNUaW1lSW50ZXJ2YWwgZGF0ZSkKSW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL1BhbmVscy9X ZWJBdXRoZW50aWNhdGlvblBhbmVsLm0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9tYWMv UGFuZWxzL1dlYkF1dGhlbnRpY2F0aW9uUGFuZWwubQkocmV2aXNpb24gMTc5MzY0KQorKysgU291 cmNlL1dlYktpdC9tYWMvUGFuZWxzL1dlYkF1dGhlbnRpY2F0aW9uUGFuZWwubQkod29ya2luZyBj b3B5KQpAQCAtNzgsMTIgKzc4LDcgQEAgLSAoSUJBY3Rpb24pY2FuY2VsOihpZClzZW5kZXIKICAg ICBbW3NlbGYgcmV0YWluXSBhdXRvcmVsZWFzZV07CiAKICAgICBpZiAodXNpbmdTaGVldCkgewot I2lmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTA5MAogICAgICAgICBbcGFu ZWwuc2hlZXRQYXJlbnQgZW5kU2hlZXQ6cGFuZWwgcmV0dXJuQ29kZTpOU01vZGFsUmVzcG9uc2VD YW5jZWxdOwotI2Vsc2UKLSAgICAgICAgW3BhbmVsIG9yZGVyT3V0OnNlbmRlcl07Ci0gICAgICAg IFtbTlNBcHBsaWNhdGlvbiBzaGFyZWRBcHBsaWNhdGlvbl0gZW5kU2hlZXQ6cGFuZWwgcmV0dXJu Q29kZToxXTsKLSNlbmRpZgogICAgIH0gZWxzZSB7CiAgICAgICAgIFtwYW5lbCBvcmRlck91dDpz ZW5kZXJdOwogICAgICAgICBbW05TQXBwbGljYXRpb24gc2hhcmVkQXBwbGljYXRpb25dIHN0b3BN b2RhbFdpdGhDb2RlOjFdOwpAQCAtOTksMTIgKzk0LDcgQEAgLSAoSUJBY3Rpb24pbG9nSW46KGlk KXNlbmRlcgogICAgIFtbcGFuZWwgcmV0YWluXSBhdXRvcmVsZWFzZV07CiAKICAgICBpZiAodXNp bmdTaGVldCkgewotI2lmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTA5MAog ICAgICAgICBbcGFuZWwuc2hlZXRQYXJlbnQgZW5kU2hlZXQ6cGFuZWwgcmV0dXJuQ29kZTpOU01v ZGFsUmVzcG9uc2VPS107Ci0jZWxzZQotICAgICAgICBbcGFuZWwgb3JkZXJPdXQ6c2VuZGVyXTsK LSAgICAgICAgW1tOU0FwcGxpY2F0aW9uIHNoYXJlZEFwcGxpY2F0aW9uXSBlbmRTaGVldDpwYW5l bCByZXR1cm5Db2RlOjBdOwotI2VuZGlmCiAgICAgfSBlbHNlIHsKICAgICAgICAgW3BhbmVsIG9y ZGVyT3V0OnNlbmRlcl07CiAgICAgICAgIFtbTlNBcHBsaWNhdGlvbiBzaGFyZWRBcHBsaWNhdGlv bl0gc3RvcE1vZGFsV2l0aENvZGU6MF07CkBAIC0yNTgsMTQgKzI0OCwxMCBAQCAtICh2b2lkKXJ1 bkFzU2hlZXRPbldpbmRvdzooTlNXaW5kb3cgKil3CiAgICAgdXNpbmdTaGVldCA9IFRSVUU7CiAg ICAgY2hhbGxlbmdlID0gW2NoYWxsIHJldGFpbl07CiAKLSNpZiBfX01BQ19PU19YX1ZFUlNJT05f TUlOX1JFUVVJUkVEID49IDEwOTAKICAgICBbd2luZG93IGJlZ2luU2hlZXQ6cGFuZWwgY29tcGxl dGlvbkhhbmRsZXI6XihOU01vZGFsUmVzcG9uc2UgbW9kYWxSZXNwb25zZSkgewogICAgICAgICBp bnQgcmV0dXJuQ29kZSA9IChtb2RhbFJlc3BvbnNlID09IE5TTW9kYWxSZXNwb25zZUNhbmNlbCkg PyAxIDogMDsKICAgICAgICAgW3NlbGYgc2hlZXREaWRFbmQ6cGFuZWwgcmV0dXJuQ29kZTpyZXR1 cm5Db2RlIGNvbnRleHRJbmZvOk5VTExdOwogICAgIH1dOwotI2Vsc2UKLSAgICBbW05TQXBwbGlj YXRpb24gc2hhcmVkQXBwbGljYXRpb25dIGJlZ2luU2hlZXQ6cGFuZWwgbW9kYWxGb3JXaW5kb3c6 d2luZG93IG1vZGFsRGVsZWdhdGU6c2VsZiBkaWRFbmRTZWxlY3RvcjpAc2VsZWN0b3Ioc2hlZXRE aWRFbmQ6cmV0dXJuQ29kZTpjb250ZXh0SW5mbzopIGNvbnRleHRJbmZvOk5VTExdOwotI2VuZGlm CiB9CiAKIC0gKHZvaWQpc2hlZXREaWRFbmQ6KE5TV2luZG93ICopc2hlZXQgcmV0dXJuQ29kZToo aW50KXJldHVybkNvZGUgY29udGV4dEluZm86KHZvaWQgICopY29udGV4dEluZm8KSW5kZXg6IFNv dXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYlN5c3RlbUludGVyZmFjZS5tbQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJTeXN0ZW1JbnRl cmZhY2UubW0JKHJldmlzaW9uIDE3OTM2NCkKKysrIFNvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVT dXBwb3J0L1dlYlN5c3RlbUludGVyZmFjZS5tbQkod29ya2luZyBjb3B5KQpAQCAtMTg0LDExICsx ODQsNyBAQCB2b2lkIEluaXRXZWJDb3JlU3lzdGVtSW50ZXJmYWNlKHZvaWQpCiAKICNpZiAhUExB VEZPUk0oSU9TKQogICAgIElOSVQoQ3JlYXRlVk1QcmVzc3VyZURpc3BhdGNoT25NYWluUXVldWUp OwotCi0jaWYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDkwCiAgICAgSU5J VChDcmVhdGVNZW1vcnlTdGF0dXNQcmVzc3VyZUNyaXRpY2FsRGlzcGF0Y2hPbk1haW5RdWV1ZSk7 Ci0jZW5kaWYKLQogICAgIElOSVQoRXhlY3V0YWJsZVdhc0xpbmtlZE9uT3JCZWZvcmVMaW9uKTsK ICNlbmRpZgogCkluZGV4OiBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkZyYW1lVmlldy5t bQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkZyYW1lVmlldy5t bQkocmV2aXNpb24gMTc5MzY0KQorKysgU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJGcmFt ZVZpZXcubW0JKHdvcmtpbmcgY29weSkKQEAgLTEwMCw3ICsxMDAsNyBAQCBAaW50ZXJmYWNlIE5T Q2xpcFZpZXcgKEFwcEtpdFNlY3JldHNJS25vCiAtIChCT09MKV9zY3JvbGxUbzooY29uc3QgTlNQ b2ludCAqKW5ld09yaWdpbiBhbmltYXRlOihCT09MKWFuaW1hdGU7IC8vIG5lZWQgdGhlIGJvb2xl YW4gcmVzdWx0IGZyb20gdGhpcyBtZXRob2QKIEBlbmQKIAotI2lmICFQTEFURk9STShJT1MpICYm IF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTA5MAorI2lmICFQTEFURk9STShJ T1MpCiBAaW50ZXJmYWNlIE5TVmlldyAoRGV0YWlscykKIC0gKHZvaWQpc2V0QmFja2dyb3VuZENv bG9yOihOU0NvbG9yICopY29sb3I7CiBAZW5kCkBAIC01NDYsNyArNTQ2LDcgQEAgLSAodm9pZClk cmF3UmVjdDooTlNSZWN0KXJlY3QKICAgICB9CiB9CiAKLSNpZiAhUExBVEZPUk0oSU9TKSAmJiBf X01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwOTAKKyNpZiAhUExBVEZPUk0oSU9T KQogLSAoQk9PTCl3YW50c1VwZGF0ZUxheWVyCiB7CiAgICAgcmV0dXJuIFlFUzsKSW5kZXg6IFNv dXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZXMubW0KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlcy5tbQkocmV2aXNpb24gMTc5 MzY0KQorKysgU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlcy5tbQkod29y a2luZyBjb3B5KQpAQCAtNTQzLDEyICs1NDMsNyBAQCArICh2b2lkKWluaXRpYWxpemUKICAgICAg ICAgW05TTnVtYmVyIG51bWJlcldpdGhCb29sOllFU10sICBXZWJLaXRSZXF1ZXN0QW5pbWF0aW9u RnJhbWVFbmFibGVkUHJlZmVyZW5jZUtleSwKICAgICAgICAgW05TTnVtYmVyIG51bWJlcldpdGhC b29sOk5PXSwgICBXZWJLaXRXYW50c0JhbGFuY2VkU2V0RGVmZXJzTG9hZGluZ0JlaGF2aW9yS2V5 LAogICAgICAgICBbTlNOdW1iZXIgbnVtYmVyV2l0aEJvb2w6Tk9dLCAgIFdlYktpdERpYWdub3N0 aWNMb2dnaW5nRW5hYmxlZEtleSwKLSNpZiBQTEFURk9STShJT1MpIHx8IF9fTUFDX09TX1hfVkVS U0lPTl9NSU5fUkVRVUlSRUQgPj0gMTA5MAotICAgICAgICBbTlNOdW1iZXIgbnVtYmVyV2l0aEJv b2w6Tk9dLAotI2Vsc2UKLSAgICAgICAgW05TTnVtYmVyIG51bWJlcldpdGhCb29sOllFU10sCi0j ZW5kaWYKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBXZWJLaXRTY3Jl ZW5Gb250U3Vic3RpdHV0aW9uRW5hYmxlZEtleSwKKyAgICAgICAgW05TTnVtYmVyIG51bWJlcldp dGhCb29sOk5PXSwgICBXZWJLaXRTY3JlZW5Gb250U3Vic3RpdHV0aW9uRW5hYmxlZEtleSwKICAg ICAgICAgW05TTnVtYmVyIG51bWJlcldpdGhJbnQ6V2ViQWxsb3dBbGxTdG9yYWdlXSwgV2ViS2l0 U3RvcmFnZUJsb2NraW5nUG9saWN5S2V5LAogICAgICAgICBbTlNOdW1iZXIgbnVtYmVyV2l0aEJv b2w6Tk9dLCAgIFdlYktpdFBsdWdJblNuYXBzaG90dGluZ0VuYWJsZWRQcmVmZXJlbmNlS2V5LAog CkBAIC0yMzU4LDcgKzIzNTMsNyBAQCAtICh2b2lkKXNldERpYWdub3N0aWNMb2dnaW5nRW5hYmxl ZDooQk9PCiAKIHN0YXRpYyBib29sIG5lZWRzU2NyZWVuRm9udHNFbmFibGVkUXVpcmsoKQogewot I2lmICFQTEFURk9STShJT1MpICYmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0g MTA5MAorI2lmICFQTEFURk9STShJT1MpCiAgICAgc3RhdGljIGJvb2wgaXMxUGFzc3dvcmROZWVk aW5nU2NyZWVuRm9udHNRdWlyayA9IFdLRXhlY3V0YWJsZVdhc0xpbmtlZE9uT3JCZWZvcmVNb3Vu dGFpbkxpb24oKQogICAgICAgICAmJiBbW1tOU0J1bmRsZSBtYWluQnVuZGxlXSBidW5kbGVJZGVu dGlmaWVyXSBpc0VxdWFsVG9TdHJpbmc6QCJ3cy5hZ2lsZS4xUGFzc3dvcmQiXTsKICAgICByZXR1 cm4gaXMxUGFzc3dvcmROZWVkaW5nU2NyZWVuRm9udHNRdWlyazsKSW5kZXg6IFNvdXJjZS9XZWJL aXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21h Yy9XZWJWaWV3L1dlYlZpZXcubW0JKHJldmlzaW9uIDE3OTM2NCkKKysrIFNvdXJjZS9XZWJLaXQv bWFjL1dlYlZpZXcvV2ViVmlldy5tbQkod29ya2luZyBjb3B5KQpAQCAtMTI2OCwxMSArMTI2OCw3 IEBAICsgKHZvaWQpcmVnaXN0ZXJGb3JNZW1vcnlOb3RpZmljYXRpb25zCiAgICAgICAgIFtXZWJW aWV3IF9oYW5kbGVNZW1vcnlXYXJuaW5nXTsKICAgICB9LCBzaG91bGRBdXRvQ2xlYXJQcmVzc3Vy ZU9uTWVtb3J5UmVsZWFzZSk7CiAKLSNpZiBQTEFURk9STShJT1MpIHx8IF9fTUFDX09TX1hfVkVS U0lPTl9NSU5fUkVRVUlSRUQgPj0gMTA5MAogICAgIHN0YXRpYyBkaXNwYXRjaF9zb3VyY2VfdCBt ZW1vcnlOb3RpZmljYXRpb25FdmVudFNvdXJjZSA9IGRpc3BhdGNoX3NvdXJjZV9jcmVhdGUoRElT UEFUQ0hfU09VUkNFX1RZUEVfTUVNT1JZU1RBVFVTLCAwLCBESVNQQVRDSF9NRU1PUllTVEFUVVNf UFJFU1NVUkVfV0FSTiwgZGlzcGF0Y2hfZ2V0X2dsb2JhbF9xdWV1ZShESVNQQVRDSF9RVUVVRV9Q UklPUklUWV9ERUZBVUxULCAwKSk7Ci0jZWxzZQotICAgIHN0YXRpYyBkaXNwYXRjaF9zb3VyY2Vf dCBtZW1vcnlOb3RpZmljYXRpb25FdmVudFNvdXJjZSA9IGRpc3BhdGNoX3NvdXJjZV9jcmVhdGUo RElTUEFUQ0hfU09VUkNFX1RZUEVfVk0sIDAsIERJU1BBVENIX1ZNX1BSRVNTVVJFLCBkaXNwYXRj aF9nZXRfZ2xvYmFsX3F1ZXVlKERJU1BBVENIX1FVRVVFX1BSSU9SSVRZX0RFRkFVTFQsIDApKTsK LSNlbmRpZgogICAgIGRpc3BhdGNoX3NvdXJjZV9zZXRfZXZlbnRfaGFuZGxlcihtZW1vcnlOb3Rp ZmljYXRpb25FdmVudFNvdXJjZSwgXnsKICAgICAgICAgLy8gU2V0IG1lbW9yeSBwcmVzc3VyZSBm bGFnIGFuZCBzY2hlZHVsZSByZWxlYXNpbmcgbWVtb3J5IGluIHdlYiB0aHJlYWQgcnVubG9vcCBl eGl0LgogICAgICAgICBtZW1vcnlQcmVzc3VyZUhhbmRsZXIoKS5zZXRSZWNlaXZlZE1lbW9yeVBy ZXNzdXJlKFdlYkNvcmU6Ok1lbW9yeVByZXNzdXJlUmVhc29uVk1QcmVzc3VyZSk7CkBAIC0yMjA1 LDcgKzIyMDEsNyBAQCAtICh2b2lkKV9wcmVmZXJlbmNlc0NoYW5nZWQ6KFdlYlByZWZlcmVuCiAg ICAgc2V0dGluZ3Muc2V0RmFudGFzeUZvbnRGYW1pbHkoW3ByZWZlcmVuY2VzIGZhbnRhc3lGb250 RmFtaWx5XSk7CiAgICAgc2V0dGluZ3Muc2V0Rml4ZWRGb250RmFtaWx5KFtwcmVmZXJlbmNlcyBm aXhlZEZvbnRGYW1pbHldKTsKICAgICBzZXR0aW5ncy5zZXRTY3JlZW5Gb250U3Vic3RpdHV0aW9u RW5hYmxlZCgKLSNpZiAhUExBVEZPUk0oSU9TKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JF UVVJUkVEID49IDEwOTAKKyNpZiAhUExBVEZPUk0oSU9TKQogICAgICAgICBbW05TVXNlckRlZmF1 bHRzIHN0YW5kYXJkVXNlckRlZmF1bHRzXSBib29sRm9yS2V5OkAiTlNGb250RGVmYXVsdFNjcmVl bkZvbnRTdWJzdGl0dXRpb25FbmFibGVkIl0gfHwKICNlbmRpZgogICAgICAgICBbcHJlZmVyZW5j ZXMgc2NyZWVuRm9udFN1YnN0aXR1dGlvbkVuYWJsZWRdCkBAIC00Njc2LDEwICs0NjcyLDcgQEAg KyAodm9pZClpbml0aWFsaXplCiAgICAgW1tOU05vdGlmaWNhdGlvbkNlbnRlciBkZWZhdWx0Q2Vu dGVyXSBhZGRPYnNlcnZlcjpzZWxmIHNlbGVjdG9yOkBzZWxlY3RvcihfcHJlZmVyZW5jZXNSZW1v dmVkTm90aWZpY2F0aW9uOikgbmFtZTpXZWJQcmVmZXJlbmNlc1JlbW92ZWROb3RpZmljYXRpb24g b2JqZWN0Om5pbF07CiAKICAgICBOU1VzZXJEZWZhdWx0cyAqZGVmYXVsdHMgPSBbTlNVc2VyRGVm YXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNdOwotCi0jaWYgUExBVEZPUk0oSU9TKSB8fCBfX01B Q19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwOTAKICAgICBbZGVmYXVsdHMgcmVnaXN0 ZXJEZWZhdWx0czpbTlNEaWN0aW9uYXJ5IGRpY3Rpb25hcnlXaXRoT2JqZWN0OltOU051bWJlciBu dW1iZXJXaXRoQm9vbDpZRVNdIGZvcktleTpXZWJLaXRLZXJuaW5nQW5kTGlnYXR1cmVzRW5hYmxl ZEJ5RGVmYXVsdERlZmF1bHRzS2V5XV07Ci0jZW5kaWYKIAogI2lmIFBMQVRGT1JNKElPUykKICAg ICBjb250aW51b3VzU3BlbGxDaGVja2luZ0VuYWJsZWQgPSBOTzsKQEAgLTQ3MDMsMTQgKzQ2OTYs MTEgQEAgKyAodm9pZClpbml0aWFsaXplCiAgICAgICAgIG5hbWU6TlNTcGVsbENoZWNrZXJEaWRD aGFuZ2VBdXRvbWF0aWNUZXh0UmVwbGFjZW1lbnROb3RpZmljYXRpb24gb2JqZWN0Om5pbF07CiAg ICAgW1tOU05vdGlmaWNhdGlvbkNlbnRlciBkZWZhdWx0Q2VudGVyXSBhZGRPYnNlcnZlcjpzZWxm IHNlbGVjdG9yOkBzZWxlY3RvcihfZGlkQ2hhbmdlQXV0b21hdGljU3BlbGxpbmdDb3JyZWN0aW9u RW5hYmxlZDopCiAgICAgICAgIG5hbWU6TlNTcGVsbENoZWNrZXJEaWRDaGFuZ2VBdXRvbWF0aWNT cGVsbGluZ0NvcnJlY3Rpb25Ob3RpZmljYXRpb24gb2JqZWN0Om5pbF07Ci0KLSNpZiBfX01BQ19P U19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwOTAKICAgICBbW05TTm90aWZpY2F0aW9uQ2Vu dGVyIGRlZmF1bHRDZW50ZXJdIGFkZE9ic2VydmVyOnNlbGYgc2VsZWN0b3I6QHNlbGVjdG9yKF9k aWRDaGFuZ2VBdXRvbWF0aWNRdW90ZVN1YnN0aXR1dGlvbkVuYWJsZWQ6KQogICAgICAgICBuYW1l Ok5TU3BlbGxDaGVja2VyRGlkQ2hhbmdlQXV0b21hdGljUXVvdGVTdWJzdGl0dXRpb25Ob3RpZmlj YXRpb24gb2JqZWN0Om5pbF07CiAgICAgW1tOU05vdGlmaWNhdGlvbkNlbnRlciBkZWZhdWx0Q2Vu dGVyXSBhZGRPYnNlcnZlcjpzZWxmIHNlbGVjdG9yOkBzZWxlY3RvcihfZGlkQ2hhbmdlQXV0b21h dGljRGFzaFN1YnN0aXR1dGlvbkVuYWJsZWQ6KQogICAgICAgICBuYW1lOk5TU3BlbGxDaGVja2Vy RGlkQ2hhbmdlQXV0b21hdGljRGFzaFN1YnN0aXR1dGlvbk5vdGlmaWNhdGlvbiBvYmplY3Q6bmls XTsKICNlbmRpZgotI2VuZGlmCiB9CiAKICNpZiAhUExBVEZPUk0oSU9TKQpAQCAtNDc0NSwyNCAr NDczNSwxOSBAQCArICh2b2lkKV9kaWRDaGFuZ2VBdXRvbWF0aWNTcGVsbGluZ0NvcnJlCiArIChC T09MKV9zaG91bGRBdXRvbWF0aWNRdW90ZVN1YnN0aXR1dGlvbkJlRW5hYmxlZAogewogICAgIE5T VXNlckRlZmF1bHRzICpkZWZhdWx0cyA9IFtOU1VzZXJEZWZhdWx0cyBzdGFuZGFyZFVzZXJEZWZh dWx0c107Ci0jaWYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDkwCiAgICAg aWYgKCFbZGVmYXVsdHMgb2JqZWN0Rm9yS2V5OldlYkF1dG9tYXRpY1F1b3RlU3Vic3RpdHV0aW9u RW5hYmxlZF0pCiAgICAgICAgIHJldHVybiBbTlNTcGVsbENoZWNrZXIgaXNBdXRvbWF0aWNRdW90 ZVN1YnN0aXR1dGlvbkVuYWJsZWRdOwotI2VuZGlmCiAgICAgcmV0dXJuIFtkZWZhdWx0cyBib29s Rm9yS2V5OldlYkF1dG9tYXRpY1F1b3RlU3Vic3RpdHV0aW9uRW5hYmxlZF07CiB9CiAKICsgKEJP T0wpX3Nob3VsZEF1dG9tYXRpY0Rhc2hTdWJzdGl0dXRpb25CZUVuYWJsZWQKIHsKICAgICBOU1Vz ZXJEZWZhdWx0cyAqZGVmYXVsdHMgPSBbTlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVs dHNdOwotI2lmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTA5MAogICAgIGlm ICghW2RlZmF1bHRzIG9iamVjdEZvcktleTpXZWJBdXRvbWF0aWNEYXNoU3Vic3RpdHV0aW9uRW5h YmxlZF0pCiAgICAgICAgIHJldHVybiBbTlNTcGVsbENoZWNrZXIgaXNBdXRvbWF0aWNEYXNoU3Vi c3RpdHV0aW9uRW5hYmxlZF07Ci0jZW5kaWYKICAgICByZXR1cm4gW2RlZmF1bHRzIGJvb2xGb3JL ZXk6V2ViQXV0b21hdGljRGFzaFN1YnN0aXR1dGlvbkVuYWJsZWRdOwogfQogCi0jaWYgX19NQUNf T1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDkwCiArICh2b2lkKV9kaWRDaGFuZ2VBdXRv bWF0aWNRdW90ZVN1YnN0aXR1dGlvbkVuYWJsZWQ6KE5TTm90aWZpY2F0aW9uICopbm90aWZpY2F0 aW9uCiB7CiAgICAgYXV0b21hdGljUXVvdGVTdWJzdGl0dXRpb25FbmFibGVkID0gW3NlbGYgX3No b3VsZEF1dG9tYXRpY1F1b3RlU3Vic3RpdHV0aW9uQmVFbmFibGVkXTsKQEAgLTQ3NzQsNyArNDc1 OSw2IEBAICsgKHZvaWQpX2RpZENoYW5nZUF1dG9tYXRpY0Rhc2hTdWJzdGl0dXQKICAgICBhdXRv bWF0aWNEYXNoU3Vic3RpdHV0aW9uRW5hYmxlZCA9IFtzZWxmIF9zaG91bGRBdXRvbWF0aWNEYXNo U3Vic3RpdHV0aW9uQmVFbmFibGVkXTsKICAgICBbW05TU3BlbGxDaGVja2VyIHNoYXJlZFNwZWxs Q2hlY2tlcl0gdXBkYXRlUGFuZWxzXTsKIH0KLSNlbmRpZgogCiArICh2b2lkKV9hcHBsaWNhdGlv bldpbGxUZXJtaW5hdGUKIHsgICAK