Changeset 102619 in webkit

Timestamp:

Dec 12, 2011 2:00:31 PM (12 years ago)

Author:

beidson@apple.com

Message:

Page cache should support pages with plugins.
<rdar://problem/5190122> and ​https://bugs.webkit.org/show_bug.cgi?id=13634

Source/WebCore:

Reviewed by Anders Carlsson.

By making plugin elements renderers go display:none when entering the page cache,
we destroy the plug-in in a cross platform way as well as handle invalidating script
objects created by that plugin.

By restoring the original style when leaving the page cache and forcing a style recalc
on the plugin element, the plugin is gracefully reinstantiated when the user goes back.

Test: plugins/netscape-plugin-page-cache-works.html

• dom/Document.cpp:

(WebCore::Document::documentDidBecomeActive): Copy this collection before iterating over

it, as the callbacks might result in mutating the set.

• dom/Node.h:

(WebCore::Node::setHasCustomStyleForRenderer):
(WebCore::Node::clearHasCustomStyleForRenderer): Expose the ability to stop using a

custom renderer and go back to the default renderer.

• history/CachedFrame.cpp:

(WebCore::CachedFrame::CachedFrame): Move the document inactivation call to the same place

we suspend active DOM objects. It is important this call be *after* the beforeunload event
is dispatched, and was coincidental non of the elements that using Document activation
had run in to this problem yet.

• history/PageCache.cpp:

(WebCore::logCanCacheFrameDecision):
(WebCore::PageCache::canCachePageContainingThisFrame): If the page contains plugins but

the PageCacheSupportsPlugins setting is true, allow this page.

Kill and recreate the plugin by listening for Document activation callbacks and setting a custom
display:none render style:

• html/HTMLPlugInImageElement.cpp:

(WebCore::HTMLPlugInImageElement::HTMLPlugInImageElement):
(WebCore::HTMLPlugInImageElement::~HTMLPlugInImageElement): Unregister for document activation

callbacks.

(WebCore::HTMLPlugInImageElement::createRenderer): Once a renderer (ie. plugin instance) is

created, this element needs Document (in)activation callbacks.

(WebCore::HTMLPlugInImageElement::willMoveToNewOwnerDocument): Manage Document activation

callback registration.

(WebCore::HTMLPlugInImageElement::didMoveToNewOwnerDocument): Ditto.
(WebCore::HTMLPlugInImageElement::documentWillBecomeInactive): Clone the element's current style

and set the clone's display value to None. Start using this custom style and force a style
recall. This destroys the renderer and therefore the plugin instance.

(WebCore::HTMLPlugInImageElement::documentDidBecomeActive): Stop using the custom style and

force a style recall to reinstantiate the plugin.

(WebCore::HTMLPlugInImageElement::customStyleForRenderer): Return the stand-in style that has

display:none set.

• html/HTMLPlugInImageElement.h:

Add a setting that allows runtime configuration of whether or not the page cache supports plugins:

• page/Settings.cpp:

(WebCore::Settings::Settings):

• page/Settings.h:

(WebCore::Settings::setPageCacheSupportsPlugins):
(WebCore::Settings::pageCacheSupportsPlugins):

Source/WebKit/mac:

Expose a WebKit preference for the page cache supporting plugins (on by default).

Reviewed by Anders Carlsson.

• WebView/WebPreferenceKeysPrivate.h:

• WebView/WebPreferences.mm:

(-[WebPreferences pageCacheSupportsPlugins]):
(-[WebPreferences setPageCacheSupportsPlugins:]):

• WebView/WebPreferencesPrivate.h:

• WebView/WebView.mm:

(-[WebView _preferencesChanged:]):

Source/WebKit2:

Expose a WebKit2 preference for the page cache supporting plugins (on by default).

Reviewed by Anders Carlsson.

• Shared/WebPreferencesStore.h:

• UIProcess/API/C/WKPreferences.cpp:

(WKPreferencesSetPageCacheSupportsPlugins):
(WKPreferencesGetPageCacheSupportsPlugins):

• UIProcess/API/C/WKPreferencesPrivate.h:

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::updatePreferences):

LayoutTests:

Reviewed by Anders Carlsson.

