128752 2014-02-13 11:56:39 -0800 Add rendering progress events SPI 2014-02-13 13:09:14 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca commit-queue oldest_to_newest 980382 0 andersca 2014-02-13 11:56:39 -0800 Add rendering progress events SPI 980386 1 224092 andersca 2014-02-13 12:12:21 -0800 Created attachment 224092 Patch 980388 2 commit-queue 2014-02-13 12:15:08 -0800 Attachment 224092 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h:30: Place brace on its own line for function definitions. [whitespace/braces] [4] ERROR: Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h:40: Missing spaces around = [whitespace/operators] [4] Total errors found: 2 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 980407 3 224092 mitz 2014-02-13 13:06:44 -0800 Comment on attachment 224092 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=224092&action=review > Source/WebKit2/UIProcess/Cocoa/NavigationState.mm:372 > + [static_cast<id<WKNavigationDelegatePrivate>>(navigationDelegate.get()) _webView:m_navigationState.m_webView renderingProgressDidChange:renderingProgressEvents(layoutMilestones)]; Missing space after “id” 980408 4 andersca 2014-02-13 13:09:14 -0800 Committed r164049: <http://trac.webkit.org/changeset/164049> 224092 2014-02-13 12:12:21 -0800 2014-02-13 13:06:43 -0800 Patch bug-128752-20140213121219.patch text/plain 14153 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTY0MDM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYTIxNTRhMmFlNzk3ZjFh ZTJmODVhZWUxOWRmMjUzZTc0ZmY2MzgwNC4uZmViMTFmM2Q1MDFkZTYxODUyZDE3MGViNzMyMTJk MjM1ODdlMTc5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI2IEBACiAyMDE0LTAyLTEzICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgQWRkIHJlbmRlcmlu ZyBwcm9ncmVzcyBldmVudHMgU1BJCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMjg3NTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tOYXZpZ2F0aW9uRGVsZWdhdGVQ cml2YXRlLmg6IENvcGllZCBmcm9tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2Ev V0tXZWJWaWV3UHJpdmF0ZS5oLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJW aWV3Lm1tOgorICAgICAgICAoLVtXS1dlYlZpZXcgX29ic2VydmVkUmVuZGVyaW5nUHJvZ3Jlc3NF dmVudHNdKToKKyAgICAgICAgKGxheW91dE1pbGVzdG9uZXMpOgorICAgICAgICAoLVtXS1dlYlZp ZXcgX3NldE9ic2VydmVkUmVuZGVyaW5nUHJvZ3Jlc3NFdmVudHM6XSk6CisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdQcml2YXRlLmg6CisgICAgICAgIChOU19PUFRJT05T KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLmg6CisgICAgICAg ICogVUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5tbToKKyAgICAgICAgKFdlYktpdDo6 TmF2aWdhdGlvblN0YXRlOjpzZXROYXZpZ2F0aW9uRGVsZWdhdGUpOgorICAgICAgICAoV2ViS2l0 OjpyZW5kZXJpbmdQcm9ncmVzc0V2ZW50cyk6CisgICAgICAgIChXZWJLaXQ6Ok5hdmlnYXRpb25T dGF0ZTo6TG9hZGVyQ2xpZW50OjpkaWRMYXlvdXQpOgorICAgICAgICAqIFdlYktpdDIueGNvZGVw cm9qL3Byb2plY3QucGJ4cHJvajoKKworMjAxNC0wMi0xMyAgQW5kZXJzIENhcmxzc29uICA8YW5k ZXJzY2FAYXBwbGUuY29tPgorCiAgICAgICAgIERpc2FibGUgWFBDIGZvciBwbHVnLWlucyB0aGF0 IG5lZWQgZXhlY3V0YWJsZSBoZWFwCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMjg3NDQKICAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE1OTYyOTU4Pgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS05hdmlnYXRp b25EZWxlZ2F0ZVByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2Ev V0tOYXZpZ2F0aW9uRGVsZWdhdGVQcml2YXRlLmgKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYjY5NjY5NzVjMmU4MDgz MjlmMmUzYmY4OTQ5MDc5YWFmMjY4MDQyNQotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tOYXZpZ2F0aW9uRGVsZWdhdGVQcml2YXRlLmgKQEAg LTAsMCArMSwzOSBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxNCBBcHBsZSBJbmMuIEFsbCBy aWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2Ug YW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBw ZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBt ZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhl IGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBh bmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJp bmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGlj ZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBp biB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRl ZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURF RCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJworICogQU5EIEFO WSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlU RUQgVE8sCisgKiBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQg RklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBO TyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMKKyAqIEJFIExJQUJM RSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFS WSwgT1IKKyAqIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlU RUQgVE8sIFBST0NVUkVNRU5UIE9GCisgKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBM T1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKKyAqIElOVEVSUlVQVElP TikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVS IElOCisgKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5F R0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQorICogQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUg VVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgorICogVEhFIFBPU1NJQklM SVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKKyNpbXBvcnQgPFdlYktpdDIvV0tOYXZpZ2F0aW9u RGVsZWdhdGUuaD4KKyNpbXBvcnQgPFdlYktpdDIvV0tXZWJWaWV3UHJpdmF0ZS5oPgorCisjaWYg V0tfQVBJX0VOQUJMRUQKKworQHByb3RvY29sIFdLTmF2aWdhdGlvbkRlbGVnYXRlUHJpdmF0ZSA8 V0tOYXZpZ2F0aW9uRGVsZWdhdGU+CisKK0BvcHRpb25hbAorCistICh2b2lkKV93ZWJWaWV3OihX S1dlYlZpZXcgKil3ZWJWaWV3IHJlbmRlcmluZ1Byb2dyZXNzRGlkQ2hhbmdlOihfV0tSZW5kZXJp bmdQcm9ncmVzc0V2ZW50cylwcm9ncmVzc0V2ZW50czsKKworQGVuZAorCisjZW5kaWYKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5kZXggZGQ2 YTQ2ZjkwMjI2MDk3OGYxMjlhODBiMTE5YzEwOTVlZDBhMTE3Yi4uNmI0MTcxNTUxYTRkMTEwOTc5 NzZiMzM3NDZjYzYyOGQ4OGNkMmZkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KQEAgLTU4LDYgKzU4LDcgQEAKICAgICBzdGQ6OnVuaXF1 ZV9wdHI8V2ViS2l0OjpOYXZpZ2F0aW9uU3RhdGU+IF9uYXZpZ2F0aW9uU3RhdGU7CiAKICAgICBS ZXRhaW5QdHI8V0tSZW1vdGVPYmplY3RSZWdpc3RyeT4gX3JlbW90ZU9iamVjdFJlZ2lzdHJ5Owor ICAgIF9XS1JlbmRlcmluZ1Byb2dyZXNzRXZlbnRzIF9vYnNlcnZlZFJlbmRlcmluZ1Byb2dyZXNz RXZlbnRzOwogCiAjaWYgUExBVEZPUk0oSU9TKQogICAgIFJldGFpblB0cjxXS1Njcm9sbFZpZXc+ IF9zY3JvbGxWaWV3OwpAQCAtMzcyLDYgKzM3MywzMCBAQAogICAgIHJldHVybiBfcmVtb3RlT2Jq ZWN0UmVnaXN0cnkuZ2V0KCk7CiB9CiAKKy0gKF9XS1JlbmRlcmluZ1Byb2dyZXNzRXZlbnRzKV9v YnNlcnZlZFJlbmRlcmluZ1Byb2dyZXNzRXZlbnRzCit7CisgICAgcmV0dXJuIF9vYnNlcnZlZFJl bmRlcmluZ1Byb2dyZXNzRXZlbnRzOworfQorCitzdGF0aWMgaW5saW5lIFdlYkNvcmU6OkxheW91 dE1pbGVzdG9uZXMgbGF5b3V0TWlsZXN0b25lcyhfV0tSZW5kZXJpbmdQcm9ncmVzc0V2ZW50cyBl dmVudHMpCit7CisgICAgV2ViQ29yZTo6TGF5b3V0TWlsZXN0b25lcyBtaWxlc3RvbmVzID0gMDsK KworICAgIGlmIChldmVudHMgJiBfV0tSZW5kZXJpbmdQcm9ncmVzc0V2ZW50Rmlyc3RMYXlvdXQp CisgICAgICAgIG1pbGVzdG9uZXMgfD0gV2ViQ29yZTo6RGlkRmlyc3RMYXlvdXQ7CisKKyAgICBp ZiAoZXZlbnRzICYgV0tSZW5kZXJpbmdQcm9ncmVzc0V2ZW50Rmlyc3RQYWludFdpdGhTaWduaWZp Y2FudEFyZWEpCisgICAgICAgIG1pbGVzdG9uZXMgfD0gV2ViQ29yZTo6RGlkSGl0UmVsZXZhbnRS ZXBhaW50ZWRPYmplY3RzQXJlYVRocmVzaG9sZDsKKworICAgIHJldHVybiBtaWxlc3RvbmVzOwor fQorCistICh2b2lkKV9zZXRPYnNlcnZlZFJlbmRlcmluZ1Byb2dyZXNzRXZlbnRzOihfV0tSZW5k ZXJpbmdQcm9ncmVzc0V2ZW50cylvYnNlcnZlZFJlbmRlcmluZ1Byb2dyZXNzRXZlbnRzCit7Cisg ICAgX29ic2VydmVkUmVuZGVyaW5nUHJvZ3Jlc3NFdmVudHMgPSBvYnNlcnZlZFJlbmRlcmluZ1By b2dyZXNzRXZlbnRzOworICAgIF9wYWdlLT5saXN0ZW5Gb3JMYXlvdXRNaWxlc3RvbmVzKGxheW91 dE1pbGVzdG9uZXMob2JzZXJ2ZWRSZW5kZXJpbmdQcm9ncmVzc0V2ZW50cykpOworfQorCiAjcHJh Z21hIG1hcmsgaU9TLXNwZWNpZmljIG1ldGhvZHMKIAogI2lmIFBMQVRGT1JNKElPUykKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0 ZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdQcml2YXRl LmgKaW5kZXggODI3OGExMGUwODc3YmQ4ZTUyNjE1MDY4MjhlZWI4ZTczZGI4OWQ1ZS4uZDM3OTFk MDNjYzVjZjViM2VjMjJmMGI2ZmU1MTBlNTMyYTcxY2MzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdQcml2YXRlLmgKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdQcml2YXRlLmgKQEAgLTI3LDEx ICsyNywxNyBAQAogCiAjaWYgV0tfQVBJX0VOQUJMRUQKIAordHlwZWRlZiBOU19PUFRJT05TKE5T VUludGVnZXIsIF9XS1JlbmRlcmluZ1Byb2dyZXNzRXZlbnRzKSB7CisgICAgX1dLUmVuZGVyaW5n UHJvZ3Jlc3NFdmVudEZpcnN0TGF5b3V0ID0gMSA8PCAwLAorICAgIF9XS1JlbmRlcmluZ1Byb2dy ZXNzRXZlbnRGaXJzdFBhaW50V2l0aFNpZ25pZmljYW50QXJlYSA9IDEgPDwgMiwKK307CisKIEBj bGFzcyBXS1JlbW90ZU9iamVjdFJlZ2lzdHJ5OwogCiBAaW50ZXJmYWNlIFdLV2ViVmlldyAoV0tQ cml2YXRlKQogCiBAcHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHkpIFdLUmVtb3RlT2JqZWN0 UmVnaXN0cnkgKl9yZW1vdGVPYmplY3RSZWdpc3RyeTsKK0Bwcm9wZXJ0eSAobm9uYXRvbWljLCBz ZXR0ZXI9X3NldE9ic2VydmVkUmVuZGVyaW5nUHJvZ3Jlc3NFdmVudHM6KSBfV0tSZW5kZXJpbmdQ cm9ncmVzc0V2ZW50cyBfb2JzZXJ2ZWRSZW5kZXJpbmdQcm9ncmVzc0V2ZW50czsKIAogI2lmIFRB UkdFVF9PU19JUEhPTkUKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCBzZXR0ZXI9X3NldE1pbmltdW1M YXlvdXRTaXplT3ZlcnJpZGU6KSBDR1NpemUgX21pbmltdW1MYXlvdXRTaXplT3ZlcnJpZGU7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRl LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLmgKaW5k ZXggNTExYjYzNmEzYmZkOTY0NGE3Yjc3ODhjZTYxZGIyOTAyODU4YTJmZi4uNTBlNjU0Yjg2YWUz YWI1NWM2NTE0ZjY3M2U3ZDM3ZWFhOThjMDc0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUuaApAQCAtODIsNyArODIsOCBAQCBwcml2YXRl OgogICAgICAgICB2aXJ0dWFsIHZvaWQgZGlkRmFpbFByb3Zpc2lvbmFsTG9hZFdpdGhFcnJvckZv ckZyYW1lKFdlYlBhZ2VQcm94eSosIFdlYkZyYW1lUHJveHkqLCB1aW50NjRfdCBuYXZpZ2F0aW9u SUQsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlRXJyb3ImLCBBUEk6Ok9iamVjdCopIG92ZXJyaWRl OwogICAgICAgICB2aXJ0dWFsIHZvaWQgZGlkQ29tbWl0TG9hZEZvckZyYW1lKFdlYlBhZ2VQcm94 eSosIFdlYkZyYW1lUHJveHkqLCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIEFQSTo6T2JqZWN0Kikg b3ZlcnJpZGU7CiAgICAgICAgIHZpcnR1YWwgdm9pZCBkaWRGaW5pc2hMb2FkRm9yRnJhbWUoV2Vi UGFnZVByb3h5KiwgV2ViRnJhbWVQcm94eSosIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgQVBJOjpP YmplY3QqKSBvdmVycmlkZTsKLSAgICAgICAgdmlydHVhbCB2b2lkIGRpZEZhaWxMb2FkV2l0aEVy cm9yRm9yRnJhbWUoV2ViUGFnZVByb3h5KiwgV2ViRnJhbWVQcm94eSosIHVpbnQ2NF90IG5hdmln YXRpb25JRCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciYsIEFQSTo6T2JqZWN0KiB1c2Vy RGF0YSkgb3ZlcnJpZGU7CisgICAgICAgIHZpcnR1YWwgdm9pZCBkaWRGYWlsTG9hZFdpdGhFcnJv ckZvckZyYW1lKFdlYlBhZ2VQcm94eSosIFdlYkZyYW1lUHJveHkqLCB1aW50NjRfdCBuYXZpZ2F0 aW9uSUQsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlRXJyb3ImLCBBUEk6Ok9iamVjdCopIG92ZXJy aWRlOworICAgICAgICB2aXJ0dWFsIHZvaWQgZGlkTGF5b3V0KFdlYktpdDo6V2ViUGFnZVByb3h5 KiwgV2ViQ29yZTo6TGF5b3V0TWlsZXN0b25lcywgQVBJOjpPYmplY3QqKSBvdmVycmlkZTsKIAog ICAgICAgICBOYXZpZ2F0aW9uU3RhdGUmIG1fbmF2aWdhdGlvblN0YXRlOwogICAgIH07CkBAIC0x MTIsNiArMTEzLDggQEAgcHJpdmF0ZToKICAgICAgICAgYm9vbCB3ZWJWaWV3RGlkQ29tbWl0TmF2 aWdhdGlvbiA6IDE7CiAgICAgICAgIGJvb2wgd2ViVmlld0RpZEZpbmlzaExvYWRpbmdOYXZpZ2F0 aW9uIDogMTsKICAgICAgICAgYm9vbCB3ZWJWaWV3RGlkRmFpbE5hdmlnYXRpb25XaXRoRXJyb3Ig OiAxOworCisgICAgICAgIGJvb2wgd2ViVmlld1JlbmRlcmluZ1Byb2dyZXNzRGlkQ2hhbmdlIDog MTsKICAgICB9IG1fbmF2aWdhdGlvbkRlbGVnYXRlTWV0aG9kczsKIAogICAgIEhhc2hNYXA8dWlu dDY0X3QsIFJldGFpblB0cjxXS05hdmlnYXRpb24+PiBtX25hdmlnYXRpb25zOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5tbSBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUubW0KaW5kZXggMDYy Mzc5MjZkMDc5NTYzOTA5ZTRkMTQ4ZTlkNWY5NjZjNjY5OWFiYS4uZjAzYTBiOTU2ZDNhZDBjMGVi MjkyYzhlMzBmZDVhN2M3ZmEwOWIyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLm1tCkBAIC0zMiw3ICszMiw3IEBACiAjaW1wb3J0ICJQ YWdlTG9hZFN0YXRlLmgiCiAjaW1wb3J0ICJXS0ZyYW1lSW5mb0ludGVybmFsLmgiCiAjaW1wb3J0 ICJXS05hdmlnYXRpb25BY3Rpb25JbnRlcm5hbC5oIgotI2ltcG9ydCAiV0tOYXZpZ2F0aW9uRGVs ZWdhdGUuaCIKKyNpbXBvcnQgIldLTmF2aWdhdGlvbkRlbGVnYXRlUHJpdmF0ZS5oIgogI2ltcG9y dCAiV0tOYXZpZ2F0aW9uSW50ZXJuYWwuaCIKICNpbXBvcnQgIldLTmF2aWdhdGlvblJlc3BvbnNl SW50ZXJuYWwuaCIKICNpbXBvcnQgIldLV2ViVmlld0ludGVybmFsLmgiCkBAIC04Myw2ICs4Myw4 IEBAIHZvaWQgTmF2aWdhdGlvblN0YXRlOjpzZXROYXZpZ2F0aW9uRGVsZWdhdGUoaWQgPFdLTmF2 aWdhdGlvbkRlbGVnYXRlPiBkZWxlZ2F0ZSkKICAgICBtX25hdmlnYXRpb25EZWxlZ2F0ZU1ldGhv ZHMud2ViVmlld0RpZENvbW1pdE5hdmlnYXRpb24gPSBbZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVj dG9yOkBzZWxlY3Rvcih3ZWJWaWV3OmRpZENvbW1pdE5hdmlnYXRpb246KV07CiAgICAgbV9uYXZp Z2F0aW9uRGVsZWdhdGVNZXRob2RzLndlYlZpZXdEaWRGaW5pc2hMb2FkaW5nTmF2aWdhdGlvbiA9 IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKHdlYlZpZXc6ZGlkRmluaXNo TG9hZGluZ05hdmlnYXRpb246KV07CiAgICAgbV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndl YlZpZXdEaWRGYWlsTmF2aWdhdGlvbldpdGhFcnJvciA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2Vs ZWN0b3I6QHNlbGVjdG9yKHdlYlZpZXc6ZGlkRmFpbE5hdmlnYXRpb246d2l0aEVycm9yOildOwor CisgICAgbV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndlYlZpZXdSZW5kZXJpbmdQcm9ncmVz c0RpZENoYW5nZSA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF93ZWJW aWV3OnJlbmRlcmluZ1Byb2dyZXNzRGlkQ2hhbmdlOildOwogfQogCiBSZXRhaW5QdHI8V0tOYXZp Z2F0aW9uPiBOYXZpZ2F0aW9uU3RhdGU6OmNyZWF0ZUxvYWRSZXF1ZXN0TmF2aWdhdGlvbih1aW50 NjRfdCBuYXZpZ2F0aW9uSUQsIE5TVVJMUmVxdWVzdCAqcmVxdWVzdCkKQEAgLTM0NSw2ICszNDcs MzEgQEAgdm9pZCBOYXZpZ2F0aW9uU3RhdGU6OkxvYWRlckNsaWVudDo6ZGlkRmFpbExvYWRXaXRo RXJyb3JGb3JGcmFtZShXZWJQYWdlUHJveHkqLAogICAgIFtuYXZpZ2F0aW9uRGVsZWdhdGUgd2Vi VmlldzptX25hdmlnYXRpb25TdGF0ZS5tX3dlYlZpZXcgZGlkRmFpbE5hdmlnYXRpb246bmF2aWdh dGlvbiB3aXRoRXJyb3I6ZXJyb3JdOwogfQogCitzdGF0aWMgX1dLUmVuZGVyaW5nUHJvZ3Jlc3NF dmVudHMgcmVuZGVyaW5nUHJvZ3Jlc3NFdmVudHMoV2ViQ29yZTo6TGF5b3V0TWlsZXN0b25lcyBt aWxlc3RvbmVzKQoreworICAgIF9XS1JlbmRlcmluZ1Byb2dyZXNzRXZlbnRzIGV2ZW50cyA9IDA7 CisKKyAgICBpZiAobWlsZXN0b25lcyAmIFdlYkNvcmU6OkRpZEZpcnN0TGF5b3V0KQorICAgICAg ICBldmVudHMgfD0gX1dLUmVuZGVyaW5nUHJvZ3Jlc3NFdmVudEZpcnN0TGF5b3V0OworCisgICAg aWYgKG1pbGVzdG9uZXMgJiBXZWJDb3JlOjpEaWRIaXRSZWxldmFudFJlcGFpbnRlZE9iamVjdHNB cmVhVGhyZXNob2xkKQorICAgICAgICBldmVudHMgfD0gX1dLUmVuZGVyaW5nUHJvZ3Jlc3NFdmVu dEZpcnN0UGFpbnRXaXRoU2lnbmlmaWNhbnRBcmVhOworCisgICAgcmV0dXJuIGV2ZW50czsKK30K Kwordm9pZCBOYXZpZ2F0aW9uU3RhdGU6OkxvYWRlckNsaWVudDo6ZGlkTGF5b3V0KFdlYktpdDo6 V2ViUGFnZVByb3h5KiwgV2ViQ29yZTo6TGF5b3V0TWlsZXN0b25lcyBsYXlvdXRNaWxlc3RvbmVz LCBBUEk6Ok9iamVjdCopCit7CisgICAgaWYgKCFtX25hdmlnYXRpb25TdGF0ZS5tX25hdmlnYXRp b25EZWxlZ2F0ZU1ldGhvZHMud2ViVmlld1JlbmRlcmluZ1Byb2dyZXNzRGlkQ2hhbmdlKQorICAg ICAgICByZXR1cm47CisKKyAgICBhdXRvIG5hdmlnYXRpb25EZWxlZ2F0ZSA9IG1fbmF2aWdhdGlv blN0YXRlLm1fbmF2aWdhdGlvbkRlbGVnYXRlLmdldCgpOworICAgIGlmICghbmF2aWdhdGlvbkRl bGVnYXRlKQorICAgICAgICByZXR1cm47CisKKyAgICBbc3RhdGljX2Nhc3Q8aWQ8V0tOYXZpZ2F0 aW9uRGVsZWdhdGVQcml2YXRlPj4obmF2aWdhdGlvbkRlbGVnYXRlLmdldCgpKSBfd2ViVmlldzpt X25hdmlnYXRpb25TdGF0ZS5tX3dlYlZpZXcgcmVuZGVyaW5nUHJvZ3Jlc3NEaWRDaGFuZ2U6cmVu ZGVyaW5nUHJvZ3Jlc3NFdmVudHMobGF5b3V0TWlsZXN0b25lcyldOworfQorCiB2b2lkIE5hdmln YXRpb25TdGF0ZTo6d2lsbENoYW5nZUlzTG9hZGluZygpCiB7CiAgICAgW21fd2ViVmlldyB3aWxs Q2hhbmdlVmFsdWVGb3JLZXk6QCJsb2FkaW5nIl07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9XZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9Tb3VyY2UvV2ViS2l0Mi9XZWJL aXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKaW5kZXggYzUwZWE2OTI5Y2U2ZDQ2MDhmN2M3 NmRiMDdiZWMwNmUyZTc0YWQ4MC4uNmI5OWE1ZGZiN2YxYzE3NzM3NjNhOTUzZTk0ZDYwZjczNjg5 OGQ1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViS2l0Mi54Y29kZXByb2ovcHJvamVj dC5wYnhwcm9qCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYktpdDIueGNvZGVwcm9qL3Byb2plY3Qu cGJ4cHJvagpAQCAtMjQzLDYgKzI0Myw3IEBACiAJCTFBOUUzMjlGMTgyMkZFREQwMEY1RDA0QyAv KiBXS1JlbW90ZU9iamVjdENvZGVyLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZp bGU7IGZpbGVSZWYgPSAxQTlFMzI5RDE4MjJGRUREMDBGNUQwNEMgLyogV0tSZW1vdGVPYmplY3RD b2Rlci5oICovOyB9OwogCQkxQTlFMzJBMTE4MjMwMTg5MDBGNUQwNEMgLyogV0tSZW1vdGVPYmpl Y3RSZWdpc3RyeUludGVybmFsLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7 IGZpbGVSZWYgPSAxQTlFMzJBMDE4MjMwMTg5MDBGNUQwNEMgLyogV0tSZW1vdGVPYmplY3RSZWdp c3RyeUludGVybmFsLmggKi87IH07CiAJCTFBOUZCQThEMTNGRjA0RTYwMERFRUQ2NyAvKiBQbHVn aW5Db21wbGV4VGV4dElucHV0U3RhdGUuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxk RmlsZTsgZmlsZVJlZiA9IDFBOUZCQThDMTNGRjA0RTYwMERFRUQ2NyAvKiBQbHVnaW5Db21wbGV4 VGV4dElucHV0U3RhdGUuaCAqLzsgfTsKKwkJMUFBMjBENTExOEFENTBFMDAwNUQxRUQ0IC8qIFdL TmF2aWdhdGlvbkRlbGVnYXRlUHJpdmF0ZS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVp bGRGaWxlOyBmaWxlUmVmID0gMUFBMjBENTAxOEFENTBFMDAwNUQxRUQ0IC8qIFdLTmF2aWdhdGlv bkRlbGVnYXRlUHJpdmF0ZS5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUs ICk7IH07IH07CiAJCTFBQTJFNTFEMTJFNEMwNUUwMEJDNDk2NiAvKiBDR1V0aWxpdGllcy5oIGlu IEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUFBMkU1MUIxMkU0 QzA1RTAwQkM0OTY2IC8qIENHVXRpbGl0aWVzLmggKi87IH07CiAJCTFBQTJFNTFFMTJFNEMwNUUw MEJDNDk2NiAvKiBDR1V0aWxpdGllcy5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWls ZEZpbGU7IGZpbGVSZWYgPSAxQUEyRTUxQzEyRTRDMDVFMDBCQzQ5NjYgLyogQ0dVdGlsaXRpZXMu Y3BwICovOyB9OwogCQkxQUEzRDc1QjE2NTFCNDRGMDA4NzEzRDAgLyogUmVtb3RlTGF5ZXJUcmVl SG9zdC5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFB QTNENzU5MTY1MUI0NEYwMDg3MTNEMCAvKiBSZW1vdGVMYXllclRyZWVIb3N0Lm1tICovOyB9OwpA QCAtMTkyMCw2ICsxOTIxLDcgQEAKIAkJMUFBMUM3REUxMDBFODQ2RTAwNzhERUJDIC8qIEphdmFT Y3JpcHRDb3JlLmZyYW1ld29yayAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25v d25GaWxlVHlwZSA9IHdyYXBwZXIuZnJhbWV3b3JrOyBwYXRoID0gSmF2YVNjcmlwdENvcmUuZnJh bWV3b3JrOyBzb3VyY2VUcmVlID0gQlVJTFRfUFJPRFVDVFNfRElSOyB9OwogCQkxQUExQ0M1QzEw MEZBMUExMDA3OERFQkMgLyogUXVhcnR6Q29yZS5mcmFtZXdvcmsgKi8gPSB7aXNhID0gUEJYRmls ZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5cGUgPSB3cmFwcGVyLmZyYW1ld29yazsgbmFtZSA9 IFF1YXJ0ekNvcmUuZnJhbWV3b3JrOyBwYXRoID0gL1N5c3RlbS9MaWJyYXJ5L0ZyYW1ld29ya3Mv UXVhcnR6Q29yZS5mcmFtZXdvcms7IHNvdXJjZVRyZWUgPSAiPGFic29sdXRlPiI7IH07CiAJCTFB QTFDRDA2MTAwRkExQkEwMDc4REVCQyAvKiBDYXJib24uZnJhbWV3b3JrICovID0ge2lzYSA9IFBC WEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93bkZpbGVUeXBlID0gd3JhcHBlci5mcmFtZXdvcms7IG5h bWUgPSBDYXJib24uZnJhbWV3b3JrOyBwYXRoID0gL1N5c3RlbS9MaWJyYXJ5L0ZyYW1ld29ya3Mv Q2FyYm9uLmZyYW1ld29yazsgc291cmNlVHJlZSA9ICI8YWJzb2x1dGU+IjsgfTsKKwkJMUFBMjBE NTAxOEFENTBFMDAwNUQxRUQ0IC8qIFdLTmF2aWdhdGlvbkRlbGVnYXRlUHJpdmF0ZS5oICovID0g e2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVU eXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBXS05hdmlnYXRpb25EZWxlZ2F0ZVByaXZhdGUu aDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUFBMkU1MUIxMkU0QzA1RTAwQkM0OTY2 IC8qIENHVXRpbGl0aWVzLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29k aW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IENHVXRp bGl0aWVzLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFBQTJFNTFDMTJFNEMwNUUw MEJDNDk2NiAvKiBDR1V0aWxpdGllcy5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsg ZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7 IHBhdGggPSBDR1V0aWxpdGllcy5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFB QTNENzU5MTY1MUI0NEYwMDg3MTNEMCAvKiBSZW1vdGVMYXllclRyZWVIb3N0Lm1tICovID0ge2lz YSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBl ID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBwYXRoID0gUmVtb3RlTGF5ZXJUcmVlSG9zdC5tbTsg c291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAgLTQzNzMsNiArNDM3NSw3IEBACiAJCQkJMUEy NTZFMzUxOEExQTc4ODAwNkZCOTIyIC8qIFdLTmF2aWdhdGlvbkFjdGlvbi5tbSAqLywKIAkJCQkx QTI1NkUzOTE4QTFBN0RGMDA2RkI5MjIgLyogV0tOYXZpZ2F0aW9uQWN0aW9uSW50ZXJuYWwuaCAq LywKIAkJCQkxQUJDM0RGQjE4OTlGNTFDMDA0RjA2MjYgLyogV0tOYXZpZ2F0aW9uRGVsZWdhdGUu aCAqLywKKwkJCQkxQUEyMEQ1MDE4QUQ1MEUwMDA1RDFFRDQgLyogV0tOYXZpZ2F0aW9uRGVsZWdh dGVQcml2YXRlLmggKi8sCiAJCQkJMUFCQzNERjAxODk5QzZCNjAwNEYwNjI2IC8qIFdLTmF2aWdh dGlvbkludGVybmFsLmggKi8sCiAJCQkJMUExQjBFQjQxOEE0MjQ5NTAwMzg0ODFBIC8qIFdLTmF2 aWdhdGlvblJlc3BvbnNlLmggKi8sCiAJCQkJMUExQjBFQjMxOEE0MjQ5NTAwMzg0ODFBIC8qIFdL TmF2aWdhdGlvblJlc3BvbnNlLm1tICovLApAQCAtNjUxMSw2ICs2NTE0LDcgQEAKIAkJCQlFMThF NjkxODE2OUI2NjdCMDA5QjY2NzAgLyogU2VjSXRlbVNoaW1Qcm94eU1lc3NhZ2VzLmggaW4gSGVh ZGVycyAqLywKIAkJCQkzMzE1Mjk3NjEzMEQwQ0IyMDBFRDI0ODMgLyogU2VjdXJpdHlPcmlnaW5E YXRhLmggaW4gSGVhZGVycyAqLywKIAkJCQk1MThEMkNDQjEyRDUxREZCMDAzQkI5M0IgLyogU2Vz c2lvblN0YXRlLmggaW4gSGVhZGVycyAqLywKKwkJCQkxQUEyMEQ1MTE4QUQ1MEUwMDA1RDFFRDQg LyogV0tOYXZpZ2F0aW9uRGVsZWdhdGVQcml2YXRlLmggaW4gSGVhZGVycyAqLywKIAkJCQkxQTY0 MjBFNTEyRENFMkZGMDBDQUFFMkMgLyogU2hhcmVhYmxlQml0bWFwLmggaW4gSGVhZGVycyAqLywK IAkJCQk1MTIxNzQ2MTE2NEMyMEUzMDAzN0E1QzEgLyogU2hhcmVhYmxlUmVzb3VyY2UuaCBpbiBI ZWFkZXJzICovLAogCQkJCTFBMjRCRUQ1MTIwODk0RDEwMEZCQjA1OSAvKiBTaGFyZWRNZW1vcnku aCBpbiBIZWFkZXJzICovLAo=