Re-point WebCoreObjCExtras to WebKit, remove one from pending dir.

Review URL: http://codereview.chromium.org/13024

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6176 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 82 deletions

diff --git a/webkit/pending/WebCoreObjCExtras.mm b/webkit/pending/WebCoreObjCExtras.mm
deleted file mode 100644
index 105c462..0000000
--- a/webkit/pending/WebCoreObjCExtras.mm
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2007 Apple Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer. 
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution. 
- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission. 
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "WebCoreObjCExtras.h"
-
-#include <objc/objc-auto.h>
-#include <objc/objc-runtime.h>
-#include <wtf/Assertions.h>
-#include <wtf/MainThread.h>
-#include <wtf/Threading.h>
-
-void WebCoreObjCFinalizeOnMainThread(Class cls)
-{
-#if !defined(BUILDING_ON_TIGER) && !defined(DONT_FINALIZE_ON_MAIN_THREAD)
-    objc_finalizeOnMainThread(cls);
-#endif
-    
-    // The reason we call initializeThreading here is that we'd like to have 
-    // threading initialized early, otherwise WebCoreObjCScheduleDeallocateOnMainThread
-    // will crash
-    WTF::initializeThreading();
-}
-
-#ifdef BUILDING_ON_TIGER
-static inline IMP method_getImplementation(Method method) 
-{
-    return method->method_imp;
-}
-#endif
-
-typedef std::pair<Class, id> ClassAndIdPair;
-
-static void deallocCallback(void* context)
-{
-    ClassAndIdPair* pair = static_cast<ClassAndIdPair*>(context);
-    
-    Method method = class_getInstanceMethod(pair->first, @selector(dealloc));
-    
-    IMP imp = method_getImplementation(method);
-    imp(pair->second, @selector(dealloc));
-    
-    delete pair;
-}
-
-bool WebCoreObjCScheduleDeallocateOnMainThread(Class cls, id object)
-{
-    ASSERT([object isKindOfClass:cls]);
-    
-    if (pthread_main_np() != 0)
-        return false;
-    
-    ClassAndIdPair* pair = new ClassAndIdPair(cls, object);
-    callOnMainThread(deallocCallback, pair);
-    return true;
-}
-