diff options
| author | Steve Block <steveblock@google.com> | 2010-05-11 14:22:42 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-20 10:23:10 +0100 |
| commit | 084b183bafe9e8e5636ed353110cf95be8566f23 (patch) | |
| tree | 8c0cce94bc15d551411a074489cfe7be9d780179 /WebCore/plugins/PluginView.h | |
| parent | cbb11248c4cee2a74b3352860b1cf703552483fb (diff) | |
| download | external_webkit-084b183bafe9e8e5636ed353110cf95be8566f23.zip external_webkit-084b183bafe9e8e5636ed353110cf95be8566f23.tar.gz external_webkit-084b183bafe9e8e5636ed353110cf95be8566f23.tar.bz2 | |
Update Android to reflect upstreaming of PluginView JSC guards in WebKit change 59826
See http://trac.webkit.org/changeset/59826
Change-Id: Ia1e16f7fa71fe8b5740610e3caa4bfbf05391a0f
Diffstat (limited to 'WebCore/plugins/PluginView.h')
| -rw-r--r-- | WebCore/plugins/PluginView.h | 6 |
1 files changed, 3 insertions, 3 deletions
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&); |