Title: [102974] trunk/Source/WebKit/chromium
- Revision
- 102974
- Author
- [email protected]
- Date
- 2011-12-15 12:32:45 -0800 (Thu, 15 Dec 2011)
Log Message
[chromium] MediaStream API: Fixing #include statements and removing forwarding header file
https://bugs.webkit.org/show_bug.cgi?id=74598
Reviewed by Darin Fisher.
WebMediaStreamSource.h had some issues when accessed from chromium. Also cleaned up the forwarding header.
* WebKit.gyp:
* public/WebMediaStreamSource.h: Removed.
* public/platform/WebMediaStreamSource.h:
Modified Paths
Removed Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (102973 => 102974)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-12-15 19:54:23 UTC (rev 102973)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-12-15 20:32:45 UTC (rev 102974)
@@ -1,3 +1,16 @@
+2011-12-15 Tommy Widenflycht <[email protected]>
+
+ [chromium] MediaStream API: Fixing #include statements and removing forwarding header file
+ https://bugs.webkit.org/show_bug.cgi?id=74598
+
+ Reviewed by Darin Fisher.
+
+ WebMediaStreamSource.h had some issues when accessed from chromium. Also cleaned up the forwarding header.
+
+ * WebKit.gyp:
+ * public/WebMediaStreamSource.h: Removed.
+ * public/platform/WebMediaStreamSource.h:
+
2011-12-15 Stephen White <[email protected]>
Unreviewed, rolling out r102956.
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (102973 => 102974)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2011-12-15 19:54:23 UTC (rev 102973)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2011-12-15 20:32:45 UTC (rev 102974)
@@ -193,7 +193,6 @@
'public/WebMediaPlayerAction.h',
'public/WebMediaPlayerClient.h',
'public/WebMediaStreamRegistry.h',
- 'public/WebMediaStreamSource.h',
'public/WebMenuItemInfo.h',
'public/WebMessagePortChannel.h',
'public/WebMessagePortChannelClient.h',
Deleted: trunk/Source/WebKit/chromium/public/WebMediaStreamSource.h (102973 => 102974)
--- trunk/Source/WebKit/chromium/public/WebMediaStreamSource.h 2011-12-15 19:54:23 UTC (rev 102973)
+++ trunk/Source/WebKit/chromium/public/WebMediaStreamSource.h 2011-12-15 20:32:45 UTC (rev 102974)
@@ -1,31 +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:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * 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.
- * * Neither the name of Google Inc. 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 THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
- * OWNER 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.
- */
-
-#include "platform/WebMediaStreamSource.h"
Modified: trunk/Source/WebKit/chromium/public/platform/WebMediaStreamSource.h (102973 => 102974)
--- trunk/Source/WebKit/chromium/public/platform/WebMediaStreamSource.h 2011-12-15 19:54:23 UTC (rev 102973)
+++ trunk/Source/WebKit/chromium/public/platform/WebMediaStreamSource.h 2011-12-15 20:32:45 UTC (rev 102974)
@@ -31,9 +31,9 @@
#ifndef WebMediaStreamSource_h
#define WebMediaStreamSource_h
-#include "platform/WebCommon.h"
-#include "platform/WebNonCopyable.h"
-#include "platform/WebPrivatePtr.h"
+#include "WebCommon.h"
+#include "WebNonCopyable.h"
+#include "WebPrivatePtr.h"
namespace WebCore {
class MediaStreamSource;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
