Changeset 65183 in webkit

Timestamp:

Aug 11, 2010 1:38:00 PM (14 years ago)

Author:

aa@chromium.org

Message:

2010-08-10 Aaron Boodman <​aa@chromium.org>

Reviewed by David Hyatt.

Make the cascade level of "user" styles configurable
​https://bugs.webkit.org/show_bug.cgi?id=43457

• css/CSSStyleSelector.cpp: (WebCore::CSSStyleSelector::CSSStyleSelector): Handle the case where user styles might have author level. Minor refactor.
• dom/Document.cpp: (WebCore::Document::pageGroupUserSheets): Set isUserStyle on created stylesheet objects appropriately.
• page/PageGroup.cpp: (WebCore::PageGroup::addUserStyleSheetToWorld): Add new optional "level" argument.
• page/PageGroup.h: Ditto.
• page/UserStyleSheet.h: Add level property. (WebCore::UserStyleSheet::): (WebCore::UserStyleSheet::UserStyleSheet): (WebCore::UserStyleSheet::setLevel): (WebCore::UserStyleSheet::level):

2010-08-10 Aaron Boodman <​aa@chromium.org>

Reviewed by David Hyatt.

Make the cascade level of "user" styles configurable
​https://bugs.webkit.org/show_bug.cgi?id=43457

• src/WebViewImpl.cpp: (WebKit::WebView::addUserStyleSheet): Send "author" for the css level of user styles.

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.exp.in (modified) (1 diff)
• WebCore/css/CSSStyleSelector.cpp (modified) (2 diffs)
• WebCore/dom/Document.cpp (modified) (1 diff)
• WebCore/page/PageGroup.cpp (modified) (1 diff)
• WebCore/page/PageGroup.h (modified) (1 diff)
• WebCore/page/UserStyleSheet.h (modified) (4 diffs)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/WebViewImpl.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-10  Aaron Boodman  <aa@chromium.org>
+
+        Reviewed by David Hyatt.
+
+        Make the cascade level of "user" styles configurable
+        https://bugs.webkit.org/show_bug.cgi?id=43457
+
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::CSSStyleSelector): Handle the case where user styles might have author level. Minor refactor.
+        * dom/Document.cpp:
+        (WebCore::Document::pageGroupUserSheets): Set isUserStyle on created stylesheet objects appropriately.
+        * page/PageGroup.cpp:
+        (WebCore::PageGroup::addUserStyleSheetToWorld): Add new optional "level" argument.
+        * page/PageGroup.h: Ditto.
+        * page/UserStyleSheet.h: Add level property.
+        (WebCore::UserStyleSheet::):
+        (WebCore::UserStyleSheet::UserStyleSheet):
+        (WebCore::UserStyleSheet::setLevel):
+        (WebCore::UserStyleSheet::level):
+
 2010-08-11  Rob Buis  <rwlbuis@gmail.com>
 

trunk/WebCore/WebCore.exp.in

@@ -821 +821 @@
 __ZN7WebCore9PageGroup20removeAllUserContentEv
 __ZN7WebCore9PageGroup21removeAllVisitedLinksEv
-__ZN7WebCore9PageGroup24addUserStyleSheetToWorldEPNS_15DOMWrapperWorldERKN3WTF6StringERKNS_4KURLENS3_10PassOwnPtrINS3_6VectorIS4_Lm0EEEEESD_NS_25UserContentInjectedFramesE
+__ZN7WebCore9PageGroup24addUserStyleSheetToWorldEPNS_15DOMWrapperWorldERKN3WTF6StringERKNS_4KURLENS3_10PassOwnPtrINS3_6VectorIS4_Lm0EEEEESD_NS_25UserContentInjectedFramesENS_14UserStyleSheet5LevelE
 __ZN7WebCore9PageGroup25removeUserScriptFromWorldEPNS_15DOMWrapperWorldERKNS_4KURLE
 __ZN7WebCore9PageGroup26removeUserScriptsFromWorldEPNS_15DOMWrapperWorldE

trunk/WebCore/css/CSSStyleSelector.cpp

@@ -461 +461 @@
     }
 
+    m_authorStyle = new CSSRuleSet();
+
     // FIXME: This sucks! The user sheet is reparsed every time!
-    if (pageUserSheet || pageGroupUserSheets) {
-        m_userStyle = new CSSRuleSet();
-        if (pageUserSheet)
-            m_userStyle->addRulesFromSheet(pageUserSheet, *m_medium, this);
-        if (pageGroupUserSheets) {
-            unsigned length = pageGroupUserSheets->size();
-            for (unsigned i = 0; i < length; i++)
-                m_userStyle->addRulesFromSheet(pageGroupUserSheets->at(i).get(), *m_medium, this);
-        }
-    }
-
-    // add stylesheets from document
-    m_authorStyle = new CSSRuleSet();
-    
+    OwnPtr<CSSRuleSet> tempUserStyle(new CSSRuleSet);
+    if (pageUserSheet)
+        tempUserStyle->addRulesFromSheet(pageUserSheet, *m_medium, this);
+    if (pageGroupUserSheets) {
+        unsigned length = pageGroupUserSheets->size();
+        for (unsigned i = 0; i < length; i++) {
+            if (pageGroupUserSheets->at(i)->isUserStyleSheet())
+                tempUserStyle->addRulesFromSheet(pageGroupUserSheets->at(i).get(), *m_medium, this);
+            else
+                m_authorStyle->addRulesFromSheet(pageGroupUserSheets->at(i).get(), *m_medium, this);
+        }
+    }
+
+    if (tempUserStyle->m_ruleCount > 0)
+        m_userStyle = tempUserStyle.leakPtr();
+
     // Add rules from elements like SVG's <font-face>
     if (mappedElementSheet)
         m_authorStyle->addRulesFromSheet(mappedElementSheet, *m_medium, this);
 
