Title: [143750] trunk/Source/WebCore
- Revision
- 143750
- Author
- [email protected]
- Date
- 2013-02-22 10:21:42 -0800 (Fri, 22 Feb 2013)
Log Message
Build fix after r143637.
* WebCore.exp.in: Unconditionally export ScriptController::_javascript_Context.
* bindings/js/ScriptController.h: Unconditionally define _javascript_Context for Mac builds.
* bindings/js/ScriptControllerMac.mm:
(WebCore::ScriptController::_javascript_Context): Move the #if inside the function, and return 0 when false.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (143749 => 143750)
--- trunk/Source/WebCore/ChangeLog 2013-02-22 18:20:19 UTC (rev 143749)
+++ trunk/Source/WebCore/ChangeLog 2013-02-22 18:21:42 UTC (rev 143750)
@@ -1,3 +1,12 @@
+2013-02-22 Mark Rowe <[email protected]>
+
+ Build fix after r143637.
+
+ * WebCore.exp.in: Unconditionally export ScriptController::_javascript_Context.
+ * bindings/js/ScriptController.h: Unconditionally define _javascript_Context for Mac builds.
+ * bindings/js/ScriptControllerMac.mm:
+ (WebCore::ScriptController::_javascript_Context): Move the #if inside the function, and return 0 when false.
+
2013-02-22 Anton Vayvod <[email protected]>
[TextAutosizing] Refactoring to eliminate boolean parameter.
Modified: trunk/Source/WebCore/WebCore.exp.in (143749 => 143750)
--- trunk/Source/WebCore/WebCore.exp.in 2013-02-22 18:20:19 UTC (rev 143749)
+++ trunk/Source/WebCore/WebCore.exp.in 2013-02-22 18:21:42 UTC (rev 143750)
@@ -504,9 +504,6 @@
__ZN7WebCore16ScriptController11createWorldEv
__ZN7WebCore16ScriptController13executeScriptERKN3WTF6StringEb
__ZN7WebCore16ScriptController17canExecuteScriptsENS_33ReasonForCallingCanExecuteScriptsE
-#if JSC_OBJC_API_ENABLED
-__ZN7WebCore16ScriptController17javaScriptContextEv
-#endif
__ZN7WebCore16ScriptController18windowScriptObjectEv
__ZN7WebCore16ScriptController20executeScriptInWorldEPNS_15DOMWrapperWorldERKN3WTF6StringEb
__ZN7WebCore16ScriptController21processingUserGestureEv
@@ -1703,16 +1700,17 @@
#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
Modified: trunk/Source/WebCore/bindings/js/ScriptController.h (143749 => 143750)
--- trunk/Source/WebCore/bindings/js/ScriptController.h 2013-02-22 18:20:19 UTC (rev 143749)
+++ trunk/Source/WebCore/bindings/js/ScriptController.h 2013-02-22 18:21:42 UTC (rev 143750)
@@ -153,10 +153,8 @@
#if PLATFORM(MAC)
WebScriptObject* windowScriptObject();
-#if JSC_OBJC_API_ENABLED
JSContext *_javascript_Context();
#endif
-#endif
JSC::JSObject* jsObjectForPluginElement(HTMLPlugInElement*);
Modified: trunk/Source/WebCore/bindings/js/ScriptControllerMac.mm (143749 => 143750)
--- trunk/Source/WebCore/bindings/js/ScriptControllerMac.mm 2013-02-22 18:20:19 UTC (rev 143749)
+++ trunk/Source/WebCore/bindings/js/ScriptControllerMac.mm 2013-02-22 18:21:42 UTC (rev 143750)
@@ -110,15 +110,17 @@
return m_windowScriptObject.get();
}
-#if JSC_OBJC_API_ENABLED
JSContext *ScriptController::_javascript_Context()
{
+#if JSC_OBJC_API_ENABLED
if (!canExecuteScripts(NotAboutToExecuteScript))
return 0;
JSContext *context = [JSContext contextWithGlobalContextRef:toGlobalRef(bindingRootObject()->globalObject()->globalExec())];
return context;
+#else
+ return 0;
+#endif
}
-#endif
void ScriptController::updatePlatformScriptObjects()
{
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
