Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / modules / webdatabase / InspectorDatabaseAgent.cpp

diff --git a/src/third_party/WebKit/Source/modules/webdatabase/InspectorDatabaseAgent.cpp b/src/third_party/WebKit/Source/modules/webdatabase/InspectorDatabaseAgent.cpp
index 7fb0227..3b4fe53 100644 (file)
--- a/src/third_party/WebKit/Source/modules/webdatabase/InspectorDatabaseAgent.cpp
+++ b/src/third_party/WebKit/Source/modules/webdatabase/InspectorDatabaseAgent.cpp
@@ -29,7 +29,7 @@
 #include "config.h"
 #include "modules/webdatabase/InspectorDatabaseAgent.h"
 
-#include "bindings/v8/ExceptionStatePlaceholder.h"
+#include "bindings/core/v8/ExceptionStatePlaceholder.h"
 #include "core/frame/LocalFrame.h"
 #include "core/html/VoidCallback.h"
 #include "core/inspector/InspectorState.h"
@@ -49,9 +49,9 @@
 #include "platform/JSONValues.h"
 #include "wtf/Vector.h"
 
-typedef WebCore::InspectorBackendDispatcher::DatabaseCommandHandler::ExecuteSQLCallback ExecuteSQLCallback;
+typedef blink::InspectorBackendDispatcher::DatabaseCommandHandler::ExecuteSQLCallback ExecuteSQLCallback;
 
-namespace WebCore {
+namespace blink {
 
 namespace DatabaseAgentState {
 static const char databaseAgentEnabled[] = "databaseAgentEnabled";
@@ -313,4 +313,12 @@ Database* InspectorDatabaseAgent::databaseForId(const String& databaseId)
     return it->value->database();
 }
 
-} // namespace WebCore
+void InspectorDatabaseAgent::trace(Visitor* visitor)
+{
+#if ENABLE(OILPAN)
+    visitor->trace(m_resources);
+#endif
+    InspectorBaseAgent::trace(visitor);
+}
+
+} // namespace blink