Attachment #128758 for bug #79508

View Details Raw Unified Return to Bug 79508

| Differences between



2012-02-24  Mark Pilgrim  <pilgrim@chromium.org>

        Switch indexeddb to use supplemental IDL for WorkerContext
        https://bugs.webkit.org/show_bug.cgi?id=79508

        Reviewed by NOBODY (OOPS!).

        No new tests. (OOPS!)

        * WebCore.gypi:
        * page/DOMWindow.h:
        (DOMWindow):
        (WebCore::DOMWindow::defaultStatus):
        * workers/WorkerContext.cpp:
        (WebCore::WorkerContext::notifyObserversOfStop):
        * workers/WorkerContext.h:
        (WebCore::WorkerContext::idbFactory):
        (WorkerContext):
        (WebCore::WorkerContext::idbFactoryBackendInterface):
        * workers/WorkerContext.idl:

2012-02-24  Adam Klein  <adamk@chromium.org>

        Don't notify the inspector of Node insertions initiated by the parser

Lines 727-732 Source/WebCore/WebCore.gypi_sec1
- Source/WebCore/WebCore.gypi +3 lines
727	'Modules/geolocation/PositionError.idl',	727	'Modules/geolocation/PositionError.idl',
728	'Modules/geolocation/PositionErrorCallback.idl',	728	'Modules/geolocation/PositionErrorCallback.idl',
729	'Modules/indexeddb/DOMWindowIndexedDatabase.idl',	729	'Modules/indexeddb/DOMWindowIndexedDatabase.idl',
		730	'Modules/indexeddb/WorkerContextIndexedDB.idl',
730	'Modules/intents/DOMWindowIntents.idl',	731	'Modules/intents/DOMWindowIntents.idl',
731	'Modules/intents/Intent.idl',	732	'Modules/intents/Intent.idl',
732	'Modules/intents/IntentResultCallback.idl',	733	'Modules/intents/IntentResultCallback.idl',
Lines 1292-1297 Source/WebCore/WebCore.gypi_sec2
1292	'Modules/geolocation/NavigatorGeolocation.h',	1293	'Modules/geolocation/NavigatorGeolocation.h',
1293	'Modules/indexeddb/DOMWindowIndexedDatabase.cpp',	1294	'Modules/indexeddb/DOMWindowIndexedDatabase.cpp',
1294	'Modules/indexeddb/DOMWindowIndexedDatabase.h',	1295	'Modules/indexeddb/DOMWindowIndexedDatabase.h',
		1296	'Modules/indexeddb/WorkerContextIndexedDB.cpp',
		1297	'Modules/indexeddb/WorkerContextIndexedDB.h',
1295	'Modules/intents/Intent.cpp',	1298	'Modules/intents/Intent.cpp',
1296	'Modules/intents/Intent.h',	1299	'Modules/intents/Intent.h',
1297	'Modules/intents/IntentRequest.cpp',	1300	'Modules/intents/IntentRequest.cpp',



 * 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 DOMWindow_h

        double devicePixelRatio() const;

        PassRefPtr<WebKitPoint> webkitConvertPointFromPageToNode(Node*, const WebKitPoint*) const;
        PassRefPtr<WebKitPoint> webkitConvertPointFromNodeToPage(Node*, const WebKitPoint*) const;

        Console* console() const;


    inline String DOMWindow::defaultStatus() const
    {
        return m_defaultStatus;
    }

} // namespace WebCore




 * 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 "ExceptionCode.h"
#endif

#include "IDBFactory.h"

namespace WebCore {

class CloseWorkerContextTask : public ScriptExecutionContext::Task {

    }
}

#if ENABLE(INDEXED_DATABASE)
IDBFactory* WorkerContext::webkitIndexedDB() const
{
    if (!securityOrigin()->canAccessDatabase())
        return 0;
    if (!m_idbFactoryBackendInterface)
        m_idbFactoryBackendInterface = IDBFactoryBackendInterface::create();
    if (!m_idbFactory)
        m_idbFactory = IDBFactory::create(m_idbFactoryBackendInterface.get());
    return m_idbFactory.get();
}
#endif

