Log Message
Rollout http://trac.webkit.org/changeset/102019, dependent has not landed in chromium
* WebKit.gyp: * public/WebContentLayer.h: Added. * public/WebExternalTextureLayer.h: Added. * public/WebLayer.h: Added. * public/WebLayerClient.h: Added. * public/WebLayerTreeView.h: Added. * public/WebLayerTreeViewClient.h: Added. * src/WebLayerTreeView.cpp: * src/WebLayerTreeViewImpl.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
Added Paths
- trunk/Source/WebKit/chromium/public/WebContentLayer.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 (102098 => 102099)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-12-06 06:56:03 UTC (rev 102098)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-12-06 07:24:07 UTC (rev 102099)
@@ -1,3 +1,18 @@
+2011-12-05 James Robinson <[email protected]>
+
+ Rollout http://trac.webkit.org/changeset/102019, dependent has not
+ landed in chromium
+
+ * WebKit.gyp:
+ * public/WebContentLayer.h: Added.
+ * public/WebExternalTextureLayer.h: Added.
+ * public/WebLayer.h: Added.
+ * public/WebLayerClient.h: Added.
+ * public/WebLayerTreeView.h: Added.
+ * public/WebLayerTreeViewClient.h: Added.
+ * src/WebLayerTreeView.cpp:
+ * src/WebLayerTreeViewImpl.cpp:
+
2011-12-05 Dana Jansens <[email protected]>
Set opaque flag for WebGLLayerChromium
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (102098 => 102099)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2011-12-06 06:56:03 UTC (rev 102098)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2011-12-06 07:24:07 UTC (rev 102099)
@@ -95,26 +95,6 @@
'bridge/PeerConnectionHandler.cpp',
'bridge/PeerConnectionHandlerInternal.cpp',
'bridge/PeerConnectionHandlerInternal.h',
- 'public/android/WebInputEventFactory.h',
- 'public/android/WebSandboxSupport.h',
- 'public/android/WebThemeEngine.h',
- 'public/gtk/WebInputEventFactory.h',
- 'public/linux/WebFontRendering.h',
- 'public/linux/WebFontRenderStyle.h',
- 'public/linux/WebRenderTheme.h',
- 'public/linux/WebThemeEngine.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',
@@ -122,46 +102,49 @@
'public/WebApplicationCacheHostClient.h',
'public/WebArrayBuffer.h',
'public/WebAttribute.h',
+ 'public/WebAudioSourceProvider.h',
'public/WebAudioSourceProviderClient.h',
- 'public/WebAudioSourceProvider.h',
'public/WebAutofillClient.h',
'public/WebBindings.h',
'public/WebBlob.h',
'public/WebCache.h',
'public/WebCommonWorkerClient.h',
'public/WebCompositionUnderline.h',
+ 'public/WebCompositor.h',
'public/WebCompositorClient.h',
- 'public/WebCompositor.h',
+ 'public/WebCompositorInputHandler.h',
'public/WebCompositorInputHandlerClient.h',
- 'public/WebCompositorInputHandler.h',
'public/WebConsoleMessage.h',
+ 'public/WebContentLayer.h',
+ 'public/WebContentLayerClient.h',
'public/WebContextMenuData.h',
'public/WebCrossOriginPreflightResultCache.h',
'public/WebCursorInfo.h',
+ 'public/WebDOMEvent.h',
+ 'public/WebDOMEventListener.h',
+ 'public/WebDOMMessageEvent.h',
+ 'public/WebDOMMouseEvent.h',
+ 'public/WebDOMMutationEvent.h',
+ 'public/WebDOMStringList.h',
+ 'public/WebDataSource.h',
'public/WebDatabase.h',
'public/WebDatabaseObserver.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/WebEditingAction.h',
'public/WebElement.h',
'public/WebExceptionCode.h',
+ 'public/WebExternalPopupMenu.h',
'public/WebExternalPopupMenuClient.h',
- 'public/WebExternalPopupMenu.h',
+ 'public/WebExternalTextureLayer.h',
'public/WebFileChooserCompletion.h',
'public/WebFileChooserParams.h',
'public/WebFileError.h',
@@ -169,16 +152,16 @@
'public/WebFileSystemCallbacks.h',
'public/WebFileSystemEntry.h',
'public/WebFileUtilities.h',
+ 'public/WebFileWriter.h',
'public/WebFileWriterClient.h',
- 'public/WebFileWriter.h',
'public/WebFindOptions.h',
+ 'public/WebFont.h',
'public/WebFontCache.h',
'public/WebFontDescription.h',
- 'public/WebFont.h',
'public/WebFormControlElement.h',
'public/WebFormElement.h',
+ 'public/WebFrame.h',
'public/WebFrameClient.h',
- 'public/WebFrame.h',
'public/WebGeolocationClient.h',
'public/WebGeolocationClientMock.h',
'public/WebGeolocationController.h',
@@ -188,21 +171,21 @@
'public/WebGeolocationPosition.h',
'public/WebGlyphCache.h',
'public/WebHistoryItem.h',
- 'public/WebIconLoadingCompletion.h',
- 'public/WebIconURL.h',
'public/WebIDBCallbacks.h',
'public/WebIDBCursor.h',
+ 'public/WebIDBDatabase.h',
'public/WebIDBDatabaseCallbacks.h',
'public/WebIDBDatabaseError.h',
- 'public/WebIDBDatabase.h',
'public/WebIDBFactory.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/WebIconLoadingCompletion.h',
+ 'public/WebIconURL.h',
'public/WebImageDecoder.h',
'public/WebInputElement.h',
'public/WebInputEvent.h',
@@ -210,35 +193,39 @@
'public/WebIntentServiceInfo.h',
'public/WebKit.h',
'public/WebLabelElement.h',
+ 'public/WebLayer.h',
+ 'public/WebLayerClient.h',
+ 'public/WebLayerTreeView.h',
+ 'public/WebLayerTreeViewClient.h',
'public/WebMediaElement.h',
+ 'public/WebMediaPlayer.h',
'public/WebMediaPlayerAction.h',
'public/WebMediaPlayerClient.h',
- 'public/WebMediaPlayer.h',
'public/WebMediaStreamRegistry.h',
'public/WebMediaStreamSource.h',
'public/WebMenuItemInfo.h',
+ 'public/WebMessagePortChannel.h',
'public/WebMessagePortChannelClient.h',
- 'public/WebMessagePortChannel.h',
'public/WebNamedNodeMap.h',
'public/WebNavigationType.h',
'public/WebNetworkStateNotifier.h',
+ 'public/WebNode.h',
'public/WebNodeCollection.h',
- 'public/WebNode.h',
'public/WebNodeList.h',
'public/WebNotification.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/WebPerformance.h',
'public/WebPermissionClient.h',
+ 'public/WebPlugin.h',
'public/WebPluginContainer.h',
'public/WebPluginDocument.h',
- 'public/WebPlugin.h',
'public/WebPluginListBuilder.h',
'public/WebPopupMenu.h',
'public/WebPopupMenuInfo.h',
@@ -250,8 +237,8 @@
'public/WebScreenInfo.h',
'public/WebScriptController.h',
'public/WebScriptSource.h',
+ 'public/WebScrollbar.h',
'public/WebScrollbarClient.h',
- 'public/WebScrollbar.h',
'public/WebSearchableFormData.h',
'public/WebSecurityOrigin.h',
'public/WebSecurityPolicy.h',
@@ -259,28 +246,27 @@
'public/WebSettings.h',
'public/WebSharedWorker.h',
'public/WebSharedWorkerRepository.h',
+ 'public/WebSocket.h',
'public/WebSocketClient.h',
- 'public/WebSocket.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',
+ 'public/WebStorageNamespace.h',
'public/WebStorageQuotaCallbacks.h',
'public/WebStorageQuotaType.h',
- 'public/WebStorageNamespace.h',
'public/WebTextAffinity.h',
'public/WebTextCaseSensitivity.h',
+ 'public/WebTextCheckingCompletion.h',
'public/WebTextCheckingResult.h',
- 'public/WebTextCheckingCompletion.h',
'public/WebTextDirection.h',
'public/WebTextInputType.h',
'public/WebTextRun.h',
+ 'public/WebURLLoadTiming.h',
'public/WebURLLoaderOptions.h',
- 'public/WebURLLoadTiming.h',
'public/WebUserMediaClient.h',
'public/WebUserMediaRequest.h',
'public/WebView.h',
@@ -290,6 +276,19 @@
'public/WebWorker.h',
'public/WebWorkerClient.h',
'public/WebWorkerRunLoop.h',
+ 'public/android/WebInputEventFactory.h',
+ 'public/android/WebSandboxSupport.h',
+ 'public/android/WebThemeEngine.h',
+ 'public/gtk/WebInputEventFactory.h',
+ 'public/linux/WebFontRenderStyle.h',
+ 'public/linux/WebFontRendering.h',
+ 'public/linux/WebRenderTheme.h',
+ 'public/linux/WebThemeEngine.h',
+ 'public/mac/WebInputEventFactory.h',
+ 'public/mac/WebSandboxSupport.h',
+ 'public/mac/WebScreenInfoFactory.h',
+ 'public/mac/WebSubstringUtil.h',
+ 'public/mac/WebThemeEngine.h',
'public/platform/WebArrayBufferView.h',
'public/platform/WebAudioBus.h',
'public/platform/WebAudioDevice.h',
@@ -301,10 +300,13 @@
'public/platform/WebColor.h',
'public/platform/WebColorName.h',
'public/platform/WebCommon.h',
+ 'public/platform/WebContentLayer.h',
+ 'public/platform/WebContentLayerClient.h',
'public/platform/WebCookie.h',
'public/platform/WebCookieJar.h',
'public/platform/WebData.h',
'public/platform/WebDragData.h',
+ 'public/platform/WebExternalTextureLayer.h',
'public/platform/WebFileSystem.h',
'public/platform/WebFloatPoint.h',
'public/platform/WebFloatQuad.h',
@@ -317,6 +319,10 @@
'public/platform/WebHTTPLoadInfo.h',
'public/platform/WebImage.h',
'public/platform/WebKitPlatformSupport.h',
+ 'public/platform/WebLayer.h',
+ 'public/platform/WebLayerClient.h',
+ 'public/platform/WebLayerTreeView.h',
+ 'public/platform/WebLayerTreeViewClient.h',
'public/platform/WebLocalizedString.h',
'public/platform/WebMediaStreamDescriptor.h',
'public/platform/WebMimeRegistry.h',
@@ -354,6 +360,7 @@
'public/win/WebSandboxSupport.h',
'public/win/WebScreenInfoFactory.h',
'public/win/WebThemeEngine.h',
+ 'public/x11/WebScreenInfoFactory.h',
'src/ApplicationCacheHost.cpp',
'src/ApplicationCacheHostInternal.h',
'src/AssertMatchingEnums.cpp',
Added: trunk/Source/WebKit/chromium/public/WebContentLayer.h (0 => 102099)
--- trunk/Source/WebKit/chromium/public/WebContentLayer.h (rev 0)
+++ trunk/Source/WebKit/chromium/public/WebContentLayer.h 2011-12-06 07:24:07 UTC (rev 102099)
@@ -0,0 +1,26 @@
+/*
+ * 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"
Property changes on: trunk/Source/WebKit/chromium/public/WebContentLayer.h
___________________________________________________________________
Added: svn:eol-style
Added: trunk/Source/WebKit/chromium/public/WebExternalTextureLayer.h (0 => 102099)
--- trunk/Source/WebKit/chromium/public/WebExternalTextureLayer.h (rev 0)
+++ trunk/Source/WebKit/chromium/public/WebExternalTextureLayer.h 2011-12-06 07:24:07 UTC (rev 102099)
@@ -0,0 +1,27 @@
+/*
+ * 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"
+
Property changes on: trunk/Source/WebKit/chromium/public/WebExternalTextureLayer.h
___________________________________________________________________
Added: svn:eol-style
Added: trunk/Source/WebKit/chromium/public/WebLayer.h (0 => 102099)
--- trunk/Source/WebKit/chromium/public/WebLayer.h (rev 0)
+++ trunk/Source/WebKit/chromium/public/WebLayer.h 2011-12-06 07:24:07 UTC (rev 102099)
@@ -0,0 +1,27 @@
+/*
+ * 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"
+
Property changes on: trunk/Source/WebKit/chromium/public/WebLayer.h
___________________________________________________________________
Added: svn:eol-style
Added: trunk/Source/WebKit/chromium/public/WebLayerClient.h (0 => 102099)
--- trunk/Source/WebKit/chromium/public/WebLayerClient.h (rev 0)
+++ trunk/Source/WebKit/chromium/public/WebLayerClient.h 2011-12-06 07:24:07 UTC (rev 102099)
@@ -0,0 +1,27 @@
+/*
+ * 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"
+
Property changes on: trunk/Source/WebKit/chromium/public/WebLayerClient.h
___________________________________________________________________
Added: svn:eol-style
Added: trunk/Source/WebKit/chromium/public/WebLayerTreeView.h (0 => 102099)
--- trunk/Source/WebKit/chromium/public/WebLayerTreeView.h (rev 0)
+++ trunk/Source/WebKit/chromium/public/WebLayerTreeView.h 2011-12-06 07:24:07 UTC (rev 102099)
@@ -0,0 +1,26 @@
+/*
+ * 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"
Property changes on: trunk/Source/WebKit/chromium/public/WebLayerTreeView.h
___________________________________________________________________
Added: svn:eol-style
Added: trunk/Source/WebKit/chromium/public/WebLayerTreeViewClient.h (0 => 102099)
--- trunk/Source/WebKit/chromium/public/WebLayerTreeViewClient.h (rev 0)
+++ trunk/Source/WebKit/chromium/public/WebLayerTreeViewClient.h 2011-12-06 07:24:07 UTC (rev 102099)
@@ -0,0 +1,27 @@
+/*
+ * 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"
+
Property changes on: trunk/Source/WebKit/chromium/public/WebLayerTreeViewClient.h
___________________________________________________________________
Added: svn:eol-style
Modified: trunk/Source/WebKit/chromium/src/WebLayerTreeView.cpp (102098 => 102099)
--- trunk/Source/WebKit/chromium/src/WebLayerTreeView.cpp 2011-12-06 06:56:03 UTC (rev 102098)
+++ trunk/Source/WebKit/chromium/src/WebLayerTreeView.cpp 2011-12-06 07:24:07 UTC (rev 102099)
@@ -26,11 +26,11 @@
#include "config.h"
#include "platform/WebLayerTreeView.h"
-#include "WebLayerTreeViewImpl.h"
+#include "cc/CCLayerTreeHost.h"
+#include "platform/WebLayer.h"
+#include "platform/WebLayerTreeViewImpl.h"
#include "platform/WebRect.h"
#include "platform/WebSize.h"
-#include "platform/WebLayer.h"
-#include "cc/CCLayerTreeHost.h"
using namespace WebCore;
Modified: trunk/Source/WebKit/chromium/src/WebLayerTreeViewImpl.cpp (102098 => 102099)
--- trunk/Source/WebKit/chromium/src/WebLayerTreeViewImpl.cpp 2011-12-06 06:56:03 UTC (rev 102098)
+++ trunk/Source/WebKit/chromium/src/WebLayerTreeViewImpl.cpp 2011-12-06 07:24:07 UTC (rev 102099)
@@ -29,13 +29,13 @@
#include "CCThreadImpl.h"
#include "GraphicsContext3DPrivate.h"
#include "LayerChromium.h"
+#include "cc/CCThreadProxy.h"
#include "platform/WebGraphicsContext3D.h"
-#include "platform/WebSize.h"
-#include "platform/WebThread.h"
-#include "cc/CCThreadProxy.h"
#include "platform/WebLayer.h"
#include "platform/WebLayerTreeView.h"
#include "platform/WebLayerTreeViewClient.h"
+#include "platform/WebSize.h"
+#include "platform/WebThread.h"
using namespace WebCore;
_______________________________________________ webkit-changes mailing list [email protected] http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
