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

Unified Diff: Source/core/html/canvas/CanvasRenderingContext2D.cpp

Issue 87503003: Moving fontSelector from StyleResolver to StyleEngine. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Reverted hasAnyFontFaceRule Created 7 years, 1 month 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
Index: Source/core/html/canvas/CanvasRenderingContext2D.cpp
diff --git a/Source/core/html/canvas/CanvasRenderingContext2D.cpp b/Source/core/html/canvas/CanvasRenderingContext2D.cpp
index 5e926d794a99b9a7203fbff58192e59716b48ce9..7a68dc5aa882309ae4b8fe53985be0766bdf73df 100644
--- a/Source/core/html/canvas/CanvasRenderingContext2D.cpp
+++ b/Source/core/html/canvas/CanvasRenderingContext2D.cpp
@@ -2098,9 +2098,9 @@ void CanvasRenderingContext2D::setFont(const String& newFont)
if (state().m_realizedFont)
state().m_font.fontSelector()->unregisterForInvalidationCallbacks(&modifiableState());
modifiableState().m_font = newStyle->font();
- modifiableState().m_font.update(styleResolver->fontSelector());
+ modifiableState().m_font.update(canvas()->document().fontSelector());
modifiableState().m_realizedFont = true;
- styleResolver->fontSelector()->registerForInvalidationCallbacks(&modifiableState());
+ canvas()->document().fontSelector()->registerForInvalidationCallbacks(&modifiableState());
}
String CanvasRenderingContext2D::textAlign() const

Powered by Google App Engine
This is Rietveld 408576698