mirror of
https://github.com/cappuccino/cappuccino.git
synced 2026-11-22 14:35:52 +00:00
AppKit: Fix CPDOMAvailable read before assignment
CPDOMAvailable was read during load before it was assigned. * CPCompatibility: Move the CPDOMAvailable assignment ahead of the engine detection, whose AppleWebKit case calls +[CPPlatform isBrowser], which reads it. * CPCompatibilityTest: Add a test that re-executes CPCompatibility.j with an AppleWebKit user agent and CPDOMAvailable unset, failing on any exception.
This commit is contained in:
1 parent
572c872c31
commit
f1a8b154fc
2 files changed
+88
-23
No files matched your search
+23
-23
@@ -24,6 +24,29 @@
|
||||
@import "CPPlatform.j"
|
||||
|
||||
|
||||
/*
|
||||
CPDOMAvailable is the authoritative runtime predicate for DOM capability.
|
||||
|
||||
It replaces the former `#if PLATFORM(DOM)` preprocessor conditional, which
|
||||
selected code at build time between the browser (DOM) and CommonJS (Node)
|
||||
targets. It is a CAPABILITY test: YES only when a
|
||||
functioning document object with createElement exists.
|
||||
|
||||
The predicate subsumes all direct local probing for the presence of a DOM.
|
||||
|
||||
YES - browsers (the only deployment target)
|
||||
YES - any environment providing a working DOM (e.g. jsdom), where DOM
|
||||
operations genuinely function
|
||||
NO - CommonJS/Node without a DOM (legacy tooling: theme blending, nib2cib)
|
||||
|
||||
Rules for consumers:
|
||||
- Platform-conditional code MUST test CPDOMAvailable.
|
||||
- Do NOT reference `document` (or test for it) anywhere else in AppKit;
|
||||
this declaration is the single environment peek.
|
||||
- The preprocessor form must not return: there is no preprocessor.
|
||||
*/
|
||||
CPDOMAvailable = (typeof document !== "undefined") && document && (typeof document.createElement === "function");
|
||||
|
||||
// Browser Engines
|
||||
CPUnknownBrowserEngine = 0;
|
||||
CPGeckoBrowserEngine = 1 << 0;
|
||||
@@ -262,29 +285,6 @@ else if (USER_AGENT.indexOf("Gecko") !== -1) // Must follow KHTML check.
|
||||
}*/
|
||||
}
|
||||
|
||||
/*
|
||||
CPDOMAvailable is the authoritative runtime predicate for DOM capability.
|
||||
|
||||
It replaces the former `#if PLATFORM(DOM)` preprocessor conditional, which
|
||||
selected code at build time between the browser (DOM) and CommonJS (Node)
|
||||
targets. It is a CAPABILITY test: YES only when a
|
||||
functioning document object with createElement exists.
|
||||
|
||||
The predicate subsumes all direct local probing for the presence of a DOM.
|
||||
|
||||
YES - browsers (the only deployment target)
|
||||
YES - any environment providing a working DOM (e.g. jsdom), where DOM
|
||||
operations genuinely function
|
||||
NO - CommonJS/Node without a DOM (legacy tooling: theme blending, nib2cib)
|
||||
|
||||
Rules for consumers:
|
||||
- Platform-conditional code MUST test CPDOMAvailable.
|
||||
- Do NOT reference `document` (or test for it) anywhere else in AppKit;
|
||||
this declaration is the single environment peek.
|
||||
- The preprocessor form must not return: there is no preprocessor.
|
||||
*/
|
||||
CPDOMAvailable = (typeof document !== "undefined") && document && (typeof document.createElement === "function");
|
||||
|
||||
// Feature-specific checks
|
||||
if (typeof document != "undefined")
|
||||
{
|
||||
|
||||
@@ -0,0 +1,65 @@
|
||||
@import <Foundation/Foundation.j>
|
||||
@import <AppKit/CPCompatibility.j>
|
||||
|
||||
var SafariUserAgent = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/27.0.1 Safari/605.1.15";
|
||||
|
||||
@implementation CPCompatibilityTest : OJTestCase
|
||||
|
||||
/*!
|
||||
When CPCompatibility.j loads, it identifies the browser engine from the user
|
||||
agent string. For WebKit and Blink browsers (user agent containing
|
||||
"AppleWebKit/"), that detection calls +[CPPlatform isBrowser], which reads
|
||||
CPDOMAvailable, so CPDOMAvailable must already be assigned at that point.
|
||||
|
||||
The test suite runs outside a browser, with no user agent, so this code is
|
||||
never reached when the frameworks load for testing. The test reproduces a
|
||||
WebKit or Blink browser load instead: it supplies an AppleWebKit user agent,
|
||||
removes CPDOMAvailable, and runs CPCompatibility.j again.
|
||||
*/
|
||||
- (void)testLoadUnderWebKitUserAgentDoesNotReadCPDOMAvailableBeforeAssignment
|
||||
{
|
||||
var executable = compatibilityExecutable(),
|
||||
runtimeWindow = ObjectiveJ.window,
|
||||
savedNavigator = runtimeWindow.navigator,
|
||||
savedDOMAvailable = CPDOMAvailable,
|
||||
loadException = nil;
|
||||
|
||||
[self assertNotNull:executable message:@"CPCompatibility.j executable not found"];
|
||||
|
||||
runtimeWindow.navigator = { userAgent: SafariUserAgent };
|
||||
delete global.CPDOMAvailable;
|
||||
|
||||
try
|
||||
{
|
||||
executable.execute(YES);
|
||||
}
|
||||
catch (anException)
|
||||
{
|
||||
loadException = anException;
|
||||
}
|
||||
|
||||
// Restore the Node environment and re-run detection so later tests see it.
|
||||
if (savedNavigator === undefined)
|
||||
delete runtimeWindow.navigator;
|
||||
else
|
||||
runtimeWindow.navigator = savedNavigator;
|
||||
|
||||
CPDOMAvailable = savedDOMAvailable;
|
||||
executable.execute(YES);
|
||||
|
||||
if (loadException)
|
||||
[self fail:@"CPCompatibility.j threw while loading under a WebKit user agent: " + loadException];
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
function compatibilityExecutable()
|
||||
{
|
||||
var executables = ObjectiveJ.FileExecutable.allFileExecutables();
|
||||
|
||||
for (var i = 0; i < executables.length; i++)
|
||||
if (/\/CPCompatibility\.j$/.test(executables[i].URL().absoluteString()))
|
||||
return executables[i];
|
||||
|
||||
return nil;
|
||||
}
|
||||
Reference in new issue
Block a user