Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (104606 => 104607)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-01-10 19:43:08 UTC (rev 104606)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-01-10 19:45:15 UTC (rev 104607)
@@ -1,3 +1,18 @@
+2012-01-10 James Robinson <jam...@chromium.org>
+
+ [chromium] Remove old WebMimeRegistry.h forwarding header
+ https://bugs.webkit.org/show_bug.cgi?id=75979
+
+ Reviewed by Ryosuke Niwa.
+
+ This isn't needed any more.
+
+ * WebKit.gyp:
+ * public/platform/WebMimeRegistry.h: Removed.
+ * src/FrameLoaderClientImpl.cpp:
+ * src/PlatformSupport.cpp:
+ * src/WebMediaPlayerClientImpl.cpp:
+
2012-01-10 Adrienne Walker <e...@google.com>
[chromium] Draw debug tile borders on composited layers
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (104606 => 104607)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2012-01-10 19:43:08 UTC (rev 104606)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2012-01-10 19:45:15 UTC (rev 104607)
@@ -312,7 +312,6 @@
'public/platform/WebLocalizedString.h',
'public/platform/WebMediaStreamDescriptor.h',
'public/platform/WebMediaStreamSource.h',
- 'public/platform/WebMimeRegistry.h',
'public/platform/WebNonCopyable.h',
'public/platform/WebPeerConnectionHandler.h',
'public/platform/WebPeerConnectionHandlerClient.h',
Deleted: trunk/Source/WebKit/chromium/public/platform/WebMimeRegistry.h (104606 => 104607)
--- trunk/Source/WebKit/chromium/public/platform/WebMimeRegistry.h 2012-01-10 19:43:08 UTC (rev 104606)
+++ trunk/Source/WebKit/chromium/public/platform/WebMimeRegistry.h 2012-01-10 19:45:15 UTC (rev 104607)
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2011 Google 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 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.
- */
-
-// This is a temporary forwarding header to ease the Platform transition for downstream users of the WebKit API.
-// See https://bugs.webkit.org/show_bug.cgi?id=74583
-// FIXME: Remove as soon as downstream clients are updated.
-#include "../../../../Platform/chromium/public/WebMimeRegistry.h"
Modified: trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp (104606 => 104607)
--- trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp 2012-01-10 19:43:08 UTC (rev 104606)
+++ trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp 2012-01-10 19:45:15 UTC (rev 104607)
@@ -68,7 +68,7 @@
#include "WebFrameImpl.h"
#include "WebKit.h"
#include "platform/WebKitPlatformSupport.h"
-#include "platform/WebMimeRegistry.h"
+#include <public/WebMimeRegistry.h>
#include "WebNode.h"
#include "WebPermissionClient.h"
#include "WebPlugin.h"
Modified: trunk/Source/WebKit/chromium/src/PlatformSupport.cpp (104606 => 104607)
--- trunk/Source/WebKit/chromium/src/PlatformSupport.cpp 2012-01-10 19:43:08 UTC (rev 104606)
+++ trunk/Source/WebKit/chromium/src/PlatformSupport.cpp 2012-01-10 19:45:15 UTC (rev 104607)
@@ -57,11 +57,11 @@
#include "platform/WebDragData.h"
#include "platform/WebImage.h"
#include "platform/WebKitPlatformSupport.h"
-#include "platform/WebMimeRegistry.h"
#include "platform/WebSerializedScriptValue.h"
#include "platform/WebString.h"
#include "platform/WebURL.h"
#include "platform/WebVector.h"
+#include <public/WebMimeRegistry.h>
#if USE(CG)
#include <CoreGraphics/CGContext.h>
Modified: trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp (104606 => 104607)
--- trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp 2012-01-10 19:43:08 UTC (rev 104606)
+++ trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp 2012-01-10 19:45:15 UTC (rev 104607)
@@ -31,11 +31,11 @@
#include "platform/WebCString.h"
#include "platform/WebCanvas.h"
#include "platform/WebKitPlatformSupport.h"
-#include "platform/WebMimeRegistry.h"
#include "platform/WebRect.h"
#include "platform/WebSize.h"
#include "platform/WebString.h"
#include "platform/WebURL.h"
+#include <public/WebMimeRegistry.h>
#if USE(ACCELERATED_COMPOSITING)
#include "RenderLayerCompositor.h"
