Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (111968 => 111969)
--- trunk/Source/WebCore/CMakeLists.txt 2012-03-24 02:15:59 UTC (rev 111968)
+++ trunk/Source/WebCore/CMakeLists.txt 2012-03-24 02:20:42 UTC (rev 111969)
@@ -1630,12 +1630,14 @@
notifications/NotificationCenter.cpp
notifications/NotificationController.cpp
notifications/Notification.cpp
+ notifications/WorkerContextNotifications.cpp
)
LIST(APPEND WebCore_IDL_FILES
notifications/DOMWindowNotifications.idl
notifications/Notification.idl
notifications/NotificationCenter.idl
+ notifications/WorkerContextNotifications.idl
)
ENDIF ()
Modified: trunk/Source/WebCore/ChangeLog (111968 => 111969)
--- trunk/Source/WebCore/ChangeLog 2012-03-24 02:15:59 UTC (rev 111968)
+++ trunk/Source/WebCore/ChangeLog 2012-03-24 02:20:42 UTC (rev 111969)
@@ -1,3 +1,30 @@
+2012-03-23 Adam Barth <[email protected]>
+
+ Move Notifications APIs from WorkerContext.idl to WorkerContextNotifications.idl
+ https://bugs.webkit.org/show_bug.cgi?id=79635
+
+ Reviewed by Kentaro Hara.
+
+ This patch moves the NotificationCenter from WorkerContext to
+ WorkerContextNotificiations, reducing clutter in WorkerContext. After
+ this patch, Notifications are almost entirely contained in the
+ notifications directory.
+
+ * CMakeLists.txt:
+ * DerivedSources.make:
+ * DerivedSources.pri:
+ * GNUmakefile.list.am:
+ * Target.pri:
+ * WebCore.gypi:
+ * WebCore.vcproj/WebCore.vcproj:
+ * WebCore.xcodeproj/project.pbxproj:
+ * workers/WorkerContext.cpp:
+ (WebCore::WorkerContext::~WorkerContext):
+ * workers/WorkerContext.h:
+ (WebCore):
+ (WorkerContext):
+ * workers/WorkerContext.idl:
+
2012-03-23 Michal Mocny <[email protected]>
[chromium] RootLayer was not being checked for null causing segfaults very rarely.
Modified: trunk/Source/WebCore/DerivedSources.make (111968 => 111969)
--- trunk/Source/WebCore/DerivedSources.make 2012-03-24 02:15:59 UTC (rev 111968)
+++ trunk/Source/WebCore/DerivedSources.make 2012-03-24 02:20:42 UTC (rev 111969)
@@ -387,6 +387,7 @@
$(WebCore)/notifications/DOMWindowNotifications.idl \
$(WebCore)/notifications/Notification.idl \
$(WebCore)/notifications/NotificationCenter.idl \
+ $(WebCore)/notifications/WorkerContextNotifications.idl \
$(WebCore)/page/AbstractView.idl \
$(WebCore)/page/BarInfo.idl \
$(WebCore)/page/Console.idl \
Modified: trunk/Source/WebCore/DerivedSources.pri (111968 => 111969)
--- trunk/Source/WebCore/DerivedSources.pri 2012-03-24 02:15:59 UTC (rev 111968)
+++ trunk/Source/WebCore/DerivedSources.pri 2012-03-24 02:20:42 UTC (rev 111969)
@@ -400,6 +400,7 @@
$$PWD/notifications/DOMWindowNotifications.idl \
$$PWD/notifications/Notification.idl \
$$PWD/notifications/NotificationCenter.idl \
+ $$PWD/notifications/WorkerContextNotifications.idl \
$$PWD/page/BarInfo.idl \
$$PWD/page/Console.idl \
$$PWD/page/Coordinates.idl \
Modified: trunk/Source/WebCore/GNUmakefile.list.am (111968 => 111969)
--- trunk/Source/WebCore/GNUmakefile.list.am 2012-03-24 02:15:59 UTC (rev 111968)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2012-03-24 02:20:42 UTC (rev 111969)
@@ -2851,6 +2851,8 @@
Source/WebCore/notifications/NotificationController.h \
Source/WebCore/notifications/Notification.cpp \
Source/WebCore/notifications/Notification.h \
+ Source/WebCore/notifications/WorkerContextNotifications.cpp \
+ Source/WebCore/notifications/WorkerContextNotifications.h \
Source/WebCore/page/animation/AnimationBase.cpp \
Source/WebCore/page/animation/AnimationBase.h \
Source/WebCore/page/animation/AnimationController.cpp \
Modified: trunk/Source/WebCore/Target.pri (111968 => 111969)
--- trunk/Source/WebCore/Target.pri 2012-03-24 02:15:59 UTC (rev 111968)
+++ trunk/Source/WebCore/Target.pri 2012-03-24 02:20:42 UTC (rev 111969)
@@ -984,6 +984,7 @@
notifications/Notification.cpp \
notifications/NotificationCenter.cpp \
notifications/NotificationController.cpp \
+ notifications/WorkerContextNotifications.cpp \
page/animation/AnimationBase.cpp \
page/animation/AnimationController.cpp \
page/animation/CompositeAnimation.cpp \
@@ -2086,6 +2087,7 @@
notifications/NotificationCenter.h \
notifications/NotificationClient.h \
notifications/NotificationController.h \
+ notifications/WorkerContextNotifications.h \
page/animation/AnimationBase.h \
page/animation/AnimationController.h \
page/animation/CompositeAnimation.h \
Modified: trunk/Source/WebCore/WebCore.gypi (111968 => 111969)
--- trunk/Source/WebCore/WebCore.gypi 2012-03-24 02:15:59 UTC (rev 111968)
+++ trunk/Source/WebCore/WebCore.gypi 2012-03-24 02:20:42 UTC (rev 111969)
@@ -1101,6 +1101,7 @@
'notifications/DOMWindowNotifications.idl',
'notifications/Notification.idl',
'notifications/NotificationCenter.idl',
+ 'notifications/WorkerContextNotifications.idl',
'page/AbstractView.idl',
'page/BarInfo.idl',
'page/Console.idl',
@@ -2896,6 +2897,8 @@
'notifications/NotificationCenter.h',
'notifications/NotificationController.cpp',
'notifications/NotificationController.h',
+ 'notifications/WorkerContextNotifications.cpp',
+ 'notifications/WorkerContextNotifications.h',
'page/BarInfo.cpp',
'page/BarInfo.h',
'page/Chrome.cpp',
Modified: trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj (111968 => 111969)
--- trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2012-03-24 02:15:59 UTC (rev 111968)
+++ trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2012-03-24 02:20:42 UTC (rev 111969)
@@ -53949,6 +53949,14 @@
RelativePath="..\notifications\NotificationClient.h"
>
</File>
+ <File
+ RelativePath="..\notifications\WorkerContextNotifications.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\notifications\WorkerContextNotifications.h"
+ >
+ </File>
</Filter>
<Filter
Name="editing"
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (111968 => 111969)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2012-03-24 02:15:59 UTC (rev 111968)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2012-03-24 02:20:42 UTC (rev 111969)
@@ -3582,6 +3582,8 @@
97E4A12614F4C5D400870E43 /* NavigatorRegisterProtocolHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 9730BE1514EF286B00DF06B9 /* NavigatorRegisterProtocolHandler.h */; };
97E4A12714F4C5D700870E43 /* NavigatorRegisterProtocolHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9730BE1414EF286B00DF06B9 /* NavigatorRegisterProtocolHandler.cpp */; };
97EF7DFE107E55B700D7C49C /* ScriptControllerBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97EF7DFD107E55B700D7C49C /* ScriptControllerBase.cpp */; };
+ 97F8E665151D4A4B00D2D181 /* WorkerContextNotifications.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97F8E661151D4A3F00D2D181 /* WorkerContextNotifications.cpp */; };
+ 97F8E666151D4A4E00D2D181 /* WorkerContextNotifications.h in Headers */ = {isa = PBXBuildFile; fileRef = 97F8E662151D4A3F00D2D181 /* WorkerContextNotifications.h */; };
984264F112D5280A000D88A4 /* LinkLoaderClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 984264EF12D5280A000D88A4 /* LinkLoaderClient.h */; };
985BB96D13A94058007A0B69 /* LinkRelAttribute.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 985BB96B13A94058007A0B69 /* LinkRelAttribute.cpp */; };
985BB96E13A94058007A0B69 /* LinkRelAttribute.h in Headers */ = {isa = PBXBuildFile; fileRef = 985BB96C13A94058007A0B69 /* LinkRelAttribute.h */; };
@@ -10565,6 +10567,9 @@
97E4028D13A696ED00913D67 /* IconController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IconController.cpp; sourceTree = "<group>"; };
97E4028E13A696ED00913D67 /* IconController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IconController.h; sourceTree = "<group>"; };
97EF7DFD107E55B700D7C49C /* ScriptControllerBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptControllerBase.cpp; sourceTree = "<group>"; };
+ 97F8E661151D4A3F00D2D181 /* WorkerContextNotifications.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WorkerContextNotifications.cpp; path = notifications/WorkerContextNotifications.cpp; sourceTree = "<group>"; };
+ 97F8E662151D4A3F00D2D181 /* WorkerContextNotifications.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WorkerContextNotifications.h; path = notifications/WorkerContextNotifications.h; sourceTree = "<group>"; };
+ 97F8E663151D4A3F00D2D181 /* WorkerContextNotifications.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = WorkerContextNotifications.idl; path = notifications/WorkerContextNotifications.idl; sourceTree = "<group>"; };
984264EF12D5280A000D88A4 /* LinkLoaderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LinkLoaderClient.h; sourceTree = "<group>"; };
985BB96B13A94058007A0B69 /* LinkRelAttribute.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LinkRelAttribute.cpp; sourceTree = "<group>"; };
985BB96C13A94058007A0B69 /* LinkRelAttribute.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LinkRelAttribute.h; sourceTree = "<group>"; };
@@ -14436,6 +14441,9 @@
33503C9910179A74003B47E1 /* NotificationClient.h */,
3128CA67147331520074C72A /* NotificationController.cpp */,
3128CA6A147331630074C72A /* NotificationController.h */,
+ 97F8E661151D4A3F00D2D181 /* WorkerContextNotifications.cpp */,
+ 97F8E662151D4A3F00D2D181 /* WorkerContextNotifications.h */,
+ 97F8E663151D4A3F00D2D181 /* WorkerContextNotifications.idl */,
);
name = notifications;
sourceTree = "<group>";
@@ -24575,6 +24583,7 @@
F3820897147D35F90010BC06 /* WorkerConsoleAgent.h in Headers */,
2E4346490F546A8200B0F1BA /* WorkerContext.h in Headers */,
9712A612150090CE0048AF10 /* WorkerContextIndexedDatabase.h in Headers */,
+ 97F8E666151D4A4E00D2D181 /* WorkerContextNotifications.h in Headers */,
2E43464B0F546A8200B0F1BA /* WorkerContextProxy.h in Headers */,
97BC6A601505F081001B74AC /* WorkerContextSQLDatabase.h in Headers */,
F34742E11343631F00531BC2 /* WorkerDebuggerAgent.h in Headers */,
@@ -27570,6 +27579,7 @@
F3820896147D35F90010BC06 /* WorkerConsoleAgent.cpp in Sources */,
2E4346480F546A8200B0F1BA /* WorkerContext.cpp in Sources */,
9712A611150090CE0048AF10 /* WorkerContextIndexedDatabase.cpp in Sources */,
+ 97F8E665151D4A4B00D2D181 /* WorkerContextNotifications.cpp in Sources */,
97BC6A5F1505F081001B74AC /* WorkerContextSQLDatabase.cpp in Sources */,
F34742E01343631F00531BC2 /* WorkerDebuggerAgent.cpp in Sources */,
A3E2643014748991005A8588 /* WorkerEventQueue.cpp in Sources */,
Added: trunk/Source/WebCore/notifications/WorkerContextNotifications.cpp (0 => 111969)
--- trunk/Source/WebCore/notifications/WorkerContextNotifications.cpp (rev 0)
+++ trunk/Source/WebCore/notifications/WorkerContextNotifications.cpp 2012-03-24 02:20:42 UTC (rev 111969)
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2008 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2009, 2011 Google Inc. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include "config.h"
+#include "WorkerContextNotifications.h"
+
+#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
+
+#include "NotificationCenter.h"
+#include "WorkerContext.h"
+#include "WorkerThread.h"
+
+namespace WebCore {
+
+WorkerContextNotifications::WorkerContextNotifications(WorkerContext* context)
+ : m_context(context)
+{
+}
+
+WorkerContextNotifications::~WorkerContextNotifications()
+{
+}
+
+WorkerContextNotifications* WorkerContextNotifications::from(WorkerContext* context)
+{
+ AtomicString supplementName = "WorkerContextNotifications";
+ WorkerContextNotifications* supplement = static_cast<WorkerContextNotifications*>(Supplement<ScriptExecutionContext>::from(context, supplementName));
+ if (!supplement) {
+ supplement = new WorkerContextNotifications(context);
+ Supplement<ScriptExecutionContext>::provideTo(context, supplementName, adoptPtr(supplement));
+ }
+ return supplement;
+}
+
+NotificationCenter* WorkerContextNotifications::webkitNotifications(WorkerContext* context)
+{
+ return WorkerContextNotifications::from(context)->webkitNotifications();
+}
+
+NotificationCenter* WorkerContextNotifications::webkitNotifications()
+{
+ if (!m_notificationCenter)
+ m_notificationCenter = NotificationCenter::create(m_context, m_context->thread()->getNotificationClient());
+ return m_notificationCenter.get();
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
Added: trunk/Source/WebCore/notifications/WorkerContextNotifications.h (0 => 111969)
--- trunk/Source/WebCore/notifications/WorkerContextNotifications.h (rev 0)
+++ trunk/Source/WebCore/notifications/WorkerContextNotifications.h 2012-03-24 02:20:42 UTC (rev 111969)
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2008, 2009 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WorkerContextNotifications_h
+#define WorkerContextNotifications_h
+
+#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
+
+#include "Supplementable.h"
+
+namespace WebCore {
+
+class NotificationCenter;
+class ScriptExecutionContext;
+class WorkerContext;
+
+class WorkerContextNotifications : public Supplement<ScriptExecutionContext> {
+public:
+ virtual ~WorkerContextNotifications();
+
+ static NotificationCenter* webkitNotifications(WorkerContext*);
+ static WorkerContextNotifications* from(WorkerContext*);
+
+private:
+ explicit WorkerContextNotifications(WorkerContext*);
+
+ NotificationCenter* webkitNotifications();
+
+ WorkerContext* m_context;
+ RefPtr<NotificationCenter> m_notificationCenter;
+};
+
+} // namespace WebCore
+
+#endif // ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
+
+#endif // WorkerContextNotifications_h
Added: trunk/Source/WebCore/notifications/WorkerContextNotifications.idl (0 => 111969)
--- trunk/Source/WebCore/notifications/WorkerContextNotifications.idl (rev 0)
+++ trunk/Source/WebCore/notifications/WorkerContextNotifications.idl 2012-03-24 02:20:42 UTC (rev 111969)
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2008 Apple Inc. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+module threads {
+
+ interface [
+ Conditional=NOTIFICATIONS|LEGACY_NOTIFICATIONS,
+ Supplemental=WorkerContext
+ ] WorkerContextNotificiations {
+ readonly attribute [V8EnabledAtRuntime] NotificationCenter webkitNotifications;
+ };
+
+}
Modified: trunk/Source/WebCore/workers/WorkerContext.cpp (111968 => 111969)
--- trunk/Source/WebCore/workers/WorkerContext.cpp 2012-03-24 02:15:59 UTC (rev 111968)
+++ trunk/Source/WebCore/workers/WorkerContext.cpp 2012-03-24 02:20:42 UTC (rev 111969)
@@ -104,9 +104,6 @@
WorkerContext::~WorkerContext()
{
ASSERT(currentThread() == thread()->threadID());
-#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
- m_notifications.clear();
-#endif
// Make sure we have no observers.
notifyObserversOfStop();
@@ -294,15 +291,6 @@
InspectorInstrumentation::addMessageToConsole(this, source, type, level, message, sourceURL, lineNumber);
}
-#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
-NotificationCenter* WorkerContext::webkitNotifications() const
-{
- if (!m_notifications)
- m_notifications = NotificationCenter::create(scriptExecutionContext(), m_thread->getNotificationClient());
- return m_notifications.get();
-}
-#endif
-
bool WorkerContext::isContextThread() const
{
return currentThread() == thread()->threadID();
Modified: trunk/Source/WebCore/workers/WorkerContext.h (111968 => 111969)
--- trunk/Source/WebCore/workers/WorkerContext.h 2012-03-24 02:15:59 UTC (rev 111968)
+++ trunk/Source/WebCore/workers/WorkerContext.h 2012-03-24 02:20:42 UTC (rev 111969)
@@ -48,7 +48,6 @@
class Blob;
class DOMURL;
- class NotificationCenter;
class ScheduledAction;
class WorkerInspectorController;
class WorkerLocation;
@@ -105,10 +104,6 @@
// ScriptExecutionContext
virtual WorkerEventQueue* eventQueue() const;
-#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
- NotificationCenter* webkitNotifications() const;
-#endif
-
virtual bool isContextThread() const;
virtual bool isJSExecutionForbidden() const;
@@ -172,9 +167,6 @@
OwnPtr<WorkerScriptController> m_script;
WorkerThread* m_thread;
-#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
- mutable RefPtr<NotificationCenter> m_notifications;
-#endif
#if ENABLE(BLOB)
mutable RefPtr<DOMURL> m_domURL;
#endif
Modified: trunk/Source/WebCore/workers/WorkerContext.idl (111968 => 111969)
--- trunk/Source/WebCore/workers/WorkerContext.idl 2012-03-24 02:15:59 UTC (rev 111968)
+++ trunk/Source/WebCore/workers/WorkerContext.idl 2012-03-24 02:20:42 UTC (rev 111969)
@@ -70,11 +70,6 @@
boolean dispatchEvent(in Event evt)
raises(EventException);
-#if (defined(ENABLE_NOTIFICATIONS) && ENABLE_NOTIFICATIONS) || (defined(ENABLE_LEGACY_NOTIFICATIONS) && ENABLE_LEGACY_NOTIFICATIONS)
- // Notification interface
- readonly attribute [V8EnabledAtRuntime] NotificationCenter webkitNotifications;
-#endif
-
#if !defined(LANGUAGE_CPP) || !LANGUAGE_CPP
// Constructors
attribute MessageEventConstructor MessageEvent;
