Rename (updateLayout/updateStyle).*.() to updateStyleAndLayout.*.()

third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2007 Alp Toker <alp@atoker.com>
  * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008 Dirk Schulze <krit@webkit.org>
  * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
  * Copyright (C) 2012, 2013 Intel Corporation. All rights reserved.
  * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
  *
@@ skipping 304 matching lines @@
 void CanvasRenderingContext2D::scrollPathIntoView(Path2D* path2d)
 {
     scrollPathIntoViewInternal(path2d->path());
 }
 
 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();
     if (!renderer || !layoutBox)
         return;
 
     // Apply transformation and get the bounding rect
     Path transformedPath = path;
     transformedPath.transform(state().transform());
     FloatRect boundingRect = transformedPath.boundingRect();
@@ skipping 112 matching lines @@
 
     return serializedFont.toString();
 }
 
 void CanvasRenderingContext2D::setFont(const String& newFont)
 {
     // The style resolution required for rendering text is not available in frame-less documents.
     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
     // which would require that the font be re-resolved. This check has to
     // come after the layout tree update to flush pending style changes.
     if (newFont == state().unparsedFont() && state().hasRealizedFont() && m_fontsResolvedUsingCurrentStyle.size() > 0)
         return;
 
     CanvasFontCache* canvasFontCache = canvas()->document().canvasFontCache();
 
@@ skipping 192 matching lines @@
     case CanvasRenderingContext2DState::DirectionLTR:
         return LTR;
     }
     ASSERT_NOT_REACHED();
     return LTR;
 }
 
 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;
 }
 
 void CanvasRenderingContext2D::setDirection(const String& directionString)
 {
     CanvasRenderingContext2DState::Direction direction;
     if (directionString == inherit)
         direction = CanvasRenderingContext2DState::DirectionInherit;
     else if (directionString == rtl)
         direction = CanvasRenderingContext2DState::DirectionRTL;
@@ skipping 29 matching lines @@
 }
 
 TextMetrics* CanvasRenderingContext2D::measureText(const String& text)
 {
     TextMetrics* metrics = TextMetrics::create();
 
     // The style resolution required for rendering text is not available in frame-less documents.
     if (!canvas()->document().frame())
         return metrics;
 
-    canvas()->document().updateLayoutTreeForNode(canvas());
+    canvas()->document().updateStyleAndLayoutTreeForNode(canvas());
     const Font& font = accessFont();
 
     TextDirection direction;
     if (state().getDirection() == CanvasRenderingContext2DState::DirectionInherit)
         direction = determineDirectionality(text);
     else
         direction = toTextDirection(state().getDirection(), canvas());
     TextRun textRun(text, 0, 0, TextRun::AllowTrailingExpansion | TextRun::ForbidLeadingExpansion, direction, false);
     textRun.setNormalizeSpace(true);
     FloatRect textBounds = font.selectionRectForText(textRun, FloatPoint(), font.getFontDescription().computedSize(), 0, -1, true);
@@ skipping 27 matching lines @@
 
 void CanvasRenderingContext2D::drawTextInternal(const String& text, double x, double y, CanvasRenderingContext2DState::PaintType paintType, double* maxWidth)
 {
     // The style resolution required for rendering text is not available in frame-less documents.
     if (!canvas()->document().frame())
         return;
 
     // 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)
         return;
 
     if (!std::isfinite(x) || !std::isfinite(y))
         return;
     if (maxWidth && (!std::isfinite(*maxWidth) || *maxWidth <= 0))
         return;
 
@@ skipping 183 matching lines @@
 
     SkIRect dirtyRect;
     if (!computeDirtyRect(path.strokeBoundingRect(strokeData), &dirtyRect))
         return;
 
     didDraw(dirtyRect);
 }
 
 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();
     if (!axObjectCache || !lbmo || !renderer)
         return;
 
     // Get the transformed path.
     Path transformedPath = path;
     transformedPath.transform(state().transform());
 
@@ skipping 71 matching lines @@
 
 unsigned CanvasRenderingContext2D::hitRegionsCount() const
 {
     if (m_hitRegionManager)
         return m_hitRegionManager->getHitRegionsCount();
 
     return 0;
 }
 
 } // namespace blink