From 084b183bafe9e8e5636ed353110cf95be8566f23 Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Tue, 11 May 2010 14:22:42 +0100
Subject: Update Android to reflect upstreaming of PluginView JSC guards in
 WebKit change 59826

See http://trac.webkit.org/changeset/59826

Change-Id: Ia1e16f7fa71fe8b5740610e3caa4bfbf05391a0f
---
 WebCore/plugins/PluginView.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'WebCore/plugins/PluginView.h')

diff --git a/WebCore/plugins/PluginView.h b/WebCore/plugins/PluginView.h
index 88136e3..b685bbf 100644
--- a/WebCore/plugins/PluginView.h
+++ b/WebCore/plugins/PluginView.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Collabora Ltd. All rights reserved.
@@ -140,8 +139,6 @@ namespace WebCore {
 
 #if USE(JSC)
         PassRefPtr<JSC::Bindings::Instance> bindingInstance();
-#elif USE(V8)
-        NPObject* getNPObject();
 #endif
 
         PluginStatus status() const { return m_status; }
@@ -175,6 +172,9 @@ namespace WebCore {
                              void (*timerFunc)(NPP, uint32_t timerID));
         void unscheduleTimer(NPP, uint32_t timerID);
 #endif
+#if USE(V8)
+        NPObject* getNPObject();
+#endif
 
         virtual void invalidateRect(const IntRect&);
 
-- 
cgit v1.1