Made USE(JSC) unconditional

https://bugs.webkit.org/show_bug.cgi?id=114058

Reviewed by Anders Carlsson.

../JavaScriptCore:

* config.h:

../ThirdParty:

* gtest/include/gtest/internal/gtest-port.h:

../WebCore:

* Modules/webdatabase/Database.cpp:
* bindings/ScriptControllerBase.cpp:
(WebCore::ScriptController::executeIfJavaScriptURL):
* bindings/js/JavaScriptCallFrame.cpp:
* bindings/js/JavaScriptCallFrame.h:
* bindings/scripts/InFilesCompiler.pm:
(generateHeadersHeader):
* css/MediaQueryListListener.cpp:
(WebCore::MediaQueryListListener::queryChanged):
* dom/ContainerNode.cpp:
(WebCore::dispatchChildRemovalEvents):
* dom/EventListener.h:
(EventListener):
(WebCore::EventListener::visitJSFunction):
* dom/EventTarget.h:
(EventTarget):
(WebCore):
(WebCore::EventTarget::visitJSEventListeners):
* dom/Node.cpp:
* dom/Node.h:
* dom/ScriptExecutionContext.cpp:
(WebCore):
(WebCore::ScriptExecutionContext::globalData):
* dom/ScriptExecutionContext.h:
(ScriptExecutionContext):
* html/HTMLCanvasElement.cpp:
(WebCore::HTMLCanvasElement::createImageBuffer):
* html/HTMLImageLoader.cpp:
(WebCore::HTMLImageLoader::notifyFinished):
* inspector/InjectedScriptHost.h:
(InjectedScriptHost):
(WebCore::InjectedScriptHost::evaluateReturnsEvalFunction):
* inspector/InspectorInstrumentation.cpp:
(WebCore):
(WebCore::InspectorInstrumentation::didCommitLoadImpl):
* page/Frame.cpp:
* page/Settings.cpp:
(WebCore):
(WebCore::Settings::shouldRespectPriorityInCSSAttributeSetters):
* page/Settings.h:
(Settings):
* plugins/PluginView.cpp:
(WebCore::PluginView::start):
(WebCore::PluginView::stop):
(WebCore::PluginView::performRequest):
(WebCore::PluginView::npObject):
(WebCore):
(WebCore::PluginView::bindingInstance):
(WebCore::PluginView::privateBrowsingStateChanged):
* plugins/PluginView.h:
(PluginView):
* plugins/PluginViewBase.h:
(PluginViewBase):
(WebCore::PluginViewBase::scriptObject):
* plugins/PluginViewNone.cpp:
(WebCore):
(WebCore::PluginView::bindingInstance):
* plugins/qt/PluginViewQt.cpp:
(WebCore::PluginView::dispatchNPEvent):
(WebCore::PluginView::setNPWindowIfNeeded):
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::dropProtection):

../WebKit/efl:

* ewk/ewk_frame.cpp:
(ewk_frame_script_execute):

../WebKit/qt:

* Api/qwebscriptworld.cpp:
(QWebScriptWorld::QWebScriptWorld):

../WebKit2:

* Shared/linux/WebMemorySamplerLinux.cpp:
(WebKit::WebMemorySampler::sampleWebKit):
* config.h:

../WTF:

* wtf/ThreadRestrictionVerifier.h:
(WTF):
* wtf/WTFThreadData.cpp:
(WTF::WTFThreadData::WTFThreadData):
(WTF::WTFThreadData::~WTFThreadData):
* wtf/WTFThreadData.h:
(WTFThreadData):
* wtf/text/StringImpl.cpp:
(WTF::StringImpl::~StringImpl):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@147795 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 6d6b71513f5fe900791b92d194c7640edb65b493..cc190894d9b5933c335deb40f82fd3f40736f3da 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2013-04-05  Geoffrey Garen  <ggaren@apple.com>
+
+        Made USE(JSC) unconditional
+        https://bugs.webkit.org/show_bug.cgi?id=114058
+
+        Reviewed by Anders Carlsson.
+
+        * config.h:
+
 2013-04-05  Filip Pizlo  <fpizlo@apple.com>
 
         Unreviewed, rolling out http://trac.webkit.org/changeset/147729

diff --git a/Source/JavaScriptCore/config.h b/Source/JavaScriptCore/config.h
index 7976ec42f13a77b372a99d0c123707d5dbfa415d..4e1d2b91cb028ec1fb97544e3fcf0f2305ae22ef 100644 (file)
--- a/Source/JavaScriptCore/config.h
+++ b/Source/JavaScriptCore/config.h
@@ -29,12 +29,8 @@
 
 #include <wtf/Platform.h>
 #include <wtf/ExportMacros.h>
-// WTF cannot depend on JSC even if USE(JSC).
-#if USE(JSC) && !defined(BUILDING_WTF)
+#if !defined(BUILDING_WTF)
 #include "JSExportMacros.h"
-#elif PLATFORM(CHROMIUM)
-// Chromium doesn't have runtime/ in its include paths.
-#include "runtime/JSExportMacros.h"
 #endif
 
 #if OS(WINDOWS)

diff --git a/Source/ThirdParty/ChangeLog b/Source/ThirdParty/ChangeLog
index 93d431ce6c2fd6396c0d57022e22437364bc256d..9cad3df8f1e8369a9e6d6808807f488d45280430 100644 (file)
--- a/Source/ThirdParty/ChangeLog
+++ b/Source/ThirdParty/ChangeLog
@@ -1,3 +1,12 @@
+2013-04-05  Geoffrey Garen  <ggaren@apple.com>
+
+        Made USE(JSC) unconditional
+        https://bugs.webkit.org/show_bug.cgi?id=114058
+
+        Reviewed by Anders Carlsson.
+
+        * gtest/include/gtest/internal/gtest-port.h:
+
 2013-03-29  Martin Robinson  <mrobinson@igalia.com>
 
         Update the version of gyp in the repository

diff --git a/Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h b/Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h
index fb3b376361fd1da543b55e8de3042f83c184991b..c4af9163fd8b024845945cbc4ccb509dbfde9e3d 100644 (file)
--- a/Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h
+++ b/Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h
@@ -179,9 +179,7 @@
 
 #include <wtf/Platform.h>
 #include <wtf/ExportMacros.h>
-#if USE(JSC)
 #include <runtime/JSExportMacros.h>
-#endif
 #include <wtf/Assertions.h>
 #include <wtf/FastMalloc.h>
 

diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
index 6408e2cde11f8fffe961b93eb6c0a447f27b0df7..81a56796a1321939939439b50af527b43a9ea330 100644 (file)
--- a/Source/WTF/ChangeLog
+++ b/Source/WTF/ChangeLog
@@ -1,3 +1,20 @@
+2013-04-05  Geoffrey Garen  <ggaren@apple.com>
+
+        Made USE(JSC) unconditional
+        https://bugs.webkit.org/show_bug.cgi?id=114058
+
+        Reviewed by Anders Carlsson.
+
+        * wtf/ThreadRestrictionVerifier.h:
+        (WTF):
+        * wtf/WTFThreadData.cpp:
+        (WTF::WTFThreadData::WTFThreadData):
+        (WTF::WTFThreadData::~WTFThreadData):
+        * wtf/WTFThreadData.h:
+        (WTFThreadData):
+        * wtf/text/StringImpl.cpp:
+        (WTF::StringImpl::~StringImpl):
+
 2013-04-05  Roger Fong  <roger_fong@apple.com>
 
         More VS2010 solution makefile fixes.

