Changeset 65193 in webkit


Ignore:
Timestamp:
Aug 11, 2010 3:54:35 PM (14 years ago)
Author:
aa@chromium.org
Message:

2010-08-11 Kenneth Russell <kbr@google.com>

Reviewed by Dimitri Glazkov.

Remove obsolete texImage2D and texSubImage2D entry points
https://bugs.webkit.org/show_bug.cgi?id=40320

No new tests; covered by existing WebGL tests.

  • html/canvas/WebGLRenderingContext.cpp:
  • html/canvas/WebGLRenderingContext.h:
  • html/canvas/WebGLRenderingContext.idl:

2010-08-11 James Hawkins <jhawkins@chromium.org>

Reviewed by Dmitry Titov.

[Chromium] Notify the WebFrameClient when the frame is detached from
the view. This is used to clear the cached frame in the FormManager.
Eventually this will be removed once handling forms is moved into
WebCore.
https://bugs.webkit.org/show_bug.cgi?id=43648

  • public/WebFrameClient.h: (WebKit::WebFrameClient::frameDetached):
  • src/FrameLoaderClientImpl.cpp: (WebKit::FrameLoaderClientImpl::detachedFromParent3):
Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r65192 r65193  
    5555        * svg/graphics/SVGImage.cpp:
    5656        (WebCore::SVGImage::dataChanged):
    57 
    58 2010-08-10  Aaron Boodman  <aa@chromium.org>
    59 
    60         Reviewed by David Hyatt.
    61 
    62         Make the cascade level of "user" styles configurable
    63         https://bugs.webkit.org/show_bug.cgi?id=43457
    64 
    65         * css/CSSStyleSelector.cpp:
    66         (WebCore::CSSStyleSelector::CSSStyleSelector): Handle the case where user styles might have author level. Minor refactor.
    67         * dom/Document.cpp:
    68         (WebCore::Document::pageGroupUserSheets): Set isUserStyle on created stylesheet objects appropriately.
    69         * page/PageGroup.cpp:
    70         (WebCore::PageGroup::addUserStyleSheetToWorld): Add new optional "level" argument.
    71         * page/PageGroup.h: Ditto.
    72         * page/UserStyleSheet.h: Add level property.
    73         (WebCore::UserStyleSheet::):
    74         (WebCore::UserStyleSheet::UserStyleSheet):
    75         (WebCore::UserStyleSheet::setLevel):
    76         (WebCore::UserStyleSheet::level):
    7757
    78582010-08-11  Rob Buis  <rwlbuis@gmail.com>
  • trunk/WebCore/WebCore.exp.in

    r65183 r65193  
    821821__ZN7WebCore9PageGroup20removeAllUserContentEv
    822822__ZN7WebCore9PageGroup21removeAllVisitedLinksEv
    823 __ZN7WebCore9PageGroup24addUserStyleSheetToWorldEPNS_15DOMWrapperWorldERKN3WTF6StringERKNS_4KURLENS3_10PassOwnPtrINS3_6VectorIS4_Lm0EEEEESD_NS_25UserContentInjectedFramesENS_14UserStyleSheet5LevelE
     823__ZN7WebCore9PageGroup24addUserStyleSheetToWorldEPNS_15DOMWrapperWorldERKN3WTF6StringERKNS_4KURLENS3_10PassOwnPtrINS3_6VectorIS4_Lm0EEEEESD_NS_25UserContentInjectedFramesE
    824824__ZN7WebCore9PageGroup25removeUserScriptFromWorldEPNS_15DOMWrapperWorldERKNS_4KURLE
    825825__ZN7WebCore9PageGroup26removeUserScriptsFromWorldEPNS_15DOMWrapperWorldE
  • trunk/WebCore/css/CSSStyleSelector.cpp

    r65183 r65193  
    461461    }
    462462
     463    // FIXME: This sucks! The user sheet is reparsed every time!
     464    if (pageUserSheet || pageGroupUserSheets) {
     465        m_userStyle = new CSSRuleSet();
     466        if (pageUserSheet)
     467            m_userStyle->addRulesFromSheet(pageUserSheet, *m_medium, this);
     468        if (pageGroupUserSheets) {
     469            unsigned length = pageGroupUserSheets->size();
     470            for (unsigned i = 0; i < length; i++)
     471                m_userStyle->addRulesFromSheet(pageGroupUserSheets->at(i).get(), *m_medium, this);
     472        }
     473    }
     474
     475    // add stylesheets from document
    463476    m_authorStyle = new CSSRuleSet();
    464 
    465     // FIXME: This sucks! The user sheet is reparsed every time!
    466     OwnPtr<CSSRuleSet> tempUserStyle(new CSSRuleSet);
    467     if (pageUserSheet)
    468         tempUserStyle->addRulesFromSheet(pageUserSheet, *m_medium, this);
    469     if (pageGroupUserSheets) {
    470         unsigned length = pageGroupUserSheets->size();
    471         for (unsigned i = 0; i < length; i++) {
    472             if (pageGroupUserSheets->at(i)->isUserStyleSheet())
    473                 tempUserStyle->addRulesFromSheet(pageGroupUserSheets->at(i).get(), *m_medium, this);
    474             else
    475                 m_authorStyle->addRulesFromSheet(pageGroupUserSheets->at(i).get(), *m_medium, this);
    476         }
    477     }
    478 
    479     if (tempUserStyle->m_ruleCount > 0)
    480         m_userStyle = tempUserStyle.leakPtr();
    481 
     477   
    482478    // Add rules from elements like SVG's <font-face>
    483479    if (mappedElementSheet)
    484480        m_authorStyle->addRulesFromSheet(mappedElementSheet, *m_medium, this);
    485481
    486     // add stylesheets from document
    487482    unsigned length = styleSheets->length();
    488483    for (unsigned i = 0; i < length; i++) {
     
    491486            m_authorStyle->addRulesFromSheet(static_cast<CSSStyleSheet*>(sheet), *m_medium, this);
    492487    }
    493 
     488   
    494489    if (doc->renderer() && doc->renderer()->style())
    495490        doc->renderer()->style()->font().update(fontSelector());
  • trunk/WebCore/dom/Document.cpp

    r65183 r65193  
    22262226                continue;
    22272227            RefPtr<CSSStyleSheet> parsedSheet = CSSStyleSheet::createInline(const_cast<Document*>(this), sheet->url());
    2228             parsedSheet->setIsUserStyleSheet(sheet->level() == UserStyleSheet::UserLevel);
     2228            parsedSheet->setIsUserStyleSheet(true);
    22292229            parsedSheet->parseString(sheet->source(), !inCompatMode());
    22302230            if (!m_pageGroupUserSheets)
  • trunk/WebCore/page/PageGroup.cpp

    r65183 r65193  
    237237void PageGroup::addUserStyleSheetToWorld(DOMWrapperWorld* world, const String& source, const KURL& url,
    238238                                         PassOwnPtr<Vector<String> > whitelist, PassOwnPtr<Vector<String> > blacklist,
    239                                          UserContentInjectedFrames injectedFrames,
    240                                          UserStyleSheet::Level level)
    241 {
    242     ASSERT_ARG(world, world);
    243 
    244     OwnPtr<UserStyleSheet> userStyleSheet(new UserStyleSheet(source, url, whitelist, blacklist, injectedFrames, level));
     239                                         UserContentInjectedFrames injectedFrames)
     240{
     241    ASSERT_ARG(world, world);
     242
     243    OwnPtr<UserStyleSheet> userStyleSheet(new UserStyleSheet(source, url, whitelist, blacklist, injectedFrames));
    245244    if (!m_userStyleSheets)
    246245        m_userStyleSheets.set(new UserStyleSheetMap);
  • trunk/WebCore/page/PageGroup.h

    r65183 r65193  
    8181        void addUserStyleSheetToWorld(DOMWrapperWorld*, const String& source, const KURL&,
    8282                                      PassOwnPtr<Vector<String> > whitelist, PassOwnPtr<Vector<String> > blacklist,
    83                                       UserContentInjectedFrames,
    84                                       UserStyleSheet::Level level = UserStyleSheet::UserLevel);
     83                                      UserContentInjectedFrames);
    8584
    8685        void removeUserScriptFromWorld(DOMWrapperWorld*, const KURL&);
  • trunk/WebCore/page/UserStyleSheet.h

    r65183 r65193  
    3838class UserStyleSheet : public Noncopyable {
    3939public:
    40     enum Level {
    41         UserLevel,
    42         AuthorLevel
    43     };
    44 
    4540    UserStyleSheet(const String& source, const KURL& url,
    4641                   PassOwnPtr<Vector<String> > whitelist, PassOwnPtr<Vector<String> > blacklist,
    47                    UserContentInjectedFrames injectedFrames, Level level)
     42                   UserContentInjectedFrames injectedFrames)
    4843        : m_source(source)
    4944        , m_url(url)
     
    5146        , m_blacklist(blacklist)
    5247        , m_injectedFrames(injectedFrames)
    53         , m_level(level)
    5448    {
    5549    }
     
    6054    const Vector<String>* blacklist() const { return m_blacklist.get(); }
    6155    UserContentInjectedFrames injectedFrames() const { return m_injectedFrames; }
    62     Level level() const { return m_level; }
    6356
    6457private:
     
    6861    OwnPtr<Vector<String> > m_blacklist;
    6962    UserContentInjectedFrames m_injectedFrames;
    70     Level m_level;
    7163};
    7264
  • trunk/WebKit/chromium/ChangeLog

    r65183 r65193  
    1 2010-08-10  Aaron Boodman  <aa@chromium.org>
    2 
    3         Reviewed by David Hyatt.
    4 
    5         Make the cascade level of "user" styles configurable
    6         https://bugs.webkit.org/show_bug.cgi?id=43457
    7 
    8         * src/WebViewImpl.cpp:
    9         (WebKit::WebView::addUserStyleSheet): Send "author" for the css level of user styles.
    10 
    1112010-08-11  James Hawkins  <jhawkins@chromium.org>
    122
  • trunk/WebKit/chromium/src/WebViewImpl.cpp

    r65183 r65193  
    19501950    PageGroup* pageGroup = PageGroup::pageGroup(pageGroupName);
    19511951    RefPtr<DOMWrapperWorld> world(DOMWrapperWorld::create());
    1952 
    1953     // FIXME: Current callers always want the level to be "author". It probably makes sense to let
    1954     // callers specify this though, since in other cases the caller will probably want "user" level.
    1955     //
    1956     // FIXME: It would be nice to populate the URL correctly, instead of passing an empty URL.
    19571952    pageGroup->addUserStyleSheetToWorld(world.get(), sourceCode, WebURL(), patterns.release(), 0,
    1958                                         static_cast<UserContentInjectedFrames>(injectIn),
    1959                                         UserStyleSheet::AuthorLevel);
     1953                                        static_cast<UserContentInjectedFrames>(injectIn));
    19601954}
    19611955
Note: See TracChangeset for help on using the changeset viewer.