Changeset 80190 in webkit


Ignore:
Timestamp:
Mar 2, 2011 5:38:21 PM (13 years ago)
Author:
andersca@apple.com
Message:

2011-03-02 Anders Carlsson <​andersca@apple.com>

Reviewed by Sam Weinig.

WKPageSetMemoryCacheClientCallsEnabled doesn't persist if web process crashes
​https://bugs.webkit.org/show_bug.cgi?id=55635

  • Shared/WebPageCreationParameters.cpp: (WebKit::WebPageCreationParameters::encode): (WebKit::WebPageCreationParameters::decode): Encode and decode areMemoryCacheClientCallsEnabled.
  • Shared/WebPageCreationParameters.h: Add areMemoryCacheClientCallsEnabled member variable.
  • UIProcess/WebPageProxy.cpp: (WebKit::WebPageProxy::WebPageProxy): Initialize m_areMemoryCacheClientCallsEnabled.

(WebKit::WebPageProxy::setMemoryCacheClientCallsEnabled):
Update m_areMemoryCacheClientCallsEnabled. Send a message if necessary.

(WebKit::WebPageProxy::creationParameters):
Set areMemoryCacheClientCallsEnabled.

  • WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::WebPage): Call WebPage::setMemoryCacheMessagesEnabled.
Location:
trunk/Source/WebKit2
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r80188 r80190  
     12011-03-02  Anders Carlsson  <andersca@apple.com>
     2
     3        Reviewed by Sam Weinig.
     4
     5        WKPageSetMemoryCacheClientCallsEnabled doesn't persist if web process crashes
     6        https://bugs.webkit.org/show_bug.cgi?id=55635
     7
     8        * Shared/WebPageCreationParameters.cpp:
     9        (WebKit::WebPageCreationParameters::encode):
     10        (WebKit::WebPageCreationParameters::decode):
     11        Encode and decode areMemoryCacheClientCallsEnabled.
     12
     13        * Shared/WebPageCreationParameters.h:
     14        Add areMemoryCacheClientCallsEnabled member variable.
     15
     16        * UIProcess/WebPageProxy.cpp:
     17        (WebKit::WebPageProxy::WebPageProxy):
     18        Initialize m_areMemoryCacheClientCallsEnabled.
     19
     20        (WebKit::WebPageProxy::setMemoryCacheClientCallsEnabled):
     21        Update m_areMemoryCacheClientCallsEnabled. Send a message if necessary.
     22
     23        (WebKit::WebPageProxy::creationParameters):
     24        Set areMemoryCacheClientCallsEnabled.
     25
     26        * WebProcess/WebPage/WebPage.cpp:
     27        (WebKit::WebPage::WebPage):
     28        Call WebPage::setMemoryCacheMessagesEnabled.
     29
    1302011-03-02  Timothy Hatcher  <timothy@apple.com>
    231

  • trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp

    r79803 r80190  
    4444    encoder->encode(drawsBackground);
    4545    encoder->encode(drawsTransparentBackground);
     46    encoder->encode(areMemoryCacheClientCallsEnabled);
    4647    encoder->encode(useFixedLayout);
    4748    encoder->encode(fixedLayoutSize);
    … …  
    8182    if (!decoder->decode(parameters.drawsTransparentBackground))
    8283        return false;
     84    if (!decoder->decode(parameters.areMemoryCacheClientCallsEnabled))
     85        return false;
    8386    if (!decoder->decode(parameters.useFixedLayout))
    8487        return false;

  • trunk/Source/WebKit2/Shared/WebPageCreationParameters.h

    r79803 r80190  
    5959    bool drawsTransparentBackground;
    6060
     61    bool areMemoryCacheClientCallsEnabled;
     62
    6163    bool useFixedLayout;
    6264    WebCore::IntSize fixedLayoutSize;

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

    r80188 r80190  
    124124    , m_drawsBackground(true)
    125125    , m_drawsTransparentBackground(false)
     126    , m_areMemoryCacheClientCallsEnabled(true)
    126127    , m_useFixedLayout(false)
    127128    , m_isValid(true)
    … …  
    10971098void WebPageProxy::setMemoryCacheClientCallsEnabled(bool memoryCacheClientCallsEnabled)
    10981099{
     1100    if (m_areMemoryCacheClientCallsEnabled == memoryCacheClientCallsEnabled)
     1101        return;
     1102
     1103    m_areMemoryCacheClientCallsEnabled = memoryCacheClientCallsEnabled;
    10991104    process()->send(Messages::WebPage::SetMemoryCacheMessagesEnabled(memoryCacheClientCallsEnabled), m_pageID);
    11001105}
    … …  
    25982603    parameters.drawsBackground = m_drawsBackground;
    25992604    parameters.drawsTransparentBackground = m_drawsTransparentBackground;
     2605    parameters.areMemoryCacheClientCallsEnabled = m_areMemoryCacheClientCallsEnabled;
    26002606    parameters.useFixedLayout = m_useFixedLayout;
    26012607    parameters.fixedLayoutSize = m_fixedLayoutSize;

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.h

    r80188 r80190  
    663663    bool m_drawsTransparentBackground;
    664664
     665    bool m_areMemoryCacheClientCallsEnabled;
     666
    665667    bool m_useFixedLayout;
    666668    WebCore::IntSize m_fixedLayoutSize;

  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

    r80188 r80190  
    199199    setDrawsTransparentBackground(parameters.drawsTransparentBackground);
    200200
     201    setMemoryCacheMessagesEnabled(parameters.areMemoryCacheClientCallsEnabled);
     202
    201203    setActive(parameters.isActive);
    202204    setFocused(parameters.isFocused);
Note: See TracChangeset for help on using the changeset viewer.