diff options
| author | Steve Block <steveblock@google.com> | 2010-01-20 12:26:39 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-01-20 12:26:39 +0000 |
| commit | f94c3ecac24651c15569bdca42b311d0fc971861 (patch) | |
| tree | 3222cbe56cf10b82a93966f6eb01d4f6e50e0142 /WebKit/mac | |
| parent | f5306da72ab6bb63f7ae07371e687f72a75c2fb2 (diff) | |
| parent | 3f4b1969e5c86f542a2b86118467a8fc8cec9c7c (diff) | |
| download | external_webkit-f94c3ecac24651c15569bdca42b311d0fc971861.zip external_webkit-f94c3ecac24651c15569bdca42b311d0fc971861.tar.gz external_webkit-f94c3ecac24651c15569bdca42b311d0fc971861.tar.bz2 | |
resolved conflicts for merge of 3f4b1969 to master
Change-Id: I24c41d6ab08dd3594edd4ff62a1c823c904b9851
Diffstat (limited to 'WebKit/mac')
| -rw-r--r-- | WebKit/mac/ChangeLog | 9 | ||||
| -rw-r--r-- | WebKit/mac/Plugins/Hosted/ProxyInstance.h | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog index ee545bd..17c7470 100644 --- a/WebKit/mac/ChangeLog +++ b/WebKit/mac/ChangeLog @@ -1,3 +1,12 @@ +2010-01-19 Steve Block <steveblock@google.com> + + Reviewed by Adam Barth. + + Renames WebCore/bridge/runtime.[cpp|h] to WebCore/bridge/Bridge.[cpp|h] + https://bugs.webkit.org/show_bug.cgi?id=33801 + + * Plugins/Hosted/ProxyInstance.h: + 2009-12-13 Sam Weinig <sam@webkit.org> Reviewed by Dan Bernstein. diff --git a/WebKit/mac/Plugins/Hosted/ProxyInstance.h b/WebKit/mac/Plugins/Hosted/ProxyInstance.h index 8a07def..f84c685 100644 --- a/WebKit/mac/Plugins/Hosted/ProxyInstance.h +++ b/WebKit/mac/Plugins/Hosted/ProxyInstance.h @@ -28,7 +28,7 @@ #ifndef ProxyInstance_h #define ProxyInstance_h -#include <WebCore/runtime.h> +#include <WebCore/Bridge.h> #include <WebCore/runtime_root.h> #include <wtf/OwnPtr.h> #include "WebKitPluginHostTypes.h" |