139033 2014-11-24 14:01:15 -0800 Stub out user content WebView member functions on Windows 2014-11-24 14:08:52 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1050886 0 andersca 2014-11-24 14:01:15 -0800 Stub out user content WebView member functions on Windows 1050887 1 242172 andersca 2014-11-24 14:02:39 -0800 Created attachment 242172 Patch 1050888 2 andersca 2014-11-24 14:08:52 -0800 Committed r176523: <http://trac.webkit.org/changeset/176523> 242172 2014-11-24 14:02:39 -0800 2014-11-24 14:03:32 -0800 Patch bug-139033-20141124140301.patch text/plain 6446 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2NTIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dp bi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKaW5kZXggYTE3ZDkxNTJl NTMxMjM2YTExMmFiNDE3ZDk2ZGI1NmQzZTU0NWZkNS4uMjA5YjJjZjNkMjg5YWJiNmIwNWYzYWMz NGFlMjVmNzdiNTQwMjVhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE0 LTExLTI0ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAg U3R1YiBvdXQgdXNlciBjb250ZW50IFdlYlZpZXcgbWVtYmVyIGZ1bmN0aW9ucyBvbiBXaW5kb3dz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzkwMzMK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGVzZSBm dW5jdGlvbnMgYXJlbid0IHVzZWQgYnkgYW55IGNsaWVudHMgYW5kIGhpbmRlciBnZXR0aW5nIHJp ZCBvZiBQYWdlR3JvdXAuCisgICAgICAgIElmIGl0IHR1cm5zIG91dCB0aGV5J3JlIHN0aWxsIG5l ZWRlZCB3ZSBjYW4gY29weSB0aGUgdXNlciBjb250ZW50IGNvbnRyb2xsZXIgY29kZSBmcm9tIE1h YyBMZWdhY3kgV2ViS2l0LgorCisgICAgICAgICogV2ViVmlldy5jcHA6CisgICAgICAgIChXZWJW aWV3OjphZGRVc2VyU2NyaXB0VG9Hcm91cCk6CisgICAgICAgIChXZWJWaWV3OjphZGRVc2VyU3R5 bGVTaGVldFRvR3JvdXApOgorICAgICAgICAoV2ViVmlldzo6cmVtb3ZlVXNlclNjcmlwdEZyb21H cm91cCk6CisgICAgICAgIChXZWJWaWV3OjpyZW1vdmVVc2VyU3R5bGVTaGVldEZyb21Hcm91cCk6 CisgICAgICAgIChXZWJWaWV3OjpyZW1vdmVVc2VyU2NyaXB0c0Zyb21Hcm91cCk6CisgICAgICAg IChXZWJWaWV3OjpyZW1vdmVVc2VyU3R5bGVTaGVldHNGcm9tR3JvdXApOgorICAgICAgICAoV2Vi Vmlldzo6cmVtb3ZlQWxsVXNlckNvbnRlbnRGcm9tR3JvdXApOgorICAgICAgICAodG9TdHJpbmdW ZWN0b3IpOiBEZWxldGVkLgorCiAyMDE0LTExLTIxICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBw bGUuY29tPgogCiAgICAgICAgIFN1cHBvcnQgbXVsdGlwbGUgc2lnbmF0dXJlcyBvZiBkaWFnbm9z dGljIGxvZ2dpbmcuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJWaWV3LmNwcCBi L1NvdXJjZS9XZWJLaXQvd2luL1dlYlZpZXcuY3BwCmluZGV4IGE3ODFlZGIyOWQ5ODU3MTI1ODkz MzgxZmY1ODQ4ZTAzMDdiNzhhMjAuLmVhYTA1MjA0YmQyMjk4MGIyMWEwOTlkMzViMjJmNjA4MTMy ODVlZDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvd2luL1dlYlZpZXcuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQvd2luL1dlYlZpZXcuY3BwCkBAIC02MzM5LDE1NyArNjMzOSw0NCBAQCB2b2lk IFdlYlZpZXc6OmV4aXRWaWRlb0Z1bGxzY3JlZW4oKQogI2VuZGlmCiB9CiAKLXN0YXRpYyBWZWN0 b3I8U3RyaW5nPiB0b1N0cmluZ1ZlY3Rvcih1bnNpZ25lZCBwYXR0ZXJuc0NvdW50LCBCU1RSKiBw YXR0ZXJucykKLXsKLSAgICBWZWN0b3I8U3RyaW5nPiBwYXR0ZXJuc1ZlY3RvcjsKLSAgICBpZiAo IXBhdHRlcm5zQ291bnQpCi0gICAgICAgIHJldHVybiBwYXR0ZXJuc1ZlY3RvcjsKLSAgICBmb3Ig KHVuc2lnbmVkIGkgPSAwOyBpIDwgcGF0dGVybnNDb3VudDsgKytpKQotICAgICAgICBwYXR0ZXJu c1ZlY3Rvci5hcHBlbmQodG9TdHJpbmcocGF0dGVybnNbaV0pKTsKLSAgICByZXR1cm4gcGF0dGVy bnNWZWN0b3I7Ci19Ci0KIEhSRVNVTFQgV2ViVmlldzo6YWRkVXNlclNjcmlwdFRvR3JvdXAoQlNU UiBncm91cE5hbWUsIElXZWJTY3JpcHRXb3JsZCogaVdvcmxkLCBCU1RSIHNvdXJjZSwgQlNUUiB1 cmwsIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCB3aGl0 ZWxpc3RDb3VudCwgQlNUUiogd2hpdGVsaXN0LAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICB1bnNpZ25lZCBibGFja2xpc3RDb3VudCwgQlNUUiogYmxhY2tsaXN0LAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBXZWJVc2VyU2NyaXB0SW5qZWN0aW9u VGltZSBpbmplY3Rpb25UaW1lKQogewotICAgIENPTVB0cjxXZWJTY3JpcHRXb3JsZD4gd29ybGQo UXVlcnksIGlXb3JsZCk7Ci0gICAgaWYgKCF3b3JsZCkKLSAgICAgICAgcmV0dXJuIEVfUE9JTlRF UjsKLQotICAgIFN0cmluZyBncm91cCA9IHRvU3RyaW5nKGdyb3VwTmFtZSk7Ci0gICAgaWYgKGdy b3VwLmlzRW1wdHkoKSkKLSAgICAgICAgcmV0dXJuIEVfSU5WQUxJREFSRzsKLQotICAgIFBhZ2VH cm91cCogcGFnZUdyb3VwID0gUGFnZUdyb3VwOjpwYWdlR3JvdXAoZ3JvdXApOwotICAgIEFTU0VS VChwYWdlR3JvdXApOwotICAgIGlmICghcGFnZUdyb3VwKQotICAgICAgICByZXR1cm4gRV9GQUlM OwotCi0gICAgcGFnZUdyb3VwLT5hZGRVc2VyU2NyaXB0VG9Xb3JsZCh3b3JsZC0+d29ybGQoKSwg dG9TdHJpbmcoc291cmNlKSwgdG9VUkwodXJsKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHRvU3RyaW5nVmVjdG9yKHdoaXRlbGlzdENvdW50LCB3aGl0ZWxpc3QpLCB0b1N0 cmluZ1ZlY3RvcihibGFja2xpc3RDb3VudCwgYmxhY2tsaXN0KSwKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGluamVjdGlvblRpbWUgPT0gV2ViSW5qZWN0QXREb2N1bWVudFN0 YXJ0ID8gSW5qZWN0QXREb2N1bWVudFN0YXJ0IDogSW5qZWN0QXREb2N1bWVudEVuZCwKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEluamVjdEluQWxsRnJhbWVzKTsKLQotICAg IHJldHVybiBTX09LOworICAgIHJldHVybiBFX05PVElNUEw7CiB9CiAKIEhSRVNVTFQgV2ViVmll dzo6YWRkVXNlclN0eWxlU2hlZXRUb0dyb3VwKEJTVFIgZ3JvdXBOYW1lLCBJV2ViU2NyaXB0V29y bGQqIGlXb3JsZCwgQlNUUiBzb3VyY2UsIEJTVFIgdXJsLAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgd2hpdGVsaXN0Q291bnQsIEJTVFIqIHdoaXRl bGlzdCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVk IGJsYWNrbGlzdENvdW50LCBCU1RSKiBibGFja2xpc3QpCiB7Ci0gICAgQ09NUHRyPFdlYlNjcmlw dFdvcmxkPiB3b3JsZChRdWVyeSwgaVdvcmxkKTsKLSAgICBpZiAoIXdvcmxkKQotICAgICAgICBy ZXR1cm4gRV9QT0lOVEVSOwotCi0gICAgU3RyaW5nIGdyb3VwID0gdG9TdHJpbmcoZ3JvdXBOYW1l KTsKLSAgICBpZiAoZ3JvdXAuaXNFbXB0eSgpKQotICAgICAgICByZXR1cm4gRV9JTlZBTElEQVJH OwotCi0gICAgUGFnZUdyb3VwKiBwYWdlR3JvdXAgPSBQYWdlR3JvdXA6OnBhZ2VHcm91cChncm91 cCk7Ci0gICAgQVNTRVJUKHBhZ2VHcm91cCk7Ci0gICAgaWYgKCFwYWdlR3JvdXApCi0gICAgICAg IHJldHVybiBFX0ZBSUw7Ci0KLSAgICBwYWdlR3JvdXAtPmFkZFVzZXJTdHlsZVNoZWV0VG9Xb3Js ZCh3b3JsZC0+d29ybGQoKSwgdG9TdHJpbmcoc291cmNlKSwgdG9VUkwodXJsKSwKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0b1N0cmluZ1ZlY3Rvcih3aGl0ZWxpc3RD b3VudCwgd2hpdGVsaXN0KSwgdG9TdHJpbmdWZWN0b3IoYmxhY2tsaXN0Q291bnQsIGJsYWNrbGlz dCksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgSW5qZWN0SW5BbGxG cmFtZXMpOwotCi0gICAgcmV0dXJuIFNfT0s7CisgICAgcmV0dXJuIEVfTk9USU1QTDsKIH0KIAog SFJFU1VMVCBXZWJWaWV3OjpyZW1vdmVVc2VyU2NyaXB0RnJvbUdyb3VwKEJTVFIgZ3JvdXBOYW1l LCBJV2ViU2NyaXB0V29ybGQqIGlXb3JsZCwgQlNUUiB1cmwpCiB7Ci0gICAgQ09NUHRyPFdlYlNj cmlwdFdvcmxkPiB3b3JsZChRdWVyeSwgaVdvcmxkKTsKLSAgICBpZiAoIXdvcmxkKQotICAgICAg ICByZXR1cm4gRV9QT0lOVEVSOwotCi0gICAgU3RyaW5nIGdyb3VwID0gdG9TdHJpbmcoZ3JvdXBO YW1lKTsKLSAgICBpZiAoZ3JvdXAuaXNFbXB0eSgpKQotICAgICAgICByZXR1cm4gRV9JTlZBTElE QVJHOwotCi0gICAgUGFnZUdyb3VwKiBwYWdlR3JvdXAgPSBQYWdlR3JvdXA6OnBhZ2VHcm91cChn cm91cCk7Ci0gICAgQVNTRVJUKHBhZ2VHcm91cCk7Ci0gICAgaWYgKCFwYWdlR3JvdXApCi0gICAg ICAgIHJldHVybiBFX0ZBSUw7Ci0KLSAgICBwYWdlR3JvdXAtPnJlbW92ZVVzZXJTY3JpcHRGcm9t V29ybGQod29ybGQtPndvcmxkKCksIHRvVVJMKHVybCkpOwotCi0gICAgcmV0dXJuIFNfT0s7Cisg ICAgcmV0dXJuIEVfTk9USU1QTDsKIH0KIAogSFJFU1VMVCBXZWJWaWV3OjpyZW1vdmVVc2VyU3R5 bGVTaGVldEZyb21Hcm91cChCU1RSIGdyb3VwTmFtZSwgSVdlYlNjcmlwdFdvcmxkKiBpV29ybGQs IEJTVFIgdXJsKQogewotICAgIENPTVB0cjxXZWJTY3JpcHRXb3JsZD4gd29ybGQoUXVlcnksIGlX b3JsZCk7Ci0gICAgaWYgKCF3b3JsZCkKLSAgICAgICAgcmV0dXJuIEVfUE9JTlRFUjsKLQotICAg IFN0cmluZyBncm91cCA9IHRvU3RyaW5nKGdyb3VwTmFtZSk7Ci0gICAgaWYgKGdyb3VwLmlzRW1w dHkoKSkKLSAgICAgICAgcmV0dXJuIEVfSU5WQUxJREFSRzsKLQotICAgIFBhZ2VHcm91cCogcGFn ZUdyb3VwID0gUGFnZUdyb3VwOjpwYWdlR3JvdXAoZ3JvdXApOwotICAgIEFTU0VSVChwYWdlR3Jv dXApOwotICAgIGlmICghcGFnZUdyb3VwKQotICAgICAgICByZXR1cm4gRV9GQUlMOwotCi0gICAg cGFnZUdyb3VwLT5yZW1vdmVVc2VyU3R5bGVTaGVldEZyb21Xb3JsZCh3b3JsZC0+d29ybGQoKSwg dG9VUkwodXJsKSk7Ci0KLSAgICByZXR1cm4gU19PSzsKKyAgICByZXR1cm4gRV9OT1RJTVBMOwog fQogCiBIUkVTVUxUIFdlYlZpZXc6OnJlbW92ZVVzZXJTY3JpcHRzRnJvbUdyb3VwKEJTVFIgZ3Jv dXBOYW1lLCBJV2ViU2NyaXB0V29ybGQqIGlXb3JsZCkKIHsKLSAgICBDT01QdHI8V2ViU2NyaXB0 V29ybGQ+IHdvcmxkKFF1ZXJ5LCBpV29ybGQpOwotICAgIGlmICghd29ybGQpCi0gICAgICAgIHJl dHVybiBFX1BPSU5URVI7Ci0KLSAgICBTdHJpbmcgZ3JvdXAgPSB0b1N0cmluZyhncm91cE5hbWUp OwotICAgIGlmIChncm91cC5pc0VtcHR5KCkpCi0gICAgICAgIHJldHVybiBFX0lOVkFMSURBUkc7 Ci0KLSAgICBQYWdlR3JvdXAqIHBhZ2VHcm91cCA9IFBhZ2VHcm91cDo6cGFnZUdyb3VwKGdyb3Vw KTsKLSAgICBBU1NFUlQocGFnZUdyb3VwKTsKLSAgICBpZiAoIXBhZ2VHcm91cCkKLSAgICAgICAg cmV0dXJuIEVfRkFJTDsKLQotICAgIHBhZ2VHcm91cC0+cmVtb3ZlVXNlclNjcmlwdHNGcm9tV29y bGQod29ybGQtPndvcmxkKCkpOwotICAgIHJldHVybiBTX09LOworICAgIHJldHVybiBFX05PVElN UEw7CiB9CiAKIEhSRVNVTFQgV2ViVmlldzo6cmVtb3ZlVXNlclN0eWxlU2hlZXRzRnJvbUdyb3Vw KEJTVFIgZ3JvdXBOYW1lLCBJV2ViU2NyaXB0V29ybGQqIGlXb3JsZCkKIHsKLSAgICBDT01QdHI8 V2ViU2NyaXB0V29ybGQ+IHdvcmxkKFF1ZXJ5LCBpV29ybGQpOwotICAgIGlmICghd29ybGQpCi0g ICAgICAgIHJldHVybiBFX1BPSU5URVI7Ci0KLSAgICBTdHJpbmcgZ3JvdXAgPSB0b1N0cmluZyhn cm91cE5hbWUpOwotICAgIGlmIChncm91cC5pc0VtcHR5KCkpCi0gICAgICAgIHJldHVybiBFX0lO VkFMSURBUkc7Ci0KLSAgICBQYWdlR3JvdXAqIHBhZ2VHcm91cCA9IFBhZ2VHcm91cDo6cGFnZUdy b3VwKGdyb3VwKTsKLSAgICBBU1NFUlQocGFnZUdyb3VwKTsKLSAgICBpZiAoIXBhZ2VHcm91cCkK LSAgICAgICAgcmV0dXJuIEVfRkFJTDsKLQotICAgIHBhZ2VHcm91cC0+cmVtb3ZlVXNlclN0eWxl U2hlZXRzRnJvbVdvcmxkKHdvcmxkLT53b3JsZCgpKTsKLSAgICByZXR1cm4gU19PSzsKKyAgICBy ZXR1cm4gRV9OT1RJTVBMOwogfQogCiBIUkVTVUxUIFdlYlZpZXc6OnJlbW92ZUFsbFVzZXJDb250 ZW50RnJvbUdyb3VwKEJTVFIgZ3JvdXBOYW1lKQogewotICAgIFN0cmluZyBncm91cCA9IHRvU3Ry aW5nKGdyb3VwTmFtZSk7Ci0gICAgaWYgKGdyb3VwLmlzRW1wdHkoKSkKLSAgICAgICAgcmV0dXJu IEVfSU5WQUxJREFSRzsKLQotICAgIFBhZ2VHcm91cCogcGFnZUdyb3VwID0gUGFnZUdyb3VwOjpw YWdlR3JvdXAoZ3JvdXApOwotICAgIEFTU0VSVChwYWdlR3JvdXApOwotICAgIGlmICghcGFnZUdy b3VwKQotICAgICAgICByZXR1cm4gRV9GQUlMOwotCi0gICAgcGFnZUdyb3VwLT5yZW1vdmVBbGxV c2VyQ29udGVudCgpOwotICAgIHJldHVybiBTX09LOworICAgIHJldHVybiBFX05PVElNUEw7CiB9 CiAKIEhSRVNVTFQgV2ViVmlldzo6aW52YWxpZGF0ZUJhY2tpbmdTdG9yZShjb25zdCBSRUNUKiBy ZWN0KQo=