diff options
| author | Steve Block <steveblock@google.com> | 2010-02-02 18:17:00 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-04 15:06:56 +0000 |
| commit | e5261c62245272b7442a8c5135a2bf85202de0a4 (patch) | |
| tree | 79d784e9533e16660375bc7855c156879f5b509e /WebKit | |
| parent | dba6dad689f23b0ae432573363cdce7d6c027059 (diff) | |
| download | external_webkit-e5261c62245272b7442a8c5135a2bf85202de0a4.zip external_webkit-e5261c62245272b7442a8c5135a2bf85202de0a4.tar.gz external_webkit-e5261c62245272b7442a8c5135a2bf85202de0a4.tar.bz2 | |
Merge webkit.org at r54127 : Resolve conflicts in WebCore/bridge
Keep ours for generic bridge code as this is a work in progress.
Take theirs for conflicts on other platforms due to bridge changes.
Take theirs for updates for recently moved JSC JNI bridge.
Change-Id: I7db68450a369bb652755cc4b9555083c76b07510
Diffstat (limited to 'WebKit')
| -rw-r--r-- | WebKit/mac/Plugins/Hosted/ProxyInstance.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/WebKit/mac/Plugins/Hosted/ProxyInstance.h b/WebKit/mac/Plugins/Hosted/ProxyInstance.h index 138a316..6e8ac47 100644 --- a/WebKit/mac/Plugins/Hosted/ProxyInstance.h +++ b/WebKit/mac/Plugins/Hosted/ProxyInstance.h @@ -28,18 +28,11 @@ #ifndef ProxyInstance_h #define ProxyInstance_h -<<<<<<< HEAD -#include <WebCore/Bridge.h> -#include <WebCore/runtime_root.h> -#include <wtf/OwnPtr.h> -#include "WebKitPluginHostTypes.h" -======= #import "NetscapePluginInstanceProxy.h" #import "WebKitPluginHostTypes.h" #import <WebCore/Bridge.h> #import <WebCore/runtime_root.h> #import <wtf/OwnPtr.h> ->>>>>>> webkit.org at r54127 namespace WebKit { |