38907 2010-05-11 07:23:16 -0700 PluginView contains JSC-specific code 2010-05-20 02:06:31 -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 223916 0 steveblock 2010-05-11 07:23:16 -0700 PluginView contains JSC-specific code. This causes build errors on Android, which can use JSC or V8. This can be solved by guarding calls to JSLock with USE(JSC) and refactoring to use platform independent methods. 223939 1 55705 steveblock 2010-05-11 08:44:57 -0700 Created attachment 55705 Patch 228259 2 55705 eric 2010-05-20 01:18:50 -0700 Comment on attachment 55705 Patch LGTM. 228278 3 55705 steveblock 2010-05-20 02:06:21 -0700 Comment on attachment 55705 Patch Clearing flags on attachment: 55705 Committed r59826: <http://trac.webkit.org/changeset/59826> 228279 4 steveblock 2010-05-20 02:06:31 -0700 All reviewed patches have been landed. Closing bug. 55705 2010-05-11 08:44:57 -0700 2010-05-20 02:06:21 -0700 Patch bug-38907-20100511164454.patch text/plain 5944 steveblock SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1OTE1MSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMTAtMDUtMTEgIFN0ZXZlIEJsb2NrICA8c3RldmVibG9ja0Bnb29n bGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFBsdWdpblZpZXcgY29udGFpbnMgSlNDLXNwZWNpZmljIGNvZGUKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM4OTA3CisKKyAgICAgICAgQnVpbGQgZml4 IG9ubHksIG5vIG5ldyB0ZXN0cy4KKworICAgICAgICAqIHBsdWdpbnMvUGx1Z2luVmlldy5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5WaWV3OjpzdGFydCk6CisgICAgICAgIChXZWJDb3Jl OjpQbHVnaW5WaWV3OjpzdG9wKToKKyAgICAgICAgKFdlYkNvcmU6OlBsdWdpblZpZXc6OnBlcmZv cm1SZXF1ZXN0KToKKyAgICAgICAgKiBwbHVnaW5zL1BsdWdpblZpZXcuaDoKKwogMjAxMC0wNS0x MSAgQmVuamFtaW4gUG91bGFpbiAgPGJlbmphbWluLnBvdWxhaW5Abm9raWEuY29tPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuLgpJbmRleDogV2ViQ29y ZS9wbHVnaW5zL1BsdWdpblZpZXcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGx1Z2lucy9Q bHVnaW5WaWV3LmNwcAkocmV2aXNpb24gNTkxNTApCisrKyBXZWJDb3JlL3BsdWdpbnMvUGx1Z2lu Vmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQyLDggKzQyLDYgQEAKICNpbmNsdWRlICJIVE1M TmFtZXMuaCIKICNpbmNsdWRlICJIVE1MUGx1Z0luRWxlbWVudC5oIgogI2luY2x1ZGUgIkltYWdl LmgiCi0jaW5jbHVkZSAiSlNET01CaW5kaW5nLmgiCi0jaW5jbHVkZSAiSlNET01XaW5kb3cuaCIK ICNpbmNsdWRlICJLZXlib2FyZEV2ZW50LmgiCiAjaW5jbHVkZSAiTUlNRVR5cGVSZWdpc3RyeS5o IgogI2luY2x1ZGUgIk1vdXNlRXZlbnQuaCIKQEAgLTYwLDIyICs1OCwyNyBAQAogI2luY2x1ZGUg IlNjcmlwdFZhbHVlLmgiCiAjaW5jbHVkZSAiU2VjdXJpdHlPcmlnaW4uaCIKICNpbmNsdWRlICJT ZXR0aW5ncy5oIgotI2luY2x1ZGUgImNfaW5zdGFuY2UuaCIKICNpbmNsdWRlICJucHJ1bnRpbWVf aW1wbC5oIgotI2luY2x1ZGUgInJ1bnRpbWVfcm9vdC5oIgotI2luY2x1ZGUgPHJ1bnRpbWUvSlNM b2NrLmg+Ci0jaW5jbHVkZSA8cnVudGltZS9KU1ZhbHVlLmg+CiAjaW5jbHVkZSA8d3RmL0FTQ0lJ Q1R5cGUuaD4KIAogI2lmIE9TKFdJTkRPV1MpICYmIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJ KQogI2luY2x1ZGUgIlBsdWdpbk1lc3NhZ2VUaHJvdHRsZXJXaW4uaCIKICNlbmRpZgogCisjaWYg VVNFKEpTQykKKyNpbmNsdWRlICJKU0RPTUJpbmRpbmcuaCIKKyNpbmNsdWRlICJKU0RPTVdpbmRv dy5oIgorI2luY2x1ZGUgImNfaW5zdGFuY2UuaCIKKyNpbmNsdWRlICJydW50aW1lX3Jvb3QuaCIK KyNpbmNsdWRlIDxydW50aW1lL0pTTG9jay5oPgorI2luY2x1ZGUgPHJ1bnRpbWUvSlNWYWx1ZS5o PgorCiB1c2luZyBKU0M6OkV4ZWNTdGF0ZTsKIHVzaW5nIEpTQzo6SlNMb2NrOwogdXNpbmcgSlND OjpKU09iamVjdDsKIHVzaW5nIEpTQzo6SlNWYWx1ZTsKIHVzaW5nIEpTQzo6VVN0cmluZzsKKyNl bmRpZgogCiB1c2luZyBzdGQ6Om1pbjsKIApAQCAtMjI5LDcgKzIzMiw5IEBAIGJvb2wgUGx1Z2lu Vmlldzo6c3RhcnQoKQogICAgIE5QRXJyb3IgbnBFcnI7CiAgICAgewogICAgICAgICBQbHVnaW5W aWV3OjpzZXRDdXJyZW50UGx1Z2luVmlldyh0aGlzKTsKKyNpZiBVU0UoSlNDKQogICAgICAgICBK U0M6OkpTTG9jazo6RHJvcEFsbExvY2tzIGRyb3BBbGxMb2NrcyhKU0M6OlNpbGVuY2VBc3NlcnRp b25zT25seSk7CisjZW5kaWYKICAgICAgICAgc2V0Q2FsbGluZ1BsdWdpbih0cnVlKTsKICAgICAg ICAgbnBFcnIgPSBtX3BsdWdpbi0+cGx1Z2luRnVuY3MoKS0+bmV3cCgoTlBNSU1FVHlwZSltX21p bWVUeXBlLnV0ZjgoKS5kYXRhKCksIG1faW5zdGFuY2UsIG1fbW9kZSwgbV9wYXJhbUNvdW50LCBt X3BhcmFtTmFtZXMsIG1fcGFyYW1WYWx1ZXMsIE5VTEwpOwogICAgICAgICBzZXRDYWxsaW5nUGx1 Z2luKGZhbHNlKTsKQEAgLTMzMCw3ICszMzUsOSBAQCB2b2lkIFBsdWdpblZpZXc6OnN0b3AoKQog CiAgICAgbV9pc1N0YXJ0ZWQgPSBmYWxzZTsKIAorI2lmIFVTRShKU0MpCiAgICAgSlNDOjpKU0xv Y2s6OkRyb3BBbGxMb2NrcyBkcm9wQWxsTG9ja3MoSlNDOjpTaWxlbmNlQXNzZXJ0aW9uc09ubHkp OworI2VuZGlmCiAKICNpZiBFTkFCTEUoTkVUU0NBUEVfUExVR0lOX0FQSSkKICNpZmRlZiBYUF9X SU4KQEAgLTQxMywyMCArNDIwLDYgQEAgc3RhdGljIGNoYXIqIGNyZWF0ZVVURjhTdHJpbmcoY29u c3QgU3RyaQogICAgIHJldHVybiByZXN1bHQ7CiB9CiAKLXN0YXRpYyBib29sIGdldFN0cmluZyhT Y3JpcHRDb250cm9sbGVyKiBwcm94eSwgSlNWYWx1ZSByZXN1bHQsIFN0cmluZyYgc3RyaW5nKQot ewotICAgIGlmICghcHJveHkgfHwgIXJlc3VsdCB8fCByZXN1bHQuaXNVbmRlZmluZWQoKSkKLSAg ICAgICAgcmV0dXJuIGZhbHNlOwotICAgIEpTTG9jayBsb2NrKEpTQzo6U2lsZW5jZUFzc2VydGlv bnNPbmx5KTsKLQotICAgIEV4ZWNTdGF0ZSogZXhlYyA9IHByb3h5LT5nbG9iYWxPYmplY3QocGx1 Z2luV29ybGQoKSktPmdsb2JhbEV4ZWMoKTsKLSAgICBVU3RyaW5nIHVzdHJpbmcgPSByZXN1bHQu dG9TdHJpbmcoZXhlYyk7Ci0gICAgZXhlYy0+Y2xlYXJFeGNlcHRpb24oKTsKLQotICAgIHN0cmlu ZyA9IHVzdHJpbmdUb1N0cmluZyh1c3RyaW5nKTsKLSAgICByZXR1cm4gdHJ1ZTsKLX0KLQogdm9p ZCBQbHVnaW5WaWV3OjpwZXJmb3JtUmVxdWVzdChQbHVnaW5SZXF1ZXN0KiByZXF1ZXN0KQogewog ICAgIGlmICghbV9pc1N0YXJ0ZWQpCkBAIC00NTksNyArNDUyLDkgQEAgdm9pZCBQbHVnaW5WaWV3 OjpwZXJmb3JtUmVxdWVzdChQbHVnaW5SZQogICAgICAgICAgICAgLy8gRklYTUU6IDxyZGFyOi8v cHJvYmxlbS80ODA3NDY5PiBUaGlzIHNob3VsZCBiZSBzZW50IHdoZW4gdGhlIGRvY3VtZW50IGhh cyBmaW5pc2hlZCBsb2FkaW5nCiAgICAgICAgICAgICBpZiAocmVxdWVzdC0+c2VuZE5vdGlmaWNh dGlvbigpKSB7CiAgICAgICAgICAgICAgICAgUGx1Z2luVmlldzo6c2V0Q3VycmVudFBsdWdpblZp ZXcodGhpcyk7CisjaWYgVVNFKEpTQykKICAgICAgICAgICAgICAgICBKU0M6OkpTTG9jazo6RHJv cEFsbExvY2tzIGRyb3BBbGxMb2NrcyhKU0M6OlNpbGVuY2VBc3NlcnRpb25zT25seSk7CisjZW5k aWYKICAgICAgICAgICAgICAgICBzZXRDYWxsaW5nUGx1Z2luKHRydWUpOwogICAgICAgICAgICAg ICAgIG1fcGx1Z2luLT5wbHVnaW5GdW5jcygpLT51cmxub3RpZnkobV9pbnN0YW5jZSwgcmVxdWVz dFVSTC5zdHJpbmcoKS51dGY4KCkuZGF0YSgpLCBOUFJFU19ET05FLCByZXF1ZXN0LT5ub3RpZnlE YXRhKCkpOwogICAgICAgICAgICAgICAgIHNldENhbGxpbmdQbHVnaW4oZmFsc2UpOwpAQCAtNDc1 LDEzICs0NzAsMTggQEAgdm9pZCBQbHVnaW5WaWV3OjpwZXJmb3JtUmVxdWVzdChQbHVnaW5SZQog ICAgIAogICAgIC8vIEV4ZWN1dGluZyBhIHNjcmlwdCBjYW4gY2F1c2UgdGhlIHBsdWdpbiB2aWV3 IHRvIGJlIGRlc3Ryb3llZCwgc28gd2Uga2VlcCBhIHJlZmVyZW5jZSB0byB0aGUgcGFyZW50IGZy YW1lLgogICAgIFJlZlB0cjxGcmFtZT4gcGFyZW50RnJhbWUgPSBtX3BhcmVudEZyYW1lOwotICAg IEpTVmFsdWUgcmVzdWx0ID0gbV9wYXJlbnRGcmFtZS0+c2NyaXB0KCktPmV4ZWN1dGVTY3JpcHQo anNTdHJpbmcsIHJlcXVlc3QtPnNob3VsZEFsbG93UG9wdXBzKCkpLmpzVmFsdWUoKTsKKyAgICBT Y3JpcHRWYWx1ZSByZXN1bHQgPSBtX3BhcmVudEZyYW1lLT5zY3JpcHQoKS0+ZXhlY3V0ZVNjcmlw dChqc1N0cmluZywgcmVxdWVzdC0+c2hvdWxkQWxsb3dQb3B1cHMoKSk7CiAKICAgICBpZiAodGFy Z2V0RnJhbWVOYW1lLmlzTnVsbCgpKSB7CiAgICAgICAgIFN0cmluZyByZXN1bHRTdHJpbmc7CiAK KyNpZiBVU0UoSlNDKQorICAgICAgICBTY3JpcHRTdGF0ZSogc2NyaXB0U3RhdGUgPSBwYXJlbnRG cmFtZS0+c2NyaXB0KCktPmdsb2JhbE9iamVjdChwbHVnaW5Xb3JsZCgpKS0+Z2xvYmFsRXhlYygp OworI2VsaWYgVVNFKFY4KQorICAgICAgICBTY3JpcHRTdGF0ZSogc2NyaXB0U3RhdGUgPSAwOyAv LyBOb3QgdXNlZCB3aXRoIFY4CisjZW5kaWYKICAgICAgICAgQ1N0cmluZyBjc3RyOwotICAgICAg ICBpZiAoZ2V0U3RyaW5nKHBhcmVudEZyYW1lLT5zY3JpcHQoKSwgcmVzdWx0LCByZXN1bHRTdHJp bmcpKQorICAgICAgICBpZiAocmVzdWx0LmdldFN0cmluZyhzY3JpcHRTdGF0ZSwgcmVzdWx0U3Ry aW5nKSkKICAgICAgICAgICAgIGNzdHIgPSByZXN1bHRTdHJpbmcudXRmOCgpOwogCiAgICAgICAg IFJlZlB0cjxQbHVnaW5TdHJlYW0+IHN0cmVhbSA9IFBsdWdpblN0cmVhbTo6Y3JlYXRlKHRoaXMs IG1fcGFyZW50RnJhbWUuZ2V0KCksIHJlcXVlc3QtPmZyYW1lTG9hZFJlcXVlc3QoKS5yZXNvdXJj ZVJlcXVlc3QoKSwgcmVxdWVzdC0+c2VuZE5vdGlmaWNhdGlvbigpLCByZXF1ZXN0LT5ub3RpZnlE YXRhKCksIHBsdWdpbigpLT5wbHVnaW5GdW5jcygpLCBpbnN0YW5jZSgpLCBtX3BsdWdpbi0+cXVp cmtzKCkpOwpAQCAtNzI2LDYgKzcyNiw3IEBAIHZvaWQgUGx1Z2luVmlldzo6c2V0SmF2YVNjcmlw dFBhdXNlZChib28KICAgICAgICAgbV9yZXF1ZXN0VGltZXIuc3RhcnRPbmVTaG90KDApOwogfQog CisjaWYgVVNFKEpTQykKIFBhc3NSZWZQdHI8SlNDOjpCaW5kaW5nczo6SW5zdGFuY2U+IFBsdWdp blZpZXc6OmJpbmRpbmdJbnN0YW5jZSgpCiB7CiAjaWYgRU5BQkxFKE5FVFNDQVBFX1BMVUdJTl9B UEkpCkBAIC03NjksNiArNzcwLDcgQEAgUGFzc1JlZlB0cjxKU0M6OkJpbmRpbmdzOjpJbnN0YW5j ZT4gUGx1ZwogICAgIHJldHVybiAwOwogI2VuZGlmCiB9CisjZW5kaWYKIAogdm9pZCBQbHVnaW5W aWV3OjpkaXNjb25uZWN0U3RyZWFtKFBsdWdpblN0cmVhbSogc3RyZWFtKQogewpJbmRleDogV2Vi Q29yZS9wbHVnaW5zL1BsdWdpblZpZXcuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsdWdpbnMv UGx1Z2luVmlldy5oCShyZXZpc2lvbiA1OTE1MCkKKysrIFdlYkNvcmUvcGx1Z2lucy9QbHVnaW5W aWV3LmgJKHdvcmtpbmcgY29weSkKQEAgLTU1LDExICs1NSwxMyBAQCB0eXBlZGVmIFBsYXRmb3Jt V2lkZ2V0IFBsYXRmb3JtUGx1Z2luV2lkCiAjZW5kaWYKICNlbmRpZgogCisjaWYgVVNFKEpTQykK IG5hbWVzcGFjZSBKU0MgewogICAgIG5hbWVzcGFjZSBCaW5kaW5ncyB7CiAgICAgICAgIGNsYXNz IEluc3RhbmNlOwogICAgIH0KIH0KKyNlbmRpZgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAg Y2xhc3MgRWxlbWVudDsKQEAgLTEyMiw3ICsxMjQsOSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAg ICAgICAgIHZvaWQgc2V0TlBXaW5kb3dSZWN0KGNvbnN0IEludFJlY3QmKTsKICAgICAgICAgc3Rh dGljIFBsdWdpblZpZXcqIGN1cnJlbnRQbHVnaW5WaWV3KCk7CiAKKyNpZiBVU0UoSlNDKQogICAg ICAgICBQYXNzUmVmUHRyPEpTQzo6QmluZGluZ3M6Okluc3RhbmNlPiBiaW5kaW5nSW5zdGFuY2Uo KTsKKyNlbmRpZgogCiAgICAgICAgIFBsdWdpblN0YXR1cyBzdGF0dXMoKSBjb25zdCB7IHJldHVy biBtX3N0YXR1czsgfQogCg==