Merge changes Ide388898,Ic49f367c,I1158a808,Iacb6ca5d,I2100dd3a,I5c1abe54,Ib0ef9902,I31dbc523,I570314b3

* changes:
  Merge WebKit at r75315: Update WebKit version
  Merge WebKit at r75315: Add FrameLoaderClient PageCache stubs
  Merge WebKit at r75315: Stub out AXObjectCache::remove()
  Merge WebKit at r75315: Fix ImageBuffer
  Merge WebKit at r75315: Fix PluginData::initPlugins()
  Merge WebKit at r75315: Fix conflicts
  Merge WebKit at r75315: Fix Makefiles
  Merge WebKit at r75315: Move Android-specific WebCore files to Source
  Merge WebKit at r75315: Initial merge by git.

1 files changed, 67 insertions, 0 deletions

diff --git a/Source/WebCore/platform/Logging.h b/Source/WebCore/platform/Logging.h
new file mode 100644
index 0000000..11ad1db
--- /dev/null
+++ b/Source/WebCore/platform/Logging.h
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2003, 2006 Apple Computer, 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 COMPUTER, INC. OR
+ * 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.
+ */
+
+#ifndef Logging_h
+#define Logging_h
+
+#include <wtf/Assertions.h>
+#include <wtf/Forward.h>
+
+#ifndef LOG_CHANNEL_PREFIX
+#define LOG_CHANNEL_PREFIX Log
+#endif
+
+namespace WebCore {
+
+    extern WTFLogChannel LogNotYetImplemented;
+    extern WTFLogChannel LogFrames;
+    extern WTFLogChannel LogLoading;
+    extern WTFLogChannel LogPopupBlocking;
+    extern WTFLogChannel LogEvents;
+    extern WTFLogChannel LogEditing;
+    extern WTFLogChannel LogLiveConnect;
+    extern WTFLogChannel LogIconDatabase;
+    extern WTFLogChannel LogSQLDatabase;
+    extern WTFLogChannel LogSpellingAndGrammar;
+    extern WTFLogChannel LogBackForward;
+    extern WTFLogChannel LogHistory;
+    extern WTFLogChannel LogPageCache;
+    extern WTFLogChannel LogPlatformLeaks;
+    extern WTFLogChannel LogResourceLoading;
+    extern WTFLogChannel LogNetwork;
+    extern WTFLogChannel LogFTP;
+    extern WTFLogChannel LogThreading;
+    extern WTFLogChannel LogStorageAPI;
+    extern WTFLogChannel LogMedia;
+    extern WTFLogChannel LogPlugins;
+    extern WTFLogChannel LogArchives;
+    extern WTFLogChannel LogProgress;
+    extern WTFLogChannel LogFileAPI;
+
+    void InitializeLoggingChannelsIfNecessary();
+    WTFLogChannel* getChannelFromName(const String& channelName);
+}
+
+#endif // Logging_h