Diff
Modified: trunk/Source/WebCore/ChangeLog (204554 => 204555)
--- trunk/Source/WebCore/ChangeLog 2016-08-17 05:48:27 UTC (rev 204554)
+++ trunk/Source/WebCore/ChangeLog 2016-08-17 08:50:11 UTC (rev 204555)
@@ -1,3 +1,20 @@
+2016-08-17 Carlos Garcia Campos <[email protected]>
+
+ Unreviewed. Fix GObject DOM bindings API break after r204312.
+
+ HTMLInputElement capture attribute now returns the actual capture value, instead of whether it's present or
+ not. This patch renames webkit_dom_html_input_element_get_capture as
+ webkit_dom_html_input_element_get_capture_type and deprecates webkit_dom_html_input_element_get_capture.
+
+ * bindings/gobject/WebKitDOMDeprecated.cpp:
+ (webkit_dom_html_input_element_get_capture):
+ * bindings/gobject/WebKitDOMDeprecated.h:
+ * bindings/gobject/WebKitDOMDeprecated.symbols:
+ * bindings/gobject/webkitdom.symbols:
+ * bindings/scripts/CodeGeneratorGObject.pm:
+ (GenerateProperty):
+ (GetEffectiveFunctionName):
+
2016-08-16 Ryosuke Niwa <[email protected]>
customElements.define should retrieve lifecycle callbacks
Modified: trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.cpp (204554 => 204555)
--- trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.cpp 2016-08-17 05:48:27 UTC (rev 204554)
+++ trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.cpp 2016-08-17 08:50:11 UTC (rev 204555)
@@ -28,8 +28,10 @@
#include "HTMLCollection.h"
#include "WebKitDOMDocumentPrivate.h"
#include "WebKitDOMElementPrivate.h"
+#include "WebKitDOMHTMLInputElementPrivate.h"
#include "WebKitDOMHTMLTitleElement.h"
#include "WebKitDOMNodeListPrivate.h"
+#include "WebKitDOMPrivate.h"
#include "WebKitDOMTextPrivate.h"
#include <wtf/GetPtr.h>
#include <wtf/RefPtr.h>
@@ -172,7 +174,21 @@
return WebKit::kit(gobjectResult.get());
}
+gboolean webkit_dom_html_input_element_get_capture(WebKitDOMHTMLInputElement* self)
+{
+ g_return_val_if_fail(WEBKIT_DOM_IS_HTML_INPUT_ELEMENT(self), FALSE);
+#if ENABLE(MEDIA_CAPTURE)
+ WebCore::JSMainThreadNullState state;
+ WebCore::HTMLInputElement* item = WebKit::core(self);
+ return item->mediaCaptureType() != MediaCaptureTypeNone;
+#else
+ UNUSED_PARAM(self);
+ WEBKIT_WARN_FEATURE_NOT_PRESENT("Media Capture")
+ return FALSE;
+#endif /* ENABLE(MEDIA_CAPTURE) */
+}
+
G_DEFINE_TYPE(WebKitDOMEntityReference, webkit_dom_entity_reference, WEBKIT_DOM_TYPE_NODE)
static void webkit_dom_entity_reference_init(WebKitDOMEntityReference*)
Modified: trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.h (204554 => 204555)
--- trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.h 2016-08-17 05:48:27 UTC (rev 204554)
+++ trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.h 2016-08-17 08:50:11 UTC (rev 204555)
@@ -215,6 +215,17 @@
WEBKIT_DEPRECATED WebKitDOMText*
webkit_dom_text_replace_whole_text(WebKitDOMText* self, const gchar* content, GError** error);
+/**
+ * webkit_dom_html_input_element_get_capture:
+ * @self: A #WebKitDOMHTMLInputElement
+ *
+ * Returns: A #gboolean
+ *
+ * Deprecated: 2.14: Use webkit_dom_html_input_element_get_capture_type() instead.
+ **/
+WEBKIT_DEPRECATED_FOR(webkit_dom_html_input_element_get_capture_type) gboolean
+webkit_dom_html_input_element_get_capture(WebKitDOMHTMLInputElement* self);
+
#define WEBKIT_DOM_TYPE_ENTITY_REFERENCE (webkit_dom_entity_reference_get_type())
#define WEBKIT_DOM_ENTITY_REFERENCE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_DOM_TYPE_ENTITY_REFERENCE, WebKitDOMEntityReference))
#define WEBKIT_DOM_ENTITY_REFERENCE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), WEBKIT_DOM_TYPE_ENTITY_REFERENCE, WebKitDOMEntityReferenceClass)
Modified: trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.symbols (204554 => 204555)
--- trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.symbols 2016-08-17 05:48:27 UTC (rev 204554)
+++ trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.symbols 2016-08-17 08:50:11 UTC (rev 204555)
@@ -25,3 +25,4 @@
void webkit_dom_html_title_element_set_text(WebKitDOMHTMLTitleElement*, const gchar*)
gchar* webkit_dom_document_get_default_charset(WebKitDOMDocument*)
WebKitDOMText* webkit_dom_text_replace_whole_text(WebKitDOMText*, const gchar*, GError**)
+gboolean webkit_dom_html_input_element_get_capture(WebKitDOMHTMLInputElement*)
Modified: trunk/Source/WebCore/bindings/gobject/webkitdom.symbols (204554 => 204555)
--- trunk/Source/WebCore/bindings/gobject/webkitdom.symbols 2016-08-17 05:48:27 UTC (rev 204554)
+++ trunk/Source/WebCore/bindings/gobject/webkitdom.symbols 2016-08-17 08:50:11 UTC (rev 204555)
@@ -586,6 +586,7 @@
gchar* webkit_dom_html_input_element_get_alt(WebKitDOMHTMLInputElement*)
gboolean webkit_dom_html_input_element_get_autofocus(WebKitDOMHTMLInputElement*)
gboolean webkit_dom_html_input_element_get_capture(WebKitDOMHTMLInputElement*)
+gchar* webkit_dom_html_input_element_get_capture_type(WebKitDOMHTMLInputElement*)@2.14
gboolean webkit_dom_html_input_element_get_checked(WebKitDOMHTMLInputElement*)
gboolean webkit_dom_html_input_element_get_default_checked(WebKitDOMHTMLInputElement*)
gchar* webkit_dom_html_input_element_get_default_value(WebKitDOMHTMLInputElement*)
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm (204554 => 204555)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm 2016-08-17 05:48:27 UTC (rev 204554)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm 2016-08-17 08:50:11 UTC (rev 204555)
@@ -556,7 +556,7 @@
$mutableString = "read-write";
}
- my $getterFunctionName = "webkit_dom_${decamelizeInterfaceName}_get_" . $propFunctionName;
+ my $getterFunctionName = GetEffectiveFunctionName("webkit_dom_${decamelizeInterfaceName}_get_" . $propFunctionName);
if (FunctionUsedToNotRaiseException($getterFunctionName)) {
$getterFunctionName = $getterFunctionName . "_with_error";
}
@@ -565,7 +565,7 @@
push(@getterArguments, "nullptr") if $hasGetterException || FunctionUsedToRaiseException($getterFunctionName);
if (grep {$_ eq $attribute} @writeableProperties) {
- my $setterFunctionName = "webkit_dom_${decamelizeInterfaceName}_set_" . $propFunctionName;
+ my $setterFunctionName = GetEffectiveFunctionName("webkit_dom_${decamelizeInterfaceName}_set_" . $propFunctionName);
if (FunctionUsedToNotRaiseException($setterFunctionName)) {
$setterFunctionName = $setterFunctionName . "_with_error";
}
@@ -1022,6 +1022,12 @@
return $functionName . "_as_html_collection";
}
+ # Rename webkit_dom_html_input_element_get_capture as webkit_dom_html_input_element_get_capture_type since
+ # it changed the return value in r204312.
+ if ($functionName eq "webkit_dom_html_input_element_get_capture") {
+ return $functionName . "_type";
+ }
+
return $functionName;
}
