[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
japhet at chromium.org
japhet at chromium.org
Thu Apr 8 02:19:48 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 553f87dfa86179e190ef0e3e51c451d2ad06bffc
Author: japhet at chromium.org <japhet at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Mar 12 00:03:32 2010 +0000
2010-03-11 Nate Chapin <japhet at chromium.org>
Reviewed by Dimitri Glazkov.
[V8] Remove DOMObjectsInclude.h and update headers accordingly.
https://bugs.webkit.org/show_bug.cgi?id=36036
* WebCore.gypi:
* bindings/v8/DOMData.h:
* bindings/v8/DOMDataStore.h:
* bindings/v8/DOMObjectsInclude.h: Removed.
* bindings/v8/V8DOMMap.cpp:
* bindings/v8/V8DOMWindowShell.cpp:
* bindings/v8/V8DOMWrapper.cpp:
* bindings/v8/V8GCController.cpp:
* bindings/v8/V8Proxy.cpp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55862 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 8105e6d..b5b8324 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2010-03-11 Nate Chapin <japhet at chromium.org>
+
+ Reviewed by Dimitri Glazkov.
+
+ [V8] Remove DOMObjectsInclude.h and update headers accordingly.
+
+ https://bugs.webkit.org/show_bug.cgi?id=36036
+
+ * WebCore.gypi:
+ * bindings/v8/DOMData.h:
+ * bindings/v8/DOMDataStore.h:
+ * bindings/v8/DOMObjectsInclude.h: Removed.
+ * bindings/v8/V8DOMMap.cpp:
+ * bindings/v8/V8DOMWindowShell.cpp:
+ * bindings/v8/V8DOMWrapper.cpp:
+ * bindings/v8/V8GCController.cpp:
+ * bindings/v8/V8Proxy.cpp:
+
2010-03-11 Simon Fraser <simon.fraser at apple.com>
Reviewed by Mark Rowe.
diff --git a/WebCore/WebCore.gypi b/WebCore/WebCore.gypi
index 71fa69d..2c8e3ea 100644
--- a/WebCore/WebCore.gypi
+++ b/WebCore/WebCore.gypi
@@ -795,7 +795,6 @@
'bindings/v8/DOMData.h',
'bindings/v8/DOMDataStore.cpp',
'bindings/v8/DOMDataStore.h',
- 'bindings/v8/DOMObjectsInclude.h',
'bindings/v8/DOMWrapperWorld.cpp',
'bindings/v8/DOMWrapperWorld.h',
'bindings/v8/IsolatedWorld.cpp',
diff --git a/WebCore/bindings/v8/DOMData.h b/WebCore/bindings/v8/DOMData.h
index 3551c9d..70e1749 100644
--- a/WebCore/bindings/v8/DOMData.h
+++ b/WebCore/bindings/v8/DOMData.h
@@ -32,6 +32,7 @@
#define DOMData_h
#include "DOMDataStore.h"
+#include "V8DOMWrapper.h"
namespace WebCore {
diff --git a/WebCore/bindings/v8/DOMDataStore.h b/WebCore/bindings/v8/DOMDataStore.h
index 54a49e7..2333a48 100644
--- a/WebCore/bindings/v8/DOMDataStore.h
+++ b/WebCore/bindings/v8/DOMDataStore.h
@@ -31,7 +31,7 @@
#ifndef DOMDataStore_h
#define DOMDataStore_h
-#include "DOMObjectsInclude.h"
+#include "V8DOMMap.h"
#include "V8Node.h"
#include <v8.h>
@@ -47,6 +47,7 @@
namespace WebCore {
class DOMData;
+ class DOMDataStore;
typedef WTF::Vector<DOMDataStore*> DOMDataList;
diff --git a/WebCore/bindings/v8/DOMObjectsInclude.h b/WebCore/bindings/v8/DOMObjectsInclude.h
deleted file mode 100644
index cd8443a..0000000
--- a/WebCore/bindings/v8/DOMObjectsInclude.h
+++ /dev/null
@@ -1,300 +0,0 @@
-/*
- * Copyright (C) 2009 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.
- */
-
-#ifndef DOMObjectsInclude_h
-#define DOMObjectsInclude_h
-
-#include "Attr.h"
-#include "BarInfo.h"
-#include "BeforeLoadEvent.h"
-#include "Blob.h"
-#include "WebGLActiveInfo.h"
-#include "WebGLArray.h"
-#include "WebGLArrayBuffer.h"
-#include "WebGLBuffer.h"
-#include "WebGLByteArray.h"
-#include "WebGLFloatArray.h"
-#include "WebGLFramebuffer.h"
-#include "CanvasGradient.h"
-#include "WebGLIntArray.h"
-#include "CanvasObject.h"
-#include "CanvasPattern.h"
-#include "CanvasPixelArray.h"
-#include "WebGLProgram.h"
-#include "WebGLRenderbuffer.h"
-#include "CanvasRenderingContext.h"
-#include "CanvasRenderingContext2D.h"
-#include "WebGLRenderingContext.h"
-#include "WebGLShader.h"
-#include "WebGLShortArray.h"
-#include "WebGLUnsignedByteArray.h"
-#include "WebGLUnsignedIntArray.h"
-#include "WebGLUnsignedShortArray.h"
-#include "CanvasStyle.h"
-#include "WebGLTexture.h"
-#include "CharacterData.h"
-#include "ClientRect.h"
-#include "ClientRectList.h"
-#include "Clipboard.h"
-#include "CompositionEvent.h"
-#include "Console.h"
-#include "Counter.h"
-#include "CSSCharsetRule.h"
-#include "CSSFontFaceRule.h"
-#include "CSSImportRule.h"
-#include "CSSMediaRule.h"
-#include "CSSPageRule.h"
-#include "CSSRule.h"
-#include "CSSRuleList.h"
-#include "CSSStyleDeclaration.h"
-#include "CSSStyleRule.h"
-#include "CSSStyleSheet.h"
-#include "CSSValueList.h"
-#include "CSSVariablesDeclaration.h"
-#include "CSSVariablesRule.h"
-#include "DocumentType.h"
-#include "DocumentFragment.h"
-#include "DOMCoreException.h"
-#include "DOMImplementation.h"
-#include "DOMParser.h"
-#include "DOMSelection.h"
-#include "DOMWindow.h"
-#include "Entity.h"
-#include "ErrorEvent.h"
-#include "EventListener.h"
-#include "EventTarget.h"
-#include "Event.h"
-#include "EventException.h"
-#include "ExceptionCode.h"
-#include "File.h"
-#include "FileList.h"
-#include "Frame.h"
-#include "FrameLoader.h"
-#include "FrameTree.h"
-#include "History.h"
-#include "HTMLNames.h"
-#include "HTMLDocument.h"
-#include "HTMLElement.h"
-#include "HTMLImageElement.h"
-#include "HTMLInputElement.h"
-#include "HTMLSelectElement.h"
-#include "HTMLOptionsCollection.h"
-#include "ImageData.h"
-#include "KeyboardEvent.h"
-#include "Location.h"
-#include "Media.h"
-#include "MediaError.h"
-#include "MediaList.h"
-#include "MediaPlayer.h"
-#include "MessageChannel.h"
-#include "MessageEvent.h"
-#include "MessagePort.h"
-#include "MimeTypeArray.h"
-#include "MouseEvent.h"
-#include "MutationEvent.h"
-#include "Navigator.h" // for MimeTypeArray
-#include "NodeFilter.h"
-#include "Notation.h"
-#include "NodeList.h"
-#include "NodeIterator.h"
-#include "OverflowEvent.h"
-#include "Page.h"
-#include "PageTransitionEvent.h"
-#include "Plugin.h"
-#include "PluginArray.h"
-#include "PopStateEvent.h"
-#include "ProcessingInstruction.h"
-#include "ProgressEvent.h"
-#include "Range.h"
-#include "RangeException.h"
-#include "Rect.h"
-#include "RGBColor.h"
-#include "Screen.h"
-#include "ScriptExecutionContext.h"
-#include "SecurityOrigin.h"
-#include "Settings.h"
-#include "StyleSheet.h"
-#include "StyleSheetList.h"
-#include "TextEvent.h"
-#include "TextMetrics.h"
-#include "TimeRanges.h"
-#include "TreeWalker.h"
-#include "V8AbstractEventListener.h"
-#include "V8CustomEventListener.h"
-#include "V8DOMWindow.h"
-#include "V8HTMLElement.h"
-#include "V8LazyEventListener.h"
-#include "V8NodeFilterCondition.h"
-#include "ValidityState.h"
-#include "WebKitAnimationEvent.h"
-#include "WebKitCSSKeyframeRule.h"
-#include "WebKitCSSKeyframesRule.h"
-#include "WebKitCSSMatrix.h"
-#include "WebKitCSSTransformValue.h"
-#include "WebKitPoint.h"
-#include "WebKitTransitionEvent.h"
-#include "WheelEvent.h"
-#include "XMLHttpRequest.h"
-#include "XMLHttpRequestException.h"
-#include "XMLHttpRequestProgressEvent.h"
-#include "XMLHttpRequestUpload.h"
-#include "XMLSerializer.h"
-
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
-#include "DOMApplicationCache.h"
-#endif
-
-#if ENABLE(DATABASE)
-#include "Database.h"
-#include "SQLTransaction.h"
-#include "SQLResultSet.h"
-#include "SQLResultSetRowList.h"
-#endif // DATABASE
-
-#if ENABLE(DATAGRID)
-#include "DataGridColumn.h"
-#include "DataGridColumnList.h"
-#endif // DATAGRID
-
-#if ENABLE(DOM_STORAGE)
-#include "Storage.h"
-#include "StorageEvent.h"
-#endif // DOM_STORAGE
-
-#if ENABLE(EVENTSOURCE)
-#include "EventSource.h"
-#endif // EVENTSOURCE
-
-// GEOLOCATION
-#include "Coordinates.h"
-#include "Geolocation.h"
-#include "Geoposition.h"
-#include "PositionError.h"
-
-#if ENABLE(INDEXED_DATABASE)
-#include "IDBDatabaseError.h"
-#include "IDBDatabaseException.h"
-#include "IDBDatabaseRequest.h"
-#include "IDBRequest.h"
-#include "IndexedDatabaseRequest.h"
-#endif // INDEXED_DATABASE
-
-#if ENABLE(SVG)
-#include "SVGAngle.h"
-#include "SVGAnimatedPoints.h"
-#include "SVGColor.h"
-#include "SVGElement.h"
-#include "SVGElementInstance.h"
-#include "SVGElementInstanceList.h"
-#include "SVGException.h"
-#include "SVGLength.h"
-#include "SVGLengthList.h"
-#include "SVGNumberList.h"
-#include "SVGPaint.h"
-#include "SVGPathSeg.h"
-#include "SVGPathSegArc.h"
-#include "SVGPathSegClosePath.h"
-#include "SVGPathSegCurvetoCubic.h"
-#include "SVGPathSegCurvetoCubicSmooth.h"
-#include "SVGPathSegCurvetoQuadratic.h"
-#include "SVGPathSegCurvetoQuadraticSmooth.h"
-#include "SVGPathSegLineto.h"
-#include "SVGPathSegLinetoHorizontal.h"
-#include "SVGPathSegLinetoVertical.h"
-#include "SVGPathSegList.h"
-#include "SVGPathSegMoveto.h"
-#include "SVGPointList.h"
-#include "SVGPreserveAspectRatio.h"
-#include "SVGRenderingIntent.h"
-#include "SVGStringList.h"
-#include "SVGTransform.h"
-#include "SVGTransformList.h"
-#include "SVGUnitTypes.h"
-#include "SVGURIReference.h"
-#include "SVGZoomEvent.h"
-#include "V8SVGPODTypeWrapper.h"
-#endif // SVG
-
-#if ENABLE(WEB_SOCKETS)
-#include "WebSocket.h"
-#endif
-
-#if ENABLE(WORKERS)
-#include "AbstractWorker.h"
-#include "DedicatedWorkerContext.h"
-#include "Worker.h"
-#include "WorkerContext.h"
-#include "WorkerLocation.h"
-#include "WorkerNavigator.h"
-#endif // WORKERS
-
-#if ENABLE(SHARED_WORKERS)
-#include "SharedWorker.h"
-#include "SharedWorkerContext.h"
-#endif // SHARED_WORKERS
-
-#if ENABLE(NOTIFICATIONS)
-#include "Notification.h"
-#include "NotificationCenter.h"
-#endif // NOTIFICATIONS
-
-#if ENABLE(XPATH)
-#include "XPathEvaluator.h"
-#include "XPathException.h"
-#include "XPathExpression.h"
-#include "XPathNSResolver.h"
-#include "XPathResult.h"
-#endif // XPATH
-
-#if ENABLE(XSLT)
-#include "XSLTProcessor.h"
-#endif // XSLT
-
-#if ENABLE(INSPECTOR)
-#include "InjectedScriptHost.h"
-#include "InspectorBackend.h"
-#include "InspectorFrontendHost.h"
-#endif // INSPECTOR
-
-#if ENABLE(TOUCH_EVENTS)
-#include "Touch.h"
-#include "TouchEvent.h"
-#include "TouchList.h"
-#endif
-
-namespace WebCore {
-
- // A helper class for undetectable document.all
- class HTMLAllCollection : public HTMLCollection {
- };
-
-} // namespace WebCore
-
-#endif // DOMObjectsInclude_h
diff --git a/WebCore/bindings/v8/V8DOMMap.cpp b/WebCore/bindings/v8/V8DOMMap.cpp
index fa2fba3..3c5e92c 100644
--- a/WebCore/bindings/v8/V8DOMMap.cpp
+++ b/WebCore/bindings/v8/V8DOMMap.cpp
@@ -33,7 +33,6 @@
#include "DOMData.h"
#include "DOMDataStore.h"
-#include "DOMObjectsInclude.h"
#include "MainThreadDOMData.h"
#include "ScopedDOMDataStore.h"
diff --git a/WebCore/bindings/v8/V8DOMWindowShell.cpp b/WebCore/bindings/v8/V8DOMWindowShell.cpp
index 867820c..f645deb 100644
--- a/WebCore/bindings/v8/V8DOMWindowShell.cpp
+++ b/WebCore/bindings/v8/V8DOMWindowShell.cpp
@@ -36,7 +36,6 @@
#include "CSSMutableStyleDeclaration.h"
#include "DateExtension.h"
#include "DocumentLoader.h"
-#include "DOMObjectsInclude.h"
#include "Frame.h"
#include "FrameLoaderClient.h"
#include "InspectorTimelineAgent.h"
diff --git a/WebCore/bindings/v8/V8DOMWrapper.cpp b/WebCore/bindings/v8/V8DOMWrapper.cpp
index dd359d9..3325924 100644
--- a/WebCore/bindings/v8/V8DOMWrapper.cpp
+++ b/WebCore/bindings/v8/V8DOMWrapper.cpp
@@ -33,7 +33,6 @@
#include "CSSMutableStyleDeclaration.h"
#include "DOMDataStore.h"
-#include "DOMObjectsInclude.h"
#include "DocumentLoader.h"
#include "FrameLoaderClient.h"
#include "Notification.h"
@@ -42,6 +41,7 @@
#include "V8Binding.h"
#include "V8Collection.h"
#include "V8CustomEventListener.h"
+#include "V8DedicatedWorkerContext.h"
#include "V8DOMApplicationCache.h"
#include "V8DOMMap.h"
#include "V8DOMWindow.h"
@@ -54,6 +54,7 @@
#include "V8MessageChannel.h"
#include "V8NamedNodeMap.h"
#include "V8Node.h"
+#include "V8NodeFilterCondition.h"
#include "V8NodeList.h"
#include "V8Notification.h"
#include "V8Proxy.h"
diff --git a/WebCore/bindings/v8/V8GCController.cpp b/WebCore/bindings/v8/V8GCController.cpp
index 81fc8fb..c5be506 100644
--- a/WebCore/bindings/v8/V8GCController.cpp
+++ b/WebCore/bindings/v8/V8GCController.cpp
@@ -31,8 +31,14 @@
#include "config.h"
#include "V8GCController.h"
+#include "ActiveDOMObject.h"
+#include "Attr.h"
#include "DOMDataStore.h"
-#include "DOMObjectsInclude.h"
+#include "Frame.h"
+#include "HTMLImageElement.h"
+#include "HTMLNames.h"
+#include "MessagePort.h"
+#include "SVGElement.h"
#include "V8DOMMap.h"
#include "V8Index.h"
#include "V8Proxy.h"
diff --git a/WebCore/bindings/v8/V8Proxy.cpp b/WebCore/bindings/v8/V8Proxy.cpp
index 7a0c9a0..5ac521a 100644
--- a/WebCore/bindings/v8/V8Proxy.cpp
+++ b/WebCore/bindings/v8/V8Proxy.cpp
@@ -33,14 +33,16 @@
#include "CSSMutableStyleDeclaration.h"
#include "DateExtension.h"
-#include "DOMObjectsInclude.h"
#include "DocumentLoader.h"
+#include "Frame.h"
#include "FrameLoaderClient.h"
#include "InspectorTimelineAgent.h"
#include "Page.h"
#include "PageGroup.h"
#include "PlatformBridge.h"
+#include "SVGElement.h"
#include "ScriptController.h"
+#include "Settings.h"
#include "StorageNamespace.h"
#include "V8Binding.h"
#include "V8BindingState.h"
@@ -56,6 +58,7 @@
#include "V8RangeException.h"
#include "V8XMLHttpRequestException.h"
#include "V8XPathException.h"
+#include "WorkerContext.h"
#include "WorkerContextExecutionProxy.h"
#if ENABLE(SVG)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list