Changeset 69461 in webkit
- Timestamp:
- Oct 9, 2010 4:18:54 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit2/ChangeLog
r69460 r69461 1 2010-10-09 Sam Weinig <sam@webkit.org> 2 3 Reviewed by Dan Bernstein. 4 5 WKFrameGetFrameLoadState() returns kWKFrameLoadStateCommitted after the load has been stopped 6 <rdar://problem/8173667> 7 https://bugs.webkit.org/show_bug.cgi?id=47461 8 9 API Test: WebKit2/FailedLoad 10 11 * UIProcess/WebFrameProxy.cpp: 12 (WebKit::WebFrameProxy::didFailProvisionalLoad): 13 (WebKit::WebFrameProxy::didFailLoad): 14 * UIProcess/WebFrameProxy.h: 15 * UIProcess/WebPageProxy.cpp: 16 (WebKit::WebPageProxy::didFailProvisionalLoadForFrame): 17 (WebKit::WebPageProxy::didFailLoadForFrame): 18 Set the frame load state to LoadStateFinished for both didFailProvisionalLoadForFrame 19 and didFailLoadForFrame. 20 1 21 2010-10-09 Sam Weinig <sam@webkit.org> 2 22 -
trunk/WebKit2/UIProcess/WebFrameProxy.cpp
r67775 r69461 81 81 } 82 82 83 void WebFrameProxy::didFailProvisionalLoad() 84 { 85 m_loadState = LoadStateFinished; 86 } 87 83 88 void WebFrameProxy::didCommitLoad() 84 89 { … … 92 97 { 93 98 // FIXME: Add assertions 99 m_loadState = LoadStateFinished; 100 } 101 102 void WebFrameProxy::didFailLoad() 103 { 94 104 m_loadState = LoadStateFinished; 95 105 } -
trunk/WebKit2/UIProcess/WebFrameProxy.h
r69116 r69461 83 83 void didStartProvisionalLoad(const String& url); 84 84 void didReceiveServerRedirectForProvisionalLoad(const String& url); 85 void didFailProvisionalLoad(); 85 86 void didCommitLoad(); 86 87 void didFinishLoad(); 88 void didFailLoad(); 87 89 void didReceiveTitle(const String&); 88 90 -
trunk/WebKit2/UIProcess/WebPageProxy.cpp
r69460 r69461 645 645 WebFrameProxy* frame = process()->webFrame(frameID); 646 646 647 frame->didFailProvisionalLoad(); 647 648 m_loaderClient.didFailProvisionalLoadWithErrorForFrame(this, frame, userData.get()); 648 649 } … … 696 697 697 698 WebFrameProxy* frame = process()->webFrame(frameID); 699 frame->didFailLoad(); 698 700 699 701 m_loaderClient.didFailLoadWithErrorForFrame(this, frame, userData.get()); -
trunk/WebKitTools/ChangeLog
r69460 r69461 1 2010-10-09 Sam Weinig <sam@webkit.org> 2 3 Reviewed by Dan Bernstein. 4 5 WKFrameGetFrameLoadState() returns kWKFrameLoadStateCommitted after the load has been stopped 6 <rdar://problem/8173667> 7 https://bugs.webkit.org/show_bug.cgi?id=47461 8 9 * TestWebKitAPI/PlatformUtilities.h: 10 * TestWebKitAPI/Test.h: 11 * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: 12 * TestWebKitAPI/Tests/WebKit2/FailedLoad.cpp: Added. 13 (TestWebKitAPI::didFailProvisionalLoadWithErrorForFrame): 14 (TestWebKitAPI::TEST): 15 * TestWebKitAPI/mac/PlatformUtilitiesMac.mm: 16 (TestWebKitAPI::Util::URLForNonExistentResource): 17 Adds a test for the frame load state after a failed provisional load. I wanted to test 18 the frame load state after a committed load failed, but I don't believe that is possible 19 to do without hooking up the http server to serve a long loading page. 20 1 21 2010-10-09 Sam Weinig <sam@webkit.org> 2 22 -
trunk/WebKitTools/TestWebKitAPI/PlatformUtilities.h
r69129 r69461 39 39 40 40 WKURLRef createURLForResource(const char* resource, const char* extension); 41 WKURLRef URLForNonExistentResource(); 41 42 42 43 inline std::string toSTD(WKStringRef string) -
trunk/WebKitTools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj
r69343 r69461 25 25 BCBD3737125ABBEB00D2C29F /* icon.png in Copy Resources */ = {isa = PBXBuildFile; fileRef = BCBD372E125ABBE600D2C29F /* icon.png */; }; 26 26 BCBD3761125ABCFE00D2C29F /* FrameMIMETypePNG.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCBD3760125ABCFE00D2C29F /* FrameMIMETypePNG.cpp */; }; 27 BCC8B95B12611F4700DE46A4 /* FailedLoad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCC8B95A12611F4700DE46A4 /* FailedLoad.cpp */; }; 27 28 /* End PBXBuildFile section */ 28 29 … … 79 80 BCBD372E125ABBE600D2C29F /* icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon.png; sourceTree = "<group>"; }; 80 81 BCBD3760125ABCFE00D2C29F /* FrameMIMETypePNG.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FrameMIMETypePNG.cpp; sourceTree = "<group>"; }; 82 BCC8B95A12611F4700DE46A4 /* FailedLoad.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FailedLoad.cpp; sourceTree = "<group>"; }; 81 83 /* End PBXFileReference section */ 82 84 … … 159 161 BC90995D12567BC100083756 /* WKString.cpp */, 160 162 BC9099931256ACF100083756 /* WKStringJSString.cpp */, 163 BCC8B95A12611F4700DE46A4 /* FailedLoad.cpp */, 161 164 ); 162 165 path = WebKit2; … … 262 265 BCBD3761125ABCFE00D2C29F /* FrameMIMETypePNG.cpp in Sources */, 263 266 1A02C84F125D4A8400E3F4BD /* Find.cpp in Sources */, 267 BCC8B95B12611F4700DE46A4 /* FailedLoad.cpp in Sources */, 264 268 ); 265 269 runOnlyForDeploymentPostprocessing = 0; -
trunk/WebKitTools/TestWebKitAPI/mac/PlatformUtilitiesMac.mm
r69116 r69461 44 44 } 45 45 46 WKURLRef URLForNonExistentResource() 47 { 48 NSURL* nsURL = [NSURL URLWithString:@"file:///does-not-exist.html"]; 49 return WKURLCreateWithCFURL((CFURLRef)nsURL); 50 } 51 46 52 } // namespace Util 47 53 } // namespace TestWebKitAPI
Note: See TracChangeset
for help on using the changeset viewer.