<!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>[196474] trunk/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/196474">196474</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-02-12 08:37:13 -0800 (Fri, 12 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Properly handle classes inheriting from EventTarget
https://bugs.webkit.org/show_bug.cgi?id=154158
Reviewed by Michael Catanzaro.
Instead of removing its parent we now handle the case of classes
having EventTarget as parent to make them implement the interface
instead.
* bindings/scripts/CodeGeneratorGObject.pm:
(ShouldBeExposedAsInterface): Whether the parent given class
should be exposed as an interface instead of a parent class.
(GetParentClassName): Return Object as parent for classes having
a parent that should be exposed as an interface.
(GetParentImplClassName): Ditto.
(GetBaseClass): Ditto.
(GetParentGObjType): Ditto.
(SkipFunction): Add FIXME comment.
(ImplementsInterface): Helper function to check if a class
implements the given interface.
(GenerateCFile): Check whether the class implements EventTarget to
generate the interface implementation.
(GenerateInterface): Do not remove the parent class when it's EventTarget.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorGObjectpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (196473 => 196474)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-02-12 15:49:24 UTC (rev 196473)
+++ trunk/Source/WebCore/ChangeLog        2016-02-12 16:37:13 UTC (rev 196474)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2016-02-12 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Properly handle classes inheriting from EventTarget
+ https://bugs.webkit.org/show_bug.cgi?id=154158
+
+ Reviewed by Michael Catanzaro.
+
+ Instead of removing its parent we now handle the case of classes
+ having EventTarget as parent to make them implement the interface
+ instead.
+
+ * bindings/scripts/CodeGeneratorGObject.pm:
+ (ShouldBeExposedAsInterface): Whether the parent given class
+ should be exposed as an interface instead of a parent class.
+ (GetParentClassName): Return Object as parent for classes having
+ a parent that should be exposed as an interface.
+ (GetParentImplClassName): Ditto.
+ (GetBaseClass): Ditto.
+ (GetParentGObjType): Ditto.
+ (SkipFunction): Add FIXME comment.
+ (ImplementsInterface): Helper function to check if a class
+ implements the given interface.
+ (GenerateCFile): Check whether the class implements EventTarget to
+ generate the interface implementation.
+ (GenerateInterface): Do not remove the parent class when it's EventTarget.
+
</ins><span class="cx"> 2016-02-12 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r196470.
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorGObjectpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm (196473 => 196474)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm        2016-02-12 15:49:24 UTC (rev 196473)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm        2016-02-12 16:37:13 UTC (rev 196474)
</span><span class="lines">@@ -119,18 +119,26 @@
</span><span class="cx"> */
</span><span class="cx"> EOF
</span><span class="cx">
</span><ins>+sub ShouldBeExposedAsInterface {
+ my $interface = shift;
+
+ return $interface eq "EventTarget";
+}
+
</ins><span class="cx"> sub GetParentClassName {
</span><span class="cx"> my $interface = shift;
</span><ins>+ my $parent = $interface->parent;
</ins><span class="cx">
</span><del>- return "WebKitDOMObject" unless $interface->parent;
- return "WebKitDOM" . $interface->parent;
</del><ins>+ return "WebKitDOMObject" unless $parent and !ShouldBeExposedAsInterface($parent);
+ return "WebKitDOM" . $parent;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub GetParentImplClassName {
</span><span class="cx"> my $interface = shift;
</span><ins>+ my $parent = $interface->parent;
</ins><span class="cx">
</span><del>- return "Object" unless $interface->parent;
- return $interface->parent;
</del><ins>+ return "Object" unless $parent and !ShouldBeExposedAsInterface($parent);
+ return $parent;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub IsBaseType
</span><span class="lines">@@ -147,6 +155,7 @@
</span><span class="cx"> $interface = shift;
</span><span class="cx">
</span><span class="cx"> return $parent if $parent eq "Object" or IsBaseType($parent);
</span><ins>+ return "Object" if ShouldBeExposedAsInterface($parent);
</ins><span class="cx"> return "Event" if $codeGenerator->InheritsInterface($interface, "Event");
</span><span class="cx"> return "CSSValue" if $parent eq "SVGColor" or $parent eq "CSSValueList";
</span><span class="cx"> return "Node";
</span><span class="lines">@@ -208,9 +217,10 @@
</span><span class="cx">
</span><span class="cx"> sub GetParentGObjType {
</span><span class="cx"> my $interface = shift;
</span><ins>+ my $parent = $interface->parent;
</ins><span class="cx">
</span><del>- return "WEBKIT_DOM_TYPE_OBJECT" unless $interface->parent;
- return "WEBKIT_DOM_TYPE_" . uc(decamelize(($interface->parent)));
</del><ins>+ return "WEBKIT_DOM_TYPE_OBJECT" unless $parent and !ShouldBeExposedAsInterface($parent);
+ return "WEBKIT_DOM_TYPE_" . uc(decamelize(($parent)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub GetClassName {
</span><span class="lines">@@ -326,6 +336,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # Skip dispatch_event methods.
</span><ins>+ # FIXME: This can be removed once all classes implementing EventTarget inherit from it instead.
</ins><span class="cx"> if ($parentNode->extendedAttributes->{"EventTarget"} && $function->signature->name eq "dispatchEvent") {
</span><span class="cx"> return 1;
</span><span class="cx"> }
</span><span class="lines">@@ -1490,10 +1501,20 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+sub ImplementsInterface {
+ my $interface = shift;
+ my $implementInterface = shift;
+
+ # FIXME: Check only the parent class once all classes implementing EventTarget inherit from it instead.
+ return 1 if $interface->parent and $interface->parent eq implementInterface and ShouldBeExposedAsInterface($interface->parent);
+ return 1 if $interface->extendedAttributes->{$implementInterface};
+ return 0;
+}
+
</ins><span class="cx"> sub GenerateCFile {
</span><span class="cx"> my ($object, $interfaceName, $parentClassName, $parentGObjType, $interface) = @_;
</span><span class="cx">
</span><del>- if ($interface->extendedAttributes->{"EventTarget"}) {
</del><ins>+ if (ImplementsInterface($interface, "EventTarget")) {
</ins><span class="cx"> $object->GenerateEventTargetIface($interface);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1921,9 +1942,6 @@
</span><span class="cx"> sub GenerateInterface {
</span><span class="cx"> my ($object, $interface, $defines) = @_;
</span><span class="cx">
</span><del>- # FIXME: GObject bindings do not support EventTarget as base class.
- $interface->parent(undef) if $interface->parent && $interface->parent eq "EventTarget";
-
</del><span class="cx"> # Set up some global variables
</span><span class="cx"> $className = GetClassName($interface->name);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>