Attachment 368388 Details for Bug 197343 – Patch

[patch] Patch

bug-197343-20190426223915.patch (text/plain), 3.21 KB, created by Wenson Hsieh on 2019-04-26 22:39:16 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Wenson Hsieh

Created: 2019-04-26 22:39:16 PDT

Size: 3.21 KB

patch

obsolete

>Subversion Revision: 244594
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 64b06d90962fd6e36b70d700ff1f249de9df85a3..2c332be5408fc42e5b64021c12f141003d857d74 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,18 @@
>+2019-04-26  Wenson Hsieh  <wenson_hsieh@apple.com>
>+
>+        Rename m_LayerTreeFreezeReasons to m_layerTreeFreezeReasons
>+        https://bugs.webkit.org/show_bug.cgi?id=197343
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        No change in behavior.
>+
>+        * WebProcess/WebPage/WebPage.cpp:
>+        (WebKit::WebPage::freezeLayerTree):
>+        (WebKit::WebPage::unfreezeLayerTree):
>+        (WebKit::WebPage::updateDrawingAreaLayerTreeFreezeState):
>+        * WebProcess/WebPage/WebPage.h:
>+
> 2019-04-24  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         Plumb the navigation's request when determining recommended compatibility mode
>diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.cpp b/Source/WebKit/WebProcess/WebPage/WebPage.cpp
>index 4ee6b886622731994bceac058c1f61fe14c0feb5..0ddd91c9217e3c0e424d65cb9fd0664567bd54dd 100644
>--- a/Source/WebKit/WebProcess/WebPage/WebPage.cpp
>+++ b/Source/WebKit/WebProcess/WebPage/WebPage.cpp
>@@ -2454,16 +2454,16 @@ const WebEvent* WebPage::currentEvent()
> void WebPage::freezeLayerTree(LayerTreeFreezeReason reason)
> {
>     RELEASE_LOG(ProcessSuspension, "%p - WebPage (PageID=%llu) - Adding a reason %d to freeze layer tree; current reasons are %d",
>-        this, m_pageID, static_cast<unsigned>(reason), m_LayerTreeFreezeReasons.toRaw());
>-    m_LayerTreeFreezeReasons.add(reason);
>+        this, m_pageID, static_cast<unsigned>(reason), m_layerTreeFreezeReasons.toRaw());
>+    m_layerTreeFreezeReasons.add(reason);
>     updateDrawingAreaLayerTreeFreezeState();
> }
> 
> void WebPage::unfreezeLayerTree(LayerTreeFreezeReason reason)
> {
>     RELEASE_LOG(ProcessSuspension, "%p - WebPage (PageID=%llu) - Removing a reason %d to freeze layer tree; current reasons are %d",
>-        this, m_pageID, static_cast<unsigned>(reason), m_LayerTreeFreezeReasons.toRaw());
>-    m_LayerTreeFreezeReasons.remove(reason);
>+        this, m_pageID, static_cast<unsigned>(reason), m_layerTreeFreezeReasons.toRaw());
>+    m_layerTreeFreezeReasons.remove(reason);
>     updateDrawingAreaLayerTreeFreezeState();
> }
> 
>@@ -2471,7 +2471,7 @@ void WebPage::updateDrawingAreaLayerTreeFreezeState()
> {
>     if (!m_drawingArea)
>         return;
>-    m_drawingArea->setLayerTreeStateIsFrozen(!!m_LayerTreeFreezeReasons);
>+    m_drawingArea->setLayerTreeStateIsFrozen(!!m_layerTreeFreezeReasons);
> }
> 
> void WebPage::callVolatilityCompletionHandlers(bool succeeded)
>diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.h b/Source/WebKit/WebProcess/WebPage/WebPage.h
>index 4b25b5c9d9b2099ad703e9d52e6085ae9966d8e4..10f64df6a3d05816edd39db4118927a00ae236d6 100644
>--- a/Source/WebKit/WebProcess/WebPage/WebPage.h
>+++ b/Source/WebKit/WebProcess/WebPage/WebPage.h
>@@ -1883,7 +1883,7 @@ private:
>     HashMap<uint64_t, uint64_t> m_applicationManifestFetchCallbackMap;
> #endif
> 
>-    OptionSet<LayerTreeFreezeReason> m_LayerTreeFreezeReasons;
>+    OptionSet<LayerTreeFreezeReason> m_layerTreeFreezeReasons;
>     bool m_isSuspended { false };
>     bool m_needsFontAttributes { false };
> #if PLATFORM(COCOA)

Actions: View | Formatted Diff | Diff

Attachments on bug 197343: 368388