Build fix after r143637.
authormrowe@apple.com <mrowe@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 22 Feb 2013 18:21:42 +0000 (18:21 +0000)
committermrowe@apple.com <mrowe@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 22 Feb 2013 18:21:42 +0000 (18:21 +0000)
* WebCore.exp.in: Unconditionally export ScriptController::javaScriptContext.
* bindings/js/ScriptController.h: Unconditionally define javaScriptContext for Mac builds.
* bindings/js/ScriptControllerMac.mm:
(WebCore::ScriptController::javaScriptContext): Move the #if inside the function, and return 0 when false.

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

Source/WebCore/ChangeLog
Source/WebCore/WebCore.exp.in
Source/WebCore/bindings/js/ScriptController.h
Source/WebCore/bindings/js/ScriptControllerMac.mm

index 39275e6..4ec390a 100644 (file)
@@ -1,3 +1,12 @@
+2013-02-22  Mark Rowe  <mrowe@apple.com>
+
+        Build fix after r143637.
+
+        * WebCore.exp.in: Unconditionally export ScriptController::javaScriptContext.
+        * bindings/js/ScriptController.h: Unconditionally define javaScriptContext for Mac builds.
+        * bindings/js/ScriptControllerMac.mm:
+        (WebCore::ScriptController::javaScriptContext): Move the #if inside the function, and return 0 when false.
+
 2013-02-22  Anton Vayvod  <avayvod@chromium.org>
 
         [TextAutosizing] Refactoring to eliminate boolean parameter.
index 9efc2c2..bde6dfd 100644 (file)
@@ -504,9 +504,6 @@ __ZN7WebCore16ScriptController10initScriptEPNS_15DOMWrapperWorldE
 __ZN7WebCore16ScriptController11createWorldEv
 __ZN7WebCore16ScriptController13executeScriptERKN3WTF6StringEb
 __ZN7WebCore16ScriptController17canExecuteScriptsENS_33ReasonForCallingCanExecuteScriptsE
-#if JSC_OBJC_API_ENABLED
-__ZN7WebCore16ScriptController17javaScriptContextEv
-#endif
 __ZN7WebCore16ScriptController18windowScriptObjectEv
 __ZN7WebCore16ScriptController20executeScriptInWorldEPNS_15DOMWrapperWorldERKN3WTF6StringEb
 __ZN7WebCore16ScriptController21processingUserGestureEv
@@ -1703,16 +1700,17 @@ __ZN7WebCore15SpeechSynthesis22setPlatformSynthesizerEN3WTF10PassOwnPtrINS_25Pla
 #endif
 __ZN7WebCore16FontPlatformDataC1EP6NSFontfbbbNS_15FontOrientationENS_16FontWidthVariantE
 __ZN7WebCore16FontPlatformDataC2EP6NSFontfbbbNS_15FontOrientationENS_16FontWidthVariantE
-__ZN7WebCore16colorFromNSColorEP7NSColor
-__ZN7WebCore16enclosingIntRectERK7_NSRect
+__ZN7WebCore16ScriptController17javaScriptContextEv
 __ZN7WebCore16StylePropertySet25ensureCSSStyleDeclarationEv
 __ZN7WebCore16StylePropertySetD2Ev
-__ZN7WebCore21DeviceOrientationData6createEbdbdbdbb
+__ZN7WebCore16colorFromNSColorEP7NSColor
+__ZN7WebCore16enclosingIntRectERK7_NSRect
 __ZN7WebCore18SearchPopupMenuMacC1EPNS_15PopupMenuClientE
 __ZN7WebCore19applicationIsSafariEv
 __ZN7WebCore20PlatformEventFactory24createPlatformMouseEventEP7NSEventP6NSView
 __ZN7WebCore20PlatformEventFactory27createPlatformKeyboardEventEP7NSEvent
 __ZN7WebCore20builtInPDFPluginNameEv
+__ZN7WebCore21DeviceOrientationData6createEbdbdbdbb
 __ZN7WebCore21applicationIsApertureEv
 __ZN7WebCore21reportThreadViolationEPKcNS_20ThreadViolationRoundE
 __ZN7WebCore22applicationIsAppleMailEv
index cd867e0..0f765f8 100644 (file)
@@ -153,10 +153,8 @@ public:
 
 #if PLATFORM(MAC)
     WebScriptObject* windowScriptObject();
-#if JSC_OBJC_API_ENABLED
     JSContext *javaScriptContext();
 #endif
-#endif
 
     JSC::JSObject* jsObjectForPluginElement(HTMLPlugInElement*);
     
index f1fad69..8e662b6 100644 (file)
@@ -110,15 +110,17 @@ WebScriptObject* ScriptController::windowScriptObject()
     return m_windowScriptObject.get();
 }
 
-#if JSC_OBJC_API_ENABLED
 JSContext *ScriptController::javaScriptContext()
 {
+#if JSC_OBJC_API_ENABLED
     if (!canExecuteScripts(NotAboutToExecuteScript))
         return 0;
     JSContext *context = [JSContext contextWithGlobalContextRef:toGlobalRef(bindingRootObject()->globalObject()->globalExec())];
     return context;
-}
+#else
+    return 0;
 #endif
+}
 
 void ScriptController::updatePlatformScriptObjects()
 {