27006 2009-07-06 14:22:30 -0700 Build fix when MAC_JAVA_BRIDGE is disabled 2009-07-06 19:49:32 -0700 1 1 1 Unclassified WebKit Java 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 ddkilzer webkit-unassigned oldest_to_newest 130018 0 32323 ddkilzer 2009-07-06 14:22:30 -0700 Created attachment 32323 Patch v1 Build fix when MAC_JAVA_BRIDGE is disabled Reviewed by NOBODY (OOPS!). * WebCoreSupport/WebFrameLoaderClient.mm: (WebFrameLoaderClient::createJavaAppletWidget): Wrap contents of the method in #if ENABLE(MAC_JAVA_BRIDGE)/#endif and return 0 when this feature is disabled. 130107 1 ddkilzer 2009-07-06 19:49:32 -0700 $ git svn dcommit Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebKit/mac/ChangeLog M WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm Committed r45584 http://trac.webkit.org/changeset/45584 32323 2009-07-06 14:22:30 -0700 2009-07-06 14:36:32 -0700 Patch v1 0007--Build-fix-when-MAC_JAVA_BRIDGE-is-disabled.patch text/plain 2306 ddkilzer RnJvbSBkODQ5YjAwNzA3Y2Q2MzJkMjEwMzQ1YTdlNDVjZThjODA4MTExY2RlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEYXZpZCBLaWx6ZXIgPGRka2lsemVyQGFwcGxlLmNvbT4KRGF0 ZTogTW9uLCA2IEp1bCAyMDA5IDA3OjA2OjUwIC0wNzAwClN1YmplY3Q6IFtQQVRDSCA3LzhdICAg ICAgICAgQnVpbGQgZml4IHdoZW4gTUFDX0pBVkFfQlJJREdFIGlzIGRpc2FibGVkCgogICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dl YkZyYW1lTG9hZGVyQ2xpZW50Lm1tOgogICAgICAgIChXZWJGcmFtZUxvYWRlckNsaWVudDo6Y3Jl YXRlSmF2YUFwcGxldFdpZGdldCk6IFdyYXAgY29udGVudHMgb2YKICAgICAgICB0aGUgbWV0aG9k IGluICNpZiBFTkFCTEUoTUFDX0pBVkFfQlJJREdFKS8jZW5kaWYgYW5kIHJldHVybiAwCiAgICAg ICAgd2hlbiB0aGlzIGZlYXR1cmUgaXMgZGlzYWJsZWQuCi0tLQogV2ViS2l0L21hYy9DaGFuZ2VM b2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTEgKysrKysrKysrKysKIFdlYktp dC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQubW0gfCAgICA0ICsrKysK IDIgZmlsZXMgY2hhbmdlZCwgMTUgaW5zZXJ0aW9ucygrKSwgMCBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9XZWJLaXQvbWFjL0NoYW5nZUxvZyBiL1dlYktpdC9tYWMvQ2hhbmdlTG9nCmluZGV4 IDJiZWRmZDkuLjFlZmU1MTMgMTAwNjQ0Ci0tLSBhL1dlYktpdC9tYWMvQ2hhbmdlTG9nCisrKyBi L1dlYktpdC9tYWMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTYgQEAKIDIwMDktMDctMDYgIERhdmlk IEtpbHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KIAorICAgICAgICBCdWlsZCBmaXggd2hlbiBN QUNfSkFWQV9CUklER0UgaXMgZGlzYWJsZWQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50 Lm1tOgorICAgICAgICAoV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmNyZWF0ZUphdmFBcHBsZXRXaWRn ZXQpOiBXcmFwIGNvbnRlbnRzIG9mCisgICAgICAgIHRoZSBtZXRob2QgaW4gI2lmIEVOQUJMRShN QUNfSkFWQV9CUklER0UpLyNlbmRpZiBhbmQgcmV0dXJuIDAKKyAgICAgICAgd2hlbiB0aGlzIGZl YXR1cmUgaXMgZGlzYWJsZWQuCisKKzIwMDktMDctMDYgIERhdmlkIEtpbHplciAgPGRka2lsemVy QGFwcGxlLmNvbT4KKwogICAgICAgICBCdWlsZCBmaXhlcyB3aGVuIE5FVFNDQVBFX1BMVUdJTl9B UEkgaXMgZGlzYWJsZWQKIAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KZGlm ZiAtLWdpdCBhL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQu bW0gYi9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lm1tCmlu ZGV4IDBiMjEyYzkuLmE2Y2RlYzMgMTAwNjQ0Ci0tLSBhL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBv cnQvV2ViRnJhbWVMb2FkZXJDbGllbnQubW0KKysrIGIvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9y dC9XZWJGcmFtZUxvYWRlckNsaWVudC5tbQpAQCAtMTUzNyw2ICsxNTM3LDcgQEAgdm9pZCBXZWJG cmFtZUxvYWRlckNsaWVudDo6cmVkaXJlY3REYXRhVG9QbHVnaW4oV2lkZ2V0KiBwbHVnaW5XaWRn ZXQpCiBXaWRnZXQqIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpjcmVhdGVKYXZhQXBwbGV0V2lkZ2V0 KGNvbnN0IEludFNpemUmIHNpemUsIEhUTUxBcHBsZXRFbGVtZW50KiBlbGVtZW50LCBjb25zdCBL VVJMJiBiYXNlVVJMLCAKICAgICBjb25zdCBWZWN0b3I8U3RyaW5nPiYgcGFyYW1OYW1lcywgY29u c3QgVmVjdG9yPFN0cmluZz4mIHBhcmFtVmFsdWVzKQogeworI2lmIEVOQUJMRShNQUNfSkFWQV9C UklER0UpCiAgICAgQkVHSU5fQkxPQ0tfT0JKQ19FWENFUFRJT05TOwogCiAgICAgTlNWaWV3ICp2 aWV3ID0gbmlsOwpAQCAtMTU5Niw2ICsxNTk3LDkgQEAgV2lkZ2V0KiBXZWJGcmFtZUxvYWRlckNs aWVudDo6Y3JlYXRlSmF2YUFwcGxldFdpZGdldChjb25zdCBJbnRTaXplJiBzaXplLCBIVE1MQXAK ICAgICBFTkRfQkxPQ0tfT0JKQ19FWENFUFRJT05TOwogICAgIAogICAgIHJldHVybiBuZXcgUGx1 Z2luV2lkZ2V0OworI2Vsc2UKKyAgICByZXR1cm4gMDsKKyNlbmRpZiAvLyBFTkFCTEUoTUFDX0pB VkFfQlJJREdFKQogfQogCiBTdHJpbmcgV2ViRnJhbWVMb2FkZXJDbGllbnQ6Om92ZXJyaWRlTWVk aWFUeXBlKCkgY29uc3QKLS0gCjEuNi4yCgo=