From: timothy@apple.com Date: Wed, 5 Mar 2008 04:48:04 +0000 (+0000) Subject: Fix the Tiger build. X-Git-Url: http://git.webkit.org/?p=WebKit-https.git;a=commitdiff_plain;h=29296bf4596f0b13bbb4a348237a1cfa149c0a0e Fix the Tiger build. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@30786 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- diff --git a/WebCore/loader/mac/DocumentLoaderMac.cpp b/WebCore/loader/mac/DocumentLoaderMac.cpp index b6f5b25..05c6e26 100644 --- a/WebCore/loader/mac/DocumentLoaderMac.cpp +++ b/WebCore/loader/mac/DocumentLoaderMac.cpp @@ -34,6 +34,7 @@ namespace WebCore { +#ifndef BUILDING_ON_TIGER static void scheduleAll(const ResourceLoaderSet& loaders, SchedulePair* pair) { const ResourceLoaderSet copy = loaders; @@ -51,23 +52,28 @@ static void unscheduleAll(const ResourceLoaderSet& loaders, SchedulePair* pair) if (ResourceHandle* handle = (*it)->handle()) handle->unschedule(pair); } +#endif void DocumentLoader::schedule(SchedulePair* pair) { +#ifndef BUILDING_ON_TIGER if (m_mainResourceLoader && m_mainResourceLoader->handle()) m_mainResourceLoader->handle()->schedule(pair); scheduleAll(m_subresourceLoaders, pair); scheduleAll(m_plugInStreamLoaders, pair); scheduleAll(m_multipartSubresourceLoaders, pair); +#endif } void DocumentLoader::unschedule(SchedulePair* pair) { +#ifndef BUILDING_ON_TIGER if (m_mainResourceLoader && m_mainResourceLoader->handle()) m_mainResourceLoader->handle()->unschedule(pair); unscheduleAll(m_subresourceLoaders, pair); unscheduleAll(m_plugInStreamLoaders, pair); unscheduleAll(m_multipartSubresourceLoaders, pair); +#endif } } // namespace diff --git a/WebCore/page/mac/PageMac.cpp b/WebCore/page/mac/PageMac.cpp index fabdcf3..7386eea 100644 --- a/WebCore/page/mac/PageMac.cpp +++ b/WebCore/page/mac/PageMac.cpp @@ -43,12 +43,14 @@ void Page::addSchedulePair(PassRefPtr prpPair) m_scheduledRunLoopPairs.set(new SchedulePairHashSet); m_scheduledRunLoopPairs->add(pair); +#ifndef BUILDING_ON_TIGER for (Frame* frame = m_mainFrame.get(); frame; frame = frame->tree()->traverseNext()) { if (DocumentLoader* documentLoader = frame->loader()->documentLoader()) documentLoader->schedule(pair.get()); if (DocumentLoader* documentLoader = frame->loader()->provisionalDocumentLoader()) documentLoader->schedule(pair.get()); } +#endif // FIXME: make SharedTimerMac use these SchedulePairs. } @@ -62,12 +64,14 @@ void Page::removeSchedulePair(PassRefPtr prpPair) RefPtr pair = prpPair; m_scheduledRunLoopPairs->remove(pair); +#ifndef BUILDING_ON_TIGER for (Frame* frame = m_mainFrame.get(); frame; frame = frame->tree()->traverseNext()) { if (DocumentLoader* documentLoader = frame->loader()->documentLoader()) documentLoader->unschedule(pair.get()); if (DocumentLoader* documentLoader = frame->loader()->provisionalDocumentLoader()) documentLoader->unschedule(pair.get()); } +#endif } } // namespace diff --git a/WebKit/mac/WebView/WebView.mm b/WebKit/mac/WebView/WebView.mm index a08ebf1..2320299 100644 --- a/WebKit/mac/WebView/WebView.mm +++ b/WebKit/mac/WebView/WebView.mm @@ -1823,10 +1823,12 @@ WebFrameLoadDelegateImplementationCache* WebViewGetFrameLoadDelegateImplementati _private->page = new Page(new WebChromeClient(self), new WebContextMenuClient(self), new WebEditorClient(self), new WebDragClient(self), new WebInspectorClient(self)); [[[WebFrameBridge alloc] initMainFrameWithPage:_private->page frameName:frameName frameView:frameView] release]; +#ifndef BUILDING_ON_TIGER if (WebKitLinkedOnOrAfter(WEBKIT_FIRST_VERSION_WITH_LOADING_DURING_COMMON_RUNLOOP_MODES)) [self scheduleInRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes]; else [self scheduleInRunLoop:[NSRunLoop mainRunLoop] forMode:NSDefaultRunLoopMode]; +#endif [self _addToAllWebViewsSet]; [self setGroupName:groupName]; @@ -2844,14 +2846,18 @@ static WebFrame *incrementFrame(WebFrame *curr, BOOL forward, BOOL wrapFlag) - (void)scheduleInRunLoop:(NSRunLoop *)runLoop forMode:(NSString *)mode { +#ifndef BUILDING_ON_TIGER if (runLoop && mode) core(self)->addSchedulePair(SchedulePair::create(runLoop, (CFStringRef)mode)); +#endif } - (void)unscheduleFromRunLoop:(NSRunLoop *)runLoop forMode:(NSString *)mode { +#ifndef BUILDING_ON_TIGER if (runLoop && mode) core(self)->removeSchedulePair(SchedulePair::create(runLoop, (CFStringRef)mode)); +#endif } - (BOOL)searchFor:(NSString *)string direction:(BOOL)forward caseSensitive:(BOOL)caseFlag wrap:(BOOL)wrapFlag startInSelection:(BOOL)startInSelection