<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[162925] tags/Safari-538.14/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/162925">162925</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2014-01-28 01:38:06 -0800 (Tue, 28 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/162872">r162872</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari53814SourceWebCoreChangeLog">tags/Safari-538.14/Source/WebCore/ChangeLog</a></li>
<li><a href="#tagsSafari53814SourceWebCorebindingsscriptsCodeGeneratorObjCpm">tags/Safari-538.14/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari53814SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.14/Source/WebCore/ChangeLog (162924 => 162925)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.14/Source/WebCore/ChangeLog 2014-01-28 09:21:07 UTC (rev 162924)
+++ tags/Safari-538.14/Source/WebCore/ChangeLog 2014-01-28 09:38:06 UTC (rev 162925)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-01-28 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r162872
+
+ 2014-01-27 Andy Estes <aestes@apple.com>
+
+ Stop the code generator from adding ENABLE() macros to Objective-C DOM headers
+ https://bugs.webkit.org/show_bug.cgi?id=127706
+
+ Reviewed by David Kilzer.
+
+ Instead of adding ENABLE() macros to generated Objective-C DOM
+ headers, which might become Public or Private headers, elide generated
+ code for disabled features.
+
+ * bindings/scripts/CodeGeneratorObjC.pm:
+ (GenerateInterface): Passed $defines to GenerateHeader.
+ (ConditionalIsEnabled): Checked if the given conditional is found in
+ $defines. Handled conditionals with '&' and '|'.
+ (GenerateHeader): Rather than calling GenerateConditionalString to
+ generate an "#if ENABLE(...)", called ConditionalIsEnabled() to see
+ whether we should generate code for the given constant, attribute, or
+ function.
+
</ins><span class="cx"> 2014-01-26 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Disable accessibility after every test run
</span></span></pre></div>
<a id="tagsSafari53814SourceWebCorebindingsscriptsCodeGeneratorObjCpm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.14/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm (162924 => 162925)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.14/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm 2014-01-28 09:21:07 UTC (rev 162924)
+++ tags/Safari-538.14/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm 2014-01-28 09:38:06 UTC (rev 162925)
</span><span class="lines">@@ -28,6 +28,8 @@
</span><span class="cx">
</span><span class="cx"> use constant FileNamePrefix => "DOM";
</span><span class="cx">
</span><ins>+sub ConditionalIsEnabled(\%$);
+
</ins><span class="cx"> # Global Variables
</span><span class="cx"> my $writeDependencies = 0;
</span><span class="cx"> my %publicInterfaces = ();
</span><span class="lines">@@ -376,7 +378,7 @@
</span><span class="cx"> ReadPublicInterfaces($className, $parentClassName, $defines, $isProtocol);
</span><span class="cx">
</span><span class="cx"> # Start actual generation..
</span><del>- $object->GenerateHeader($interface);
</del><ins>+ $object->GenerateHeader($interface, $defines);
</ins><span class="cx"> $object->GenerateImplementation($interface) unless $noImpl;
</span><span class="cx">
</span><span class="cx"> # Check for missing public API
</span><span class="lines">@@ -790,11 +792,36 @@
</span><span class="cx"> return ($svgPropertyType, $svgListPropertyType, $svgNativeType);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+sub ConditionalIsEnabled(\%$)
+{
+ my $defines = shift;
+ my $conditional = shift;
+
+ return 1 if !$conditional;
+
+ my $operator = ($conditional =~ /&/ ? '&' : ($conditional =~ /\|/ ? '|' : ''));
+ if (!$operator) {
+ return exists($defines->{"ENABLE_" . $conditional});
+ }
+
+ my @conditions = split(/\Q$operator\E/, $conditional);
+ foreach (@conditions) {
+ my $enable = "ENABLE_" . $_;
+ return 0 if ($operator eq '&') and !exists($defines->{$enable});
+ return 1 if ($operator eq '|') and exists($defines->{$enable});
+ }
+
+ return $operator eq '&';
+}
+
</ins><span class="cx"> sub GenerateHeader
</span><span class="cx"> {
</span><span class="cx"> my $object = shift;
</span><span class="cx"> my $interface = shift;
</span><ins>+ my $defines = shift;
</ins><span class="cx">
</span><ins>+ my %definesRef = map { $_ => 1 } split(/\s+/, $defines);
+
</ins><span class="cx"> my $interfaceName = $interface->name;
</span><span class="cx"> my $className = GetClassName($interfaceName);
</span><span class="cx">
</span><span class="lines">@@ -851,20 +878,15 @@
</span><span class="cx"> foreach my $constant (@constants) {
</span><span class="cx"> my $constantName = $constant->name;
</span><span class="cx"> my $constantValue = $constant->value;
</span><del>- my $conditional = $constant->extendedAttributes->{"Conditional"};
</del><span class="cx"> my $notLast = $constant ne $constants[-1];
</span><del>-
- if ($conditional) {
- my $conditionalString = $codeGenerator->GenerateConditionalStringFromAttributeValue($conditional);
- $combinedConstants .= "#if ${conditionalString}\n";
</del><ins>+
+ if (ConditionalIsEnabled(%definesRef, $constant->extendedAttributes->{"Conditional"})) {
+ $combinedConstants .= " DOM_$constantName = $constantValue";
+ $combinedConstants .= "," if $notLast;
+ if ($notLast) {
+ $combinedConstants .= "\n";
+ }
</ins><span class="cx"> }
</span><del>- $combinedConstants .= " DOM_$constantName = $constantValue";
- $combinedConstants .= "," if $notLast;
- if ($conditional) {
- $combinedConstants .= "\n#endif\n";
- } elsif ($notLast) {
- $combinedConstants .= "\n";
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # FIXME: the formatting of the enums should line up the equal signs.
</span><span class="lines">@@ -943,13 +965,7 @@
</span><span class="cx"> $property .= $declarationSuffix;
</span><span class="cx"> push(@headerAttributes, $property) if $public;
</span><span class="cx"> push(@privateHeaderAttributes, $property) unless $public;
</span><del>- } else {
- my $attributeConditionalString = $codeGenerator->GenerateConditionalString($attribute->signature);
- if ($attributeConditionalString) {
- push(@headerAttributes, "#if ${attributeConditionalString}\n") if $public;
- push(@privateHeaderAttributes, "#if ${attributeConditionalString}\n") unless $public;
- }
-
</del><ins>+ } elsif (ConditionalIsEnabled(%definesRef, $attribute->signature->extendedAttributes->{"Conditional"})) {
</ins><span class="cx"> # - GETTER
</span><span class="cx"> my $getter = "- (" . $attributeType . ")" . $attributeName . $declarationSuffix;
</span><span class="cx"> push(@headerAttributes, $getter) if $public;
</span><span class="lines">@@ -961,11 +977,6 @@
</span><span class="cx"> push(@headerAttributes, $setter) if $public;
</span><span class="cx"> push(@privateHeaderAttributes, $setter) unless $public;
</span><span class="cx"> }
</span><del>-
- if ($attributeConditionalString) {
- push(@headerAttributes, "#endif\n") if $public;
- push(@privateHeaderAttributes, "#endif\n") unless $public;
- }
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1052,46 +1063,35 @@
</span><span class="cx"> push(@privateHeaderFunctions, $endAppleCopyright) unless $public;
</span><span class="cx"> $inAppleCopyright{$public ? "public" : "private"} = 0;
</span><span class="cx"> }
</span><ins>+
+ if (ConditionalIsEnabled(%definesRef, $function->signature->extendedAttributes->{"Conditional"})) {
+ push(@headerFunctions, $functionDeclaration) if $public;
+ push(@privateHeaderFunctions, $functionDeclaration) unless $public;
</ins><span class="cx">
</span><del>- my $functionConditionalString = $codeGenerator->GenerateConditionalString($function->signature);
- if ($functionConditionalString) {
- push(@headerFunctions, "#if ${functionConditionalString}\n") if $public;
- push(@privateHeaderFunctions, "#if ${functionConditionalString}\n") unless $public;
- push(@deprecatedHeaderFunctions, "#if ${functionConditionalString}\n") if $needsDeprecatedVersion;
- }
</del><ins>+ # generate the old style method names with un-named parameters, these methods are deprecated
+ if ($needsDeprecatedVersion) {
+ my $deprecatedFunctionSig = $functionSig;
+ $deprecatedFunctionSig =~ s/\s\w+:/ :/g; # remove parameter names
</ins><span class="cx">
</span><del>- push(@headerFunctions, $functionDeclaration) if $public;
- push(@privateHeaderFunctions, $functionDeclaration) unless $public;
</del><ins>+ $publicInterfaceKey = $deprecatedFunctionSig . ";";
</ins><span class="cx">
</span><del>- # generate the old style method names with un-named parameters, these methods are deprecated
- if ($needsDeprecatedVersion) {
- my $deprecatedFunctionSig = $functionSig;
- $deprecatedFunctionSig =~ s/\s\w+:/ :/g; # remove parameter names
</del><ins>+ my $availabilityMacro = "WEBKIT_DEPRECATED_MAC(10_4, 10_5)";
+ if (defined $publicInterfaces{$publicInterfaceKey} and length $publicInterfaces{$publicInterfaceKey}) {
+ $availabilityMacro = $publicInterfaces{$publicInterfaceKey};
+ }
</ins><span class="cx">
</span><del>- $publicInterfaceKey = $deprecatedFunctionSig . ";";
</del><ins>+ $functionDeclaration = "$deprecatedFunctionSig $availabilityMacro;\n";
</ins><span class="cx">
</span><del>- my $availabilityMacro = "WEBKIT_DEPRECATED_MAC(10_4, 10_5)";
- if (defined $publicInterfaces{$publicInterfaceKey} and length $publicInterfaces{$publicInterfaceKey}) {
- $availabilityMacro = $publicInterfaces{$publicInterfaceKey};
- }
</del><ins>+ push(@deprecatedHeaderFunctions, $functionDeclaration);
</ins><span class="cx">
</span><del>- $functionDeclaration = "$deprecatedFunctionSig $availabilityMacro;\n";
</del><ins>+ unless (defined $publicInterfaces{$publicInterfaceKey}) {
+ warn "Deprecated method $publicInterfaceKey is not in PublicDOMInterfaces.h. All deprecated methods need to be public, or should have the ObjCLegacyUnnamedParameters IDL attribute removed";
+ $fatalError = 1;
+ }
</ins><span class="cx">
</span><del>- push(@deprecatedHeaderFunctions, $functionDeclaration);
-
- unless (defined $publicInterfaces{$publicInterfaceKey}) {
- warn "Deprecated method $publicInterfaceKey is not in PublicDOMInterfaces.h. All deprecated methods need to be public, or should have the ObjCLegacyUnnamedParameters IDL attribute removed";
- $fatalError = 1;
</del><ins>+ delete $publicInterfaces{$publicInterfaceKey};
</ins><span class="cx"> }
</span><del>-
- delete $publicInterfaces{$publicInterfaceKey};
</del><span class="cx"> }
</span><del>-
- if ($functionConditionalString) {
- push(@headerFunctions, "#endif\n") if $public;
- push(@privateHeaderFunctions, "#endif\n") unless $public;
- push(@deprecatedHeaderFunctions, "#endif\n") if $needsDeprecatedVersion;
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> push(@headerFunctions, $endAppleCopyright) if $inAppleCopyright{"public"};
</span></span></pre>
</div>
</div>
</body>
</html>