summaryrefslogtreecommitdiffstats
path: root/webkit/pending
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-22 22:38:59 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-22 22:38:59 +0000
commitf11ef8765d6d48dd0cf73c7388aeaf2a2de3a1f7 (patch)
treeb9617d9ec35522aa56557936648db997e1a2c256 /webkit/pending
parent29f9fd0ec34b36c3cfe9733b46947365933d061e (diff)
downloadchromium_src-f11ef8765d6d48dd0cf73c7388aeaf2a2de3a1f7.zip
chromium_src-f11ef8765d6d48dd0cf73c7388aeaf2a2de3a1f7.tar.gz
chromium_src-f11ef8765d6d48dd0cf73c7388aeaf2a2de3a1f7.tar.bz2
Get the majority of the files in V8Bindings/ building.
The rest are excluded from the linux build because they include windowisms; this will be fixed later. Also, random linux compile fixes. Extra qualifiers, unused variables, et cetera. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1254 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/pending')
-rw-r--r--webkit/pending/FramePrivate.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/webkit/pending/FramePrivate.h b/webkit/pending/FramePrivate.h
index 196f789..7220b3f 100644
--- a/webkit/pending/FramePrivate.h
+++ b/webkit/pending/FramePrivate.h
@@ -63,7 +63,7 @@ namespace WebCore {
#if USE(JAVASCRIPTCORE_BINDINGS)
typedef HashMap<void*, RefPtr<KJS::Bindings::RootObject> > RootObjectMap;
-#else if USE(V8_BINDING)
+#elif USE(V8_BINDING)
typedef HashMap<void*, NPObject* > PluginObjectMap;
#endif
@@ -123,7 +123,7 @@ namespace WebCore {
// The root object used for objects bound outside the context of a plugin.
RefPtr<KJS::Bindings::RootObject> m_bindingRootObject;
RootObjectMap m_rootObjects;
-#else if USE(V8_BINDING)
+#elif USE(V8_BINDING)
// A mapping between Widgets and their corresponding script object.
// This list is used so that when the plugin dies, we can immediately
// invalidate all sub-objects which are associated with that plugin.