diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-06-03 13:13:26 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-06 13:02:52 +0200 |
| commit | 0c06c599cfa5a3235922494992712860c34dfcd3 (patch) | |
| tree | 078896570f61ec29eb9454620c9c575b0eee4883 /Source/WebCore/plugins | |
| parent | f64d11fc6fd0798fae2a1ecc7565b9d2efd385bc (diff) | |
| download | qtwebkit-0c06c599cfa5a3235922494992712860c34dfcd3.tar.gz | |
[Qt] Re-enable plugins on Mac.
https://bugs.webkit.org/show_bug.cgi?id=116622
Reviewed by Tor Arne Vestbø.
Source/WebCore:
* platform/FileSystem.h:
* platform/qt/FileSystemQt.cpp:
(WebCore::unloadModule):
- Q_WS_* aren't defined since Qt5, use Q_OS_MACX instead.
* plugins/mac/PluginPackageMac.cpp:
(WebCore::PluginPackage::fetchInfo):
(WebCore::PluginPackage::load):
- createCFString now does the adoption itself.
* plugins/mac/PluginViewMac.mm:
- Add missing include.
Source/WebKit/qt:
* WebCoreSupport/ChromeClientQt.cpp:
(WebCore::ChromeClientQt::windowResizerRect):
- Add missing parenthese.
Tools:
Plugins on Mac were only enabled if !embedded but the later was set if
QPA is enabled, which is the default since Qt 5.0.
Remove references to 'embedded' and fix various build issues,
PluginViewMac.mm and PluginPackageMac.cpp haven't been compiled since a few
months.
* DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro:
* qmake/mkspecs/features/features.prf:
* qmake/mkspecs/features/unix/default_pre.prf:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@151109 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Conflicts:
Source/WebCore/platform/FileSystem.h
Source/WebCore/plugins/mac/PluginPackageMac.cpp
Change-Id: I38dc6170ca868b54f8092aa6b271ace4911a2390
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source/WebCore/plugins')
| -rw-r--r-- | Source/WebCore/plugins/mac/PluginPackageMac.cpp | 4 | ||||
| -rw-r--r-- | Source/WebCore/plugins/mac/PluginViewMac.mm | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Source/WebCore/plugins/mac/PluginPackageMac.cpp b/Source/WebCore/plugins/mac/PluginPackageMac.cpp index fead89bc3..23a5e231b 100644 --- a/Source/WebCore/plugins/mac/PluginPackageMac.cpp +++ b/Source/WebCore/plugins/mac/PluginPackageMac.cpp @@ -138,7 +138,7 @@ bool PluginPackage::fetchInfo() if (mimeTypesFileName && CFGetTypeID(mimeTypesFileName.get()) == CFStringGetTypeID()) { WTF::RetainPtr<CFStringRef> fileName = (CFStringRef)mimeTypesFileName.get(); - WTF::RetainPtr<CFStringRef> homeDir = adoptCF(homeDirectoryPath().createCFString()); + WTF::RetainPtr<CFStringRef> homeDir = homeDirectoryPath().createCFString(); WTF::RetainPtr<CFStringRef> path(AdoptCF, CFStringCreateWithFormat(0, 0, CFSTR("%@/Library/Preferences/%@"), homeDir.get(), fileName.get())); WTF::RetainPtr<CFDictionaryRef> plist = readPListFile(path.get(), /*createFile*/ false, m_module); @@ -255,7 +255,7 @@ bool PluginPackage::load() return true; } - WTF::RetainPtr<CFStringRef> path(AdoptCF, m_path.createCFString()); + WTF::RetainPtr<CFStringRef> path = m_path.createCFString(); WTF::RetainPtr<CFURLRef> url(AdoptCF, CFURLCreateWithFileSystemPath(kCFAllocatorDefault, path.get(), kCFURLPOSIXPathStyle, false)); m_module = CFBundleCreate(NULL, url.get()); diff --git a/Source/WebCore/plugins/mac/PluginViewMac.mm b/Source/WebCore/plugins/mac/PluginViewMac.mm index d1582d837..c163b5f3b 100644 --- a/Source/WebCore/plugins/mac/PluginViewMac.mm +++ b/Source/WebCore/plugins/mac/PluginViewMac.mm @@ -61,6 +61,9 @@ #include "WheelEvent.h" #include "npruntime_impl.h" #include "runtime_root.h" +#include <AppKit/NSEvent.h> +#include <AppKit/NSMenu.h> +#include <AppKit/NSWindow.h> #include <runtime/JSLock.h> #include <runtime/JSValue.h> #include <wtf/RetainPtr.h> |