diff options
| author | pinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-08 18:55:36 +0000 |
|---|---|---|
| committer | pinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-08 18:55:36 +0000 |
| commit | 66b2bc1ccd6a7d41b71b602b2983aa81527f9c8f (patch) | |
| tree | 86e1de0db9bb4f60a7c76e99b150789e3b481c12 | |
| parent | 81c4557afa8945db9eeb0a73213fbf3c8d857810 (diff) | |
| download | chromium_src-66b2bc1ccd6a7d41b71b602b2983aa81527f9c8f.zip chromium_src-66b2bc1ccd6a7d41b71b602b2983aa81527f9c8f.tar.gz chromium_src-66b2bc1ccd6a7d41b71b602b2983aa81527f9c8f.tar.bz2 | |
changes to get mac layout tests moving forward. Turn off objc GC and remove asserts in the plugin stub code that throw off the layout tests.
Review URL: http://codereview.chromium.org/6588
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3026 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/common.xcconfig | 1 | ||||
| -rw-r--r-- | webkit/port/platform/PluginStubsMac.cpp | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/build/common.xcconfig b/build/common.xcconfig index 030e667..4f4cab7 100644 --- a/build/common.xcconfig +++ b/build/common.xcconfig @@ -6,7 +6,6 @@ ALWAYS_SEARCH_USER_PATHS = NO GCC_C_LANGUAGE_STANDARD = c99 GCC_CW_ASM_SYNTAX = NO GCC_DYNAMIC_NO_PIC = YES -GCC_ENABLE_OBJC_GC = supported GCC_ENABLE_PASCAL_STRINGS = NO GCC_INLINES_ARE_PRIVATE_EXTERN = YES GCC_PRECOMPILE_PREFIX_HEADER = YES diff --git a/webkit/port/platform/PluginStubsMac.cpp b/webkit/port/platform/PluginStubsMac.cpp index a5fa893..cc565db 100644 --- a/webkit/port/platform/PluginStubsMac.cpp +++ b/webkit/port/platform/PluginStubsMac.cpp @@ -23,7 +23,7 @@ class PluginInfoStore { }; PluginInfo * PluginInfoStore::createPluginInfoForPluginAtIndex(unsigned) { - ASSERT_NOT_REACHED(); + // TODO(pinkerton): don't assert here because that crashes layout tests. return NULL; } @@ -37,7 +37,7 @@ bool PluginInfoStore::supportsMIMEType(const WebCore::String& mimeType) { PluginData::PluginData(const Page* page) : m_page(page) { - ASSERT_NOT_REACHED(); + // TODO(pinkerton): don't assert here because that crashes layout tests. } PluginData::~PluginData() { @@ -48,7 +48,7 @@ bool PluginData::supportsMimeType(const String& mimeType) const { } String PluginData::pluginNameForMimeType(const String& mimeType) const { - ASSERT_NOT_REACHED(); + // TODO(pinkerton): don't assert here because that crashes layout tests. return String(); } |