commit dc26b37ecd9ae4431aa7e9d9847915e8c87f3b4a
author kling@webkit.org <kling@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Thu Feb 09 07:14:55 2012 +0000
committer kling@webkit.org <kling@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Thu Feb 09 07:14:55 2012 +0000
tree f2c64c68c9312e4a84d5e4400706e04f59bfca15
parent 7fde2688ded913f26901fdd35da1488c41b15a39

Simplify ownership of StyledElement::additionalAttributeStyles().
<http://webkit.org/b/78204>

Reviewed by Anders Carlsson.

Change additionalAttributeStyle() to return a raw pointer rather than a PassRefPtr.

* css/CSSStyleSelector.cpp:
(WebCore::CSSStyleSelector::matchAllRules):
(WebCore::CSSStyleSelector::canShareStyleWithElement):
* dom/StyledElement.h:
(WebCore::StyledElement::additionalAttributeStyle):
* html/HTMLTableCellElement.cpp:
(WebCore::HTMLTableCellElement::additionalAttributeStyle):
* html/HTMLTableCellElement.h:
(HTMLTableCellElement):
* html/HTMLTableColElement.cpp:
(WebCore::HTMLTableColElement::additionalAttributeStyle):
* html/HTMLTableColElement.h:
(HTMLTableColElement):
* html/HTMLTableElement.cpp:
(WebCore::HTMLTableElement::additionalAttributeStyle):
(WebCore::HTMLTableElement::additionalCellStyle):
(WebCore::HTMLTableElement::additionalGroupStyle):
* html/HTMLTableElement.h:
(HTMLTableElement):
* html/HTMLTableSectionElement.cpp:
(WebCore::HTMLTableSectionElement::additionalAttributeStyle):
* html/HTMLTableSectionElement.h:
(HTMLTableSectionElement):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@107185 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/html/HTMLTableElement.cpp

diff --git a/Source/WebCore/html/HTMLTableElement.cpp b/Source/WebCore/html/HTMLTableElement.cpp
index 97586c2..be3aaa2 100644
--- a/Source/WebCore/html/HTMLTableElement.cpp
+++ b/Source/WebCore/html/HTMLTableElement.cpp
@@ -443,7 +443,7 @@
     return style.release().leakRef();
 }
 
-PassRefPtr<StylePropertySet> HTMLTableElement::additionalAttributeStyle()
+StylePropertySet* HTMLTableElement::additionalAttributeStyle()
 {
     if ((!m_borderAttr && !m_borderColorAttr) || m_frameAttr)
         return 0;
@@ -530,11 +530,11 @@
     return style.release();
 }
 
-PassRefPtr<StylePropertySet> HTMLTableElement::additionalCellStyle()
+StylePropertySet* HTMLTableElement::additionalCellStyle()
 {
     if (!m_sharedCellStyle)
         m_sharedCellStyle = createSharedCellStyle();
-    return m_sharedCellStyle;
+    return m_sharedCellStyle.get();
 }
 
 static StylePropertySet* leakGroupBorderStyle(int rows)
@@ -554,7 +554,7 @@
     return style.release().leakRef();
 }
 
-PassRefPtr<StylePropertySet> HTMLTableElement::additionalGroupStyle(bool rows)
+StylePropertySet* HTMLTableElement::additionalGroupStyle(bool rows)
 {
     if (m_rulesAttr != GroupsRules)
         return 0;