Changeset 86601 in webkit

Timestamp:

May 16, 2011 1:24:42 PM (13 years ago)

Author:

yuzo@google.com

Message:

2011-05-16 Yuzo Fujishima <​yuzo@google.com>

Reviewed by Antti Koivisto.

Fix for Bug 43704 - Web font is printed as blank if it is not cached
​https://bugs.webkit.org/show_bug.cgi?id=43704

In setting printing, we should not validate resources already cached
for the document. If we do, web fonts used for screen are revalidated
and possiby reloaded. Then the fonts can be shown as blank on print.
This patch won't save the case where screen and print use different web
fonts. Nonetheless, this is an improvement.

No new tests because there seems to be no good way to test print images.

• editing/Editor.cpp: (WebCore::Editor::paste): Use ResourceCacheValidationSuppressor instead of explicitly allowing/disallowing stale resources.
• loader/cache/CachedResourceLoader.h: (WebCore::ResourceCacheValidationSuppressor::ResourceCacheValidationSuppressor): RAII class for allowing/disallowing stale resources. (WebCore::ResourceCacheValidationSuppressor::~ResourceCacheValidationSuppressor):
• page/DragController.cpp: (WebCore::DragController::concludeEditDrag): Use ResourceCacheValidationSuppressor instead of explicitly allowing/disallowing stale resources.
• page/Frame.cpp: (WebCore::Frame::setPrinting): Use ResourceCacheValidationSuppressor to allow stale resources in printing.

2011-05-16 Yuzo Fujishima <​yuzo@google.com>

Reviewed by Antti Koivisto.

Fix for Bug 43704 - Web font is printed as blank if it is not cached
​https://bugs.webkit.org/show_bug.cgi?id=43704

• WebView/WebHTMLView.mm: (-[WebHTMLView _setPrinting:minimumPageWidth:height:maximumPageWidth:adjustViewSize:paginateScreenContent:]): Use ResourceCacheValidationSuppressor to allow stale resources in printing.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/editing/Editor.cpp (modified) (1 diff)
• WebCore/loader/cache/CachedResourceLoader.h (modified) (3 diffs)
• WebCore/page/DragController.cpp (modified) (3 diffs)
• WebCore/page/Frame.cpp (modified) (1 diff)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/WebView/WebHTMLView.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-16  Yuzo Fujishima  <yuzo@google.com>
+
+        Reviewed by Antti Koivisto.
+
+        Fix for Bug 43704 - Web font is printed as blank if it is not cached
+        https://bugs.webkit.org/show_bug.cgi?id=43704
+
+        In setting printing, we should not validate resources already cached
+        for the document. If we do, web fonts used for screen are revalidated
+        and possiby reloaded. Then the fonts can be shown as blank on print.
+        This patch won't save the case where screen and print use different web
+        fonts. Nonetheless, this is an improvement.
+
+        No new tests because there seems to be no good way to test print images.
+
+        * editing/Editor.cpp:
+        (WebCore::Editor::paste): Use ResourceCacheValidationSuppressor instead of explicitly allowing/disallowing stale resources.
+        * loader/cache/CachedResourceLoader.h:
+        (WebCore::ResourceCacheValidationSuppressor::ResourceCacheValidationSuppressor): RAII class for allowing/disallowing stale resources.
+        (WebCore::ResourceCacheValidationSuppressor::~ResourceCacheValidationSuppressor):
+        * page/DragController.cpp:
+        (WebCore::DragController::concludeEditDrag): Use ResourceCacheValidationSuppressor instead of explicitly allowing/disallowing stale resources.
+        * page/Frame.cpp:
+        (WebCore::Frame::setPrinting): Use ResourceCacheValidationSuppressor to allow stale resources in printing.
+
 2011-05-16  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/editing/Editor.cpp

@@ -1217 +1217 @@
     updateMarkersForWordsAffectedByEditing(false);
     CachedResourceLoader* loader = m_frame->document()->cachedResourceLoader();
-    loader->setAllowStaleResources(true);
+    ResourceCacheValidationSuppressor validationSuppressor(loader);
     if (m_frame->selection()->isContentRichlyEditable())
         pasteWithPasteboard(Pasteboard::generalPasteboard(), true);
     else
         pasteAsPlainTextWithPasteboard(Pasteboard::generalPasteboard());
-    loader->setAllowStaleResources(false);
 }
 

trunk/Source/WebCore/loader/cache/CachedResourceLoader.h

@@ -55 +55 @@
     WTF_MAKE_NONCOPYABLE(CachedResourceLoader); WTF_MAKE_FAST_ALLOCATED;
 friend class ImageLoader;
+friend class ResourceCacheValidationSuppressor;
 
 public:
