-
sullivan authored
Reviewed by Adam - WebCore part of fix for <rdar://problem/5315033> * rendering/RenderObject.h: replaced PaintRestrictionSelectionOnlyWhiteText with PaintRestrictionSelectionOnlyBlackText (WebCore::RenderObject::PaintInfo::PaintInfo): replaced forceWhiteText with forceBlackText * rendering/RenderObject.cpp: (WebCore::RenderObject::addLineBoxRects): added a useSelectionHeight parameter, which defaults to false; this method is unimplemented at this level so this has no effect. * rendering/RenderText.h: * rendering/RenderText.cpp: (WebCore::RenderText::addLineBoxRects): added a useSelectionHeight parameter, which defaults to false. If true, use the vertical position and height returned by selectionRect rather than replacing it with the more tight-fitting position and height of the line box. * dom/Range.h: * dom/Range.cpp: (WebCore::Range::addLineBoxRects): added a useSelectionHeight parameter, which defaults to false. Passes this along to RenderObject. * page/Frame.h: renamed parameter to selectionImage * page/Frame.cpp: (WebCore::Frame::selectionTextRects): pass true for addLineBoxRects new useSelectionHeight parameter, so the rects returned by this new method will match the height that the selection would be painted here (WebCore::Frame::paint): updated for white->black name changes * page/mac/FrameMac.mm: (WebCore::Frame::selectionImage): updated for white->black name changes * rendering/InlineFlowBox.cpp: (WebCore::InlineFlowBox::paintTextDecorations): updated for white->black name changes * rendering/RenderLayer.cpp: (WebCore::RenderLayer::paintLayer): updated for white->black name changes * rendering/InlineTextBox.cpp: (WebCore::InlineTextBox::paint): updated for white->black name changes, and actually use black instead of white. This was the goal of all the name changes. WebKit: Reviewed by Adam - WebKit part of fix for <rdar://problem/5315033> * WebView/WebDocumentPrivate.h: new selectionImageForcingBlackText: method. selectionImageForcingWhiteText: is no longer used and was never in an official release of WebKit, so it could be removed, except that doing so would cause trouble for people using nightly WebKit with Safari 3.0 beta. So I left it in, but made it just force black text instead of white text, which will look different for those nightly WebKit/Safari 3.0 beta people but not break anything. * Misc/WebSearchableTextView.m: (-[WebSearchableTextView selectionImageForcingBlackText:]): new unimplemented protocol method for this obsolete class * WebView/WebHTMLView.mm: (-[WebHTMLView selectionImageForcingBlackText:]): calls through to WebCore the way selectionImageForcingWhiteText: used to (-[WebHTMLView selectionImageForcingWhiteText:]): now just calls selectionImageForcingBlackText:, thus not working as you would expect from the name * WebView/WebPDFView.mm: (-[WebPDFView selectionImageForcingBlackText:]): guts of old selectionImageForcingWhiteText:, but with black substituted for white (-[WebPDFView selectionImageForcingWhiteText:]): now just calls selectionImageForcingBlackText:, thus not working as you would expect from the name git-svn-id: http://svn.webkit.org/repository/webkit/trunk@24041 268f45cc-cd09-0410-ab3c-d52691b4dbfc
4ea5e41a