diff --git a/Source/WTF/wtf/ThreadRestrictionVerifier.h b/Source/WTF/wtf/ThreadRestrictionVerifier.h
index cff49d31842833ed707d2fb86085fc769441ba74..f7ada50947e4adfd34eb7e3b124b16e089e6e6f1 100644 (file)
--- a/Source/WTF/wtf/ThreadRestrictionVerifier.h
+++ b/Source/WTF/wtf/ThreadRestrictionVerifier.h
@@ -47,7 +47,12 @@ namespace WTF {
 // The default mode is to verify that the object will only be used on a single thread. The
 // thread gets captured when setShared(true) is called.
 // The mode may be changed by calling useMutexMode (or turnOffVerification).
-#if !USE(JSC) // This verifier is completely wrong for JavaScript implementations that use threads
+
+// FIXME: This verifier is switched off because it fires false positives for
+// objects that are used on multiple threads. Instead of an opt-out verifier,
+// we probably need an opt-in verifier that marks select objects as being
+// tied to select threads.
+#if 0
 class ThreadRestrictionVerifier {
 public:
     ThreadRestrictionVerifier()
@@ -169,7 +174,7 @@ private:
     dispatch_queue_t m_owningQueue;
 #endif
 };
-#else // !USE(JSC) => so the JSC case
+#else
 class ThreadRestrictionVerifier {
 public:
     ThreadRestrictionVerifier()

diff --git a/Source/WTF/wtf/WTFThreadData.cpp b/Source/WTF/wtf/WTFThreadData.cpp
index 70e7a84ababa2f025c49815c977acc7db658d1eb..ec3e5003868469056fbee2de591a4e7a8b25816e 100644 (file)
--- a/Source/WTF/wtf/WTFThreadData.cpp
+++ b/Source/WTF/wtf/WTFThreadData.cpp
@@ -35,14 +35,12 @@ WTFThreadData::WTFThreadData()
     : m_apiData(0)
     , m_atomicStringTable(0)
     , m_atomicStringTableDestructor(0)
-#if USE(JSC)
     , m_defaultIdentifierTable(new JSC::IdentifierTable())
     , m_currentIdentifierTable(m_defaultIdentifierTable)
     , m_stackBounds(StackBounds::currentThreadStackBounds())
 #if ENABLE(STACK_STATS)
     , m_stackStats()
 #endif
-#endif // USE(JSC)
 {
 }
 
@@ -50,14 +48,11 @@ WTFThreadData::~WTFThreadData()
 {
     if (m_atomicStringTableDestructor)
         m_atomicStringTableDestructor(m_atomicStringTable);
-#if USE(JSC)
     delete m_defaultIdentifierTable;
-#endif
 }
 
 } // namespace WTF
 
-#if USE(JSC)
 namespace JSC {
 
 IdentifierTable::~IdentifierTable()
@@ -75,5 +70,3 @@ HashSet<StringImpl*>::AddResult IdentifierTable::add(StringImpl* value)
 }
 
 } // namespace JSC
-#endif
-

diff --git a/Source/WTF/wtf/WTFThreadData.h b/Source/WTF/wtf/WTFThreadData.h
index eea788b72679904b189c401bf52989f699d597e0..86f40e04c9aa44e0cfbc2781b8da36e44d576d02 100644 (file)
--- a/Source/WTF/wtf/WTFThreadData.h
+++ b/Source/WTF/wtf/WTFThreadData.h
@@ -36,7 +36,6 @@
 #include <wtf/ThreadSpecific.h>
 #include <wtf/Threading.h>
 
-#if USE(JSC)
 // FIXME: This is a temporary layering violation while we move more string code to WTF.
 namespace JSC {
 
@@ -68,7 +67,6 @@ private:
 };
 
 }
-#endif
 
 namespace WTF {
 
@@ -87,7 +85,6 @@ public:
         return m_atomicStringTable;
     }
 
-#if USE(JSC)
     JSC::IdentifierTable* currentIdentifierTable()
     {
         return m_currentIdentifierTable;
@@ -121,7 +118,6 @@ public:
         return m_stackStats;
     }
 #endif
-#endif // USE(JSC)
 
     void* m_apiData;
 
@@ -129,14 +125,12 @@ private:
     AtomicStringTable* m_atomicStringTable;
     AtomicStringTableDestructor m_atomicStringTableDestructor;
 
-#if USE(JSC)
     JSC::IdentifierTable* m_defaultIdentifierTable;
     JSC::IdentifierTable* m_currentIdentifierTable;
     StackBounds m_stackBounds;
 #if ENABLE(STACK_STATS)
     StackStats::PerThreadStats m_stackStats;
 #endif
-#endif // USE(JSC)
 
     static WTF_EXPORTDATA ThreadSpecific<WTFThreadData>* staticData;
     friend WTFThreadData& wtfThreadData();

diff --git a/Source/WTF/wtf/text/StringImpl.cpp b/Source/WTF/wtf/text/StringImpl.cpp
index b59e62d9f83bb3e84ae9096733ac94c6c362e841..48c5cbacee04432f1d7234a0252010eec3005325 100644 (file)
--- a/Source/WTF/wtf/text/StringImpl.cpp
+++ b/Source/WTF/wtf/text/StringImpl.cpp
@@ -115,12 +115,10 @@ StringImpl::~StringImpl()
 
     if (isAtomic())
         AtomicString::remove(this);
-#if USE(JSC)
     if (isIdentifier()) {
         if (!wtfThreadData().currentIdentifierTable()->remove(this))
             CRASH();
     }
-#endif
 
     BufferOwnership ownership = bufferOwnership();
 

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 33cf7cda52a00acaa2353adcdea1068f0e3ff2de..ceaf73c5f43fefa39a8207297bc22a673e3554e5 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,73 @@
+2013-04-05  Geoffrey Garen  <ggaren@apple.com>
+
+        Made USE(JSC) unconditional
+        https://bugs.webkit.org/show_bug.cgi?id=114058
+
+        Reviewed by Anders Carlsson.
+
+        * Modules/webdatabase/Database.cpp:
+        * bindings/ScriptControllerBase.cpp:
+        (WebCore::ScriptController::executeIfJavaScriptURL):
+        * bindings/js/JavaScriptCallFrame.cpp:
+        * bindings/js/JavaScriptCallFrame.h:
+        * bindings/scripts/InFilesCompiler.pm:
+        (generateHeadersHeader):
+        * css/MediaQueryListListener.cpp:
+        (WebCore::MediaQueryListListener::queryChanged):
+        * dom/ContainerNode.cpp:
+        (WebCore::dispatchChildRemovalEvents):
+        * dom/EventListener.h:
+        (EventListener):
+        (WebCore::EventListener::visitJSFunction):
+        * dom/EventTarget.h:
+        (EventTarget):
+        (WebCore):
+        (WebCore::EventTarget::visitJSEventListeners):
+        * dom/Node.cpp:
+        * dom/Node.h:
+        * dom/ScriptExecutionContext.cpp:
+        (WebCore):
+        (WebCore::ScriptExecutionContext::globalData):
+        * dom/ScriptExecutionContext.h:
+        (ScriptExecutionContext):
+        * html/HTMLCanvasElement.cpp:
+        (WebCore::HTMLCanvasElement::createImageBuffer):
+        * html/HTMLImageLoader.cpp:
+        (WebCore::HTMLImageLoader::notifyFinished):
+        * inspector/InjectedScriptHost.h:
+        (InjectedScriptHost):
+        (WebCore::InjectedScriptHost::evaluateReturnsEvalFunction):
+        * inspector/InspectorInstrumentation.cpp:
+        (WebCore):
+        (WebCore::InspectorInstrumentation::didCommitLoadImpl):
+        * page/Frame.cpp:
+        * page/Settings.cpp:
+        (WebCore):
+        (WebCore::Settings::shouldRespectPriorityInCSSAttributeSetters):
+        * page/Settings.h:
+        (Settings):
+        * plugins/PluginView.cpp:
+        (WebCore::PluginView::start):
+        (WebCore::PluginView::stop):
+        (WebCore::PluginView::performRequest):
+        (WebCore::PluginView::npObject):
+        (WebCore):
+        (WebCore::PluginView::bindingInstance):
+        (WebCore::PluginView::privateBrowsingStateChanged):
+        * plugins/PluginView.h:
+        (PluginView):
+        * plugins/PluginViewBase.h:
+        (PluginViewBase):
+        (WebCore::PluginViewBase::scriptObject):
+        * plugins/PluginViewNone.cpp:
+        (WebCore):
+        (WebCore::PluginView::bindingInstance):
+        * plugins/qt/PluginViewQt.cpp:
+        (WebCore::PluginView::dispatchNPEvent):
+        (WebCore::PluginView::setNPWindowIfNeeded):
+        * xml/XMLHttpRequest.cpp:
+        (WebCore::XMLHttpRequest::dropProtection):
+
 2013-04-05  Roger Fong  <roger_fong@apple.com>
 
         More VS2010 solution makefile fixes.

