Changeset 24619 in webkit
- Timestamp:
- Jul 25, 2007 2:57:02 AM (17 years ago)
- Location:
- trunk
- Files:
-
- 6 deleted
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r24618 r24619 1 2007-07-24 Kevin McCullough <kmccullough@apple.com>2 3 Reviewed by Oliver.4 5 - <rdar://problem/5329440> REGRESSION: Clicking links with the feed:// protocol in Safari 3 does nothing6 - Tests that feed:// urls can still be followed when clicked.7 8 * http/tests/security/feed-urls-from-remote-expected.txt: Added.9 * http/tests/security/feed-urls-from-remote.html: Added.10 * http/tests/security/resources/feed.html: Added.11 * http/tests/security/resources/feed.xml: Added.12 * win/Skipped:13 14 1 2007-07-24 Brady Eidson <beidson@apple.com> 15 2 -
trunk/WebCore/ChangeLog
r24618 r24619 1 2007-07-24 Kevin McCullough <kmccullough@apple.com>2 3 Reviewed by Oliver.4 5 - <rdar://problem/5329440> REGRESSION: Clicking links with the feed:// protocol in Safari 3 does nothing6 - Check for file:// urls when clicking links, not block all schemes that are treated as local.7 8 * loader/FrameLoader.cpp:9 (WebCore::FrameLoader::load):10 11 1 2007-07-24 Oliver Hunt <oliver@apple.com> 12 2 -
trunk/WebCore/loader/FrameLoader.cpp
r24618 r24619 1819 1819 1820 1820 ASSERT(frame()->document()); 1821 1822 const String& urlString = url.url().lower(); 1823 if (urlString.startsWith("file:")) { 1824 FrameLoader::reportLocalLoadFailed(m_frame->page(), urlString); 1821 if (!canLoad(url, frame()->document()) && 1822 !canLoad(url, referrer)) { 1823 FrameLoader::reportLocalLoadFailed(m_frame->page(), url.url()); 1825 1824 return; 1826 1825 } -
trunk/WebKitTools/ChangeLog
r24618 r24619 1 2007-07-24 Kevin McCullough <kmccullough@apple.com>2 3 Reviewed by Oliver.4 5 - <rdar://problem/5329440> REGRESSION: Clicking links with the feed:// protocol in Safari 3 does nothing6 - Change DRT to be able to intercept the requst to load so it can check if a scheme was allowed or not.7 8 * ChangeLog:9 * DumpRenderTree/DumpRenderTree.m:10 (createWebView):11 (dumpRenderTree):12 (+[LayoutTestController isSelectorExcludedFromWebScript:]):13 (+[LayoutTestController webScriptNameForSelector:]):14 (-[LayoutTestController setCustomPolicyDelegate:]):15 * DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:16 * DumpRenderTree/FrameLoadDelegate.h:17 * DumpRenderTree/PolicyDelegate.h: Added.18 * DumpRenderTree/PolicyDelegate.m: Added.19 (-[PolicyDelegate webView:decidePolicyForNavigationAction:request:frame:decisionListener:]):20 * DumpRenderTree/ResourceLoadDelegate.h:21 22 1 2007-07-23 Adam Treat <treat@kde.org> 23 2 -
trunk/WebKitTools/DumpRenderTree/DumpRenderTree.m
r24618 r24619 36 36 #import "ObjCPlugin.h" 37 37 #import "ObjCPluginFunction.h" 38 #import "PolicyDelegate.h"39 38 #import "ResourceLoadDelegate.h" 40 39 #import "UIDelegate.h" … … 117 116 static EditingDelegate *editingDelegate; 118 117 static ResourceLoadDelegate *resourceLoadDelegate; 119 static PolicyDelegate *policyDelegate;120 118 121 119 // Deciding when it's OK to dump out the state is a bit tricky. All these must be true: … … 383 381 [webView setEditingDelegate:editingDelegate]; 384 382 [webView setResourceLoadDelegate:resourceLoadDelegate]; 385 386 // Register the same schemes that Safari does 387 [WebView registerURLSchemeAsLocal:@"feed"]; 388 [WebView registerURLSchemeAsLocal:@"feeds"]; 389 [WebView registerURLSchemeAsLocal:@"feedsearch"]; 390 383 391 384 // The back/forward cache is causing problems due to layouts during transition from one page to another. 392 385 // So, turn it off for now, but we might want to turn it back on some day. … … 522 515 editingDelegate = [[EditingDelegate alloc] init]; 523 516 resourceLoadDelegate = [[ResourceLoadDelegate alloc] init]; 524 policyDelegate = [[PolicyDelegate alloc] init];525 517 526 518 NSString *pwd = [[NSString stringWithUTF8String:argv[0]] stringByDeletingLastPathComponent]; … … 595 587 [resourceLoadDelegate release]; 596 588 [uiDelegate release]; 597 [policyDelegate release];598 589 599 590 [localPasteboards release]; … … 1012 1003 || aSelector == @selector(setCanOpenWindows) 1013 1004 || aSelector == @selector(setCloseRemainingWindowsWhenComplete:) 1014 || aSelector == @selector(setCustomPolicyDelegate:)1015 1005 || aSelector == @selector(setMainFrameIsFirstResponder:) 1016 1006 || aSelector == @selector(setTabKeyCyclesThroughElements:) … … 1067 1057 if (aSelector == @selector(setCloseRemainingWindowsWhenComplete:)) 1068 1058 return @"setCloseRemainingWindowsWhenComplete"; 1069 if (aSelector == @selector(setCustomPolicyDelegate:))1070 return @"setCustomPolicyDelegate";1071 1059 if (aSelector == @selector(setUseDashboardCompatibilityMode:)) 1072 1060 return @"setUseDashboardCompatiblityMode"; … … 1106 1094 { 1107 1095 closeRemainingWindowsWhenComplete = closeWindows; 1108 }1109 1110 - (void)setCustomPolicyDelegate:(BOOL)setDelegate1111 {1112 if (setDelegate)1113 [[mainFrame webView] setPolicyDelegate:policyDelegate];1114 else1115 [[mainFrame webView] setPolicyDelegate:nil];1116 1096 } 1117 1097 -
trunk/WebKitTools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj
r24618 r24619 68 68 B5A752A008AF5CD400138E45 /* ImageDiff.m in Sources */ = {isa = PBXBuildFile; fileRef = B5A7525808AF4A3600138E45 /* ImageDiff.m */; }; 69 69 B5A752A208AF5D1F00138E45 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5A752A108AF5D1F00138E45 /* QuartzCore.framework */; }; 70 D23AE9660C56BB2100C47236 /* PolicyDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = D23AE8EA0C56B2FF00C47236 /* PolicyDelegate.m */; };71 D23AE9690C56BB2900C47236 /* PolicyDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = D23AE8E00C56B29E00C47236 /* PolicyDelegate.h */; };72 70 E1330800099624DA00AC0A91 /* AppleScriptController.h in Headers */ = {isa = PBXBuildFile; fileRef = E13307FE099624DA00AC0A91 /* AppleScriptController.h */; }; 73 71 E1330801099624DA00AC0A91 /* AppleScriptController.m in Sources */ = {isa = PBXBuildFile; fileRef = E13307FF099624DA00AC0A91 /* AppleScriptController.m */; }; … … 141 139 B5A7526708AF4A4A00138E45 /* ImageDiff */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = ImageDiff; sourceTree = BUILT_PRODUCTS_DIR; }; 142 140 B5A752A108AF5D1F00138E45 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = /System/Library/Frameworks/QuartzCore.framework; sourceTree = "<absolute>"; }; 143 D23AE8E00C56B29E00C47236 /* PolicyDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PolicyDelegate.h; sourceTree = "<group>"; };144 D23AE8EA0C56B2FF00C47236 /* PolicyDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PolicyDelegate.m; sourceTree = "<group>"; };145 141 E13307FE099624DA00AC0A91 /* AppleScriptController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppleScriptController.h; sourceTree = "<group>"; }; 146 142 E13307FF099624DA00AC0A91 /* AppleScriptController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppleScriptController.m; sourceTree = "<group>"; }; … … 245 241 A803FFF309CAAFE0009B2A37 /* EditingDelegate.h */, 246 242 A803FFF409CAAFE0009B2A37 /* EditingDelegate.m */, 247 D23AE8E00C56B29E00C47236 /* PolicyDelegate.h */,248 D23AE8EA0C56B2FF00C47236 /* PolicyDelegate.m */,249 243 1A6CA8630B7120CF00A24B62 /* ResourceLoadDelegate.h */, 250 244 1A6CA8640B7120CF00A24B62 /* ResourceLoadDelegate.m */, … … 315 309 6508A2990BFABB8100AD2696 /* FrameLoadDelegate.h in Headers */, 316 310 6508A29A0BFABB8200AD2696 /* ResourceLoadDelegate.h in Headers */, 317 D23AE9690C56BB2900C47236 /* PolicyDelegate.h in Headers */,318 311 ); 319 312 runOnlyForDeploymentPostprocessing = 0; … … 442 435 1422A1BB0AF6EDD600E1A883 /* UIDelegate.m in Sources */, 443 436 6508A2980BFABB8000AD2696 /* FrameLoadDelegate.m in Sources */, 444 D23AE9660C56BB2100C47236 /* PolicyDelegate.m in Sources */,445 437 ); 446 438 runOnlyForDeploymentPostprocessing = 0; -
trunk/WebKitTools/DumpRenderTree/FrameLoadDelegate.h
r24618 r24619 1 1 /* 2 * Copyright (C) 2007 Apple Inc. All rights reserved.2 * Copyright (C) 2007, Apple Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without -
trunk/WebKitTools/DumpRenderTree/ResourceLoadDelegate.h
r24618 r24619 1 1 /* 2 * Copyright (C) 2007 Apple Inc. All rights reserved.2 * Copyright (C) 2007, Apple Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without
Note: See TracChangeset
for help on using the changeset viewer.