Title: [97483] trunk/Source/WebKit2
- Revision
- 97483
- Author
- [email protected]
- Date
- 2011-10-14 11:27:26 -0700 (Fri, 14 Oct 2011)
Log Message
Unreviewed, rolling out r97375.
http://trac.webkit.org/changeset/97375
https://bugs.webkit.org/show_bug.cgi?id=70115
It breaks loading of webpages in QtWebKit2 (Requested by jeez_
on #webkit).
Patch by Sheriff Bot <[email protected]> on 2011-10-14
* UIProcess/qt/ClientImpl.cpp:
(qt_wk_decidePolicyForNavigationAction):
* UIProcess/qt/ClientImpl.h:
* UIProcess/qt/QtWebPageProxy.cpp:
(QtWebPageProxy::init):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (97482 => 97483)
--- trunk/Source/WebKit2/ChangeLog 2011-10-14 18:26:09 UTC (rev 97482)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-14 18:27:26 UTC (rev 97483)
@@ -1,3 +1,18 @@
+2011-10-14 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r97375.
+ http://trac.webkit.org/changeset/97375
+ https://bugs.webkit.org/show_bug.cgi?id=70115
+
+ It breaks loading of webpages in QtWebKit2 (Requested by jeez_
+ on #webkit).
+
+ * UIProcess/qt/ClientImpl.cpp:
+ (qt_wk_decidePolicyForNavigationAction):
+ * UIProcess/qt/ClientImpl.h:
+ * UIProcess/qt/QtWebPageProxy.cpp:
+ (QtWebPageProxy::init):
+
2011-10-12 Ryosuke Niwa <[email protected]>
Make the interface of locationAndLengthFromRange and rangeFromLocationAndLength consistent
Modified: trunk/Source/WebKit2/UIProcess/qt/ClientImpl.cpp (97482 => 97483)
--- trunk/Source/WebKit2/UIProcess/qt/ClientImpl.cpp 2011-10-14 18:26:09 UTC (rev 97482)
+++ trunk/Source/WebKit2/UIProcess/qt/ClientImpl.cpp 2011-10-14 18:27:26 UTC (rev 97483)
@@ -252,30 +252,3 @@
break;
}
}
-
-void qt_wk_decidePolicyForResponse(WKPageRef page, WKFrameRef frame, WKURLResponseRef response, WKURLRequestRef request, WKFramePolicyListenerRef listener, WKTypeRef userData, const void* clientInfo)
-{
- String type = toImpl(response)->resourceResponse().mimeType();
- type.makeLower();
- bool canShowMIMEType = toImpl(frame)->canShowMIMEType(type);
-
- if (WKPageGetMainFrame(page) == frame) {
- if (canShowMIMEType) {
- WKFramePolicyListenerUse(listener);
- return;
- }
-
- // If we can't use (show) it then we should download it.
- WKFramePolicyListenerDownload(listener);
- return;
- }
-
- // We should ignore downloadable top-level content for subframes, with an exception for text/xml and application/xml so we can still support Acid3 test.
- // It makes the browser intentionally behave differently when it comes to text(application)/xml content in subframes vs. mainframe.
- if (!canShowMIMEType && !(type == "text/xml" || type == "application/xml")) {
- WKFramePolicyListenerIgnore(listener);
- return;
- }
-
- WKFramePolicyListenerUse(listener);
-}
Modified: trunk/Source/WebKit2/UIProcess/qt/ClientImpl.h (97482 => 97483)
--- trunk/Source/WebKit2/UIProcess/qt/ClientImpl.h 2011-10-14 18:26:09 UTC (rev 97482)
+++ trunk/Source/WebKit2/UIProcess/qt/ClientImpl.h 2011-10-14 18:27:26 UTC (rev 97483)
@@ -48,7 +48,6 @@
// Policy client.
void qt_wk_decidePolicyForNavigationAction(WKPageRef, WKFrameRef, WKFrameNavigationType, WKEventModifiers, WKEventMouseButton, WKURLRequestRef, WKFramePolicyListenerRef, WKTypeRef userData, const void* clientInfo);
-void qt_wk_decidePolicyForResponse(WKPageRef, WKFrameRef, WKURLResponseRef, WKURLRequestRef, WKFramePolicyListenerRef, WKTypeRef userData, const void* clientInfo);
#ifdef __cplusplus
}
Modified: trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp (97482 => 97483)
--- trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp 2011-10-14 18:26:09 UTC (rev 97482)
+++ trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp 2011-10-14 18:27:26 UTC (rev 97483)
@@ -156,7 +156,6 @@
policyClient.version = kWKPagePolicyClientCurrentVersion;
policyClient.clientInfo = m_policyInterface;
policyClient.decidePolicyForNavigationAction = qt_wk_decidePolicyForNavigationAction;
- policyClient.decidePolicyForResponse = qt_wk_decidePolicyForResponse;
WKPageSetPagePolicyClient(toAPI(m_webPageProxy.get()), &policyClient);
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