WorkerEventQueue* WorkerContext::eventQueue() const
{
    return m_eventQueue.get();

Lines 20-26 Source/WebCore/workers/WorkerContext.h_sec1
- Source/WebCore/workers/WorkerContext.h -2 / +5 lines
20	* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY	20	* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21	* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT	21	* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE	22	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23	* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	23	* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24	*	24	*
25	*/	25	*/
26		26
Lines 170-176 namespace WebCore { Source/WebCore/workers/WorkerContext.h_sec2
170	void unregisterObserver(Observer*);	170	void unregisterObserver(Observer*);
171	void notifyObserversOfStop();	171	void notifyObserversOfStop();
172	#if ENABLE(INDEXED_DATABASE)	172	#if ENABLE(INDEXED_DATABASE)
173	IDBFactory* webkitIndexedDB() const;	173	IDBFactory* idbFactory() { return m_idbFactory.get(); }
		174	void setIDBFactory(PassRefPtr<IDBFactory>);
		175	IDBFactoryBackendInterface* idbFactoryBackendInterface() { return m_idbFactoryBackendInterface.get(); }
		176	void setIDBFactoryBackendInterface(PassRefPtr<IDBFactoryBackendInterface>);
174	#endif	177	#endif
175		178
176	protected:	179	protected:



 * 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.
 *
 */




        // EventTarget interface
        void addEventListener(in DOMString type,
                              in EventListener listener,
                              in [Optional] boolean useCapture);
        void removeEventListener(in DOMString type,
                                 in EventListener listener,
                                 in [Optional] boolean useCapture);
        boolean dispatchEvent(in Event evt)
            raises(EventException);

        attribute Float32ArrayConstructor Float32Array; // Usable with new operator
        attribute Float64ArrayConstructor Float64Array; // Usable with new operator
        attribute DataViewConstructor DataView; // Usable with new operator
#if defined(ENABLE_INDEXED_DATABASE) && ENABLE_INDEXED_DATABASE
        readonly attribute [V8EnabledAtRuntime] IDBFactory webkitIndexedDB;

        attribute [V8EnabledAtRuntime] IDBCursorConstructor webkitIDBCursor;
        attribute [V8EnabledAtRuntime] IDBDatabaseConstructor webkitIDBDatabase;
        attribute [V8EnabledAtRuntime] IDBDatabaseErrorConstructor webkitIDBDatabaseError;
        attribute [V8EnabledAtRuntime] IDBDatabaseExceptionConstructor webkitIDBDatabaseException;
        attribute [V8EnabledAtRuntime] IDBFactoryConstructor webkitIDBFactory;
        attribute [V8EnabledAtRuntime] IDBIndexConstructor webkitIDBIndex;
        attribute [V8EnabledAtRuntime] IDBKeyRangeConstructor webkitIDBKeyRange;
        attribute [V8EnabledAtRuntime] IDBObjectStoreConstructor webkitIDBObjectStore;
        attribute [V8EnabledAtRuntime] IDBRequestConstructor webkitIDBRequest;
        attribute [V8EnabledAtRuntime] IDBTransactionConstructor webkitIDBTransaction;
#endif
    };

}

Return to Bug 79508

Lines 1-3 Source/WebCore/ChangeLog_sec1
- Source/WebCore/ChangeLog +21 lines
		1	2012-02-24 Mark Pilgrim <pilgrim@chromium.org>
		2
		3	Switch indexeddb to use supplemental IDL for WorkerContext
		4	https://bugs.webkit.org/show_bug.cgi?id=79508
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	No new tests. (OOPS!)
		9
		10	* WebCore.gypi:
		11	* page/DOMWindow.h:
		12	(DOMWindow):
		13	(WebCore::DOMWindow::defaultStatus):
		14	* workers/WorkerContext.cpp:
		15	(WebCore::WorkerContext::notifyObserversOfStop):
		16	* workers/WorkerContext.h:
		17	(WebCore::WorkerContext::idbFactory):
		18	(WorkerContext):
		19	(WebCore::WorkerContext::idbFactoryBackendInterface):
		20	* workers/WorkerContext.idl:
		21
1	2012-02-24 Adam Klein <adamk@chromium.org>	22	2012-02-24 Adam Klein <adamk@chromium.org>
2		23
3	Don't notify the inspector of Node insertions initiated by the parser	24	Don't notify the inspector of Node insertions initiated by the parser

