129016 2014-02-18 18:32:37 -0800 Clean up WKContentView initialization 2014-02-18 20:07:59 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser simon.fraser oldest_to_newest 982194 0 simon.fraser 2014-02-18 18:32:37 -0800 Clean up WKContentView initialization 982195 1 224575 simon.fraser 2014-02-18 18:34:15 -0800 Created attachment 224575 Patch 982196 2 224575 benjamin 2014-02-18 18:37:02 -0800 Comment on attachment 224575 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=224575&action=review > Source/WebKit2/UIProcess/API/ios/WKViewIOS.mm:246 > - _contentView = adoptNS([[WKContentView alloc] initWithFrame:bounds contextRef:contextRef pageGroupRef:pageGroupRef relatedToPage:relatedPage]); > + WebKit::WebPageConfiguration webPageConfiguration; > + webPageConfiguration.pageGroup = toImpl(pageGroupRef); > + webPageConfiguration.relatedPage = toImpl(relatedPage); > + > + _contentView = adoptNS([[WKContentView alloc] initWithFrame:bounds context:*toImpl(contextRef) configuration:std::move(webPageConfiguration)]); You need to update WKWebView accordingly :( 982208 3 simon.fraser 2014-02-18 20:06:35 -0800 WKWebView already uses the correct initializer. 982209 4 simon.fraser 2014-02-18 20:07:59 -0800 http://trac.webkit.org/changeset/164349 224575 2014-02-18 18:34:15 -0800 2014-02-18 18:37:02 -0800 Patch bug-129016-20140218183410.patch text/plain 6083 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTY0MzQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZTQyZGU2NDgzNzNhN2Q1 YmY5YmQ1ZGEwOTk3NjllYjIxODI5MjU5Yi4uZTVkNjdmYjc4OTNhOTI2OTAzOWNmYjEzNjEzYjRl YjZiZDYyZTk3YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE0LTAyLTE4ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIENsZWFuIHVwIFdL Q29udGVudFZpZXcgaW5pdGlhbGl6YXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEyOTAxNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorICAgICAgICAKKyAgICAgICAgV0tDb250ZW50VmlldyBoYWQgdG9vIG1hbnkgaW5p dGlhbGl6ZXJzIGFuZCBkdXBsaWNhdGVkIGluaXQKKyAgICAgICAgY29kZS4gQ2xlYW4gdXAgYnkg cmVtb3ZpbmcgYWxsIGJ1dCBvbmUgaW5pdGlhbGl6ZXIgYW5kIGFuZAorICAgICAgICBkb2luZyBh bGwgdGhlIHNldHVwIGluIGl0LgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9pb3MvV0tDb250 ZW50Vmlldy5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvaW9zL1dLQ29udGVudFZpZXcubW06 CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9pb3MvV0tWaWV3SU9TLm1tOgorICAgICAgICAoLVtX S1ZpZXcgX2NvbW1vbkluaXRpYWxpemF0aW9uV2l0aENvbnRleHRSZWY6cGFnZUdyb3VwUmVmOnJl bGF0ZWRUb1BhZ2U6XSk6CisKIDIwMTQtMDItMTggIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRv bkBhcHBsZS5jb20+CiAKICAgICAgICAgQ2FuJ3QgdXNlICNpZiBpbnNpZGUgYSBtYWNybywgc28g d2UnbGwgZHVwbGljYXRlIHRoZSBtYWNybyBmb3Igbm93LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9pb3MvV0tDb250ZW50Vmlldy5oIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9pb3MvV0tDb250ZW50Vmlldy5oCmluZGV4IDM5ZmM5MThjZTFiNjliZmRk ODQ3ZWIyMDY3NDQxYjVhNDEyOGI4NDMuLjg3ZTAxODlhMDdjNTQwZWY4NjdiZmVjNmJhMmEwNzA0 MjkzM2RiNjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvaW9zL1dL Q29udGVudFZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2lvcy9XS0Nv bnRlbnRWaWV3LmgKQEAgLTYwLDEwICs2MCw2IEBAIFdLX0FQSV9DTEFTUwogCiAtIChpbnN0YW5j ZXR5cGUpaW5pdFdpdGhGcmFtZTooQ0dSZWN0KWZyYW1lIGNvbnRleHQ6KFdlYktpdDo6V2ViQ29u dGV4dCYpY29udGV4dCBjb25maWd1cmF0aW9uOihXZWJLaXQ6OldlYlBhZ2VDb25maWd1cmF0aW9u KXdlYlBhZ2VDb25maWd1cmF0aW9uOwogCi0tIChpZClpbml0V2l0aEZyYW1lOihDR1JlY3QpZnJh bWUgY29udGV4dFJlZjooV0tDb250ZXh0UmVmKWNvbnRleHRSZWYgcGFnZUdyb3VwUmVmOihXS1Bh Z2VHcm91cFJlZilwYWdlR3JvdXBSZWY7Ci0tIChpZClpbml0V2l0aEZyYW1lOihDR1JlY3QpZnJh bWUgY29udGV4dFJlZjooV0tDb250ZXh0UmVmKWNvbnRleHRSZWYgcGFnZUdyb3VwUmVmOihXS1Bh Z2VHcm91cFJlZilwYWdlR3JvdXBSZWYgcmVsYXRlZFRvUGFnZTooV0tQYWdlUmVmKXJlbGF0ZWRQ YWdlOwotLSAoaWQpaW5pdFdpdGhGcmFtZTooQ0dSZWN0KWZyYW1lIHByb2Nlc3NHcm91cDooV0tQ cm9jZXNzR3JvdXAgKilwcm9jZXNzR3JvdXAgYnJvd3NpbmdDb250ZXh0R3JvdXA6KFdLQnJvd3Np bmdDb250ZXh0R3JvdXAgKilicm93c2luZ0NvbnRleHRHcm91cDsKLQogLSAodm9pZClzZXRNaW5p bXVtU2l6ZTooQ0dTaXplKXNpemU7CiAtICh2b2lkKXNldFZpZXdwb3J0U2l6ZTooQ0dTaXplKXNp emU7CiAtICh2b2lkKXNldE1pbmltdW1MYXlvdXRTaXplOihDR1NpemUpc2l6ZTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvaW9zL1dLQ29udGVudFZpZXcubW0gYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2lvcy9XS0NvbnRlbnRWaWV3Lm1tCmluZGV4IGFl ZWUyMWVhODlmODU5Yzk0NDNkZDc5ZTc3YTQ4NzdiM2FkZmI2M2UuLjRhOTljOTgwYzQzYWYxYWQ0 MDY2YTQ4OWVlYjVmOWNkNzcxZTZhNzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvaW9zL1dLQ29udGVudFZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9pb3MvV0tDb250ZW50Vmlldy5tbQpAQCAtNzIsMjkgKzcyLDYgQEAgQGltcGxlbWVu dGF0aW9uIFdLQ29udGVudFZpZXcgewogICAgIFdlYkNvcmU6OkZsb2F0UG9pbnQgX2N1cnJlbnRF eHBvc2VkUmVjdFBvc2l0aW9uOwogfQogCi0tIChpZClpbml0V2l0aEZyYW1lOihDR1JlY3QpZnJh bWUgY29udGV4dFJlZjooV0tDb250ZXh0UmVmKWNvbnRleHRSZWYgcGFnZUdyb3VwUmVmOihXS1Bh Z2VHcm91cFJlZilwYWdlR3JvdXBSZWYKLXsKLSAgICByZXR1cm4gW3NlbGYgaW5pdFdpdGhGcmFt ZTpmcmFtZSBjb250ZXh0UmVmOmNvbnRleHRSZWYgcGFnZUdyb3VwUmVmOnBhZ2VHcm91cFJlZiBy ZWxhdGVkVG9QYWdlOm51bGxwdHJdOwotfQotCi0tIChpZClpbml0V2l0aEZyYW1lOihDR1JlY3Qp ZnJhbWUgY29udGV4dFJlZjooV0tDb250ZXh0UmVmKWNvbnRleHRSZWYgcGFnZUdyb3VwUmVmOihX S1BhZ2VHcm91cFJlZilwYWdlR3JvdXBSZWYgcmVsYXRlZFRvUGFnZTooV0tQYWdlUmVmKXJlbGF0 ZWRQYWdlCi17Ci0gICAgaWYgKCEoc2VsZiA9IFtzdXBlciBpbml0V2l0aEZyYW1lOmZyYW1lXSkp Ci0gICAgICAgIHJldHVybiBuaWw7Ci0KLSAgICBbc2VsZiBfY29tbW9uSW5pdGlhbGl6YXRpb25X aXRoQ29udGV4dFJlZjpjb250ZXh0UmVmIHBhZ2VHcm91cFJlZjpwYWdlR3JvdXBSZWYgcmVsYXRl ZFRvUGFnZTpyZWxhdGVkUGFnZV07Ci0gICAgcmV0dXJuIHNlbGY7Ci19Ci0KLS0gKGlkKWluaXRX aXRoRnJhbWU6KENHUmVjdClmcmFtZSBwcm9jZXNzR3JvdXA6KFdLUHJvY2Vzc0dyb3VwICopcHJv Y2Vzc0dyb3VwIGJyb3dzaW5nQ29udGV4dEdyb3VwOihXS0Jyb3dzaW5nQ29udGV4dEdyb3VwICop YnJvd3NpbmdDb250ZXh0R3JvdXAKLXsKLSAgICBpZiAoIShzZWxmID0gW3N1cGVyIGluaXRXaXRo RnJhbWU6ZnJhbWVdKSkKLSAgICAgICAgcmV0dXJuIG5pbDsKLQotICAgIFtzZWxmIF9jb21tb25J bml0aWFsaXphdGlvbldpdGhDb250ZXh0UmVmOnByb2Nlc3NHcm91cC5fY29udGV4dFJlZiBwYWdl R3JvdXBSZWY6YnJvd3NpbmdDb250ZXh0R3JvdXAuX3BhZ2VHcm91cFJlZiByZWxhdGVkVG9QYWdl Om51bGxwdHJdOwotICAgIHJldHVybiBzZWxmOwotfQotCiAtIChpbnN0YW5jZXR5cGUpaW5pdFdp dGhGcmFtZTooQ0dSZWN0KWZyYW1lIGNvbnRleHQ6KFdlYktpdDo6V2ViQ29udGV4dCYpY29udGV4 dCBjb25maWd1cmF0aW9uOihXZWJLaXQ6OldlYlBhZ2VDb25maWd1cmF0aW9uKXdlYlBhZ2VDb25m aWd1cmF0aW9uCiB7CiAgICAgaWYgKCEoc2VsZiA9IFtzdXBlciBpbml0V2l0aEZyYW1lOmZyYW1l XSkpCkBAIC0yNTIsMzcgKzIyOSw2IEBAIC0gKHZvaWQpZGlkWm9vbVRvU2NhbGU6KENHRmxvYXQp c2NhbGUKIAogI3ByYWdtYSBtYXJrIEludGVybmFsCiAKLS0gKHZvaWQpX2NvbW1vbkluaXRpYWxp emF0aW9uV2l0aENvbnRleHRSZWY6KFdLQ29udGV4dFJlZiljb250ZXh0UmVmIHBhZ2VHcm91cFJl ZjooV0tQYWdlR3JvdXBSZWYpcGFnZUdyb3VwUmVmIHJlbGF0ZWRUb1BhZ2U6KFdLUGFnZVJlZily ZWxhdGVkUGFnZQotewotICAgIEluaXRpYWxpemVXZWJLaXQyKCk7Ci0KLSAgICBfcGFnZUNsaWVu dCA9IHN0ZDo6bWFrZV91bmlxdWU8UGFnZUNsaWVudEltcGw+KHNlbGYpOwotCi0gICAgV2ViUGFn ZUNvbmZpZ3VyYXRpb24gd2ViUGFnZUNvbmZpZ3VyYXRpb247Ci0gICAgd2ViUGFnZUNvbmZpZ3Vy YXRpb24ucGFnZUdyb3VwID0gdG9JbXBsKHBhZ2VHcm91cFJlZik7Ci0gICAgd2ViUGFnZUNvbmZp Z3VyYXRpb24ucmVsYXRlZFBhZ2UgPSB0b0ltcGwocmVsYXRlZFBhZ2UpOwotCi0gICAgX3BhZ2Ug PSB0b0ltcGwoY29udGV4dFJlZiktPmNyZWF0ZVdlYlBhZ2UoKl9wYWdlQ2xpZW50LCBzdGQ6Om1v dmUod2ViUGFnZUNvbmZpZ3VyYXRpb24pKTsKLSAgICBfcGFnZS0+aW5pdGlhbGl6ZVdlYlBhZ2Uo KTsKLSAgICBfcGFnZS0+c2V0SW50cmluc2ljRGV2aWNlU2NhbGVGYWN0b3IoW1VJU2NyZWVuIG1h aW5TY3JlZW5dLnNjYWxlKTsKLSAgICBfcGFnZS0+c2V0VXNlRml4ZWRMYXlvdXQodHJ1ZSk7Ci0g ICAgX3BhZ2UtPnNldERlbGVnYXRlc1Njcm9sbGluZyh0cnVlKTsKLQotICAgIFdlYkNvbnRleHQ6 OnN0YXRpc3RpY3MoKS53a1ZpZXdDb3VudCsrOwotCi0gICAgX3Jvb3RDb250ZW50VmlldyA9IGFk b3B0TlMoW1tVSVZpZXcgYWxsb2NdIGluaXRdKTsKLSAgICBbW19yb290Q29udGVudFZpZXcgbGF5 ZXJdIHNldE1hc2tzVG9Cb3VuZHM6Tk9dOwotICAgIFtfcm9vdENvbnRlbnRWaWV3IHNldFVzZXJJ bnRlcmFjdGlvbkVuYWJsZWQ6Tk9dOwotCi0gICAgW3NlbGYgYWRkU3Vidmlldzpfcm9vdENvbnRl bnRWaWV3LmdldCgpXTsKLQotICAgIF9pbnRlcmFjdGlvblZpZXcgPSBhZG9wdE5TKFtbV0tJbnRl cmFjdGlvblZpZXcgYWxsb2NdIGluaXRdKTsKLSAgICBbX2ludGVyYWN0aW9uVmlldyBzZXRQYWdl Ol9wYWdlXTsKLSAgICBbc2VsZiBhZGRTdWJ2aWV3Ol9pbnRlcmFjdGlvblZpZXcuZ2V0KCldOwot Ci0gICAgc2VsZi5sYXllci5oaXRUZXN0c0FzT3BhcXVlID0gWUVTOwotfQotCiAtICh2b2lkKV93 aW5kb3dEaWRNb3ZlVG9TY3JlZW5Ob3RpZmljYXRpb246KE5TTm90aWZpY2F0aW9uICopbm90aWZp Y2F0aW9uCiB7CiAgICAgQVNTRVJUKG5vdGlmaWNhdGlvbi5vYmplY3QgPT0gc2VsZi53aW5kb3cp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9pb3MvV0tWaWV3SU9T Lm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9pb3MvV0tWaWV3SU9TLm1tCmluZGV4 IDlhZDc3NTgxN2E5MzJlYmMwMmY4M2RmNGI2MWJjYjc1YTJlZWEwMWQuLjUwNTZiNzMxNDI3ZDdh Nzg4MGYwZjhjYWFmMTlkM2ExNTE4NzI3MjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvaW9zL1dLVmlld0lPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2lvcy9XS1ZpZXdJT1MubW0KQEAgLTIzOSw3ICsyMzksMTIgQEAgLSAodm9pZClfY29t bW9uSW5pdGlhbGl6YXRpb25XaXRoQ29udGV4dFJlZjooV0tDb250ZXh0UmVmKWNvbnRleHRSZWYg cGFnZUdyb3VwUmUKIAogICAgIFtzZWxmIGFkZFN1YnZpZXc6X3Njcm9sbFZpZXcuZ2V0KCldOwog Ci0gICAgX2NvbnRlbnRWaWV3ID0gYWRvcHROUyhbW1dLQ29udGVudFZpZXcgYWxsb2NdIGluaXRX aXRoRnJhbWU6Ym91bmRzIGNvbnRleHRSZWY6Y29udGV4dFJlZiBwYWdlR3JvdXBSZWY6cGFnZUdy b3VwUmVmIHJlbGF0ZWRUb1BhZ2U6cmVsYXRlZFBhZ2VdKTsKKyAgICBXZWJLaXQ6OldlYlBhZ2VD b25maWd1cmF0aW9uIHdlYlBhZ2VDb25maWd1cmF0aW9uOworICAgIHdlYlBhZ2VDb25maWd1cmF0 aW9uLnBhZ2VHcm91cCA9IHRvSW1wbChwYWdlR3JvdXBSZWYpOworICAgIHdlYlBhZ2VDb25maWd1 cmF0aW9uLnJlbGF0ZWRQYWdlID0gdG9JbXBsKHJlbGF0ZWRQYWdlKTsKKworICAgIF9jb250ZW50 VmlldyA9IGFkb3B0TlMoW1tXS0NvbnRlbnRWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOmJvdW5k cyBjb250ZXh0Oip0b0ltcGwoY29udGV4dFJlZikgY29uZmlndXJhdGlvbjpzdGQ6Om1vdmUod2Vi UGFnZUNvbmZpZ3VyYXRpb24pXSk7CisKICAgICBbX2NvbnRlbnRWaWV3IHNldERlbGVnYXRlOnNl bGZdOwogICAgIFtbX2NvbnRlbnRWaWV3IGxheWVyXSBzZXRBbmNob3JQb2ludDpDR1BvaW50WmVy b107CiAgICAgW19jb250ZW50VmlldyBzZXRGcmFtZTpib3VuZHNdOwo=