Context Navigation

Roll out some recent changes by Chris that caused a performance regression.
Fix is in hand, but it is a little risky this close to a submission. So,
we have decided to roll back the change with the regression and roll in
the new code after we submit.

khtml/css/cssproperties.c: (hash_prop): (findProp):
khtml/css/cssvalues.c: (hash_val): (findValue):
khtml/misc/htmlattrs.c: (hash_attr): (findAttr):
khtml/misc/htmltags.c: (hash_tag): (findTag):
khtml/misc/loader.cpp: (CachedObject::~CachedObject): (CachedObject::setResponse): (CachedCSSStyleSheet::checkNotify): (Loader::servePendingRequests): (Loader::slotFinished): (Loader::slotReceivedResponse): (Cache::requestImage): (Cache::requestScript):
khtml/misc/loader.h: (khtml::CachedObject::CachedObject): (khtml::CachedObject::response):
kwq/KWQKJobClasses.h:
kwq/KWQKJobClasses.mm: (KIO::TransferJobPrivate::TransferJobPrivate): (KIO::TransferJobPrivate::~TransferJobPrivate): (KIO::TransferJob::TransferJob): (KIO::TransferJob::assembleResponseHeaders): (KIO::TransferJob::retrieveCharset): (KIO::TransferJob::emitResult): (KIO::TransferJob::emitReceivedResponse):
kwq/KWQLoader.h:
kwq/KWQLoader.mm: (KWQHeaderStringFromDictionary): (KWQCheckCacheObjectStatus): (KWQRetainResponse): (KWQReleaseResponse): (KWQIsResponseURLEqualToURL): (KWQResponseURL): (KWQResponseMIMEType): (KWQResponseTextEncodingName): (KWQResponseHeaderString): (KWQCacheObjectExpiresTime): (KWQLoader::KWQLoader):
kwq/KWQPixmap.h:
kwq/KWQPixmap.mm: (QPixmap::QPixmap):
kwq/KWQResourceLoader.mm: (-[KWQResourceLoader finishJobAndHandle]): (-[KWQResourceLoader cancel]): (-[KWQResourceLoader reportError]): (-[KWQResourceLoader finish]):
kwq/KWQSignal.h:
kwq/KWQSignal.mm: (KWQSignal::call):
kwq/KWQSlot.h:
kwq/KWQSlot.mm: (KWQSlot::KWQSlot): (KWQSlot::call):
kwq/WebCoreBridge.h:
kwq/WebCoreResourceLoader.h:

WebKit:

Reviewed by me

Roll out some recent changes by Chris that caused a performance regression.
Fix is in hand, but it is a little risky this close to a submission. So,
we have decided to roll back the change with the regression and roll in
the new code after we submit.

WebCoreSupport.subproj/WebBridge.m: (-[WebBridge objectLoadedFromCacheWithURL:response:size:]): (-[WebBridge syncLoadResourceWithURL:customHeaders:postData:finalURL:responseHeaders:statusCode:]):
WebCoreSupport.subproj/WebSubresourceClient.m: (-[WebSubresourceClient didFinishLoading]):
WebView.subproj/WebFrame.m: (-[WebFrame _opened]): (-[WebFrame _internalLoadDelegate]):
WebView.subproj/WebFrameInternal.h:

2:01 PM Changeset in webkit [8113] by sullivan

2 edits in trunk/WebCore

Vicki gave me special dispensation to check this in though the tree is closed.

Reviewed by Chris.

fixed <rdar://problem/3903990> can't tab to all items on www.google.com any more (other pages too?)

kwq/KWQKHTMLPart.mm: (KWQKHTMLPart::nextKeyViewInFrameHierarchy): when checking whether we moved the focus to another view, make sure we didn't "move" it to our documentView, because that's no move at all.

1:01 PM Changeset in webkit [8112] by darin

4 edits in trunk/WebCore

Reviewed by Vicki.

fixed <rdar://problem/3901109> REGRESSION (171-172): repro crash in DOM::NodeImpl::setChanged at chick-fil-a.com

khtml/css/css_valueimpl.cpp: (DOM::CSSMutableStyleDeclarationImpl::CSSMutableStyleDeclarationImpl): Added missing initialization for base class and node pointer.

fixed a few places that could leave dangling node pointers

khtml/html/html_baseimpl.cpp: (HTMLBodyElementImpl::~HTMLBodyElementImpl): Clear out the node pointer when the node is destroyed.
khtml/html/html_elementimpl.cpp: (HTMLElementImpl::~HTMLElementImpl): Ditto.

12:06 PM Changeset in webkit [8111] by cblu

11 edits in trunk/WebCore

Fix for performance regression. My original patch added a signal for passing the data of a resource to its WebCore cache object. This patch passes the data with the preexisting "finished" symbol so we make less calls.
Fixed: <rdar://problem/3903173> REGRESSION (172-TOT): assertion failure and crash in slotAllData logging into hotmail account

Reviewed by rjw.

