Try again to begin compiling the files that implemen the HTML5...

webkit/port/page/inspector/InspectorController.cpp

 /*
  * Copyright (C) 2007 Google Inc. All rights reserved.
  * Authors: Collin Jackson, Adam Barth
  *
  * This is the V8 version of the KJS InspectorController, which is located in
  * webkit/pending.
  * Copyright (C) 2007 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ skipping 71 matching lines @@
 #if USE(JAVASCRIPTCORE_BINDINGS)
 #include "kjs_proxy.h"
 #include <JavaScriptCore/APICast.h>
 #include <JavaScriptCore/JSLock.h>
 #include <JavaScriptCore/JSRetainPtr.h>
 #include <JavaScriptCore/JSStringRef.h>
 #include <kjs/ustring.h>
 #endif
 #include <wtf/RefCounted.h>
 
+// TODO(aa): Implement database inspection and remove this macro.
+#define ENABLE_DATABASE_INSPECTION 0
+
 #if ENABLE(DATABASE)
 #include "Database.h"
+#if ENABLE_DATABASE_INSPECTION
 #include "JSDatabase.h"
 #endif
+#endif
 
 #if USE(JAVASCRIPTCORE_BINDINGS)
 using namespace KJS;
 using namespace std;
 #endif
 
 namespace WebCore {
 
 // Maximum size of the console message cache.
 static const int MAX_CONSOLE_MESSAGES = 250;
@@ skipping 364 matching lines @@
         , endTime(-1.0)
     {
     }
 };
 
 #pragma mark -
 #pragma mark InspectorDatabaseResource Struct
 
 #if ENABLE(DATABASE)
 struct InspectorDatabaseResource : public RefCounted<InspectorDatabaseResource> {
+#if ENABLE_DATABASE_INSPECTION
     static PassRefPtr<InspectorDatabaseResource> create(Database* database, const String& domain, const String& name, const String& version)
     {
         // Apple changed the default refcount to 1: http://trac.webkit.org/changeset/30406
         // We default it to 1 in the protected constructor below to match Apple,
         // so adoptRef is the right thing.
         return adoptRef(new InspectorDatabaseResource(database, domain, name, version));
     }
 
     void setScriptObject(JSContextRef context, JSObjectRef newScriptObject)
     {
@@ skipping 21 matching lines @@
     InspectorDatabaseResource(Database* database, const String& domain, const String& name, const String& version)
         : RefCounted<InspectorDatabaseResource>(1)
         , database(database)
         , domain(domain)
         , name(name)
         , version(version)
         , scriptContext(0)
         , scriptObject(0)
     {
     }
+#endif
 };
 #endif
 
 #pragma mark -
 #pragma mark JavaScript Callbacks
 
 #if USE(JAVASCRIPTCORE_BINDINGS)
 static JSValueRef addSourceToFrame(JSContextRef ctx, JSObjectRef /*function*/, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
 {
     JSValueRef undefined = JSValueMakeUndefined(ctx);
@@ skipping 370 matching lines @@
         (v8::Function::Cast(*push))->Call(array, 1, args);
 
         setStart(searchRange.get(), newStart);
     } while (true);
 
     // TODO(jackson): Figure out how to return array
 }
 #endif
 
 #if ENABLE(DATABASE)
+#if ENABLE_DATABASE_INSPECTION
 static JSValueRef databaseTableNames(JSContextRef ctx, JSObjectRef /*function*/, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
 {
     InspectorController* controller = reinterpret_cast<InspectorController*>(JSObjectGetPrivate(thisObject));
     if (!controller)
         return JSValueMakeUndefined(ctx);
 
     if (argumentCount < 1)
         return JSValueMakeUndefined(ctx);
 
     JSQuarantinedObjectWrapper* wrapper = JSQuarantinedObjectWrapper::asWrapper(toJS(arguments[0]));
@@ skipping 34 matching lines @@
 
         JSValueRef pushArguments[] = { tableNameValue };
         JSObjectCallAsFunction(ctx, pushFunction, result, 1, pushArguments, exception);
         if (exception && *exception)
             return JSValueMakeUndefined(ctx);
     }
 
     return result;
 }
 #endif