• plugins/netscape-plugin-page-cache-works-expected.txt: Added.
• plugins/netscape-plugin-page-cache-works.html: Added.
• plugins/resources/go-back.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/plugins/netscape-plugin-page-cache-works-expected.txt (added)
• LayoutTests/plugins/netscape-plugin-page-cache-works.html (added)
• LayoutTests/plugins/resources/go-back.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Document.cpp (modified) (1 diff)
• Source/WebCore/dom/Node.h (modified) (1 diff)
• Source/WebCore/history/CachedFrame.cpp (modified) (2 diffs)
• Source/WebCore/history/PageCache.cpp (modified) (2 diffs)
• Source/WebCore/html/HTMLPlugInImageElement.cpp (modified) (4 diffs)
• Source/WebCore/html/HTMLPlugInImageElement.h (modified) (4 diffs)
• Source/WebCore/page/Settings.cpp (modified) (1 diff)
• Source/WebCore/page/Settings.h (modified) (2 diffs)
• Source/WebKit/mac/ChangeLog (modified) (1 diff)
• Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (modified) (1 diff)
• Source/WebKit/mac/WebView/WebPreferences.mm (modified) (1 diff)
• Source/WebKit/mac/WebView/WebPreferencesPrivate.h (modified) (1 diff)
• Source/WebKit/mac/WebView/WebView.mm (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/Shared/WebPreferencesStore.h (modified) (1 diff)
• Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (modified) (1 diff)
• Source/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h (modified) (1 diff)
• Source/WebKit2/WebProcess/WebPage/WebPage.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-12-12  Brady Eidson  <beidson@apple.com>
+
+        Page cache should support pages with plugins.
+        <rdar://problem/5190122> and https://bugs.webkit.org/show_bug.cgi?id=13634
+
+        Reviewed by Anders Carlsson.
+
+        * plugins/netscape-plugin-page-cache-works-expected.txt: Added.
+        * plugins/netscape-plugin-page-cache-works.html: Added.
+        * plugins/resources/go-back.html: Added.
+
 2011-12-12  James Robinson  <jamesr@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-12  Brady Eidson  <beidson@apple.com>
+
+        Page cache should support pages with plugins.
+        <rdar://problem/5190122> and https://bugs.webkit.org/show_bug.cgi?id=13634
+
+        Reviewed by Anders Carlsson.
+
+        By making plugin elements renderers go display:none when entering the page cache,
+        we destroy the plug-in in a cross platform way as well as handle invalidating script
+        objects created by that plugin.
+
+        By restoring the original style when leaving the page cache and forcing a style recalc
+        on the plugin element, the plugin is gracefully reinstantiated when the user goes back.
+
+        Test: plugins/netscape-plugin-page-cache-works.html
+
+        * dom/Document.cpp:
+        (WebCore::Document::documentDidBecomeActive): Copy this collection before iterating over
+          it, as the callbacks might result in mutating the set.
+
+        * dom/Node.h:
+        (WebCore::Node::setHasCustomStyleForRenderer):
+        (WebCore::Node::clearHasCustomStyleForRenderer): Expose the ability to stop using a 
+          custom renderer and go back to the default renderer.
+
+        * history/CachedFrame.cpp:
+        (WebCore::CachedFrame::CachedFrame): Move the document inactivation call to the same place
+          we suspend active DOM objects. It is important this call be *after* the beforeunload event
+          is dispatched, and was coincidental non of the elements that using Document activation
+          had run in to this problem yet.
+
+        * history/PageCache.cpp:
+        (WebCore::logCanCacheFrameDecision):
+        (WebCore::PageCache::canCachePageContainingThisFrame): If the page contains plugins but
+          the PageCacheSupportsPlugins setting is true, allow this page.
+
+        Kill and recreate the plugin by listening for Document activation callbacks and setting a custom
+        display:none render style:
+        * html/HTMLPlugInImageElement.cpp:
+        (WebCore::HTMLPlugInImageElement::HTMLPlugInImageElement):
+        (WebCore::HTMLPlugInImageElement::~HTMLPlugInImageElement): Unregister for document activation
+          callbacks.
+        (WebCore::HTMLPlugInImageElement::createRenderer): Once a renderer (ie. plugin instance) is
+          created, this element needs Document (in)activation callbacks.
+        (WebCore::HTMLPlugInImageElement::willMoveToNewOwnerDocument): Manage Document activation 
+          callback registration.
+        (WebCore::HTMLPlugInImageElement::didMoveToNewOwnerDocument): Ditto.
+        (WebCore::HTMLPlugInImageElement::documentWillBecomeInactive): Clone the element's current style
+          and set the clone's display value to None. Start using this custom style and force a style
+          recall. This destroys the renderer and therefore the plugin instance.
+        (WebCore::HTMLPlugInImageElement::documentDidBecomeActive): Stop using the custom style and
+          force a style recall to reinstantiate the plugin.
+        (WebCore::HTMLPlugInImageElement::customStyleForRenderer): Return the stand-in style that has
+          display:none set.
+        * html/HTMLPlugInImageElement.h:
+
+        Add a setting that allows runtime configuration of whether or not the page cache supports plugins:
+        * page/Settings.cpp:
+        (WebCore::Settings::Settings):
+        * page/Settings.h:
+        (WebCore::Settings::setPageCacheSupportsPlugins):
+        (WebCore::Settings::pageCacheSupportsPlugins):
+
 2011-12-12  Ojan Vafai  <ojan@chromium.org>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -3941 +3941 @@
 void Document::documentDidBecomeActive() 
 {
-    HashSet<Element*>::iterator end = m_documentActivationCallbackElements.end();
-    for (HashSet<Element*>::iterator i = m_documentActivationCallbackElements.begin(); i != end; ++i)
+    Vector<Element*> elements;
+    copyToVector(m_documentActivationCallbackElements, elements);
+    Vector<Element*>::iterator end = elements.end();
+    for (Vector<Element*>::iterator i = elements.begin(); i != end; ++i)
         (*i)->documentDidBecomeActive();
 

trunk/Source/WebCore/dom/Node.h

@@ -692 +692 @@
     
     bool hasCustomStyleForRenderer() const { return getFlag(HasCustomStyleForRendererFlag); }
-    void setHasCustomStyleForRenderer() { setFlag(true, HasCustomStyleForRendererFlag); } 
+    void setHasCustomStyleForRenderer() { setFlag(true, HasCustomStyleForRendererFlag); }
+    void clearHasCustomStyleForRenderer() { clearFlag(HasCustomStyleForRendererFlag); }
 
 private:

trunk/Source/WebCore/history/CachedFrame.cpp

@@ -157 +157 @@
     m_view->detachCustomScrollbars();
 
-    m_document->documentWillBecomeInactive();
     frame->clearTimers();
     m_document->setInPageCache(true);
@@ -171 +170 @@
     // those create more objects.
     // FIXME: It's still possible to have objects created after suspending in some cases, see http://webkit.org/b/53733 for more details.
+    m_document->documentWillBecomeInactive();
     m_document->suspendScriptedAnimationControllerCallbacks();
     m_document->suspendActiveDOMObjects(ActiveDOMObject::DocumentWillBecomeInactive);

trunk/Source/WebCore/history/PageCache.cpp

@@ -108 +108 @@
             cannotCache = true;
         }
-        if (frame->loader()->subframeLoader()->containsPlugins()) {
+        if (frame->loader()->subframeLoader()->containsPlugins() && !frame->page()->settings()->pageCacheSupportsPlugins()) {
             PCLOG("   -Frame contains plugins");
             cannotCache = true;
@@ -256 +256 @@
         // Do not cache error pages (these can be recognized as pages with substitute data or unreachable URLs).
         && !(frame->loader()->documentLoader()->substituteData().isValid() && !frame->loader()->documentLoader()->substituteData().failingURL().isEmpty())
-        // FIXME: If we ever change this so that frames with plug-ins will be cached,
-        // we need to make sure that we don't cache frames that have outstanding NPObjects
-        // (objects created by the plug-in). Since there is no way to pause/resume a Netscape plug-in,
-        // they would need to be destroyed and then recreated, and there is no way that we can recreate
-        // the right NPObjects. See <rdar://problem/5197041> for more information.
-        && !frame->loader()->subframeLoader()->containsPlugins()
+        && (!frame->loader()->subframeLoader()->containsPlugins() || frame->page()->settings()->pageCacheSupportsPlugins())
         && !frame->document()->url().protocolIs("https")
         && (!frame->domWindow() || !frame->domWindow()->hasEventListeners(eventNames().unloadEvent))

trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp

@@ -28 +28 @@
 #include "HTMLNames.h"
 #include "Image.h"
+#include "NodeRenderStyle.h"
 #include "Page.h"
 #include "RenderEmbeddedObject.h"
@@ -43 +44 @@
     , m_needsWidgetUpdate(!createdByParser)
     , m_shouldPreferPlugInsForImages(preferPlugInsForImagesOption == ShouldPreferPlugInsForImages)
+    , m_needsDocumentActivationCallbacks(false)
 {
     setHasCustomWillOrDidRecalcStyle();
+}
+
+HTMLPlugInImageElement::~HTMLPlugInImageElement()
+{
+    if (m_needsDocumentActivationCallbacks)
+        document()->unregisterForDocumentActivationCallbacks(this);
 }
 
@@ -116 +124 @@
 RenderObject* HTMLPlugInImageElement::createRenderer(RenderArena* arena, RenderStyle* style)
 {
+    // Once a PlugIn Element creates its renderer, it needs to be told when the Document goes
+    // inactive or reactivates so it can clear the renderer before going into the page cache.
+    if (!m_needsDocumentActivationCallbacks) {
+        m_needsDocumentActivationCallbacks = true;
+        document()->registerForDocumentActivationCallbacks(this);
+    }
+    
     // Fallback content breaks the DOM->Renderer class relationship of this
     // class and all superclasses because createObject won't necessarily
@@ -190 +205 @@
 void HTMLPlugInImageElement::willMoveToNewOwnerDocument()
 {
+    if (m_needsDocumentActivationCallbacks)
+        document()->unregisterForDocumentActivationCallbacks(this);
+
     if (m_imageLoader)
         m_imageLoader->elementWillMoveToNewOwnerDocument();
+
     HTMLPlugInElement::willMoveToNewOwnerDocument();
 }
 
+void HTMLPlugInImageElement::didMoveToNewOwnerDocument()
+{
+    if (m_needsDocumentActivationCallbacks)
+        document()->registerForDocumentActivationCallbacks(this);   
+    
+    HTMLPlugInElement::didMoveToNewOwnerDocument();
+}
+
+void HTMLPlugInImageElement::documentWillBecomeInactive()
+{
+    if (RenderStyle* rs = renderStyle()) {
+        m_customStyleForPageCache = RenderStyle::clone(rs);
+        m_customStyleForPageCache->setDisplay(NONE);
+    }
+
+    setHasCustomStyleForRenderer();
+
+    if (m_customStyleForPageCache)
+        recalcStyle(Force);
+        
+    HTMLPlugInElement::documentWillBecomeInactive();
+}
+
+void HTMLPlugInImageElement::documentDidBecomeActive()
+{
+    clearHasCustomStyleForRenderer();
+
+    if (m_customStyleForPageCache) {
+        m_customStyleForPageCache = 0;
+        recalcStyle(Force);
+    }
+    
+    HTMLPlugInElement::documentDidBecomeActive();
+}
+
+PassRefPtr<RenderStyle> HTMLPlugInImageElement::customStyleForRenderer()
+{
+    if (!m_customStyleForPageCache)
+        return renderStyle();
+
+    return m_customStyleForPageCache;
+}
+
 void HTMLPlugInImageElement::updateWidgetCallback(Node* n, unsigned)
 {

trunk/Source/WebCore/html/HTMLPlugInImageElement.h

@@ -23 +23 @@
 
 #include "HTMLPlugInElement.h"
+
+#include "RenderStyle.h"
 #include <wtf/OwnPtr.h>
 
@@ -43 +45 @@
 class HTMLPlugInImageElement : public HTMLPlugInElement {
 public:
+    virtual ~HTMLPlugInImageElement() OVERRIDE;
+
     RenderEmbeddedObject* renderEmbeddedObject() const;
 
@@ -70 +74 @@
     bool wouldLoadAsNetscapePlugin(const String& url, const String& serviceType);
 
-    virtual void willMoveToNewOwnerDocument();
+    virtual void willMoveToNewOwnerDocument() OVERRIDE;
+    virtual void didMoveToNewOwnerDocument() OVERRIDE;
+    
+    virtual void documentWillBecomeInactive() OVERRIDE;
+    virtual void documentDidBecomeActive() OVERRIDE;
+
+    virtual PassRefPtr<RenderStyle> customStyleForRenderer() OVERRIDE;
 
 private:
@@ -83 +93 @@
     bool m_needsWidgetUpdate;
     bool m_shouldPreferPlugInsForImages;
+    bool m_needsDocumentActivationCallbacks;
+    RefPtr<RenderStyle> m_customStyleForPageCache;
 };
 

trunk/Source/WebCore/page/Settings.cpp

@@ -154 +154 @@
     , m_shrinksStandaloneImagesToFit(true)
     , m_usesPageCache(false)
+    , m_pageCacheSupportsPlugins(false)
     , m_showsURLsInToolTips(false)
     , m_showsToolTipOverTruncatedText(false)

trunk/Source/WebCore/page/Settings.h

@@ -230 +230 @@
         void setUsesPageCache(bool);
         bool usesPageCache() const { return m_usesPageCache; }
+        
+        void setPageCacheSupportsPlugins(bool pageCacheSupportsPlugins) { m_pageCacheSupportsPlugins = pageCacheSupportsPlugins; }
+        bool pageCacheSupportsPlugins() const { return m_pageCacheSupportsPlugins; }
 
         void setShrinksStandaloneImagesToFit(bool);
@@ -562 +565 @@
         bool m_isDOMPasteAllowed : 1;
         bool m_shrinksStandaloneImagesToFit : 1;
-        bool m_usesPageCache: 1;
+        bool m_usesPageCache : 1;
+        bool m_pageCacheSupportsPlugins : 1;
         bool m_showsURLsInToolTips : 1;
         bool m_showsToolTipOverTruncatedText : 1;

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2011-12-12  Brady Eidson  <beidson@apple.com>
+
+        Page cache should support pages with plugins.
+        <rdar://problem/5190122> and https://bugs.webkit.org/show_bug.cgi?id=13634
+
+        Expose a WebKit preference for the page cache supporting plugins (on by default).
+
+        Reviewed by Anders Carlsson.
+
+        * WebView/WebPreferenceKeysPrivate.h:
+
+        * WebView/WebPreferences.mm:
+        (-[WebPreferences pageCacheSupportsPlugins]):
+        (-[WebPreferences setPageCacheSupportsPlugins:]):
+        * WebView/WebPreferencesPrivate.h:
+
+        * WebView/WebView.mm:
+        (-[WebView _preferencesChanged:]):
+
 2011-12-12  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h

@@ -76 +76 @@
 #define WebKitDOMPasteAllowedPreferenceKey @"WebKitDOMPasteAllowedPreferenceKey"
 #define WebKitUsesPageCachePreferenceKey @"WebKitUsesPageCachePreferenceKey"
+#define WebKitPageCacheSupportsPluginsPreferenceKey @"WebKitPageCacheSupportsPluginsPreferenceKey"
 #define WebKitFTPDirectoryTemplatePath @"WebKitFTPDirectoryTemplatePath"
 #define WebKitForceFTPDirectoryListings @"WebKitForceFTPDirectoryListings"

trunk/Source/WebKit/mac/WebView/WebPreferences.mm

@@ -1558 +1558 @@
 }
 
+- (BOOL)pageCacheSupportsPlugins
+{
+    return [self _boolValueForKey:WebKitPageCacheSupportsPluginsPreferenceKey];
+}
+
+- (void)setPageCacheSupportsPlugins:(BOOL)flag
+{
+    [self _setBoolValue:flag forKey:WebKitPageCacheSupportsPluginsPreferenceKey];
+
+}
+
 - (void)setSuppressIncrementalRendering:(BOOL)flag
 {

trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h

@@ -220 +220 @@
 - (void)setPictographFontFamily:(NSString *)family;
 
+- (BOOL)pageCacheSupportsPlugins;
+- (void)setPageCacheSupportsPlugins:(BOOL)flag;
+
 // This is a global setting.
 - (BOOL)mockScrollbarsEnabled;

trunk/Source/WebKit/mac/WebView/WebView.mm

@@ -1430 +1430 @@
     settings->setDOMPasteAllowed([preferences isDOMPasteAllowed]);
     settings->setUsesPageCache([self usesPageCache]);
+    settings->setPageCacheSupportsPlugins([preferences pageCacheSupportsPlugins]);
     settings->setShowsURLsInToolTips([preferences showsURLsInToolTips]);
     settings->setShowsToolTipOverTruncatedText([preferences showsToolTipOverTruncatedText]);

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-12-12  Brady Eidson  <beidson@apple.com>
+
+        Page cache should support pages with plugins.
+        <rdar://problem/5190122> and https://bugs.webkit.org/show_bug.cgi?id=13634
+
+        Expose a WebKit2 preference for the page cache supporting plugins (on by default).
+
+        Reviewed by Anders Carlsson.
+
+        * Shared/WebPreferencesStore.h:
+
+        * UIProcess/API/C/WKPreferences.cpp:
+        (WKPreferencesSetPageCacheSupportsPlugins):
+        (WKPreferencesGetPageCacheSupportsPlugins):
+        * UIProcess/API/C/WKPreferencesPrivate.h:
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::updatePreferences):
+
 2011-12-12  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebKit2/Shared/WebPreferencesStore.h

@@ -78 +78 @@
     macro(LocalFileContentSniffingEnabled, localFileContentSniffingEnabled, Bool, bool, false) \
     macro(UsesPageCache, usesPageCache, Bool, bool, true) \
+    macro(PageCacheSupportsPlugins, pageCacheSupportsPlugins, Bool, bool, true) \
     macro(AuthorAndUserStylesEnabled, authorAndUserStylesEnabled, Bool, bool, true) \
     macro(PaginateDuringLayoutEnabled, paginateDuringLayoutEnabled, Bool, bool, false) \

trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp

@@ -493 +493 @@
 }
 
+void WKPreferencesSetPageCacheSupportsPlugins(WKPreferencesRef preferencesRef, bool pageCacheSupportsPlugins)
+{
+    toImpl(preferencesRef)->setPageCacheSupportsPlugins(pageCacheSupportsPlugins);
+}
+
+bool WKPreferencesGetPageCacheSupportsPlugins(WKPreferencesRef preferencesRef)
+{
+    return toImpl(preferencesRef)->pageCacheSupportsPlugins();
+}
+
 void WKPreferencesSetPaginateDuringLayoutEnabled(WKPreferencesRef preferencesRef, bool enabled)
 {

trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h

@@ -109 +109 @@
 WK_EXPORT bool WKPreferencesGetPageCacheEnabled(WKPreferencesRef preferences);
 
+// Defaults to true.
+WK_EXPORT void WKPreferencesSetPageCacheSupportsPlugins(WKPreferencesRef preferences, bool pageCacheSupportsPlugins);
+WK_EXPORT bool WKPreferencesGetPageCacheSupportsPlugins(WKPreferencesRef preferences);
+
 // Defaults to false.
 WK_EXPORT void WKPreferencesSetPaginateDuringLayoutEnabled(WKPreferencesRef preferences, bool enabled);

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

@@ -1793 +1793 @@
     settings->setLocalFileContentSniffingEnabled(store.getBoolValueForKey(WebPreferencesKey::localFileContentSniffingEnabledKey()));
     settings->setUsesPageCache(store.getBoolValueForKey(WebPreferencesKey::usesPageCacheKey()));
+    settings->setPageCacheSupportsPlugins(store.getBoolValueForKey(WebPreferencesKey::pageCacheSupportsPluginsKey()));
     settings->setAuthorAndUserStylesEnabled(store.getBoolValueForKey(WebPreferencesKey::authorAndUserStylesEnabledKey()));
     settings->setPaginateDuringLayoutEnabled(store.getBoolValueForKey(WebPreferencesKey::paginateDuringLayoutEnabledKey()));