Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1427)

Unified Diff: third_party/WebKit/Source/bindings/core/v8/custom/V8HTMLPlugInElementCustom.cpp

Issue 2329463004: ABANDONED CL: Changes needed to make things compile after running rewrite_to_chrome_style tool. (Closed)
Patch Set: Rebasing the fixes... Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 bb9a760dae043de310782cde3815b9621227d1f6..1664b301077f74c23708c2d7ebafc6bcf67c9dc4 100644
--- a/third_party/WebKit/Source/bindings/core/v8/custom/V8HTMLPlugInElementCustom.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/custom/V8HTMLPlugInElementCustom.cpp
@@ -46,8 +46,10 @@ 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();
+ RefPtr<SharedPersistent<v8::Object>> wrapper = impl->PluginWrapper();
if (!wrapper)
return;
@@ -80,8 +82,10 @@ void setScriptableObjectProperty(
info.Holder()->Has(info.GetIsolate()->GetCurrentContext(), v8Name)))
return;
+ /* 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();
+ RefPtr<SharedPersistent<v8::Object>> wrapper = impl->PluginWrapper();
if (!wrapper)
return;
@@ -135,9 +139,11 @@ void V8HTMLObjectElement::namedPropertySetterCustom(
namespace {
template <typename ElementType>
-void invokeOnScriptableObject(const v8::FunctionCallbackInfo<v8::Value>& info) {
+void InvokeOnScriptableObject(const v8::FunctionCallbackInfo<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();
+ RefPtr<SharedPersistent<v8::Object>> wrapper = impl->PluginWrapper();
if (!wrapper)
return;

Powered by Google App Engine
This is Rietveld 408576698