Title: [99063] trunk/Source/WebCore
- Revision
- 99063
- Author
- [email protected]
- Date
- 2011-11-02 08:45:04 -0700 (Wed, 02 Nov 2011)
Log Message
CSSStyleRule: Devirtualize selectorText()
https://bugs.webkit.org/show_bug.cgi?id=71364
Patch by Andreas Kling <[email protected]> on 2011-11-02
Reviewed by Antti Koivisto.
Have CSSStyleRule::selectorText() redirect to CSSPageRule::pageSelectorText()
if type() is PAGE_RULE.
* css/CSSPageRule.cpp:
(WebCore::CSSPageRule::pageSelectorText):
* css/CSSPageRule.h:
* css/CSSStyleRule.cpp:
(WebCore::CSSStyleRule::selectorText):
* css/CSSStyleRule.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (99062 => 99063)
--- trunk/Source/WebCore/ChangeLog 2011-11-02 15:11:16 UTC (rev 99062)
+++ trunk/Source/WebCore/ChangeLog 2011-11-02 15:45:04 UTC (rev 99063)
@@ -1,5 +1,22 @@
2011-11-02 Andreas Kling <[email protected]>
+ CSSStyleRule: Devirtualize selectorText()
+ https://bugs.webkit.org/show_bug.cgi?id=71364
+
+ Reviewed by Antti Koivisto.
+
+ Have CSSStyleRule::selectorText() redirect to CSSPageRule::pageSelectorText()
+ if type() is PAGE_RULE.
+
+ * css/CSSPageRule.cpp:
+ (WebCore::CSSPageRule::pageSelectorText):
+ * css/CSSPageRule.h:
+ * css/CSSStyleRule.cpp:
+ (WebCore::CSSStyleRule::selectorText):
+ * css/CSSStyleRule.h:
+
+2011-11-02 Andreas Kling <[email protected]>
+
CSSRule: Devirtualize cssText()
https://bugs.webkit.org/show_bug.cgi?id=71292
Modified: trunk/Source/WebCore/css/CSSPageRule.cpp (99062 => 99063)
--- trunk/Source/WebCore/css/CSSPageRule.cpp 2011-11-02 15:11:16 UTC (rev 99062)
+++ trunk/Source/WebCore/css/CSSPageRule.cpp 2011-11-02 15:45:04 UTC (rev 99063)
@@ -36,7 +36,7 @@
{
}
-String CSSPageRule::selectorText() const
+String CSSPageRule::pageSelectorText() const
{
String text = "@page";
CSSSelector* selector = selectorList().first();
Modified: trunk/Source/WebCore/css/CSSPageRule.h (99062 => 99063)
--- trunk/Source/WebCore/css/CSSPageRule.h 2011-11-02 15:11:16 UTC (rev 99062)
+++ trunk/Source/WebCore/css/CSSPageRule.h 2011-11-02 15:45:04 UTC (rev 99063)
@@ -41,7 +41,7 @@
virtual ~CSSPageRule();
- virtual String selectorText() const;
+ String pageSelectorText() const;
private:
CSSPageRule(CSSStyleSheet* parent, int sourceLine);
Modified: trunk/Source/WebCore/css/CSSStyleRule.cpp (99062 => 99063)
--- trunk/Source/WebCore/css/CSSStyleRule.cpp 2011-11-02 15:11:16 UTC (rev 99062)
+++ trunk/Source/WebCore/css/CSSStyleRule.cpp 2011-11-02 15:45:04 UTC (rev 99063)
@@ -23,6 +23,7 @@
#include "CSSStyleRule.h"
#include "CSSMutableStyleDeclaration.h"
+#include "CSSPageRule.h"
#include "CSSParser.h"
#include "CSSSelector.h"
#include "CSSStyleSheet.h"
@@ -45,6 +46,9 @@
String CSSStyleRule::selectorText() const
{
+ if (isPageRule())
+ return static_cast<const CSSPageRule*>(this)->pageSelectorText();
+
String str;
for (CSSSelector* s = selectorList().first(); s; s = CSSSelectorList::next(s)) {
if (s != selectorList().first())
Modified: trunk/Source/WebCore/css/CSSStyleRule.h (99062 => 99063)
--- trunk/Source/WebCore/css/CSSStyleRule.h 2011-11-02 15:11:16 UTC (rev 99062)
+++ trunk/Source/WebCore/css/CSSStyleRule.h 2011-11-02 15:45:04 UTC (rev 99063)
@@ -40,7 +40,7 @@
}
virtual ~CSSStyleRule();
- virtual String selectorText() const;
+ String selectorText() const;
void setSelectorText(const String&);
CSSMutableStyleDeclaration* style() const { return m_style.get(); }
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
