Log Message
[chromium] Remove forwarding headers for WebLayer APIs https://bugs.webkit.org/show_bug.cgi?id=73729
Reviewed by Adam Barth. These are no longer necessary. * WebKit.gyp: * public/WebContentLayer.h: Removed. * public/WebContentLayerClient.h: Removed. * public/WebExternalTextureLayer.h: Removed. * public/WebLayer.h: Removed. * public/WebLayerClient.h: Removed. * public/WebLayerTreeView.h: Removed. * public/WebLayerTreeViewClient.h: Removed. * src/WebLayerTreeView.cpp: * src/WebLayerTreeViewImpl.cpp: * tests/WebLayerTest.cpp:
Modified Paths
- trunk/Source/WebKit/chromium/ChangeLog
- trunk/Source/WebKit/chromium/WebKit.gyp
- trunk/Source/WebKit/chromium/src/WebLayerTreeView.cpp
- trunk/Source/WebKit/chromium/src/WebLayerTreeViewImpl.cpp
- trunk/Source/WebKit/chromium/tests/WebLayerTest.cpp
Removed Paths
- trunk/Source/WebKit/chromium/public/WebContentLayer.h
- trunk/Source/WebKit/chromium/public/WebContentLayerClient.h
- trunk/Source/WebKit/chromium/public/WebExternalTextureLayer.h
- trunk/Source/WebKit/chromium/public/WebLayer.h
- trunk/Source/WebKit/chromium/public/WebLayerClient.h
- trunk/Source/WebKit/chromium/public/WebLayerTreeView.h
- trunk/Source/WebKit/chromium/public/WebLayerTreeViewClient.h
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (102018 => 102019)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-12-05 19:10:21 UTC (rev 102018)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-12-05 19:12:26 UTC (rev 102019)
@@ -1,3 +1,24 @@
+2011-12-02 James Robinson <[email protected]>
+
+ [chromium] Remove forwarding headers for WebLayer APIs
+ https://bugs.webkit.org/show_bug.cgi?id=73729
+
+ Reviewed by Adam Barth.
+
+ These are no longer necessary.
+
+ * WebKit.gyp:
+ * public/WebContentLayer.h: Removed.
+ * public/WebContentLayerClient.h: Removed.
+ * public/WebExternalTextureLayer.h: Removed.
+ * public/WebLayer.h: Removed.
+ * public/WebLayerClient.h: Removed.
+ * public/WebLayerTreeView.h: Removed.
+ * public/WebLayerTreeViewClient.h: Removed.
+ * src/WebLayerTreeView.cpp:
+ * src/WebLayerTreeViewImpl.cpp:
+ * tests/WebLayerTest.cpp:
+
2011-12-05 Vsevolod Vlasov <[email protected]>
Unreviewed, fixed chromium DEPS syntax.
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (102018 => 102019)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2011-12-05 19:10:21 UTC (rev 102018)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2011-12-05 19:12:26 UTC (rev 102019)
@@ -103,29 +103,34 @@
'public/linux/WebFontRenderStyle.h',
'public/linux/WebRenderTheme.h',
'public/linux/WebThemeEngine.h',
- 'public/x11/WebScreenInfoFactory.h',
'public/mac/WebInputEventFactory.h',
'public/mac/WebSandboxSupport.h',
'public/mac/WebScreenInfoFactory.h',
'public/mac/WebSubstringUtil.h',
'public/mac/WebThemeEngine.h',
+ 'public/platform/WebContentLayerClient.h',
+ 'public/platform/WebContentLayer.h',
+ 'public/platform/WebExternalTextureLayer.h',
+ 'public/platform/WebLayerClient.h',
+ 'public/platform/WebLayer.h',
+ 'public/platform/WebLayerTreeViewClient.h',
+ 'public/platform/WebLayerTreeView.h',
'public/WebAccessibilityNotification.h',
'public/WebAccessibilityObject.h',
'public/WebAccessibilityRole.h',
'public/WebAnimationController.h',
- 'public/WebApplicationCacheHost.h',
'public/WebApplicationCacheHostClient.h',
'public/WebArrayBuffer.h',
'public/WebArrayBufferView.h',
'public/WebAttribute.h',
'public/WebAudioBus.h',
'public/WebAudioDevice.h',
- 'public/WebAudioSourceProvider.h',
'public/WebAudioSourceProviderClient.h',
+ 'public/WebAudioSourceProvider.h',
'public/WebAutofillClient.h',
'public/WebBindings.h',
- 'public/WebBlob.h',
'public/WebBlobData.h',
+ 'public/WebBlob.h',
'public/WebBlobRegistry.h',
'public/WebCache.h',
'public/WebCanvas.h',
@@ -140,62 +145,59 @@
'public/WebCompositorInputHandlerClient.h',
'public/WebCompositorInputHandler.h',
'public/WebConsoleMessage.h',
- 'public/WebContentLayer.h',
- 'public/WebContentLayerClient.h',
'public/WebContextMenuData.h',
'public/WebCookie.h',
'public/WebCookieJar.h',
'public/WebCrossOriginPreflightResultCache.h',
'public/WebCString.h',
'public/WebCursorInfo.h',
- 'public/WebDOMEvent.h',
- 'public/WebDOMEventListener.h',
- 'public/WebDOMMessageEvent.h',
- 'public/WebDOMMouseEvent.h',
- 'public/WebDOMMutationEvent.h',
- 'public/WebDOMStringList.h',
- 'public/WebData.h',
'public/WebDatabase.h',
'public/WebDatabaseObserver.h',
+ 'public/WebData.h',
'public/WebDataSource.h',
- 'public/WebDevToolsAgent.h',
- 'public/WebDevToolsAgentClient.h',
- 'public/WebDevToolsFrontend.h',
- 'public/WebDevToolsFrontendClient.h',
- 'public/WebDeviceOrientation.h',
'public/WebDeviceOrientationClient.h',
'public/WebDeviceOrientationClientMock.h',
'public/WebDeviceOrientationController.h',
+ 'public/WebDeviceOrientation.h',
+ 'public/WebDevToolsAgentClient.h',
+ 'public/WebDevToolsAgent.h',
+ 'public/WebDevToolsFrontendClient.h',
+ 'public/WebDevToolsFrontend.h',
'public/WebDocument.h',
'public/WebDocumentType.h',
+ 'public/WebDOMEvent.h',
+ 'public/WebDOMEventListener.h',
+ 'public/WebDOMMessageEvent.h',
+ 'public/WebDOMMouseEvent.h',
+ 'public/WebDOMMutationEvent.h',
+ 'public/WebDOMStringList.h',
'public/WebDragData.h',
'public/WebEditingAction.h',
'public/WebElement.h',
'public/WebExceptionCode.h',
- 'public/WebExternalPopupMenu.h',
'public/WebExternalPopupMenuClient.h',
- 'public/WebExternalTextureLayer.h',
+ 'public/WebExternalPopupMenu.h',
'public/WebFileChooserCompletion.h',
'public/WebFileChooserParams.h',
'public/WebFileError.h',
'public/WebFileInfo.h',
- 'public/WebFileSystem.h',
'public/WebFileSystemCallbacks.h',
'public/WebFileSystemEntry.h',
+ 'public/WebFileSystem.h',
'public/WebFileUtilities.h',
- 'public/WebFileWriter.h',
'public/WebFileWriterClient.h',
+ 'public/WebFileWriter.h',
'public/WebFindOptions.h',
'public/WebFloatPoint.h',
'public/WebFloatQuad.h',
'public/WebFloatRect.h',
- 'public/WebFont.h',
- 'public/WebFontDescription.h',
- 'public/WebFrame.h',
- 'public/WebFrameClient.h',
'public/WebFontCache.h',
+ 'public/WebFontDescription.h',
+ 'public/WebFont.h',
'public/WebFormControlElement.h',
'public/WebFormElement.h',
+ 'public/WebFrameClient.h',
+ 'public/WebFrame.h',
'public/WebGamepad.h',
'public/WebGamepads.h',
'public/WebGeolocationClient.h',
@@ -212,21 +214,21 @@
'public/WebHTTPLoadInfo.h',
'public/WebIconLoadingCompletion.h',
'public/WebIconURL.h',
- 'public/WebImage.h',
- 'public/WebImageDecoder.h',
'public/WebIDBCallbacks.h',
'public/WebIDBCursor.h',
- 'public/WebIDBDatabase.h',
'public/WebIDBDatabaseCallbacks.h',
'public/WebIDBDatabaseError.h',
+ 'public/WebIDBDatabase.h',
'public/WebIDBFactory.h',
- 'public/WebIDBKeyRange.h',
'public/WebIDBIndex.h',
'public/WebIDBKey.h',
'public/WebIDBKeyPath.h',
+ 'public/WebIDBKeyRange.h',
'public/WebIDBObjectStore.h',
- 'public/WebIDBTransaction.h',
'public/WebIDBTransactionCallbacks.h',
+ 'public/WebIDBTransaction.h',
+ 'public/WebImageDecoder.h',
+ 'public/WebImage.h',
'public/WebInputElement.h',
'public/WebInputEvent.h',
'public/WebIntent.h',
@@ -234,62 +236,58 @@
'public/WebKit.h',
'public/WebKitPlatformSupport.h',
'public/WebLabelElement.h',
- 'public/WebLayer.h',
- 'public/WebLayerClient.h',
- 'public/WebLayerTreeView.h',
- 'public/WebLayerTreeViewClient.h',
'public/WebLocalizedString.h',
'public/WebMediaElement.h',
- 'public/WebMediaPlayer.h',
'public/WebMediaPlayerAction.h',
'public/WebMediaPlayerClient.h',
+ 'public/WebMediaPlayer.h',
'public/WebMediaStreamDescriptor.h',
'public/WebMediaStreamRegistry.h',
'public/WebMediaStreamSource.h',
'public/WebMenuItemInfo.h',
- 'public/WebMessagePortChannel.h',
'public/WebMessagePortChannelClient.h',
+ 'public/WebMessagePortChannel.h',
'public/WebMimeRegistry.h',
'public/WebNamedNodeMap.h',
'public/WebNavigationType.h',
'public/WebNetworkStateNotifier.h',
- 'public/WebNode.h',
'public/WebNodeCollection.h',
+ 'public/WebNode.h',
'public/WebNodeList.h',
'public/WebNonCopyable.h',
'public/WebNotification.h',
- 'public/WebNotificationPresenter.h',
'public/WebNotificationPermissionCallback.h',
+ 'public/WebNotificationPresenter.h',
'public/WebOptionElement.h',
'public/WebPageOverlay.h',
- 'public/WebPageSerializer.h',
'public/WebPageSerializerClient.h',
+ 'public/WebPageSerializer.h',
'public/WebPageVisibilityState.h',
'public/WebPasswordFormData.h',
- 'public/WebPeerConnectionHandler.h',
'public/WebPeerConnectionHandlerClient.h',
+ 'public/WebPeerConnectionHandler.h',
'public/WebPerformance.h',
'public/WebPermissionClient.h',
- 'public/WebPlugin.h',
'public/WebPluginContainer.h',
'public/WebPluginDocument.h',
+ 'public/WebPlugin.h',
'public/WebPluginListBuilder.h',
'public/WebPoint.h',
'public/WebPopupMenu.h',
'public/WebPopupMenuInfo.h',
'public/WebPopupType.h',
- 'public/WebPrivatePtr.h',
'public/WebPrivateOwnPtr.h',
+ 'public/WebPrivatePtr.h',
'public/WebRange.h',
'public/WebRect.h',
'public/WebReferrerPolicy.h',
'public/WebRegularExpression.h',
'public/WebRuntimeFeatures.h',
- 'public/WebScrollbar.h',
- 'public/WebScrollbarClient.h',
'public/WebScreenInfo.h',
'public/WebScriptController.h',
'public/WebScriptSource.h',
+ 'public/WebScrollbarClient.h',
+ 'public/WebScrollbar.h',
'public/WebSearchableFormData.h',
'public/WebSecurityOrigin.h',
'public/WebSecurityPolicy.h',
@@ -299,15 +297,16 @@
'public/WebSharedWorker.h',
'public/WebSharedWorkerRepository.h',
'public/WebSize.h',
- 'public/WebSocket.h',
'public/WebSocketClient.h',
+ 'public/WebSocket.h',
'public/WebSocketStreamError.h',
- 'public/WebSocketStreamHandle.h',
'public/WebSocketStreamHandleClient.h',
+ 'public/WebSocketStreamHandle.h',
'public/WebSpeechInputController.h',
'public/WebSpeechInputControllerMock.h',
'public/WebSpeechInputListener.h',
'public/WebSpeechInputResult.h',
+ 'public/x11/WebScreenInfoFactory.h',
'public/WebSpellCheckClient.h',
'public/WebStorageArea.h',
'public/WebStorageEventDispatcher.h',
Deleted: trunk/Source/WebKit/chromium/public/WebContentLayer.h (102018 => 102019)
--- trunk/Source/WebKit/chromium/public/WebContentLayer.h 2011-12-05 19:10:21 UTC (rev 102018)
+++ trunk/Source/WebKit/chromium/public/WebContentLayer.h 2011-12-05 19:12:26 UTC (rev 102019)
@@ -1,26 +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.
- */
-
-#include "platform/WebContentLayer.h"
Deleted: trunk/Source/WebKit/chromium/public/WebContentLayerClient.h (102018 => 102019)
--- trunk/Source/WebKit/chromium/public/WebContentLayerClient.h 2011-12-05 19:10:21 UTC (rev 102018)
+++ trunk/Source/WebKit/chromium/public/WebContentLayerClient.h 2011-12-05 19:12:26 UTC (rev 102019)
@@ -1,27 +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.
- */
-
-#include "platform/WebContentLayerClient.h"
-
Deleted: trunk/Source/WebKit/chromium/public/WebExternalTextureLayer.h (102018 => 102019)
--- trunk/Source/WebKit/chromium/public/WebExternalTextureLayer.h 2011-12-05 19:10:21 UTC (rev 102018)
+++ trunk/Source/WebKit/chromium/public/WebExternalTextureLayer.h 2011-12-05 19:12:26 UTC (rev 102019)
@@ -1,27 +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.
- */
-
-#include "platform/WebExternalTextureLayer.h"
-
Deleted: trunk/Source/WebKit/chromium/public/WebLayer.h (102018 => 102019)
--- trunk/Source/WebKit/chromium/public/WebLayer.h 2011-12-05 19:10:21 UTC (rev 102018)
+++ trunk/Source/WebKit/chromium/public/WebLayer.h 2011-12-05 19:12:26 UTC (rev 102019)
@@ -1,27 +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.
- */
-
-#include "platform/WebLayer.h"
-
Deleted: trunk/Source/WebKit/chromium/public/WebLayerClient.h (102018 => 102019)
--- trunk/Source/WebKit/chromium/public/WebLayerClient.h 2011-12-05 19:10:21 UTC (rev 102018)
+++ trunk/Source/WebKit/chromium/public/WebLayerClient.h 2011-12-05 19:12:26 UTC (rev 102019)
@@ -1,27 +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.
- */
-
-#include "platform/WebLayerClient.h"
-
Deleted: trunk/Source/WebKit/chromium/public/WebLayerTreeView.h (102018 => 102019)
--- trunk/Source/WebKit/chromium/public/WebLayerTreeView.h 2011-12-05 19:10:21 UTC (rev 102018)
+++ trunk/Source/WebKit/chromium/public/WebLayerTreeView.h 2011-12-05 19:12:26 UTC (rev 102019)
@@ -1,26 +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.
- */
-
-#include "platform/WebLayerTreeView.h"
Deleted: trunk/Source/WebKit/chromium/public/WebLayerTreeViewClient.h (102018 => 102019)
--- trunk/Source/WebKit/chromium/public/WebLayerTreeViewClient.h 2011-12-05 19:10:21 UTC (rev 102018)
+++ trunk/Source/WebKit/chromium/public/WebLayerTreeViewClient.h 2011-12-05 19:12:26 UTC (rev 102019)
@@ -1,27 +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.
- */
-
-#include "platform/WebLayerTreeViewClient.h"
-
Modified: trunk/Source/WebKit/chromium/src/WebLayerTreeView.cpp (102018 => 102019)
--- trunk/Source/WebKit/chromium/src/WebLayerTreeView.cpp 2011-12-05 19:10:21 UTC (rev 102018)
+++ trunk/Source/WebKit/chromium/src/WebLayerTreeView.cpp 2011-12-05 19:12:26 UTC (rev 102019)
@@ -26,10 +26,10 @@
#include "config.h"
#include "platform/WebLayerTreeView.h"
-#include "WebLayer.h"
#include "WebLayerTreeViewImpl.h"
#include "WebRect.h"
#include "WebSize.h"
+#include "platform/WebLayer.h"
#include "cc/CCLayerTreeHost.h"
using namespace WebCore;
Modified: trunk/Source/WebKit/chromium/src/WebLayerTreeViewImpl.cpp (102018 => 102019)
--- trunk/Source/WebKit/chromium/src/WebLayerTreeViewImpl.cpp 2011-12-05 19:10:21 UTC (rev 102018)
+++ trunk/Source/WebKit/chromium/src/WebLayerTreeViewImpl.cpp 2011-12-05 19:12:26 UTC (rev 102019)
@@ -30,12 +30,12 @@
#include "GraphicsContext3DPrivate.h"
#include "LayerChromium.h"
#include "WebGraphicsContext3D.h"
-#include "WebLayer.h"
-#include "WebLayerTreeView.h"
-#include "WebLayerTreeViewClient.h"
#include "WebSize.h"
#include "WebThread.h"
#include "cc/CCThreadProxy.h"
+#include "platform/WebLayer.h"
+#include "platform/WebLayerTreeView.h"
+#include "platform/WebLayerTreeViewClient.h"
using namespace WebCore;
Modified: trunk/Source/WebKit/chromium/tests/WebLayerTest.cpp (102018 => 102019)
--- trunk/Source/WebKit/chromium/tests/WebLayerTest.cpp 2011-12-05 19:10:21 UTC (rev 102018)
+++ trunk/Source/WebKit/chromium/tests/WebLayerTest.cpp 2011-12-05 19:12:26 UTC (rev 102019)
@@ -23,16 +23,16 @@
*/
#include "config.h"
-#include "WebLayer.h"
+#include "platform/WebLayer.h"
-#include "WebContentLayer.h"
-#include "WebContentLayerClient.h"
-#include "WebExternalTextureLayer.h"
#include "WebFloatPoint.h"
#include "WebFloatRect.h"
-#include "WebLayerClient.h"
#include "WebRect.h"
#include "WebSize.h"
+#include "platform/WebContentLayer.h"
+#include "platform/WebContentLayerClient.h"
+#include "platform/WebExternalTextureLayer.h"
+#include "platform/WebLayerClient.h"
#include <gmock/gmock.h>
_______________________________________________ webkit-changes mailing list [email protected] http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
