For local review prior to sending to webkit

bindings/js/JSEventTarget.cpp

 /*
  * 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
@@ skipping 21 matching lines @@
 #include "JSDOMWindowShell.h"
 #include "JSEventListener.h"
 #include "JSMessagePort.h"
 #include "JSNode.h"
 #include "JSXMLHttpRequest.h"
 #include "JSXMLHttpRequestUpload.h"
 #include "MessagePort.h"
 #include "XMLHttpRequest.h"
 #include "XMLHttpRequestUpload.h"
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
+#if ENABLE(OFFLINE_WEB_APPLICATIONS) || ENABLE(APPLICATION_CACHE)
 #include "DOMApplicationCache.h"
 #include "JSDOMApplicationCache.h"
 #endif
 
 #if ENABLE(SVG)
 #include "SVGElementInstance.h"
 #include "JSSVGElementInstance.h"
 #endif
 
 #if ENABLE(WORKERS)
@@ skipping 24 matching lines @@
     if (DOMWindow* domWindow = target->toDOMWindow())
         return toJS(exec, domWindow);
 
     if (XMLHttpRequest* xhr = target->toXMLHttpRequest())
         // XMLHttpRequest is always created via JS, so we don't need to use cacheDOMObject() here.
         return getCachedDOMObjectWrapper(exec->globalData(), xhr);
 
     if (XMLHttpRequestUpload* upload = target->toXMLHttpRequestUpload())
         return toJS(exec, upload);
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
+#if ENABLE(OFFLINE_WEB_APPLICATIONS) || ENABLE(APPLICATION_CACHE)
     if (DOMApplicationCache* cache = target->toDOMApplicationCache())
         // DOMApplicationCache is always created via JS, so we don't need to use cacheDOMObject() here.
         return getCachedDOMObjectWrapper(exec->globalData(), cache);
 #endif
 
     if (MessagePort* messagePort = target->toMessagePort())
         return toJS(exec, messagePort);
 
 #if ENABLE(WORKERS)
     if (Worker* worker = target->toWorker())
@@ skipping 14 matching lines @@
             return static_cast<JS##type*>(asObject(value))->impl();
 
     CONVERT_TO_EVENT_TARGET(Node)
     CONVERT_TO_EVENT_TARGET(XMLHttpRequest)
     CONVERT_TO_EVENT_TARGET(XMLHttpRequestUpload)
     CONVERT_TO_EVENT_TARGET(MessagePort)
 
     if (value.isObject(&JSDOMWindowShell::s_info))
         return static_cast<JSDOMWindowShell*>(asObject(value))->impl();
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
+#if ENABLE(OFFLINE_WEB_APPLICATIONS) || ENABLE(APPLICATION_CACHE)
     CONVERT_TO_EVENT_TARGET(DOMApplicationCache)
 #endif
 
 #if ENABLE(SVG)
     CONVERT_TO_EVENT_TARGET(SVGElementInstance)
 #endif
 
 #if ENABLE(WORKERS)
     CONVERT_TO_EVENT_TARGET(Worker)
     CONVERT_TO_EVENT_TARGET(WorkerContext)
 #endif
 
     return 0;
 }
 
 } // namespace WebCore