khtml/misc/loader.cpp: (Loader::servePendingRequests): pass data param to slotFinished, removed allData signal (Loader::slotFinished): take data param
khtml/misc/loader.h:
kwq/KWQKJobClasses.h:
kwq/KWQKJobClasses.mm: (KIO::TransferJob::TransferJob): have m_result take a data param, removed m_allData (KIO::TransferJob::emitResult): take data param and pass it
kwq/KWQResourceLoader.mm: (-[KWQResourceLoader finishJobAndHandle:]): take data param and pass it (-[KWQResourceLoader cancel]): pass nil for data (-[KWQResourceLoader reportError]): ditto (-[KWQResourceLoader finishWithData:]): pass data
kwq/KWQSlot.mm: (KWQSlot::KWQSlot): pass data param to slotFinished (KWQSlot::call): added support for slotFinished_Loader, removed slotAllData

10:57 AM Changeset in webkit [8110] by kocienda

5 edits in trunk/WebCore

Reviewed by John

Did some clean up in the Position class as a result of trying to write some new layout
tests and discovering a bug along the way.

I removed these three functions from the Position class:

bool isFirstRenderedPositionOnLine() const;
bool isLastRenderedPositionOnLine() const;
static bool renderersOnDifferentLine(RenderObject *r1, long o1, RenderObject *r2, long o2);
bool inFirstEditableInRootEditableElement() const;

The first two have replacements in the VisiblePosition class, and some code has been
moved to use these new variants. The third function was a helper used only by these
first two function, and can be removed as well. The fourth function was not used by anyone.

khtml/editing/htmlediting.cpp: (khtml::InsertTextCommand::input): Change over to use VisiblePosition isFirstVisiblePositionOnLine().
khtml/editing/visible_position.cpp: (khtml::visiblePositionsOnDifferentLines): Added an additional check for blocks to this function. Incorrect results were being returned when asking about positions at the starts of blocks.
khtml/xml/dom_position.cpp: (DOM::Position::previousCharacterPosition): Change over to use VisiblePosition isFirstVisiblePositionOnLine(). (DOM::Position::nextCharacterPosition): Change over to use VisiblePosition isLastVisiblePositionOnLine(). (DOM::Position::rendersInDifferentPosition): Removed use of #3 helper in a log message. We can live without it.
khtml/xml/dom_position.h: Update header for deletions.

9:31 AM Changeset in webkit [8109] by kocienda

19 edits in trunk

Reviewed by John

Terminology change in execCommand command identifiers. Specifically, the name of
"InsertNewline" command has been changed to "InsertLineBreak". This matches the
terminology used by AppKit. It is also more accurate, since the insertion of a
"br" element is what the command does. The inspiration for this change is so the
-insertNewline AppKit method can be mapped to insert a new "div" element in
a document and avoid ambiguity with what the javascript editing command does.

khtml/editing/jsediting.cpp
layout-tests/editing/deleting/delete-tab-004.html
layout-tests/editing/editing.js
layout-tests/editing/inserting/insert-3654864-fix.html
layout-tests/editing/inserting/insert-3659587-fix.html
layout-tests/editing/inserting/insert-3775316-fix.html
layout-tests/editing/inserting/insert-3800346-fix.html
layout-tests/editing/inserting/insert-br-001.html
layout-tests/editing/inserting/insert-br-002.html
layout-tests/editing/inserting/insert-br-003.html
layout-tests/editing/inserting/insert-br-004.html
layout-tests/editing/inserting/insert-br-005.html
layout-tests/editing/inserting/insert-br-006.html
layout-tests/editing/inserting/insert-br-007.html
layout-tests/editing/inserting/insert-br-008.html
layout-tests/editing/inserting/insert-tab-004.html
layout-tests/editing/inserting/insert-text-with-newlines.html
layout-tests/editing/pasteboard/paste-text-010.html

Dec 2, 2004:

4:33 PM Changeset in webkit [8108] by kocienda

2 edits
2 adds in trunk

Reviewed by John

Fix for this bug:

<rdar://problem/3786362> REGRESSION (Mail): pasted text loses one newline

khtml/editing/htmlediting.cpp: (khtml::InsertLineBreakCommand::doApply): Added check for strict mode before adding an extra br element at the end of a block. This is only necessary in quirks mode. Also, lower-case "br" used to make element. (khtml::ReplaceSelectionCommand::doApply): If the replacement adds a br element as the last element in a block and the document is in quirks mode, add an additional br to make the one in the replacement content show up. This turns out to be much the same logic as is done in InsertLineBreakCommand.
layout-tests/editing/inserting/insert-3786362-fix-expected.txt: Added.
layout-tests/editing/inserting/insert-3786362-fix.html: Added.

4:24 PM Changeset in webkit [8107] by rjw

5 edits in trunk

WebKit:

Fixed <rdar://problem/3841332> REGRESSION (125.9-167u): repro crash in -[KWQPageState invalidate] involving .Mac images

Ensure that the document is cleared when leaving a non-HTML page. This ensures that
the b/f cache won't incorrectly trash the previous state when restoring.

