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

Unified Diff: third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.cpp

Issue 1896793002: Rename (updateLayout/updateStyle).*.() to updateStyleAndLayout.*.() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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
Index: third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.cpp
diff --git a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.cpp b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.cpp
index c93dce3c8cc0d6313d700546e6a50107d88ee8e1..5aa2d8b4981e77a3a418b6c3802a314f628605a0 100644
--- a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.cpp
+++ b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.cpp
@@ -327,7 +327,7 @@ void CanvasRenderingContext2D::scrollPathIntoViewInternal(const Path& path)
if (!state().isTransformInvertible() || path.isEmpty())
return;
- canvas()->document().updateLayoutIgnorePendingStylesheets();
+ canvas()->document().updateStyleAndLayoutIgnorePendingStylesheets();
LayoutObject* renderer = canvas()->layoutObject();
LayoutBox* layoutBox = canvas()->layoutBox();
@@ -460,7 +460,7 @@ void CanvasRenderingContext2D::setFont(const String& newFont)
if (!canvas()->document().frame())
return;
- canvas()->document().updateLayoutTreeForNode(canvas());
+ canvas()->document().updateStyleAndLayoutTreeForNode(canvas());
// The following early exit is dependent on the cache not being empty
// because an empty cache may indicate that a style change has occured
@@ -673,7 +673,7 @@ static inline TextDirection toTextDirection(CanvasRenderingContext2DState::Direc
String CanvasRenderingContext2D::direction() const
{
if (state().getDirection() == CanvasRenderingContext2DState::DirectionInherit)
- canvas()->document().updateLayoutTreeForNode(canvas());
+ canvas()->document().updateStyleAndLayoutTreeForNode(canvas());
return toTextDirection(state().getDirection(), canvas()) == RTL ? rtl : ltr;
}
@@ -723,7 +723,7 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text)
if (!canvas()->document().frame())
return metrics;
- canvas()->document().updateLayoutTreeForNode(canvas());
+ canvas()->document().updateStyleAndLayoutTreeForNode(canvas());
const Font& font = accessFont();
TextDirection direction;
@@ -771,7 +771,7 @@ void CanvasRenderingContext2D::drawTextInternal(const String& text, double x, do
// accessFont needs the style to be up to date, but updating style can cause script to run,
// (e.g. due to autofocus) which can free the canvas (set size to 0, for example), so update
// style before grabbing the drawingCanvas.
- canvas()->document().updateLayoutTreeForNode(canvas());
+ canvas()->document().updateStyleAndLayoutTreeForNode(canvas());
SkCanvas* c = drawingCanvas();
if (!c)
@@ -975,7 +975,7 @@ void CanvasRenderingContext2D::drawFocusRing(const Path& path)
void CanvasRenderingContext2D::updateElementAccessibility(const Path& path, Element* element)
{
- element->document().updateLayoutIgnorePendingStylesheets();
+ element->document().updateStyleAndLayoutIgnorePendingStylesheets();
AXObjectCache* axObjectCache = element->document().existingAXObjectCache();
LayoutBoxModelObject* lbmo = canvas()->layoutBoxModelObject();
LayoutObject* renderer = canvas()->layoutObject();

Powered by Google App Engine
This is Rietveld 408576698