Changeset 17730 in webkit

Timestamp:

Nov 11, 2006 7:49:45 AM (17 years ago)

Author:

rwlbuis

Message:

Reviewed by hyatt.

​http://bugzilla.opendarwin.org/show_bug.cgi?id=10893
InsertRule can not handle @import statements

Allow @import as part of a css rule.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/css-insert-import-rule-expected.txt (added)
• LayoutTests/fast/dom/css-insert-import-rule.html (added)
• LayoutTests/fast/dom/resources/css-insert-import-rule-red.css (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/css/CSSGrammar.y (modified) (2 diffs)
• WebCore/css/CSSImportRule.cpp (modified) (2 diffs)
• WebCore/css/CSSStyleSheet.cpp (modified) (4 diffs)
• WebCore/css/CSSStyleSheet.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2006-11-11  Rob Buis  <buis@kde.org>
+
+        Reviewed by hyatt.
+
+        Testcase for:
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=10893
+        InsertRule can not handle @import statements
+
+        * fast/dom/css-insert-import-rule-expected.txt: Added.
+        * fast/dom/css-insert-import-rule.html: Added.
+        * fast/dom/resources/css-insert-import-rule-red.css: Added.
+
 2006-11-11  Graham Dennis  <graham.dennis@gmail.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-11-11  Rob Buis  <buis@kde.org>
+
+        Reviewed by hyatt.
+
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=10893
+        InsertRule can not handle @import statements
+
+        Allow @import as part of a css rule.
+
+        * css/CSSGrammar.y:
+        * css/CSSImportRule.cpp:
+        (WebCore::CSSImportRule::insertedIntoParent):
+        * css/CSSStyleSheet.cpp:
+        (WebCore::CSSStyleSheet::CSSStyleSheet):
+        (WebCore::CSSStyleSheet::checkLoaded):
+        * css/CSSStyleSheet.h:
+        (WebCore::CSSStyleSheet::loadCompleted):
+
 2006-11-11  Alexey Proskuryakov  <ap@webkit.org>
 

trunk/WebCore/css/CSSGrammar.y

@@ -229 +229 @@
 %type <rule> charset
 %type <rule> ruleset
+%type <rule> ruleset_or_import
 %type <rule> media
 %type <rule> import
@@ -298 +299 @@
   ;
 
+ruleset_or_import:
+   ruleset |
+   import
+;
+
 webkit_rule:
-    WEBKIT_RULE_SYM '{' maybe_space ruleset maybe_space '}' {
+    WEBKIT_RULE_SYM '{' maybe_space ruleset_or_import maybe_space '}' {
         static_cast<CSSParser*>(parser)->rule = $4;
     }

trunk/WebCore/css/CSSImportRule.cpp

@@ -27 +27 @@
 #include "CSSStyleSheet.h"
 #include "DocLoader.h"
+#include "Document.h"
 #include "KURL.h"
 #include "MediaList.h"
@@ -101 +102 @@
     m_cachedSheet = docLoader->requestCSSStyleSheet(absHref, parentSheet->charset());
     if (m_cachedSheet) {
+        // if the import rule is issued dynamically, the sheet may be
+        // removed from the pending sheet count, so let the doc know
+        // the sheet being imported is pending.
+        if (parentSheet && parentSheet->loadCompleted())
+            parentSheet->doc()->addPendingSheet();
         m_loading = true;
         m_cachedSheet->ref(this);

trunk/WebCore/css/CSSStyleSheet.cpp

@@ -38 +38 @@
     , m_namespaces(0)
     , m_charset(charset)
+    , m_loadCompleted(false)
 {
 }
@@ -46 +47 @@
     , m_namespaces(0)
     , m_charset(charset)
+    , m_loadCompleted(false)
 {
 }
@@ -54 +56 @@
     , m_namespaces(0)
     , m_charset(charset)
+    , m_loadCompleted(false)
 {
 }
@@ -170 +173 @@
     if (m_parentNode)
         m_parentNode->sheetLoaded();
+    m_loadCompleted = true;
 }
 

trunk/WebCore/css/CSSStyleSheet.h

@@ -71 +71 @@
     const String& charset() const { return m_charset; }
 
+    bool loadCompleted() const { return m_loadCompleted; }
+
 protected:
     Document* m_doc;
     CSSNamespace* m_namespaces;
     String m_charset;
+    bool m_loadCompleted;
 };