From 53733164eb6cabab5a1eddcabb42e4ce27eb0e44 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Fri, 20 May 2011 16:48:45 +0100 Subject: Merge WebKit at r76408: Fix Bridge.h Cherry pick of upstream http://trac.webkit.org/changeset/79988 Needed now due to FastAllocBase and Noncopyable changes in this merge. Change-Id: I26c91f7940b106db21e26c37507490acd1546cff --- Source/WebCore/plugins/gtk/PluginViewGtk.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Source/WebCore/plugins/gtk/PluginViewGtk.cpp') diff --git a/Source/WebCore/plugins/gtk/PluginViewGtk.cpp b/Source/WebCore/plugins/gtk/PluginViewGtk.cpp index ec855a2..5166151 100644 --- a/Source/WebCore/plugins/gtk/PluginViewGtk.cpp +++ b/Source/WebCore/plugins/gtk/PluginViewGtk.cpp @@ -29,7 +29,7 @@ #include "config.h" #include "PluginView.h" -#include "Bridge.h" +#include "BridgeJSC.h" #include "Document.h" #include "DocumentLoader.h" #include "Element.h" @@ -898,4 +898,3 @@ void PluginView::restart() } } // namespace WebCore - -- cgit v1.1