| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "config.h" | 26 #include "config.h" |
| 27 #include "bindings/core/v8/custom/V8DataViewCustom.h" | 27 #include "bindings/core/v8/custom/V8DataViewCustom.h" |
| 28 | 28 |
| 29 #include "bindings/core/v8/V8Binding.h" | 29 #include "bindings/core/v8/V8Binding.h" |
| 30 #include "bindings/core/v8/custom/V8ArrayBufferViewCustom.h" | 30 #include "bindings/core/v8/custom/V8ArrayBufferViewCustom.h" |
| 31 #include "bindings/core/v8/custom/V8TypedArrayCustom.h" |
| 31 #include "core/html/canvas/DataView.h" | 32 #include "core/html/canvas/DataView.h" |
| 32 | 33 |
| 33 namespace blink { | 34 namespace blink { |
| 34 | 35 |
| 36 const WrapperTypeInfo& DataView::s_wrapperTypeInfo = V8TypedArray<DataView>::wra
pperTypeInfo; |
| 37 |
| 35 static void initializeScriptWrappableForInterface(DataView* object) | 38 static void initializeScriptWrappableForInterface(DataView* object) |
| 36 { | 39 { |
| 37 if (ScriptWrappable::wrapperCanBeStoredInObject(object)) | 40 if (ScriptWrappable::wrapperCanBeStoredInObject(object)) |
| 38 ScriptWrappable::fromObject(object)->setTypeInfo(&V8DataView::wrapperTyp
eInfo); | 41 ScriptWrappable::fromObject(object)->setTypeInfo(&V8DataView::wrapperTyp
eInfo); |
| 39 else | 42 else |
| 40 ASSERT_NOT_REACHED(); | 43 ASSERT_NOT_REACHED(); |
| 41 } | 44 } |
| 42 | 45 |
| 43 } // namespace blink | 46 } // namespace blink |
| 44 | 47 |
| 45 // In ScriptWrappable::init, the use of a local function declaration has an issu
e on Windows: | 48 // In ScriptWrappable::init, the use of a local function declaration has an issu
e on Windows: |
| 46 // the local declaration does not pick up the surrounding namespace. Therefore,
we provide this function | 49 // the local declaration does not pick up the surrounding namespace. Therefore,
we provide this function |
| 47 // in the global namespace. | 50 // in the global namespace. |
| 48 // (More info on the MSVC bug here: http://connect.microsoft.com/VisualStudio/fe
edback/details/664619/the-namespace-of-local-function-declarations-in-c) | 51 // (More info on the MSVC bug here: http://connect.microsoft.com/VisualStudio/fe
edback/details/664619/the-namespace-of-local-function-declarations-in-c) |
| 49 void webCoreInitializeScriptWrappableForInterface(blink::DataView* object) | 52 void webCoreInitializeScriptWrappableForInterface(blink::DataView* object) |
| 50 { | 53 { |
| 51 blink::initializeScriptWrappableForInterface(object); | 54 blink::initializeScriptWrappableForInterface(object); |
| 52 } | 55 } |
| OLD | NEW |