78784 2012-02-16 01:04:43 -0800 [BlackBerry] Adapt to the removal of WebStringIml.h 2012-02-16 18:08:38 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 73144 1 leo.yang leo.yang charles.wei rwlbuis staikos tonikitoo zimmermann oldest_to_newest 557977 0 leo.yang 2012-02-16 01:04:43 -0800 WebKit/blackberry/WebCoreSupport/WebStringImpl.h which hasn't been upstreamed has been removed internally. We should adapt to this removal for the upstreamed part of the BlackBerry port. 557979 1 127327 leo.yang 2012-02-16 01:14:36 -0800 Created attachment 127327 Patch 558773 2 leo.yang 2012-02-16 18:08:38 -0800 Committed r108011: <http://trac.webkit.org/changeset/108011> 127327 2012-02-16 01:14:36 -0800 2012-02-16 07:45:09 -0800 Patch 0001-BlackBerry-Adapt-to-the-removal-of-WebStringIml.h.patch text/plain 7175 leo.yang RnJvbSAyN2FlODJjYmYxOWM5NzM3YTE4ZTNiNjlkZjdhNTI2Njc5Zjk4OTNjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMZW8gWWFuZyA8bGVvLnlhbmdAdG9yY2htb2JpbGUuY29tLmNu PgpEYXRlOiBUaHUsIDE2IEZlYiAyMDEyIDE3OjEzOjA2ICswODAwClN1YmplY3Q6IFtQQVRDSF0g W0JsYWNrQmVycnldIEFkYXB0IHRvIHRoZSByZW1vdmFsIG9mIFdlYlN0cmluZ0ltbC5oCiBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Nzg3ODQKClJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgoKU291cmNlL1dlYkNvcmU6CgpXZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3Jl U3VwcG9ydC9XZWJTdHJpbmdJbXBsLmggd2hpY2ggaGFzbid0IGJlZW4gdXBzdHJlYW1lZApoYXMg YmVlbiByZW1vdmVkIGludGVybmFsbHkuIFdlIHNob3VsZCBhZGFwdCB0byB0aGlzIHJlbW92YWwg Zm9yIHRoZQp1cHN0cmVhbWVkIHBhcnQgb2YgdGhlIEJsYWNrQmVycnkgcG9ydC4gQWN0dWFsbHkg V2ViU3RyaW5nSW1wbCBpcyBub3QgbmVjZXNzYXJ5CmJlY2F1c2UgaXQganVzdCBpbmhlcml0cyBm cm9tIFdURjo6U3RyaW5nSW1wbCBidXQgYWRkaW5nIG5vdGhpbmcuCgpObyBmdW5jdGlvbmFsaXRp ZXMgY2hhbmdlZCwgbm8gbmV3IHRlc3RzLgoKKiBwbGF0Zm9ybS90ZXh0L2JsYWNrYmVycnkvU3Ry aW5nQmxhY2tCZXJyeS5jcHA6CihXVEY6OlN0cmluZzo6b3BlcmF0b3IgV2ViU3RyaW5nKToKClNv dXJjZS9XZWJLaXQ6CgpibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L1dlYlN0cmluZ0ltcGwuaCB3 aGljaCBoYXNuJ3QgYmVlbiB1cHN0cmVhbWVkCmhhcyBiZWVuIHJlbW92ZWQgaW50ZXJuYWxseS4g V2Ugc2hvdWxkIGFkYXB0IHRvIHRoaXMgcmVtb3ZhbCBmb3IgdGhlCnVwc3RyZWFtZWQgcGFydCBv ZiB0aGUgQmxhY2tCZXJyeSBwb3J0LiBBY3R1YWxseSBXZWJTdHJpbmdJbXBsIGlzIG5vdCBuZWNl c3NhcnkKYmVjYXVzZSBpdCBqdXN0IGluaGVyaXRzIGZyb20gV1RGOjpTdHJpbmdJbXBsIGJ1dCBh ZGRpbmcgbm90aGluZy4KCiogYmxhY2tiZXJyeS9BcGkvV2ViU3RyaW5nLmNwcDoKKEJsYWNrQmVy cnk6OldlYktpdDo6V2ViU3RyaW5nOjpXZWJTdHJpbmcpOgooQmxhY2tCZXJyeTo6V2ViS2l0OjpX ZWJTdHJpbmc6OmVxdWFsSWdub3JpbmdDYXNlKToKKiBibGFja2JlcnJ5L0FwaS9XZWJTdHJpbmcu aDoKKFdURik6Ci0tLQogU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAg ICAgICAgICAgfCAgIDE3ICsrKysrKysrKysrKysrKysrCiAuLi4vcGxhdGZvcm0vdGV4dC9ibGFj a2JlcnJ5L1N0cmluZ0JsYWNrQmVycnkuY3BwICB8ICAgIDQgKy0tLQogU291cmNlL1dlYktpdC9D aGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDE4ICsrKysrKysrKysrKysr KysrKwogU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJTdHJpbmcuY3BwICAgICAgICAg fCAgIDExICsrKysrLS0tLS0tCiBTb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlN0cmlu Zy5oICAgICAgICAgICB8ICAgMTYgKysrKysrKysrKystLS0tLQogNSBmaWxlcyBjaGFuZ2VkLCA1 MiBpbnNlcnRpb25zKCspLCAxNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGQzODRhZC4u NDcyMWQ3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTAyLTE2ICBMZW8gWWFu ZyAgPGxlby55YW5nQHRvcmNobW9iaWxlLmNvbS5jbj4KKworICAgICAgICBbQmxhY2tCZXJyeV0g QWRhcHQgdG8gdGhlIHJlbW92YWwgb2YgV2ViU3RyaW5nSW1sLmgKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc4Nzg0CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1 cHBvcnQvV2ViU3RyaW5nSW1wbC5oIHdoaWNoIGhhc24ndCBiZWVuIHVwc3RyZWFtZWQKKyAgICAg ICAgaGFzIGJlZW4gcmVtb3ZlZCBpbnRlcm5hbGx5LiBXZSBzaG91bGQgYWRhcHQgdG8gdGhpcyBy ZW1vdmFsIGZvciB0aGUKKyAgICAgICAgdXBzdHJlYW1lZCBwYXJ0IG9mIHRoZSBCbGFja0JlcnJ5 IHBvcnQuIEFjdHVhbGx5IFdlYlN0cmluZ0ltcGwgaXMgbm90IG5lY2Vzc2FyeQorICAgICAgICBi ZWNhdXNlIGl0IGp1c3QgaW5oZXJpdHMgZnJvbSBXVEY6OlN0cmluZ0ltcGwgYnV0IGFkZGluZyBu b3RoaW5nLgorCisgICAgICAgIE5vIGZ1bmN0aW9uYWxpdGllcyBjaGFuZ2VkLCBubyBuZXcgdGVz dHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS90ZXh0L2JsYWNrYmVycnkvU3RyaW5nQmxhY2tCZXJy eS5jcHA6CisgICAgICAgIChXVEY6OlN0cmluZzo6b3BlcmF0b3IgV2ViU3RyaW5nKToKKwogMjAx Mi0wMi0xNSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAg IEZpeCB1bnVzZWQgcGFyYW1ldGVyIHdhcm5pbmdzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vdGV4dC9ibGFja2JlcnJ5L1N0cmluZ0JsYWNrQmVycnkuY3BwIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9ibGFja2JlcnJ5L1N0cmluZ0JsYWNrQmVycnkuY3BwCmlu ZGV4IDUyZDEzMGMuLjNlZmY2NmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L3RleHQvYmxhY2tiZXJyeS9TdHJpbmdCbGFja0JlcnJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS90ZXh0L2JsYWNrYmVycnkvU3RyaW5nQmxhY2tCZXJyeS5jcHAKQEAgLTIwLDEw ICsyMCw4IEBACiAjaW5jbHVkZSAiUGxhdGZvcm1TdHJpbmcuaCIKIAogI2luY2x1ZGUgIldlYlN0 cmluZy5oIgotI2luY2x1ZGUgIldlYlN0cmluZ0ltcGwuaCIKIAogdXNpbmcgQmxhY2tCZXJyeTo6 V2ViS2l0OjpXZWJTdHJpbmc7Ci11c2luZyBCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlN0cmluZ0lt cGw7CiAKIG5hbWVzcGFjZSBXVEYgewogCkBAIC0zNCw3ICszMiw3IEBAIFN0cmluZzo6U3RyaW5n KGNvbnN0IFdlYlN0cmluZyYgd2ViU3RyaW5nKQogCiBTdHJpbmc6Om9wZXJhdG9yIFdlYlN0cmlu ZygpIGNvbnN0CiB7Ci0gICAgV2ViU3RyaW5nIHdlYlN0cmluZyhzdGF0aWNfY2FzdDxXZWJTdHJp bmdJbXBsKj4obV9pbXBsLmdldCgpKSk7CisgICAgV2ViU3RyaW5nIHdlYlN0cmluZyhtX2ltcGwu Z2V0KCkpOwogICAgIHJldHVybiB3ZWJTdHJpbmc7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggNjdmNDY4ZC4u MDU5MTBmOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNl L1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMi0wMi0xNiAgTGVvIFlhbmcg IDxsZW8ueWFuZ0B0b3JjaG1vYmlsZS5jb20uY24+CisKKyAgICAgICAgW0JsYWNrQmVycnldIEFk YXB0IHRvIHRoZSByZW1vdmFsIG9mIFdlYlN0cmluZ0ltbC5oCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03ODc4NAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGJsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvV2Vi U3RyaW5nSW1wbC5oIHdoaWNoIGhhc24ndCBiZWVuIHVwc3RyZWFtZWQKKyAgICAgICAgaGFzIGJl ZW4gcmVtb3ZlZCBpbnRlcm5hbGx5LiBXZSBzaG91bGQgYWRhcHQgdG8gdGhpcyByZW1vdmFsIGZv ciB0aGUKKyAgICAgICAgdXBzdHJlYW1lZCBwYXJ0IG9mIHRoZSBCbGFja0JlcnJ5IHBvcnQuIEFj dHVhbGx5IFdlYlN0cmluZ0ltcGwgaXMgbm90IG5lY2Vzc2FyeQorICAgICAgICBiZWNhdXNlIGl0 IGp1c3QgaW5oZXJpdHMgZnJvbSBXVEY6OlN0cmluZ0ltcGwgYnV0IGFkZGluZyBub3RoaW5nLgor CisgICAgICAgICogYmxhY2tiZXJyeS9BcGkvV2ViU3RyaW5nLmNwcDoKKyAgICAgICAgKEJsYWNr QmVycnk6OldlYktpdDo6V2ViU3RyaW5nOjpXZWJTdHJpbmcpOgorICAgICAgICAoQmxhY2tCZXJy eTo6V2ViS2l0OjpXZWJTdHJpbmc6OmVxdWFsSWdub3JpbmdDYXNlKToKKyAgICAgICAgKiBibGFj a2JlcnJ5L0FwaS9XZWJTdHJpbmcuaDoKKyAgICAgICAgKFdURik6CisKIDIwMTItMDItMTUgIExl byBZYW5nICA8bGVvLnlhbmdAdG9yY2htb2JpbGUuY29tLmNuPgogCiAgICAgICAgIFtCbGFja0Jl cnJ5XSBSZW1vdmUgUmVzb3VyY2VIb2xkZXJJbXBsLmNwcCBmcm9tIGJ1aWxkIHN5c3RlbQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJTdHJpbmcuY3BwIGIvU291 cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJTdHJpbmcuY3BwCmluZGV4IDc0MjlkODYuLjdm YzlhMWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViU3RyaW5n LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlN0cmluZy5jcHAKQEAg LTE5LDcgKzE5LDYgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJXZWJTdHJpbmcu aCIKIAotI2luY2x1ZGUgIldlYlN0cmluZ0ltcGwuaCIKICNpbmNsdWRlIDx3dGYvdGV4dC9DU3Ry aW5nLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAKQEAgLTI3LDIxICsyNiwy MSBAQCBuYW1lc3BhY2UgQmxhY2tCZXJyeSB7CiBuYW1lc3BhY2UgV2ViS2l0IHsKIAogV2ViU3Ry aW5nOjpXZWJTdHJpbmcoY29uc3QgY2hhciogbGF0aW4xKQotICAgIDogbV9pbXBsKHN0YXRpY19j YXN0PFdlYlN0cmluZ0ltcGwqPihXVEY6OlN0cmluZ0ltcGw6OmNyZWF0ZShsYXRpbjEpLnJlbGVh c2VSZWYoKSkpCisgICAgOiBtX2ltcGwoU3RyaW5nSW1wbDo6Y3JlYXRlKGxhdGluMSkubGVha1Jl ZigpKQogewogfQogCiBXZWJTdHJpbmc6OldlYlN0cmluZyhjb25zdCBjaGFyKiBsYXRpbjEsIHVu c2lnbmVkIGxlbmd0aCkKLSAgICA6IG1faW1wbChzdGF0aWNfY2FzdDxXZWJTdHJpbmdJbXBsKj4o V1RGOjpTdHJpbmdJbXBsOjpjcmVhdGUobGF0aW4xLCBsZW5ndGgpLnJlbGVhc2VSZWYoKSkpCisg ICAgOiBtX2ltcGwoU3RyaW5nSW1wbDo6Y3JlYXRlKGxhdGluMSwgbGVuZ3RoKS5sZWFrUmVmKCkp CiB7CiB9CiAKIFdlYlN0cmluZzo6V2ViU3RyaW5nKGNvbnN0IHVuc2lnbmVkIHNob3J0KiB1dGYx NiwgdW5zaWduZWQgbGVuZ3RoKQotICAgIDogbV9pbXBsKHN0YXRpY19jYXN0PFdlYlN0cmluZ0lt cGwqPihXVEY6OlN0cmluZ0ltcGw6OmNyZWF0ZSh1dGYxNiwgbGVuZ3RoKS5yZWxlYXNlUmVmKCkp KQorICAgIDogbV9pbXBsKFN0cmluZ0ltcGw6OmNyZWF0ZSh1dGYxNiwgbGVuZ3RoKS5sZWFrUmVm KCkpCiB7CiB9CiAKLVdlYlN0cmluZzo6V2ViU3RyaW5nKFdlYlN0cmluZ0ltcGwqIGltcGwpCitX ZWJTdHJpbmc6OldlYlN0cmluZyhTdHJpbmdJbXBsKiBpbXBsKQogICAgIDogbV9pbXBsKGltcGwp CiB7CiAgICAgaWYgKG1faW1wbCkKQEAgLTEwOSw3ICsxMDgsNyBAQCBib29sIFdlYlN0cmluZzo6 ZXF1YWwoY29uc3QgY2hhciogdXRmOCkgY29uc3QKIAogYm9vbCBXZWJTdHJpbmc6OmVxdWFsSWdu b3JpbmdDYXNlKGNvbnN0IGNoYXIqIHV0ZjgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIFdURjo6ZXF1 YWxJZ25vcmluZ0Nhc2UobV9pbXBsLCB1dGY4KTsKKyAgICByZXR1cm4gV1RGOjplcXVhbElnbm9y aW5nQ2FzZSh1dGY4LCBXVEY6OlN0cmluZyhtX2ltcGwpKTsKIH0KIAogfSAvLyBuYW1lc3BhY2Ug V2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlN0cmlu Zy5oIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJTdHJpbmcuaAppbmRleCBmZTI4 YmRlLi5mZTQzYzI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dl YlN0cmluZy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViU3RyaW5nLmgK QEAgLTIyLDExICsyMiwxNCBAQAogI2luY2x1ZGUgIkJsYWNrQmVycnlHbG9iYWwuaCIKICNpbmNs dWRlIDxzdHJpbmc+CiAKKy8vIE5vdCBmb3IgcHVibGljIEFQSSBwdXJwb3NlLgorbmFtZXNwYWNl IFdURiB7CitjbGFzcyBTdHJpbmdJbXBsOworfQorCiBuYW1lc3BhY2UgQmxhY2tCZXJyeSB7CiBu YW1lc3BhY2UgV2ViS2l0IHsKIAotY2xhc3MgV2ViU3RyaW5nSW1wbDsKLQogY2xhc3MgQkxBQ0tC RVJSWV9FWFBPUlQgV2ViU3RyaW5nIHsKIHB1YmxpYzoKICAgICBXZWJTdHJpbmcoKSA6IG1faW1w bCgwKSB7IH0KQEAgLTM0LDcgKzM3LDYgQEAgcHVibGljOgogICAgIFdlYlN0cmluZyhjb25zdCBj aGFyKiBsYXRpbjEpOwogICAgIFdlYlN0cmluZyhjb25zdCBjaGFyKiBsYXRpbjEsIHVuc2lnbmVk IGxlbmd0aCk7CiAgICAgV2ViU3RyaW5nKGNvbnN0IHVuc2lnbmVkIHNob3J0KiB1dGYxNiwgdW5z aWduZWQgbGVuZ3RoKTsKLSAgICBXZWJTdHJpbmcoV2ViU3RyaW5nSW1wbCopOwogICAgIFdlYlN0 cmluZyhjb25zdCBXZWJTdHJpbmcmKTsKICAgICBXZWJTdHJpbmcmIG9wZXJhdG9yPShjb25zdCBX ZWJTdHJpbmcmKTsKICAgICBzdGQ6OnN0cmluZyB1dGY4KCkgY29uc3Q7CkBAIC00NCw5ICs0Niwx MyBAQCBwdWJsaWM6CiAgICAgYm9vbCBpc0VtcHR5KCkgY29uc3Q7CiAgICAgYm9vbCBlcXVhbChj b25zdCBjaGFyKiB1dGY4KSBjb25zdDsKICAgICBib29sIGVxdWFsSWdub3JpbmdDYXNlKGNvbnN0 IGNoYXIqIHV0ZjgpIGNvbnN0OwotICAgIFdlYlN0cmluZ0ltcGwqIGltcGwoKSBjb25zdCB7IHJl dHVybiBtX2ltcGw7IH0KKworICAgIC8vIE5vdCBmb3IgcHVibGljIEFQSSBwdXJwb3NlLgorICAg IFdlYlN0cmluZyhXVEY6OlN0cmluZ0ltcGwqKTsKKyAgICBXVEY6OlN0cmluZ0ltcGwqIGltcGwo KSBjb25zdCB7IHJldHVybiBtX2ltcGw7IH0KKwogcHJpdmF0ZToKLSAgICBXZWJTdHJpbmdJbXBs KiBtX2ltcGw7CisgICAgV1RGOjpTdHJpbmdJbXBsKiBtX2ltcGw7CiB9OwogfSAvLyBuYW1lc3Bh Y2UgV2ViS2l0CiB9IC8vIG5hbWVzcGFjZSBCbGFja0JlcnJ5Ci0tIAoxLjcuNS40Cgo=