diff --git a/Source/WebCore/Modules/webdatabase/Database.cpp b/Source/WebCore/Modules/webdatabase/Database.cpp
index 7cabcfd96c168a257815f1eaf70dc1b84836e891..e475bec4fdd08c9f56555c3dfbb787ce453ff636 100644 (file)
--- a/Source/WebCore/Modules/webdatabase/Database.cpp
+++ b/Source/WebCore/Modules/webdatabase/Database.cpp
@@ -41,6 +41,7 @@
 #include "DatabaseThread.h"
 #include "DatabaseTracker.h"
 #include "Document.h"
+#include "JSDOMWindow.h"
 #include "Logging.h"
 #include "NotImplemented.h"
 #include "Page.h"
@@ -59,10 +60,6 @@
 #include <wtf/StdLibExtras.h>
 #include <wtf/text/CString.h>
 
-#if USE(JSC)
-#include "JSDOMWindow.h"
-#endif
-
 namespace WebCore {
 
 PassRefPtr<Database> Database::create(ScriptExecutionContext*, PassRefPtr<DatabaseBackendBase> backend)

diff --git a/Source/WebCore/bindings/ScriptControllerBase.cpp b/Source/WebCore/bindings/ScriptControllerBase.cpp
index 05805d9d1a9c9201199a5d466fadc176a6208a8a..963dcbc803f55d9d9fc107cc36dc2fbd5f30bea9 100644 (file)
--- a/Source/WebCore/bindings/ScriptControllerBase.cpp
+++ b/Source/WebCore/bindings/ScriptControllerBase.cpp
@@ -99,15 +99,10 @@ bool ScriptController::executeIfJavaScriptURL(const KURL& url, ShouldReplaceDocu
         return true;
 
     String scriptResult;
-#if USE(JSC)
     JSDOMWindowShell* shell = windowShell(mainThreadNormalWorld());
     JSC::ExecState* exec = shell->window()->globalExec();
     if (!result.getString(exec, scriptResult))
         return true;
-#else
-    if (!result.getString(scriptResult))
-        return true;
-#endif
 
     // FIXME: We should always replace the document, but doing so
     //        synchronously can cause crashes:

diff --git a/Source/WebCore/bindings/js/JavaScriptCallFrame.cpp b/Source/WebCore/bindings/js/JavaScriptCallFrame.cpp
index 00f0990884f375710da7a02ccd9d1c0dbbb35b60..3604d0bf7b01818f69b75cf67fc459c7ce4c7f00 100644 (file)
--- a/Source/WebCore/bindings/js/JavaScriptCallFrame.cpp
+++ b/Source/WebCore/bindings/js/JavaScriptCallFrame.cpp
@@ -25,7 +25,7 @@
 
 #include "config.h"
 
-#if ENABLE(JAVASCRIPT_DEBUGGER) && USE(JSC)
+#if ENABLE(JAVASCRIPT_DEBUGGER)
 
 #include "JavaScriptCallFrame.h"
 

diff --git a/Source/WebCore/bindings/js/JavaScriptCallFrame.h b/Source/WebCore/bindings/js/JavaScriptCallFrame.h
index 1bbc45d7ab6986b8974382eee29917674e61c679..ab8f8f308b0aeb161468b443a82f471391917cf1 100644 (file)
--- a/Source/WebCore/bindings/js/JavaScriptCallFrame.h
+++ b/Source/WebCore/bindings/js/JavaScriptCallFrame.h
@@ -26,7 +26,7 @@
 #ifndef JavaScriptCallFrame_h
 #define JavaScriptCallFrame_h
 
-#if ENABLE(JAVASCRIPT_DEBUGGER) && USE(JSC)
+#if ENABLE(JAVASCRIPT_DEBUGGER)
 
 #include <debugger/DebuggerCallFrame.h>
 #include <interpreter/CallFrame.h>

diff --git a/Source/WebCore/bindings/scripts/InFilesCompiler.pm b/Source/WebCore/bindings/scripts/InFilesCompiler.pm
index 3dcd7729efe9f90064c6e76a3eda607364eedec3..297568c97f9ceb831949dc0cee475f02aa2fbf74 100644 (file)
--- a/Source/WebCore/bindings/scripts/InFilesCompiler.pm
+++ b/Source/WebCore/bindings/scripts/InFilesCompiler.pm
@@ -279,11 +279,7 @@ sub generateHeadersHeader()
 
         print F "#if " . $object->conditionalStringFromAttributeValue($conditional) . "\n" if $conditional;
         print F "#include \"$interfaceName.h\"\n";
-        print F "#if USE(JSC)\n";
         print F "#include \"JS$interfaceName.h\"\n";
-        print F "#elif USE(V8)\n";
-        print F "#include \"V8$interfaceName.h\"\n";
-        print F "#endif\n";
         print F "#endif\n" if $conditional;
     }
 

diff --git a/Source/WebCore/css/MediaQueryListListener.cpp b/Source/WebCore/css/MediaQueryListListener.cpp
index 03c41575ac64d49ab0db6082c6924c732647c086..f771a09fcd9ae335362940b7c15643ad91360e4d 100644 (file)
--- a/Source/WebCore/css/MediaQueryListListener.cpp
+++ b/Source/WebCore/css/MediaQueryListListener.cpp
@@ -23,27 +23,14 @@
 #include "MediaQueryList.h"
 #include "ScriptFunctionCall.h"
 
-#if USE(JSC)
 #include "JSMediaQueryList.h"
-#else
-#include "V8MediaQueryList.h"
-#endif
 
 namespace WebCore {
 
 void MediaQueryListListener::queryChanged(ScriptState* state, MediaQueryList* query)
 {
     ScriptCallback callback(state, m_value);
-#if USE(JSC)
     callback.appendArgument(toJS(state, deprecatedGlobalObjectForPrototype(state), query));
-#else
-    v8::HandleScope handleScope;
-    v8::Handle<v8::Context> context = state->context();
-    if (context.IsEmpty())
-       return; // JS may not be enabled.
-    v8::Context::Scope scope(context);
-    callback.appendArgument(toV8(query, v8::Handle<v8::Object>(), context->GetIsolate()));
-#endif
     callback.call();
 }
 

diff --git a/Source/WebCore/dom/ContainerNode.cpp b/Source/WebCore/dom/ContainerNode.cpp
index cbf593ea34caf33f49e2d51740959daf2391a27d..8a25837b4d7b4f748ae6a96c1fa18591d3ca2652 100644 (file)
--- a/Source/WebCore/dom/ContainerNode.cpp
+++ b/Source/WebCore/dom/ContainerNode.cpp
@@ -56,9 +56,7 @@
 #include <wtf/CurrentTime.h>
 #include <wtf/Vector.h>
 
-#if USE(JSC)
 #include "JSNode.h"
-#endif
 
 using namespace std;
 
@@ -1124,9 +1122,7 @@ static void dispatchChildRemovalEvents(Node* child)
 
     ASSERT(!NoEventDispatchAssertion::isEventDispatchForbidden());
 
-#if USE(JSC)
     willCreatePossiblyOrphanedTreeByRemoval(child);
-#endif
     InspectorInstrumentation::willRemoveDOMNode(child->document(), child);
 
     RefPtr<Node> c = child;

diff --git a/Source/WebCore/dom/EventListener.h b/Source/WebCore/dom/EventListener.h
index d1a6e8f249de121f2733d7f3a81367a0501f92c1..30bf9b96e6392717867a3d9d67db0836947d231c 100644 (file)
--- a/Source/WebCore/dom/EventListener.h
+++ b/Source/WebCore/dom/EventListener.h
@@ -51,9 +51,7 @@ namespace WebCore {
         virtual void handleEvent(ScriptExecutionContext*, Event*) = 0;
         virtual bool wasCreatedFromMarkup() const { return false; }
 
-#if USE(JSC)
         virtual void visitJSFunction(JSC::SlotVisitor&) { }
-#endif
 
         bool isAttribute() const { return virtualisAttribute(); }
         Type type() const { return m_type; }

diff --git a/Source/WebCore/dom/EventTarget.h b/Source/WebCore/dom/EventTarget.h
index 7a2e100a055053b0d55b4d1c976a50ce82158919..82777a86eefdfbebe689c9b92336882958391c3e 100644 (file)
--- a/Source/WebCore/dom/EventTarget.h
+++ b/Source/WebCore/dom/EventTarget.h
@@ -129,10 +129,8 @@ namespace WebCore {
         bool fireEventListeners(Event*);
         bool isFiringEventListeners();
 
-#if USE(JSC)
         void visitJSEventListeners(JSC::SlotVisitor&);
         void invalidateJSEventListeners(JSC::JSObject*);
-#endif
 
     protected:
         virtual ~EventTarget();
@@ -175,14 +173,12 @@ namespace WebCore {
         EventListener* on##attribute() { return recipient ? recipient->getAttributeEventListener(eventNames().attribute##Event) : 0; } \
         void setOn##attribute(PassRefPtr<EventListener> listener) { if (recipient) recipient->setAttributeEventListener(eventNames().attribute##Event, listener); } \
 
-#if USE(JSC)
     inline void EventTarget::visitJSEventListeners(JSC::SlotVisitor& visitor)
     {
         EventListenerIterator iterator(this);
         while (EventListener* listener = iterator.nextListener())
             listener->visitJSFunction(visitor);
     }
-#endif
 
     inline bool EventTarget::isFiringEventListeners()
     {

diff --git a/Source/WebCore/dom/Node.cpp b/Source/WebCore/dom/Node.cpp
index d2c0b50dcc60b3ee88d606ce4905902395e04b82..d27a3743bbf763cb4f033d28e9d8132f95e9417b 100644 (file)
--- a/Source/WebCore/dom/Node.cpp
+++ b/Source/WebCore/dom/Node.cpp
@@ -132,10 +132,8 @@
 #include "InspectorController.h"
 #endif
 
-#if USE(JSC)
 #include <runtime/JSGlobalData.h>
 #include <runtime/Operations.h>
-#endif
 
 #if ENABLE(MICRODATA)
 #include "HTMLPropertiesCollection.h"

diff --git a/Source/WebCore/dom/Node.h b/Source/WebCore/dom/Node.h
index eae9149dcb998bc64f0d25c8b7af59657618a7bf..538a7fb04db7ffd841854cf0d704dbb73b18cb43 100644 (file)
--- a/Source/WebCore/dom/Node.h
+++ b/Source/WebCore/dom/Node.h
@@ -40,12 +40,10 @@
 #include <wtf/ListHashSet.h>
 #include <wtf/text/AtomicString.h>
 
-#if USE(JSC)
 namespace JSC {
     class JSGlobalData;
     class SlotVisitor;
 }
-#endif
 
 // This needs to be here because Document.h also depends on it.
 #define DUMP_NODE_STATISTICS 0

diff --git a/Source/WebCore/dom/ScriptExecutionContext.cpp b/Source/WebCore/dom/ScriptExecutionContext.cpp
index f4757f36e92d70472b3a87220cc957ca0cee3be8..7facd959b56e2fb54c49d460c57e078d2cca547c 100644 (file)
--- a/Source/WebCore/dom/ScriptExecutionContext.cpp
+++ b/Source/WebCore/dom/ScriptExecutionContext.cpp
@@ -47,10 +47,8 @@
 #include <wtf/PassRefPtr.h>
 #include <wtf/Vector.h>
 
-#if USE(JSC)
 // FIXME: This is a layering violation.
 #include "JSDOMWindow.h"
-#endif
 
 #if ENABLE(SQL_DATABASE)
 #include "DatabaseContext.h"
@@ -411,7 +409,6 @@ ScriptExecutionContext::Task::~Task()
 {
 }
 
-#if USE(JSC)
 JSC::JSGlobalData* ScriptExecutionContext::globalData()
 {
      if (isDocument())
@@ -425,7 +422,6 @@ JSC::JSGlobalData* ScriptExecutionContext::globalData()
     ASSERT_NOT_REACHED();
     return 0;
 }
-#endif
 
 #if ENABLE(SQL_DATABASE)
 void ScriptExecutionContext::setDatabaseContext(DatabaseContext* databaseContext)

diff --git a/Source/WebCore/dom/ScriptExecutionContext.h b/Source/WebCore/dom/ScriptExecutionContext.h
index 9f19a3e87e4e0f73567a93345aa91b606cb12bf4..0d962bccc19737cc8221a7e09942590771f67aef 100644 (file)
--- a/Source/WebCore/dom/ScriptExecutionContext.h
+++ b/Source/WebCore/dom/ScriptExecutionContext.h
@@ -35,6 +35,7 @@
 #include "ScriptState.h"
 #include "SecurityContext.h"
 #include "Supplementable.h"
+#include <runtime/JSGlobalData.h>
 #include <wtf/Forward.h>
 #include <wtf/HashSet.h>
 #include <wtf/Noncopyable.h>
@@ -43,10 +44,6 @@
 #include <wtf/Threading.h>
 #include <wtf/text/StringHash.h>
 
-#if USE(JSC)
-#include <runtime/JSGlobalData.h>
-#endif
-
 namespace WebCore {
 
 class CachedScript;
@@ -147,9 +144,7 @@ public:
     void removeTimeout(int timeoutId) { m_timeouts.remove(timeoutId); }
     DOMTimer* findTimeout(int timeoutId) { return m_timeouts.get(timeoutId); }
 
-#if USE(JSC)
     JSC::JSGlobalData* globalData();
-#endif
 
     // Interval is in seconds.
     void adjustMinimumTimerInterval(double oldMinimumTimerInterval);

diff --git a/Source/WebCore/html/HTMLCanvasElement.cpp b/Source/WebCore/html/HTMLCanvasElement.cpp
index 753dc8a05628df7b0ea27761fcff25de6da53bf8..fab875e8b92e5f8f8abfd4a71965651ef092a7e3 100644 (file)
--- a/Source/WebCore/html/HTMLCanvasElement.cpp
+++ b/Source/WebCore/html/HTMLCanvasElement.cpp
@@ -50,10 +50,8 @@
 #include <math.h>
 #include <stdio.h>
 
-#if USE(JSC)
 #include <runtime/JSLock.h>
 #include <runtime/Operations.h>
-#endif
 
 #if ENABLE(WEBGL)    
 #include "WebGLContextAttributes.h"
@@ -565,11 +563,9 @@ void HTMLCanvasElement::createImageBuffer() const
     m_imageBuffer->context()->setStrokeThickness(1);
     m_contextStateSaver = adoptPtr(new GraphicsContextStateSaver(*m_imageBuffer->context()));
 
-#if USE(JSC)
     JSC::JSLockHolder lock(scriptExecutionContext()->globalData());
     size_t numBytes = 4 * m_imageBuffer->internalSize().width() * m_imageBuffer->internalSize().height();
     scriptExecutionContext()->globalData()->heap.reportExtraMemoryCost(numBytes);
-#endif
 
 #if USE(IOSURFACE_CANVAS_BACKING_STORE) || (ENABLE(ACCELERATED_2D_CANVAS) && USE(ACCELERATED_COMPOSITING))
     if (m_context && m_context->is2d())

diff --git a/Source/WebCore/html/HTMLImageLoader.cpp b/Source/WebCore/html/HTMLImageLoader.cpp
index a3a34a1f1c265973a99ce76009142ff0c08c64d0..623cebc1f436ceec2b2e2255271633ebe12bd2d1 100644 (file)
--- a/Source/WebCore/html/HTMLImageLoader.cpp
+++ b/Source/WebCore/html/HTMLImageLoader.cpp
@@ -31,11 +31,9 @@
 #include "HTMLParserIdioms.h"
 #include "Settings.h"
 
-#if USE(JSC)
 #include "JSDOMWindowBase.h"
 #include <runtime/JSLock.h>
 #include <runtime/Operations.h>
-#endif
 
 namespace WebCore {
 
@@ -79,7 +77,6 @@ void HTMLImageLoader::notifyFinished(CachedResource*)
     ImageLoader::notifyFinished(cachedImage);
 
     bool loadError = cachedImage->errorOccurred() || cachedImage->response().httpStatusCode() >= 400;
-#if USE(JSC)
     if (!loadError) {
         if (!element->inDocument()) {
             JSC::JSGlobalData* globalData = JSDOMWindowBase::commonJSGlobalData();
@@ -87,7 +84,6 @@ void HTMLImageLoader::notifyFinished(CachedResource*)
             globalData->heap.reportExtraMemoryCost(cachedImage->encodedSize());
         }
     }
-#endif
 
     if (loadError && element->hasTagName(HTMLNames::objectTag))
         static_cast<HTMLObjectElement*>(element.get())->renderFallbackContent();

diff --git a/Source/WebCore/inspector/InjectedScriptHost.h b/Source/WebCore/inspector/InjectedScriptHost.h
index 9372c2f5dacb5bafbc5c08d7ed5910c81f9aabf9..29bf8dd92ef2b88c9aa1e2399e3f7a9289b22664 100644 (file)
--- a/Source/WebCore/inspector/InjectedScriptHost.h
+++ b/Source/WebCore/inspector/InjectedScriptHost.h
@@ -105,11 +105,7 @@ public:
     void getEventListenersImpl(Node*, Vector<EventListenerInfo>& listenersArray);
 
     // FIXME: Remove evaluateReturnsEvalFunction once InjectedScriptHost returns eval in evaluate on V8. https://webkit.org/b/113134
-#if USE(JSC)
     bool evaluateReturnsEvalFunction() { return true; }
-#else
-    bool evaluateReturnsEvalFunction() { return false; }
-#endif
 
     void clearConsoleMessages();
     void copyText(const String& text);

diff --git a/Source/WebCore/inspector/InspectorInstrumentation.cpp b/Source/WebCore/inspector/InspectorInstrumentation.cpp
index 308e6f292c90cc60f05899e2bf42d4de2a1800cb..0574958dbc04eed52f6d793db45dc0730f5f950a 100644 (file)
--- a/Source/WebCore/inspector/InspectorInstrumentation.cpp
+++ b/Source/WebCore/inspector/InspectorInstrumentation.cpp
@@ -908,7 +908,7 @@ void InspectorInstrumentation::didCommitLoadImpl(InstrumentingAgents* instrument
 
         if (InspectorResourceAgent* resourceAgent = instrumentingAgents->inspectorResourceAgent())
             resourceAgent->mainFrameNavigated(loader);
-#if ENABLE(JAVASCRIPT_DEBUGGER) && USE(JSC)
+#if ENABLE(JAVASCRIPT_DEBUGGER)
         if (InspectorProfilerAgent* profilerAgent = instrumentingAgents->inspectorProfilerAgent())
             profilerAgent->resetState();
         if (InspectorHeapProfilerAgent* heapProfilerAgent = instrumentingAgents->inspectorHeapProfilerAgent())

diff --git a/Source/WebCore/page/Frame.cpp b/Source/WebCore/page/Frame.cpp
index c1e24202fb6ae77178df5e1b1c3289decafe59ed..501f1e6b62c5b30df42ffdeca7a4e94b9d6dddd6 100644 (file)
--- a/Source/WebCore/page/Frame.cpp
+++ b/Source/WebCore/page/Frame.cpp
@@ -35,10 +35,10 @@
 #include "CSSComputedStyleDeclaration.h"
 #include "CSSPropertyNames.h"
 #include "CachedCSSStyleSheet.h"
+#include "CachedResourceLoader.h"
 #include "Chrome.h"
 #include "ChromeClient.h"
 #include "DOMWindow.h"
-#include "CachedResourceLoader.h"
 #include "DocumentType.h"
 #include "EditorClient.h"
 #include "Event.h"
@@ -60,7 +60,9 @@
 #include "HitTestResult.h"
 #include "ImageBuffer.h"
 #include "InspectorInstrumentation.h"
+#include "JSDOMWindowShell.h"
 #include "Logging.h"
+#include "MathMLNames.h"
 #include "MediaFeatureNames.h"
 #include "Navigator.h"
 #include "NodeList.h"
@@ -75,6 +77,7 @@
 #include "RenderTheme.h"
 #include "RenderView.h"
 #include "RuntimeEnabledFeatures.h"
+#include "SVGNames.h"
 #include "ScriptController.h"
 #include "ScriptSourceCode.h"
 #include "ScriptValue.h"
@@ -87,11 +90,13 @@
 #include "UserTypingGestureIndicator.h"
 #include "VisibleUnits.h"
 #include "WebKitFontFamilyNames.h"
+#include "XLinkNames.h"
 #include "XMLNSNames.h"
 #include "XMLNames.h"
 #include "htmlediting.h"
 #include "markup.h"
 #include "npruntime_impl.h"
+#include "runtime_root.h"
 #include <wtf/PassOwnPtr.h>
 #include <wtf/RefCountedLeakCounter.h>
 #include <wtf/StdLibExtras.h>
@@ -100,15 +105,6 @@
 #include "RenderLayerCompositor.h"
 #endif
 
-#if USE(JSC)
-#include "JSDOMWindowShell.h"
-#include "runtime_root.h"
-#endif
-
-#include "MathMLNames.h"
-#include "SVGNames.h"
-#include "XLinkNames.h"
-
 #if ENABLE(SVG)
 #include "SVGDocument.h"
 #include "SVGDocumentExtensions.h"

diff --git a/Source/WebCore/page/Settings.cpp b/Source/WebCore/page/Settings.cpp
index 331a2792b4869ede7747bcbc9b23ac74f9286e7a..1876eb3491cba393ab746aa5cbb95229bcc38d5c 100644 (file)
--- a/Source/WebCore/page/Settings.cpp
+++ b/Source/WebCore/page/Settings.cpp
@@ -107,9 +107,7 @@ bool Settings::gUsesOverlayScrollbars = false;
 bool Settings::gShouldUseHighResolutionTimers = true;
 #endif
     
-#if USE(JSC)
 bool Settings::gShouldRespectPriorityInCSSAttributeSetters = false;
-#endif
 
 // NOTEs
 //  1) EditingMacBehavior comprises Tiger, Leopard, SnowLeopard and iOS builds, as well as QtWebKit when built on Mac;
@@ -595,7 +593,6 @@ bool Settings::usesOverlayScrollbars()
     return gUsesOverlayScrollbars;
 }
 
-#if USE(JSC)
 void Settings::setShouldRespectPriorityInCSSAttributeSetters(bool flag)
 {
     gShouldRespectPriorityInCSSAttributeSetters = flag;
@@ -605,7 +602,6 @@ bool Settings::shouldRespectPriorityInCSSAttributeSetters()
 {
     return gShouldRespectPriorityInCSSAttributeSetters;
 }
-#endif
 
 #if ENABLE(HIDDEN_PAGE_DOM_TIMER_THROTTLING)
 void Settings::setHiddenPageDOMTimerThrottlingEnabled(bool flag)

diff --git a/Source/WebCore/page/Settings.h b/Source/WebCore/page/Settings.h
index 2adaead33a673109491c1faa66dd97919a6506d2..5c590aa0075cf70fd62850038b029f0ef87e191a 100644 (file)
--- a/Source/WebCore/page/Settings.h
+++ b/Source/WebCore/page/Settings.h
@@ -259,10 +259,8 @@ namespace WebCore {
         void setAggressiveTileRetentionEnabled(bool);
         bool aggressiveTileRetentionEnabled() { return m_aggressiveTileRetentionEnabled; }
 
-#if USE(JSC)
         static void setShouldRespectPriorityInCSSAttributeSetters(bool);
         static bool shouldRespectPriorityInCSSAttributeSetters();
-#endif
 
         void setTimeWithoutMouseMovementBeforeHidingControls(double time) { m_timeWithoutMouseMovementBeforeHidingControls = time; }
         double timeWithoutMouseMovementBeforeHidingControls() const { return m_timeWithoutMouseMovementBeforeHidingControls; }
@@ -357,9 +355,7 @@ namespace WebCore {
 #if PLATFORM(WIN) || (OS(WINDOWS) && PLATFORM(WX))
         static bool gShouldUseHighResolutionTimers;
 #endif
-#if USE(JSC)
         static bool gShouldRespectPriorityInCSSAttributeSetters;
-#endif
 
         static double gHiddenPageDOMTimerAlignmentInterval;
     };

diff --git a/Source/WebCore/plugins/PluginView.cpp b/Source/WebCore/plugins/PluginView.cpp
index c1587ea03ba8e9ec061ab90aca48f5a6c855fe49..864b3f38e5fd1a1056a5570bc2ef91ac0cab677a 100644 (file)
--- a/Source/WebCore/plugins/PluginView.cpp
+++ b/Source/WebCore/plugins/PluginView.cpp
@@ -28,9 +28,7 @@
 #include "config.h"
 #include "PluginView.h"
 
-#if USE(JSC)
 #include "BridgeJSC.h"
-#endif
 #include "Chrome.h"
 #include "CookieJar.h"
 #include "Document.h"
@@ -47,6 +45,8 @@
 #include "HTMLNames.h"
 #include "HTMLPlugInElement.h"
 #include "Image.h"
+#include "JSDOMBinding.h"
+#include "JSDOMWindow.h"
 #include "KeyboardEvent.h"
 #include "MIMETypeRegistry.h"
 #include "MouseEvent.h"
@@ -64,7 +64,11 @@
 #include "SecurityOrigin.h"
 #include "Settings.h"
 #include "WheelEvent.h"
+#include "c_instance.h"
 #include "npruntime_impl.h"
+#include "runtime_root.h"
+#include <runtime/JSCJSValue.h>
+#include <runtime/JSLock.h>
 #include <wtf/ASCIICType.h>
 #include <wtf/text/WTFString.h>
 
@@ -72,19 +76,10 @@
 #include "PluginMessageThrottlerWin.h"
 #endif
 
-#if USE(JSC)
-#include "JSDOMBinding.h"
-#include "JSDOMWindow.h"
-#include "c_instance.h"
-#include "runtime_root.h"
-#include <runtime/JSCJSValue.h>
-#include <runtime/JSLock.h>
-
 using JSC::ExecState;
 using JSC::JSLock;
 using JSC::JSObject;
 using JSC::JSValue;
-#endif
 
 #if ENABLE(NETSCAPE_PLUGIN_API)
 
@@ -250,9 +245,7 @@ bool PluginView::start()
     NPError npErr;
     {
         PluginView::setCurrentPluginView(this);
-#if USE(JSC)
         JSC::JSLock::DropAllLocks dropAllLocks(JSDOMWindowBase::commonJSGlobalData());
-#endif
         setCallingPlugin(true);
         npErr = m_plugin->pluginFuncs()->newp((NPMIMEType)m_mimeType.utf8().data(), m_instance, m_mode, m_paramCount, m_paramNames, m_paramValues, NULL);
         setCallingPlugin(false);
@@ -340,9 +333,7 @@ void PluginView::stop()
 
     m_isStarted = false;
 
-#if USE(JSC)
     JSC::JSLock::DropAllLocks dropAllLocks(JSDOMWindowBase::commonJSGlobalData());
-#endif
 
 #if ENABLE(NETSCAPE_PLUGIN_API)
 #if defined(XP_WIN) && !PLATFORM(GTK)
@@ -459,9 +450,7 @@ void PluginView::performRequest(PluginRequest* request)
             // FIXME: <rdar://problem/4807469> This should be sent when the document has finished loading
             if (request->sendNotification()) {
                 PluginView::setCurrentPluginView(this);
-#if USE(JSC)
                 JSC::JSLock::DropAllLocks dropAllLocks(JSDOMWindowBase::commonJSGlobalData());
-#endif
                 setCallingPlugin(true);
                 m_plugin->pluginFuncs()->urlnotify(m_instance, requestURL.string().utf8().data(), NPRES_DONE, request->notifyData());
                 setCallingPlugin(false);
@@ -482,11 +471,7 @@ void PluginView::performRequest(PluginRequest* request)
     if (targetFrameName.isNull()) {
         String resultString;
 
-#if USE(JSC)
         ScriptState* scriptState = m_parentFrame->script()->globalObject(pluginWorld())->globalExec();
-#elif USE(V8)
-        ScriptState* scriptState = 0; // Not used with V8
-#endif
         CString cstr;
         if (result.getString(scriptState, resultString))
             cstr = resultString.utf8();
@@ -749,9 +734,7 @@ NPObject* PluginView::npObject()
     NPError npErr;
     {
         PluginView::setCurrentPluginView(this);
-#if USE(JSC)
         JSC::JSLock::DropAllLocks dropAllLocks(JSDOMWindowBase::commonJSGlobalData());
-#endif
         setCallingPlugin(true);
         npErr = m_plugin->pluginFuncs()->getvalue(m_instance, NPPVpluginScriptableNPObject, &object);
         setCallingPlugin(false);
@@ -765,7 +748,6 @@ NPObject* PluginView::npObject()
 }
 #endif
 
-#if USE(JSC)
 PassRefPtr<JSC::Bindings::Instance> PluginView::bindingInstance()
 {
 #if ENABLE(NETSCAPE_PLUGIN_API)
@@ -790,7 +772,6 @@ PassRefPtr<JSC::Bindings::Instance> PluginView::bindingInstance()
     return 0;
 #endif
 }
-#endif
 
 void PluginView::disconnectStream(PluginStream* stream)
 {
@@ -1525,9 +1506,7 @@ void PluginView::privateBrowsingStateChanged(bool privateBrowsingEnabled)
         return;
 
     PluginView::setCurrentPluginView(this);
-#if USE(JSC)
     JSC::JSLock::DropAllLocks dropAllLocks(JSDOMWindowBase::commonJSGlobalData());
-#endif
     setCallingPlugin(true);
     NPBool value = privateBrowsingEnabled;
     setValue(m_instance, NPNVprivateModeBool, &value);

diff --git a/Source/WebCore/plugins/PluginView.h b/Source/WebCore/plugins/PluginView.h
index 7e76040c308eecd3b4bf1c8345015909ddf2a681..04944a80b1e13bf32f2706a84e4481754f57b2ef 100644 (file)
--- a/Source/WebCore/plugins/PluginView.h
+++ b/Source/WebCore/plugins/PluginView.h
@@ -75,13 +75,11 @@ QT_END_NAMESPACE
 typedef struct _GtkSocket GtkSocket;
 #endif
 
-#if USE(JSC)
 namespace JSC {
     namespace Bindings {
         class Instance;
     }
 }
-#endif
 
 namespace WebCore {
     class Frame;
@@ -156,9 +154,7 @@ namespace WebCore {
 #if ENABLE(NETSCAPE_PLUGIN_API)
         NPObject* npObject();
 #endif
-#if USE(JSC)
         PassRefPtr<JSC::Bindings::Instance> bindingInstance();
-#endif
 
         PluginStatus status() const { return m_status; }
 

diff --git a/Source/WebCore/plugins/PluginViewBase.h b/Source/WebCore/plugins/PluginViewBase.h
index 311c9cc589fbbba501243e75eeed5598fa6507a8..b60fa925e1c04db0a1c24f4099fdd4f533caf527 100644 (file)
--- a/Source/WebCore/plugins/PluginViewBase.h
+++ b/Source/WebCore/plugins/PluginViewBase.h
@@ -30,16 +30,11 @@
 #include "Widget.h"
 #include <wtf/text/WTFString.h>
 
-#if USE(V8)
-struct NPObject;
-#endif
-#if USE(JSC)
 namespace JSC {
     class ExecState;
     class JSGlobalObject;
     class JSObject;
 }
-#endif
 
 namespace WebCore {
 
@@ -53,12 +48,7 @@ public:
     virtual PlatformLayer* platformLayer() const { return 0; }
 #endif
 
-#if USE(V8)
-    virtual NPObject* scriptableObject() { return 0; }
-#endif
-#if USE(JSC)
     virtual JSC::JSObject* scriptObject(JSC::JSGlobalObject*) { return 0; }
-#endif
     virtual void storageBlockingStateChanged() { }
     virtual void privateBrowsingStateChanged(bool) { }
     virtual bool getFormValue(String&) { return false; }

diff --git a/Source/WebCore/plugins/PluginViewNone.cpp b/Source/WebCore/plugins/PluginViewNone.cpp
index 93cc6cfb5ca1d362d79047958bff1ddb991adf1e..ed8f89035c43103e7b6bc8b09c13d067a3d4928f 100644 (file)
--- a/Source/WebCore/plugins/PluginViewNone.cpp
+++ b/Source/WebCore/plugins/PluginViewNone.cpp
@@ -26,10 +26,8 @@
 #include "config.h"
 #include "PluginView.h"
 
-#if USE(JSC)
 #include "BridgeJSC.h"
 #include <runtime/JSObject.h>
-#endif
 
 using namespace WTF;
 
@@ -141,12 +139,10 @@ void PluginView::keepAlive(NPP)
 }
 #endif
 
-#if USE(JSC)
 PassRefPtr<JSC::Bindings::Instance> PluginView::bindingInstance()
 {
     return 0;
 }
-#endif
 
 void PluginView::privateBrowsingStateChanged(bool)
 {

diff --git a/Source/WebCore/plugins/qt/PluginViewQt.cpp b/Source/WebCore/plugins/qt/PluginViewQt.cpp
index e419008c04a034c1a07f23136128fa763c47a4e1..e64c914d27918088e19d3aa1f70f93fc3655cd71 100644 (file)
--- a/Source/WebCore/plugins/qt/PluginViewQt.cpp
+++ b/Source/WebCore/plugins/qt/PluginViewQt.cpp
@@ -28,9 +28,7 @@
 #include "config.h"
 #include "PluginView.h"
 
-#if USE(JSC)
 #include "BridgeJSC.h"
-#endif
 #include "Chrome.h"
 #include "ChromeClient.h"
 #include "Document.h"
@@ -49,9 +47,7 @@
 #include "HostWindow.h"
 #include "IFrameShimSupport.h"
 #include "Image.h"
-#if USE(JSC)
 #include "JSDOMBinding.h"
-#endif
 #include "KeyboardEvent.h"
 #include "MouseEvent.h"
 #include "NotImplemented.h"
@@ -65,9 +61,7 @@
 #include "RenderObject.h"
 #include "Settings.h"
 #include "npruntime_impl.h"
-#if USE(JSC)
 #include "runtime_root.h"
-#endif
 #include <QKeyEvent>
 #include <QPainter>
 #include <X11/X.h>
@@ -85,9 +79,7 @@
 #include <qpa/qplatformnativeinterface.h>
 
 using JSC::ExecState;
-#if USE(JSC)
 using JSC::Interpreter;
-#endif
 using JSC::JSLock;
 using JSC::JSObject;
 
@@ -281,9 +273,7 @@ bool PluginView::dispatchNPEvent(NPEvent& event)
     }
 
     PluginView::setCurrentPluginView(this);
-#if USE(JSC)
     JSC::JSLock::DropAllLocks dropAllLocks(JSDOMWindowBase::commonJSGlobalData());
-#endif
     setCallingPlugin(true);
     bool accepted = !m_plugin->pluginFuncs()->event(m_instance, &event);
     setCallingPlugin(false);
@@ -566,9 +556,7 @@ void PluginView::setNPWindowIfNeeded()
     }
 
     PluginView::setCurrentPluginView(this);
-#if USE(JSC)
     JSC::JSLock::DropAllLocks dropAllLocks(JSDOMWindowBase::commonJSGlobalData());
-#endif
     setCallingPlugin(true);
     m_plugin->pluginFuncs()->setwindow(m_instance, &m_npWindow);
     setCallingPlugin(false);

diff --git a/Source/WebCore/xml/XMLHttpRequest.cpp b/Source/WebCore/xml/XMLHttpRequest.cpp
index 1f0fe2964b141b8a43d2b7435edd88d0d96a2fb3..779544f6299280dac28db87c283e995a516d9966 100644 (file)
--- a/Source/WebCore/xml/XMLHttpRequest.cpp
+++ b/Source/WebCore/xml/XMLHttpRequest.cpp
@@ -40,6 +40,8 @@
 #include "HTTPParsers.h"
 #include "HistogramSupport.h"
 #include "InspectorInstrumentation.h"
+#include "JSDOMBinding.h"
+#include "JSDOMWindow.h"
 #include "MemoryCache.h"
 #include "ParsedContentType.h"
 #include "ResourceError.h"
@@ -56,6 +58,9 @@
 #include "XMLHttpRequestProgressEvent.h"
 #include "XMLHttpRequestUpload.h"
 #include "markup.h"
+#include <heap/Strong.h>
+#include <runtime/JSLock.h>
+#include <runtime/Operations.h>
 #include <wtf/ArrayBuffer.h>
 #include <wtf/ArrayBufferView.h>
 #include <wtf/RefCountedLeakCounter.h>
@@ -67,14 +72,6 @@
 #include "CachedResourceRequestInitiators.h"
 #endif
 
-#if USE(JSC)
-#include "JSDOMBinding.h"
-#include "JSDOMWindow.h"
-#include <heap/Strong.h>
-#include <runtime/JSLock.h>
-#include <runtime/Operations.h>
-#endif
-
 namespace WebCore {
 
 DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, xmlHttpRequestCounter, ("XMLHttpRequest"));
@@ -936,7 +933,6 @@ void XMLHttpRequest::abortError()
 
 void XMLHttpRequest::dropProtection()
 {
-#if USE(JSC)
     // The XHR object itself holds on to the responseText, and
     // thus has extra cost even independent of any
     // responseText or responseXML objects it has handed
@@ -946,7 +942,6 @@ void XMLHttpRequest::dropProtection()
     JSC::JSGlobalData* globalData = scriptExecutionContext()->globalData();
     JSC::JSLockHolder lock(globalData);
     globalData->heap.reportExtraMemoryCost(m_responseBuilder.length() * 2);
-#endif
 
     unsetPendingActivity(this);
 }

diff --git a/Source/WebKit/efl/ChangeLog b/Source/WebKit/efl/ChangeLog
index 4686672c03de36697b24cee0958342db3819df7a..6bd1fc495d2f5d84f9aaacd37eaf76c94a5291b1 100644 (file)
--- a/Source/WebKit/efl/ChangeLog
+++ b/Source/WebKit/efl/ChangeLog
@@ -1,3 +1,13 @@
+2013-04-05  Geoffrey Garen  <ggaren@apple.com>
+
+        Made USE(JSC) unconditional
+        https://bugs.webkit.org/show_bug.cgi?id=114058
+
+        Reviewed by Anders Carlsson.
+
+        * ewk/ewk_frame.cpp:
+        (ewk_frame_script_execute):
+
 2013-04-04  Christophe Dumez  <ch.dumez@sisa.samsung.com>
 
         [Cairo] Fix canvas drawing of SVG-based patterns and remove NativeImageCairo

diff --git a/Source/WebKit/efl/ewk/ewk_frame.cpp b/Source/WebKit/efl/ewk/ewk_frame.cpp
index 44904b8f439593ebe6dea8a8ee07af9ccc380d14..5d4f1e6b0f39d2f6fcbbdd49c9f14bc4d62fdc28 100644 (file)
--- a/Source/WebKit/efl/ewk/ewk_frame.cpp
+++ b/Source/WebKit/efl/ewk/ewk_frame.cpp
@@ -446,7 +446,6 @@ const char* ewk_frame_script_execute(Evas_Object* ewkFrame, const char* script)
     EINA_SAFETY_ON_NULL_RETURN_VAL(smartData->frame, 0);
     EINA_SAFETY_ON_NULL_RETURN_VAL(script, 0);
 
-#if USE(JSC)
     WTF::String resultString;
     JSC::JSValue result = smartData->frame->script()->executeScript(WTF::String::fromUTF8(script), true).jsValue();
 
@@ -460,10 +459,6 @@ const char* ewk_frame_script_execute(Evas_Object* ewkFrame, const char* script)
     JSC::JSLockHolder lock(exec);
     resultString = result.toString(exec)->value(exec);
     return eina_stringshare_add(resultString.utf8().data());
-#else
-    notImplemented();
-    return 0;
-#endif
 }
 
 Eina_Bool ewk_frame_editable_get(const Evas_Object* ewkFrame)

diff --git a/Source/WebKit/qt/Api/qwebscriptworld.cpp b/Source/WebKit/qt/Api/qwebscriptworld.cpp
index 7a44813238aa9b26182c855e480670858937efdb..afeb5bb2a18ea9a3288c0b1919ada3e4b38052ac 100644 (file)
--- a/Source/WebKit/qt/Api/qwebscriptworld.cpp
+++ b/Source/WebKit/qt/Api/qwebscriptworld.cpp
@@ -32,9 +32,7 @@ using namespace WebCore;
 */
 QWebScriptWorld::QWebScriptWorld()
 {
-#if USE(JSC)
     d = new QWebScriptWorldPrivate(ScriptController::createWorld());
-#endif
 }
 
 QWebScriptWorld::QWebScriptWorld(const QWebScriptWorld& other)

diff --git a/Source/WebKit/qt/ChangeLog b/Source/WebKit/qt/ChangeLog
index 43aa4ed1b548cca011196beb66a784e53e266dae..50acb3b0395c02fcdd79a32ebc0273a9e8f7f91d 100644 (file)
--- a/Source/WebKit/qt/ChangeLog
+++ b/Source/WebKit/qt/ChangeLog
@@ -1,3 +1,13 @@
+2013-04-05  Geoffrey Garen  <ggaren@apple.com>
+
+        Made USE(JSC) unconditional
+        https://bugs.webkit.org/show_bug.cgi?id=114058
+
+        Reviewed by Anders Carlsson.
+
+        * Api/qwebscriptworld.cpp:
+        (QWebScriptWorld::QWebScriptWorld):
+
 2013-04-04  Sze Howe Koh  <szehowe.koh@gmail.com>
 
         [Qt] docs: Fix module name format

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index c685688acbe3bae0763f02587e89d8e84e05af9c..7ae3b301b9e6d0fd0173563411b1c825a18fb194 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,14 @@
+2013-04-05  Geoffrey Garen  <ggaren@apple.com>
+
+        Made USE(JSC) unconditional
+        https://bugs.webkit.org/show_bug.cgi?id=114058
+
+        Reviewed by Anders Carlsson.
+
+        * Shared/linux/WebMemorySamplerLinux.cpp:
+        (WebKit::WebMemorySampler::sampleWebKit):
+        * config.h:
+
 2013-04-05  Ed Bartosh  <bartosh@gmail.com>
 
         [EFL] --no-tiled-backing-store build fails because of not used #if USE(ACCELERATED_COMPOSITING)

diff --git a/Source/WebKit2/Shared/linux/WebMemorySamplerLinux.cpp b/Source/WebKit2/Shared/linux/WebMemorySamplerLinux.cpp
index a7d3ccb53c5250afab01645cb610b9dab1fcf9db..519c8a7b04264ea1c2d5135fa05e4cd09ca3f358 100644 (file)
--- a/Source/WebKit2/Shared/linux/WebMemorySamplerLinux.cpp
+++ b/Source/WebKit2/Shared/linux/WebMemorySamplerLinux.cpp
@@ -154,7 +154,6 @@ WebMemoryStatistics WebMemorySampler::sampleWebKit() const
     appendKeyValuePair(webKitMemoryStats, ASCIILiteral("Fast Malloc Committed Memory"), fastMallocBytesCommitted);
 #endif
 
-#if USE(JSC)
     size_t jscHeapBytesInUse = JSDOMWindow::commonJSGlobalData()->heap.size();
     size_t jscHeapBytesCommitted = JSDOMWindow::commonJSGlobalData()->heap.capacity();
     totalBytesInUse += jscHeapBytesInUse;
@@ -169,7 +168,6 @@ WebMemoryStatistics WebMemorySampler::sampleWebKit() const
     
     appendKeyValuePair(webKitMemoryStats, ASCIILiteral("JavaScript Stack Bytes"), globalMemoryStats.stackBytes);
     appendKeyValuePair(webKitMemoryStats, ASCIILiteral("JavaScript JIT Bytes"), globalMemoryStats.JITBytes);
-#endif
 
     appendKeyValuePair(webKitMemoryStats, ASCIILiteral("Total Memory In Use"), totalBytesInUse);
     appendKeyValuePair(webKitMemoryStats, ASCIILiteral("Total Committed Memory"), totalBytesCommitted);

diff --git a/Source/WebKit2/config.h b/Source/WebKit2/config.h
index 77b9a21935153a15bfaf65a7732f6c5d220f271d..4bf2bd81e62385d878248253c0838f27039092f9 100644 (file)
--- a/Source/WebKit2/config.h
+++ b/Source/WebKit2/config.h
@@ -32,12 +32,10 @@
 #include "cmakeconfig.h"
 #endif
 
+#include <runtime/JSExportMacros.h>
 #include <wtf/DisallowCType.h>
 #include <wtf/Platform.h>
 #include <wtf/ExportMacros.h>
-#if USE(JSC)
-#include <runtime/JSExportMacros.h>
-#endif
 
 #ifdef __cplusplus
 #ifndef EXTERN_C_BEGIN