[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf
sullivan at apple.com
sullivan at apple.com
Tue Jan 5 23:44:48 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 12fcc4a55dd0a2ec95b81965183ca6f1dd5db679
Author: sullivan at apple.com <sullivan at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Dec 8 15:08:18 2009 +0000
Add isAutofilled getter to match existing setter.
Reviewed by Ada Chan.
WebCore:
* bindings/objc/DOMHTML.mm:
(-[DOMHTMLInputElement _isAutofilled]):
Implemented new cover function.
* bindings/objc/DOMPrivate.h:
Declared new cover function.
WebKit/win:
* DOMHTMLClasses.cpp:
(DOMHTMLInputElement::isAutofilled):
Implemented new cover function.
* DOMHTMLClasses.h:
Declared new cover function.
* Interfaces/DOMPrivate.idl:
Declared new interface.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51850 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 668351e..cce8dc5 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2009-12-08 John Sullivan <sullivan at apple.com>
+
+ Add isAutofilled getter to match existing setter.
+
+ Reviewed by Ada Chan.
+
+ * bindings/objc/DOMHTML.mm:
+ (-[DOMHTMLInputElement _isAutofilled]):
+ Implemented new cover function.
+
+ * bindings/objc/DOMPrivate.h:
+ Declared new cover function.
+
2009-12-08 Dominik Röttsches <dominik.roettsches at access-company.com>
Reviewed by Gustavo Noronha Silva.
diff --git a/WebCore/bindings/objc/DOMHTML.mm b/WebCore/bindings/objc/DOMHTML.mm
index 0a0d570..3488b35 100644
--- a/WebCore/bindings/objc/DOMHTML.mm
+++ b/WebCore/bindings/objc/DOMHTML.mm
@@ -140,7 +140,12 @@
return NSMakeRange(start, end - start);
}
return NSMakeRange(NSNotFound, 0);
-}
+}
+
+- (BOOL)_isAutofilled
+{
+ return core(self)->isAutofilled();
+}
- (void)_setAutofilled:(BOOL)filled
{
diff --git a/WebCore/bindings/objc/DOMPrivate.h b/WebCore/bindings/objc/DOMPrivate.h
index 4291cbc..b8e4460 100644
--- a/WebCore/bindings/objc/DOMPrivate.h
+++ b/WebCore/bindings/objc/DOMPrivate.h
@@ -67,10 +67,10 @@
@end
// All the methods in this category are used by Safari forms autofill and should not be used for any other purpose.
-// They are stopgap measures until we finish transitioning form controls to not use NSView. Each one should become
-// replaceable by public DOM API, and when that happens Safari will switch to implementations using that public API,
-// and these will be deleted.
+// Each one should eventually be replaced by public DOM API, and when that happens Safari will switch to implementations
+// using that public API, and these will be deleted.
@interface DOMHTMLInputElement (FormsAutoFillTransition)
+- (BOOL)_isAutofilled;
- (BOOL)_isTextField;
- (NSRect)_rectOnScreen; // bounding box of the text field, in screen coordinates
- (void)_replaceCharactersInRange:(NSRange)targetRange withString:(NSString *)replacementString selectingFromIndex:(int)index;
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index f734c83..dca9c02 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,19 @@
+2009-12-08 John Sullivan <sullivan at apple.com>
+
+ Add isAutofilled getter to match existing setter.
+
+ Reviewed by Ada Chan.
+
+ * DOMHTMLClasses.cpp:
+ (DOMHTMLInputElement::isAutofilled):
+ Implemented new cover function.
+
+ * DOMHTMLClasses.h:
+ Declared new cover function.
+
+ * Interfaces/DOMPrivate.idl:
+ Declared new interface.
+
2009-12-07 Gavin Barraclough <barraclough at apple.com>
Reviewed by NOBODY (Windows build fix part III).
diff --git a/WebKit/win/DOMHTMLClasses.cpp b/WebKit/win/DOMHTMLClasses.cpp
index db5052e..2adaaa7 100644
--- a/WebKit/win/DOMHTMLClasses.cpp
+++ b/WebKit/win/DOMHTMLClasses.cpp
@@ -1357,6 +1357,15 @@ HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::setAutofilled(
return S_OK;
}
+HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::isAutofilled(
+ /* [retval][out] */ BOOL* result)
+{
+ ASSERT(m_element && m_element->hasTagName(inputTag));
+ HTMLInputElement* inputElement = static_cast<HTMLInputElement*>(m_element);
+ *result = inputElement->isAutofilled() ? TRUE : FALSE;
+ return S_OK;
+}
+
// DOMHTMLInputElement -- IFormPromptAdditions ------------------------------------
HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::isUserEdited(
diff --git a/WebKit/win/DOMHTMLClasses.h b/WebKit/win/DOMHTMLClasses.h
index 0f99787..f520c3c 100644
--- a/WebKit/win/DOMHTMLClasses.h
+++ b/WebKit/win/DOMHTMLClasses.h
@@ -2020,6 +2020,9 @@ public:
virtual HRESULT STDMETHODCALLTYPE setAutofilled(
/* [in] */ BOOL filled);
+ virtual HRESULT STDMETHODCALLTYPE isAutofilled(
+ /* [retval][out] */ BOOL *result);
+
// IFormPromptAdditions
virtual HRESULT STDMETHODCALLTYPE isUserEdited(
/* [retval][out] */ BOOL *result);
diff --git a/WebKit/win/Interfaces/DOMPrivate.idl b/WebKit/win/Interfaces/DOMPrivate.idl
index 7210943..3365565 100644
--- a/WebKit/win/Interfaces/DOMPrivate.idl
+++ b/WebKit/win/Interfaces/DOMPrivate.idl
@@ -51,9 +51,8 @@ interface IDOMElementPrivate : IUnknown
/*
All the methods in this category are used by Safari forms autofill and should not be used for any other purpose.
- They are stopgap measures until we finish transitioning form controls to not use NSView. Each one should become
- replaceable by public DOM API, and when that happens Safari will switch to implementations using that public API,
- and these will be deleted.
+ Each one should eventually be replaced by public DOM API, and when that happens Safari will switch to implementations
+ using that public API, and these will be deleted.
@interface DOMHTMLInputElement(FormsAutoFillTransition)
*/
@@ -89,6 +88,11 @@ interface IFormsAutoFillTransition : IUnknown
- (void)_setAutofilled:(BOOL)filled;
*/
HRESULT setAutofilled([in] BOOL filled);
+
+ /*
+ - (BOOL)_isAutofilled;
+ */
+ HRESULT isAutofilled([out, retval] BOOL* result);
}
/*
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list