27005 2009-07-06 14:21:38 -0700 Build fixes when NETSCAPE_PLUGIN_API is disabled 2009-07-06 19:44:56 -0700 1 1 1 Unclassified WebKit Plug-ins 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 ddkilzer webkit-unassigned andersca oldest_to_newest 130017 0 32322 ddkilzer 2009-07-06 14:21:38 -0700 Created attachment 32322 Patch v1 Build fixes when NETSCAPE_PLUGIN_API is disabled Reviewed by NOBODY (OOPS!). * Plugins/WebPluginController.mm: (-[WebPluginController destroyPlugin:]): Wrap call to ScriptController::cleanupScriptObjectsForPlugin() in #if ENABLE(NETSCAPE_PLUGIN_API)/#endif macro. (-[WebPluginController destroyAllPlugins]): Ditto. * Plugins/WebPluginDatabase.mm: (-[WebPluginDatabase removePluginInstanceViewsFor:]): Wrap WebBaseNetscapePluginView class checks in #if ENABLE(NETSCAPE_PLUGIN_API)/#endif macro. (-[WebPluginDatabase destroyAllPluginInstanceViews]): Ditto. 130106 1 ddkilzer 2009-07-06 19:44:56 -0700 $ git svn dcommit Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebKit/mac/ChangeLog M WebKit/mac/Plugins/WebPluginController.mm M WebKit/mac/Plugins/WebPluginDatabase.mm Committed r45583 http://trac.webkit.org/changeset/45583 32322 2009-07-06 14:21:38 -0700 2009-07-06 14:41:21 -0700 Patch v1 0006--Build-fixes-when-NETSCAPE_PLUGIN_API-is-disa.patch text/plain 4902 ddkilzer RnJvbSBkYWE2NTE5YWIwMjkzZTRlNGZkY2E1NmVhZDc3MTViMDlkMmI3YzIyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEYXZpZCBLaWx6ZXIgPGRka2lsemVyQGFwcGxlLmNvbT4KRGF0 ZTogTW9uLCA2IEp1bCAyMDA5IDA3OjAyOjIyIC0wNzAwClN1YmplY3Q6IFtQQVRDSCA2LzhdICAg ICAgICAgQnVpbGQgZml4ZXMgd2hlbiBORVRTQ0FQRV9QTFVHSU5fQVBJIGlzIGRpc2FibGVkCgog ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKICAgICAgICAqIFBsdWdpbnMvV2Vi UGx1Z2luQ29udHJvbGxlci5tbToKICAgICAgICAoLVtXZWJQbHVnaW5Db250cm9sbGVyIGRlc3Ry b3lQbHVnaW46XSk6IFdyYXAgY2FsbCB0bwogICAgICAgIFNjcmlwdENvbnRyb2xsZXI6OmNsZWFu dXBTY3JpcHRPYmplY3RzRm9yUGx1Z2luKCkgaW4KICAgICAgICAjaWYgRU5BQkxFKE5FVFNDQVBF X1BMVUdJTl9BUEkpLyNlbmRpZiBtYWNyby4KICAgICAgICAoLVtXZWJQbHVnaW5Db250cm9sbGVy IGRlc3Ryb3lBbGxQbHVnaW5zXSk6IERpdHRvLgogICAgICAgICogUGx1Z2lucy9XZWJQbHVnaW5E YXRhYmFzZS5tbToKICAgICAgICAoLVtXZWJQbHVnaW5EYXRhYmFzZSByZW1vdmVQbHVnaW5JbnN0 YW5jZVZpZXdzRm9yOl0pOiBXcmFwCiAgICAgICAgV2ViQmFzZU5ldHNjYXBlUGx1Z2luVmlldyBj bGFzcyBjaGVja3MgaW4KICAgICAgICAjaWYgRU5BQkxFKE5FVFNDQVBFX1BMVUdJTl9BUEkpLyNl bmRpZiBtYWNyby4KICAgICAgICAoLVtXZWJQbHVnaW5EYXRhYmFzZSBkZXN0cm95QWxsUGx1Z2lu SW5zdGFuY2VWaWV3c10pOiBEaXR0by4KLS0tCiBXZWJLaXQvbWFjL0NoYW5nZUxvZyAgICAgICAg ICAgICAgICAgICAgICB8ICAgMTcgKysrKysrKysrKysrKysrKysKIFdlYktpdC9tYWMvUGx1Z2lu cy9XZWJQbHVnaW5Db250cm9sbGVyLm1tIHwgICAgNCArKysrCiBXZWJLaXQvbWFjL1BsdWdpbnMv V2ViUGx1Z2luRGF0YWJhc2UubW0gICB8ICAgMTEgKysrKysrKysrLS0KIDMgZmlsZXMgY2hhbmdl ZCwgMzAgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9XZWJLaXQv bWFjL0NoYW5nZUxvZyBiL1dlYktpdC9tYWMvQ2hhbmdlTG9nCmluZGV4IDI1MmRjZTMuLjJiZWRm ZDkgMTAwNjQ0Ci0tLSBhL1dlYktpdC9tYWMvQ2hhbmdlTG9nCisrKyBiL1dlYktpdC9tYWMvQ2hh bmdlTG9nCkBAIC0xLDUgKzEsMjIgQEAKIDIwMDktMDctMDYgIERhdmlkIEtpbHplciAgPGRka2ls emVyQGFwcGxlLmNvbT4KIAorICAgICAgICBCdWlsZCBmaXhlcyB3aGVuIE5FVFNDQVBFX1BMVUdJ Tl9BUEkgaXMgZGlzYWJsZWQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFBsdWdpbnMvV2ViUGx1Z2luQ29udHJvbGxlci5tbToKKyAgICAgICAgKC1b V2ViUGx1Z2luQ29udHJvbGxlciBkZXN0cm95UGx1Z2luOl0pOiBXcmFwIGNhbGwgdG8KKyAgICAg ICAgU2NyaXB0Q29udHJvbGxlcjo6Y2xlYW51cFNjcmlwdE9iamVjdHNGb3JQbHVnaW4oKSBpbgor ICAgICAgICAjaWYgRU5BQkxFKE5FVFNDQVBFX1BMVUdJTl9BUEkpLyNlbmRpZiBtYWNyby4KKyAg ICAgICAgKC1bV2ViUGx1Z2luQ29udHJvbGxlciBkZXN0cm95QWxsUGx1Z2luc10pOiBEaXR0by4K KyAgICAgICAgKiBQbHVnaW5zL1dlYlBsdWdpbkRhdGFiYXNlLm1tOgorICAgICAgICAoLVtXZWJQ bHVnaW5EYXRhYmFzZSByZW1vdmVQbHVnaW5JbnN0YW5jZVZpZXdzRm9yOl0pOiBXcmFwCisgICAg ICAgIFdlYkJhc2VOZXRzY2FwZVBsdWdpblZpZXcgY2xhc3MgY2hlY2tzIGluCisgICAgICAgICNp ZiBFTkFCTEUoTkVUU0NBUEVfUExVR0lOX0FQSSkvI2VuZGlmIG1hY3JvLgorICAgICAgICAoLVtX ZWJQbHVnaW5EYXRhYmFzZSBkZXN0cm95QWxsUGx1Z2luSW5zdGFuY2VWaWV3c10pOiBEaXR0by4K KworMjAwOS0wNy0wNiAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29tPgorCiAgICAg ICAgIEJ1aWxkIGZpeCBmb3IgRU5BQkxFKFBMVUdJTl9QUk9YWV9GT1JfVklERU8pIGFmdGVyIHI0 MjYxOAogCiAgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgpkaWZmIC0tZ2l0IGEv V2ViS2l0L21hYy9QbHVnaW5zL1dlYlBsdWdpbkNvbnRyb2xsZXIubW0gYi9XZWJLaXQvbWFjL1Bs dWdpbnMvV2ViUGx1Z2luQ29udHJvbGxlci5tbQppbmRleCBmMTUxNjUyLi42MDZiYTYzIDEwMDY0 NAotLS0gYS9XZWJLaXQvbWFjL1BsdWdpbnMvV2ViUGx1Z2luQ29udHJvbGxlci5tbQorKysgYi9X ZWJLaXQvbWFjL1BsdWdpbnMvV2ViUGx1Z2luQ29udHJvbGxlci5tbQpAQCAtMjQ2LDggKzI0Niwx MCBAQCBzdGF0aWMgTlNNdXRhYmxlU2V0ICpwbHVnaW5WaWV3cyA9IG5pbDsKICAgICAgICAgICAg IFt2aWV3IHBsdWdpbkRlc3Ryb3ldOwogICAgICAgICB9CiAgICAgICAgIAorI2lmIEVOQUJMRShO RVRTQ0FQRV9QTFVHSU5fQVBJKQogICAgICAgICBpZiAoRnJhbWUqIGZyYW1lID0gY29yZShbc2Vs ZiB3ZWJGcmFtZV0pKQogICAgICAgICAgICAgZnJhbWUtPnNjcmlwdCgpLT5jbGVhbnVwU2NyaXB0 T2JqZWN0c0ZvclBsdWdpbihzZWxmKTsKKyNlbmRpZgogICAgICAgICAKICAgICAgICAgW3BsdWdp blZpZXdzIHJlbW92ZU9iamVjdDp2aWV3XTsKICAgICAgICAgW1tfZG9jdW1lbnRWaWV3IF93ZWJW aWV3XSByZW1vdmVQbHVnaW5JbnN0YW5jZVZpZXc6dmlld107CkBAIC0yOTYsOCArMjk4LDEwIEBA IHN0YXRpYyB2b2lkIGNhbmNlbE91dHN0YW5kaW5nQ2hlY2soY29uc3Qgdm9pZCAqaXRlbSwgdm9p ZCAqY29udGV4dCkKICAgICAgICAgICAgIFthVmlldyBwbHVnaW5EZXN0cm95XTsKICAgICAgICAg fQogICAgICAgICAKKyNpZiBFTkFCTEUoTkVUU0NBUEVfUExVR0lOX0FQSSkKICAgICAgICAgaWYg KEZyYW1lKiBmcmFtZSA9IGNvcmUoW3NlbGYgd2ViRnJhbWVdKSkKICAgICAgICAgICAgIGZyYW1l LT5zY3JpcHQoKS0+Y2xlYW51cFNjcmlwdE9iamVjdHNGb3JQbHVnaW4oc2VsZik7CisjZW5kaWYK ICAgICAgICAgCiAgICAgICAgIFtwbHVnaW5WaWV3cyByZW1vdmVPYmplY3Q6YVZpZXddOwogICAg ICAgICBbW19kb2N1bWVudFZpZXcgX3dlYlZpZXddIHJlbW92ZVBsdWdpbkluc3RhbmNlVmlldzph Vmlld107CmRpZmYgLS1naXQgYS9XZWJLaXQvbWFjL1BsdWdpbnMvV2ViUGx1Z2luRGF0YWJhc2Uu bW0gYi9XZWJLaXQvbWFjL1BsdWdpbnMvV2ViUGx1Z2luRGF0YWJhc2UubW0KaW5kZXggNGYyYmRk OC4uMTg1NmZlMSAxMDA2NDQKLS0tIGEvV2ViS2l0L21hYy9QbHVnaW5zL1dlYlBsdWdpbkRhdGFi YXNlLm1tCisrKyBiL1dlYktpdC9tYWMvUGx1Z2lucy9XZWJQbHVnaW5EYXRhYmFzZS5tbQpAQCAt MzMzLDcgKzMzMywxMSBAQCBzdGF0aWMgTlNBcnJheSAqYWRkaXRpb25hbFdlYlBsdWdJblBhdGhz OwogICAgICAgICAKICAgICAgICAgZm9yIChzdWJ2aWV3SW5kZXggPSAwOyBzdWJ2aWV3SW5kZXgg PCBzdWJ2aWV3Q291bnQ7IHN1YnZpZXdJbmRleCsrKSB7IAogICAgICAgICAgICAgTlNWaWV3ICpz dWJ2aWV3ID0gW3N1YnZpZXdzIG9iamVjdEF0SW5kZXg6c3Vidmlld0luZGV4XTsgCi0gICAgICAg ICAgICBpZiAoW3N1YnZpZXcgaXNLaW5kT2ZDbGFzczpbV2ViQmFzZU5ldHNjYXBlUGx1Z2luVmll dyBjbGFzc11dIHx8IFtXZWJQbHVnaW5Db250cm9sbGVyIGlzUGx1Z0luVmlldzpzdWJ2aWV3XSkg CisjaWYgRU5BQkxFKE5FVFNDQVBFX1BMVUdJTl9BUEkpCisgICAgICAgICAgICBpZiAoW3N1YnZp ZXcgaXNLaW5kT2ZDbGFzczpbV2ViQmFzZU5ldHNjYXBlUGx1Z2luVmlldyBjbGFzc11dIHx8IFtX ZWJQbHVnaW5Db250cm9sbGVyIGlzUGx1Z0luVmlldzpzdWJ2aWV3XSkKKyNlbHNlCisgICAgICAg ICAgICBpZiAoW1dlYlBsdWdpbkNvbnRyb2xsZXIgaXNQbHVnSW5WaWV3OnN1YnZpZXddKQorI2Vu ZGlmCiAgICAgICAgICAgICAgICAgW3BsdWdpbkluc3RhbmNlVmlld3MgcmVtb3ZlT2JqZWN0OnN1 YnZpZXddOyAKICAgICAgICAgfQogICAgIH0KQEAgLTM0NSwxMCArMzQ5LDEzIEBAIHN0YXRpYyBO U0FycmF5ICphZGRpdGlvbmFsV2ViUGx1Z0luUGF0aHM7CiAgICAgTlNBcnJheSAqcGxpID0gW3Bs dWdpbkluc3RhbmNlVmlld3MgYWxsT2JqZWN0c107CiAgICAgTlNFbnVtZXJhdG9yICplbnVtZXJh dG9yID0gW3BsaSBvYmplY3RFbnVtZXJhdG9yXTsKICAgICB3aGlsZSAoKHZpZXcgPSBbZW51bWVy YXRvciBuZXh0T2JqZWN0XSkgIT0gbmlsKSB7CisjaWYgRU5BQkxFKE5FVFNDQVBFX1BMVUdJTl9B UEkpCiAgICAgICAgIGlmIChbdmlldyBpc0tpbmRPZkNsYXNzOltXZWJCYXNlTmV0c2NhcGVQbHVn aW5WaWV3IGNsYXNzXV0pIHsKICAgICAgICAgICAgIEFTU0VSVChbdmlldyByZXNwb25kc1RvU2Vs ZWN0b3I6QHNlbGVjdG9yKHN0b3ApXSk7CiAgICAgICAgICAgICBbdmlldyBwZXJmb3JtU2VsZWN0 b3I6QHNlbGVjdG9yKHN0b3ApXTsKLSAgICAgICAgfSBlbHNlIGlmIChbV2ViUGx1Z2luQ29udHJv bGxlciBpc1BsdWdJblZpZXc6dmlld10pIHsKKyAgICAgICAgfSBlbHNlCisjZW5kaWYKKyAgICAg ICAgaWYgKFtXZWJQbHVnaW5Db250cm9sbGVyIGlzUGx1Z0luVmlldzp2aWV3XSkgewogICAgICAg ICAgICAgQVNTRVJUKFtbdmlldyBzdXBlcnZpZXddIGlzS2luZE9mQ2xhc3M6W1dlYkhUTUxWaWV3 IGNsYXNzXV0pOwogICAgICAgICAgICAgQVNTRVJUKFtbdmlldyBzdXBlcnZpZXddIHJlc3BvbmRz VG9TZWxlY3RvcjpAc2VsZWN0b3IoX2Rlc3Ryb3lBbGxXZWJQbHVnaW5zKV0pOwogICAgICAgICAg ICAgLy8gdGhpcyB3aWxsIGFjdHVhbGx5IGRlc3Ryb3kgYWxsIHBsdWdpbiBpbnN0YW5jZXMgZm9y IGEgd2ViSFRNTFZpZXcgYW5kIHJlbW92ZSB0aGVtIGZyb20gdGhpcyBsaXN0Ci0tIAoxLjYuMgoK