Title: [101376] trunk/Source/WebCore
- Revision
- 101376
- Author
- hausm...@webkit.org
- Date
- 2011-11-29 07:37:51 -0800 (Tue, 29 Nov 2011)
Log Message
[Qt] Make WebCore compile with Qt 5 and V8
https://bugs.webkit.org/show_bug.cgi?id=73313
Reviewed by Tor Arne Vestbø.
* DerivedSources.pri: Add missing V8 specific IDL files to the build.
* Target.pri: Ditto.
* bindings/v8/ScriptController.h: V8 NPAPI bindings don't really support
building with ENABLE_NETSCAPE_PLUGIN_API=0. These functions are always
defined, so they also need to be declared.
* platform/qt/PlatformSupportQt.cpp:
(WebCore::PlatformSupport::pluginScriptableObject): Don't return a
scriptable object when compiling without npapi.
* storage/StorageAreaImpl.cpp: Add missing Document.h include that is
included implicitly with the Chromium build but not with Qt.
* xml/XSLTProcessorQt.cpp: Ditto.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (101375 => 101376)
--- trunk/Source/WebCore/ChangeLog 2011-11-29 15:33:10 UTC (rev 101375)
+++ trunk/Source/WebCore/ChangeLog 2011-11-29 15:37:51 UTC (rev 101376)
@@ -1,3 +1,22 @@
+2011-11-29 Simon Hausmann <simon.hausm...@nokia.com>
+
+ [Qt] Make WebCore compile with Qt 5 and V8
+ https://bugs.webkit.org/show_bug.cgi?id=73313
+
+ Reviewed by Tor Arne Vestbø.
+
+ * DerivedSources.pri: Add missing V8 specific IDL files to the build.
+ * Target.pri: Ditto.
+ * bindings/v8/ScriptController.h: V8 NPAPI bindings don't really support
+ building with ENABLE_NETSCAPE_PLUGIN_API=0. These functions are always
+ defined, so they also need to be declared.
+ * platform/qt/PlatformSupportQt.cpp:
+ (WebCore::PlatformSupport::pluginScriptableObject): Don't return a
+ scriptable object when compiling without npapi.
+ * storage/StorageAreaImpl.cpp: Add missing Document.h include that is
+ included implicitly with the Chromium build but not with Qt.
+ * xml/XSLTProcessorQt.cpp: Ditto.
+
2011-11-29 Pavel Feldman <pfeld...@google.com>
Not reviewed: fixing clang build.
Modified: trunk/Source/WebCore/DerivedSources.pri (101375 => 101376)
--- trunk/Source/WebCore/DerivedSources.pri 2011-11-29 15:33:10 UTC (rev 101375)
+++ trunk/Source/WebCore/DerivedSources.pri 2011-11-29 15:37:51 UTC (rev 101376)
@@ -225,6 +225,8 @@
html/canvas/WebGLBuffer.idl \
html/canvas/WebGLContextAttributes.idl \
html/canvas/WebGLContextEvent.idl \
+ html/canvas/WebGLDebugRendererInfo.idl \
+ html/canvas/WebGLDebugShaders.idl \
html/canvas/WebGLFramebuffer.idl \
html/canvas/WebGLProgram.idl \
html/canvas/WebGLRenderbuffer.idl \
Modified: trunk/Source/WebCore/Target.pri (101375 => 101376)
--- trunk/Source/WebCore/Target.pri 2011-11-29 15:33:10 UTC (rev 101375)
+++ trunk/Source/WebCore/Target.pri 2011-11-29 15:37:51 UTC (rev 101376)
@@ -3648,8 +3648,11 @@
platform/graphics/gpu/DrawingBuffer.h \
platform/graphics/qt/Extensions3DQt.h
- !v8 {
+ v8 {
SOURCES += \
+ bindings/v8/custom/V8WebGLRenderingContextCustom.cpp
+ } else {
+ SOURCES += \
bindings/js/JSWebGLRenderingContextCustom.cpp
}
Modified: trunk/Source/WebCore/bindings/v8/ScriptController.h (101375 => 101376)
--- trunk/Source/WebCore/bindings/v8/ScriptController.h 2011-11-29 15:33:10 UTC (rev 101375)
+++ trunk/Source/WebCore/bindings/v8/ScriptController.h 2011-11-29 15:37:51 UTC (rev 101376)
@@ -175,10 +175,8 @@
void updatePlatformScriptObjects();
void cleanupScriptObjectsForPlugin(Widget*);
-#if ENABLE(NETSCAPE_PLUGIN_API)
NPObject* createScriptObjectForPluginElement(HTMLPlugInElement*);
NPObject* windowScriptNPObject();
-#endif
#if PLATFORM(QT)
QJSEngine* qtScriptEngine();
@@ -207,7 +205,6 @@
// invalidate all sub-objects which are associated with that plugin.
// The frame keeps a NPObject reference for each item on the list.
PluginObjectMap m_pluginObjects;
-#if ENABLE(NETSCAPE_PLUGIN_API)
// The window script object can get destroyed while there are outstanding
// references to it. Please refer to ScriptController::clearScriptObjects
// for more information as to why this is necessary. To avoid crashes due
@@ -216,7 +213,6 @@
// pointer in this object is cleared out when the window object is
// destroyed.
NPObject* m_wrappedWindowScriptNPObject;
-#endif
};
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/qt/PlatformSupportQt.cpp (101375 => 101376)
--- trunk/Source/WebCore/platform/qt/PlatformSupportQt.cpp 2011-11-29 15:33:10 UTC (rev 101375)
+++ trunk/Source/WebCore/platform/qt/PlatformSupportQt.cpp 2011-11-29 15:37:51 UTC (rev 101376)
@@ -25,6 +25,7 @@
#include "Frame.h"
#include "PluginView.h"
#include "Widget.h"
+#include "npapi.h"
namespace WebCore {
@@ -44,8 +45,12 @@
if (!widget->isPluginView())
return 0;
+#if ENABLE(NETSCAPE_PLUGIN_API)
PluginView* pluginView = static_cast<PluginView*>(widget);
return pluginView->npObject();
+#else
+ return 0;
+#endif
}
}
Modified: trunk/Source/WebCore/storage/StorageAreaImpl.cpp (101375 => 101376)
--- trunk/Source/WebCore/storage/StorageAreaImpl.cpp 2011-11-29 15:33:10 UTC (rev 101375)
+++ trunk/Source/WebCore/storage/StorageAreaImpl.cpp 2011-11-29 15:37:51 UTC (rev 101376)
@@ -26,6 +26,7 @@
#include "config.h"
#include "StorageAreaImpl.h"
+#include "Document.h"
#include "ExceptionCode.h"
#include "Frame.h"
#include "Page.h"
Modified: trunk/Source/WebCore/xml/XSLTProcessorQt.cpp (101375 => 101376)
--- trunk/Source/WebCore/xml/XSLTProcessorQt.cpp 2011-11-29 15:33:10 UTC (rev 101375)
+++ trunk/Source/WebCore/xml/XSLTProcessorQt.cpp 2011-11-29 15:37:51 UTC (rev 101376)
@@ -26,6 +26,7 @@
#include "XSLTProcessor.h"
#include "Console.h"
+#include "Document.h"
#include "DOMWindow.h"
#include "Frame.h"
#include "SecurityOrigin.h"
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