@@ -97 +98 @@
     void cancelRequests();
     
-    void setAllowStaleResources(bool allowStaleResources) { m_allowStaleResources = allowStaleResources; }
-
     void incrementRequestCount(const CachedResource*);
     void decrementRequestCount(const CachedResource*);
@@ -150 +149 @@
 };
 
-}
+class ResourceCacheValidationSuppressor {
+    WTF_MAKE_NONCOPYABLE(ResourceCacheValidationSuppressor);
+    WTF_MAKE_FAST_ALLOCATED;
+public:
+    ResourceCacheValidationSuppressor(CachedResourceLoader* loader)
+        : m_loader(loader)
+        , m_previousState(false)
+    {
+        if (m_loader) {
+            m_previousState = m_loader->m_allowStaleResources;
+            m_loader->m_allowStaleResources = true;
+        }
+    }
+    ~ResourceCacheValidationSuppressor()
+    {
+        if (m_loader)
+            m_loader->m_allowStaleResources = m_previousState;
+    }
+private:
+    CachedResourceLoader* m_loader;
+    bool m_previousState;
+};
+
+} // namespace WebCore
 
 #endif

trunk/Source/WebCore/page/DragController.cpp

@@ -448 +448 @@
         return false;
     CachedResourceLoader* cachedResourceLoader = range->ownerDocument()->cachedResourceLoader();
-    cachedResourceLoader->setAllowStaleResources(true);
+    ResourceCacheValidationSuppressor validationSuppressor(cachedResourceLoader);
     if (dragIsMove(innerFrame->selection(), dragData) || dragCaret.isContentRichlyEditable()) {
         bool chosePlainText = false;
         RefPtr<DocumentFragment> fragment = documentFragmentFromDragData(dragData, innerFrame, range, true, chosePlainText);
         if (!fragment || !innerFrame->editor()->shouldInsertFragment(fragment, range, EditorInsertActionDropped)) {
-            cachedResourceLoader->setAllowStaleResources(false);
             return false;
         }
@@ -477 +476 @@
         String text = dragData->asPlainText(innerFrame);
         if (text.isEmpty() || !innerFrame->editor()->shouldInsertText(text, range.get(), EditorInsertActionDropped)) {
-            cachedResourceLoader->setAllowStaleResources(false);
             return false;
         }
@@ -485 +483 @@
             applyCommand(ReplaceSelectionCommand::create(m_documentUnderMouse.get(), createFragmentFromText(range.get(), text),  ReplaceSelectionCommand::SelectReplacement | ReplaceSelectionCommand::MatchStyle | ReplaceSelectionCommand::PreventNesting));
     }
-    cachedResourceLoader->setAllowStaleResources(false);
 
     return true;

trunk/Source/WebCore/page/Frame.cpp

@@ -548 +548 @@
 void Frame::setPrinting(bool printing, const FloatSize& pageSize, float maximumShrinkRatio, AdjustViewSizeOrNot shouldAdjustViewSize)
 {
+    // In setting printing, we should not validate resources already cached for the document.
+    // See https://bugs.webkit.org/show_bug.cgi?id=43704
+    ResourceCacheValidationSuppressor validationSuppressor(m_doc->cachedResourceLoader());
+
     m_doc->setPrinting(printing);
     view()->adjustMediaTypeForPrinting(printing);

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2011-05-16  Yuzo Fujishima  <yuzo@google.com>
+
+        Reviewed by Antti Koivisto.
+
+        Fix for Bug 43704 - Web font is printed as blank if it is not cached
+        https://bugs.webkit.org/show_bug.cgi?id=43704
+
+        * WebView/WebHTMLView.mm:
+        (-[WebHTMLView _setPrinting:minimumPageWidth:height:maximumPageWidth:adjustViewSize:paginateScreenContent:]): Use ResourceCacheValidationSuppressor to allow stale resources in printing.
+
 2011-05-16  David Kilzer  <ddkilzer@apple.com>
 

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

@@ -77 +77 @@
 #import <WebCore/CachedImage.h>
 #import <WebCore/CachedResourceClient.h>
+#import <WebCore/CachedResourceLoader.h>
 #import <WebCore/Chrome.h>
 #import <WebCore/ColorMac.h>
@@ -3835 +3836 @@
             coreView->setMediaType(_private->printing ? "print" : "screen");
         if (Document* document = coreFrame->document()) {
+            // In setting printing, we should not validate resources already cached for the document.
+            // See https://bugs.webkit.org/show_bug.cgi?id=43704
+            ResourceCacheValidationSuppressor validationSuppressor(document->cachedResourceLoader());
+
             document->setPaginatedForScreen(_private->paginateScreenContent);
             document->setPrinting(_private->printing);