36214 2010-03-17 04:36:32 -0700 WebCore/bridge uses bzero, which is not available on Android without extra includes 2010-03-17 05:12:22 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Android Android RESOLVED FIXED P2 Normal --- 1 steveblock webkit-unassigned android-webkit-unforking steveblock oldest_to_newest 200677 0 steveblock 2010-03-17 04:36:32 -0700 WebCore/bridge uses bzero. Android's stdlib.h will soon be modified to not include strings.h, in order to reduce pollution of the standard C namespace. Without strings.h being included from stdlib.h, use of bzero would require additional local includes on Android. Rather than add includes, we should replace calls to bzero with memset, as this is what is used throughout WebCore common code. 200679 1 50893 steveblock 2010-03-17 04:40:46 -0700 Created attachment 50893 Patch 200688 2 50893 jorlow 2010-03-17 04:50:31 -0700 Comment on attachment 50893 Patch Looks like a no-op and consistency is good. r=me 200699 3 steveblock 2010-03-17 05:12:22 -0700 Committed r56105: <http://trac.webkit.org/changeset/56105> 50893 2010-03-17 04:40:46 -0700 2010-03-17 04:50:31 -0700 Patch bug-36214-20100317114043.patch text/plain 6640 steveblock SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NjEwMykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjMgQEAKKzIwMTAtMDMtMTcgIFN0ZXZlIEJsb2NrICA8c3RldmVibG9ja0Bnb29n bGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFJlcGxhY2UgaW5zdGFuY2VzIG9mIGJ6ZXJvIGluIFdlYkNvcmUvYnJpZGdlIGNvbW1vbiBjb2Rl IHdpdGggbWVtc2V0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0zNjIxNAorCisgICAgICAgIFN5bnRheCBjaGFuZ2Ugb25seSwgbm8gbmV3IHRlc3RzLgor CisgICAgICAgICogYnJpZGdlL2puaS9KTklVdGlsaXR5LmNwcDoKKyAgICAgICAgKEpTQzo6Qmlu ZGluZ3M6OmdldEpOSUZpZWxkKToKKyAgICAgICAgKiBicmlkZ2Uvam5pL2pzYy9KTklCcmlkZ2VK U0MuY3BwOgorICAgICAgICAoSmF2YUZpZWxkOjpkaXNwYXRjaFZhbHVlRnJvbUluc3RhbmNlKToK KyAgICAgICAgKiBicmlkZ2Uvam5pL2pzYy9KTklVdGlsaXR5UHJpdmF0ZS5jcHA6CisgICAgICAg IChKU0M6OkJpbmRpbmdzOjpjb252ZXJ0VmFsdWVUb0pWYWx1ZSk6CisgICAgICAgICogYnJpZGdl L2puaS92OC9KTklVdGlsaXR5UHJpdmF0ZS5jcHA6CisgICAgICAgIChKU0M6OkJpbmRpbmdzOjpj b252ZXJ0TlBWYXJpYW50VG9KVmFsdWUpOgorICAgICAgICAqIGJyaWRnZS9qbmkvdjgvSmF2YU5Q T2JqZWN0VjguY3BwOgorICAgICAgICAoSlNDOjpCaW5kaW5nczo6QWxsb2NKYXZhTlBPYmplY3Qp OgorCiAyMDEwLTAzLTE3ICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgog CiAgICAgICAgIFJldmlld2VkIGJ5IFRpbW90aHkgSGF0Y2hlci4KSW5kZXg6IFdlYkNvcmUvYnJp ZGdlL2puaS9KTklVdGlsaXR5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JyaWRnZS9qbmkv Sk5JVXRpbGl0eS5jcHAJKHJldmlzaW9uIDU2MTAzKQorKysgV2ViQ29yZS9icmlkZ2Uvam5pL0pO SVV0aWxpdHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yODMsNyArMjgzLDcgQEAganZhbHVlIGdl dEpOSUZpZWxkKGpvYmplY3Qgb2JqLCBKTklUeXBlIAogICAgIEpOSUVudiogZW52ID0gZ2V0Sk5J RW52KCk7CiAgICAganZhbHVlIHJlc3VsdDsKIAotICAgIGJ6ZXJvKCZyZXN1bHQsIHNpemVvZihq dmFsdWUpKTsKKyAgICBtZW1zZXQoJnJlc3VsdCwgMCwgc2l6ZW9mKGp2YWx1ZSkpOwogICAgIGlm IChvYmogJiYganZtICYmIGVudikgewogICAgICAgICBqY2xhc3MgY2xzID0gZW52LT5HZXRPYmpl Y3RDbGFzcyhvYmopOwogICAgICAgICBpZiAoY2xzKSB7CkluZGV4OiBXZWJDb3JlL2JyaWRnZS9q bmkvanNjL0pOSUJyaWRnZUpTQy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9icmlkZ2Uvam5p L2pzYy9KTklCcmlkZ2VKU0MuY3BwCShyZXZpc2lvbiA1NjEwMykKKysrIFdlYkNvcmUvYnJpZGdl L2puaS9qc2MvSk5JQnJpZGdlSlNDLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzUsNyArNzUsNyBA QCBqdmFsdWUgSmF2YUZpZWxkOjpkaXNwYXRjaFZhbHVlRnJvbUluc3RhCiAgICAgSk5JRW52KiBl bnYgPSBnZXRKTklFbnYoKTsKICAgICBqdmFsdWUgcmVzdWx0OwogCi0gICAgYnplcm8oJnJlc3Vs dCwgc2l6ZW9mKGp2YWx1ZSkpOworICAgIG1lbXNldCgmcmVzdWx0LCAwLCBzaXplb2YoanZhbHVl KSk7CiAgICAgamNsYXNzIGNscyA9IGVudi0+R2V0T2JqZWN0Q2xhc3MoZmllbGRKSW5zdGFuY2Up OwogICAgIGlmIChjbHMpIHsKICAgICAgICAgam1ldGhvZElEIG1pZCA9IGVudi0+R2V0TWV0aG9k SUQoY2xzLCBuYW1lLCBzaWcpOwpJbmRleDogV2ViQ29yZS9icmlkZ2Uvam5pL2pzYy9KTklVdGls aXR5UHJpdmF0ZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9icmlkZ2Uvam5pL2pzYy9KTklV dGlsaXR5UHJpdmF0ZS5jcHAJKHJldmlzaW9uIDU2MTAzKQorKysgV2ViQ29yZS9icmlkZ2Uvam5p L2pzYy9KTklVdGlsaXR5UHJpdmF0ZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE3NCw3ICsxNzQs NyBAQCBqdmFsdWUgY29udmVydFZhbHVlVG9KVmFsdWUoRXhlY1N0YXRlKiBlCiAgICAgSlNMb2Nr IGxvY2soU2lsZW5jZUFzc2VydGlvbnNPbmx5KTsKIAogICAgIGp2YWx1ZSByZXN1bHQ7Ci0gICAg Ynplcm8oJnJlc3VsdCwgc2l6ZW9mKGp2YWx1ZSkpOworICAgIG1lbXNldCgmcmVzdWx0LCAwLCBz aXplb2YoanZhbHVlKSk7CiAKICAgICBzd2l0Y2ggKGpuaVR5cGUpIHsKICAgICBjYXNlIGFycmF5 X3R5cGU6CkluZGV4OiBXZWJDb3JlL2JyaWRnZS9qbmkvdjgvSk5JVXRpbGl0eVByaXZhdGUuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYnJpZGdlL2puaS92OC9KTklVdGlsaXR5UHJpdmF0ZS5j cHAJKHJldmlzaW9uIDU2MTAzKQorKysgV2ViQ29yZS9icmlkZ2Uvam5pL3Y4L0pOSVV0aWxpdHlQ cml2YXRlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzEsNyArNzEsNyBAQCBqdmFsdWUgY29udmVy dE5QVmFyaWFudFRvSlZhbHVlKE5QVmFyaWFuCiAgICAgICAgICAgICAgICAgICAgIHJlc3VsdC5s ID0gamF2YVN0cmluZzsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9IGVsc2UgaWYg KCFyZXN1bHQubCkKLSAgICAgICAgICAgICAgICBiemVybygmcmVzdWx0LCBzaXplb2YoanZhbHVl KSk7IC8vIEhhbmRsZSBpdCB0aGUgc2FtZSBhcyBhIHZvaWQgY2FzZQorICAgICAgICAgICAgICAg IG1lbXNldCgmcmVzdWx0LCAwLCBzaXplb2YoanZhbHVlKSk7IC8vIEhhbmRsZSBpdCB0aGUgc2Ft ZSBhcyBhIHZvaWQgY2FzZQogICAgICAgICB9CiAgICAgICAgIGJyZWFrOwogCkBAIC04MCw3ICs4 MCw3IEBAIGp2YWx1ZSBjb252ZXJ0TlBWYXJpYW50VG9KVmFsdWUoTlBWYXJpYW4KICAgICAgICAg ICAgIGlmICh0eXBlID09IE5QVmFyaWFudFR5cGVfQm9vbCkKICAgICAgICAgICAgICAgICByZXN1 bHQueiA9IE5QVkFSSUFOVF9UT19CT09MRUFOKHZhbHVlKTsKICAgICAgICAgICAgIGVsc2UKLSAg ICAgICAgICAgICAgICBiemVybygmcmVzdWx0LCBzaXplb2YoanZhbHVlKSk7IC8vIGFzIHZvaWQg Y2FzZQorICAgICAgICAgICAgICAgIG1lbXNldCgmcmVzdWx0LCAwLCBzaXplb2YoanZhbHVlKSk7 IC8vIGFzIHZvaWQgY2FzZQogICAgICAgICB9CiAgICAgICAgIGJyZWFrOwogCkBAIC04OSw3ICs4 OSw3IEBAIGp2YWx1ZSBjb252ZXJ0TlBWYXJpYW50VG9KVmFsdWUoTlBWYXJpYW4KICAgICAgICAg ICAgIGlmICh0eXBlID09IE5QVmFyaWFudFR5cGVfSW50MzIpCiAgICAgICAgICAgICAgICAgcmVz dWx0LmIgPSBzdGF0aWNfY2FzdDxjaGFyPihOUFZBUklBTlRfVE9fSU5UMzIodmFsdWUpKTsKICAg ICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICBiemVybygmcmVzdWx0LCBzaXplb2YoanZh bHVlKSk7CisgICAgICAgICAgICAgICAgbWVtc2V0KCZyZXN1bHQsIDAsIHNpemVvZihqdmFsdWUp KTsKICAgICAgICAgfQogICAgICAgICBicmVhazsKIApAQCAtOTgsNyArOTgsNyBAQCBqdmFsdWUg Y29udmVydE5QVmFyaWFudFRvSlZhbHVlKE5QVmFyaWFuCiAgICAgICAgICAgICBpZiAodHlwZSA9 PSBOUFZhcmlhbnRUeXBlX0ludDMyKQogICAgICAgICAgICAgICAgIHJlc3VsdC5jID0gc3RhdGlj X2Nhc3Q8Y2hhcj4oTlBWQVJJQU5UX1RPX0lOVDMyKHZhbHVlKSk7CiAgICAgICAgICAgICBlbHNl Ci0gICAgICAgICAgICAgICAgYnplcm8oJnJlc3VsdCwgc2l6ZW9mKGp2YWx1ZSkpOworICAgICAg ICAgICAgICAgIG1lbXNldCgmcmVzdWx0LCAwLCBzaXplb2YoanZhbHVlKSk7CiAgICAgICAgIH0K ICAgICAgICAgYnJlYWs7CiAKQEAgLTEwNyw3ICsxMDcsNyBAQCBqdmFsdWUgY29udmVydE5QVmFy aWFudFRvSlZhbHVlKE5QVmFyaWFuCiAgICAgICAgICAgICBpZiAodHlwZSA9PSBOUFZhcmlhbnRU eXBlX0ludDMyKQogICAgICAgICAgICAgICAgIHJlc3VsdC5zID0gc3RhdGljX2Nhc3Q8anNob3J0 PihOUFZBUklBTlRfVE9fSU5UMzIodmFsdWUpKTsKICAgICAgICAgICAgIGVsc2UKLSAgICAgICAg ICAgICAgICBiemVybygmcmVzdWx0LCBzaXplb2YoanZhbHVlKSk7CisgICAgICAgICAgICAgICAg bWVtc2V0KCZyZXN1bHQsIDAsIHNpemVvZihqdmFsdWUpKTsKICAgICAgICAgfQogICAgICAgICBi cmVhazsKIApAQCAtMTE2LDcgKzExNiw3IEBAIGp2YWx1ZSBjb252ZXJ0TlBWYXJpYW50VG9KVmFs dWUoTlBWYXJpYW4KICAgICAgICAgICAgIGlmICh0eXBlID09IE5QVmFyaWFudFR5cGVfSW50MzIp CiAgICAgICAgICAgICAgICAgcmVzdWx0LmkgPSBzdGF0aWNfY2FzdDxqaW50PihOUFZBUklBTlRf VE9fSU5UMzIodmFsdWUpKTsKICAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICBiemVy bygmcmVzdWx0LCBzaXplb2YoanZhbHVlKSk7CisgICAgICAgICAgICAgICAgbWVtc2V0KCZyZXN1 bHQsIDAsIHNpemVvZihqdmFsdWUpKTsKICAgICAgICAgfQogICAgICAgICBicmVhazsKIApAQCAt MTI3LDcgKzEyNyw3IEBAIGp2YWx1ZSBjb252ZXJ0TlBWYXJpYW50VG9KVmFsdWUoTlBWYXJpYW4K ICAgICAgICAgICAgIGVsc2UgaWYgKHR5cGUgPT0gTlBWYXJpYW50VHlwZV9Eb3VibGUpCiAgICAg ICAgICAgICAgICAgcmVzdWx0LmogPSBzdGF0aWNfY2FzdDxqbG9uZz4oTlBWQVJJQU5UX1RPX0RP VUJMRSh2YWx1ZSkpOwogICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgIGJ6ZXJvKCZy ZXN1bHQsIHNpemVvZihqdmFsdWUpKTsKKyAgICAgICAgICAgICAgICBtZW1zZXQoJnJlc3VsdCwg MCwgc2l6ZW9mKGp2YWx1ZSkpOwogICAgICAgICB9CiAgICAgICAgIGJyZWFrOwogCkBAIC0xMzgs NyArMTM4LDcgQEAganZhbHVlIGNvbnZlcnROUFZhcmlhbnRUb0pWYWx1ZShOUFZhcmlhbgogICAg ICAgICAgICAgZWxzZSBpZiAodHlwZSA9PSBOUFZhcmlhbnRUeXBlX0RvdWJsZSkKICAgICAgICAg ICAgICAgICByZXN1bHQuZiA9IHN0YXRpY19jYXN0PGpmbG9hdD4oTlBWQVJJQU5UX1RPX0RPVUJM RSh2YWx1ZSkpOwogICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgIGJ6ZXJvKCZyZXN1 bHQsIHNpemVvZihqdmFsdWUpKTsKKyAgICAgICAgICAgICAgICBtZW1zZXQoJnJlc3VsdCwgMCwg c2l6ZW9mKGp2YWx1ZSkpOwogICAgICAgICB9CiAgICAgICAgIGJyZWFrOwogCkBAIC0xNDksNyAr MTQ5LDcgQEAganZhbHVlIGNvbnZlcnROUFZhcmlhbnRUb0pWYWx1ZShOUFZhcmlhbgogICAgICAg ICAgICAgZWxzZSBpZiAodHlwZSA9PSBOUFZhcmlhbnRUeXBlX0RvdWJsZSkKICAgICAgICAgICAg ICAgICByZXN1bHQuZCA9IHN0YXRpY19jYXN0PGpkb3VibGU+KE5QVkFSSUFOVF9UT19ET1VCTEUo dmFsdWUpKTsKICAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICBiemVybygmcmVzdWx0 LCBzaXplb2YoanZhbHVlKSk7CisgICAgICAgICAgICAgICAgbWVtc2V0KCZyZXN1bHQsIDAsIHNp emVvZihqdmFsdWUpKTsKICAgICAgICAgfQogICAgICAgICBicmVhazsKIApAQCAtMTU5LDcgKzE1 OSw3IEBAIGp2YWx1ZSBjb252ZXJ0TlBWYXJpYW50VG9KVmFsdWUoTlBWYXJpYW4KICAgICBkZWZh dWx0OgogICAgIGNhc2Ugdm9pZF90eXBlOgogICAgICAgICB7Ci0gICAgICAgICAgICBiemVybygm cmVzdWx0LCBzaXplb2YoanZhbHVlKSk7CisgICAgICAgICAgICBtZW1zZXQoJnJlc3VsdCwgMCwg c2l6ZW9mKGp2YWx1ZSkpOwogICAgICAgICB9CiAgICAgICAgIGJyZWFrOwogICAgIH0KSW5kZXg6 IFdlYkNvcmUvYnJpZGdlL2puaS92OC9KYXZhTlBPYmplY3RWOC5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViQ29yZS9icmlkZ2Uvam5pL3Y4L0phdmFOUE9iamVjdFY4LmNwcAkocmV2aXNpb24gNTYxMDMp CisrKyBXZWJDb3JlL2JyaWRnZS9qbmkvdjgvSmF2YU5QT2JqZWN0VjguY3BwCSh3b3JraW5nIGNv cHkpCkBAIC00MSw3ICs0MSw3IEBAIHN0YXRpYyBOUE9iamVjdCogQWxsb2NKYXZhTlBPYmplY3Qo TlBQLCAKICAgICBKYXZhTlBPYmplY3QqIG9iaiA9IHN0YXRpY19jYXN0PEphdmFOUE9iamVjdCo+ KG1hbGxvYyhzaXplb2YoSmF2YU5QT2JqZWN0KSkpOwogICAgIGlmICghb2JqKQogICAgICAgICBy ZXR1cm4gMDsKLSAgICBiemVybyhvYmosIHNpemVvZihKYXZhTlBPYmplY3QpKTsKKyAgICBtZW1z ZXQob2JqLCAwLCBzaXplb2YoSmF2YU5QT2JqZWN0KSk7CiAgICAgcmV0dXJuIHJlaW50ZXJwcmV0 X2Nhc3Q8TlBPYmplY3QqPihvYmopOwogfQogCg==