Reviewed by John.

WebView.subproj/WebFrame.m: (-[WebFrame _setState:]):

WebCore:

Fixed <rdar://problem/3841332> REGRESSION (125.9-167u): repro crash in -[KWQPageState invalidate] involving .Mac images

Ensure that the document is cleared when leaving a non-HTML page. This ensures that
the b/f cache won't incorrectly trash the previous state when restoring.

Reviewed by John.

kwq/WebCoreBridge.h:
kwq/WebCoreBridge.mm: (-[WebCoreBridge openURL:reload:contentType:refresh:lastModified:pageCache:]): (-[WebCoreBridge canCachePage]): (-[WebCoreBridge clear]):

3:08 PM Changeset in webkit [8106] by kocienda

2 edits in trunk/WebKit

Reviewed by Richard

<rdar://problem/3748323> Problem with -[WebView editableDOMRangeForPoint:] (-isFlipped not taken into account?)
<rdar://problem/3852590> REGRESSION (Mail): Dropped content appears in wrong place if Mail message is scrolled down

When implementing drag and drop, moveDragCaretToPoint: and editableDOMRangeForPoint: are used in
concert to track the mouse and determine a drop location, respectively. However, moveDragCaretToPoint:
did a conversion of the passed-in point to the document view's coordinate space, whereas
editableDOMRangeForPoint: did not. Now it does.

Note that I will need to coordinate with Grant to have him roll out some code in Mail that
attempts to work around this problem (unsuccessfully), and actually manages to block the
real fix (which needs to be in WebKit).

WebView.subproj/WebView.m: (-[WebView editableDOMRangeForPoint:]): Convert the passed-in point to the document view's coordinate space.

2:17 PM Changeset in webkit [8105] by rjw

2 edits in trunk/WebKit

Fixed <rdar://problem/3895810> FATAL ERROR: <WebTextRenderer: 0x9328a20> unable to initialize with font "Times-Roman 16.00 pt. S ....

We have a hack to replace Times with Times New Roman if we fail
to setup Times. If we then fail to setup Times New Roman we
don't attempt to further fallback to the system font. Added
that additional fallback.

Reviewed by Ken.

WebCoreSupport.subproj/WebTextRenderer.m: (+[WebTextRenderer webFallbackFontFamily]): (-[WebTextRenderer initWithFont:usingPrinterFont:]):

1:37 PM Changeset in webkit [8104] by rjw

2 edits in trunk/WebKit

Fixed build problem on Tiger8A821. Private macro and function
we were using have been deprecated,

Reviewed by Vicki.

WebCoreSupport.subproj/WebTextRenderer.m: (-[WebTextRenderer initWithFont:usingPrinterFont:]):

1:04 PM Changeset in webkit [8103] by kocienda

2 edits in trunk/WebCore

Reviewed by Richard

Fix for this bug:

<rdar://problem/3857775> 8A293: Mail.app crashes converting copy-pasted text into plain text

khtml/xml/dom2_rangeimpl.cpp: (DOM::RangeImpl::commonAncestorContainer): Return the document element if no common ancestor container was found. This can happen in cases where the DOM was built from malformed markup (as in the case of this bug where there is content after the body tag). Did a little code clean up as well. (DOM::RangeImpl::compareBoundaryPoints): Made code more robust by adding some null checks.

11:05 AM Changeset in webkit [8102] by kocienda

2 edits in trunk/WebCore

Reviewed by Chris

Fix for this bug:

<rdar://problem/3668157> REGRESSION (Mail): shift-click deselects when selection was created right-to-left

khtml/khtml_part.cpp: (KHTMLPart::handleMousePressEventSingleClick): Use RangeImpl::compareBoundaryPoints to figure out which end of the selection to extend.

10:22 AM Changeset in webkit [8101] by harrison

4 edits in trunk/WebCore

Reviewed by Ken Kocienda.

<rdar://problem/3834917> REGRESSION (Mail): double-clicking blank line selects end of previous line
Fixed originally reported bug plus the case of double-clicking whitespace at the beginning of a line, which has a similar result.

khtml/editing/visible_text.cpp: (khtml::SimplifiedBackwardsTextIterator::SimplifiedBackwardsTextIterator): (khtml::SimplifiedBackwardsTextIterator::handleTextNode): (khtml::SimplifiedBackwardsTextIterator::handleReplacedElement): (khtml::SimplifiedBackwardsTextIterator::handleNonTextNode): (khtml::SimplifiedBackwardsTextIterator::emitCharacter): Distinguish BR from whitespace.
khtml/editing/visible_text.h: Distinguish BR from whitespace.
khtml/editing/visible_units.cpp: (khtml::previousWordBoundary): Use UPSTREAM visible position now that SimplifiedBackwardsTextIterator distinguishes BR from whitespace. Otherwise, double-clicking at end of line would result in caret selection at start of next line.

9:43 AM Changeset in webkit [8100] by kocienda

2 edits in trunk/WebCore

Reviewed by John

Fix for this bug:

