Changeset 49480 in webkit
- Timestamp:
- Oct 12, 2009, 3:39:27 PM (15 years ago)
- Location:
- branches/safari-4-branch/WebCore
- Files:
-
- 4 edited
-
ChangeLog (modified) (1 diff)
-
html/HTMLMediaElement.cpp (modified) (2 diffs)
-
loader/FrameLoader.cpp (modified) (1 diff)
-
loader/FrameLoader.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/safari-4-branch/WebCore/ChangeLog
r49477 r49480 1 2009-10-12 Mark Rowe <mrowe@apple.com> 2 3 Merge r49218. 4 5 2009-10-06 Sam Weinig <sam@webkit.org> 6 7 Reviewed by Brady Eidson. 8 9 Fix for <rdar://problem/7271202> 10 Dispatch resource load delegate functions for the media element. 11 Since we don't get the required callbacks from the media engine, 12 just fake the parameters to the delegate functions as best as possible. 13 14 * html/HTMLMediaElement.cpp: 15 (WebCore::HTMLMediaElement::loadResource): 16 (WebCore::HTMLMediaElement::isSafeToLoadURL): 17 * loader/FrameLoader.cpp: 18 (WebCore::FrameLoader::willLoadMediaElementURL): 19 * loader/FrameLoader.h: 20 1 21 2009-10-12 Mark Rowe <mrowe@apple.com> 2 22 -
branches/safari-4-branch/WebCore/html/HTMLMediaElement.cpp
r49470 r49480 548 548 } 549 549 550 void HTMLMediaElement::loadResource(const KURL& url, ContentType& contentType) 551 { 552 ASSERT(isSafeToLoadURL(url, Complain)); 550 void HTMLMediaElement::loadResource(const KURL& initialURL, ContentType& contentType) 551 { 552 ASSERT(isSafeToLoadURL(initialURL, Complain)); 553 554 Frame* frame = document()->frame(); 555 if (!frame) 556 return; 557 FrameLoader* loader = frame->loader(); 558 if (!loader) 559 return; 560 561 KURL url(initialURL); 562 if (!loader->willLoadMediaElementURL(url)) 563 return; 553 564 554 565 // The resource fetch algorithm … … 582 593 FrameLoader* loader = frame ? frame->loader() : 0; 583 594 584 // don't allow remote to local urls 595 // don't allow remote to local urls, and check with the frame loader client. 585 596 if (!loader || !loader->canLoad(url, String(), document())) { 586 597 if (actionIfInvalid == Complain) -
branches/safari-4-branch/WebCore/loader/FrameLoader.cpp
r49471 r49480 2428 2428 } 2429 2429 2430 bool FrameLoader::willLoadMediaElementURL(KURL& url) 2431 { 2432 ResourceRequest request(url); 2433 2434 unsigned long identifier; 2435 ResourceError error; 2436 requestFromDelegate(request, identifier, error); 2437 sendRemainingDelegateMessages(identifier, ResourceResponse(url, String(), -1, String(), String()), -1, error); 2438 2439 url = request.url(); 2440 2441 return error.isNull(); 2442 } 2443 2430 2444 void FrameLoader::handleUnimplementablePolicy(const ResourceError& error) 2431 2445 { -
branches/safari-4-branch/WebCore/loader/FrameLoader.h
r45679 r49480 191 191 void receivedData(const char*, int); 192 192 193 bool willLoadMediaElementURL(KURL&); 194 193 195 void handleFallbackContent(); 194 196 bool isStopping() const;
Note:
See TracChangeset
for help on using the changeset viewer.