diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-20 16:48:45 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-23 18:54:18 +0100 |
| commit | 53733164eb6cabab5a1eddcabb42e4ce27eb0e44 (patch) | |
| tree | 1ba5405cbf0bf31341e2e260a7ed05c9dcce8e4b /Source/WebKit/mac | |
| parent | 9bbecbe38e6249c7b1c0874e80503f6162f13613 (diff) | |
| download | external_webkit-53733164eb6cabab5a1eddcabb42e4ce27eb0e44.zip external_webkit-53733164eb6cabab5a1eddcabb42e4ce27eb0e44.tar.gz external_webkit-53733164eb6cabab5a1eddcabb42e4ce27eb0e44.tar.bz2 | |
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
Diffstat (limited to 'Source/WebKit/mac')
| -rw-r--r-- | Source/WebKit/mac/Plugins/Hosted/ProxyInstance.h | 2 | ||||
| -rw-r--r-- | Source/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebKit/mac/Plugins/Hosted/ProxyInstance.h b/Source/WebKit/mac/Plugins/Hosted/ProxyInstance.h index b72e49a..65f3a51 100644 --- a/Source/WebKit/mac/Plugins/Hosted/ProxyInstance.h +++ b/Source/WebKit/mac/Plugins/Hosted/ProxyInstance.h @@ -30,7 +30,7 @@ #import "NetscapePluginInstanceProxy.h" #import "WebKitPluginHostTypes.h" -#import <WebCore/Bridge.h> +#import <WebCore/BridgeJSC.h> #import <WebCore/runtime_root.h> #import <wtf/OwnPtr.h> diff --git a/Source/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm b/Source/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm index 5593050..c3ee98b 100644 --- a/Source/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm +++ b/Source/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm @@ -38,7 +38,7 @@ #import "WebUIDelegate.h" #import <CoreFoundation/CoreFoundation.h> -#import <WebCore/Bridge.h> +#import <WebCore/BridgeJSC.h> #import <WebCore/Frame.h> #import <WebCore/FrameLoaderTypes.h> #import <WebCore/FrameView.h> |