+#endif
 
 #if USE(JAVASCRIPTCORE_BINDINGS)
 static JSValueRef inspectedWindow(JSContextRef ctx, JSObjectRef /*function*/, JSObjectRef thisObject, size_t /*argumentCount*/, const JSValueRef[] /*arguments[]*/, JSValueRef* /*exception*/)
 {
     InspectorController* controller = reinterpret_cast<InspectorController*>(JSObjectGetPrivate(thisObject));
     if (!controller)
         return JSValueMakeUndefined(ctx);
 
     JSDOMWindow* inspectedWindow = toJSDOMWindow(controller->inspectedPage()->mainFrame());
     JSLock lock;
@@ skipping 465 matching lines @@
         { "addSourceToFrame", addSourceToFrame, kJSPropertyAttributeNone },
         { "getResourceDocumentNode", getResourceDocumentNode, kJSPropertyAttributeNone },
         { "highlightDOMNode", highlightDOMNode, kJSPropertyAttributeNone },
         { "hideDOMNodeHighlight", hideDOMNodeHighlight, kJSPropertyAttributeNone },
         { "loaded", loaded, kJSPropertyAttributeNone },
         { "windowUnloading", unloading, kJSPropertyAttributeNone },
         { "attach", attach, kJSPropertyAttributeNone },
         { "detach", detach, kJSPropertyAttributeNone },
         { "search", search, kJSPropertyAttributeNone },
 #if ENABLE(DATABASE)
+#if ENABLE_DATABASE_INSPECTION
         { "databaseTableNames", databaseTableNames, kJSPropertyAttributeNone },
 #endif
+#endif
         { "inspectedWindow", inspectedWindow, kJSPropertyAttributeNone },
         { "localizedStringsURL", localizedStrings, kJSPropertyAttributeNone },
         { "platform", platform, kJSPropertyAttributeNone },
         { "moveByUnrestricted", moveByUnrestricted, kJSPropertyAttributeNone },
         { "wrapCallback", wrapCallback, kJSPropertyAttributeNone },
         { "startDebuggingAndReloadInspectedPage", WebCore::startDebuggingAndReloadInspectedPage, kJSPropertyAttributeNone },
         { "stopDebugging", WebCore::stopDebugging, kJSPropertyAttributeNone },
         { "debuggerAttached", WebCore::debuggerAttached, kJSPropertyAttributeNone },
         { 0, 0, 0 }
     };
@@ skipping 724 matching lines @@
 
     ResourcesMap::iterator resourcesEnd = m_resources.end();
     for (ResourcesMap::iterator it = m_resources.begin(); it != resourcesEnd; ++it)
         addAndUpdateScriptResource(it->second.get());
 
     unsigned messageCount = m_consoleMessages.size();
     for (unsigned i = 0; i < messageCount; ++i)
         addScriptConsoleMessage(m_consoleMessages[i]);
 
 #if ENABLE(DATABASE)
+#if ENABLE_DATABASE_INSPECTION
     DatabaseResourcesSet::iterator databasesEnd = m_databaseResources.end();
     for (DatabaseResourcesSet::iterator it = m_databaseResources.begin(); it != databasesEnd; ++it)
         addDatabaseScriptResource((*it).get());
 #endif
+#endif
 }
 #elif USE(V8_BINDING)
 void InspectorController::populateScriptObjects()
 {
     ResourcesMap::iterator resourcesEnd = m_resources.end();
     for (ResourcesMap::iterator it = m_resources.begin(); it != resourcesEnd; ++it)
         addAndUpdateScriptResource(it->second.get());
 
     unsigned messageCount = m_consoleMessages.size();
     for (unsigned i = 0; i < messageCount; ++i)
         addScriptConsoleMessage(m_consoleMessages[i]);
 }
 #endif
 
 #if ENABLE(DATABASE)
+#if ENABLE_DATABASE_INSPECTION
 JSObjectRef InspectorController::addDatabaseScriptResource(InspectorDatabaseResource* resource)
 {
     ASSERT_ARG(resource, resource);
 
     if (resource->scriptObject)
         return resource->scriptObject;
 
     ASSERT(m_scriptContext);
     ASSERT(m_scriptObject);
     if (!m_scriptContext || !m_scriptObject)
@@ skipping 74 matching lines @@
 
     JSObjectRef removeDatabaseFunction = JSValueToObject(m_scriptContext, removeDatabaseProperty, &exception);
     if (HANDLE_EXCEPTION(exception))
         return;
 
     JSValueRef arguments[] = { scriptObject };
     JSObjectCallAsFunction(m_scriptContext, removeDatabaseFunction, m_scriptObject, 1, arguments, &exception);
     HANDLE_EXCEPTION(exception);
 }
 #endif
