Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(547)

Issue 11471034: Merge 136878 (Closed)

Created:
8 years ago by tony
Modified:
8 years ago
Reviewers:
tony
CC:
chromium-reviews
Base URL:
http://svn.webkit.org/repository/webkit/branches/chromium/1312/
Visibility:
Public.

Description

Merge 136878 > REGRESSION(r135082): Restore the ability to insert author level style sheets from script > https://bugs.webkit.org/show_bug.cgi?id=104042 > > Reviewed by Antti Koivisto. > > .: > > Update exports for Internals.cpp. > > * Source/autotools/symbols.filter: > > Source/WebCore: > > Add DocumentStyleSheetCollection::addAuthorSheet so embedders can allow scripts > to insert author level styles. Expose the method to window.interals for testing. > > Test: userscripts/insert-stylesheets.html > > * WebCore.exp.in: Update exports for Internals.cpp. > * WebCore.order: Update exports for Internals.cpp. > * dom/DocumentStyleSheetCollection.cpp: > (WebCore::DocumentStyleSheetCollection::~DocumentStyleSheetCollection): > (WebCore::DocumentStyleSheetCollection::addAuthorSheet): Add the stylesheet and force a style recalc. > (WebCore::DocumentStyleSheetCollection::updateActiveStyleSheets): Include author level styles. > (WebCore::DocumentStyleSheetCollection::reportMemoryUsage): Include author styles. > * dom/DocumentStyleSheetCollection.h: > (WebCore::DocumentStyleSheetCollection::documentAuthorStyleSheets): Accessor. > (DocumentStyleSheetCollection): Keep track of author styles added by script. > * testing/Internals.cpp: > (WebCore::Internals::insertAuthorCSS): Testing addAuthorSheet. > (WebCore::Internals::insertUserCSS): Testing addUserSheet. > * testing/Internals.h: > * testing/Internals.idl: Add addAuthorSheet and addUserSheet. > > Source/WebKit/chromium: > > * src/WebDocument.cpp: > (WebKit::WebDocument::insertUserStyleSheet): Use addAuthorSheet if an author level script is requested. > > Source/WebKit2: > > Update exports for Internals.cpp. > > * win/WebKit2.def.in: > > LayoutTests: > > Add a test that makes sure that an author level style is set. > > * userscripts/insert-stylesheets-expected.txt: Added. > * userscripts/insert-stylesheets.html: Added. > TBR=tony@chromium.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=136960

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+133 lines, -4 lines) Patch
M ChangeLog View 1 chunk +11 lines, -0 lines 0 comments Download
M LayoutTests/ChangeLog View 2 chunks +12 lines, -1 line 0 comments Download
A + LayoutTests/userscripts/insert-stylesheets.html View 0 chunks +-1 lines, --1 lines 0 comments Download
A + LayoutTests/userscripts/insert-stylesheets-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M Source/WebCore/ChangeLog View 1 chunk +28 lines, -0 lines 0 comments Download
M Source/WebCore/WebCore.order View 1 chunk +6 lines, -0 lines 0 comments Download
M Source/WebCore/WebCore.exp.in View 1 chunk +6 lines, -0 lines 0 comments Download
M Source/WebCore/dom/DocumentStyleSheetCollection.h View 3 chunks +3 lines, -0 lines 0 comments Download
M Source/WebCore/dom/DocumentStyleSheetCollection.cpp View 4 chunks +11 lines, -0 lines 0 comments Download
M Source/WebCore/testing/Internals.h View 1 chunk +3 lines, -0 lines 0 comments Download
M Source/WebCore/testing/Internals.cpp View 2 chunks +17 lines, -0 lines 0 comments Download
M Source/WebCore/testing/Internals.idl View 1 chunk +3 lines, -0 lines 0 comments Download
M Source/WebKit/chromium/ChangeLog View 1 chunk +11 lines, -1 line 0 comments Download
M Source/WebKit/chromium/src/WebDocument.cpp View 1 chunk +6 lines, -4 lines 0 comments Download
M Source/WebKit2/ChangeLog View 1 chunk +11 lines, -0 lines 0 comments Download
M Source/autotools/symbols.filter View 1 chunk +7 lines, -0 lines 0 comments Download

Messages

Total messages: 1 (0 generated)
tony
8 years ago (2012-12-07 18:05:55 UTC) #1

          

Powered by Google App Engine
This is Rietveld 408576698