diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-06-28 16:42:48 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-07-02 10:29:56 +0100 |
| commit | 06ea8e899e48f1f2f396b70e63fae369f2f23232 (patch) | |
| tree | 20c1428cd05c76f32394ab354ea35ed99acd86d8 /WebCore/bindings/js/JSBindingsAllInOne.cpp | |
| parent | 72aad67af14193199e29cdd5c4ddc095a8b9a8a8 (diff) | |
| download | external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.zip external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.tar.gz external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.tar.bz2 | |
Merge WebKit at r61871: Initial merge by git.
Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
Diffstat (limited to 'WebCore/bindings/js/JSBindingsAllInOne.cpp')
| -rw-r--r-- | WebCore/bindings/js/JSBindingsAllInOne.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/WebCore/bindings/js/JSBindingsAllInOne.cpp b/WebCore/bindings/js/JSBindingsAllInOne.cpp index ae31608..1d64198 100644 --- a/WebCore/bindings/js/JSBindingsAllInOne.cpp +++ b/WebCore/bindings/js/JSBindingsAllInOne.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 Apple Inc. All Rights Reserved. + * Copyright (C) 2009, 2010 Apple Inc. All Rights Reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -58,7 +58,7 @@ #include "JSElementCustom.cpp" #include "JSEventCustom.cpp" #include "JSEventListener.cpp" -#include "JSEventSourceConstructor.cpp" +#include "JSEventSourceCustom.cpp" #include "JSEventTarget.cpp" #include "JSExceptionBase.cpp" #include "JSHTMLAllCollectionCustom.cpp" @@ -86,7 +86,6 @@ #include "JSLazyEventListener.cpp" #include "JSLocationCustom.cpp" #include "JSMainThreadExecState.cpp" -#include "JSMessageChannelConstructor.cpp" #include "JSMessageChannelCustom.cpp" #include "JSMessageEventCustom.cpp" #include "JSMessagePortCustom.cpp" @@ -111,25 +110,21 @@ #include "JSSVGPathSegCustom.cpp" #include "JSSVGPathSegListCustom.cpp" #include "JSScriptProfileNodeCustom.cpp" -#include "JSSharedWorkerConstructor.cpp" #include "JSSharedWorkerCustom.cpp" #include "JSStorageCustom.cpp" #include "JSStyleSheetCustom.cpp" #include "JSStyleSheetListCustom.cpp" #include "JSTextCustom.cpp" #include "JSTreeWalkerCustom.cpp" -#include "JSWebKitCSSMatrixConstructor.cpp" -#include "JSWebKitPointConstructor.cpp" -#include "JSWebSocketConstructor.cpp" +#include "JSWebKitCSSMatrixCustom.cpp" +#include "JSWebKitPointCustom.cpp" #include "JSWebSocketCustom.cpp" -#include "JSWorkerConstructor.cpp" #include "JSWorkerContextBase.cpp" #include "JSWorkerContextCustom.cpp" #include "JSWorkerContextErrorHandler.cpp" #include "JSWorkerCustom.cpp" #include "JSXMLHttpRequestCustom.cpp" #include "JSXMLHttpRequestUploadCustom.cpp" -#include "JSXSLTProcessorConstructor.cpp" #include "JSXSLTProcessorCustom.cpp" #include "JavaScriptCallFrame.cpp" #include "MemoryInfo.cpp" |