Lines 21-27 Source/WebCore/page/DOMWindow.h_sec1
- Source/WebCore/page/DOMWindow.h -3 / +3 lines
21	* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY	21	* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
22	* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT	22	* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE	23	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
24	* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	24	* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25	*/	25	*/
26		26
27	#ifndef DOMWindow_h	27	#ifndef DOMWindow_h
Lines 219-225 namespace WebCore { Source/WebCore/page/DOMWindow.h_sec2
219	double devicePixelRatio() const;	219	double devicePixelRatio() const;
220		220
221	PassRefPtr<WebKitPoint> webkitConvertPointFromPageToNode(Node, const WebKitPoint) const;	221	PassRefPtr<WebKitPoint> webkitConvertPointFromPageToNode(Node, const WebKitPoint) const;
222	PassRefPtr<WebKitPoint> webkitConvertPointFromNodeToPage(Node, const WebKitPoint) const;	222	PassRefPtr<WebKitPoint> webkitConvertPointFromNodeToPage(Node, const WebKitPoint) const;
223		223
224	Console* console() const;	224	Console* console() const;
225		225
Lines 474-480 namespace WebCore { Source/WebCore/page/DOMWindow.h_sec3
474	inline String DOMWindow::defaultStatus() const	474	inline String DOMWindow::defaultStatus() const
475	{	475	{
476	return m_defaultStatus;	476	return m_defaultStatus;
477	}	477	}
478		478
479	} // namespace WebCore	479	} // namespace WebCore
480		480

Lines 21-27 Source/WebCore/workers/WorkerContext.cpp_sec1
- Source/WebCore/workers/WorkerContext.cpp -16 / +1 lines
21	* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY	21	* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
22	* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT	22	* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE	23	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
24	* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	24	* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25	*	25	*
26	*/	26	*/
27		27
Lines 86-93 Source/WebCore/workers/WorkerContext.cpp_sec2
86	#include "ExceptionCode.h"	86	#include "ExceptionCode.h"
87	#endif	87	#endif
88		88
89	#include "IDBFactory.h"
90
91	namespace WebCore {	89	namespace WebCore {
92		90
93	class CloseWorkerContextTask : public ScriptExecutionContext::Task {	91	class CloseWorkerContextTask : public ScriptExecutionContext::Task {
Lines 511-529 void WorkerContext::notifyObserversOfSto Source/WebCore/workers/WorkerContext.cpp_sec3
511	}	509	}
512	}	510	}
513		511
514	#if ENABLE(INDEXED_DATABASE)
515	IDBFactory* WorkerContext::webkitIndexedDB() const
516	{
517	if (!securityOrigin()->canAccessDatabase())
518	return 0;
519	if (!m_idbFactoryBackendInterface)
520	m_idbFactoryBackendInterface = IDBFactoryBackendInterface::create();
521	if (!m_idbFactory)
522	m_idbFactory = IDBFactory::create(m_idbFactoryBackendInterface.get());
523	return m_idbFactory.get();
524	}
525	#endif
526
527	WorkerEventQueue* WorkerContext::eventQueue() const	512	WorkerEventQueue* WorkerContext::eventQueue() const
528	{	513	{
529	return m_eventQueue.get();	514	return m_eventQueue.get();

Lines 20-26 Source/WebCore/workers/WorkerContext.idl_sec1
- Source/WebCore/workers/WorkerContext.idl -19 / +5 lines
20	* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY	20	* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21	* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT	21	* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE	22	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23	* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	23	* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24	*	24	*
25	*/	25	*/
26		26
Lines 67-77 module threads { Source/WebCore/workers/WorkerContext.idl_sec2
67		67
68		68
69	// EventTarget interface	69	// EventTarget interface
70	void addEventListener(in DOMString type,	70	void addEventListener(in DOMString type,
71	in EventListener listener,	71	in EventListener listener,
72	in [Optional] boolean useCapture);	72	in [Optional] boolean useCapture);
73	void removeEventListener(in DOMString type,	73	void removeEventListener(in DOMString type,
74	in EventListener listener,	74	in EventListener listener,
75	in [Optional] boolean useCapture);	75	in [Optional] boolean useCapture);
76	boolean dispatchEvent(in Event evt)	76	boolean dispatchEvent(in Event evt)
77	raises(EventException);	77	raises(EventException);
Lines 127-146 module threads { Source/WebCore/workers/WorkerContext.idl_sec3
127	attribute Float32ArrayConstructor Float32Array; // Usable with new operator	127	attribute Float32ArrayConstructor Float32Array; // Usable with new operator
128	attribute Float64ArrayConstructor Float64Array; // Usable with new operator	128	attribute Float64ArrayConstructor Float64Array; // Usable with new operator
129	attribute DataViewConstructor DataView; // Usable with new operator	129	attribute DataViewConstructor DataView; // Usable with new operator
130	#if defined(ENABLE_INDEXED_DATABASE) && ENABLE_INDEXED_DATABASE
131	readonly attribute [V8EnabledAtRuntime] IDBFactory webkitIndexedDB;
132
133	attribute [V8EnabledAtRuntime] IDBCursorConstructor webkitIDBCursor;
134	attribute [V8EnabledAtRuntime] IDBDatabaseConstructor webkitIDBDatabase;
135	attribute [V8EnabledAtRuntime] IDBDatabaseErrorConstructor webkitIDBDatabaseError;
136	attribute [V8EnabledAtRuntime] IDBDatabaseExceptionConstructor webkitIDBDatabaseException;
137	attribute [V8EnabledAtRuntime] IDBFactoryConstructor webkitIDBFactory;
138	attribute [V8EnabledAtRuntime] IDBIndexConstructor webkitIDBIndex;
139	attribute [V8EnabledAtRuntime] IDBKeyRangeConstructor webkitIDBKeyRange;
140	attribute [V8EnabledAtRuntime] IDBObjectStoreConstructor webkitIDBObjectStore;
141	attribute [V8EnabledAtRuntime] IDBRequestConstructor webkitIDBRequest;
142	attribute [V8EnabledAtRuntime] IDBTransactionConstructor webkitIDBTransaction;
143	#endif
144	};	130	};
145		131
146	}	132	}