sync docs up with tip of tree

Also check in work in progress for blend modes,
round rects, and a placeholder for pictures.

One minor include change to add a parameter name
for SkBlendMode function.

TBR=reed@google.com
R=caryclark@google.com

Docs-Preview: https://skia.org/?cl=134200
Bug: skia:6898
Change-Id: I5d2a9221d61edb32d9c7edbb3193401605b2b513
Reviewed-on: https://skia-review.googlesource.com/134200
Reviewed-by: Cary Clark <caryclark@google.com>
Reviewed-by: Cary Clark <caryclark@skia.org>
Commit-Queue: Cary Clark <caryclark@skia.org>
Auto-Submit: Cary Clark <caryclark@skia.org>

1 files changed, 3 insertions, 19 deletions

diff --git a/site/user/api/SkRect_Reference.md b/site/user/api/SkRect_Reference.md
index fcd018d0df..02438608ca 100644
--- a/site/user/api/SkRect_Reference.md
+++ b/site/user/api/SkRect_Reference.md
@@ -86,7 +86,6 @@ SkRect global, <code>struct</code>, and <code>class</code> related member functi
   </tr>
 </table>
 
-
 ## <a name='Member_Function'>Member Function</a>
 
 
@@ -308,7 +307,6 @@ SkRect member functions read and modify the structure properties.
   </tr>
 </table>
 
-
 ## <a name='Member'>Member</a>
 
 
@@ -364,7 +362,6 @@ SkRect members may be read and written directly without using a member function.
   </tr>
 </table>
 
-
 ### Members
 
 <table style='border-collapse: collapse; width: 62.5em'>
@@ -458,7 +455,6 @@ SkRect can be constructed or initialized by these functions, including C++ class
   </tr>
 </table>
 
-
 <a name='SkRect_MakeEmpty'></a>
 ## MakeEmpty
 
@@ -888,7 +884,6 @@ than <a href='#SkRect_fBottom'>fBottom</a>.
   </tr>
 </table>
 
-
 <a name='SkRect_isEmpty'></a>
 ## isEmpty
 
@@ -1234,7 +1229,7 @@ large width: 4294967296
 <a href='undocumented#SkScalar'>SkScalar</a>    <a href='#SkRect_height'>height</a>() const
 </pre>
 
-Returns span on the y-axis. This does not check if <a href='SkIRect_Reference#IRect'>IRect</a> is sorted, or if
+Returns span on the y-axis. This does not check if <a href='#Rect'>Rect</a> is sorted, or if
 result fits in 32-bit float; result may be negative or infinity.
 
 ### Return Value
@@ -1345,7 +1340,6 @@ SkRect operators inline class member functions with arithmetic equivalents.
   </tr>
 </table>
 
-
 <a name='SkRect_equal_operator'></a>
 ## operator==
 
@@ -1459,7 +1453,6 @@ test with NaN is not equal to itself
   </tr>
 </table>
 
-
 <a name='SkRect_toQuad'></a>
 ## toQuad
 
@@ -1470,8 +1463,6 @@ void <a href='#SkRect_toQuad'>toQuad</a>(<a href='SkPoint_Reference#SkPoint'>SkP
 Returns four points in <a href='#SkRect_toQuad_quad'>quad</a> that enclose <a href='#Rect'>Rect</a> ordered as: top-left, top-right,
 bottom-right, bottom-left.
 
-Consider adding param to control whether <a href='#SkRect_toQuad_quad'>quad</a> is clockwise or counterclockwise.
-
 ### Parameters
 
 <table>  <tr>    <td><a name='SkRect_toQuad_quad'><code><strong>quad</strong></code></a></td>
@@ -1629,7 +1620,6 @@ added: nan, 8 count: 4 rect: 0, 0, 0, 0 success: false
   </tr>
 </table>
 
-
 <a name='SkRect_setBoundsNoCheck'></a>
 ## setBoundsNoCheck
 
@@ -1995,7 +1985,6 @@ rect: -15, 0, 0, 25  isEmpty: false
   </tr>
 </table>
 
-
 <a name='SkRect_iset'></a>
 ## iset
 
@@ -2111,7 +2100,6 @@ rect2: {0, 0, 1, 2}
   </tr>
 </table>
 
-
 <a name='SkRect_makeOffset'></a>
 ## makeOffset
 
@@ -2462,8 +2450,8 @@ rect: 5, 1, 55, 86
 must describe area; <a href='#SkRect_fLeft'>fLeft</a> is less than <a href='#SkRect_fRight'>fRight</a>, and <a href='#SkRect_fTop'>fTop</a> is less than <a href='#SkRect_fBottom'>fBottom</a>;
 empty() returns false. The intersection of <a href='#Rect'>Rect</a> pair can be described by:
 
-(max(a.fLeft, b.fLeft), max(a.fTop, b.fTop),
-min(a.fRight, b.fRight), min(a.fBottom, b.fBottom))
+(max(a.<a href='#SkRect_fLeft'>fLeft</a>, b.<a href='#SkRect_fLeft'>fLeft</a>), max(a.<a href='#SkRect_fTop'>fTop</a>, b.<a href='#SkRect_fTop'>fTop</a>),
+min(a.<a href='#SkRect_fRight'>fRight</a>, b.<a href='#SkRect_fRight'>fRight</a>), min(a.<a href='#SkRect_fBottom'>fBottom</a>, b.<a href='#SkRect_fBottom'>fBottom</a>))
 .
 
 The intersection is only meaningful if the resulting <a href='#Rect'>Rect</a> is not empty and
@@ -2503,7 +2491,6 @@ describes an area: <a href='#SkRect_fLeft'>fLeft</a> is less than <a href='#SkRe
   </tr>
 </table>
 
-
 <a name='SkRect_contains'></a>
 ## contains
 
@@ -2929,7 +2916,6 @@ intersection
   </tr>
 </table>
 
-
 <a name='SkRect_join'></a>
 ## join
 
@@ -3122,7 +3108,6 @@ sorted: 10, 0, 55, 100
   </tr>
 </table>
 
-
 <a name='SkRect_round'></a>
 ## round
 
@@ -3348,7 +3333,6 @@ round: 30, 50, 41, 61
   </tr>
 </table>
 
-
 <a name='SkRect_sort'></a>
 ## sort