Jacek Caban : mshtml: Use get_elem_attr_value helper in get_font_size.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3efaaacf3c5add5e99c689d40ddeea574c6dfd2e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3efaaacf3c5add5e99c689d40d...

Author: Jacek Caban 
Date:   Tue May 27 11:29:11 2014 +0200

mshtml: Use get_elem_attr_value helper in get_font_size.

---

dlls/mshtml/editor.c |   21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c
index cfab2ed..14aab53 100644
--- a/dlls/mshtml/editor.c
+++ b/dlls/mshtml/editor.c
@@ -263,7 +263,7 @@ static void remove_child_attr(nsIDOMElement *elem, LPCWSTR tag, nsAString *attr_
 static void get_font_size(HTMLDocument *This, WCHAR *ret)
 {
     nsISelection *nsselection = get_ns_selection(This);
-    nsIDOMElement *elem = NULL;
+    nsIDOMHTMLElement *elem = NULL;
     nsIDOMNode *node = NULL, *tmp_node;
     nsAString tag_str;
     LPCWSTR tag;
@@ -284,36 +284,29 @@ static void get_font_size(HTMLDocument *This, WCHAR *ret)
             break;

if(node_type == ELEMENT_NODE) {
-            nsIDOMNode_QueryInterface(node, &IID_nsIDOMElement, (void**)&elem);
+            nsIDOMNode_QueryInterface(node, &IID_nsIDOMHTMLElement, (void**)&elem);

nsAString_Init(&tag_str, NULL);
-            nsIDOMElement_GetTagName(elem, &tag_str);
+            nsIDOMHTMLElement_GetTagName(elem, &tag_str);
             nsAString_GetData(&tag_str, &tag);

if(!strcmpiW(tag, fontW)) {
-                nsAString size_str, val_str;
-                LPCWSTR val;
+                nsAString val_str;
+                const PRUnichar *val;

TRACE("found font tag %p\n", elem);

-                nsAString_InitDepend(&size_str, sizeW);
-                nsAString_Init(&val_str, NULL);
-
-                nsIDOMElement_GetAttribute(elem, &size_str, &val_str);
-                nsAString_GetData(&val_str, &val);
-
+                get_elem_attr_value(elem, sizeW, &val_str, &val);
                 if(*val) {
                     TRACE("found size %s\n", debugstr_w(val));
                     strcpyW(ret, val);
                 }

-                nsAString_Finish(&size_str);
                 nsAString_Finish(&val_str);
             }

nsAString_Finish(&tag_str);
-
-            nsIDOMElement_Release(elem);
+            nsIDOMHTMLElement_Release(elem);
         }

if(*ret)