128130 2014-02-03 14:59:36 -0800 NavigationState should be a PageLoadState::Observer 2014-02-03 15:36:20 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 976040 0 andersca 2014-02-03 14:59:36 -0800 NavigationState should be a PageLoadState::Observer 976042 1 223027 andersca 2014-02-03 15:03:21 -0800 Created attachment 223027 Patch 976053 2 223027 darin 2014-02-03 15:22:26 -0800 Comment on attachment 223027 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=223027&action=review > Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h:38 > +#if PLATFORM(IOS) > +#import "WKContentViewInternal.h" > +#import <UIKit/UIScrollView_Private.h> > +#import <UIKit/_UIWebViewportHandler.h> > + > +#define WK_WEB_VIEW_PROTOCOLS <UIScrollViewDelegate, WKContentViewDelegate, _UIWebViewportHandlerDelegate> > +#endif The paragraphing here is hard to read. I’d almost prefer two separate if statements. > Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h:42 > +#if PLATFORM(MAC) && !PLATFORM(IOS) > +#define WK_WEB_VIEW_PROTOCOLS > +#endif Maybe just: #if !defined(WK_WEB_VIEW_PROTOCOLS) #define WK_WEB_VIEW_PROTOCOLS #endif > Source/WebKit2/UIProcess/Cocoa/NavigationState.h:92 > + // PageLoadState::Observer > + virtual void willChangeIsLoading() override; > + virtual void didChangeIsLoading() override; Without a blank line, this comment seems to be grouped with only these first two overrides, so I suggest different formatting. > Source/WebKit2/UIProcess/Cocoa/NavigationState.mm:340 > + printf("%s!\n", __PRETTY_FUNCTION__); Do we really want to land this? > Source/WebKit2/UIProcess/Cocoa/NavigationState.mm:345 > + printf("%s!\n", __PRETTY_FUNCTION__); Do we really want to land this? 976057 3 andersca 2014-02-03 15:28:35 -0800 Committed r163332: <http://trac.webkit.org/changeset/163332> 976064 4 223027 mitz 2014-02-03 15:36:20 -0800 Comment on attachment 223027 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=223027&action=review > Source/WebKit2/UIProcess/Cocoa/NavigationState.mm:34 > +#import "PageLoadState.h" P < W > Source/WebKit2/UIProcess/Cocoa/NavigationState.mm:340 > + printf("%s!\n", __PRETTY_FUNCTION__); No! > Source/WebKit2/UIProcess/Cocoa/NavigationState.mm:345 > + printf("%s!\n", __PRETTY_FUNCTION__); No! 223027 2014-02-03 15:03:21 -0800 2014-02-03 15:36:20 -0800 Patch bug-128130-20140203150320.patch text/plain 13531 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTYzMzI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOGY5Njg2ZmU5ODFiMzZj MzJiNGNiMmIxYWFjZGE4YmM3NWRiMzk3MS4uMTM2NmI3NDgwN2U0OWRlMjgzZjdlZTU4Y2M3MTBj OGY3NWQzZjQ1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE0LTAyLTAzICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgTmF2aWdhdGlvblN0 YXRlIHNob3VsZCBiZSBhIFBhZ2VMb2FkU3RhdGU6Ok9ic2VydmVyCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjgxMzAKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHdpbGwgbWFrZSBpdCBlYXNpZXIg dG8gcHJvdmlkZSBsb2FkIHJlbGF0ZWQgS1ZPIHByb3BlcnRpZXMgb24gV0tXZWJWaWV3LgorCisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW06CisgICAgICAgICgtW1dL V2ViVmlldyBpbml0V2l0aEZyYW1lOmNvbmZpZ3VyYXRpb246XSk6CisgICAgICAgICogVUlQcm9j ZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdJbnRlcm5hbC5oOiBBZGRlZC4KKyAgICAgICAgKiBVSVBy b2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLmg6CisgICAgICAgICogVUlQcm9jZXNzL0NvY29h L05hdmlnYXRpb25TdGF0ZS5tbToKKyAgICAgICAgKFdlYktpdDo6TmF2aWdhdGlvblN0YXRlOjpO YXZpZ2F0aW9uU3RhdGUpOgorICAgICAgICAoV2ViS2l0OjpOYXZpZ2F0aW9uU3RhdGU6On5OYXZp Z2F0aW9uU3RhdGUpOgorICAgICAgICAoV2ViS2l0OjpOYXZpZ2F0aW9uU3RhdGU6OndpbGxDaGFu Z2VJc0xvYWRpbmcpOgorICAgICAgICAoV2ViS2l0OjpOYXZpZ2F0aW9uU3RhdGU6OmRpZENoYW5n ZUlzTG9hZGluZyk6CisgICAgICAgIChXZWJLaXQ6Ok5hdmlnYXRpb25TdGF0ZTo6d2lsbENoYW5n ZVRpdGxlKToKKyAgICAgICAgKFdlYktpdDo6TmF2aWdhdGlvblN0YXRlOjpkaWRDaGFuZ2VUaXRs ZSk6CisgICAgICAgIChXZWJLaXQ6Ok5hdmlnYXRpb25TdGF0ZTo6d2lsbENoYW5nZUFjdGl2ZVVS TCk6CisgICAgICAgIChXZWJLaXQ6Ok5hdmlnYXRpb25TdGF0ZTo6ZGlkQ2hhbmdlQWN0aXZlVVJM KToKKyAgICAgICAgKFdlYktpdDo6TmF2aWdhdGlvblN0YXRlOjp3aWxsQ2hhbmdlSGFzT25seVNl Y3VyZUNvbnRlbnQpOgorICAgICAgICAoV2ViS2l0OjpOYXZpZ2F0aW9uU3RhdGU6OmRpZENoYW5n ZUhhc09ubHlTZWN1cmVDb250ZW50KToKKyAgICAgICAgKFdlYktpdDo6TmF2aWdhdGlvblN0YXRl Ojp3aWxsQ2hhbmdlRXN0aW1hdGVkUHJvZ3Jlc3MpOgorICAgICAgICAoV2ViS2l0OjpOYXZpZ2F0 aW9uU3RhdGU6OmRpZENoYW5nZUVzdGltYXRlZFByb2dyZXNzKToKKyAgICAgICAgKiBXZWJLaXQy Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisKIDIwMTQtMDItMDMgIFRpbSBIb3J0b24gIDx0 aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgV2ViS2l0MiBWaWV3IEdlc3R1cmVz OiBUd28gc21hcnQgbWFnbmlmaWNhdGlvbnMgaW4gYSByb3cgd2l0aG91dCBtb3ZpbmcgdGhlIG1v dXNlIHNob3VsZCB6b29tIG91dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9Db2NvYS9XS1dlYlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0Nv Y29hL1dLV2ViVmlldy5tbQppbmRleCA4MTNiOTNiMDRhOTFlNzcyNDM3NDJmN2Y0MjEyY2ZhMTQx NTZjZGI4Li4xYzhjNTE0OWYwNzE1NzgzODJkYTA5MjFhMmFmNmNkMGJhNTkzMmI3IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQpAQCAtMjQs NyArMjQsNyBAQAogICovCiAKICNpbXBvcnQgImNvbmZpZy5oIgotI2ltcG9ydCAiV0tXZWJWaWV3 LmgiCisjaW1wb3J0ICJXS1dlYlZpZXdJbnRlcm5hbC5oIgogCiAjaWYgV0tfQVBJX0VOQUJMRUQK IApAQCAtMzcsMTggKzM3LDEzIEBACiAjaW1wb3J0IDx3dGYvUmV0YWluUHRyLmg+CiAKICNpZiBQ TEFURk9STShJT1MpCi0jaW1wb3J0ICJXS0NvbnRlbnRWaWV3SW50ZXJuYWwuaCIKICNpbXBvcnQg IldLU2Nyb2xsVmlldy5oIgotI2ltcG9ydCA8VUlLaXQvVUlTY3JvbGxWaWV3X1ByaXZhdGUuaD4K LSNpbXBvcnQgPFVJS2l0L19VSVdlYlZpZXdwb3J0SGFuZGxlci5oPgogCiBzdGF0aWMgY29uc3Qg ZmxvYXQgbWluV2ViVmlld1NjYWxlID0gMC4yNTsKIHN0YXRpYyBjb25zdCBmbG9hdCBtYXhXZWJW aWV3U2NhbGUgPSA1Owogc3RhdGljIF9VSVdlYlZpZXdwb3J0Q29uZmlndXJhdGlvbiBzdGFuZGFy ZFZpZXdwb3J0Q29uZmlndXJhdGlvbiA9IHsgeyBVSVdlYlZpZXdwb3J0U3RhbmRhcmRWaWV3cG9y dFdpZHRoLCBVSVdlYlZpZXdwb3J0R3Jvd3NBbmRTaHJpbmtzVG9GaXRIZWlnaHQgfSwgVUlXZWJW aWV3cG9ydFNjYWxlRm9yU2NhbGVzVG9GaXQsIG1pbldlYlZpZXdTY2FsZSwgbWF4V2ViVmlld1Nj YWxlLCB0cnVlCiB9OwogCi1AaW50ZXJmYWNlIFdLV2ViVmlldyAoKSA8VUlTY3JvbGxWaWV3RGVs ZWdhdGUsIFdLQ29udGVudFZpZXdEZWxlZ2F0ZSwgX1VJV2ViVmlld3BvcnRIYW5kbGVyRGVsZWdh dGU+Ci1AZW5kCiAjZW5kaWYKIAogI2lmIFBMQVRGT1JNKE1BQykgJiYgIVBMQVRGT1JNKElPUykK QEAgLTU5LDggKzU0LDYgQEAgc3RhdGljIF9VSVdlYlZpZXdwb3J0Q29uZmlndXJhdGlvbiBzdGFu ZGFyZFZpZXdwb3J0Q29uZmlndXJhdGlvbiA9IHsgeyBVSVdlYlZpZXcKICAgICBSZXRhaW5QdHI8 V0tXZWJWaWV3Q29uZmlndXJhdGlvbj4gX2NvbmZpZ3VyYXRpb247CiAgICAgc3RkOjp1bmlxdWVf cHRyPFdlYktpdDo6TmF2aWdhdGlvblN0YXRlPiBfbmF2aWdhdGlvblN0YXRlOwogCi0gICAgUmVm UHRyPFdlYktpdDo6V2ViUGFnZVByb3h5PiBfcGFnZTsKLQogI2lmIFBMQVRGT1JNKElPUykKICAg ICBSZXRhaW5QdHI8V0tTY3JvbGxWaWV3PiBfc2Nyb2xsVmlldzsKICAgICBSZXRhaW5QdHI8V0tD b250ZW50Vmlldz4gX2NvbnRlbnRWaWV3OwpAQCAtODksOCArODIsNiBAQCBzdGF0aWMgX1VJV2Vi Vmlld3BvcnRDb25maWd1cmF0aW9uIHN0YW5kYXJkVmlld3BvcnRDb25maWd1cmF0aW9uID0geyB7 IFVJV2ViVmlldwogICAgIGlmICghW19jb25maWd1cmF0aW9uIHByb2Nlc3NDbGFzc10pCiAgICAg ICAgIFtfY29uZmlndXJhdGlvbiBzZXRQcm9jZXNzQ2xhc3M6YWRvcHROUyhbW1dLUHJvY2Vzc0Ns YXNzIGFsbG9jXSBpbml0XSkuZ2V0KCldOwogCi0gICAgX25hdmlnYXRpb25TdGF0ZSA9IHN0ZDo6 bWFrZV91bmlxdWU8V2ViS2l0OjpOYXZpZ2F0aW9uU3RhdGU+KHNlbGYpOwotCiAgICAgQ0dSZWN0 IGJvdW5kcyA9IHNlbGYuYm91bmRzOwogCiAjaWYgUExBVEZPUk0oSU9TKQpAQCAtMTE5LDYgKzEx MCw3IEBAIHN0YXRpYyBfVUlXZWJWaWV3cG9ydENvbmZpZ3VyYXRpb24gc3RhbmRhcmRWaWV3cG9y dENvbmZpZ3VyYXRpb24gPSB7IHsgVUlXZWJWaWV3CiAgICAgX3BhZ2UgPSBXZWJLaXQ6OnRvSW1w bChbX3drVmlldyBwYWdlUmVmXSk7CiAjZW5kaWYKIAorICAgIF9uYXZpZ2F0aW9uU3RhdGUgPSBz dGQ6Om1ha2VfdW5pcXVlPFdlYktpdDo6TmF2aWdhdGlvblN0YXRlPihzZWxmKTsKICAgICBfcGFn ZS0+c2V0UG9saWN5Q2xpZW50KF9uYXZpZ2F0aW9uU3RhdGUtPmNyZWF0ZVBvbGljeUNsaWVudCgp KTsKICAgICBfcGFnZS0+c2V0TG9hZGVyQ2xpZW50KF9uYXZpZ2F0aW9uU3RhdGUtPmNyZWF0ZUxv YWRlckNsaWVudCgpKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9Db2NvYS9XS1dlYlZpZXdJbnRlcm5hbC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9Db2NvYS9XS1dlYlZpZXdJbnRlcm5hbC5oCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjMyNjYzMTcwNWRlNDAxYTA0 OTI2NzM3OTk5NjI0ZDBiNGVkZWQ1NzcKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld0ludGVybmFsLmgKQEAgLTAsMCArMSw1NSBA QAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxNCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2 ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBm b3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJv dmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBS ZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHly aWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxv d2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11 c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0 IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAg IGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBk aXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJ TkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJworICogQU5EIEFOWSBFWFBSRVNTIE9S IElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBU SEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1Ig QSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFM TCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMKKyAqIEJFIExJQUJMRSBGT1IgQU5ZIERJ UkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IKKyAqIENP TlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NV UkVNRU5UIE9GCisgKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwg REFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKKyAqIElOVEVSUlVQVElPTikgSE9XRVZFUiBD QVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOCisgKiBDT05U UkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1Ig T1RIRVJXSVNFKQorICogQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMg U09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgorICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0gg REFNQUdFLgorICovCisKKyNpbXBvcnQgIldLV2ViVmlldy5oIgorCisjaWYgV0tfQVBJX0VOQUJM RUQKKworI2ltcG9ydCA8d3RmL1JlZlB0ci5oPgorCisjaWYgUExBVEZPUk0oSU9TKQorI2ltcG9y dCAiV0tDb250ZW50Vmlld0ludGVybmFsLmgiCisjaW1wb3J0IDxVSUtpdC9VSVNjcm9sbFZpZXdf UHJpdmF0ZS5oPgorI2ltcG9ydCA8VUlLaXQvX1VJV2ViVmlld3BvcnRIYW5kbGVyLmg+CisKKyNk ZWZpbmUgV0tfV0VCX1ZJRVdfUFJPVE9DT0xTIDxVSVNjcm9sbFZpZXdEZWxlZ2F0ZSwgV0tDb250 ZW50Vmlld0RlbGVnYXRlLCBfVUlXZWJWaWV3cG9ydEhhbmRsZXJEZWxlZ2F0ZT4KKyNlbmRpZgor CisjaWYgUExBVEZPUk0oTUFDKSAmJiAhUExBVEZPUk0oSU9TKQorI2RlZmluZSBXS19XRUJfVklF V19QUk9UT0NPTFMKKyNlbmRpZgorCituYW1lc3BhY2UgV2ViS2l0IHsKK2NsYXNzIFdlYlBhZ2VQ cm94eTsKK30KKworQGludGVyZmFjZSBXS1dlYlZpZXcgKCkgV0tfV0VCX1ZJRVdfUFJPVE9DT0xT IHsKKworQHBhY2thZ2UKKyAgICBSZWZQdHI8V2ViS2l0OjpXZWJQYWdlUHJveHk+IF9wYWdlOwor fQorQGVuZAorCisjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9D b2NvYS9OYXZpZ2F0aW9uU3RhdGUuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9O YXZpZ2F0aW9uU3RhdGUuaAppbmRleCAyYjQ1YzlmYTlhYjhkMTNhMmU1NTBjNzcxMjJjNjA0MTQz ZDg0YzQzLi5hZWNmNGMwNjFkNzIwZmEyZjczZTg4YjQ3NWFhZmI3MmQ4YzViY2ZhIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLmgKKysr IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5oCkBAIC0z NCw2ICszNCw3IEBACiAjaW1wb3J0IDx3dGYvUmV0YWluUHRyLmg+CiAjaW1wb3J0ICJBUElMb2Fk ZXJDbGllbnQuaCIKICNpbXBvcnQgIkFQSVBvbGljeUNsaWVudC5oIgorI2ltcG9ydCAiUGFnZUxv YWRTdGF0ZS5oIgogI2ltcG9ydCAiV2Vha09iakNQdHIuaCIKIAogQGNsYXNzIFdLTmF2aWdhdGlv bjsKQEAgLTQyLDcgKzQzLDcgQEAKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLWNsYXNzIE5hdmln YXRpb25TdGF0ZSB7CitjbGFzcyBOYXZpZ2F0aW9uU3RhdGUgOiBwcml2YXRlIFBhZ2VMb2FkU3Rh dGU6Ok9ic2VydmVyIHsKIHB1YmxpYzoKICAgICBleHBsaWNpdCBOYXZpZ2F0aW9uU3RhdGUoV0tX ZWJWaWV3ICopOwogICAgIH5OYXZpZ2F0aW9uU3RhdGUoKTsKQEAgLTg2LDYgKzg3LDI1IEBAIHBy aXZhdGU6CiAgICAgICAgIE5hdmlnYXRpb25TdGF0ZSYgbV9uYXZpZ2F0aW9uU3RhdGU7CiAgICAg fTsKIAorICAgIC8vIFBhZ2VMb2FkU3RhdGU6Ok9ic2VydmVyCisgICAgdmlydHVhbCB2b2lkIHdp bGxDaGFuZ2VJc0xvYWRpbmcoKSBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIHZvaWQgZGlkQ2hhbmdl SXNMb2FkaW5nKCkgb3ZlcnJpZGU7CisKKyAgICB2aXJ0dWFsIHZvaWQgd2lsbENoYW5nZVRpdGxl KCkgb3ZlcnJpZGU7CisgICAgdmlydHVhbCB2b2lkIGRpZENoYW5nZVRpdGxlKCkgb3ZlcnJpZGU7 CisKKyAgICB2aXJ0dWFsIHZvaWQgd2lsbENoYW5nZUFjdGl2ZVVSTCgpIG92ZXJyaWRlOworICAg IHZpcnR1YWwgdm9pZCBkaWRDaGFuZ2VBY3RpdmVVUkwoKSBvdmVycmlkZTsKKworICAgIHZpcnR1 YWwgdm9pZCB3aWxsQ2hhbmdlSGFzT25seVNlY3VyZUNvbnRlbnQoKSBvdmVycmlkZTsKKyAgICB2 aXJ0dWFsIHZvaWQgZGlkQ2hhbmdlSGFzT25seVNlY3VyZUNvbnRlbnQoKSBvdmVycmlkZTsKKwor ICAgIHZpcnR1YWwgdm9pZCB3aWxsQ2hhbmdlRXN0aW1hdGVkUHJvZ3Jlc3MoKSBvdmVycmlkZTsK KyAgICB2aXJ0dWFsIHZvaWQgZGlkQ2hhbmdlRXN0aW1hdGVkUHJvZ3Jlc3MoKSBvdmVycmlkZTsK KworICAgIFdLV2ViVmlldyAqbV93ZWJWaWV3OworICAgIFdlYWtPYmpDUHRyPGlkIDxXS05hdmln YXRpb25EZWxlZ2F0ZT4gPiBtX25hdmlnYXRpb25EZWxlZ2F0ZTsKKwogICAgIHN0cnVjdCB7CiAg ICAgICAgIGJvb2wgd2ViVmlld0RlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25EZWNpc2lv bkhhbmRsZXIgOiAxOwogICAgICAgICBib29sIHdlYlZpZXdEZWNpZGVQb2xpY3lGb3JOYXZpZ2F0 aW9uUmVzcG9uc2VEZWNpc2lvbkhhbmRsZXIgOiAxOwpAQCAtOTgsOSArMTE4LDYgQEAgcHJpdmF0 ZToKICAgICAgICAgYm9vbCB3ZWJWaWV3RGlkRmFpbE5hdmlnYXRpb25XaXRoRXJyb3IgOiAxOwog ICAgIH0gbV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzOwogCi0gICAgV0tXZWJWaWV3ICptX3dl YlZpZXc7Ci0gICAgV2Vha09iakNQdHI8aWQgPFdLTmF2aWdhdGlvbkRlbGVnYXRlPiA+IG1fbmF2 aWdhdGlvbkRlbGVnYXRlOwotCiAgICAgSGFzaE1hcDx1aW50NjRfdCwgUmV0YWluUHRyPFdLTmF2 aWdhdGlvbj4+IG1fbmF2aWdhdGlvbnM7CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLm1tIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5tbQppbmRleCBmMjk4Y2JmOGFhNDM2NTllZGY3 YjcwN2M5ODlmMGYyZWRjNDI4MmU0Li43OWNmNmViZTdkMjhlNzQzNzg0MDdmODQ1MjZlZWVmZWM2 YzY5NzY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvTmF2aWdh dGlvblN0YXRlLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0 aW9uU3RhdGUubW0KQEAgLTMwLDE3ICszMCwyNSBAQAogCiAjaW1wb3J0ICJXS05hdmlnYXRpb25E ZWxlZ2F0ZS5oIgogI2ltcG9ydCAiV0tOYXZpZ2F0aW9uSW50ZXJuYWwuaCIKKyNpbXBvcnQgIldL V2ViVmlld0ludGVybmFsLmgiCisjaW1wb3J0ICJQYWdlTG9hZFN0YXRlLmgiCiAjaW1wb3J0ICJX ZWJGcmFtZVByb3h5LmgiCisjaW1wb3J0ICJXZWJQYWdlUHJveHkuaCIKIAogbmFtZXNwYWNlIFdl YktpdCB7CiAKIE5hdmlnYXRpb25TdGF0ZTo6TmF2aWdhdGlvblN0YXRlKFdLV2ViVmlldyAqd2Vi VmlldykKLSAgICA6IG1fbmF2aWdhdGlvbkRlbGVnYXRlTWV0aG9kcygpCisgICAgOiBtX3dlYlZp ZXcod2ViVmlldykKKyAgICAsIG1fbmF2aWdhdGlvbkRlbGVnYXRlTWV0aG9kcygpCiB7CisgICAg QVNTRVJUKG1fd2ViVmlldy0+X3BhZ2UpOworCisgICAgbV93ZWJWaWV3LT5fcGFnZS0+cGFnZUxv YWRTdGF0ZSgpLmFkZE9ic2VydmVyKCp0aGlzKTsKIH0KIAogTmF2aWdhdGlvblN0YXRlOjp+TmF2 aWdhdGlvblN0YXRlKCkKIHsKKyAgICBtX3dlYlZpZXctPl9wYWdlLT5wYWdlTG9hZFN0YXRlKCku cmVtb3ZlT2JzZXJ2ZXIoKnRoaXMpOwogfQogCiBzdGQ6OnVuaXF1ZV9wdHI8QVBJOjpMb2FkZXJD bGllbnQ+IE5hdmlnYXRpb25TdGF0ZTo6Y3JlYXRlTG9hZGVyQ2xpZW50KCkKQEAgLTI5NSw2ICsz MDMsNDggQEAgdm9pZCBOYXZpZ2F0aW9uU3RhdGU6OkxvYWRlckNsaWVudDo6ZGlkRmFpbExvYWRX aXRoRXJyb3JGb3JGcmFtZShXZWJQYWdlUHJveHkqLAogICAgIFtuYXZpZ2F0aW9uRGVsZWdhdGUg d2ViVmlldzptX25hdmlnYXRpb25TdGF0ZS5tX3dlYlZpZXcgZGlkRmFpbE5hdmlnYXRpb246bmF2 aWdhdGlvbiB3aXRoRXJyb3I6ZXJyb3JdOwogfQogCit2b2lkIE5hdmlnYXRpb25TdGF0ZTo6d2ls bENoYW5nZUlzTG9hZGluZygpCit7Cit9CisKK3ZvaWQgTmF2aWdhdGlvblN0YXRlOjpkaWRDaGFu Z2VJc0xvYWRpbmcoKQoreworfQorCit2b2lkIE5hdmlnYXRpb25TdGF0ZTo6d2lsbENoYW5nZVRp dGxlKCkKK3sKK30KKwordm9pZCBOYXZpZ2F0aW9uU3RhdGU6OmRpZENoYW5nZVRpdGxlKCkKK3sK K30KKwordm9pZCBOYXZpZ2F0aW9uU3RhdGU6OndpbGxDaGFuZ2VBY3RpdmVVUkwoKQoreworfQor Cit2b2lkIE5hdmlnYXRpb25TdGF0ZTo6ZGlkQ2hhbmdlQWN0aXZlVVJMKCkKK3sKK30KKwordm9p ZCBOYXZpZ2F0aW9uU3RhdGU6OndpbGxDaGFuZ2VIYXNPbmx5U2VjdXJlQ29udGVudCgpCit7Cit9 CisKK3ZvaWQgTmF2aWdhdGlvblN0YXRlOjpkaWRDaGFuZ2VIYXNPbmx5U2VjdXJlQ29udGVudCgp Cit7Cit9CisKK3ZvaWQgTmF2aWdhdGlvblN0YXRlOjp3aWxsQ2hhbmdlRXN0aW1hdGVkUHJvZ3Jl c3MoKQoreworICAgIHByaW50ZigiJXMhXG4iLCBfX1BSRVRUWV9GVU5DVElPTl9fKTsKK30KKwor dm9pZCBOYXZpZ2F0aW9uU3RhdGU6OmRpZENoYW5nZUVzdGltYXRlZFByb2dyZXNzKCkKK3sKKyAg ICBwcmludGYoIiVzIVxuIiwgX19QUkVUVFlfRlVOQ1RJT05fXyk7Cit9CisKIH0gLy8gbmFtZXNw YWNlIFdlYktpdAogCiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYktpdDIu eGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1NvdXJjZS9XZWJLaXQyL1dlYktpdDIueGNvZGVw cm9qL3Byb2plY3QucGJ4cHJvagppbmRleCAwODg0OWEyNjY2NTE3MDgyNzRiNGI2ZTdlODg2MmNm ZDU1MjI5YjQ3Li5kYzEzY2RjNWI0ZDgwMWVmY2Q5MGNkODM0ODAwZWJkM2IwOGEwYzBkIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oK KysrIGIvU291cmNlL1dlYktpdDIvV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCkBA IC0xOTAsNiArMTkwLDcgQEAKIAkJMUE2NDIzMDkxMkREMDlFQjAwQ0FBRTJDIC8qIERyYXdpbmdB cmVhUHJveHlNZXNzYWdlcy5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBm aWxlUmVmID0gMUE2NDIzMDcxMkREMDlFQjAwQ0FBRTJDIC8qIERyYXdpbmdBcmVhUHJveHlNZXNz YWdlcy5oICovOyB9OwogCQkxQTY0MjQ1RTEyREUyOUExMDBDQUFFMkMgLyogVXBkYXRlSW5mby5o IGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUE2NDI0NUMx MkRFMjlBMTAwQ0FBRTJDIC8qIFVwZGF0ZUluZm8uaCAqLzsgfTsKIAkJMUE2NDI0NUYxMkRFMjlB MTAwQ0FBRTJDIC8qIFVwZGF0ZUluZm8uY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVp bGRGaWxlOyBmaWxlUmVmID0gMUE2NDI0NUQxMkRFMjlBMTAwQ0FBRTJDIC8qIFVwZGF0ZUluZm8u Y3BwICovOyB9OworCQkxQTY2QkY4RjE4QTA1MkVEMDAyMDcxQjQgLyogV0tXZWJWaWV3SW50ZXJu YWwuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBNjZC RjhFMThBMDUyRUQwMDIwNzFCNCAvKiBXS1dlYlZpZXdJbnRlcm5hbC5oICovOyB9OwogCQkxQTZG OUY5MDExRTEzRUZDMDBEQjEzNzEgLyogQ29tbWFuZExpbmUuaCBpbiBIZWFkZXJzICovID0ge2lz YSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBNkY5RjhFMTFFMTNFRkMwMERCMTM3MSAvKiBD b21tYW5kTGluZS5oICovOyB9OwogCQkxQTZGOUZCNzExRTE0MDg1MDBEQjEzNzEgLyogQ29tbWFu ZExpbmVNYWMuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVm ID0gMUE2RjlGQjYxMUUxNDA4NTAwREIxMzcxIC8qIENvbW1hbmRMaW5lTWFjLmNwcCAqLzsgfTsK IAkJMUE2RkI3QUUxMUU2NEI2ODAwREIxMzcxIC8qIFBsdWdpblZpZXcuY3BwIGluIFNvdXJjZXMg Ki8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUE2RkI3QUMxMUU2NEI2ODAwREIx MzcxIC8qIFBsdWdpblZpZXcuY3BwICovOyB9OwpAQCAtMTgzNyw2ICsxODM4LDcgQEAKIAkJMUE2 NDIzMDcxMkREMDlFQjAwQ0FBRTJDIC8qIERyYXdpbmdBcmVhUHJveHlNZXNzYWdlcy5oICovID0g e2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVU eXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBEcmF3aW5nQXJlYVByb3h5TWVzc2FnZXMuaDsg c291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUE2NDI0NUMxMkRFMjlBMTAwQ0FBRTJDIC8q IFVwZGF0ZUluZm8uaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rpbmcg PSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gVXBkYXRlSW5m by5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkxQTY0MjQ1RDEyREUyOUExMDBDQUFF MkMgLyogVXBkYXRlSW5mby5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVu Y29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGgg PSBVcGRhdGVJbmZvLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJMUE2NkJGOEUx OEEwNTJFRDAwMjA3MUI0IC8qIFdLV2ViVmlld0ludGVybmFsLmggKi8gPSB7aXNhID0gUEJYRmls ZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vj b2RlLmMuaDsgcGF0aCA9IFdLV2ViVmlld0ludGVybmFsLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3Vw PiI7IH07CiAJCTFBNkY5RjhFMTFFMTNFRkMwMERCMTM3MSAvKiBDb21tYW5kTGluZS5oICovID0g e2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVU eXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBDb21tYW5kTGluZS5oOyBzb3VyY2VUcmVlID0g Ijxncm91cD4iOyB9OwogCQkxQTZGOUZCNjExRTE0MDg1MDBEQjEzNzEgLyogQ29tbWFuZExpbmVN YWMuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxh c3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gQ29tbWFuZExpbmVN YWMuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkxQTZGQjdBQzExRTY0QjY4MDBE QjEzNzEgLyogUGx1Z2luVmlldy5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmls ZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBh dGggPSBQbHVnaW5WaWV3LmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAgLTQyOTUs NiArNDI5Nyw3IEBACiAJCQkJMUEzQ0MxNjQxODkwNkFDRjAwMUU2RUQ4IC8qIFdLV2ViVmlldy5t bSAqLywKIAkJCQkxQURGNTkxOTE4OTA1MjhFMDA0M0MxNDUgLyogV0tXZWJWaWV3Q29uZmlndXJh dGlvbi5oICovLAogCQkJCTFBREY1OTE4MTg5MDUyOEUwMDQzQzE0NSAvKiBXS1dlYlZpZXdDb25m aWd1cmF0aW9uLm1tICovLAorCQkJCTFBNjZCRjhFMThBMDUyRUQwMDIwNzFCNCAvKiBXS1dlYlZp ZXdJbnRlcm5hbC5oICovLAogCQkJKTsKIAkJCXBhdGggPSBDb2NvYTsKIAkJCXNvdXJjZVRyZWUg PSAiPGdyb3VwPiI7CkBAIC02NzczLDYgKzY3NzYsNyBAQAogCQkJCUJDNDA3NjA2MTI0RkYwMjcw MDY4RjIwQSAvKiBXS1N0cmluZy5oIGluIEhlYWRlcnMgKi8sCiAJCQkJN0M5RDE1MzcxODQ1ODRE QTAwOUQzOTE4IC8qIFdLQnJvd3NpbmdDb250ZXh0R3JvdXBJbnRlcm5hbC5oIGluIEhlYWRlcnMg Ki8sCiAJCQkJMzczQ0VBRDgxODU5NTUzRjAwOEMzNjNEIC8qIFdLUGFnZVBvbGljeUNsaWVudElu dGVybmFsLmggaW4gSGVhZGVycyAqLywKKwkJCQkxQTY2QkY4RjE4QTA1MkVEMDAyMDcxQjQgLyog V0tXZWJWaWV3SW50ZXJuYWwuaCBpbiBIZWFkZXJzICovLAogCQkJCUJDNDA3NjFBMTI0RkYwMzcw MDY4RjIwQSAvKiBXS1N0cmluZ0NGLmggaW4gSGVhZGVycyAqLywKIAkJCQk3NTlDQ0Q1OTE4MDhG MTY5MDA3OEU4QTggLyogV2ViT3JpZ2luRGF0YU1hbmFnZXJQcm94eUNoYW5nZUNsaWVudC5oIGlu IEhlYWRlcnMgKi8sCiAJCQkJQkM5MDk5ODAxMjU2QTk4MjAwMDgzNzU2IC8qIFdLU3RyaW5nUHJp dmF0ZS5oIGluIEhlYWRlcnMgKi8sCg==