Timeline
Oct 10, 2005:
- 11:55 PM Changeset in webkit [10812] by
-
- 2 edits in trunk/WebCore
- Fixed <rdar://problem/4245682> Regression: CrashTracer: 923 crashes in Safari at com.apple.WebCore: KJS::Window::clear + 132
Reviewed by mjs.
No test case because this crash isn't reliably reproducible.
- khtml/ecma/kjs_window.cpp: (KJS::Window::Window): Initialize m_returnValueSlot to 0, so that we know not to write to it until it's explicitly set to a valid address.
- 8:45 PM Changeset in webkit [10811] by
-
- 3 edits in trunk/LayoutTests
- updated expected results due to fix for http://bugzilla.opendarwin.org/show_bug.cgi?id=5195
The old results were incorrectly clipped. This always worked fine in the
browser, but didn't draw correctly in DumpRenderTree until the bug was fixed.
- fast/clip/014-expected.checksum: Updated.
- fast/clip/014-expected.png: Updated.
- 7:49 PM Changeset in webkit [10810] by
-
- 7 edits in trunk/WebCore
Reviewed by Maciej.
- finished fixing http://bugzilla.opendarwin.org/show_bug.cgi?id=5195 Would like API to flush rendering of pending DOM changes
The first half of the fix alone broke DumpRenderTree. Better now.
- kwq/KWQWidget.h: Made paint non-virtual (it had no reason to be virtual in KWQ) and added an isPainting function.
- kwq/KWQWidget.mm: (QWidget::QWidget): Added painting boolean (actually a count). (QWidget::~QWidget): Check that painting is 0 when the widget is destroyed. (QWidget::paint): Use SPI to draw in a way that works no matter what context we are in. (QWidget::isPainting): Return true if inside the paint function.
- kwq/KWQTextArea.h: Remove inDrawingMachinery field since we can use isPainting now.
- kwq/KWQTextArea.mm: (-[KWQTextAreaTextView textView:shouldDrawInsertionPointInRect:color:turnedOn:]): Use isPainting() instead of inDrawingMachinery. inDrawingMachinery required that we use displayRectIgnoringOpacity: to paint, which we no longer do.
- kwq/KWQTextField.h: More of the same.
- kwq/KWQTextField.mm: (-[KWQTextFieldController textView:shouldDrawInsertionPointInRect:color:turnedOn:]): Ditto.
- 4:48 PM Changeset in webkit [10809] by
-
- 5 edits in trunk/WebCore
Bug #: 5320
Submitted by: darin
Reviewed by: eseidel
Mem leak fixes in xslt code.
http://bugzilla.opendarwin.org/show_bug.cgi?id=5320
- khtml/xml/dom_docimpl.cpp: (DocumentImpl::applyXSLTransform): (DocumentImpl::setTransformSourceDocument):
- khtml/xml/xml_tokenizer.cpp: (khtml::parseXMLDocumentFragment):
- khtml/xsl/xslt_processorimpl.cpp: (DOM::XSLTProcessorImpl::XSLTProcessorImpl): (DOM::XSLTProcessorImpl::~XSLTProcessorImpl): (DOM::stylesheetLoadFunc): (DOM::XSLTProcessorImpl::transformDocument): (DOM::XSLTProcessorImpl::documentFromXMLDocPtr):
- khtml/xsl/xslt_processorimpl.h: (DOM::XSLTProcessorImpl::stylesheet): (DOM::XSLTProcessorImpl::sourceDocument):
- 4:32 PM Changeset in webkit [12207]
-
- 1 copy in branches/Safari-2-0-branch/JavaScriptGlue/Info.plist
This commit was manufactured by cvs2svn to create branch
'Safari-2-0-branch'.
- 4:32 PM Changeset in webkit [12206] by
-
- 16 edits in trunk/JavaScriptGlue
Reviewed by Eric.
- converted tabs to spaces, NULL to 0, added some (void), got rid of prefixes in headers (reserved for compiler/library)
- Info.plist:
- JSBase.cpp:
- JSBase.h:
- JSObject.cpp:
- JSObject.h:
- JSRun.cpp:
- JSRun.h:
- JSUtils.cpp:
- JSUtils.h:
- JSValueWrapper.cpp:
- JSValueWrapper.h:
- JavaScriptGlue.cpp:
- JavaScriptGlue.h:
- UserObjectImp.cpp:
- UserObjectImp.h:
- 11:54 AM Changeset in webkit [12205] by
-
- 2 edits1 add in trunk/JavaScriptGlue
- .cvsignore: Added. Ignore Makefile.in and Makefile.
- 12:16 AM Changeset in webkit [10808] by
-
- 1 edit in trunk/WebCore/khtml/rendering/bidi.cpp
Bug #:
Submitted by:
Reviewed by:
- 12:15 AM Changeset in webkit [10807] by
-
- 1 edit in branches/Safari-2-0-branch/WebCore/khtml/rendering/bidi.cpp
Bug #:
Submitted by:
Reviewed by:
Oct 9, 2005:
- 11:35 PM Changeset in webkit [10806] by
-
- 5 edits in trunk/WebKitTools
- Scripts/check-dom-results: Dump ".xhtml" for tests in the xhtml directory.
- Scripts/cvs-apply: Handle added/deleted files in the current directory.
- Scripts/cvs-unapply: Ditto.
- Scripts/run-webkit-tests: Add a few more false-positive leaks.
- 8:50 PM Changeset in webkit [10805] by
-
- 2 edits in /
Land fix for bugzilla bug 4974, make sure to only move below floats in line layout if white-space is normal.
One case was using !isPre and including nowrap incorrectly as a result. Patch from koivisto.
Reviewed by hyatt
- khtml/rendering/bidi.cpp: (khtml::RenderBlock::findNextLineBreak):
- 6:28 PM Changeset in webkit [10804] by
-
- 2 edits in trunk/WebKit
Reviewed by Maciej.
- fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=5195 Would like API to flush rendering of pending DOM changes
This was actually a Tiger regression. When AppKit added a new code path for rendering
NSView, our special hack for doing layout when we draw didn't work any more. So we
were able to fix this without adding any API.
- WebView.subproj/WebHTMLView.m: (-[WebHTMLView _recursiveDisplayRectIgnoringOpacity:inContext:topView:]): Added. Does the same thing that other _recursiveDisplay methods do.
- 4:15 PM Changeset in webkit [10803] by
-
- 1 edit in trunk/WebKitTools/DumpRenderTree/TextInputController.m
Fixes the following build error when building Deployment:
DumpRenderTree/TextInputController.m: In function '-[TextInputController textInput]':
DumpRenderTree/TextInputController.m:87: warning: class 'NSView <WebDocumentView>' does not implement the 'NSTextInput' protocol
- 3:57 PM Changeset in webkit [10802] by
-
- 1 edit in trunk/JavaScriptCore/ChangeLog
Updated change log to mention one more bug fixed.
- 3:56 PM Changeset in webkit [10801] by
-
- 5 edits2 adds in trunk
Reviewed by Maciej; some changes done after review.
- fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=5280 Date.setMonth fails with negative values
- fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=5154 JSC should switch to _r variants of unix time/date functions
- fixed a few possible overflow cases
Retested all tests to be sure nothing broke; added layout test for bug 5280.
- kjs/config.h: Removed TIME_WITH_SYS_TIME define. Also set HAVE_SYS_TIMEB_H for the APPLE case (the latter is accurate but irrelevant).
- kjs/date_object.h: Reformatted. Removed unnecessary include of "function_object.h". Moved declarations of helper classes and functions into the cpp file.
- kjs/date_object.cpp: Removed code at top to define macros to use CoreFoundation instead of POSIX date functions. (KJS::styleFromArgString): Tweaked to return early instead of using a variable. (KJS::formatLocaleDate): Tweaked to check for undefined rather than checking argument count. (KJS::formatDate): Made parameter const. (KJS::formatDateUTCVariant): Ditto. (KJS::formatTime): Ditto. (KJS::DateProtoFuncImp::callAsFunction): Use gmtime_r and localtime_r instead of gmtime and localtime. (KJS::DateObjectImp::callAsFunction): Use localtime_r instead of localtime. (KJS::ymdhmsToSeconds): Renamed from ymdhms_to_seconds. Changed computation to avoid possible overflow if year is an extremely large or small number. (KJS::makeTime): Removed code to move large month numbers from tm_mon to tm_year; this was to accomodate CFGregorianDate, which is no longer used (and didn't handle negative values). (KJS::parseDate): Renamed from KRFCDate_parseDate; changed to return a value in milliseconds rather than in seconds. Reformatted the code. Changed to use UTF8String() instead of ascii(), since ascii() is not thread safe. Changed some variables back from int to long to avoid trouble if the result of strtol does not fit in an int (64-bit issue only).
LayoutTests:
- added a test for http://bugzilla.opendarwin.org/show_bug.cgi?id=5280 Date.setMonth fails with negative values
- fast/js/date-negative-setmonth-expected.txt: Added.
- fast/js/date-negative-setmonth.html: Added.
Oct 8, 2005:
- 9:45 PM Changeset in webkit [10800] by
-
- 3 edits2 adds in trunk
Reviewed by Geoff.
Tweaked and landed by Darin.
- fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=5266 Support parenthesized comments in Date.parse()
- kjs/date_object.cpp: (KJS::skipSpacesAndComments): Take a pointer, and advance it past spaces, and also past anything enclosed in parentheses. (KJS::KRFCDate_parseDate): Use skipSpacesAndComments wherever we formerly had code to skip spaces.
LayoutTests:
- added a test for http://bugzilla.opendarwin.org/show_bug.cgi?id=5266 Support parenthesized comments in Date.parse()
- fast/js/date-parse-comments-test-expected.txt: Added.
- fast/js/date-parse-comments-test.html: Added.
- 9:36 PM Changeset in webkit [10799] by
-
- 1 edit3 adds in trunk/LayoutTests
- added a test case for XSLT charset support http://bugzilla.opendarwin.org/show_bug.cgi?id=5244
- fast/xsl/xslt-entity-enc.xml: Added.
- fast/xsl/resources/xslt-entity-enc.xsl: Added.
- fast/xsl/xslt-entity-enc-expected.txt: Added.
- 9:25 PM Changeset in webkit [10798] by
-
- 3 edits in trunk/JavaScriptCore
Reviewed, tweaked, and landed by Darin.
- fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=5189 pcre_exec.c fails to compile using MSVC
- fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=5190 KJS config.h adjustment for Win32
- kjs/config.h: Make sure HAVE_MMAP and HAVE_SBRK are off for Win32. Turn HAVE_ERRNO_H on for Mac OS X. Sort defines so they are easy to compare with each other. Remove #undef of DEBUG_COLLECTOR.
- pcre/pcre_exec.c: (match): Work around strange MSVC complaint by splitting the definition of a local variable into a separate declaration and initialization.
- 9:17 PM Changeset in webkit [10797] by
-
- 7 edits2 adds in trunk
WebCore:
Reviewed by Maciej.
- support for WebKit fix for http://bugzilla.opendarwin.org/show_bug.cgi?id=5187 UTF-8 in long text files breaks at some point
No layout test added: only affects plain text view and requires loading the
file in multiple chunks.
- WebCore.exp: Added WebCoreTextDecoder.
- kwq/WebCoreTextDecoder.h: Added.
- kwq/WebCoreTextDecoder.mm: Added.
- WebCore.xcodeproj/project.pbxproj: Added files, made header private (SPI).
WebKit:
Reviewed by Maciej.
- fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=5187 UTF-8 in long text files breaks at some point
- WebView.subproj/WebTextRepresentation.m: (-[WebTextRepresentation finishedLoadingWithDataSource:]): Call flushReceivedData on the WebTextView so it can decode any final bytes.
- WebView.subproj/WebTextView.h: Added WebCoreTextDecoder field and flushReceivedData method.
- WebView.subproj/WebTextView.m: (-[WebTextView dealloc]): Release WebCoreTextDecoder. (-[WebTextView appendReceivedData:fromDataSource:]): Create a WebCoreTextDecoder to decode the text; use the textEncodingName from the data source. Use it to decode instead of the data source's stringWithData. (-[WebTextView flushReceivedData]): Call flush on the decoder and append any last bytes to the text view.
- 8:50 PM Changeset in webkit [10796] by
-
- 1 edit4 adds in trunk/LayoutTests
Reviewed by Hyatt.
- fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=5148 Rendering regressions in the Acid2 test cannot be detected
- fast/css/acid2-pixel-expected.checksum: Added.
- fast/css/acid2-pixel-expected.png: Added.
- fast/css/acid2-pixel-expected.txt: Added.
- fast/css/acid2-pixel.html: Added.
- 8:37 PM Changeset in webkit [10795] by
-
- 3 edits in trunk/LayoutTests
Reviewed by Geoff Garen.
- fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=5061 date-big-setmonth test is not timezone-independent
- fast/js/date-big-setmonth.html: Changed to compare expected result with a Date value rather than with a constant. Also write out final result as a date rather than as a constant.
- fast/js/date-big-setmonth-expected.txt: Updated.
- 8:31 PM Changeset in webkit [10794] by
-
- 5 edits2 adds in trunk
LayoutTests:
- Added a test for http://bugzilla.opendarwin.org/show_bug.cgi?id=4821 Text in submitted forms should be entity-encoded if the current encoding doesn't support it
- fast/forms/form-data-encoding-expected.txt: Added.
- fast/forms/form-data-encoding.html: Added.
WebCore:
Reviewed by Maciej.
- fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=4821 Text in submitted forms should be entity-encoded if the current encoding doesn't support it
Added one layout test.
- khtml/html/html_formimpl.cpp: (DOM::HTMLFormElementImpl::formData): Pass true to the fromUnicode function to request entity encoding. (DOM::FormDataList::appendString): Ditto.
- kwq/KWQTextCodec.h: Add boolean parameter to request entity-style encoding for characters that can't be expressed in the desired encoding.
- kwq/KWQTextCodec.mm: (QTextCodec::fromUnicode): Added code to entity-encode characters that can't be expressed in the desired encoding.
- 7:57 PM Changeset in webkit [10793] by
-
- 4 edits5 adds in trunk
LayoutTests:
Reviewed by Darin.
- Added a test for http://bugzilla.opendarwin.org/show_bug.cgi?id=4707 Need a way to automatically test for regressions in NSTextInput implementation
- editing/input/text-input-controller-expected.txt: Added.
- editing/input/text-input-controller.html: Added.
WebKitTools:
Reviewed, rearranged and landed by Darin.
- fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=4707 Need a way to automatically test for regressions in NSTextInput implementation
- DumpRenderTree/DumpRenderTree.m: (-[WaitUntilDoneDelegate webView:windowScriptObjectAvailable:]): Create a text input controller and put it in a property of the window object.
- DumpRenderTree/TextInputController.h: Added.
- DumpRenderTree/TextInputController.m: Added.
- DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj: Added files.
- 7:36 PM Changeset in webkit [10792] by
-
- 2 edits1 add in trunk/WebCore
Reviewed by Darin.
- fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=3852 typeahead doesn't work in multiple row select boxes.
- kwq/KWQListBox.mm: (KWQTableViewTypeSelectCallback): Added. (-[KWQTableView finalize]): Deallocate the UCTypeSelect object. (-[KWQTableView dealloc]): Ditto. (-[KWQTableView keyUp:]): If character typed is a graphic character, pass it along to the UCTypeSelect object and use it to type select, otherwise flush the object.
- manual-tests/select-element-type-select.html: Added.
- 7:14 PM Changeset in webkit [10791] by
-
- 12 edits in trunk
LayoutTests:
- Updated test results for fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=3245 Support the 'bdo' element
- fast/dom/HTMLElement/bdo.html: Updated test, no longer says to expect failure.
- fast/dom/HTMLElement/bdo-expected.checksum: Correct results.
- fast/dom/HTMLElement/bdo-expected.png: Ditto.
- fast/dom/HTMLElement/bdo-expected.txt: Ditto.
- fast/text/international/bidi-LDB-2-HTML-expected.checksum: Updated to expect correct results for the section done with <bdo>.
- fast/text/international/bidi-LDB-2-HTML-expected.png: Ditto.
- fast/text/international/bidi-LDB-2-HTML-expected.txt: Ditto.
WebCore:
Reviewed by Darin.
- fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=3245 Support the 'bdo' element
Fixes the results of some existing layout tests.
- khtml/xml/dom_elementimpl.h: Add eBDO to the list of entry types so there's a way to keep <bdo> dir attribute mappings separate from those of other elements.
- khtml/html/html_elementimpl.cpp: (HTMLElementImpl::mapToEntry): Add special case to use eBDO for the dir attribute on elements with the <bdo> tag. (HTMLElementImpl::parseMappedAttribute): Use bidi-override for the unicode-bidi CSS property when setting it based on the dir attribute on a <bdo> tag. Along with the change above this obviates the need for an HTMLElementImpl subclass for <bdo>, but we could refactor it that way later if we decide there's an advantage to doing it that way.
- khtml/css/html4.css: Remove the rules about <bdo>. They are insufficient, and now they are also unnecessary with the changes above.
- 6:46 PM Changeset in webkit [10790] by
-
- 8 edits12 adds in trunk
LayoutTests:
Test cases for http://bugzilla.opendarwin.org/show_bug.cgi?id=4898
(Failures in dbaron's bidi ordering tests).
- fast/dom/HTMLElement/bdo-expected.txt: Updated for differently-breaking text runs.
- fast/text/international/bidi-override-expected.txt: Updated because override characters no longer show up in the render tree.
- fast/text/international/bidi-LDB-2-CSS-expected.checksum: Added.
- fast/text/international/bidi-LDB-2-CSS-expected.png: Added.
- fast/text/international/bidi-LDB-2-CSS-expected.txt: Added.
- fast/text/international/bidi-LDB-2-CSS.html: Added.
- fast/text/international/bidi-LDB-2-HTML-expected.checksum: Added.
- fast/text/international/bidi-LDB-2-HTML-expected.png: Added.
- fast/text/international/bidi-LDB-2-HTML-expected.txt: Added.
- fast/text/international/bidi-LDB-2-HTML.html: Added.
- fast/text/international/bidi-LDB-2-formatting-characters-expected.checksum: Added.
- fast/text/international/bidi-LDB-2-formatting-characters-expected.png: Added.
- fast/text/international/bidi-LDB-2-formatting-characters-expected.txt: Added.
- fast/text/international/bidi-LDB-2-formatting-characters.html: Added.
- fast/text/international/bidi-explicit-embedding-expected.checksum: Updated to now-correct results.
- fast/text/international/bidi-explicit-embedding-expected.png: Ditto.
- fast/text/international/bidi-explicit-embedding-expected.txt: Ditto.
WebCore:
Reviewed by Darin.
- fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=4898 Failures in dbaron's bidi ordering tests
Added 3 dbaron bidi ordering tests to LayoutTests.
- khtml/rendering/bidi.cpp: (khtml::deleteBidiRuns): (khtml::Bidinext): (khtml::appendRunsForObject): (khtml::embed): (khtml::RenderBlock::bidiReorderLine):
- 3:45 AM Changeset in webkit [10789] by
-
- 1 edit4 adds in trunk
Bug #: 5240
Submitted by: Rob Buis <rwlbuis@xs4all.nl>
Reviewed by: eseidel
Almost forgot the layout test for the last commit. ;)
http://bugzilla.opendarwin.org/show_bug.cgi?id=5240
- svg-tests/custom/use-forward-refs-expected.checksum: Added.
- svg-tests/custom/use-forward-refs-expected.png: Added.
- svg-tests/custom/use-forward-refs-expected.txt: Added.
- svg-tests/custom/use-forward-refs.svg: Added.
- 2:18 AM Changeset in webkit [10788] by
-
- 4 edits in trunk/WebCore
Bug #: 5240
Submitted by: Rob Buis <rwlbuis@xs4all.nl>
Reviewed by: eseidel
Fix to handle forward referencing <use> elements.
http://bugzilla.opendarwin.org/show_bug.cgi?id=5240
- ksvg2/svg/SVGDocumentImpl.cpp: (SVGDocumentImpl::executeScripts): delayed close. (SVGDocumentImpl::addForwardReference): new function.
- ksvg2/svg/SVGDocumentImpl.h:
- ksvg2/svg/SVGUseElementImpl.cpp: (SVGUseElementImpl::close): delay close, if missing reference.
Oct 7, 2005:
- 5:51 PM Changeset in webkit [10787] by
-
- 7 edits in trunk/LayoutTests
Reviewed by Justin.
Adjusted expected results after fixing position code in
<rdar://problem/4064017> "Safari crashes at -[WebCoreBridge firstRectForDOMRange:] + 92"
- editing/deleting/delete-at-paragraph-boundaries-002-expected.txt:
- editing/deleting/delete-at-paragraph-boundaries-004-expected.txt:
- editing/deleting/delete-at-paragraph-boundaries-005-expected.txt:
- editing/selection/3690703-expected.txt:
- editing/selection/3690719-expected.txt:
- editing/selection/select-all-004-expected.txt:
- 5:50 PM Changeset in webkit [10786] by
-
- 3 edits in trunk/WebCore
Reviewed by Justin.
"<rdar://problem/4064017> Safari crashes at -[WebCoreBridge firstRectForDOMRange:] + 92"
- khtml/editing/delete_selection_command.cpp: (khtml::DeleteSelectionCommand::insertPlaceholderForAncestorBlockContent): Do not insert placeholder if selection ends at a BR.
(khtml::DeleteSelectionCommand::handleGeneralDelete):
No need to preserve starting BR because insertPlaceholderForAncestorBlockContent already did.
- khtml/xml/dom_position.cpp: (DOM::Position::upstream): (DOM::Position::downstream): Fixed to return original position instead of invisible position when no suitable position found upstream.
- 5:18 PM Changeset in webkit [12204] by
-
- 2 edits1 add in trunk/JavaScriptGlue
Reviewed by Maciej.
Build fix, needed to disable RTTI. Upgraded to a native target.
- JavaScriptGlue.xcodeproj/project.pbxproj:
- Info.plist
- 11:38 AM Changeset in webkit [10785] by
-
- 2 edits in trunk/WebCore
Reviewed by Hyatt.
- pass the current form to the isindex constructor, so that isindex doesn't malfunction in the case of a misnested form
- khtml/html/htmlparser.cpp: (HTMLParser::handleIsindex):
- 11:31 AM Changeset in webkit [10784] by
-
- 4 edits in trunk/WebKit
Reviewed by Tim Omernick.
WebKit support for allowing clients to know which frame originated a particular JavaScript alert/dialog.
- WebView.subproj/WebUIDelegatePrivate.h: New optional delegate methods for the three JavaScript alert/dialogs. These are just like the existing ones in WebUIDelegate.h except that each adds a parameter specifying the frame that the JavaScript was running in. Eventually we'll deprecate the old three methods in favor of these in the public API.
- WebCoreSupport.subproj/WebBridge.m: (-[WebBridge runJavaScriptAlertPanelWithMessage:]): Call version of the delegate method that has the frame parameter if the delegate supports it. (-[WebBridge runJavaScriptConfirmPanelWithMessage:]): ditto (-[WebBridge runJavaScriptTextInputPanelWithPrompt:defaultText:returningText:]): ditto
- WebView.subproj/WebDefaultUIDelegate.m: (-[WebDefaultUIDelegate webView:runJavaScriptAlertPanelWithMessage:initiatedByFrame:]): Now implements the new version of the delegate method that includes the frame parameter. (Still doesn't do anything though.) (-[WebDefaultUIDelegate webView:runJavaScriptConfirmPanelWithMessage:initiatedByFrame:]): Now implements the new version of the delegate method that includes the frame parameter. (Still doesn't do anything though.) (-[WebDefaultUIDelegate webView:runJavaScriptTextInputPanelWithPrompt:defaultText:initiatedByFrame:]): Now implements the new version of the delegate method that includes the frame parameter. Doesn't actually use the frame parameter here yet though.