Changeset 192762 in webkit

Timestamp:

Nov 24, 2015, 12:37:31 AM (10 years ago)

Author:

peavo@outlook.com

Message:

[Win] Implement methods to get and set inner html.
​https://bugs.webkit.org/show_bug.cgi?id=151569

Reviewed by Alex Christensen.

• DOMHTMLClasses.cpp:

(DOMHTMLElement::innerHTML):
(DOMHTMLElement::setInnerHTML):
(DOMHTMLElement::innerText):

Location:

trunk/Source/WebKit/win

Files:

• ChangeLog (modified) (1 diff)
• DOMHTMLClasses.cpp (modified) (2 diffs)

trunk/Source/WebKit/win/ChangeLog

@@ +1 @@
+2015-11-24  Per Arne Vollan  <peavo@outlook.com>
+
+        [Win] Implement methods to get and set inner html.
+        https://bugs.webkit.org/show_bug.cgi?id=151569
+
+        Reviewed by Alex Christensen.
+
+        * DOMHTMLClasses.cpp:
+        (DOMHTMLElement::innerHTML):
+        (DOMHTMLElement::setInnerHTML):
+        (DOMHTMLElement::innerText):
+
 == Rolled over to ChangeLog-2015-11-21 ==

trunk/Source/WebKit/win/DOMHTMLClasses.cpp

@@ -503 +503 @@
 HRESULT DOMHTMLElement::innerHTML(__deref_opt_out BSTR* result)
 {
-    ASSERT_NOT_REACHED();
-    if (!result)
-        return E_POINTER;
-    *result = nullptr;
-    return E_NOTIMPL;
+    if (!result)
+        return E_POINTER;
+    String innerHtmlString = downcast<HTMLElement>(m_element)->innerHTML();
+    *result = BString(innerHtmlString).release();
+    return S_OK;
 }
         
-HRESULT DOMHTMLElement::setInnerHTML(_In_ BSTR /*html*/)
-{
-    ASSERT_NOT_REACHED();
-    return E_NOTIMPL;
+HRESULT DOMHTMLElement::setInnerHTML(_In_ BSTR html)
+{
+    ASSERT(is<HTMLElement>(m_element));
+    HTMLElement* htmlElement = downcast<HTMLElement>(m_element);
+    String htmlString(html, SysStringLen(html));
+    ExceptionCode ec = 0;
+    htmlElement->setInnerHTML(htmlString, ec);
+    return S_OK;
 }
         
@@ -529 +533 @@
 {
     ASSERT(is<HTMLElement>(m_element));
-    HTMLElement* htmlEle = downcast<HTMLElement>(m_element);
+    HTMLElement* htmlElement = downcast<HTMLElement>(m_element);
     WTF::String textString(text, SysStringLen(text));
     WebCore::ExceptionCode ec = 0;
-    htmlEle->setInnerText(textString, ec);
+    htmlElement->setInnerText(textString, ec);
     return S_OK;
 }