Changeset 62494 in webkit
- Timestamp:
- Jul 5, 2010 10:50:38 AM (14 years ago)
- Location:
- trunk/WebKit2
- Files:
-
- 2 added
- 2 edited
- 2 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit2/ChangeLog
r62491 r62494 1 2010-07-05 Kenneth Rohde Christiansen <kenneth.christiansen@openbossa.org> 2 3 Reviewed by Antti Koivisto. 4 5 [Qt] Initial WebKit2 implementation 6 https://bugs.webkit.org/show_bug.cgi?id=40233 7 8 Add stubs 9 10 * UIProcess/Plugins/qt/PluginInfoStoreQt.cpp: Copied from WebKit2/UIProcess/Plugins/win/PluginInfoStoreWin.cpp. 11 (WebKit::PluginInfoStore::pluginDirectories): 12 (WebKit::PluginInfoStore::pluginPathsInDirectory): 13 (WebKit::PluginInfoStore::getPluginInfo): 14 (WebKit::PluginInfoStore::shouldUsePlugin): 15 * WebProcess/InjectedBundle/InjectedBundle.h: 16 * WebProcess/InjectedBundle/qt/InjectedBundleQt.cpp: Added. 17 (WebKit::InjectedBundle::load): 18 1 19 2010-07-05 Kenneth Rohde Christiansen <kenneth.christiansen@openbossa.org> 2 20 -
trunk/WebKit2/UIProcess/Plugins/qt/PluginInfoStoreQt.cpp
r62493 r62494 24 24 */ 25 25 26 #ifndef InjectedBundle_h 27 #define InjectedBundle_h 26 #include "PluginInfoStore.h" 28 27 29 #include "WKBundle.h" 30 #include <WebCore/PlatformString.h> 31 #include <wtf/PassRefPtr.h> 32 #include <wtf/RefCounted.h> 28 #include "NotImplemented.h" 29 30 using namespace WebCore; 33 31 34 32 namespace WebKit { 35 33 36 #if PLATFORM(MAC)37 typedef CFBundleRef PlatformBundle; 38 #elif PLATFORM(WIN) 39 typedef HMODULE PlatformBundle;40 #endif 34 Vector<String> PluginInfoStore::pluginDirectories() 35 { 36 notImplemented(); 37 return Vector<String>(); 38 } 41 39 42 class WebPage; 40 Vector<String> PluginInfoStore::pluginPathsInDirectory(const String& directory) 41 { 42 notImplemented(); 43 return Vector<String>(); 44 } 43 45 44 class InjectedBundle : public RefCounted<InjectedBundle> { 45 public: 46 static PassRefPtr<InjectedBundle> create(const WebCore::String& path) 47 { 48 return adoptRef(new InjectedBundle(path)); 49 } 50 ~InjectedBundle(); 46 bool PluginInfoStore::getPluginInfo(const String& pluginPath, Plugin& plugin) 47 { 48 notImplemented(); 49 return false; 50 } 51 51 52 bool load(); 53 54 // API 55 void initializeClient(WKBundleClient*); 56 void postMessage(WebCore::StringImpl*); 57 58 // Callback hooks 59 void didCreatePage(WebPage*); 60 void willDestroyPage(WebPage*); 61 void didRecieveMessage(const WebCore::String&); 62 63 private: 64 InjectedBundle(const WebCore::String&); 65 66 WebCore::String m_path; 67 PlatformBundle m_platformBundle; // This is leaked right now, since we never unload the bundle/module. 68 69 WKBundleClient m_client; 70 }; 52 bool PluginInfoStore::shouldUsePlugin(const Plugin& plugin, const Vector<Plugin>& loadedPlugins) 53 { 54 notImplemented(); 55 return false; 56 } 71 57 72 58 } // namespace WebKit 73 74 #endif // InjectedBundle_h -
trunk/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h
r61689 r62494 38 38 #elif PLATFORM(WIN) 39 39 typedef HMODULE PlatformBundle; 40 #elif PLATFORM(QT) 41 typedef void* PlatformBundle; 40 42 #endif 41 43 -
trunk/WebKit2/WebProcess/InjectedBundle/qt/InjectedBundleQt.cpp
r62493 r62494 24 24 */ 25 25 26 #ifndef InjectedBundle_h 27 #define InjectedBundle_h 26 #include "InjectedBundle.h" 28 27 29 #include "WKBundle .h"30 #include <WebCore/PlatformString.h>31 #include <wtf/PassRefPtr.h> 32 #include <wtf/RefCounted.h> 28 #include "WKBundleAPICast.h" 29 #include "WKBundleInitialize.h" 30 31 using namespace WebCore; 33 32 34 33 namespace WebKit { 35 34 36 #if PLATFORM(MAC) 37 typedef CFBundleRef PlatformBundle; 38 #elif PLATFORM(WIN) 39 typedef HMODULE PlatformBundle; 40 #endif 35 // FIXME: This should try and use <WebCore/FileSystem.h>. 41 36 42 class WebPage; 43 44 class InjectedBundle : public RefCounted<InjectedBundle> { 45 public: 46 static PassRefPtr<InjectedBundle> create(const WebCore::String& path) 47 { 48 return adoptRef(new InjectedBundle(path)); 49 } 50 ~InjectedBundle(); 51 52 bool load(); 53 54 // API 55 void initializeClient(WKBundleClient*); 56 void postMessage(WebCore::StringImpl*); 57 58 // Callback hooks 59 void didCreatePage(WebPage*); 60 void willDestroyPage(WebPage*); 61 void didRecieveMessage(const WebCore::String&); 62 63 private: 64 InjectedBundle(const WebCore::String&); 65 66 WebCore::String m_path; 67 PlatformBundle m_platformBundle; // This is leaked right now, since we never unload the bundle/module. 68 69 WKBundleClient m_client; 70 }; 37 bool InjectedBundle::load() 38 { 39 return false; 40 } 71 41 72 42 } // namespace WebKit 73 74 #endif // InjectedBundle_h
Note: See TracChangeset
for help on using the changeset viewer.