+#endif
 
 #if USE(JAVASCRIPTCORE_BINDINGS)
 void InspectorController::addScriptConsoleMessage(const ConsoleMessage* message)
 {
     ASSERT_ARG(message, message);
 
     if (!m_scriptContext || !m_scriptObject)
         return;
 
     JSValueRef exception = 0;
@@ skipping 108 matching lines @@
     for (ResourcesMap::iterator it = m_resources.begin(); it != resourcesEnd; ++it) {
         InspectorResource* resource = it->second.get();
 #if USE(JAVASCRIPTCORE_BINDINGS)
         resource->setScriptObject(0, 0);
 #elif USE(V8_BINDING)
         resource->setScriptObject(v8::Handle<v8::Object>());
 #endif
     }
 
 #if ENABLE(DATABASE)
+#if ENABLE_DATABASE_INSPECTION
     DatabaseResourcesSet::iterator databasesEnd = m_databaseResources.end();
     for (DatabaseResourcesSet::iterator it = m_databaseResources.begin(); it != databasesEnd; ++it) {
         InspectorDatabaseResource* resource = (*it).get();
         resource->setScriptObject(0, 0);
     }
 #endif
+#endif
 
 #if USE(JAVASCRIPTCORE_BINDINGS)
     callSimpleFunction(m_scriptContext, m_scriptObject, "reset");
 #elif USE(V8_BINDING)
     v8::HandleScope handle_scope;
     v8::Handle<v8::Context> context = V8Proxy::GetContext(m_page->mainFrame());
     v8::Context::Scope scope(context);
 
     v8::Handle<v8::Value> reset = m_scriptObject->Get(v8::String::New("reset"));
     ASSERT(reset->IsFunction());
@@ skipping 26 matching lines @@
 {
     if (!enabled())
         return;
 
     if (loader->frame() == m_inspectedPage->mainFrame()) {
         m_client->inspectedURLChanged(loader->url().string());
         deleteAllValues(m_consoleMessages);
         m_consoleMessages.clear();
 
 #if ENABLE(DATABASE)
+#if ENABLE_DATABASE_INSPECTION
         m_databaseResources.clear();
 #endif
+#endif
 
         if (windowVisible()) {
             resetScriptObjects();
 
             if (!loader->isLoadingFromCachedPage()) {
                 // We don't add the main resource until its load is committed. This is
                 // needed to keep the load for a user-entered URL from showing up in the
                 // list of resources for the page they are navigating away from.
                 if (trackResources() && m_mainResource)
                     addAndUpdateScriptResource(m_mainResource.get());
@@ skipping 221 matching lines @@
     resource->setXMLHttpRequestProperties(sourceString);
 }
 #elif USE(V8_BINDING)
 // TODO(ojan): Implement!
 #endif
 
 
 #if ENABLE(DATABASE)
 void InspectorController::didOpenDatabase(Database* database, const String& domain, const String& name, const String& version)
 {
+#if ENABLE_DATABASE_INSPECTION
     if (!enabled())
         return;
 
     RefPtr<InspectorDatabaseResource> resource = InspectorDatabaseResource::create(database, domain, name, version);
 
     m_databaseResources.add(resource);
 
     if (windowVisible())
         addDatabaseScriptResource(resource.get());
+#endif
 }
 #endif
 
 void InspectorController::moveWindowBy(float x, float y) const
 {
     if (!m_page || !enabled())
         return;
 
     FloatRect frameRect = m_page->chrome()->windowRect();
     frameRect.move(x, y);
@@ skipping 148 matching lines @@
 
 void InspectorController::exceptionWasRaised(ExecState*, int /*sourceID*/, int /*lineNumber*/)
 {
 }
 
 #elif USE(V8_BINDING)
 // TODO(ojan): Implement!
 #endif
 
 } // namespace WebCore