third_party/WebKit/Source/core/paint/ListMarkerPainter.cpp - Issue 1367193003: NOT FOR LANDING Allocate SVGImageForContainer on demand

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/paint/ListMarkerPainter.cpp

Issue 1367193003: NOT FOR LANDING Allocate SVGImageForContainer on demand (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Added some NeedsRebaseline and revived some LayoutListMarker code that turned out to be important Created 5 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/core/paint/ImagePainter.cpp ('k') | third_party/WebKit/Source/core/paint/NinePieceImagePainter.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/paint/ListMarkerPainter.cpp

diff --git a/third_party/WebKit/Source/core/paint/ListMarkerPainter.cpp b/third_party/WebKit/Source/core/paint/ListMarkerPainter.cpp

index ff115bb4d93e4fdbd03351cc35865bc7b0d8dcc7..154b927ff8bbca8dfa89c468a8c76ebbb2975ec7 100644

--- a/third_party/WebKit/Source/core/paint/ListMarkerPainter.cpp

+++ b/third_party/WebKit/Source/core/paint/ListMarkerPainter.cpp

@@ -13,6 +13,7 @@

#include "core/paint/BlockPainter.h"

#include "core/paint/LayoutObjectDrawingRecorder.h"

#include "core/paint/PaintInfo.h"

+#include "core/svg/graphics/SVGImageForContainer.h"

#include "platform/RuntimeEnabledFeatures.h"

#include "platform/geometry/LayoutPoint.h"

#include "platform/graphics/GraphicsContextStateSaver.h"

@@ -74,7 +75,9 @@ void ListMarkerPainter::paint(const PaintInfo& paintInfo, const LayoutPoint& pai

GraphicsContext* context = paintInfo.context;

if (m_layoutListMarker.isImage()) {

- context->drawImage(m_layoutListMarker.image()->image(&m_layoutListMarker, marker.size()).get(), marker);

+ RefPtr<Image> image = m_layoutListMarker.image()->image(

+ &m_layoutListMarker, marker.size(), m_layoutListMarker.styleRef().effectiveZoom(), m_layoutListMarker.image()->url());

+ context->drawImage(image.get(), marker);

if (m_layoutListMarker.selectionState() != SelectionNone) {

LayoutRect selRect = m_layoutListMarker.localSelectionRect();

selRect.moveBy(boxOrigin);