134230 2014-06-23 18:24:49 -0700 WKWebView doesn't respect -[UIScrollView contentInset] 2023-11-08 11:10:19 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca ajuma benjamin cdumez cfondacci commit-queue fred.wang oren rhys rwlbuis simon.fraser thorton oldest_to_newest 1017793 0 andersca 2014-06-23 18:24:49 -0700 WKWebView doesn't respect -[UIScrollView contentInset] 1017796 1 233663 andersca 2014-06-23 18:30:53 -0700 Created attachment 233663 Patch 1017945 2 233663 commit-queue 2014-06-24 07:38:44 -0700 Comment on attachment 233663 Patch Clearing flags on attachment: 233663 Committed r170361: <http://trac.webkit.org/changeset/170361> 1017946 3 commit-queue 2014-06-24 07:38:46 -0700 All reviewed patches have been landed. Closing bug. 1019235 4 benjamin 2014-06-28 22:27:31 -0700 Not supporting content insets was completely intentional. In UIWebView, we have a lot of issues with the interactions between the content insets and the minimal layout size. There are basically two very different use cases that needs different kind of layout. One good example is that Safari cannot work correctly with this implementation. After discussing this a lot, we decided not to support scrolling to the insets and postpone this to a solution that handle layout correctly. 1058532 5 oren 2015-01-04 01:55:11 -0800 Hi I published question about WKWebView not clickable above it's contentInset: http://stackoverflow.com/questions/27755251/wkwebview-isnt-clickable-outside-its-contentinset Is this the same issue? 1340658 6 cfondacci 2017-08-21 11:19:11 -0700 "Not supporting content insets was completely intentional." The current behavior is very surprising though: negative insets work as expected, and positive insets make the floating element move up and down between 0 inset and the specified value. Please see a demo here: https://drive.google.com/file/d/0B63_g2Mv5n4uYkNxWjJWeGR1U1E/view?usp=sharing "we decided not to support scrolling to the insets and postpone this to a solution that handle layout correctly" But it still does something... but not the right thing. It's not that it is not supported, it is that it feels broken. Can you tell us more about "the solution that handle layout correctly" and when this will be available? We are working on a workaround which resizes the webview but it makes footer transparency and overlaying header/footer broken so it is not really satisfying. I don't understand why this bug is marked as "resolved fixed" as it seems neither resolved nor fixed. 1468575 7 simon.fraser 2018-10-12 14:27:06 -0700 Tim, what's the current status? 1515776 8 rhys 2019-03-12 17:28:19 -0700 Has there been any progress on this? As things stand it's very difficult to build a fairly standard iOS UI where a WKWebview's content 'bleeds' under toolbars and navigation bars. 1990904 9 ajuma 2023-11-08 11:10:19 -0800 (In reply to Rhys Powell from comment #8) > Has there been any progress on this? As things stand it's very difficult to > build a fairly standard iOS UI where a WKWebview's content 'bleeds' under > toolbars and navigation bars. Could this bug be revisited? The lack of a public API for this means that third-party browsers on iOS cannot implement the transparent toolbars that Safari has. The last time I checked using breakpoints, Safari is using WKWebView SPI to achieve this effect, specifically, some combination of: -[WKWebView _overrideLayoutParametersWithMinimumLayoutSize:maximumUnobscuredSizeOverride:], -[WKWebView _setObscuredInsets], and -[WKWebView _setUnobscuredSafeAreaInsets] 233663 2014-06-23 18:30:53 -0700 2014-06-24 07:38:44 -0700 Patch bug-134230-20140623183032.patch text/plain 13461 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwMzM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZWQwYjZlMTgwMWMwZWVl MmY5YTQwYmYwMTllY2U4Yzc2YWRjOWFkMC4uMWNhMGQxNzJjZTU5MzgwZThhZTIwYTgzYzJlOTUx MjUwNzYxNDk1NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDY0IEBACiAyMDE0LTA2LTIzICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgV0tXZWJWaWV3IGRv ZXNuJ3QgcmVzcGVjdCAtW1VJU2Nyb2xsVmlldyBjb250ZW50SW5zZXRdCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzQyMzAKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzE3NDI5MTA3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW06CisgICAgICAg ICgtW1dLV2ViVmlldyBfc2V0SGFzQ3VzdG9tQ29udGVudFZpZXc6bG9hZGVkTUlNRVR5cGU6V1RG OjpdKToKKyAgICAgICAgQ2FsbCBpbml0V2l0aEZyYW1lIGFuZCBwYXNzIHRoZSBXS1dlYlZpZXcg YWxvbmcuCisKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9hZGp1c3RlZENvbnRlbnRPZmZzZXQ6XSk6 CisgICAgICAgIE5ldyBoZWxwZXIgbWV0aG9kIHRoYXQgdGFrZXMgYSBjb250ZW50IG9mZnNldCBh cyBhIENHUG9pbnQgYW5kIG9mZnNldHMgaXQgYnkgdGhlIGNvbXB1dGVkIGNvbnRlbnQgaW5zZXQu CisKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9jb21wdXRlZENvbnRlbnRJbnNldF0pOgorICAgICAg ICBOZXcgaGVscGVyIG1ldGhvZCB0aGF0IHJldHVybnMgdGhlIF9vYnNjdXJlZEluc2V0cywgb3Ig aWYgaXQncyB6ZXJvLCB0aGUgc2Nyb2xsIHZpZXcncyBjb250ZW50IGluc2V0LgorCisgICAgICAg ICgtW1dLV2ViVmlldyBfcHJvY2Vzc0RpZEV4aXRdKToKKyAgICAgICAgVXNlIF9jb21wdXRlZENv bnRlbnRJbnNldC4KKworICAgICAgICAoLVtXS1dlYlZpZXcgX2RpZENvbW1pdExheWVyVHJlZTpX ZWJLaXQ6Ol0pOgorICAgICAgICB1c2UgX2NvbXB1dGVkQ29udGVudEluc2V0LgorCisgICAgICAg ICgtW1dLV2ViVmlldyBfZHluYW1pY1ZpZXdwb3J0VXBkYXRlQ2hhbmdlZFRhcmdldFRvU2NhbGU6 cG9zaXRpb246XSk6CisgICAgICAgIFVzZSBfY29tcHV0ZWRDb250ZW50SW5zZXQuCisKKyAgICAg ICAgKC1bV0tXZWJWaWV3IF9zY3JvbGxUb0NvbnRlbnRPZmZzZXQ6V2ViQ29yZTo6XSk6CisgICAg ICAgIFVzZSBfY29tcHV0ZWRDb250ZW50SW5zZXQuCisKKyAgICAgICAgKC1bV0tXZWJWaWV3IF91 cGRhdGVWaXNpYmxlQ29udGVudFJlY3RzXSk6CisgICAgICAgIElmIHdlIGhhdmUgYSBjdXN0b20g Y29udGVudCB2aWV3LCBjYWxsIHdlYl9jb21wdXRlZENvbnRlbnRJbnNldERpZENoYW5nZS4KKwor ICAgICAgICAoLVtXS1dlYlZpZXcgX3NldE9ic2N1cmVkSW5zZXRzOl0pOgorICAgICAgICBEb24n dCBjYWxsIHdlYl9zZXRPYnNjdXJlZEluc2V0czogaWYgd2UgaGF2ZSBhIGN1c3RvbSBjb250ZW50 IHZpZXcuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld0ludGVybmFs Lmg6CisgICAgICAgIEFkZCBuZXcgbWV0aG9kcy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9Db2Nv YS9XS1dlYlZpZXdDb250ZW50UHJvdmlkZXIuaDoKKyAgICAgICAgQWRkIG5ldyBtZXRob2RzLgor CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS1BERlZpZXcubW06CisgICAgICAgICgtW1dLUERG VmlldyB3ZWJfaW5pdFdpdGhGcmFtZTp3ZWJWaWV3Ol0pOgorICAgICAgICBTZXQgdGhlIF93ZWJW aWV3IGFuZCBfc2Nyb2xsVmlldyBpdmFycy4KKworICAgICAgICAoLVtXS1BERlZpZXcgX29mZnNl dEZvclBhZ2VOdW1iZXJJbmRpY2F0b3JdKToKKyAgICAgICAgR2V0IHRoZSBjb21wdXRlZCBjb250 ZW50IG9mZnNldCBmcm9tIHRoZSBXS1dlYlZpZXcuCisKKyAgICAgICAgKC1bV0tQREZWaWV3IHdl Yl9jb21wdXRlZENvbnRlbnRJbnNldERpZENoYW5nZV0pOgorICAgICAgICBVcGRhdGUgdGhlIHBh Z2UgaW5kaWNhdG9yLgorICAgICAgICAKKyAgICAgICAgKC1bV0tQREZWaWV3IGluaXRXaXRoRnJh bWU6XSk6IERlbGV0ZWQuCisgICAgICAgICgtW1dLUERGVmlldyB3ZWJfc2V0T2JzY3VyZWRJbnNl dHM6XSk6IERlbGV0ZWQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLU2Nyb2xsVmlldy5t bToKKyAgICAgICAgKC1bV0tTY3JvbGxWaWV3IHNldENvbnRlbnRJbnNldDpdKToKKyAgICAgICAg Q2FsbCBfdXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0cy4KKworMjAxNC0wNi0yMyAgQW5kZXJzIENh cmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCiAgICAgICAgIEFkZCAtW1dLQmFja0Zvcndh cmRMaXN0IF9yZW1vdmVBbGxJdGVtc10KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEzNDIyNwogICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTcyOTE2MjM+ CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmll dy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCmlu ZGV4IGQ1YzQ1ZGQ4ODhiYTliZDM2MDY3OTAzYzk4M2I3YzIyYzk0NTlkYzEuLmM2YWM1NmU1NGM4 NDk4N2RiYmIwMTc5MzQ1ZGEyZWU2NzczNWNkZGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCkBAIC01ODksNyArNTg5LDcgQEAgc3RhdGlj IENHU2l6ZSByb3VuZFNjcm9sbFZpZXdDb250ZW50U2l6ZShjb25zdCBXZWJLaXQ6OldlYlBhZ2VQ cm94eSYgcGFnZSwgQ0dTaXoKIAogICAgICAgICBDbGFzcyByZXByZXNlbnRhdGlvbkNsYXNzID0g W1tfY29uZmlndXJhdGlvbiBfY29udGVudFByb3ZpZGVyUmVnaXN0cnldIHByb3ZpZGVyRm9yTUlN RVR5cGU6bWltZVR5cGVdOwogICAgICAgICBBU1NFUlQocmVwcmVzZW50YXRpb25DbGFzcyk7Ci0g ICAgICAgIF9jdXN0b21Db250ZW50VmlldyA9IGFkb3B0TlMoW1tyZXByZXNlbnRhdGlvbkNsYXNz IGFsbG9jXSBpbml0XSk7CisgICAgICAgIF9jdXN0b21Db250ZW50VmlldyA9IGFkb3B0TlMoW1ty ZXByZXNlbnRhdGlvbkNsYXNzIGFsbG9jXSB3ZWJfaW5pdFdpdGhGcmFtZTpzZWxmLmJvdW5kcyB3 ZWJWaWV3OnNlbGZdKTsKICAgICAgICAgX2N1c3RvbUNvbnRlbnRGaXhlZE92ZXJsYXlWaWV3ID0g YWRvcHROUyhbW1VJVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpzZWxmLmJvdW5kc10pOwogICAg ICAgICBbX2N1c3RvbUNvbnRlbnRGaXhlZE92ZXJsYXlWaWV3IHNldFVzZXJJbnRlcmFjdGlvbkVu YWJsZWQ6Tk9dOwogCkBAIC01OTgsOCArNTk4LDYgQEAgc3RhdGljIENHU2l6ZSByb3VuZFNjcm9s bFZpZXdDb250ZW50U2l6ZShjb25zdCBXZWJLaXQ6OldlYlBhZ2VQcm94eSYgcGFnZSwgQ0dTaXoK ICAgICAgICAgW3NlbGYgYWRkU3VidmlldzpfY3VzdG9tQ29udGVudEZpeGVkT3ZlcmxheVZpZXcu Z2V0KCldOwogCiAgICAgICAgIFtfY3VzdG9tQ29udGVudFZpZXcgd2ViX3NldE1pbmltdW1TaXpl OnNlbGYuYm91bmRzLnNpemVdOwotICAgICAgICBbX2N1c3RvbUNvbnRlbnRWaWV3IHdlYl9zZXRT Y3JvbGxWaWV3Ol9zY3JvbGxWaWV3LmdldCgpXTsKLSAgICAgICAgW19jdXN0b21Db250ZW50Vmll dyB3ZWJfc2V0T2JzY3VyZWRJbnNldHM6X29ic2N1cmVkSW5zZXRzXTsKICAgICAgICAgW19jdXN0 b21Db250ZW50VmlldyB3ZWJfc2V0Rml4ZWRPdmVybGF5VmlldzpfY3VzdG9tQ29udGVudEZpeGVk T3ZlcmxheVZpZXcuZ2V0KCldOwogICAgIH0gZWxzZSBpZiAoX2N1c3RvbUNvbnRlbnRWaWV3KSB7 CiAgICAgICAgIFtfY3VzdG9tQ29udGVudFZpZXcgcmVtb3ZlRnJvbVN1cGVydmlld107CkBAIC02 ODksNiArNjg3LDI1IEBAIHN0YXRpYyBDR0Zsb2F0IGNvbnRlbnRab29tU2NhbGUoV0tXZWJWaWV3 KiB3ZWJWaWV3KQogICAgIHJldHVybiBfdXNlc01pbmltYWxVSTsKIH0KIAorLSAoQ0dQb2ludClf YWRqdXN0ZWRDb250ZW50T2Zmc2V0OihDR1BvaW50KXBvaW50Cit7CisgICAgQ0dQb2ludCByZXN1 bHQgPSBwb2ludDsKKyAgICBVSUVkZ2VJbnNldHMgY29udGVudEluc2V0ID0gW3NlbGYgX2NvbXB1 dGVkQ29udGVudEluc2V0XTsKKworICAgIHJlc3VsdC54IC09IGNvbnRlbnRJbnNldC5sZWZ0Owor ICAgIHJlc3VsdC55IC09IGNvbnRlbnRJbnNldC50b3A7CisKKyAgICByZXR1cm4gcmVzdWx0Owor fQorCistIChVSUVkZ2VJbnNldHMpX2NvbXB1dGVkQ29udGVudEluc2V0Cit7CisgICAgaWYgKCFV SUVkZ2VJbnNldHNFcXVhbFRvRWRnZUluc2V0cyhfb2JzY3VyZWRJbnNldHMsIFVJRWRnZUluc2V0 c1plcm8pKQorICAgICAgICByZXR1cm4gX29ic2N1cmVkSW5zZXRzOworCisgICAgcmV0dXJuIFtf c2Nyb2xsVmlldyBjb250ZW50SW5zZXRdOworfQorCiAtICh2b2lkKV9wcm9jZXNzRGlkRXhpdAog ewogICAgIGlmICghX2N1c3RvbUNvbnRlbnRWaWV3ICYmIF9pc0FuaW1hdGluZ1Jlc2l6ZSkgewpA QCAtNzAyLDcgKzcxOSw3IEBAIHN0YXRpYyBDR0Zsb2F0IGNvbnRlbnRab29tU2NhbGUoV0tXZWJW aWV3KiB3ZWJWaWV3KQogICAgIH0KICAgICBbX2NvbnRlbnRWaWV3IHNldEZyYW1lOnNlbGYuYm91 bmRzXTsKICAgICBbX3Njcm9sbFZpZXcgc2V0QmFja2dyb3VuZENvbG9yOltVSUNvbG9yIHdoaXRl Q29sb3JdXTsKLSAgICBbX3Njcm9sbFZpZXcgc2V0Q29udGVudE9mZnNldDpDR1BvaW50TWFrZSgt X29ic2N1cmVkSW5zZXRzLmxlZnQsIC1fb2JzY3VyZWRJbnNldHMudG9wKV07CisgICAgW19zY3Jv bGxWaWV3IHNldENvbnRlbnRPZmZzZXQ6W3NlbGYgX2FkanVzdGVkQ29udGVudE9mZnNldDpDR1Bv aW50WmVyb11dOwogICAgIFtfc2Nyb2xsVmlldyBzZXRab29tU2NhbGU6MV07CiAKICAgICBfdmll d3BvcnRNZXRhVGFnV2lkdGggPSAtMTsKQEAgLTc3OCw3ICs3OTUsNyBAQCBzdGF0aWMgdm9pZCBj aGFuZ2VDb250ZW50T2Zmc2V0Qm91bmRlZEluVmFsaWRSYW5nZShVSVNjcm9sbFZpZXcgKnNjcm9s bFZpZXcsIFdlYgogCiAgICAgaWYgKF9uZWVkc1Jlc2V0Vmlld1N0YXRlQWZ0ZXJDb21taXRMb2Fk Rm9yTWFpbkZyYW1lICYmIGxheWVyVHJlZVRyYW5zYWN0aW9uLnRyYW5zYWN0aW9uSUQoKSA+PSBf Zmlyc3RQYWludEFmdGVyQ29tbWl0TG9hZFRyYW5zYWN0aW9uSUQpIHsKICAgICAgICAgX25lZWRz UmVzZXRWaWV3U3RhdGVBZnRlckNvbW1pdExvYWRGb3JNYWluRnJhbWUgPSBOTzsKLSAgICAgICAg W19zY3JvbGxWaWV3IHNldENvbnRlbnRPZmZzZXQ6Q0dQb2ludE1ha2UoLV9vYnNjdXJlZEluc2V0 cy5sZWZ0LCAtX29ic2N1cmVkSW5zZXRzLnRvcCldOworICAgICAgICBbX3Njcm9sbFZpZXcgc2V0 Q29udGVudE9mZnNldDpbc2VsZiBfYWRqdXN0ZWRDb250ZW50T2Zmc2V0OkNHUG9pbnRaZXJvXV07 CiAgICAgICAgIFtzZWxmIF91cGRhdGVWaXNpYmxlQ29udGVudFJlY3RzXTsKICAgICB9CiAKQEAg LTgxOSw5ICs4MzYsNyBAQCBzdGF0aWMgdm9pZCBjaGFuZ2VDb250ZW50T2Zmc2V0Qm91bmRlZElu VmFsaWRSYW5nZShVSVNjcm9sbFZpZXcgKnNjcm9sbFZpZXcsIFdlYgogICAgICAgICBkb3VibGUg c2NhbGUgPSBuZXdTY2FsZSAvIGN1cnJlbnRUYXJnZXRTY2FsZTsKICAgICAgICAgX3Jlc2l6ZUFu aW1hdGlvblRyYW5zZm9ybUFkanVzdG1lbnRzID0gQ0FUcmFuc2Zvcm0zRE1ha2VTY2FsZShzY2Fs ZSwgc2NhbGUsIDApOwogCi0gICAgICAgIENHUG9pbnQgbmV3Q29udGVudE9mZnNldCA9IENHUG9p bnRNYWtlKG5ld1Njcm9sbFBvc2l0aW9uLnggKiBuZXdTY2FsZSwgbmV3U2Nyb2xsUG9zaXRpb24u eSAqIG5ld1NjYWxlKTsKLSAgICAgICAgbmV3Q29udGVudE9mZnNldC54IC09IF9vYnNjdXJlZElu c2V0cy5sZWZ0OwotICAgICAgICBuZXdDb250ZW50T2Zmc2V0LnkgLT0gX29ic2N1cmVkSW5zZXRz LnRvcDsKKyAgICAgICAgQ0dQb2ludCBuZXdDb250ZW50T2Zmc2V0ID0gW3NlbGYgX2FkanVzdGVk Q29udGVudE9mZnNldDpDR1BvaW50TWFrZShuZXdTY3JvbGxQb3NpdGlvbi54ICogbmV3U2NhbGUs IG5ld1Njcm9sbFBvc2l0aW9uLnkgKiBuZXdTY2FsZSldOwogICAgICAgICBDR1BvaW50IGN1cnJl bnRDb250ZW50T2Zmc2V0ID0gW19zY3JvbGxWaWV3IGNvbnRlbnRPZmZzZXRdOwogCiAgICAgICAg IF9yZXNpemVBbmltYXRpb25UcmFuc2Zvcm1BZGp1c3RtZW50cy5tNDEgPSAoY3VycmVudENvbnRl bnRPZmZzZXQueCAtIG5ld0NvbnRlbnRPZmZzZXQueCkgLyBhbmltYXRpbmdTY2FsZVRhcmdldDsK QEAgLTk0MSw4ICs5NTYsNyBAQCBzdGF0aWMgV2ViQ29yZTo6RmxvYXRQb2ludCBjb25zdHJhaW5D b250ZW50T2Zmc2V0KFdlYkNvcmU6OkZsb2F0UG9pbnQgY29udGVudE9mZgogICAgIENHRmxvYXQg em9vbVNjYWxlID0gY29udGVudFpvb21TY2FsZShzZWxmKTsKICAgICBzY2FsZWRPZmZzZXQuc2Nh bGUoem9vbVNjYWxlLCB6b29tU2NhbGUpOwogCi0gICAgc2NhbGVkT2Zmc2V0IC09IFdlYkNvcmU6 OkZsb2F0U2l6ZShfb2JzY3VyZWRJbnNldHMubGVmdCwgX29ic2N1cmVkSW5zZXRzLnRvcCk7Ci0g ICAgW19zY3JvbGxWaWV3IHNldENvbnRlbnRPZmZzZXQ6c2NhbGVkT2Zmc2V0XTsKKyAgICBbX3Nj cm9sbFZpZXcgc2V0Q29udGVudE9mZnNldDpbc2VsZiBfYWRqdXN0ZWRDb250ZW50T2Zmc2V0OnNj YWxlZE9mZnNldF1dOwogfQogCiAtIChCT09MKV9zY3JvbGxUb1JlY3Q6KFdlYkNvcmU6OkZsb2F0 UmVjdCl0YXJnZXRSZWN0IG9yaWdpbjooV2ViQ29yZTo6RmxvYXRQb2ludClvcmlnaW4gbWluaW11 bVNjcm9sbERpc3RhbmNlOihmbG9hdCltaW5pbXVtU2Nyb2xsRGlzdGFuY2UKQEAgLTEyNjYsOCAr MTI4MCwxMCBAQCBzdGF0aWMgV2ViQ29yZTo6RmxvYXRQb2ludCBjb25zdHJhaW5Db250ZW50T2Zm c2V0KFdlYkNvcmU6OkZsb2F0UG9pbnQgY29udGVudE9mZgogCiAtICh2b2lkKV91cGRhdGVWaXNp YmxlQ29udGVudFJlY3RzCiB7Ci0gICAgaWYgKCFbc2VsZiB1c2VzU3RhbmRhcmRDb250ZW50Vmll d10pCi0gICAgICAgIHJldHVybjsKKyAgICBpZiAoIVtzZWxmIHVzZXNTdGFuZGFyZENvbnRlbnRW aWV3XSkgeworICAgICAgICBbX2N1c3RvbUNvbnRlbnRWaWV3IHdlYl9jb21wdXRlZENvbnRlbnRJ bnNldERpZENoYW5nZV07CisgICAgICAgIHJldHVybgorICAgIH0KIAogICAgIGlmIChfZGVsYXlV cGRhdGVWaXNpYmxlQ29udGVudFJlY3RzKSB7CiAgICAgICAgIF9oYWREZWxheWVkVXBkYXRlVmlz aWJsZUNvbnRlbnRSZWN0cyA9IFlFUzsKQEAgLTEyODMsNyArMTI5OSw3IEBAIHN0YXRpYyBXZWJD b3JlOjpGbG9hdFBvaW50IGNvbnN0cmFpbkNvbnRlbnRPZmZzZXQoV2ViQ29yZTo6RmxvYXRQb2lu dCBjb250ZW50T2ZmCiAgICAgQ0dSZWN0IGZ1bGxWaWV3UmVjdCA9IHNlbGYuYm91bmRzOwogICAg IENHUmVjdCB2aXNpYmxlUmVjdEluQ29udGVudENvb3JkaW5hdGVzID0gW3NlbGYgY29udmVydFJl Y3Q6ZnVsbFZpZXdSZWN0IHRvVmlldzpfY29udGVudFZpZXcuZ2V0KCldOwogCi0gICAgQ0dSZWN0 IHVub2JzY3VyZWRSZWN0ID0gVUlFZGdlSW5zZXRzSW5zZXRSZWN0KGZ1bGxWaWV3UmVjdCwgX29i c2N1cmVkSW5zZXRzKTsKKyAgICBDR1JlY3QgdW5vYnNjdXJlZFJlY3QgPSBVSUVkZ2VJbnNldHNJ bnNldFJlY3QoZnVsbFZpZXdSZWN0LCBbc2VsZiBfY29tcHV0ZWRDb250ZW50SW5zZXRdKTsKICAg ICBDR1JlY3QgdW5vYnNjdXJlZFJlY3RJbkNvbnRlbnRDb29yZGluYXRlcyA9IFtzZWxmIGNvbnZl cnRSZWN0OnVub2JzY3VyZWRSZWN0IHRvVmlldzpfY29udGVudFZpZXcuZ2V0KCldOwogCiAgICAg Q0dGbG9hdCBzY2FsZUZhY3RvciA9IGNvbnRlbnRab29tU2NhbGUoc2VsZik7CkBAIC0xOTIyLDcg KzE5MzgsNiBAQCBzdGF0aWMgaW5saW5lIFdlYktpdDo6RmluZE9wdGlvbnMgdG9GaW5kT3B0aW9u cyhfV0tGaW5kT3B0aW9ucyB3a0ZpbmRPcHRpb25zKQogICAgIF9vYnNjdXJlZEluc2V0cyA9IG9i c2N1cmVkSW5zZXRzOwogCiAgICAgW3NlbGYgX3VwZGF0ZVZpc2libGVDb250ZW50UmVjdHNdOwot ICAgIFtfY3VzdG9tQ29udGVudFZpZXcgd2ViX3NldE9ic2N1cmVkSW5zZXRzOm9ic2N1cmVkSW5z ZXRzXTsKIH0KIAogLSAodm9pZClfc2V0SW50ZXJmYWNlT3JpZW50YXRpb25PdmVycmlkZTooVUlJ bnRlcmZhY2VPcmllbnRhdGlvbilpbnRlcmZhY2VPcmllbnRhdGlvbgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdJbnRlcm5hbC5oIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdJbnRlcm5hbC5oCmluZGV4 IGE1MzM4MWRlZGI4YjQ3NzU3MTUyMzEzMmZjMDQ5ZTU2MWUwNzExMWUuLmJjZDY5NGE1MjdmODFl NmE5NTlmNmRlMjlhYzAwODRmMWRiNjExZWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3SW50ZXJuYWwuaAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld0ludGVybmFsLmgKQEAgLTg4LDYgKzg4LDEx IEBAIHN0cnVjdCBWaWV3U25hcHNob3Q7CiAKIC0gKHZvaWQpX3dpbGxJbnZva2VVSVNjcm9sbFZp ZXdEZWxlZ2F0ZUNhbGxiYWNrOwogLSAodm9pZClfZGlkSW52b2tlVUlTY3JvbGxWaWV3RGVsZWdh dGVDYWxsYmFjazsKKworLSAodm9pZClfdXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0czsKKworQHBy b3BlcnR5IChub25hdG9taWMsIHJlYWRvbmx5KSBVSUVkZ2VJbnNldHMgX2NvbXB1dGVkQ29udGVu dEluc2V0OworCiAjZW5kaWYKIEBlbmQKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0NvY29hL1dLV2ViVmlld0NvbnRlbnRQcm92aWRlci5oIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0NvY29hL1dLV2ViVmlld0NvbnRlbnRQcm92aWRlci5oCmluZGV4IGZlNjExNWY5 NWM5OWIwMDk1M2RlNWRjOGE4NTE5MTc5NGU2NTYwYjIuLmY1NGJjMWYyZWE3MTUxYTMzMjQ5NmYy OTVlN2RjNDVlZDFmMWUwODIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9D b2NvYS9XS1dlYlZpZXdDb250ZW50UHJvdmlkZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQ29jb2EvV0tXZWJWaWV3Q29udGVudFByb3ZpZGVyLmgKQEAgLTMyLDYgKzMyLDcgQEAK IEBjbGFzcyBOU0RhdGE7CiBAY2xhc3MgVUlTY3JvbGxWaWV3OwogQGNsYXNzIFVJVmlldzsKK0Bj bGFzcyBXS1dlYlZpZXc7CiBAcHJvdG9jb2wgTlNPYmplY3Q7CiBAcHJvdG9jb2wgVUlTY3JvbGxW aWV3RGVsZWdhdGU7CiBzdHJ1Y3QgQ0dTaXplOwpAQCAtNDAsMTEgKzQxLDExIEBAIHN0cnVjdCBV SUVkZ2VJbnNldHM7CiAvLyBGSVhNRTogVGhpcyBzaG91bGQgYmUgQVBJIChhbmQgcHJvYmFibHkg c2hvdWxkIG5vdCBiZSBhIFVJU2Nyb2xsVmlld0RlbGVnYXRlKS4KIEBwcm90b2NvbCBXS1dlYlZp ZXdDb250ZW50UHJvdmlkZXIgPE5TT2JqZWN0LCBVSVNjcm9sbFZpZXdEZWxlZ2F0ZT4KIAorLSAo aW5zdGFuY2V0eXBlKXdlYl9pbml0V2l0aEZyYW1lOihDR1JlY3QpIGZyYW1lIHdlYlZpZXc6KFdL V2ViVmlldyAqKXdlYlZpZXc7CiAtICh2b2lkKXdlYl9zZXRDb250ZW50UHJvdmlkZXJEYXRhOihO U0RhdGEgKilkYXRhIHN1Z2dlc3RlZEZpbGVuYW1lOihOU1N0cmluZyAqKWZpbGVuYW1lOwogLSAo dm9pZCl3ZWJfc2V0TWluaW11bVNpemU6KENHU2l6ZSlzaXplOwotLSAodm9pZCl3ZWJfc2V0U2Ny b2xsVmlldzooVUlTY3JvbGxWaWV3ICopc2Nyb2xsVmlldzsKLS0gKHZvaWQpd2ViX3NldE9ic2N1 cmVkSW5zZXRzOihVSUVkZ2VJbnNldHMpaW5zZXRzOwogLSAodm9pZCl3ZWJfc2V0T3ZlcmxhaWRB Y2Nlc3NvcnlWaWV3c0luc2V0OihDR1NpemUpaW5zZXQ7CistICh2b2lkKXdlYl9jb21wdXRlZENv bnRlbnRJbnNldERpZENoYW5nZTsKIC0gKHZvaWQpd2ViX3NldEZpeGVkT3ZlcmxheVZpZXc6KFVJ VmlldyAqKWZpeGVkT3ZlcmxheVZpZXc7CiAKIEBlbmQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9pb3MvV0tQREZWaWV3Lm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L2lvcy9XS1BERlZpZXcubW0KaW5kZXggNjllMTI4MjFlNTdlYmY1YTQzNmZkZWJlZDg0NTdhNTJm ZjZmNGVmNy4uZGUyODM2ZmE1YTVjZTVkOGM1OWM3ZWNhNzFlYjMwNjZlYWFiMTIyZSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS1BERlZpZXcubW0KKysrIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS1BERlZpZXcubW0KQEAgLTI5LDcgKzI5LDkgQEAK ICNpZiBQTEFURk9STShJT1MpCiAKICNpbXBvcnQgIldLUERGUGFnZU51bWJlckluZGljYXRvci5o IgorI2ltcG9ydCAiV0tXZWJWaWV3SW50ZXJuYWwuaCIKICNpbXBvcnQgPENvcmVQREYvVUlQREZE b2N1bWVudC5oPgorI2ltcG9ydCA8Q29yZVBERi9VSVBERlBhZ2UuaD4KICNpbXBvcnQgPENvcmVQ REYvVUlQREZQYWdlVmlldy5oPgogI2ltcG9ydCA8V2ViQ29yZS9GbG9hdFJlY3QuaD4KICNpbXBv cnQgPHd0Zi9SZXRhaW5QdHIuaD4KQEAgLTYwLDE4ICs2MiwyNiBAQCB0eXBlZGVmIHN0cnVjdCB7 CiAKICAgICBDR1NpemUgX21pbmltdW1TaXplOwogICAgIENHU2l6ZSBfb3ZlcmxhaWRBY2Nlc3Nv cnlWaWV3c0luc2V0OwotICAgIFVJRWRnZUluc2V0cyBfb2JzY3VyZWRJbnNldHM7CisgICAgV0tX ZWJWaWV3ICpfd2ViVmlldzsKICAgICBVSVNjcm9sbFZpZXcgKl9zY3JvbGxWaWV3OwogICAgIFVJ VmlldyAqX2ZpeGVkT3ZlcmxheVZpZXc7CiB9CiAKLS0gKGluc3RhbmNldHlwZSlpbml0V2l0aEZy YW1lOihDR1JlY3QpZnJhbWUKKy0gKGluc3RhbmNldHlwZSl3ZWJfaW5pdFdpdGhGcmFtZTooQ0dS ZWN0KWZyYW1lIHdlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcKIHsKICAgICBpZiAoIShzZWxm ID0gW3N1cGVyIGluaXRXaXRoRnJhbWU6ZnJhbWVdKSkKICAgICAgICAgcmV0dXJuIG5pbDsKIAog ICAgIHNlbGYuYmFja2dyb3VuZENvbG9yID0gW1VJQ29sb3IgZ3JheUNvbG9yXTsKIAorICAgIF93 ZWJWaWV3ID0gd2ViVmlldzsKKworICAgIF9zY3JvbGxWaWV3ID0gd2ViVmlldy5zY3JvbGxWaWV3 OworICAgIFtfc2Nyb2xsVmlldyBzZXRNaW5pbXVtWm9vbVNjYWxlOnBkZk1pbmltdW1ab29tU2Nh bGVdOworICAgIFtfc2Nyb2xsVmlldyBzZXRNYXhpbXVtWm9vbVNjYWxlOnBkZk1heGltdW1ab29t U2NhbGVdOworICAgIFtfc2Nyb2xsVmlldyBzZXRDb250ZW50U2l6ZTpfZG9jdW1lbnRGcmFtZS5z aXplXTsKKyAgICBbX3Njcm9sbFZpZXcgc2V0QmFja2dyb3VuZENvbG9yOltVSUNvbG9yIGdyYXlD b2xvcl1dOworCiAgICAgcmV0dXJuIHNlbGY7CiB9CiAKQEAgLTE3NSw3ICsxODUsOCBAQCB0eXBl ZGVmIHN0cnVjdCB7CiAKIC0gKENHUG9pbnQpX29mZnNldEZvclBhZ2VOdW1iZXJJbmRpY2F0b3IK IHsKLSAgICByZXR1cm4gQ0dQb2ludE1ha2UoX29ic2N1cmVkSW5zZXRzLmxlZnQsIF9vYnNjdXJl ZEluc2V0cy50b3AgKyBfb3ZlcmxhaWRBY2Nlc3NvcnlWaWV3c0luc2V0LmhlaWdodCk7CisgICAg VUlFZGdlSW5zZXRzIGNvbnRlbnRJbnNldCA9IFtfd2ViVmlldyBfY29tcHV0ZWRDb250ZW50SW5z ZXRdOworICAgIHJldHVybiBDR1BvaW50TWFrZShjb250ZW50SW5zZXQubGVmdCwgY29udGVudElu c2V0LnRvcCArIF9vdmVybGFpZEFjY2Vzc29yeVZpZXdzSW5zZXQuaGVpZ2h0KTsKIH0KIAogLSAo dm9pZClfdXBkYXRlUGFnZU51bWJlckluZGljYXRvcgpAQCAtMTg5LDIyICsyMDAsMTcgQEAgdHlw ZWRlZiBzdHJ1Y3QgewogICAgIFtfcGFnZU51bWJlckluZGljYXRvciBtb3ZlVG9Qb2ludDpbc2Vs ZiBfb2Zmc2V0Rm9yUGFnZU51bWJlckluZGljYXRvcl0gYW5pbWF0ZWQ6Tk9dOwogfQogCi0tICh2 b2lkKXdlYl9zZXRPYnNjdXJlZEluc2V0czooVUlFZGdlSW5zZXRzKWluc2V0cwotewotICAgIGlm IChVSUVkZ2VJbnNldHNFcXVhbFRvRWRnZUluc2V0cyhpbnNldHMsIF9vYnNjdXJlZEluc2V0cykp Ci0gICAgICAgIHJldHVybjsKLQotICAgIF9vYnNjdXJlZEluc2V0cyA9IGluc2V0czsKLQotICAg IFtzZWxmIF91cGRhdGVQYWdlTnVtYmVySW5kaWNhdG9yXTsKLX0KLQogLSAodm9pZCl3ZWJfc2V0 T3ZlcmxhaWRBY2Nlc3NvcnlWaWV3c0luc2V0OihDR1NpemUpaW5zZXQKIHsKICAgICBfb3Zlcmxh aWRBY2Nlc3NvcnlWaWV3c0luc2V0ID0gaW5zZXQ7CiAgICAgW19wYWdlTnVtYmVySW5kaWNhdG9y IG1vdmVUb1BvaW50OltzZWxmIF9vZmZzZXRGb3JQYWdlTnVtYmVySW5kaWNhdG9yXSBhbmltYXRl ZDpZRVNdOwogfQogCistICh2b2lkKXdlYl9jb21wdXRlZENvbnRlbnRJbnNldERpZENoYW5nZQor eworICAgIFtzZWxmIF91cGRhdGVQYWdlTnVtYmVySW5kaWNhdG9yXTsKK30KKwogLSAodm9pZCl3 ZWJfc2V0Rml4ZWRPdmVybGF5VmlldzooVUlWaWV3ICopZml4ZWRPdmVybGF5VmlldwogewogICAg IF9maXhlZE92ZXJsYXlWaWV3ID0gZml4ZWRPdmVybGF5VmlldzsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tTY3JvbGxWaWV3Lm1tIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL2lvcy9XS1Njcm9sbFZpZXcubW0KaW5kZXggNmI5MGJjMzI5NjVjNzY2NjcyZDdi YzJhNDI5NGQ4YjRiN2FmYTQwYi4uNDEzMzY5YmNjNGU4ZmQ3MTdiNGJmYWVmMGNmYWQ4MjI4ZjMy NzVjMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS1Njcm9sbFZp ZXcubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS1Njcm9sbFZpZXcubW0K QEAgLTE5MSw2ICsxOTEsMTMgQEAgc3RhdGljIGlubGluZSBib29sIHZhbHVlc0FyZVdpdGhpbk9u ZVBpeGVsKENHRmxvYXQgYSwgQ0dGbG9hdCBiKQogICAgIHJldHVybiBbc3VwZXIgX3J1YmJlckJh bmRPZmZzZXRGb3JPZmZzZXQ6bmV3T2Zmc2V0IG1heE9mZnNldDptYXhPZmZzZXQgbWluT2Zmc2V0 Om1pbk9mZnNldCByYW5nZTpyYW5nZSBvdXRzaWRlOm91dHNpZGVdOwogfQogCistICh2b2lkKXNl dENvbnRlbnRJbnNldDooVUlFZGdlSW5zZXRzKWNvbnRlbnRJbnNldAoreworICAgIFtzdXBlciBz ZXRDb250ZW50SW5zZXQ6Y29udGVudEluc2V0XTsKKworICAgIFtfaW50ZXJuYWxEZWxlZ2F0ZSBf dXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0c107Cit9CisKIEBlbmQKIAogI2VuZGlmIC8vIFBMQVRG T1JNKElPUykK