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 /WebCore/platform | |
| 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 'WebCore/platform')
| -rw-r--r-- | WebCore/platform/graphics/wince/MediaPlayerProxy.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/WebCore/platform/graphics/wince/MediaPlayerProxy.cpp b/WebCore/platform/graphics/wince/MediaPlayerProxy.cpp index 9673d18..ceb5a7c 100644 --- a/WebCore/platform/graphics/wince/MediaPlayerProxy.cpp +++ b/WebCore/platform/graphics/wince/MediaPlayerProxy.cpp @@ -22,9 +22,7 @@ #include "config.h" #include "MediaPlayerProxy.h" -#include "c_class.h" -#include "c_instance.h" -#include "c_runtime.h" +#include "Bridge.h" #include "DocumentLoader.h" #include "HTMLPlugInElement.h" #include "HTMLVideoElement.h" @@ -32,14 +30,16 @@ #include "JSPluginElementFunctions.h" #include "MediaPlayer.h" #include "Node.h" -#include "npruntime_impl.h" #include "PlatformString.h" #include "PluginView.h" #include "RenderPartObject.h" #include "RenderWidget.h" -#include "runtime.h" -#include <runtime/Identifier.h> #include "Widget.h" +#include "c_class.h" +#include "c_instance.h" +#include "c_runtime.h" +#include "npruntime_impl.h" +#include <runtime/Identifier.h> using namespace JSC; |