[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
vestbo at webkit.org
vestbo at webkit.org
Thu Apr 8 02:04:51 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 87a506ad473f17f7bfa453383abb6d274bddce0c
Author: vestbo at webkit.org <vestbo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Mar 1 15:34:14 2010 +0000
Fix the Qt build on Mac OS X/Cocoa 64-bit
Add missing implementation file to resolve JSC symbols.
Use the proper event/drawing-model guards instead of global 64-bit
guard for the NPAPI plugin implementation (view and package).
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55367 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 433a72a..4140b74 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,11 @@
+2010-03-01 Tor Arne Vestbø <tor.arne.vestbo at nokia.com>
+
+ Reviewed by Simon Hausmann.
+
+ Fix the Qt build on Mac OS X/Cocoa 64-bit
+
+ * JavaScriptCore.pri: Add missing implementation file to resolve JSC symbols
+
2010-02-26 Gavin Barraclough <barraclough at apple.com>
Rubber Stamped by Geoff Garen.
diff --git a/JavaScriptCore/JavaScriptCore.pri b/JavaScriptCore/JavaScriptCore.pri
index 8a6ca8a..0a093ec 100644
--- a/JavaScriptCore/JavaScriptCore.pri
+++ b/JavaScriptCore/JavaScriptCore.pri
@@ -97,6 +97,7 @@ SOURCES += \
interpreter/CallFrame.cpp \
interpreter/Interpreter.cpp \
interpreter/RegisterFile.cpp \
+ jit/ExecutableAllocatorFixedVMPool.cpp \
jit/ExecutableAllocatorPosix.cpp \
jit/ExecutableAllocatorSymbian.cpp \
jit/ExecutableAllocatorWin.cpp \
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2987385..769acc8 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-03-01 Tor Arne Vestbø <tor.arne.vestbo at nokia.com>
+
+ Reviewed by Simon Hausmann.
+
+ Fix the Qt build on Mac OS X/Cocoa 64-bit
+
+ Use the proper event/drawing-model guards instead of global 64-bit
+ guard for the NPAPI plugin implementation (view and package).
+
+ * plugins/mac/PluginPackageMac.cpp: Change guards and fix warning
+ * plugins/mac/PluginViewMac.cpp: Remove 64-bit guard
+
2010-02-27 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Timothy Hatcher.
diff --git a/WebCore/plugins/mac/PluginPackageMac.cpp b/WebCore/plugins/mac/PluginPackageMac.cpp
index be69242..69eaf76 100644
--- a/WebCore/plugins/mac/PluginPackageMac.cpp
+++ b/WebCore/plugins/mac/PluginPackageMac.cpp
@@ -25,8 +25,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef __LP64__
-
#include "config.h"
#include "PluginPackage.h"
@@ -307,9 +305,3 @@ uint16 PluginPackage::NPVersion() const
return NP_VERSION_MINOR;
}
} // namespace WebCore
-
-#else
-
-#include "../PluginPackageNone.cpp"
-
-#endif // !__LP64__
diff --git a/WebCore/plugins/mac/PluginViewMac.cpp b/WebCore/plugins/mac/PluginViewMac.cpp
index 82b6f3f..3f54195 100644
--- a/WebCore/plugins/mac/PluginViewMac.cpp
+++ b/WebCore/plugins/mac/PluginViewMac.cpp
@@ -26,8 +26,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef __LP64__
-
#include "config.h"
#include "PluginView.h"
@@ -101,7 +99,9 @@ namespace WebCore {
using namespace HTMLNames;
+#ifndef NP_NO_CARBON
static int modifiersForEvent(UIEventWithKeyState *event);
+#endif
static inline WindowRef nativeWindowFor(PlatformWidget widget)
{
@@ -177,22 +177,31 @@ bool PluginView::platformStart()
// Gracefully handle unsupported drawing or event models. We can do this
// now since the drawing and event model can only be set during NPP_New.
- NPBool eventModelSupported, drawingModelSupported;
+#ifndef NP_NO_CARBON
+ NPBool eventModelSupported;
if (getValueStatic(NPNVariable(NPNVsupportsCarbonBool + m_eventModel), &eventModelSupported) != NPERR_NO_ERROR
|| !eventModelSupported) {
+#endif
m_status = PluginStatusCanNotLoadPlugin;
LOG(Plugins, "Plug-in '%s' uses unsupported event model %s",
m_plugin->name().utf8().data(), prettyNameForEventModel(m_eventModel));
return false;
+#ifndef NP_NO_CARBON
}
+#endif
+#ifndef NP_NO_QUICKDRAW
+ NPBool drawingModelSupported;
if (getValueStatic(NPNVariable(NPNVsupportsQuickDrawBool + m_drawingModel), &drawingModelSupported) != NPERR_NO_ERROR
|| !drawingModelSupported) {
+#endif
m_status = PluginStatusCanNotLoadPlugin;
LOG(Plugins, "Plug-in '%s' uses unsupported drawing model %s",
m_plugin->name().utf8().data(), prettyNameForDrawingModel(m_drawingModel));
return false;
+#ifndef NP_NO_QUICKDRAW
}
+#endif
#if PLATFORM(QT)
// Set the platformPluginWidget only in the case of QWebView so that the context menu appears in the right place.
@@ -209,12 +218,14 @@ bool PluginView::platformStart()
// Create a fake window relative to which all events will be sent when using offscreen rendering
if (!platformPluginWidget()) {
+#ifndef NP_NO_CARBON
// Make the default size really big. It is unclear why this is required but with a smaller size, mouse move
// events don't get processed. Resizing the fake window to flash's size doesn't help.
::Rect windowBounds = { 0, 0, 1000, 1000 };
CreateNewWindow(kDocumentWindowClass, kWindowStandardDocumentAttributes, &windowBounds, &m_fakeWindow);
// Flash requires the window to be hilited to process mouse move events.
- HiliteWindow(m_fakeWindow, true);
+ HiliteWindow(m_fakeWindow, true);
+#endif
}
show();
@@ -234,8 +245,10 @@ void PluginView::platformDestroy()
setPlatformPluginWidget(0);
else {
CGContextRelease(m_contextRef);
+#ifndef NP_NO_CARBON
if (m_fakeWindow)
DisposeWindow(m_fakeWindow);
+#endif
}
}
@@ -376,6 +389,7 @@ void PluginView::setFocus()
// TODO: Also handle and pass on blur events (focus lost)
+#ifndef NP_NO_CARBON
EventRecord record;
record.what = getFocusEvent;
record.message = 0;
@@ -385,6 +399,7 @@ void PluginView::setFocus()
if (!dispatchNPEvent(record))
LOG(Events, "PluginView::setFocus(): Get-focus event not accepted");
+#endif
}
void PluginView::setParentVisible(bool visible)
@@ -421,7 +436,9 @@ void PluginView::setNPWindowIfNeeded()
return;
m_npWindow.window = (void*)&m_npCgContext;
+#ifndef NP_NO_CARBON
m_npCgContext.window = newWindowRef;
+#endif
m_npCgContext.context = newContextRef;
m_npWindow.x = m_windowRect.x();
@@ -436,7 +453,7 @@ void PluginView::setNPWindowIfNeeded()
m_npWindow.clipRect.bottom = m_windowRect.y() + m_windowRect.height();
LOG(Plugins, "PluginView::setNPWindowIfNeeded(): window=%p, context=%p,"
- " window.x:%ld window.y:%ld window.width:%d window.height:%d window.clipRect size:%dx%d",
+ " window.x:%d window.y:%d window.width:%d window.height:%d window.clipRect size:%dx%d",
newWindowRef, newContextRef, m_npWindow.x, m_npWindow.y, m_npWindow.width, m_npWindow.height,
m_npWindow.clipRect.right - m_npWindow.clipRect.left, m_npWindow.clipRect.bottom - m_npWindow.clipRect.top);
@@ -522,6 +539,7 @@ void PluginView::paint(GraphicsContext* context, const IntRect& rect)
#endif
}
+#ifndef NP_NO_CARBON
EventRecord event;
event.what = updateEvt;
event.message = (long unsigned int)m_npCgContext.window;
@@ -532,6 +550,7 @@ void PluginView::paint(GraphicsContext* context, const IntRect& rect)
if (!dispatchNPEvent(event))
LOG(Events, "PluginView::paint(): Paint event not accepted");
+#endif
CGContextRestoreGState(cgContext);
@@ -581,6 +600,7 @@ void PluginView::handleMouseEvent(MouseEvent* event)
if (!m_isStarted)
return;
+#ifndef NP_NO_CARBON
EventRecord record;
if (event->type() == eventNames().mousemoveEvent) {
@@ -620,6 +640,7 @@ void PluginView::handleMouseEvent(MouseEvent* event)
} else {
event->setDefaultHandled();
}
+#endif
}
void PluginView::handleKeyboardEvent(KeyboardEvent* event)
@@ -632,6 +653,7 @@ void PluginView::handleKeyboardEvent(KeyboardEvent* event)
LOG(Plugins, "PV::hKE(): KE.keyCode: 0x%02X, KE.charCode: %d",
event->keyCode(), event->charCode());
+#ifndef NP_NO_CARBON
EventRecord record;
if (event->type() == eventNames().keydownEvent) {
@@ -692,8 +714,10 @@ void PluginView::handleKeyboardEvent(KeyboardEvent* event)
LOG(Events, "PluginView::handleKeyboardEvent(): Keyboard event type %d not accepted", record.what);
else
event->setDefaultHandled();
+#endif
}
+#ifndef NP_NO_CARBON
void PluginView::nullEventTimerFired(Timer<PluginView>*)
{
EventRecord record;
@@ -709,7 +733,9 @@ void PluginView::nullEventTimerFired(Timer<PluginView>*)
if (!dispatchNPEvent(record))
LOG(Events, "PluginView::nullEventTimerFired(): Null event not accepted");
}
+#endif
+#ifndef NP_NO_CARBON
static int modifiersForEvent(UIEventWithKeyState* event)
{
int modifiers = 0;
@@ -728,7 +754,9 @@ static int modifiersForEvent(UIEventWithKeyState* event)
return modifiers;
}
+#endif
+#ifndef NP_NO_CARBON
static bool tigerOrBetter()
{
static SInt32 systemVersion = 0;
@@ -740,7 +768,9 @@ static bool tigerOrBetter()
return systemVersion >= 0x1040;
}
+#endif
+#ifndef NP_NO_CARBON
Point PluginView::globalMousePosForPlugin() const
{
Point pos;
@@ -765,7 +795,9 @@ Point PluginView::globalMousePosForPlugin() const
return pos;
}
+#endif
+#ifndef NP_NO_CARBON
Point PluginView::mousePosForPlugin(MouseEvent* event) const
{
ASSERT(event);
@@ -785,7 +817,9 @@ Point PluginView::mousePosForPlugin(MouseEvent* event) const
pos.v = postZoomPos.y() + m_windowRect.y() - 22;
return pos;
}
+#endif
+#ifndef NP_NO_CARBON
bool PluginView::dispatchNPEvent(NPEvent& event)
{
PluginView::setCurrentPluginView(this);
@@ -798,6 +832,7 @@ bool PluginView::dispatchNPEvent(NPEvent& event)
PluginView::setCurrentPluginView(0);
return accepted;
}
+#endif
// ------------------- Miscellaneous ------------------
@@ -835,9 +870,3 @@ void PluginView::restart()
}
} // namespace WebCore
-
-#else
-
-#include "../PluginViewNone.cpp"
-
-#endif // !__LP64__
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list