Title: [96015] releases/WebKitGTK/webkit-1.6/Source
- Revision
- 96015
- Author
- [email protected]
- Date
- 2011-09-26 15:49:42 -0700 (Mon, 26 Sep 2011)
Log Message
Merging http://trac.webkit.org/changeset/96009
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-1.6/Source/WebCore/ChangeLog (96014 => 96015)
--- releases/WebKitGTK/webkit-1.6/Source/WebCore/ChangeLog 2011-09-26 22:46:28 UTC (rev 96014)
+++ releases/WebKitGTK/webkit-1.6/Source/WebCore/ChangeLog 2011-09-26 22:49:42 UTC (rev 96015)
@@ -1,3 +1,14 @@
+2011-09-26 Xan Lopez <[email protected]>
+
+ [GTK] Do not ignore 'Replaceable' attributes in the DOM bindings
+ https://bugs.webkit.org/show_bug.cgi?id=68837
+
+ Reviewed by Martin Robinson.
+
+ * bindings/scripts/CodeGeneratorGObject.pm: add getters (but not
+ setters) for 'Replaceable' attributes. Punt for the future
+ actually making them settable, since it seems non trivial.
+
2011-09-26 ChangSeok Oh <[email protected]>
[GTK] Fix build break when enabling webgl on r95593
Modified: releases/WebKitGTK/webkit-1.6/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm (96014 => 96015)
--- releases/WebKitGTK/webkit-1.6/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm 2011-09-26 22:46:28 UTC (rev 96014)
+++ releases/WebKitGTK/webkit-1.6/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm 2011-09-26 22:49:42 UTC (rev 96015)
@@ -155,11 +155,10 @@
my $attribute = shift;
if ($attribute->signature->extendedAttributes->{"CustomGetter"} ||
- $attribute->signature->extendedAttributes->{"CustomSetter"} ||
- $attribute->signature->extendedAttributes->{"Replaceable"}) {
+ $attribute->signature->extendedAttributes->{"CustomSetter"}) {
return 1;
}
-
+
my $propType = $attribute->signature->type;
if ($propType =~ /Constructor$/) {
return 1;
@@ -307,7 +306,10 @@
$gtype eq "uint64" || $gtype eq "ulong" || $gtype eq "long" ||
$gtype eq "uint" || $gtype eq "ushort" || $gtype eq "uchar" ||
$gtype eq "char" || $gtype eq "string");
- if ($writeable && $hasGtypeSignature) {
+ # FIXME: We are not generating setters for 'Replaceable'
+ # attributes now, but we should somehow.
+ my $replaceable = $property->signature->extendedAttributes->{"Replaceable"};
+ if ($writeable && $hasGtypeSignature && !$replaceable) {
push(@result, $property);
}
}
@@ -1039,8 +1041,11 @@
$function->signature($attribute->signature);
$function->raisesExceptions($attribute->getterExceptions);
$object->GenerateFunction($interfaceName, $function, "get_");
-
- if ($attribute->type =~ /^readonly/) {
+
+ # FIXME: We are not generating setters for 'Replaceable'
+ # attributes now, but we should somehow.
+ if ($attribute->type =~ /^readonly/ ||
+ $attribute->signature->extendedAttributes->{"Replaceable"}) {
next TOP;
}
Modified: releases/WebKitGTK/webkit-1.6/Source/WebKit/gtk/tests/testatk.c (96014 => 96015)
--- releases/WebKitGTK/webkit-1.6/Source/WebKit/gtk/tests/testatk.c 2011-09-26 22:46:28 UTC (rev 96014)
+++ releases/WebKitGTK/webkit-1.6/Source/WebKit/gtk/tests/testatk.c 2011-09-26 22:49:42 UTC (rev 96015)
@@ -1323,7 +1323,7 @@
a partial section of the same line */
gint startOffset;
gint endOffset;
- gchar* text = atk_text_get_text_at_offset(multilineText, 0, ATK_TEXT_BOUNDARY_LINE_START, &startOffset, &endOffset);
+ gchar* text = atk_text_get_text_at_offset(multilineText, 0, ATK_TEXT_BOUNDARY_LINE_END, &startOffset, &endOffset);
g_free(text);
AtkTextRectangle fline_window;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