<rdar://problem/3900996> Crash dragging past end of contentEditable DIV, at DOM::RangeImpl::pastEndNode() const + 24

khtml/xml/dom_position.cpp: (DOM::Position::equivalentRangeCompliantPosition): Fixed this function so that it constrains the offset of the position to be >= 0 and <= number of kids of its node. Not doing this constraining led to a DOM exception trying to use a Position returned from this function to set the boundary point of a Range (which eventually led to the crash). Since this crash happened, it seems like this function was failing in its contract to return a range-compliant position, hence the need for this fix.

Dec 1, 2004:

2:44 PM Changeset in webkit [8099] by cblu

6 edits in trunk/WebKit

Fixed: <rdar://problem/3879870> Flash Player unable to stop data stream from continuing to download by returning -1 from NPP_Write
Also improved and cleaned-up the plug-in stream termination code.

Reviewed by john.

Plugins.subproj/WebBaseNetscapePluginStream.h:
Plugins.subproj/WebBaseNetscapePluginStream.m: (+[WebBaseNetscapePluginStream reasonForError:]): return NPRES_DONE for a nil error (-[WebBaseNetscapePluginStream _pluginCancelledConnectionError]): new, factored out from other methods (-[WebBaseNetscapePluginStream errorForReason:]): new (-[WebBaseNetscapePluginStream dealloc]): release MIME type (-[WebBaseNetscapePluginStream setMIMEType:]): new (-[WebBaseNetscapePluginStream startStreamResponseURL:expectedContentLength:lastModifiedDate:MIMEType:]): call setMIMEType so we can use it in _pluginCancelledConnectionError, call renamed methods (-[WebBaseNetscapePluginStream _destroyStream]): prepended underscore, replaced some early returns with asserts as the callers are now smarter (-[WebBaseNetscapePluginStream _destroyStreamWithReason:]): prepended underscore, only call _destroyStream if there is an error or if the load is complete and there is no more data to be streamed (-[WebBaseNetscapePluginStream cancelLoadWithError:]): new, overridden by subclasses to cancel the actual NSURLConnection (-[WebBaseNetscapePluginStream destroyStreamWithError:]): new, calls _destroyStreamWithReason (-[WebBaseNetscapePluginStream finishedLoadingWithData:]): call renamed methods (-[WebBaseNetscapePluginStream _deliverData]): prepended underscore, call cancelLoadAndDestroyStreamWithError if NPP_Write returns a negative number
Plugins.subproj/WebBaseNetscapePluginView.m: (-[WebBaseNetscapePluginView destroyStream:reason:]): call cancelLoadAndDestroyStreamWithError
Plugins.subproj/WebNetscapePluginRepresentation.m: (-[WebNetscapePluginRepresentation receivedError:withDataSource:]): call destroyStreamWithError (-[WebNetscapePluginRepresentation cancelLoadWithError:]): new, override method, tell the data source to stop loading
Plugins.subproj/WebNetscapePluginStream.m: (-[WebNetscapePluginStream cancelLoadWithError:]): new, override method, tell the loader to stop (-[WebNetscapePluginStream stop]): call cancelLoadAndDestroyStreamWithError (-[WebNetscapePluginConnectionDelegate isDone]): new (-[WebNetscapePluginConnectionDelegate didReceiveResponse:]): call cancelLoadAndDestroyStreamWithError (-[WebNetscapePluginConnectionDelegate didFailWithError:]): call destroyStreamWithError

2:11 PM Changeset in webkit [8098] by hyatt

1 edit in trunk/WebCore/kwq/KWQScrollView.mm

Fix deployment build bustage

1:59 PM Changeset in webkit [8097] by kocienda

3 edits in trunk/WebCore

Reviewed by me

Moving code only.

khtml/editing/htmlediting.cpp: Move ReplaceSelectionCommand into alphabetical order with regard to other editing commands. The class had a name change ages ago, and it was never moved.
khtml/editing/htmlediting.h: Ditto.

1:52 PM Changeset in webkit [8096] by kocienda

8 edits
3 adds in trunk

Reviewed by Hyatt

Some improvements for paste, including some new code to annotate
whitespace when writing to the pasteboard to ensure that the meaning
of the markup on the pasteboard is unambiguous.

There is also new code for reading this annotated markup from the pasteboard,
removing the nodes that were added only to prevent ambiguity.

