139619 2014-12-13 01:17:46 -0800 Implement Data Detectors immediate actions for Legacy WebKit 2014-12-15 12:27:25 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton andersca bdakin commit-queue conrad_shultz eric.carlson glenn jer.noble philipj sergio oldest_to_newest 1055411 0 thorton 2014-12-13 01:17:46 -0800 Implement Data Detectors immediate actions for Legacy WebKit 1055412 1 243253 thorton 2014-12-13 01:18:50 -0800 Created attachment 243253 Patch 1055413 2 commit-queue 2014-12-13 01:20:58 -0800 Attachment 243253 did not pass style-queue: ERROR: Source/WebKit/mac/WebView/WebImmediateActionController.mm:259: Place brace on its own line for function definitions. [whitespace/braces] [4] ERROR: Source/WebKit/mac/WebView/WebImmediateActionController.mm:260: Place brace on its own line for function definitions. [whitespace/braces] [4] ERROR: Source/WebKit/mac/WebView/WebImmediateActionController.mm:262: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 3 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 1055424 3 243253 eric.carlson 2014-12-13 07:47:32 -0800 Comment on attachment 243253 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=243253&action=review > Source/WebKit/mac/WebView/WebImmediateActionController.h:52 > + BOOL _isShowingTextIndicator; > + RefPtr<WebCore::TextIndicator> _currentDetectedDataTextIndicator; > + BOOL _hasActivatedActionContext; Minor nit: putting both BOOLs at the end of the interface will make this object slightly smaller. > Source/WebKit/mac/WebView/WebImmediateActionController.mm:86 > + _immediateActionRecognizer.enabled = NO; > + _immediateActionRecognizer.enabled = YES; Assuming you do mean to disable and then reenable the recognizer here, it might be worth adding a comment because it looks like it is a copy/paste error. 1055692 4 thorton 2014-12-15 11:50:08 -0800 http://trac.webkit.org/changeset/177300 1055703 5 thorton 2014-12-15 12:27:25 -0800 And http://trac.webkit.org/changeset/177304 243253 2014-12-13 01:18:50 -0800 2014-12-13 07:47:32 -0800 Patch bug-139619-20141213011935.patch text/plain 15248 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3MjQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21h Yy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggYmZlZGQxNTVl N2FhNmZhMTgzM2JjODg0MWFhZTRjYzRkY2MxM2RkMC4uMjczYTc2ZmQ2NTJlN2Q2YTdhYzQwYWFj MzI4YjBlMDNjMDcyNTZiZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDE0 LTEyLTEzICBUaW1vdGh5IEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KKworICAg ICAgICBJbXBsZW1lbnQgRGF0YSBEZXRlY3RvcnMgaW1tZWRpYXRlIGFjdGlvbnMgZm9yIExlZ2Fj eSBXZWJLaXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEzOTYxOQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTkxOTg1Mzk+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJWaWV3L1dlYkhUTUxWaWV3 Lm1tOgorICAgICAgICAoLVtXZWJIVE1MVmlldyBtb3VzZURvd246bW91c2VEb3duOl0pOgorICAg ICAgICBTZW5kIG1vdXNlRG93biBhbG9uZyB0byB0aGUgV2ViSW1tZWRpYXRlQWN0aW9uQ29udHJv bGxlciB0b28uCisKKyAgICAgICAgKiBXZWJWaWV3L1dlYkltbWVkaWF0ZUFjdGlvbkNvbnRyb2xs ZXIuaDoKKyAgICAgICAgKiBXZWJWaWV3L1dlYkltbWVkaWF0ZUFjdGlvbkNvbnRyb2xsZXIubW06 CisgICAgICAgICgtW1dlYkltbWVkaWF0ZUFjdGlvbkNvbnRyb2xsZXIgd2ViVmlld0Nsb3NlZF0p OgorICAgICAgICAoLVtXZWJJbW1lZGlhdGVBY3Rpb25Db250cm9sbGVyIHdlYlZpZXc6d2lsbEhh bmRsZU1vdXNlRG93bjpdKToKKyAgICAgICAgKC1bV2ViSW1tZWRpYXRlQWN0aW9uQ29udHJvbGxl ciBfY2FuY2VsSW1tZWRpYXRlQWN0aW9uXSk6CisgICAgICAgICgtW1dlYkltbWVkaWF0ZUFjdGlv bkNvbnRyb2xsZXIgX2NsZWFySW1tZWRpYXRlQWN0aW9uU3RhdGVdKToKKyAgICAgICAgKC1bV2Vi SW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlciBpbW1lZGlhdGVBY3Rpb25SZWNvZ25pemVyV2lsbFBy ZXBhcmU6XSk6CisgICAgICAgICgtW1dlYkltbWVkaWF0ZUFjdGlvbkNvbnRyb2xsZXIgX2RlZmF1 bHRBbmltYXRpb25Db250cm9sbGVyXSk6CisgICAgICAgICgtW1dlYkltbWVkaWF0ZUFjdGlvbkNv bnRyb2xsZXIgX3VwZGF0ZUltbWVkaWF0ZUFjdGlvbkl0ZW1dKToKKyAgICAgICAgKC1bV2ViSW1t ZWRpYXRlQWN0aW9uQ29udHJvbGxlciBfbWVudUl0ZW1Gb3JEYXRhRGV0ZWN0ZWRUZXh0XSk6Cisg ICAgICAgICgtW1dlYkltbWVkaWF0ZUFjdGlvbkNvbnRyb2xsZXIgX3Nob3dUZXh0SW5kaWNhdG9y XSk6CisgICAgICAgICgtW1dlYkltbWVkaWF0ZUFjdGlvbkNvbnRyb2xsZXIgX2hpZGVUZXh0SW5k aWNhdG9yXSk6CisgICAgICAgIENvcHkgbW9zdCBvZiB0aGUgRGF0YURldGVjdG9ycyBpbXBsZW1l bnRhdGlvbiBpbnRvIFdlYkltbWVkaWF0ZUFjdGlvbkNvbnRyb2xsZXIuCisKKyAgICAgICAgKiBX ZWJWaWV3L1dlYlVJRGVsZWdhdGVQcml2YXRlLmg6CisgICAgICAgIEFkZCBhIG5ldyB0eXBlLgor CisgICAgICAgICogV2ViVmlldy9XZWJWaWV3Lm1tOgorICAgICAgICAoLVtXZWJWaWV3IF9jb21t b25Jbml0aWFsaXphdGlvbldpdGhGcmFtZU5hbWU6Z3JvdXBOYW1lOl0pOgorICAgICAgICBUZW1w b3JhcmlseSBkaXNhYmxlIGFjdGlvbiBtZW51cy4KKworICAgICAgICAoLVtXZWJWaWV3IF9pbW1l ZGlhdGVBY3Rpb25Db250cm9sbGVyXSk6CisgICAgICAgICogV2ViVmlldy9XZWJWaWV3SW50ZXJu YWwuaDoKKwogMjAxNC0xMi0xMSAgRGFuIEJlcm5zdGVpbiAgPG1pdHpAYXBwbGUuY29tPgogCiAg ICAgICAgIEZpeCBhIGxlYWsgaW50cm9kdWNlZCBpbiByMTc3MTk5LgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJIVE1MVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQvbWFj L1dlYlZpZXcvV2ViSFRNTFZpZXcubW0KaW5kZXggMTAyZTBmMjFlMDc1NGUzNWIwYTVjOWEzODky NmNkOGZlNGI1MTg1Yi4uZGM4OTI5NDRiMTM0MWI3NWJkODQ1ZWMwZWJkOTU5M2YxZDk3MjA4ZiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJIVE1MVmlldy5tbQorKysg Yi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkhUTUxWaWV3Lm1tCkBAIC0zODIyLDYgKzM4 MjIsNyBAQCBzdGF0aWMgdm9pZCBzZXRNZW51VGFyZ2V0cyhOU01lbnUqIG1lbnUpCiAKICNpZiBQ TEFURk9STShNQUMpICYmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTAxMDAw CiAgICAgW1tbc2VsZiBfd2ViVmlld10gX2FjdGlvbk1lbnVDb250cm9sbGVyXSB3ZWJWaWV3Oltz ZWxmIF93ZWJWaWV3XSB3aWxsSGFuZGxlTW91c2VEb3duOmV2ZW50XTsKKyAgICBbW1tzZWxmIF93 ZWJWaWV3XSBfaW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlcl0gd2ViVmlldzpbc2VsZiBfd2ViVmll d10gd2lsbEhhbmRsZU1vdXNlRG93bjpldmVudF07CiAjZW5kaWYKIAogI2lmIFBMQVRGT1JNKElP UykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViSW1tZWRpYXRlQWN0 aW9uQ29udHJvbGxlci5oIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJJbW1lZGlhdGVB Y3Rpb25Db250cm9sbGVyLmgKaW5kZXggNTdlMjkzOTgyNjgwNmE0NWU5OWEyODViZTMxMTM4NmU3 OTVjMzVmNC4uZTMyNzdmNWI3ZTFjYzFiM2UwYTIxOWEzZWJlOWI0ZjUzM2Y3ZDZjYSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJJbW1lZGlhdGVBY3Rpb25Db250cm9s bGVyLmgKKysrIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJJbW1lZGlhdGVBY3Rpb25D b250cm9sbGVyLmgKQEAgLTMwLDE5ICszMCwzMyBAQAogI2ltcG9ydCA8V2ViQ29yZS9OU0ltbWVk aWF0ZUFjdGlvbkdlc3R1cmVSZWNvZ25pemVyU1BJLmg+CiAjaW1wb3J0IDx3dGYvUmV0YWluUHRy Lmg+CiAKK0BjbGFzcyBEREFjdGlvbkNvbnRleHQ7CiBAY2xhc3MgV2ViVmlldzsKIAorbmFtZXNw YWNlIFdlYkNvcmUgeworY2xhc3MgUmFuZ2U7CitjbGFzcyBUZXh0SW5kaWNhdG9yOworfQorCiBA aW50ZXJmYWNlIFdlYkltbWVkaWF0ZUFjdGlvbkNvbnRyb2xsZXIgOiBOU09iamVjdCA8TlNJbW1l ZGlhdGVBY3Rpb25HZXN0dXJlUmVjb2duaXplckRlbGVnYXRlPiB7CiBAcHJpdmF0ZQogICAgIFdl YlZpZXcgKl93ZWJWaWV3OwogICAgIFdlYkltbWVkaWF0ZUFjdGlvblR5cGUgX3R5cGU7CiAgICAg V2ViQ29yZTo6SGl0VGVzdFJlc3VsdCBfaGl0VGVzdFJlc3VsdDsKICAgICBOU0ltbWVkaWF0ZUFj dGlvbkdlc3R1cmVSZWNvZ25pemVyICpfaW1tZWRpYXRlQWN0aW9uUmVjb2duaXplcjsKKworICAg IFJldGFpblB0cjxEREFjdGlvbkNvbnRleHQ+IF9jdXJyZW50QWN0aW9uQ29udGV4dDsKKyAgICBS ZWZQdHI8V2ViQ29yZTo6UmFuZ2U+IF9jdXJyZW50RGV0ZWN0ZWREYXRhUmFuZ2U7CisgICAgQk9P TCBfaXNTaG93aW5nVGV4dEluZGljYXRvcjsKKyAgICBSZWZQdHI8V2ViQ29yZTo6VGV4dEluZGlj YXRvcj4gX2N1cnJlbnREZXRlY3RlZERhdGFUZXh0SW5kaWNhdG9yOworICAgIEJPT0wgX2hhc0Fj dGl2YXRlZEFjdGlvbkNvbnRleHQ7CiB9CiAKIC0gKGluc3RhbmNldHlwZSlpbml0V2l0aFdlYlZp ZXc6KFdlYlZpZXcgKil3ZWJWaWV3IHJlY29nbml6ZXI6KE5TSW1tZWRpYXRlQWN0aW9uR2VzdHVy ZVJlY29nbml6ZXIgKilpbW1lZGlhdGVBY3Rpb25SZWNvZ25pemVyOwogLSAodm9pZCl3ZWJWaWV3 Q2xvc2VkOwogCistICh2b2lkKXdlYlZpZXc6KFdlYlZpZXcgKil3ZWJWaWV3IHdpbGxIYW5kbGVN b3VzZURvd246KE5TRXZlbnQgKilldmVudDsKKwogQGVuZAogCiAjZW5kaWYgLy8gUExBVEZPUk0o TUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwMTAwMApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJJbW1lZGlhdGVBY3Rpb25Db250cm9s bGVyLm1tIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJJbW1lZGlhdGVBY3Rpb25Db250 cm9sbGVyLm1tCmluZGV4IDRlOGRkMmE3MzI0ZjJhOTA1OWQzOGFiM2M5NGRjZDljZWJkOTY1NGQu LjM4NmQ1YTJhNGVkZGExZTUwYWU4ZmFhY2RhODI4NzhkNGUwNmI0ODUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViSW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlci5tbQor KysgYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkltbWVkaWF0ZUFjdGlvbkNvbnRyb2xs ZXIubW0KQEAgLTI3LDE2ICsyNywyMiBAQAogCiAjaWYgUExBVEZPUk0oTUFDKSAmJiBfX01BQ19P U19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwMTAwMAogCisjaW1wb3J0ICJET01FbGVtZW50 SW50ZXJuYWwuaCIKKyNpbXBvcnQgIkRPTU5vZGVJbnRlcm5hbC5oIgorI2ltcG9ydCAiRE9NUmFu Z2VJbnRlcm5hbC5oIgogI2ltcG9ydCAiV2ViRWxlbWVudERpY3Rpb25hcnkuaCIKICNpbXBvcnQg IldlYkZyYW1lSW50ZXJuYWwuaCIKICNpbXBvcnQgIldlYkhUTUxWaWV3LmgiCiAjaW1wb3J0ICJX ZWJIVE1MVmlld0ludGVybmFsLmgiCiAjaW1wb3J0ICJXZWJVSURlbGVnYXRlUHJpdmF0ZS5oIgog I2ltcG9ydCAiV2ViVmlld0ludGVybmFsLmgiCisjaW1wb3J0IDxXZWJDb3JlL0RhdGFEZXRlY3Rp b24uaD4KKyNpbXBvcnQgPFdlYkNvcmUvRGF0YURldGVjdG9yc1NQSS5oPgogI2ltcG9ydCA8V2Vi Q29yZS9FdmVudEhhbmRsZXIuaD4KICNpbXBvcnQgPFdlYkNvcmUvRnJhbWUuaD4KICNpbXBvcnQg PFdlYkNvcmUvTlNNZW51U1BJLmg+CiAjaW1wb3J0IDxXZWJDb3JlL1NvZnRMaW5raW5nLmg+Cisj aW1wb3J0IDxXZWJDb3JlL1RleHRJbmRpY2F0b3IuaD4KICNpbXBvcnQgPG9iamMvb2JqYy1jbGFz cy5oPgogI2ltcG9ydCA8b2JqYy9vYmpjLmg+CiAKQEAgLTY2LDExICs3MiwyNyBAQCB1c2luZyBu YW1lc3BhY2UgV2ViQ29yZTsKIHsKICAgICBfd2ViVmlldyA9IG5pbDsKICAgICBfaW1tZWRpYXRl QWN0aW9uUmVjb2duaXplciA9IG5pbDsKKyAgICBfY3VycmVudEFjdGlvbkNvbnRleHQgPSBuaWw7 Cit9CisKKy0gKHZvaWQpd2ViVmlldzooV2ViVmlldyAqKXdlYlZpZXcgd2lsbEhhbmRsZU1vdXNl RG93bjooTlNFdmVudCAqKWV2ZW50Cit7CisgICAgW3NlbGYgX2NsZWFySW1tZWRpYXRlQWN0aW9u U3RhdGVdOworfQorCistICh2b2lkKV9jYW5jZWxJbW1lZGlhdGVBY3Rpb24KK3sKKyAgICBfaW1t ZWRpYXRlQWN0aW9uUmVjb2duaXplci5lbmFibGVkID0gTk87CisgICAgX2ltbWVkaWF0ZUFjdGlv blJlY29nbml6ZXIuZW5hYmxlZCA9IFlFUzsKKworICAgIFtzZWxmIF9jbGVhckltbWVkaWF0ZUFj dGlvblN0YXRlXTsKIH0KIAogLSAodm9pZClfY2xlYXJJbW1lZGlhdGVBY3Rpb25TdGF0ZQogewog ICAgIF90eXBlID0gV2ViSW1tZWRpYXRlQWN0aW9uTm9uZTsKKyAgICBfY3VycmVudEFjdGlvbkNv bnRleHQgPSBuaWw7CisgICAgX2ltbWVkaWF0ZUFjdGlvblJlY29nbml6ZXIuYW5pbWF0aW9uQ29u dHJvbGxlciA9IG5pbDsKIH0KIAogLSAodm9pZClwZXJmb3JtSGl0VGVzdEF0UG9pbnQ6KE5TUG9p bnQpdmlld1BvaW50CkBAIC05NSw2ICsxMTcsMTcgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7 CiAgICAgTlNQb2ludCBsb2NhdGlvbkluRG9jdW1lbnRWaWV3ID0gW2ltbWVkaWF0ZUFjdGlvblJl Y29nbml6ZXIgbG9jYXRpb25JblZpZXc6ZG9jdW1lbnRWaWV3XTsKICAgICBbc2VsZiBwZXJmb3Jt SGl0VGVzdEF0UG9pbnQ6bG9jYXRpb25JbkRvY3VtZW50Vmlld107CiAgICAgW3NlbGYgX3VwZGF0 ZUltbWVkaWF0ZUFjdGlvbkl0ZW1dOworCisgICAgaWYgKCFfaW1tZWRpYXRlQWN0aW9uUmVjb2du aXplci5hbmltYXRpb25Db250cm9sbGVyKSB7CisgICAgICAgIFtzZWxmIF9jYW5jZWxJbW1lZGlh dGVBY3Rpb25dOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgaWYgKF9jdXJyZW50QWN0 aW9uQ29udGV4dCkgeworICAgICAgICBfaGFzQWN0aXZhdGVkQWN0aW9uQ29udGV4dCA9IFlFUzsK KyAgICAgICAgaWYgKCFbZ2V0RERBY3Rpb25zTWFuYWdlckNsYXNzKCkgc2hvdWxkVXNlQWN0aW9u c1dpdGhDb250ZXh0Ol9jdXJyZW50QWN0aW9uQ29udGV4dC5nZXQoKV0pCisgICAgICAgICAgICBb c2VsZiBfY2FuY2VsSW1tZWRpYXRlQWN0aW9uXTsKKyAgICB9CiB9CiAKIC0gKHZvaWQpaW1tZWRp YXRlQWN0aW9uUmVjb2duaXplcldpbGxCZWdpbkFuaW1hdGlvbjooTlNJbW1lZGlhdGVBY3Rpb25H ZXN0dXJlUmVjb2duaXplciAqKWltbWVkaWF0ZUFjdGlvblJlY29nbml6ZXIKQEAgLTEyMywxMiAr MTU2LDggQEAgdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKICNwcmFnbWEgbWFyayBJbW1lZGlh dGUgYWN0aW9ucwogCi0tICh2b2lkKV91cGRhdGVJbW1lZGlhdGVBY3Rpb25JdGVtCistIChpZCA8 TlNJbW1lZGlhdGVBY3Rpb25BbmltYXRpb25Db250cm9sbGVyPilfZGVmYXVsdEFuaW1hdGlvbkNv bnRyb2xsZXIKIHsKLSAgICBfdHlwZSA9IFdlYkltbWVkaWF0ZUFjdGlvbk5vbmU7Ci0gICAgX2lt bWVkaWF0ZUFjdGlvblJlY29nbml6ZXIuYW5pbWF0aW9uQ29udHJvbGxlciA9IG5pbDsKLSAgICBp ZCA8TlNJbW1lZGlhdGVBY3Rpb25BbmltYXRpb25Db250cm9sbGVyPiBkZWZhdWx0QW5pbWF0aW9u Q29udHJvbGxlciA9IG5pbDsKLQogICAgIE5TVVJMICp1cmwgPSBfaGl0VGVzdFJlc3VsdC5hYnNv bHV0ZUxpbmtVUkwoKTsKICAgICBOU1N0cmluZyAqYWJzb2x1dGVVUkxTdHJpbmcgPSBbdXJsIGFi c29sdXRlU3RyaW5nXTsKICAgICBpZiAodXJsICYmIFdlYkNvcmU6OnByb3RvY29sSXNJbkhUVFBG YW1pbHkoYWJzb2x1dGVVUkxTdHJpbmcpKSB7CkBAIC0xMzcsOSArMTY2LDI2IEBAIHVzaW5nIG5h bWVzcGFjZSBXZWJDb3JlOwogICAgICAgICBSZXRhaW5QdHI8UUxQcmV2aWV3TWVudUl0ZW0+IHFs UHJldmlld0xpbmtJdGVtID0gW05TTWVudUl0ZW0gc3RhbmRhcmRRdWlja0xvb2tNZW51SXRlbV07 CiAgICAgICAgIFtxbFByZXZpZXdMaW5rSXRlbSBzZXRQcmV2aWV3U3R5bGU6UUxQcmV2aWV3U3R5 bGVQb3BvdmVyXTsKICAgICAgICAgW3FsUHJldmlld0xpbmtJdGVtIHNldERlbGVnYXRlOnNlbGZd OwotICAgICAgICBkZWZhdWx0QW5pbWF0aW9uQ29udHJvbGxlciA9IChpZCA8TlNJbW1lZGlhdGVB Y3Rpb25BbmltYXRpb25Db250cm9sbGVyPilxbFByZXZpZXdMaW5rSXRlbS5nZXQoKTsKKyAgICAg ICAgcmV0dXJuIChpZCA8TlNJbW1lZGlhdGVBY3Rpb25BbmltYXRpb25Db250cm9sbGVyPilxbFBy ZXZpZXdMaW5rSXRlbS5nZXQoKTsKICAgICB9CiAKKyAgICBOb2RlKiBub2RlID0gX2hpdFRlc3RS ZXN1bHQuaW5uZXJOb2RlKCk7CisgICAgaWYgKChub2RlICYmIG5vZGUtPmlzVGV4dE5vZGUoKSkg fHwgX2hpdFRlc3RSZXN1bHQuaXNPdmVyVGV4dEluc2lkZUZvcm1Db250cm9sRWxlbWVudCgpKSB7 CisgICAgICAgIGlmIChOU01lbnVJdGVtICppbW1lZGlhdGVBY3Rpb25JdGVtID0gW3NlbGYgX21l bnVJdGVtRm9yRGF0YURldGVjdGVkVGV4dF0pIHsKKyAgICAgICAgICAgIF90eXBlID0gV2ViSW1t ZWRpYXRlQWN0aW9uRGF0YURldGVjdGVkSXRlbTsKKyAgICAgICAgICAgIHJldHVybiAoaWQ8TlNJ bW1lZGlhdGVBY3Rpb25BbmltYXRpb25Db250cm9sbGVyPilpbW1lZGlhdGVBY3Rpb25JdGVtOwor ICAgICAgICB9CisgICAgfQorCisgICAgcmV0dXJuIG5pbDsKK30KKworLSAodm9pZClfdXBkYXRl SW1tZWRpYXRlQWN0aW9uSXRlbQoreworICAgIF90eXBlID0gV2ViSW1tZWRpYXRlQWN0aW9uTm9u ZTsKKworICAgIGlkIDxOU0ltbWVkaWF0ZUFjdGlvbkFuaW1hdGlvbkNvbnRyb2xsZXI+IGRlZmF1 bHRBbmltYXRpb25Db250cm9sbGVyID0gW3NlbGYgX2RlZmF1bHRBbmltYXRpb25Db250cm9sbGVy XTsKKwogICAgIC8vIEFsbG93IGNsaWVudHMgdGhlIG9wcG9ydHVuaXR5IHRvIG92ZXJyaWRlIHRo ZSBkZWZhdWx0IGltbWVkaWF0ZSBhY3Rpb24uCiAgICAgaWQgY3VzdG9tQ2xpZW50QW5pbWF0aW9u Q29udHJvbGxlciA9IG5pbDsKICAgICBpZiAoW1tfd2ViVmlldyBVSURlbGVnYXRlXSByZXNwb25k c1RvU2VsZWN0b3I6QHNlbGVjdG9yKF93ZWJWaWV3OmltbWVkaWF0ZUFjdGlvbkFuaW1hdGlvbkNv bnRyb2xsZXJGb3JIaXRUZXN0UmVzdWx0OndpdGhUeXBlOildKSB7CkBAIC0xNDcsOCArMTkzLDEw IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogICAgICAgICBjdXN0b21DbGllbnRBbmltYXRp b25Db250cm9sbGVyID0gW1tfd2ViVmlldyBVSURlbGVnYXRlXSBfd2ViVmlldzpfd2ViVmlldyBp bW1lZGlhdGVBY3Rpb25BbmltYXRpb25Db250cm9sbGVyRm9ySGl0VGVzdFJlc3VsdDp3ZWJIaXRU ZXN0UmVzdWx0LmdldCgpIHdpdGhUeXBlOl90eXBlXTsKICAgICB9CiAKLSAgICBpZiAoY3VzdG9t Q2xpZW50QW5pbWF0aW9uQ29udHJvbGxlciA9PSBbTlNOdWxsIG51bGxdKQorICAgIGlmIChjdXN0 b21DbGllbnRBbmltYXRpb25Db250cm9sbGVyID09IFtOU051bGwgbnVsbF0pIHsKKyAgICAgICAg W3NlbGYgX2NhbmNlbEltbWVkaWF0ZUFjdGlvbl07CiAgICAgICAgIHJldHVybjsKKyAgICB9CiAg ICAgaWYgKGN1c3RvbUNsaWVudEFuaW1hdGlvbkNvbnRyb2xsZXIgJiYgW2N1c3RvbUNsaWVudEFu aW1hdGlvbkNvbnRyb2xsZXIgY29uZm9ybXNUb1Byb3RvY29sOkBwcm90b2NvbChOU0ltbWVkaWF0 ZUFjdGlvbkFuaW1hdGlvbkNvbnRyb2xsZXIpXSkKICAgICAgICAgX2ltbWVkaWF0ZUFjdGlvblJl Y29nbml6ZXIuYW5pbWF0aW9uQ29udHJvbGxlciA9IChpZCA8TlNJbW1lZGlhdGVBY3Rpb25Bbmlt YXRpb25Db250cm9sbGVyPiljdXN0b21DbGllbnRBbmltYXRpb25Db250cm9sbGVyOwogICAgIGVs c2UKQEAgLTE3NSw2ICsyMjMsODAgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAgICAgcmV0 dXJuIE5TTWF4WUVkZ2U7CiB9CiAKKyNwcmFnbWEgbWFyayBEYXRhIERldGVjdG9ycyBhY3Rpb25z CisKKy0gKE5TTWVudUl0ZW0gKilfbWVudUl0ZW1Gb3JEYXRhRGV0ZWN0ZWRUZXh0Cit7CisgICAg UmVmUHRyPFJhbmdlPiBkZXRlY3RlZERhdGFSYW5nZTsKKyAgICBGbG9hdFJlY3QgZGV0ZWN0ZWRE YXRhQm91bmRpbmdCb3g7CisgICAgUmV0YWluUHRyPEREQWN0aW9uQ29udGV4dD4gYWN0aW9uQ29u dGV4dDsKKworICAgIGlmIChbW193ZWJWaWV3IFVJRGVsZWdhdGVdIHJlc3BvbmRzVG9TZWxlY3Rv cjpAc2VsZWN0b3IoX3dlYlZpZXc6YWN0aW9uQ29udGV4dEZvckhpdFRlc3RSZXN1bHQ6cmFuZ2U6 KV0pIHsKKyAgICAgICAgUmV0YWluUHRyPFdlYkVsZW1lbnREaWN0aW9uYXJ5PiBoaXRUZXN0RGlj dGlvbmFyeSA9IGFkb3B0TlMoW1tXZWJFbGVtZW50RGljdGlvbmFyeSBhbGxvY10gaW5pdFdpdGhI aXRUZXN0UmVzdWx0Ol9oaXRUZXN0UmVzdWx0XSk7CisKKyAgICAgICAgRE9NUmFuZ2UgKmN1c3Rv bURhdGFEZXRlY3RvcnNSYW5nZTsKKyAgICAgICAgYWN0aW9uQ29udGV4dCA9IFtbX3dlYlZpZXcg VUlEZWxlZ2F0ZV0gX3dlYlZpZXc6X3dlYlZpZXcgYWN0aW9uQ29udGV4dEZvckhpdFRlc3RSZXN1 bHQ6aGl0VGVzdERpY3Rpb25hcnkuZ2V0KCkgcmFuZ2U6JmN1c3RvbURhdGFEZXRlY3RvcnNSYW5n ZV07CisKKyAgICAgICAgaWYgKGFjdGlvbkNvbnRleHQgJiYgY3VzdG9tRGF0YURldGVjdG9yc1Jh bmdlKQorICAgICAgICAgICAgZGV0ZWN0ZWREYXRhUmFuZ2UgPSBjb3JlKGN1c3RvbURhdGFEZXRl Y3RvcnNSYW5nZSk7CisgICAgfQorCisgICAgLy8gSWYgdGhlIGNsaWVudCBkaWRuJ3QgZ2l2ZSB1 cyBhbiBhY3Rpb24gY29udGV4dCwgdHJ5IHRvIHNjYW4gYXJvdW5kIHRoZSBoaXQgcG9pbnQuCisg ICAgaWYgKCFhY3Rpb25Db250ZXh0IHx8ICFkZXRlY3RlZERhdGFSYW5nZSkKKyAgICAgICAgYWN0 aW9uQ29udGV4dCA9IERhdGFEZXRlY3Rpb246OmRldGVjdEl0ZW1Bcm91bmRIaXRUZXN0UmVzdWx0 KF9oaXRUZXN0UmVzdWx0LCBkZXRlY3RlZERhdGFCb3VuZGluZ0JveCwgZGV0ZWN0ZWREYXRhUmFu Z2UpOworCisgICAgaWYgKCFhY3Rpb25Db250ZXh0IHx8ICFkZXRlY3RlZERhdGFSYW5nZSkKKyAg ICAgICAgcmV0dXJuIG5pbDsKKworICAgIFthY3Rpb25Db250ZXh0IHNldEFsdE1vZGU6WUVTXTsK KyAgICBpZiAoW1tnZXREREFjdGlvbnNNYW5hZ2VyQ2xhc3MoKSBzaGFyZWRNYW5hZ2VyXSByZXNw b25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKGhhc0FjdGlvbnNGb3JSZXN1bHQ6YWN0aW9uQ29udGV4 dDopXSkgeworICAgICAgICBpZiAoIVtbZ2V0RERBY3Rpb25zTWFuYWdlckNsYXNzKCkgc2hhcmVk TWFuYWdlcl0gaGFzQWN0aW9uc0ZvclJlc3VsdDpbYWN0aW9uQ29udGV4dCBtYWluUmVzdWx0XSBh Y3Rpb25Db250ZXh0OmFjdGlvbkNvbnRleHQuZ2V0KCldKQorICAgICAgICAgICAgcmV0dXJuIG5p bDsKKyAgICB9CisKKyAgICBfY3VycmVudERldGVjdGVkRGF0YVRleHRJbmRpY2F0b3IgPSBUZXh0 SW5kaWNhdG9yOjpjcmVhdGVXaXRoUmFuZ2UoKmRldGVjdGVkRGF0YVJhbmdlLCBUZXh0SW5kaWNh dG9yUHJlc2VudGF0aW9uVHJhbnNpdGlvbjo6Qm91bmNlQW5kQ3Jvc3NmYWRlKTsKKworICAgIF9j dXJyZW50QWN0aW9uQ29udGV4dCA9IFthY3Rpb25Db250ZXh0IGNvbnRleHRGb3JWaWV3Ol93ZWJW aWV3IGFsdE1vZGU6WUVTIGludGVyYWN0aW9uU3RhcnRlZEhhbmRsZXI6XigpIHsKKyAgICB9IGlu dGVyYWN0aW9uQ2hhbmdlZEhhbmRsZXI6XigpIHsKKyAgICAgICAgW3NlbGYgX3Nob3dUZXh0SW5k aWNhdG9yXTsKKyAgICB9IGludGVyYWN0aW9uU3RvcHBlZEhhbmRsZXI6XigpIHsKKyAgICAgICAg W3NlbGYgX2hpZGVUZXh0SW5kaWNhdG9yXTsKKyAgICB9XTsKKyAgICBfY3VycmVudERldGVjdGVk RGF0YVJhbmdlID0gZGV0ZWN0ZWREYXRhUmFuZ2U7CisKKyAgICBbX2N1cnJlbnRBY3Rpb25Db250 ZXh0IHNldEhpZ2hsaWdodEZyYW1lOltfd2ViVmlldy53aW5kb3cgY29udmVydFJlY3RUb1NjcmVl bjpkZXRlY3RlZERhdGFCb3VuZGluZ0JveF1dOworCisgICAgTlNBcnJheSAqbWVudUl0ZW1zID0g W1tnZXREREFjdGlvbnNNYW5hZ2VyQ2xhc3MoKSBzaGFyZWRNYW5hZ2VyXSBtZW51SXRlbXNGb3JS ZXN1bHQ6W19jdXJyZW50QWN0aW9uQ29udGV4dCBtYWluUmVzdWx0XSBhY3Rpb25Db250ZXh0Ol9j dXJyZW50QWN0aW9uQ29udGV4dC5nZXQoKV07CisgICAgaWYgKG1lbnVJdGVtcy5jb3VudCAhPSAx KQorICAgICAgICByZXR1cm4gbmlsOworCisgICAgaWYgKF9jdXJyZW50RGV0ZWN0ZWREYXRhVGV4 dEluZGljYXRvcikKKyAgICAgICAgX2N1cnJlbnREZXRlY3RlZERhdGFUZXh0SW5kaWNhdG9yLT5z ZXRQcmVzZW50YXRpb25UcmFuc2l0aW9uKFRleHRJbmRpY2F0b3JQcmVzZW50YXRpb25UcmFuc2l0 aW9uOjpCb3VuY2UpOworICAgIHJldHVybiBtZW51SXRlbXMubGFzdE9iamVjdDsKK30KKworI3By YWdtYSBtYXJrIFRleHQgSW5kaWNhdG9yCisKKy0gKHZvaWQpX3Nob3dUZXh0SW5kaWNhdG9yCit7 CisgICAgaWYgKF9pc1Nob3dpbmdUZXh0SW5kaWNhdG9yKQorICAgICAgICByZXR1cm47CisKKyAg ICBpZiAoX3R5cGUgPT0gV2ViSW1tZWRpYXRlQWN0aW9uRGF0YURldGVjdGVkSXRlbSAmJiBfY3Vy cmVudERldGVjdGVkRGF0YVRleHRJbmRpY2F0b3IpIHsKKyAgICAgICAgW193ZWJWaWV3IF9zZXRU ZXh0SW5kaWNhdG9yOl9jdXJyZW50RGV0ZWN0ZWREYXRhVGV4dEluZGljYXRvci5nZXQoKSBmYWRl T3V0Ok5PIGFuaW1hdGlvbkNvbXBsZXRpb25IYW5kbGVyOl4geyB9XTsKKyAgICAgICAgX2lzU2hv d2luZ1RleHRJbmRpY2F0b3IgPSBZRVM7CisgICAgfQorfQorCistICh2b2lkKV9oaWRlVGV4dElu ZGljYXRvcgoreworICAgIGlmICghX2lzU2hvd2luZ1RleHRJbmRpY2F0b3IpCisgICAgICAgIHJl dHVybjsKKworICAgIFtfd2ViVmlldyBfY2xlYXJUZXh0SW5kaWNhdG9yXTsKKyAgICBfaXNTaG93 aW5nVGV4dEluZGljYXRvciA9IE5POworfQorCiBAZW5kCiAKICNlbmRpZiAvLyBQTEFURk9STShN QUMpICYmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTAxMDAwCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlVJRGVsZWdhdGVQcml2YXRlLmggYi9T b3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlVJRGVsZWdhdGVQcml2YXRlLmgKaW5kZXggMjM0 Y2RlNWQ2NGUyZmQxYjNlYjNhMWRhMjJlMWU3MzA0MjgyN2JiMy4uZTk0YTQ4ZWUzNzhmZDI2YTE2 ZTdmNjc5NWVjOTNjZjMzZmExN2ZhOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2Vi Vmlldy9XZWJVSURlbGVnYXRlUHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZp ZXcvV2ViVUlEZWxlZ2F0ZVByaXZhdGUuaApAQCAtMTQ2LDcgKzE0Niw4IEBAIHR5cGVkZWYgZW51 bSB7CiAKIHR5cGVkZWYgZW51bSB7CiAgICAgV2ViSW1tZWRpYXRlQWN0aW9uTm9uZSA9IDAsCi0g ICAgV2ViSW1tZWRpYXRlQWN0aW9uTGlua1ByZXZpZXcKKyAgICBXZWJJbW1lZGlhdGVBY3Rpb25M aW5rUHJldmlldywKKyAgICBXZWJJbW1lZGlhdGVBY3Rpb25EYXRhRGV0ZWN0ZWRJdGVtCiB9IFdl YkltbWVkaWF0ZUFjdGlvblR5cGU7CiAKIC8vIE1lc3NhZ2UgU291cmNlcy4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQvbWFj L1dlYlZpZXcvV2ViVmlldy5tbQppbmRleCAwYjFjNmFkNTYxMWU0NzMxYmNlYTlmZmFjYTQwMjVk ZTczNmQ0ZGY3Li45OTBlMjU4NmFjMjg0OWIzYTkwNDk1ZDRiYTYyNzY3MTlkMmU1MDllIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0KKysrIGIvU291cmNl L1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCkBAIC04ODYsMTIgKzg4NiwxMyBAQCBzdGF0 aWMgdm9pZCBXZWJLaXRJbml0aWFsaXplR2FtZXBhZFByb3ZpZGVySWZOZWNlc3NhcnkoKQogICAg IFtmcmFtZVZpZXcgcmVsZWFzZV07CiAKICNpZiBQTEFURk9STShNQUMpICYmIF9fTUFDX09TX1hf VkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTAxMDAwCi0gICAgaWYgKFtzZWxmIHJlc3BvbmRzVG9T ZWxlY3RvcjpAc2VsZWN0b3Ioc2V0QWN0aW9uTWVudTopXSkgeworICAgIC8vIEZJWE1FOiBUZW1w b3JhcmlseSBkaXNhYmxlIGFjdGlvbiBtZW51IGluc3RhbGxhdGlvbi4KKyAgICAvKmlmIChbc2Vs ZiByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKHNldEFjdGlvbk1lbnU6KV0pIHsKICAgICAg ICAgUmV0YWluUHRyPE5TTWVudT4gYWN0aW9uTWVudSA9IGFkb3B0TlMoW1tOU01lbnUgYWxsb2Nd IGluaXRdKTsKICAgICAgICAgc2VsZi5hY3Rpb25NZW51ID0gYWN0aW9uTWVudS5nZXQoKTsKICAg ICAgICAgX3ByaXZhdGUtPmFjdGlvbk1lbnVDb250cm9sbGVyID0gW1tXZWJBY3Rpb25NZW51Q29u dHJvbGxlciBhbGxvY10gaW5pdFdpdGhXZWJWaWV3OnNlbGZdOwogICAgICAgICBzZWxmLmFjdGlv bk1lbnUuYXV0b2VuYWJsZXNJdGVtcyA9IE5POwotICAgIH0KKyAgICB9Ki8KIAogICAgIGlmIChD bGFzcyBnZXN0dXJlQ2xhc3MgPSBOU0NsYXNzRnJvbVN0cmluZyhAIk5TSW1tZWRpYXRlQWN0aW9u R2VzdHVyZVJlY29nbml6ZXIiKSkgewogICAgICAgICBSZXRhaW5QdHI8TlNJbW1lZGlhdGVBY3Rp b25HZXN0dXJlUmVjb2duaXplcj4gcmVjb2duaXplciA9IGFkb3B0TlMoWyhOU0ltbWVkaWF0ZUFj dGlvbkdlc3R1cmVSZWNvZ25pemVyICopW2dlc3R1cmVDbGFzcyBhbGxvY10gaW5pdFdpdGhUYXJn ZXQ6bmlsIGFjdGlvbjpOVUxMXSk7CkBAIC04NjA1LDYgKzg2MDYsMTEgQEAgc3RhdGljIHZvaWQg Z2xpYkNvbnRleHRJdGVyYXRpb25DYWxsYmFjayhDRlJ1bkxvb3BPYnNlcnZlclJlZiwgQ0ZSdW5M b29wQWN0aXZpdHkKIHsKICAgICByZXR1cm4gX3ByaXZhdGUtPmFjdGlvbk1lbnVDb250cm9sbGVy OwogfQorCistIChXZWJJbW1lZGlhdGVBY3Rpb25Db250cm9sbGVyICopX2ltbWVkaWF0ZUFjdGlv bkNvbnRyb2xsZXIKK3sKKyAgICByZXR1cm4gX3ByaXZhdGUtPmltbWVkaWF0ZUFjdGlvbkNvbnRy b2xsZXI7Cit9CiAjZW5kaWYgLy8gX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAx MDEwMDAKIAogLSAodm9pZClfc2V0VGV4dEluZGljYXRvcjooVGV4dEluZGljYXRvciAqKXRleHRJ bmRpY2F0b3IgZmFkZU91dDooQk9PTClmYWRlT3V0IGFuaW1hdGlvbkNvbXBsZXRpb25IYW5kbGVy OihzdGQ6OmZ1bmN0aW9uPHZvaWQgKCk+KWNvbXBsZXRpb25IYW5kbGVyCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXdJbnRlcm5hbC5oIGIvU291cmNlL1dlYktp dC9tYWMvV2ViVmlldy9XZWJWaWV3SW50ZXJuYWwuaAppbmRleCBkYmQ0MjQ2MzAyMmQ4MjU1MDY4 ZGZjMWZiMDgyNGYzMTNjM2JjOTU1Li4wOTc4NzBjNGNhMGExMmM1NGRiNTQ1ZmIyNzI3NmE5OWIy MmVkODRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXdJbnRl cm5hbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlld0ludGVybmFsLmgK QEAgLTY2LDYgKzY2LDcgQEAgY2xhc3MgV2ViU2VsZWN0aW9uU2VydmljZUNvbnRyb2xsZXI7CiBA Y2xhc3MgV2ViQWN0aW9uTWVudUNvbnRyb2xsZXI7CiBAY2xhc3MgV2ViQmFzZVBsdWdpblBhY2th Z2U7CiBAY2xhc3MgV2ViRG93bmxvYWQ7CitAY2xhc3MgV2ViSW1tZWRpYXRlQWN0aW9uQ29udHJv bGxlcjsKIEBjbGFzcyBXZWJOb2RlSGlnaGxpZ2h0OwogCiAjaWZkZWYgX19jcGx1c3BsdXMKQEAg LTI2Myw2ICsyNjQsNyBAQCBPQkpDX0NMQVNTIE5TVGV4dEFsdGVybmF0aXZlczsKIC0gKHZvaWQp X3Nob3dEaWN0aW9uYXJ5TG9va3VwUG9wdXA6KGNvbnN0IERpY3Rpb25hcnlQb3B1cEluZm8mKWRp Y3Rpb25hcnlQb3B1cEluZm87CiAjaWYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+ PSAxMDEwMDAKIC0gKFdlYkFjdGlvbk1lbnVDb250cm9sbGVyICopX2FjdGlvbk1lbnVDb250cm9s bGVyOworLSAoV2ViSW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlciAqKV9pbW1lZGlhdGVBY3Rpb25D b250cm9sbGVyOwogI2VuZGlmCiAjZW5kaWYKIAo=