30275 2009-10-10 05:30:14 -0700 Build fix if Netscape plugin support is turned off 2009-10-10 09:21:13 -0700 1 1 1 Unclassified WebKit Plug-ins 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 1 laszlo.gombos webkit-unassigned oldest_to_newest 153861 0 laszlo.gombos 2009-10-10 05:30:14 -0700 r49158, r49159 and r49169 caused a build break for configurations where Netscape plugin support is turned off. 153862 1 40989 laszlo.gombos 2009-10-10 05:39:20 -0700 Created attachment 40989 proposed patch In addition to fixing the build break with guards remove notImplemented() from PluginViewNone.cpp and make them just just be empty functions. The later change was suggested by Darin in an earlier similar bug (see https://bugs.webkit.org/show_bug.cgi?id=27940#c5). - As some functions were already empty in PluginViewNone.cpp, this also makes the PluginViewNone.cpp more consistent. 153878 2 40989 laszlo.gombos 2009-10-10 09:20:54 -0700 Comment on attachment 40989 proposed patch Committed as http://trac.webkit.org/changeset/49418 40989 2009-10-10 05:39:20 -0700 2009-10-10 09:20:54 -0700 proposed patch patch_patch_30275.txt text/plain 5380 laszlo.gombos SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0OTQxNSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzggQEAKKzIwMDktMTAtMTAgIExhc3psbyBHb21ib3MgIDxsYXN6bG8uMS5nb21i b3NAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEJ1aWxkIGZpeCBpZiBOZXRzY2FwZSBwbHVnaW4gc3VwcG9ydCBpcyB0dXJuZWQgb2Zm CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMDI3NQor CisgICAgICAgIEluIGFkZGl0aW9uIHRvIGZpeGluZyB0aGUgYnVpbGQgYnJlYWsgd2l0aCBndWFy ZHMKKyAgICAgICAgcmVtb3ZlIG5vdEltcGxlbWVudGVkKCkgZnJvbSBQbHVnaW5WaWV3Tm9uZS5j cHAgYW5kCisgICAgICAgIG1ha2UgdGhlbSBqdXN0IGp1c3QgYmUgZW1wdHkgZnVuY3Rpb25zLgor CisgICAgICAgICogcGx1Z2lucy9QbHVnaW5WaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBs dWdpblZpZXc6OmhhbmRsZUV2ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OlBsdWdpblZpZXc6OlBs dWdpblZpZXcpOgorICAgICAgICAqIHBsdWdpbnMvUGx1Z2luVmlldy5oOgorICAgICAgICAqIHBs dWdpbnMvUGx1Z2luVmlld05vbmUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGx1Z2luVmlldzo6 c2V0Rm9jdXMpOgorICAgICAgICAoV2ViQ29yZTo6UGx1Z2luVmlldzo6c2hvdyk6CisgICAgICAg IChXZWJDb3JlOjpQbHVnaW5WaWV3OjpoaWRlKToKKyAgICAgICAgKFdlYkNvcmU6OlBsdWdpblZp ZXc6OnBhaW50KToKKyAgICAgICAgKFdlYkNvcmU6OlBsdWdpblZpZXc6OmhhbmRsZUtleWJvYXJk RXZlbnQpOgorICAgICAgICAoV2ViQ29yZTo6UGx1Z2luVmlldzo6aGFuZGxlTW91c2VFdmVudCk6 CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5WaWV3OjpzZXRQYXJlbnQpOgorICAgICAgICAoV2Vi Q29yZTo6UGx1Z2luVmlldzo6c2V0TlBXaW5kb3dSZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OlBs dWdpblZpZXc6OmhhbmRsZVBvc3RSZWFkRmlsZSk6CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5W aWV3OjpnZXRWYWx1ZSk6CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5WaWV3OjpnZXRWYWx1ZVN0 YXRpYyk6CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5WaWV3OjppbnZhbGlkYXRlUmVjdCk6Cisg ICAgICAgIChXZWJDb3JlOjpQbHVnaW5WaWV3OjppbnZhbGlkYXRlUmVnaW9uKToKKyAgICAgICAg KFdlYkNvcmU6OlBsdWdpblZpZXc6OmZvcmNlUmVkcmF3KToKKyAgICAgICAgKFdlYkNvcmU6OlBs dWdpblZpZXc6OnBsYXRmb3JtU3RhcnQpOgorICAgICAgICAoV2ViQ29yZTo6UGx1Z2luVmlldzo6 cGxhdGZvcm1EZXN0cm95KToKKyAgICAgICAgKFdlYkNvcmU6OlBsdWdpblZpZXc6OnNldFBhcmVu dFZpc2libGUpOgorICAgICAgICAoV2ViQ29yZTo6UGx1Z2luVmlldzo6dXBkYXRlUGx1Z2luV2lk Z2V0KToKKwogMjAwOS0xMC0xMCAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IE9saXZlciBIdW50LgpJbmRleDogV2ViQ29yZS9wbHVnaW5zL1Bs dWdpblZpZXcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGx1Z2lucy9QbHVnaW5WaWV3LmNw cAkocmV2aXNpb24gNDk0MTQpCisrKyBXZWJDb3JlL3BsdWdpbnMvUGx1Z2luVmlldy5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTE0OCw3ICsxNDgsNyBAQCB2b2lkIFBsdWdpblZpZXc6OmhhbmRsZUV2 ZW50KEV2ZW50KiBldmVuCiAgICAgICAgIGhhbmRsZU1vdXNlRXZlbnQoc3RhdGljX2Nhc3Q8TW91 c2VFdmVudCo+KGV2ZW50KSk7CiAgICAgZWxzZSBpZiAoZXZlbnQtPmlzS2V5Ym9hcmRFdmVudCgp KQogICAgICAgICBoYW5kbGVLZXlib2FyZEV2ZW50KHN0YXRpY19jYXN0PEtleWJvYXJkRXZlbnQq PihldmVudCkpOwotI2lmIGRlZmluZWQoUV9XU19YMTEpCisjaWYgZGVmaW5lZChRX1dTX1gxMSkg JiYgRU5BQkxFKE5FVFNDQVBFX1BMVUdJTl9BUEkpCiAgICAgZWxzZSBpZiAoZXZlbnQtPnR5cGUo KSA9PSBldmVudE5hbWVzKCkuRE9NRm9jdXNPdXRFdmVudCkKICAgICAgICAgaGFuZGxlRm9jdXNP dXRFdmVudCgpOwogICAgIGVsc2UgaWYgKGV2ZW50LT50eXBlKCkgPT0gZXZlbnROYW1lcygpLkRP TUZvY3VzSW5FdmVudCkKQEAgLTgxOCw3ICs4MTgsNyBAQCBQbHVnaW5WaWV3OjpQbHVnaW5WaWV3 KEZyYW1lKiBwYXJlbnRGcmFtCiAgICAgLCBtX2RyYXdpbmdNb2RlbChOUERyYXdpbmdNb2RlbCgt MSkpCiAgICAgLCBtX2V2ZW50TW9kZWwoTlBFdmVudE1vZGVsKC0xKSkKICNlbmRpZgotI2lmIGRl ZmluZWQoUV9XU19YMTEpCisjaWYgZGVmaW5lZChRX1dTX1gxMSkgJiYgRU5BQkxFKE5FVFNDQVBF X1BMVUdJTl9BUEkpCiAgICAgLCBtX2hhc1BlbmRpbmdHZW9tZXRyeUNoYW5nZShmYWxzZSkKICAg ICAsIG1fZHJhd2FibGUoMCkKICAgICAsIG1fdmlzdWFsKDApCkluZGV4OiBXZWJDb3JlL3BsdWdp bnMvUGx1Z2luVmlldy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGx1Z2lucy9QbHVnaW5WaWV3 LmgJKHJldmlzaW9uIDQ5NDE0KQorKysgV2ViQ29yZS9wbHVnaW5zL1BsdWdpblZpZXcuaAkod29y a2luZyBjb3B5KQpAQCAtMjU1LDcgKzI1NSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAg ICAgICB2b2lkIGhhbmRsZUtleWJvYXJkRXZlbnQoS2V5Ym9hcmRFdmVudCopOwogICAgICAgICB2 b2lkIGhhbmRsZU1vdXNlRXZlbnQoTW91c2VFdmVudCopOwotI2lmIGRlZmluZWQoUV9XU19YMTEp CisjaWYgZGVmaW5lZChRX1dTX1gxMSkgJiYgRU5BQkxFKE5FVFNDQVBFX1BMVUdJTl9BUEkpCiAg ICAgICAgIHZvaWQgaGFuZGxlRm9jdXNJbkV2ZW50KCk7CiAgICAgICAgIHZvaWQgaGFuZGxlRm9j dXNPdXRFdmVudCgpOwogI2VuZGlmCkBAIC0zMjQsNyArMzI0LDcgQEAgcHJpdmF0ZToKICAgICAg ICAgUG9pbnQgZ2xvYmFsTW91c2VQb3NGb3JQbHVnaW4oKSBjb25zdDsKICNlbmRpZgogCi0jaWYg ZGVmaW5lZChRX1dTX1gxMSkKKyNpZiBkZWZpbmVkKFFfV1NfWDExKSAmJiBFTkFCTEUoTkVUU0NB UEVfUExVR0lOX0FQSSkKICAgICAgICAgYm9vbCBtX2hhc1BlbmRpbmdHZW9tZXRyeUNoYW5nZTsK ICAgICAgICAgUGl4bWFwIG1fZHJhd2FibGU7CiAgICAgICAgIFZpc3VhbCogbV92aXN1YWw7Cklu ZGV4OiBXZWJDb3JlL3BsdWdpbnMvUGx1Z2luVmlld05vbmUuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvcGx1Z2lucy9QbHVnaW5WaWV3Tm9uZS5jcHAJKHJldmlzaW9uIDQ5NDE0KQorKysgV2Vi Q29yZS9wbHVnaW5zL1BsdWdpblZpZXdOb25lLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjYsMTE0 ICsyNiw5MCBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIlBsdWdpblZpZXcuaCIK IAotI2luY2x1ZGUgIk5vdEltcGxlbWVudGVkLmgiCi0jaW5jbHVkZSAiUGx1Z2luUGFja2FnZS5o IgotCiB1c2luZyBuYW1lc3BhY2UgV1RGOwogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIHZvaWQg UGx1Z2luVmlldzo6c2V0Rm9jdXMoKQogewotICAgIG5vdEltcGxlbWVudGVkKCk7CiB9CiAKIHZv aWQgUGx1Z2luVmlldzo6c2hvdygpCiB7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKIH0KIAogdm9p ZCBQbHVnaW5WaWV3OjpoaWRlKCkKIHsKLSAgICBub3RJbXBsZW1lbnRlZCgpOwogfQogCiB2b2lk IFBsdWdpblZpZXc6OnBhaW50KEdyYXBoaWNzQ29udGV4dCosIGNvbnN0IEludFJlY3QmKQogewot ICAgIG5vdEltcGxlbWVudGVkKCk7CiB9CiAKIHZvaWQgUGx1Z2luVmlldzo6aGFuZGxlS2V5Ym9h cmRFdmVudChLZXlib2FyZEV2ZW50KikKIHsKLSAgICBub3RJbXBsZW1lbnRlZCgpOwogfQogCiB2 b2lkIFBsdWdpblZpZXc6OmhhbmRsZU1vdXNlRXZlbnQoTW91c2VFdmVudCopCiB7Ci0gICAgbm90 SW1wbGVtZW50ZWQoKTsKIH0KIAogdm9pZCBQbHVnaW5WaWV3OjpzZXRQYXJlbnQoU2Nyb2xsVmll dyopCiB7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKIH0KIAogdm9pZCBQbHVnaW5WaWV3OjpzZXRO UFdpbmRvd1JlY3QoY29uc3QgSW50UmVjdCYpCiB7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKIH0K IAogTlBFcnJvciBQbHVnaW5WaWV3OjpoYW5kbGVQb3N0UmVhZEZpbGUoVmVjdG9yPGNoYXI+Jiwg dWludDMyLCBjb25zdCBjaGFyKikKIHsKLSAgICBub3RJbXBsZW1lbnRlZCgpOwotCiAgICAgcmV0 dXJuIDA7CiB9CiAKIE5QRXJyb3IgUGx1Z2luVmlldzo6Z2V0VmFsdWUoTlBOVmFyaWFibGUsIHZv aWQqKQogewotICAgIG5vdEltcGxlbWVudGVkKCk7CiAgICAgcmV0dXJuIDA7CiB9CiAKICNpZiBF TkFCTEUoTkVUU0NBUEVfUExVR0lOX0FQSSkKIE5QRXJyb3IgUGx1Z2luVmlldzo6Z2V0VmFsdWVT dGF0aWMoTlBOVmFyaWFibGUgdmFyaWFibGUsIHZvaWQqIHZhbHVlKQogewotICAgIG5vdEltcGxl bWVudGVkKCk7CiAgICAgcmV0dXJuIDA7CiB9CiAjZW5kaWYKIAogdm9pZCBQbHVnaW5WaWV3Ojpp bnZhbGlkYXRlUmVjdChOUFJlY3QqKQogewotICAgIG5vdEltcGxlbWVudGVkKCk7CiB9CiAKIHZv aWQgUGx1Z2luVmlldzo6aW52YWxpZGF0ZVJlY3QoY29uc3QgSW50UmVjdCYpCiB7Ci0gICAgbm90 SW1wbGVtZW50ZWQoKTsKIH0KIAogdm9pZCBQbHVnaW5WaWV3OjppbnZhbGlkYXRlUmVnaW9uKE5Q UmVnaW9uKQogewotICAgIG5vdEltcGxlbWVudGVkKCk7CiB9CiAKIHZvaWQgUGx1Z2luVmlldzo6 Zm9yY2VSZWRyYXcoKQogewotICAgIG5vdEltcGxlbWVudGVkKCk7CiB9CiAKIGJvb2wgUGx1Z2lu Vmlldzo6cGxhdGZvcm1TdGFydCgpCiB7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKLQogICAgIHJl dHVybiB0cnVlOwogfQogCiB2b2lkIFBsdWdpblZpZXc6OnBsYXRmb3JtRGVzdHJveSgpCiB7Ci0g ICAgbm90SW1wbGVtZW50ZWQoKTsKIH0KIAogdm9pZCBQbHVnaW5WaWV3OjpzZXRQYXJlbnRWaXNp YmxlKGJvb2wpCiB7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKIH0KIAogdm9pZCBQbHVnaW5WaWV3 Ojp1cGRhdGVQbHVnaW5XaWRnZXQoKQogewotICAgIG5vdEltcGxlbWVudGVkKCk7CiB9CiAKIHZv aWQgUGx1Z2luVmlldzo6aGFsdCgpCg==