Changeset 91893 in webkit

Timestamp:

Jul 27, 2011 8:00:54 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

Implement sizes attribute for link tag from HTML5
​https://bugs.webkit.org/show_bug.cgi?id=37674

Patch by Rachel Blum <​groby@chromium.org> on 2011-07-27
Reviewed by Dimitri Glazkov.

Source/WebCore:

Test: fast/dom/icon-size-property.html

• WebCore.gypi:
• WebCore.pro:
• bindings/js/JSHTMLLinkElementCustom.cpp:

(WebCore::JSHTMLLinkElement::sizes):
(WebCore::JSHTMLLinkElement::setSizes):

• bindings/v8/custom/V8HTMLLinkElementCustom.cpp: Added.

(WebCore::V8HTMLLinkElement::sizesAccessorGetter):
(WebCore::V8HTMLLinkElement::sizesAccessorSetter):

• html/HTMLAttributeNames.in:
• html/HTMLLinkElement.cpp:

(WebCore::HTMLLinkElement::HTMLLinkElement):
(WebCore::HTMLLinkElement::parseMappedAttribute):
(WebCore::HTMLLinkElement::sizes):
(WebCore::HTMLLinkElement::setSizes):

• html/HTMLLinkElement.h:
• html/HTMLLinkElement.idl:

LayoutTests:

• fast/dom/icon-size-property-expected.txt: Added.
• fast/dom/icon-size-property.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/icon-size-property-expected.txt (added)
• LayoutTests/fast/dom/icon-size-property.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/WebCore.gypi (modified) (1 diff)
• Source/WebCore/WebCore.pro (modified) (1 diff)
• Source/WebCore/bindings/js/JSHTMLLinkElementCustom.cpp (modified) (3 diffs)
• Source/WebCore/bindings/v8/custom/V8HTMLLinkElementCustom.cpp (added)
• Source/WebCore/html/HTMLAttributeNames.in (modified) (1 diff)
• Source/WebCore/html/HTMLLinkElement.cpp (modified) (4 diffs)
• Source/WebCore/html/HTMLLinkElement.h (modified) (4 diffs)
• Source/WebCore/html/HTMLLinkElement.idl (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-07-27  Rachel Blum  <groby@chromium.org>
+
+        Implement sizes attribute for link tag from HTML5
+        https://bugs.webkit.org/show_bug.cgi?id=37674
+
+        Reviewed by Dimitri Glazkov.
+
+        * fast/dom/icon-size-property-expected.txt: Added.
+        * fast/dom/icon-size-property.html: Added.
+
 2011-07-27  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-27  Rachel Blum  <groby@chromium.org>
+
+        Implement sizes attribute for link tag from HTML5
+        https://bugs.webkit.org/show_bug.cgi?id=37674
+
+        Reviewed by Dimitri Glazkov.
+
+        Test: fast/dom/icon-size-property.html
+
+        * WebCore.gypi:
+        * WebCore.pro:
+        * bindings/js/JSHTMLLinkElementCustom.cpp:
+        (WebCore::JSHTMLLinkElement::sizes):
+        (WebCore::JSHTMLLinkElement::setSizes):
+        * bindings/v8/custom/V8HTMLLinkElementCustom.cpp: Added.
+        (WebCore::V8HTMLLinkElement::sizesAccessorGetter):
+        (WebCore::V8HTMLLinkElement::sizesAccessorSetter):
+        * html/HTMLAttributeNames.in:
+        * html/HTMLLinkElement.cpp:
+        (WebCore::HTMLLinkElement::HTMLLinkElement):
+        (WebCore::HTMLLinkElement::parseMappedAttribute):
+        (WebCore::HTMLLinkElement::sizes):
+        (WebCore::HTMLLinkElement::setSizes):
+        * html/HTMLLinkElement.h:
+        * html/HTMLLinkElement.idl:
+
 2011-07-27  Pratik Solanki  <psolanki@apple.com>
 

trunk/Source/WebCore/WebCore.gypi

@@ -2155 +2155 @@
             'bindings/v8/custom/V8HTMLImageElementConstructor.h',
             'bindings/v8/custom/V8HTMLInputElementCustom.cpp',
+            'bindings/v8/custom/V8HTMLLinkElementCustom.cpp',
             'bindings/v8/custom/V8HTMLOptionElementConstructor.cpp',
             'bindings/v8/custom/V8HTMLOptionElementConstructor.h',

trunk/Source/WebCore/WebCore.pro

@@ -185 +185 @@
         bindings/v8/custom/V8HTMLImageElementConstructor.cpp \
         bindings/v8/custom/V8HTMLInputElementCustom.cpp \
+        bindings/v8/custom/V8HTMLLinkElementCustom.cpp \
         bindings/v8/custom/V8HTMLOptionElementConstructor.cpp \
         bindings/v8/custom/V8HTMLOptionsCollectionCustom.cpp \

trunk/Source/WebCore/bindings/js/JSHTMLLinkElementCustom.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2010 Apple Inc. All rights reserved.
+ * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -28 +29 @@
 
 #include "HTMLLinkElement.h"
+#include "JSDOMBinding.h"
+#include "JSDOMSettableTokenList.h"
+#include <wtf/GetPtr.h>
 
 using namespace JSC;
@@ -33 +37 @@
 namespace WebCore {
 
+JSValue JSHTMLLinkElement::sizes(ExecState* exec) const
+{
+    HTMLLinkElement* output = static_cast<HTMLLinkElement*>(impl());
+    JSValue result = toJS(exec, globalObject(), WTF::getPtr(output->sizes()));
+    return result;
 }
+
+void JSHTMLLinkElement::setSizes(ExecState* exec, JSValue value)
+{
+    HTMLLinkElement* output = static_cast<HTMLLinkElement*>(impl());
+    output->setSizes(valueToStringWithNullCheck(exec, value));
+}
+
+} // namespace WebCore

trunk/Source/WebCore/html/HTMLAttributeNames.in

@@ -273 +273 @@
 shape
 size
+sizes
 sortable
 sortdirection

trunk/Source/WebCore/html/HTMLLinkElement.cpp

@@ -5 +5 @@
  * Copyright (C) 2003, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Rob Buis (rwlbuis@gmail.com)
+ * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -54 +55 @@
     : HTMLElement(tagName, document)
     , m_linkLoader(this)
+    , m_sizes(DOMSettableTokenList::create())
     , m_loading(false)
     , m_isEnabledViaScript(false)
@@ -133 +135 @@
     } else if (attr->name() == typeAttr) {
         m_type = attr->value();
+        process();
+    } else if (attr->name() == sizesAttr) {
+        setSizes(attr->value());
         process();
     } else if (attr->name() == mediaAttr) {
@@ -441 +446 @@
 }
 