+    // add stylesheets from document
     unsigned length = styleSheets->length();
     for (unsigned i = 0; i < length; i++) {
@@ -486 +491 @@
             m_authorStyle->addRulesFromSheet(static_cast<CSSStyleSheet*>(sheet), *m_medium, this);
     }
-    
+
     if (doc->renderer() && doc->renderer()->style())
         doc->renderer()->style()->font().update(fontSelector());

trunk/WebCore/dom/Document.cpp

@@ -2226 +2226 @@
                 continue;
             RefPtr<CSSStyleSheet> parsedSheet = CSSStyleSheet::createInline(const_cast<Document*>(this), sheet->url());
-            parsedSheet->setIsUserStyleSheet(true);
+            parsedSheet->setIsUserStyleSheet(sheet->level() == UserStyleSheet::UserLevel);
             parsedSheet->parseString(sheet->source(), !inCompatMode());
             if (!m_pageGroupUserSheets)

trunk/WebCore/page/PageGroup.cpp

@@ -237 +237 @@
 void PageGroup::addUserStyleSheetToWorld(DOMWrapperWorld* world, const String& source, const KURL& url,
                                          PassOwnPtr<Vector<String> > whitelist, PassOwnPtr<Vector<String> > blacklist,
-                                         UserContentInjectedFrames injectedFrames)
-{
-    ASSERT_ARG(world, world);
-
-    OwnPtr<UserStyleSheet> userStyleSheet(new UserStyleSheet(source, url, whitelist, blacklist, injectedFrames));
+                                         UserContentInjectedFrames injectedFrames,
+                                         UserStyleSheet::Level level)
+{
+    ASSERT_ARG(world, world);
+
+    OwnPtr<UserStyleSheet> userStyleSheet(new UserStyleSheet(source, url, whitelist, blacklist, injectedFrames, level));
     if (!m_userStyleSheets)
         m_userStyleSheets.set(new UserStyleSheetMap);

trunk/WebCore/page/PageGroup.h

@@ -81 +81 @@
         void addUserStyleSheetToWorld(DOMWrapperWorld*, const String& source, const KURL&,
                                       PassOwnPtr<Vector<String> > whitelist, PassOwnPtr<Vector<String> > blacklist,
-                                      UserContentInjectedFrames);
+                                      UserContentInjectedFrames,
+                                      UserStyleSheet::Level level = UserStyleSheet::UserLevel);
 
         void removeUserScriptFromWorld(DOMWrapperWorld*, const KURL&);

trunk/WebCore/page/UserStyleSheet.h

@@ -38 +38 @@
 class UserStyleSheet : public Noncopyable {
 public:
+    enum Level {
+        UserLevel,
+        AuthorLevel
+    };
+
     UserStyleSheet(const String& source, const KURL& url,
                    PassOwnPtr<Vector<String> > whitelist, PassOwnPtr<Vector<String> > blacklist,
-                   UserContentInjectedFrames injectedFrames)
+                   UserContentInjectedFrames injectedFrames, Level level)
         : m_source(source)
         , m_url(url)
@@ -46 +51 @@
         , m_blacklist(blacklist)
         , m_injectedFrames(injectedFrames)
+        , m_level(level)
     {
     }
@@ -54 +60 @@
     const Vector<String>* blacklist() const { return m_blacklist.get(); }
     UserContentInjectedFrames injectedFrames() const { return m_injectedFrames; }
+    Level level() const { return m_level; }
 
 private:
@@ -61 +68 @@
     OwnPtr<Vector<String> > m_blacklist;
     UserContentInjectedFrames m_injectedFrames;
+    Level m_level;
 };
 

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-08-10  Aaron Boodman  <aa@chromium.org>
+
+        Reviewed by David Hyatt.
+
+        Make the cascade level of "user" styles configurable
+        https://bugs.webkit.org/show_bug.cgi?id=43457
+
+        * src/WebViewImpl.cpp:
+        (WebKit::WebView::addUserStyleSheet): Send "author" for the css level of user styles.
+
 2010-08-11  James Hawkins  <jhawkins@chromium.org>
 

trunk/WebKit/chromium/src/WebViewImpl.cpp

@@ -1950 +1950 @@
     PageGroup* pageGroup = PageGroup::pageGroup(pageGroupName);
     RefPtr<DOMWrapperWorld> world(DOMWrapperWorld::create());
+
+    // FIXME: Current callers always want the level to be "author". It probably makes sense to let
+    // callers specify this though, since in other cases the caller will probably want "user" level.
+    //
+    // FIXME: It would be nice to populate the URL correctly, instead of passing an empty URL.
     pageGroup->addUserStyleSheetToWorld(world.get(), sourceCode, WebURL(), patterns.release(), 0,
-                                        static_cast<UserContentInjectedFrames>(injectIn));
+                                        static_cast<UserContentInjectedFrames>(injectIn),
+                                        UserStyleSheet::AuthorLevel);
 }