WebCore.pbproj/project.pbxproj: Added html_interchange.h and html_interchange.cpp files. The header should have been added earlier, but I did not do so.
khtml/editing/html_interchange.cpp: Added. (convertHTMLTextToInterchangeFormat):
khtml/editing/html_interchange.h: Added some new constants for use with whitespace annotations.
khtml/editing/htmlediting.cpp: (khtml::ReplacementFragment::ReplacementFragment): Now looks for and removes annotations added for whitespace. Also fixed a bug in the code that counts blocks in a fragment. (khtml::ReplacementFragment::isInterchangeConvertedSpaceSpan): New helper. Recognizes annotation spans. (khtml::ReplacementFragment::insertNodeBefore): New helper. (khtml::ReplaceSelectionCommand::doApply): Fixed a bug in the code that sets the start position for the replacement after deleting. This was causing a bug when pasting at the end of a block.
khtml/editing/htmlediting.h: Add some new declarations.
khtml/xml/dom2_rangeimpl.cpp: (DOM::RangeImpl::toHTML): Calls to startMarkup now pass true for the new annotate flag.
khtml/xml/dom_nodeimpl.cpp: (NodeImpl::stringValueForRange): New helper. (NodeImpl::renderedText): New helper to return only the rendered text in a node. (NodeImpl::startMarkup): Now takes an additional flag to control whether interchange annotations should be added. Called by the paste code.
khtml/xml/dom_nodeimpl.h: Added and modified function declarations.

New test to check the khtml::ReplaceSelectionCommand::doApply fix.

layout-tests/editing/pasteboard/paste-text-010-expected.txt: Added.
layout-tests/editing/pasteboard/paste-text-010.html: Added.

11:56 AM Changeset in webkit [8095] by kdecker

3 edits in trunk/WebKit

Reviewed by Harrison.

Fixed: <rdar://problem/3228878> potential performance problem in finding in large framesets

Got rid of O(N^{2) conditions in _nextSibling and _previousSibling of where we were looking up self in the parent array of frames.}

WebView.subproj/WebFrame.h: Added two new pointers, one for the previous kid and one for the next kid
WebView.subproj/WebFrame.m: (-[WebFrame _addChild:]): Updates the previous frame and the next frame after this child (-[WebFrame _removeChild:]): ditto (-[WebFrame _nextSibling]): just return the pointer now (-[WebFrame _previousSibling]): ditto

Nov 30, 2004:

5:25 PM Changeset in webkit [8094] by cblu

1 edit in trunk/WebCore/ChangeLog-2005-08-23

ChangeLog: removed conflict marker

5:23 PM Changeset in webkit [8093] by cblu

22 edits in trunk

WebCore:

Fixed:
<rdar://problem/3685766> WebDataSource is missing subresources when they use cached WebCore data
<rdar://problem/3722434> REGRESSION?: Assertion failure trying to drag image in iframe (itapema.sc.gov.br)

Reviewed by darin.

khtml/misc/loader.cpp: (CachedObject::~CachedObject): release m_allData (CachedObject::setAllData): new (Loader::servePendingRequests): connect slotAllData (Loader::slotAllData): new (Cache::requestImage): tweak
khtml/misc/loader.h: (khtml::CachedObject::CachedObject): set allData to 0 (khtml::CachedObject::allData): new
kwq/KWQKJobClasses.h:
kwq/KWQKJobClasses.mm: (KIO::TransferJob::TransferJob): set m_allData (KIO::TransferJob::emitAllData): new
kwq/KWQLoader.mm: (KWQCheckCacheObjectStatus): pass WebKit the data instead of the length of the resource
kwq/KWQResourceLoader.mm: (-[KWQResourceLoader finishWithData:]): renamed to pass all data for the resource
kwq/KWQSlot.mm: (KWQSlot::KWQSlot): support for slotAllData (KWQSlot::call):
kwq/WebCoreBridge.h:
kwq/WebCoreResourceLoader.h:

WebKit:

Fixed:
<rdar://problem/3685766> WebDataSource is missing subresources when they use cached WebCore data
<rdar://problem/3722434> REGRESSION?: Assertion failure trying to drag image in iframe (itapema.sc.gov.br)

Reviewed by darin.

WebCoreSupport.subproj/WebBridge.m: (-[WebBridge objectLoadedFromCacheWithURL:response:data:]): renamed to pass all data for the resource, moved delegate code to new method (-[WebBridge syncLoadResourceWithURL:customHeaders:postData:finalURL:responseHeaders:statusCode:]): call renamed method
WebCoreSupport.subproj/WebSubresourceClient.m: (-[WebSubresourceClient didFinishLoading]): call renamed method
WebView.subproj/WebFrame.m: (-[WebFrame _opened]): call _sendResourceLoadDelegateMessagesForURL:response:length:, not objectLoadedFromCacheWithURL:response:data: (-[WebFrame _internalLoadDelegate]): (-[WebFrame _sendResourceLoadDelegateMessagesForURL:response:length:]): moved from objectLoadedFromCacheWithURL:response:data:
WebView.subproj/WebFrameInternal.h:

4:54 PM Changeset in webkit [8092] by mjs

3 edits in trunk/WebCore

Reviewed by John.

<rdar://problem/3805311> REGRESSION (159-163): onload in dynamically written document not called (causes blank search page at Japanese EPP site, many others)

khtml/khtml_part.cpp: (KHTMLPart::begin): call setParsing on document here after opening
from now on we'll only set parsing to true for a document open caused by page loading, not a programmatic one.
khtml/xml/dom_docimpl.cpp: (DocumentImpl::open): don't setParsing to true here any more.

3:12 PM Changeset in webkit [8091] by mjs

2 edits in trunk/WebCore

Reviewed by John.

