summaryrefslogtreecommitdiffstats
path: root/WebCore/bindings/js
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2009-08-19 12:15:58 +0100
committerBen Murdoch <benm@google.com>2009-08-19 12:26:02 +0100
commit76de9f7763de0e4568056a5a26c93030f21e0b90 (patch)
tree19a6df55fd4c9e76b28661119129ac5d88a78abb /WebCore/bindings/js
parent62983d46fda85f4d912c221e5cbc91a05d4edebf (diff)
downloadexternal_webkit-76de9f7763de0e4568056a5a26c93030f21e0b90.zip
external_webkit-76de9f7763de0e4568056a5a26c93030f21e0b90.tar.gz
external_webkit-76de9f7763de0e4568056a5a26c93030f21e0b90.tar.bz2
Continue with JSC errors.
Diffstat (limited to 'WebCore/bindings/js')
-rw-r--r--WebCore/bindings/js/JSDOMWindowCustom.cpp5
-rw-r--r--WebCore/bindings/js/JSEventCustom.cpp2
2 files changed, 5 insertions, 2 deletions
diff --git a/WebCore/bindings/js/JSDOMWindowCustom.cpp b/WebCore/bindings/js/JSDOMWindowCustom.cpp
index 44a11e4..c8e5db6 100644
--- a/WebCore/bindings/js/JSDOMWindowCustom.cpp
+++ b/WebCore/bindings/js/JSDOMWindowCustom.cpp
@@ -55,7 +55,6 @@
#include "Location.h"
#include "MediaPlayer.h"
#include "MessagePort.h"
-#include "NotificationCenter.h"
#include "Page.h"
#include "PlatformScreen.h"
#include "RegisteredEventListener.h"
@@ -68,6 +67,10 @@
#include <runtime/JSObject.h>
#include <runtime/PrototypeFunction.h>
+#if ENABLE(NOTIFICATIONS)
+#include "NotificationCenter.h"
+#endif
+
using namespace JSC;
namespace WebCore {
diff --git a/WebCore/bindings/js/JSEventCustom.cpp b/WebCore/bindings/js/JSEventCustom.cpp
index 7f9030e..804c529 100644
--- a/WebCore/bindings/js/JSEventCustom.cpp
+++ b/WebCore/bindings/js/JSEventCustom.cpp
@@ -110,7 +110,7 @@ JSValue toJS(ExecState* exec, JSDOMGlobalObject* globalObject, Event* event)
#endif
#if ENABLE(TOUCH_EVENTS) // Android
else if (event->isTouchEvent())
- wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, TouchEvent, event);
+ wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, TouchEvent, event);
#endif
else
wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, UIEvent, event);