83357 2012-04-06 02:34:36 -0700 [BlackBerry] Restore some code which was deleted by accident. 2012-04-06 17:30:58 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 charles.wei charles.wei jasonliuwebkit leo.yang liachen rwlbuis staikos tonikitoo webkit.review.bot oldest_to_newest 597262 0 charles.wei 2012-04-06 02:34:36 -0700 Patch 1aa4a1189cca46995f667bb4508e35fefb41796d was landed upstream without cherry-picking to our internal repository. And then patch b640ce59827022e1a0681f6cecdf7bf6efe2aa20 tries to synchronize our internal repository with the upstreaming repository, that reverted some of the code of the former patch, which is wrong. Need to restore the code. 597263 1 135994 charles.wei 2012-04-06 02:40:06 -0700 Created attachment 135994 Patch 597318 2 135994 rwlbuis 2012-04-06 05:58:22 -0700 Comment on attachment 135994 Patch LGTM. 597801 3 135994 charles.wei 2012-04-06 16:29:11 -0700 Comment on attachment 135994 Patch Thanks for the recite, Rob. 597846 4 135994 webkit.review.bot 2012-04-06 17:30:54 -0700 Comment on attachment 135994 Patch Clearing flags on attachment: 135994 Committed r113524: <http://trac.webkit.org/changeset/113524> 597847 5 webkit.review.bot 2012-04-06 17:30:58 -0700 All reviewed patches have been landed. Closing bug. 135994 2012-04-06 02:40:06 -0700 2012-04-06 17:30:54 -0700 Patch bug-83357-20120406174539.patch text/plain 4517 charles.wei U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzNDA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDc2Mzc1MWVmODIwMThj NGI5YWVjMTkyZGY3NmM4OWFhODE2NjBjYi4uNWVkOTUzNzAzMDA1MzNmYzRiM2UwMTQxNjM2ZTFi OWE1NDEzZmU2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTA0LTA2ICBDaGFy bGVzIFdlaSAgPGNoYXJsZXMud2VpQHRvcmNobW9iaWxlLmNvbS5jbj4KKworICAgICAgICBbQmxh Y2tCZXJyeV0gUmVzdG9yZSBzb21lIGNvZGUgd2hpY2ggd2FzIGRlbGV0ZWQgYnkgYWNjaWRlbnQu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MzM1Nwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0 ZXN0cywganVzdCBCbGFja0JlcnJ5IGJ1aWxkIGZpeC4KKworICAgICAgICAqIHBsYXRmb3JtL25l dHdvcmsvYmxhY2tiZXJyeS9SZXNvdXJjZVJlcXVlc3QuaDoKKyAgICAgICAgKFJlc291cmNlUmVx dWVzdCk6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L1Jlc291cmNlUmVx dWVzdEJsYWNrQmVycnkuY3BwOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3Jl OjptaW1lVHlwZVJlcXVlc3RUeXBlTWFwKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVx dWVzdDo6dGFyZ2V0VHlwZUZyb21NaW1lVHlwZSk6CisKIDIwMTItMDQtMDUgIERhdmlkIEJhcnRv biAgPGRiYXJ0b25AbWF0aHNjcmliZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIGludHJpbnNpYyBw YWRkaW5nIGZyb20gY29udGVudEJveFJlY3QoKSwgZXRjLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L1Jlc291cmNlUmVxdWVzdC5oIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L1Jlc291cmNlUmVxdWVzdC5o CmluZGV4IDNiOGE0Nzk4MmNkMTBiZTc0Y2Y3ZmZhOGVkMjJmNTdjOGUxOWI3ODIuLmEwMmYwZDAx NjAzZDZjYTc1MTViNWJkNmU2ZGMyMGNkY2UxY2ExZGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9SZXNvdXJjZVJlcXVlc3QuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvUmVzb3VyY2VSZXF1ZXN0 LmgKQEAgLTEyMiw2ICsxMjIsOCBAQCBwdWJsaWM6CiAgICAgVGFyZ2V0VHlwZSB0YXJnZXRUeXBl KCkgY29uc3QgeyByZXR1cm4gbV90YXJnZXRUeXBlOyB9CiAgICAgdm9pZCBzZXRUYXJnZXRUeXBl KFRhcmdldFR5cGUgdHlwZSkgeyBtX3RhcmdldFR5cGUgPSB0eXBlOyB9CiAKKyAgICBzdGF0aWMg VGFyZ2V0VHlwZSB0YXJnZXRUeXBlRnJvbU1pbWVUeXBlKGNvbnN0IFN0cmluZyYgbWltZVR5cGUp OworCiBwcml2YXRlOgogICAgIGZyaWVuZCBjbGFzcyBSZXNvdXJjZVJlcXVlc3RCYXNlOwogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvUmVz b3VyY2VSZXF1ZXN0QmxhY2tCZXJyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL2JsYWNrYmVycnkvUmVzb3VyY2VSZXF1ZXN0QmxhY2tCZXJyeS5jcHAKaW5kZXggNDQyMTg0 N2Q1NzZiOTViNzI0Y2IxNGJjYzgxYzcxYTY3ZjQ0NjYxMi4uOTdkNmIyODcyOTcxNzVlN2NjOTg4 ZDQ4NmE2ODczODQ3MDNlZDc4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9ibGFja2JlcnJ5L1Jlc291cmNlUmVxdWVzdEJsYWNrQmVycnkuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9SZXNvdXJjZVJlcXVlc3RC bGFja0JlcnJ5LmNwcApAQCAtMjMsNiArMjMsNyBAQAogI2luY2x1ZGUgIkNvb2tpZU1hbmFnZXIu aCIKICNpbmNsdWRlIDxCbGFja0JlcnJ5UGxhdGZvcm1DbGllbnQuaD4KICNpbmNsdWRlIDxuZXR3 b3JrL05ldHdvcmtSZXF1ZXN0Lmg+CisjaW5jbHVkZSA8d3RmL0hhc2hNYXAuaD4KICNpbmNsdWRl IDx3dGYvdGV4dC9DU3RyaW5nLmg+CiAKIHVzaW5nIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpOZXR3 b3JrUmVxdWVzdDsKQEAgLTEwMCw2ICsxMDEsNDcgQEAgc3RhdGljIGlubGluZSBOZXR3b3JrUmVx dWVzdDo6VGFyZ2V0VHlwZSBwbGF0Zm9ybVRhcmdldFR5cGVGb3JSZXF1ZXN0KGNvbnN0IFJlc28K ICAgICB9CiB9CiAKK3R5cGVkZWYgSGFzaE1hcDxTdHJpbmcsIFJlc291cmNlUmVxdWVzdDo6VGFy Z2V0VHlwZT4gTWltZVR5cGVSZXNvdXJjZVJlcXVlc3RUeXBlTWFwOworCitzdGF0aWMgY29uc3Qg TWltZVR5cGVSZXNvdXJjZVJlcXVlc3RUeXBlTWFwJiBtaW1lVHlwZVJlcXVlc3RUeXBlTWFwKCkK K3sKKyAgICBzdGF0aWMgTWltZVR5cGVSZXNvdXJjZVJlcXVlc3RUeXBlTWFwKiBtYXAgPSAwOwor ICAgIGlmICghbWFwKSB7CisgICAgICAgIG1hcCA9IG5ldyBNaW1lVHlwZVJlc291cmNlUmVxdWVz dFR5cGVNYXA7CisKKyAgICAgICAgaWYgKG1hcCkgeworICAgICAgICAgICAgLy8gVGhlIGxpc3Qg aGVyZSBzaG91bGQgbWF0Y2ggZXh0ZW5zaW9uTWFwW10gaW4gTUlNRVR5cGVSZWdpc3RyeUJsYWNr QmVycnkuY3BwCisgICAgICAgICAgICBtYXAtPmFkZChTdHJpbmcoInRleHQvY3NzIiksIFJlc291 cmNlUmVxdWVzdDo6VGFyZ2V0SXNTdHlsZVNoZWV0KTsKKyAgICAgICAgICAgIG1hcC0+YWRkKFN0 cmluZygiYXBwbGljYXRpb24veC1qYXZhc2NyaXB0IiksIFJlc291cmNlUmVxdWVzdDo6VGFyZ2V0 SXNTY3JpcHQpOworICAgICAgICAgICAgbWFwLT5hZGQoU3RyaW5nKCJpbWFnZS9ibXAiKSwgUmVz b3VyY2VSZXF1ZXN0OjpUYXJnZXRJc0ltYWdlKTsKKyAgICAgICAgICAgIG1hcC0+YWRkKFN0cmlu ZygiaW1hZ2UvZ2lmIiksIFJlc291cmNlUmVxdWVzdDo6VGFyZ2V0SXNJbWFnZSk7CisgICAgICAg ICAgICBtYXAtPmFkZChTdHJpbmcoImltYWdlL3gtaWNvbiIpLCBSZXNvdXJjZVJlcXVlc3Q6OlRh cmdldElzSW1hZ2UpOworICAgICAgICAgICAgbWFwLT5hZGQoU3RyaW5nKCJpbWFnZS9qcGVnIiks IFJlc291cmNlUmVxdWVzdDo6VGFyZ2V0SXNJbWFnZSk7CisgICAgICAgICAgICBtYXAtPmFkZChT dHJpbmcoImltYWdlL3BuZyIpLCBSZXNvdXJjZVJlcXVlc3Q6OlRhcmdldElzSW1hZ2UpOworICAg ICAgICAgICAgbWFwLT5hZGQoU3RyaW5nKCJpbWFnZS94LXBvcnRhYmxlLWJpdG1hcCIpLCBSZXNv dXJjZVJlcXVlc3Q6OlRhcmdldElzSW1hZ2UpOworICAgICAgICAgICAgbWFwLT5hZGQoU3RyaW5n KCJpbWFnZS94LXBvcnRhYmxlLWdyYXltYXAiKSwgUmVzb3VyY2VSZXF1ZXN0OjpUYXJnZXRJc0lt YWdlKTsKKyAgICAgICAgICAgIG1hcC0+YWRkKFN0cmluZygiaW1hZ2UveC1wb3J0YWJsZS1waXht YXAiKSwgUmVzb3VyY2VSZXF1ZXN0OjpUYXJnZXRJc0ltYWdlKTsKKyAgICAgICAgICAgIG1hcC0+ YWRkKFN0cmluZygiaW1hZ2Uvc3ZnK3htbCIpLCBSZXNvdXJjZVJlcXVlc3Q6OlRhcmdldElzSW1h Z2UpOworICAgICAgICAgICAgbWFwLT5hZGQoU3RyaW5nKCJpbWFnZS90aWZmIiksIFJlc291cmNl UmVxdWVzdDo6VGFyZ2V0SXNJbWFnZSk7CisgICAgICAgICAgICBtYXAtPmFkZChTdHJpbmcoImlt YWdlL3gteGJpdG1hcCIpLCBSZXNvdXJjZVJlcXVlc3Q6OlRhcmdldElzSW1hZ2UpOworICAgICAg ICAgICAgbWFwLT5hZGQoU3RyaW5nKCJpbWFnZS94LXhwbSIpLCBSZXNvdXJjZVJlcXVlc3Q6OlRh cmdldElzSW1hZ2UpOworICAgICAgICB9CisgICAgfQorCisgICAgcmV0dXJuICptYXA7Cit9CisK K1Jlc291cmNlUmVxdWVzdDo6VGFyZ2V0VHlwZSBSZXNvdXJjZVJlcXVlc3Q6OnRhcmdldFR5cGVG cm9tTWltZVR5cGUoY29uc3QgU3RyaW5nJiBtaW1lVHlwZSkKK3sKKyAgICBjb25zdCBNaW1lVHlw ZVJlc291cmNlUmVxdWVzdFR5cGVNYXAmIG1hcCA9IG1pbWVUeXBlUmVxdWVzdFR5cGVNYXAoKTsK KworICAgIE1pbWVUeXBlUmVzb3VyY2VSZXF1ZXN0VHlwZU1hcDo6Y29uc3RfaXRlcmF0b3IgaXRl ciA9IG1hcC5maW5kKG1pbWVUeXBlKTsKKyAgICBpZiAoaXRlciA9PSBtYXAuZW5kKCkpCisgICAg ICAgIHJldHVybiBSZXNvdXJjZVJlcXVlc3Q6OlRhcmdldElzVW5zcGVjaWZpZWQ7CisKKyAgICBy ZXR1cm4gaXRlci0+c2Vjb25kOworfQorCiB2b2lkIFJlc291cmNlUmVxdWVzdDo6aW5pdGlhbGl6 ZVBsYXRmb3JtUmVxdWVzdChOZXR3b3JrUmVxdWVzdCYgcGxhdGZvcm1SZXF1ZXN0LCBib29sIGNv b2tpZXNFbmFibGVkLCBib29sIGlzSW5pdGlhbCwgYm9vbCBpc1JlZGlyZWN0KSBjb25zdAogewog ICAgIC8vIElmIHRoaXMgaXMgdGhlIGluaXRpYWwgbG9hZCwgc2tpcCB0aGUgcmVxdWVzdCBib2R5 IGFuZCBoZWFkZXJzLgo=