Changeset 84010 in webkit
- Timestamp:
- Apr 15, 2011 12:22:34 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r83999 r84010 1 2011-04-15 Andreas Kling <kling@webkit.org> 2 3 Reviewed by Antonio Gomes. 4 5 [Qt] DRT: Block access to external URLs. 6 7 * platform/qt/Skipped: Unskip now passing tests. 8 1 9 2011-04-15 James Robinson <jamesr@chromium.org> 2 10 -
trunk/LayoutTests/platform/qt/Skipped
r83886 r84010 1649 1649 fast/events/5056619.html 1650 1650 fast/events/drag-in-frames.html 1651 fast/loader/null-request-after-willSendRequest.html1652 1651 fast/text/international/thai-line-breaks.html 1653 1652 … … 3235 3234 plugins/embed-prefers-plugins-for-images.html 3236 3235 3237 # http/tests/uri/username-with-no-hostname.html fails after r821513238 # https://bugs.webkit.org/show_bug.cgi?id=573063239 http/tests/uri/username-with-no-hostname.html3240 3241 3236 # [Qt]REGRESSION(r82243): fast/events/onsearch-enter.html fails 3242 3237 # https://bugs.webkit.org/show_bug.cgi?id=57472 … … 3496 3491 inspector/styles/styles-disable-then-enable.html 3497 3492 3498 # [Qt] fast/ruby tests fail3499 # https://bugs.webkit.org/show_bug.cgi?id=585233500 fast/ruby/after-block-doesnt-crash.html3501 fast/ruby/after-table-doesnt-crash.html3502 fast/ruby/before-block-doesnt-crash.html3503 fast/ruby/before-table-doesnt-crash.html3504 3505 3493 # [Qt] fast/transforms/scrollIntoView-transformed.html fails 3506 3494 # https://bugs.webkit.org/show_bug.cgi?id=58559 -
trunk/Source/WebCore/platform/qt/RenderThemeQt.cpp
r83837 r84010 528 528 // FIXME: Check is flawed, since it doesn't take min-width/max-width into account. 529 529 if (renderStyle->width().isIntrinsicOrAuto() && size.width() > 0) 530 renderStyle->set Width(Length(size.width(), Fixed));530 renderStyle->setMinWidth(Length(size.width(), Fixed)); 531 531 if (renderStyle->height().isAuto() && size.height() > 0) 532 renderStyle->set Height(Length(size.height(), Fixed));532 renderStyle->setMinHeight(Length(size.height(), Fixed)); 533 533 } 534 534 … … 608 608 int paddingLeft = buttonMargin; 609 609 int paddingRight = buttonMargin; 610 int paddingTop = 1;611 int paddingBottom = 0;610 int paddingTop = buttonMargin; 611 int paddingBottom = buttonMargin; 612 612 613 613 // Then check if the style uses layout margins -
trunk/Source/WebKit/qt/ChangeLog
r83892 r84010 1 2011-04-15 Andreas Kling <kling@webkit.org> 2 3 Reviewed by Antonio Gomes. 4 5 [Qt] DRT: Block access to external URLs. 6 7 Implement the "Blocked access to external URL" behavior for Qt's DRT, 8 based on what other ports are doing. 9 10 Fixes <http://webkit.org/b/57306> and <http://webkit.org/b/58523>. 11 12 * WebCoreSupport/FrameLoaderClientQt.cpp: 13 (WebCore::FrameLoaderClientQt::dispatchWillSendRequest): 14 1 15 2011-01-26 Ragner Magalhaes <ragner.magalhaes@openbossa.org> 2 16 -
trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
r83439 r84010 1027 1027 void FrameLoaderClientQt::dispatchWillSendRequest(WebCore::DocumentLoader*, unsigned long identifier, WebCore::ResourceRequest& newRequest, const WebCore::ResourceResponse& redirectResponse) 1028 1028 { 1029 KURL url = newRequest.url(); 1029 1030 1030 1031 if (dumpResourceLoadCallbacks) … … 1034 1035 (redirectResponse.isNull()) ? "(null)" : qPrintable(drtDescriptionSuitableForTestResult(redirectResponse))); 1035 1036 1036 if (sendRequestReturnsNull) 1037 if (sendRequestReturnsNull) { 1037 1038 newRequest.setURL(QUrl()); 1039 return; 1040 } 1038 1041 1039 1042 if (sendRequestReturnsNullOnRedirect && !redirectResponse.isNull()) { 1040 1043 printf("Returning null for this redirect\n"); 1041 1044 newRequest.setURL(QUrl()); 1045 return; 1046 } 1047 1048 if (QWebPagePrivate::drtRun 1049 && url.protocolInHTTPFamily() 1050 && url.host() != "127.0.0.1" 1051 && url.host() != "255.255.255.255" 1052 && !equalIgnoringCase(url.host(), "localhost")) { 1053 1054 printf("Blocked access to external URL %s\n", qPrintable(drtDescriptionSuitableForTestResult(url))); 1055 newRequest.setURL(QUrl()); 1056 return; 1042 1057 } 1043 1058 … … 1046 1061 1047 1062 if (QWebPagePrivate::drtRun) { 1048 Q String url = newRequest.url().string();1049 if ( URLsToRedirect.contains(url))1050 newRequest.setURL(QUrl( URLsToRedirect[url]));1063 QMap<QString, QString>::const_iterator it = URLsToRedirect.constFind(url.string()); 1064 if (it != URLsToRedirect.constEnd()) 1065 newRequest.setURL(QUrl(it.value())); 1051 1066 } 1052 1067 // Seems like the Mac code doesn't do anything here by default neither. 1053 // qDebug() << "FrameLoaderClientQt::dispatchWillSendRequest" << request.isNull() << request.url().string();1068 // qDebug() << "FrameLoaderClientQt::dispatchWillSendRequest" << request.isNull() << url; 1054 1069 } 1055 1070
Note: See TracChangeset
for help on using the changeset viewer.