Diff
Modified: trunk/Source/WebCore/ChangeLog (98206 => 98207)
--- trunk/Source/WebCore/ChangeLog 2011-10-24 00:37:05 UTC (rev 98206)
+++ trunk/Source/WebCore/ChangeLog 2011-10-24 01:42:08 UTC (rev 98207)
@@ -1,3 +1,19 @@
+2011-10-23 Andreas Kling <[email protected]>
+
+ Remove style sheet constructors that take a style sheet parent.
+ https://bugs.webkit.org/show_bug.cgi?id=70692
+
+ Reviewed by Antti Koivisto.
+
+ Style sheets are never directly parented by other style sheets, they always
+ go via a rule (such as @import.)
+
+ * css/CSSStyleSheet.cpp:
+ * css/CSSStyleSheet.h:
+ (WebCore::CSSStyleSheet::create):
+ * css/StyleSheet.cpp:
+ * css/StyleSheet.h:
+
2011-10-23 Mark Hahnenberg <[email protected]>
Add deleteProperty to the MethodTable
Modified: trunk/Source/WebCore/css/CSSStyleSheet.cpp (98206 => 98207)
--- trunk/Source/WebCore/css/CSSStyleSheet.cpp 2011-10-24 00:37:05 UTC (rev 98206)
+++ trunk/Source/WebCore/css/CSSStyleSheet.cpp 2011-10-24 01:42:08 UTC (rev 98207)
@@ -51,16 +51,6 @@
}
#endif
-CSSStyleSheet::CSSStyleSheet(CSSStyleSheet* parentSheet, const String& href, const KURL& baseURL, const String& charset)
- : StyleSheet(parentSheet, href, baseURL)
- , m_charset(charset)
- , m_loadCompleted(false)
- , m_strictParsing(!parentSheet || parentSheet->useStrictParsing())
- , m_isUserStyleSheet(parentSheet ? parentSheet->isUserStyleSheet() : false)
- , m_hasSyntacticallyValidCSSHeader(true)
-{
-}
-
CSSStyleSheet::CSSStyleSheet(Node* parentNode, const String& href, const KURL& baseURL, const String& charset)
: StyleSheet(parentNode, href, baseURL)
, m_charset(charset)
Modified: trunk/Source/WebCore/css/CSSStyleSheet.h (98206 => 98207)
--- trunk/Source/WebCore/css/CSSStyleSheet.h 2011-10-24 00:37:05 UTC (rev 98206)
+++ trunk/Source/WebCore/css/CSSStyleSheet.h 2011-10-24 01:42:08 UTC (rev 98207)
@@ -38,7 +38,7 @@
public:
static PassRefPtr<CSSStyleSheet> create()
{
- return adoptRef(new CSSStyleSheet(static_cast<CSSStyleSheet*>(0), String(), KURL(), String()));
+ return adoptRef(new CSSStyleSheet(static_cast<CSSRule*>(0), String(), KURL(), String()));
}
static PassRefPtr<CSSStyleSheet> create(Node* ownerNode)
{
@@ -113,7 +113,6 @@
private:
CSSStyleSheet(Node* ownerNode, const String& originalURL, const KURL& finalURL, const String& charset);
- CSSStyleSheet(CSSStyleSheet* parentSheet, const String& originalURL, const KURL& finalURL, const String& charset);
CSSStyleSheet(CSSRule* ownerRule, const String& originalURL, const KURL& finalURL, const String& charset);
virtual bool isCSSStyleSheet() const { return true; }
Modified: trunk/Source/WebCore/css/StyleSheet.cpp (98206 => 98207)
--- trunk/Source/WebCore/css/StyleSheet.cpp 2011-10-24 00:37:05 UTC (rev 98206)
+++ trunk/Source/WebCore/css/StyleSheet.cpp 2011-10-24 01:42:08 UTC (rev 98207)
@@ -26,15 +26,6 @@
namespace WebCore {
-StyleSheet::StyleSheet(StyleSheet* parentSheet, const String& originalURL, const KURL& finalURL)
- : StyleBase(parentSheet)
- , m_parentNode(0)
- , m_originalURL(originalURL)
- , m_finalURL(finalURL)
- , m_disabled(false)
-{
-}
-
StyleSheet::StyleSheet(Node* parentNode, const String& originalURL, const KURL& finalURL)
: StyleBase(0)
, m_parentNode(parentNode)
Modified: trunk/Source/WebCore/css/StyleSheet.h (98206 => 98207)
--- trunk/Source/WebCore/css/StyleSheet.h 2011-10-24 00:37:05 UTC (rev 98206)
+++ trunk/Source/WebCore/css/StyleSheet.h 2011-10-24 01:42:08 UTC (rev 98207)
@@ -67,7 +67,6 @@
protected:
StyleSheet(Node* ownerNode, const String& href, const KURL& finalURL);
- StyleSheet(StyleSheet* parentSheet, const String& href, const KURL& finalURL);
StyleSheet(StyleBase* owner, const String& href, const KURL& finalURL);
private:
