[Qt][WK2] Remove #if !USE(TILED_BACKING_STORE) from WebFrameLoaderClient::transitionT...

https://bugs.webkit.org/show_bug.cgi?id=83070

Patch by Zalan Bujtas <zbujtas@gmail.com> on 2012-04-03
Reviewed by Andreas Kling.

It is preventing m_frameHasCustomRepresentation to be set properly and not in sync with
WebFrameLoaderClient::transitionToCommittedFromCachedFrame()

* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::transitionToCommittedForNewPage):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@113100 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index d966314..5995120 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,16 @@
+2012-04-03  Zalan Bujtas  <zbujtas@gmail.com>
+
+        [Qt][WK2] Remove #if !USE(TILED_BACKING_STORE) from WebFrameLoaderClient::transitionToCommittedForNewPage()
+        https://bugs.webkit.org/show_bug.cgi?id=83070
+
+        Reviewed by Andreas Kling.
+
+        It is preventing m_frameHasCustomRepresentation to be set properly and not in sync with
+        WebFrameLoaderClient::transitionToCommittedFromCachedFrame()
+
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebKit::WebFrameLoaderClient::transitionToCommittedForNewPage):
+
 2012-04-03  Jer Noble  <jer.noble@apple.com>
 
         ESC key in full screen does not result in webkitFullScreenChange event.

diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp b/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
index 820f618..9a2b2e0 100644 (file)
--- a/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
+++ b/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
@@ -1167,10 +1167,8 @@ void WebFrameLoaderClient::transitionToCommittedForNewPage()
     bool isMainFrame = webPage->mainWebFrame() == m_frame;
     bool shouldUseFixedLayout = isMainFrame && webPage->useFixedLayout();
 
-#if !USE(TILED_BACKING_STORE)
     const ResourceResponse& response = m_frame->coreFrame()->loader()->documentLoader()->response();
     m_frameHasCustomRepresentation = isMainFrame && WebProcess::shared().shouldUseCustomRepresentationForResponse(response);
-#endif
 
     m_frame->coreFrame()->createView(webPage->size(), backgroundColor, /* transparent */ false, IntSize(), shouldUseFixedLayout);
     m_frame->coreFrame()->view()->setTransparent(!webPage->drawsBackground());