-}
+DOMSettableTokenList* HTMLLinkElement::sizes() const
+{
+    return m_sizes.get();
+}
+
+void HTMLLinkElement::setSizes(const String& value)
+{
+    m_sizes->setValue(value);
+}
+
+} // namespace WebCore

trunk/Source/WebCore/html/HTMLLinkElement.h

@@ -3 +3 @@
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2008, 2010 Apple Inc. All rights reserved.
+ * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -27 +28 @@
 #include "CachedResourceClient.h"
 #include "CachedResourceHandle.h"
+#include "DOMSettableTokenList.h"
 #include "HTMLElement.h"
 #include "IconURL.h"
@@ -54 +56 @@
     StyleSheet* sheet() const;
 
-    // FIXME: This should be remaned isStyleSheetLoading as this is only used for stylesheets.
+    // FIXME: This should be renamed isStyleSheetLoading as this is only used for stylesheets.
     bool isLoading() const;
     bool isEnabledViaScript() const { return m_isEnabledViaScript; }
     bool disabled() const;
     void setDisabled(bool);
+    void setSizes(const String&);
+    DOMSettableTokenList* sizes() const;
 
 private:
@@ -100 +104 @@
     String m_type;
     String m_media;
+    RefPtr<DOMSettableTokenList> m_sizes;
     LinkRelAttribute m_relAttribute;
     bool m_loading;

trunk/Source/WebCore/html/HTMLLinkElement.idl

@@ -2 +2 @@
  * Copyright (C) 2006, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
+ * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -29 +30 @@
         attribute [Reflect] DOMString rel;
         attribute [Reflect] DOMString rev;
+#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
+        attribute [Custom] DOMSettableTokenList sizes;
+#endif
         attribute [Reflect] DOMString target;
         attribute [Reflect] DOMString type;