Update the online book to Skia 138

Author: pavpanchekha

book/animations.md

@@ -250,6 +250,12 @@ class Browser:
             sdl2.SDL_WINDOWPOS_CENTERED,
             WIDTH, HEIGHT,
             sdl2.SDL_WINDOW_SHOWN | sdl2.SDL_WINDOW_OPENGL)
+
+        sdl2.SDL_GL_SetAttribute(sdl2.SDL_GL_CONTEXT_MAJOR_VERSION, 3)
+        sdl2.SDL_GL_SetAttribute(sdl2.SDL_GL_CONTEXT_MINOR_VERSION, 2)
+        sdl2.SDL_GL_SetAttribute(sdl2.SDL_GL_CONTEXT_FORWARD_COMPATIBLE_FLAG, True)
+        sdl2.SDL_GL_SetAttribute(sdl2.SDL_GL_CONTEXT_PROFILE_MASK,
+                                 sdl2.SDL_GL_CONTEXT_PROFILE_CORE)
         self.gl_context = sdl2.SDL_GL_CreateContext(
             self.sdl_window)
         print(("OpenGL initialized: vendor={}," + \

book/embeds.md

@@ -244,29 +244,32 @@ higher-quality "bilinear" or even "[Lanczos][lanczos]" algorithms.[^resizing]
 To give web page authors control over this performance bottleneck,
 there's an [`image-rendering`][image-rendering] CSS property that
 indicates which algorithm to use. Let's add that as an argument to
-`DrawImage`:
+`DrawImage`:[^skia-87]
+
+[^skia-87]: The 1^st^ edition of *Web Browser Engineering* used an
+    older API for image rendering quality, described in the 
+    [porting notes](https://browser.engineering/porting.html).
 
 [image-rendering]: https://developer.mozilla.org/en-US/docs/Web/CSS/image-rendering
 
 ``` {.python}
 def parse_image_rendering(quality):
    if quality == "high-quality":
-       return skia.FilterQuality.kHigh_FilterQuality
+       return skia.SamplingOptions(skia.CubicResampler.Mitchell())
    elif quality == "crisp-edges":
-       return skia.FilterQuality.kLow_FilterQuality
+       return skia.SamplingOptions(
+           skia.FilterMode.kNearest, skia.MipmapMode.kNone)
    else:
-       return skia.FilterQuality.kMedium_FilterQuality
+       return skia.SamplingOptions(
+           skia.FilterMode.kLinear, skia.MipmapMode.kLinear)
 
 class DrawImage(PaintCommand):
     def __init__(self, image, rect, quality):
         # ...
         self.quality = parse_image_rendering(quality)
 
     def execute(self, canvas):
-        paint = skia.Paint(
-            FilterQuality=self.quality,
-        )
-        canvas.drawImageRect(self.image, self.rect, paint)
+        canvas.drawImageRect(self.image, self.rect, self.quality)
 ```
 
 But to talk about where this argument comes from, or more generally to

book/porting.md

@@ -3,60 +3,48 @@ title: Porting *WBE* to Recent Software Releases
 ...
 
 The code in this book was developed for and tested on particular
-versions of the libraries it depends on, including Python 3.12, Skia
-87, Tk 8.6.14, DukPy 0.3.0, and PySDL2 0.9.15. This page documents
-code changes necessary to port the code of *Web Browser Engineering*
-to the most recent release of each library. It will be regularly
-updated as new versions are released and tested.
-
-Porting to Skia 124
-===================
-
-The text of this book uses Skia 87, and the associated skia-python
-87.6 release. Skia 124, and the associated skia-python 124b7 release,
-changes a couple of APIs used in this book. One major change is the
-removal of `FilterQuality`, used in [Chapter 15](embeds.md), and its
-replacement by `SamplingOptions`. This requires updating
-`parse_image_rendering` like so:
+library versions, including Python 3.14, Skia 138, Tk 8.6.14, DukPy
+0.3.0, and PySDL2 0.9.15. Earlier editions of the book, however,
+relied on earlier versions, and future editions might rely on later
+ones. This page documents code changes necessary to port the code of
+*Web Browser Engineering* to other relevant releases of each library.
+It will be regularly updated as new versions are released and tested.
+
+Porting to Skia 87
+==================
+
+The text of this online book uses Skia 138, but the printed 1^st^
+edition used the earlier version 87. This earlier version was missing
+the `SamplingOptions` API used in [Chapter 15](embeds.md) of this
+book. Skia 87 instead provides the older `FilterQuality` API.
+
+Readers of the 1^st^ edition thus saw a different implementation of
+`parse_image_rendering`:
 
 ``` {.python}
 def parse_image_rendering(quality):
     if quality == "high-quality":
-        return skia.SamplingOptions(skia.CubicResampler.Mitchell())
+        return skia.FilterQuality.kHigh_FilterQuality
     elif quality == "crisp-edges":
-        return skia.SamplingOptions(
-            skia.FilterMode.kNearest, skia.MipmapMode.kNone)
+        return skia.FilterQuality.kLow_FilterQuality
     else:
-        return skia.SamplingOptions(
-            skia.FilterMode.kLinear, skia.MipmapMode.kLinear)
+        return skia.FilterQuality.kMedium_FilterQuality
 ```
 
 And changing the `execute` method of `DrawImage` like so:
 
 ``` {.python}
 class DrawImage:
     def execute(self, canvas):
-        canvas.drawImageRect(self.image, self.rect, self.quality)
+        paint = skia.Paint(
+            FilterQuality=self.quality,
+        )
+        canvas.drawImageRect(self.image, self.rect, paint)
 ```
 
-The new API is somewhat cleaner and more customizable.
+The `SDL_GL_SetAttribute` method calls in the `Browser` constructor
+were also not necessary on this older version.
 
-Finally, add these `SDL_GL_SetAttribute` calls to set GL version Skia
-expects:
-
-``` {.python}
-class Browser:
-    def __init__(self):
-        self.sdl_window = sdl2.SDL_CreateWindow(b'Browser',
-            sdl2.SDL_WINDOWPOS_CENTERED,
-            sdl2.SDL_WINDOWPOS_CENTERED,
-            WIDTH, HEIGHT,
-            sdl2.SDL_WINDOW_SHOWN | sdl2.SDL_WINDOW_OPENGL)
-
-        sdl2.SDL_GL_SetAttribute(sdl2.SDL_GL_CONTEXT_MAJOR_VERSION, 3)
-        sdl2.SDL_GL_SetAttribute(sdl2.SDL_GL_CONTEXT_MINOR_VERSION, 2)
-        sdl2.SDL_GL_SetAttribute(sdl2.SDL_GL_CONTEXT_FORWARD_COMPATIBLE_FLAG, True)
-        sdl2.SDL_GL_SetAttribute(sdl2.SDL_GL_CONTEXT_PROFILE_MASK,
-                                 sdl2.SDL_GL_CONTEXT_PROFILE_CORE)
-```
- 
+We recommend new readers use a recent Skia version, as described in
+the main text, but the old code is documented here to preserve the
+code of the 1^st^ edition.

book/visual-effects.md

@@ -37,10 +37,10 @@ Tkinter uses, dates from the early 1990s, before high-performance
 graphics cards and GPUs became widespread.
 
 ::: {.installation}
-Start by installing [Skia][skia-python] and [SDL][sdl-python]:
+Start by installing [Skia][skia-python] and [SDL][sdl-python]:[^book-old]
 
 ``` {.sh}
-python3 -m pip install 'skia-python==87.*' pysdl2 pysdl2-dll
+python3 -m pip install skia-python pysdl2 pysdl2-dll
 ```
 
 As elsewhere in this book, you may need to install the `pip` package
@@ -50,18 +50,14 @@ Also, you may not be able to install `pysdl2-dll`; if so, you'll need
 to find SDL in your system package manager instead. Consult the
 [`skia-python`][skia-python] and [`pysdl2`][sdl-python] web pages for
 more details.
-
-Note that I'm explicitly installing Skia version 87. Skia makes
-regular releases that change APIs or break compatibility; version 87
-is fairly old and should work reliably on most systems. In your own
-projects, or before filing bug reports in Skia, please do use more
-recent Skia releases. It's also possible that future Python version no
-longer support Skia 87; our
-[porting notes](https://browser.engineering/porting.html) explain how
-to use recent Skia releases for the code in this book.
-
 :::
 
+[^book-old]: The 1^st^ edition of *Web Browser Engineering* used an
+    older Skia version, and if you're reading this website together
+    with a printed 1^st^ edition, make sure to check the 
+    [porting notes](https://browser.engineering/porting.html)
+    to understand the differences between the two.
+
 [skia-python]: https://kyamagu.github.io/skia-python/
 [sdl-python]: https://pypi.org/project/PySDL2/
 

requirements.txt

@@ -2,7 +2,7 @@
 dukpy==0.3.0
 
 # Skia is used in Chapters 11+ for advanced graphics
-skia-python==87
+skia-python==138
 pybind11==2.10.4
 
 # SDL2 is used in Chapters 11+ for a Skia-compatible GUI