| Index: third_party/WebKit/Source/bindings/core/v8/custom/V8HTMLPlugInElementCustom.cpp
|
| diff --git a/third_party/WebKit/Source/bindings/core/v8/custom/V8HTMLPlugInElementCustom.cpp b/third_party/WebKit/Source/bindings/core/v8/custom/V8HTMLPlugInElementCustom.cpp
|
| index 584c7ba969c4ec10eebbf18ee390037b8d8e4e80..79a00b54802aad9ee71f91a13bc4b7759766ecf0 100644
|
| --- a/third_party/WebKit/Source/bindings/core/v8/custom/V8HTMLPlugInElementCustom.cpp
|
| +++ b/third_party/WebKit/Source/bindings/core/v8/custom/V8HTMLPlugInElementCustom.cpp
|
| @@ -46,6 +46,8 @@ template <typename ElementType>
|
| void getScriptableObjectProperty(
|
| const AtomicString& name,
|
| const v8::PropertyCallbackInfo<v8::Value>& info) {
|
| + /* DO NOT SUBMIT - merge conflict marker.
|
| + * Please spell |toImpl| below (not |ToImpl|). */
|
| HTMLPlugInElement* impl = ElementType::toImpl(info.Holder());
|
| RefPtr<SharedPersistent<v8::Object>> wrapper = impl->pluginWrapper();
|
| if (!wrapper)
|
| @@ -75,6 +77,8 @@ void setScriptableObjectProperty(
|
| const v8::PropertyCallbackInfo<v8::Value>& info) {
|
| ASSERT(!value.IsEmpty());
|
|
|
| + /* DO NOT SUBMIT - merge conflict marker.
|
| + * Please spell |toImpl| below (not |ToImpl|). */
|
| HTMLPlugInElement* impl = ElementType::toImpl(info.Holder());
|
| RefPtr<SharedPersistent<v8::Object>> wrapper = impl->pluginWrapper();
|
| if (!wrapper)
|
|
|