Changeset 57699 in webkit


Ignore:
Timestamp:
Apr 15, 2010 6:00:21 PM (14 years ago)
Author:
eric@webkit.org
Message:

2010-04-15 Matt Perry <​mpcomplete@chromium.org>

Reviewed by Dimitri Glazkov.

Implement layoutTestController's addUserStyleSheet and
setAuthorAndUserStylesEnabled on Chromium port.
​https://bugs.webkit.org/show_bug.cgi?id=37595

  • public/WebSettings.h:
  • public/WebView.h:
  • src/WebSettingsImpl.cpp: (WebKit::WebSettingsImpl::setAuthorAndUserStylesEnabled):
  • src/WebSettingsImpl.h:
  • src/WebViewImpl.cpp: (WebKit::WebViewImpl::addUserStyleSheet):
  • src/WebViewImpl.h:
Location:
trunk/WebKit/chromium
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebKit/chromium/ChangeLog

    r57694 r57699  
     12010-04-15  Matt Perry  <mpcomplete@chromium.org>
     2
     3        Reviewed by Dimitri Glazkov.
     4
     5        Implement layoutTestController's addUserStyleSheet and
     6        setAuthorAndUserStylesEnabled on Chromium port.
     7        https://bugs.webkit.org/show_bug.cgi?id=37595
     8
     9        * public/WebSettings.h:
     10        * public/WebView.h:
     11        * src/WebSettingsImpl.cpp:
     12        (WebKit::WebSettingsImpl::setAuthorAndUserStylesEnabled):
     13        * src/WebSettingsImpl.h:
     14        * src/WebViewImpl.cpp:
     15        (WebKit::WebViewImpl::addUserStyleSheet):
     16        * src/WebViewImpl.h:
     17
    1182010-04-15  Zhenyao Mo  <zmo@google.com>
    219

  • trunk/WebKit/chromium/public/WebSettings.h

    r55666 r57699  
    7070    virtual void setAllowScriptsToCloseWindows(bool) = 0;
    7171    virtual void setUserStyleSheetLocation(const WebURL&) = 0;
     72    virtual void setAuthorAndUserStylesEnabled(bool) = 0;
    7273    virtual void setUsesPageCache(bool) = 0;
    7374    virtual void setDownloadableBinaryFontsEnabled(bool) = 0;

  • trunk/WebKit/chromium/public/WebView.h

    r54586 r57699  
    284284    virtual void addUserScript(const WebString& sourceCode,
    285285                               bool runAtStart) = 0;
     286    virtual void addUserStyleSheet(const WebString& sourceCode) = 0;
    286287    virtual void removeAllUserContent() = 0;
    287288

  • trunk/WebKit/chromium/src/WebSettingsImpl.cpp

    r55666 r57699  
    186186}
    187187
     188void WebSettingsImpl::setAuthorAndUserStylesEnabled(bool enabled)
     189{
     190    m_settings->setAuthorAndUserStylesEnabled(enabled);
     191}
     192
    188193void WebSettingsImpl::setUsesPageCache(bool usesPageCache)
    189194{

  • trunk/WebKit/chromium/src/WebSettingsImpl.h

    r55666 r57699  
    7272    virtual void setAllowScriptsToCloseWindows(bool);
    7373    virtual void setUserStyleSheetLocation(const WebURL&);
     74    virtual void setAuthorAndUserStylesEnabled(bool);
    7475    virtual void setUsesPageCache(bool);
    7576    virtual void setDownloadableBinaryFontsEnabled(bool);

  • trunk/WebKit/chromium/src/WebViewImpl.cpp

    r57469 r57699  
    18871887}
    18881888
     1889void WebViewImpl::addUserStyleSheet(const WebString& sourceCode)
     1890{
     1891    PageGroup* pageGroup = PageGroup::pageGroup(pageGroupName);
     1892    RefPtr<DOMWrapperWorld> world(DOMWrapperWorld::create());
     1893    pageGroup->addUserStyleSheetToWorld(world.get(), sourceCode, WebURL(), 0, 0);
     1894}
     1895
    18891896void WebViewImpl::removeAllUserContent()
    18901897{

  • trunk/WebKit/chromium/src/WebViewImpl.h

    r57606 r57699  
    182182    virtual void addUserScript(const WebString& sourceCode,
    183183                               bool runAtStart);
     184    virtual void addUserStyleSheet(const WebString& sourceCode);
    184185    virtual void removeAllUserContent();
    185186
Note: See TracChangeset for help on using the changeset viewer.