fix recent regression from collection perf fixes.

khtml/html/html_miscimpl.cpp: (HTMLFormCollectionImpl::updateNameCache): Look up the name attribute in the name cache, not the id cache (d'oh!)

1:08 PM Changeset in webkit [8090] by darin

21 edits in trunk/WebCore

Reviewed by Ken.

rolled in a KDE fix for a problem that may underlie a number of crashes

khtml/xml/dom2_rangeimpl.cpp: (RangeImpl::compareBoundaryPoints): Rolled in a change from the KDE guys to fix a subtle problem. Code said "n = n =".

rolled in a KDE fix for a containingBlock crash

khtml/rendering/render_object.cpp: Roll in a change from KDE that adds frameset to the list of elements that can not be a containingBlock. They said this fixes a crash, although I did not look into that further.

fixed <rdar://problem/3884660> 8A305: Repro crash in QScrollBar::setValue (affects Safari RSS)

kwq/KWQButton.mm: (-[KWQButton initWithQButton:]): Set up target and action here instead of in caller. (-[KWQButton detachQButton]): Added. (-[KWQButton sendConsumedMouseUpIfNeeded]): Check button for nil instead of checking target. (-[KWQButton mouseDown:]): Add calls to QWidget::beforeMouseDown/afterMouseDown. (-[KWQButton widget]): Added. (-[KWQButton becomeFirstResponder]): Added check to handle when button is 0. (-[KWQButton resignFirstResponder]): Ditto. (-[KWQButton canBecomeKeyView]): Ditto. (QButton::QButton): Remove target and action setup; handled in KWQButton now. (QButton::~QButton): Call detachQButton instead of setTarget:nil.

kwq/KWQComboBox.mm: (QComboBox::~QComboBox): Call detachQComboBox. (-[KWQPopUpButtonCell detachQComboBox]): Added. (-[KWQPopUpButtonCell trackMouse:inRect:ofView:untilMouseUp:]): Handle case where box is 0. (-[KWQPopUpButtonCell setHighlighted:]): Ditto. (-[KWQPopUpButton action:]): Ditto. (-[KWQPopUpButton widget]): Tweaked. (-[KWQPopUpButton mouseDown:]): Added. Calls QWidget::beforeMouseDown/afterMouseDown. (-[KWQPopUpButton becomeFirstResponder]): Handle case where widget is 0. (-[KWQPopUpButton resignFirstResponder]): Ditto. (-[KWQPopUpButton canBecomeKeyView]): Ditto.

kwq/KWQLineEdit.mm: (QLineEdit::~QLineEdit): Updated to use new detachQLineEdit name.

kwq/KWQListBox.mm: (-[KWQTableView mouseDown:]): Added. Calls QWidget::beforeMouseDown/afterMouseDown.

kwq/KWQScrollBar.h: Removed m_scroller field.
kwq/KWQScrollBar.mm: (-[KWQScrollBar initWithQScrollBar:]): Rearranged a little bit. (-[KWQScrollBar detachQScrollBar]): Added. (-[KWQScrollBar widget]): Added. (-[KWQScrollBar mouseDown:]): Added. Calls QWidget::beforeMouseDown and afterMouseDown. (QScrollBar::QScrollBar): Changed to no longer set m_scroller. (QScrollBar::~QScrollBar): Changed to call detachQScrollBar. No longer calls removeFromSuperview. (QScrollBar::setValue): Chagned to use getView instad of m_scrollBar. (QScrollBar::setKnobProportion): Ditto. (QScrollBar::scrollbarHit): Ditto.

kwq/KWQScrollView.mm: (QScrollView::addChild): Changed to call QWidget to add to superview to accomodate the hack where we don't remove right away when doing mouse tracking. (QScrollView::removeChild): Changed to call QWidget to remove from superview to accomodate the hack where we don't add right away when doing mouse tracking.

kwq/KWQSlider.h: Added destructor.
kwq/KWQSlider.mm: (-[KWQSlider initWithQSlider:]): Tweaked a little. (-[KWQSlider detachQSlider]): Added. (-[KWQSlider mouseDown:]): Added call to QWidget::beforeMouseDown/afterMouseDown. (-[KWQSlider widget]): Added. (QSlider::~QSlider): Added. Calls detachQSlider.

kwq/KWQTextArea.h: Added detachQTextEdit method.
kwq/KWQTextArea.mm: (-[KWQTextArea detachQTextEdit]): Added. (-[KWQTextArea textDidChange:]): Added check for widget of 0. (-[KWQTextArea becomeFirstResponder]): Ditto. (-[KWQTextArea nextKeyView]): Ditto. (-[KWQTextArea previousKeyView]): Ditto. (-[KWQTextArea drawRect:]): Ditto. (-[KWQTextAreaTextView insertTab:]): Ditto. (-[KWQTextAreaTextView insertBacktab:]): Ditto. (-[KWQTextAreaTextView shouldDrawInsertionPoint]): Ditto. (-[KWQTextAreaTextView selectedTextAttributes]): Ditto. (-[KWQTextAreaTextView mouseDown:]): Ditto. (-[KWQTextAreaTextView keyDown:]): Ditto. (-[KWQTextAreaTextView keyUp:]): Ditto.

kwq/KWQTextEdit.h: Added ~QTextEdit.
kwq/KWQTextEdit.mm: (QTextEdit::~QTextEdit): Added. Calls detachQTextEdit.

kwq/KWQTextField.h: Changed invalidate to detachQLineEdit.
kwq/KWQTextField.mm: (-[KWQTextFieldController detachQLineEdit]): Changed.

kwq/KWQWidget.h: Added addToSuperview/removeFromSuperview for use from QScrollView. Added beforeMouseDown and afterMouseDown for use in widget implementations. Removed unused hasMouseTracking function.
kwq/KWQWidget.mm: (QWidget::QWidget): Initialize two new fields. (QWidget::~QWidget): Added code to remove view when widget is destroyed. (QWidget::getOuterView): Remove unneeded exception blocking since we're just caling superview. (QWidget::addToSuperview): Added. (QWidget::removeFromSuperview): Added. (QWidget::beforeMouseDown): Added. (QWidget::afterMouseDown): Added.

khtml/rendering/render_layer.cpp: (RenderLayer::setHasHorizontalScrollbar): Remove parent parameter; let addChild call addSubview:. (RenderLayer::setHasVerticalScrollbar): Ditto.

8:33 AM Changeset in webkit [8089] by kocienda

5 edits in trunk/WebCore

Reviewed by John

Fix for this bug:

<rdar://problem/3863031> REGRESSION (Mail): caret continues flashing while mouse is down

khtml/khtml_part.cpp: (KHTMLPart::timerEvent): Add a check for whether the mouse is down. Keep the caret drawn with no blink if it is.

7:30 AM Changeset in webkit [8088] by kocienda

2 edits in trunk/WebCore

Reviewed by me

khtml/editing/htmlediting.cpp: (khtml::ReplacementFragment::mergeEndNode): Fixed one-line coding mistake that created an endless loop. Seemed simple enough to land without review.

Nov 29, 2004:

4:07 PM Changeset in webkit [8087] by kocienda

6 edits
20 adds in trunk

Reviewed by Chris

Rewrite of paste code (specifically the ReplaceSelectionCommand class). Many more cases
are handled correctly now, including selections that span multiple blocks, and cases
where content on the pasteboard ends in newlines (or what appear to be newlines to a
user, really block ends or BRs). I also made one small, but important change in the
copy code to annotate the markup written to the pasteboard to support these selections
ending in newlines.

New header that defines a couple of constants used in copying and pasting.

ForwardingHeaders/editing/html_interchange.h: Added.
khtml/editing/html_interchange.h: Added.

Rewrite of the ReplaceSelectionCommand. There are several new helper functions, as well
as a new helper class, ReplacementFragment, which encapsulates information and functions
pertaining to a document fragment that is being inserted into a document.

khtml/editing/htmlediting.cpp: (khtml::ReplacementFragment::ReplacementFragment): (khtml::ReplacementFragment::~ReplacementFragment): (khtml::ReplacementFragment::firstChild): Simple accessor. (khtml::ReplacementFragment::lastChild): Ditto. (khtml::ReplacementFragment::mergeStartNode): Looks at the nodes in a fragment and determines the starting node to use for merging into the block containing the start of the selection. (khtml::ReplacementFragment::mergeEndNode): Same as above, but for the end of the selection. (khtml::ReplacementFragment::pruneEmptyNodes): Simple helper. (khtml::ReplacementFragment::isInterchangeNewlineComment): Determines if a node is the special annotation comment added in by the copy code. (khtml::ReplacementFragment::removeNode): Simple helper. (khtml::isComment): Simple helper. (khtml::isProbablyBlock): Determines if a node is of a type that is usually rendered as a block. I would like to do better than this some day, but this check will hold us until I can do better. (khtml::ReplaceSelectionCommand::ReplaceSelectionCommand): (khtml::ReplaceSelectionCommand::~ReplaceSelectionCommand): (khtml::ReplaceSelectionCommand::doApply): (khtml::ReplaceSelectionCommand::completeHTMLReplacement): Figures out the right ending selection.
khtml/editing/htmlediting.h: Declarations for the new ReplacementFragment class. (khtml::ReplacementFragment::root): (khtml::ReplacementFragment::type): (khtml::ReplacementFragment::isEmpty): (khtml::ReplacementFragment::isSingleTextNode): (khtml::ReplacementFragment::isTreeFragment): (khtml::ReplacementFragment::hasMoreThanOneBlock): (khtml::ReplacementFragment::hasLogicalNewlineAtEnd):

This smaller set of changes markup generation to add the newline annotation described in the
comment at the start of this entry.

khtml/xml/dom2_rangeimpl.cpp: (DOM::RangeImpl::addCommentToHTMLMarkup): Simple helper. (DOM::RangeImpl::toHTML): Added new EAnnotateForInterchange default argument to control whether comment annotations are added to the markup generated.
khtml/xml/dom2_rangeimpl.h: Add some new declarations.
kwq/WebCoreBridge.mm: (-[WebCoreBridge markupStringFromRange:nodes:]): Request that markup resulting from call to DOM::RangeImpl::toHTML uses annotations when generating.

New tests.

layout-tests/editing/pasteboard/paste-text-001-expected.txt: Added.
layout-tests/editing/pasteboard/paste-text-001.html: Added.
layout-tests/editing/pasteboard/paste-text-002-expected.txt: Added.
layout-tests/editing/pasteboard/paste-text-002.html: Added.
layout-tests/editing/pasteboard/paste-text-003-expected.txt: Added.
layout-tests/editing/pasteboard/paste-text-003.html: Added.
layout-tests/editing/pasteboard/paste-text-004-expected.txt: Added.
layout-tests/editing/pasteboard/paste-text-004.html: Added.
layout-tests/editing/pasteboard/paste-text-005-expected.txt: Added.
layout-tests/editing/pasteboard/paste-text-005.html: Added.
layout-tests/editing/pasteboard/paste-text-006-expected.txt: Added.
layout-tests/editing/pasteboard/paste-text-006.html: Added.
layout-tests/editing/pasteboard/paste-text-007-expected.txt: Added.
layout-tests/editing/pasteboard/paste-text-007.html: Added.
layout-tests/editing/pasteboard/paste-text-008-expected.txt: Added.
layout-tests/editing/pasteboard/paste-text-008.html: Added.
layout-tests/editing/pasteboard/paste-text-009-expected.txt: Added.
layout-tests/editing/pasteboard/paste-text-009.html: Added.

3:13 PM Changeset in webkit [8086] by darin

4 edits in trunk/WebKit

Reviewed by John.

worked around bug in Panther where NSScroller calls _destinationFloatValueForScroller: on superview without first checking if it's implemented

WebView.subproj/WebHTMLView.m: (-[WebHTMLView _destinationFloatValueForScroller:]): Implemented. Calls floatValue on the scroller.

English.lproj/StringsNotToBeLocalized.txt: Update for recent changes.

2:17 PM Changeset in webkit [8085] by kocienda

3 edits in trunk/WebCore

Reviewed by Harrison

Made two small changes that make it possible for comments to have DOM nodes made for them
when pasting. This relies on some earlier work I did some days ago.

khtml/xml/dom_nodeimpl.cpp: (NodeImpl::startMarkup): Get the string from the comment.
kwq/WebCoreBridge.mm: (-[WebCoreBridge documentFragmentWithMarkupString:baseURLString:]): Did some very minor rearranging. Now passes a flag when creating a contextual fragment, requesting that comments be included in the DOM.

2:17 PM Changeset in webkit [8084] by kocienda

3 edits in trunk/WebCore

Reviewed by Harrison

Added some new helpers to the VisiblePosition class. I will begin to use these when I check in
my improved paste code.

khtml/editing/visible_position.cpp: (khtml::blockRelationship) (khtml::visiblePositionsInDifferentBlocks) (khtml::isFirstVisiblePositionInBlock) (khtml::isFirstVisiblePositionInNode) (khtml::isLastVisiblePositionInBlock)
khtml/editing/visible_position.h

2:13 PM Changeset in webkit [8083] by kocienda

2 edits in trunk/WebCore

Reviewed by Harrison

khtml/xml/dom_position.cpp: (DOM::Position::downstream): Fix a bug in downstream that prevented a call with DoNotStayInBlock specified from obeying that directive. The old code would stop at an outer block boundary in the case where that block had a block as its first child. The correct behavior is to drill into that inner block (and continue on drilling down, if possible), to find the correct position.

2:11 PM Changeset in webkit [8082] by kocienda

3 edits in trunk/WebCore

Reviewed by Harrison

Small improvements to the node-display debugging helpers.

khtml/xml/dom_nodeimpl.cpp: (NodeImpl::displayTree): Make the rootNode be this if there is no rootEditableElement.
khtml/xml/dom_nodeimpl.h: Make displayNode take a default argument of "" for its string.

2:05 PM Changeset in webkit [8081] by kocienda

2 edits in trunk/WebCore

Reviewed by Harrison

khtml/editing/htmlediting.cpp: (khtml::DeleteSelectionCommand::handleGeneralDelete): The downstream position in this function may need to be adjusted when deleting text off the front part of a text node. This fixes a problem I discovered while improving the paste command, where the insertion poitn wound up in the wrong place after the delete.

2:03 PM Changeset in webkit [8080] by kocienda

3 edits in trunk/WebCore

Reviewed by Harrison

Add a new helper function to insert a paragraph separator. Will be used in my
upcoming paste improvments.

khtml/editing/htmlediting.cpp: Added function (khtml::CompositeEditCommand::insertParagraphSeparator)
khtml/editing/htmlediting.h: Ditto.

Note: See TracTimeline for information about the timeline view.

Download in other formats:

RSS Feed