WebKit Bugzilla
New
Browse
Search+
Log In
×
Sign in with GitHub
or
Remember my login
Create Account
·
Forgot Password
Forgotten password account recovery
[patch]
Patch
bug-84406-20120507063358.patch (text/plain), 82.83 KB, created by
Kaustubh Atrawalkar
on 2012-05-07 06:34:05 PDT
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Kaustubh Atrawalkar
Created:
2012-05-07 06:34:05 PDT
Size:
82.83 KB
patch
obsolete
>Index: ChangeLog >=================================================================== >--- ChangeLog (revision 116304) >+++ ChangeLog (working copy) >@@ -1,3 +1,14 @@ >+2012-05-07 Kaustubh Atrawalkar <kaustubh@motorola.com> >+ >+ [DRT] LTC:: counterValueForElementById() could be moved to Internals. >+ https://bugs.webkit.org/show_bug.cgi?id=84406 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Exporting Internals::counterValueForElement symbols for the Gtk build. >+ >+ * Source/autotools/symbols.filter: >+ > 2012-05-07 Simon Hausmann <simon.hausmann@nokia.com> > > [Qt] Unreviewed trivial build fix: Don't include bytearraytestdata.h in the QtWebKit >Index: Source/WebCore/ChangeLog >=================================================================== >--- Source/WebCore/ChangeLog (revision 116304) >+++ Source/WebCore/ChangeLog (working copy) >@@ -1,3 +1,22 @@ >+2012-05-07 Kaustubh Atrawalkar <kaustubh@motorola.com> >+ >+ [DRT] LTC:: counterValueForElementById() could be moved to Internals. >+ https://bugs.webkit.org/show_bug.cgi?id=84406 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Move the counterValueForElementById from LayoutTestCotroller to Internals and >+ remove the old platform specific implementations as it exclusively tests WebCore functionality. >+ >+ Covered by existing test cases. >+ >+ * testing/Internals.cpp: >+ (WebCore::Internals::counterValueForElementById): >+ (WebCore): >+ * testing/Internals.h: >+ (Internals): >+ * testing/Internals.idl: >+ > 2012-05-07 Csaba Osztrogonác <ossy@webkit.org> > > Buildfix for buggy GCC >Index: Source/WebCore/testing/Internals.cpp >=================================================================== >--- Source/WebCore/testing/Internals.cpp (revision 116304) >+++ Source/WebCore/testing/Internals.cpp (working copy) >@@ -1008,6 +1008,19 @@ bool Internals::isPageBoxVisible(Documen > return document->isPageBoxVisible(pageNumber); > } > >+String Internals::counterValueForElementById(String elementId) >+{ >+ Frame* coreFrame = frame()->page()->mainFrame(); >+ if (!coreFrame) >+ return String(); >+ >+ Element* coreElement = coreFrame->document()->getElementById(AtomicString(elementId)); >+ if (!coreElement) >+ return String(); >+ >+ return counterValueForElement(coreElement); >+} >+ > #if ENABLE(FULLSCREEN_API) > void Internals::webkitWillEnterFullScreenForElement(Document* document, Element* element) > { >Index: Source/WebCore/testing/Internals.h >=================================================================== >--- Source/WebCore/testing/Internals.h (revision 116304) >+++ Source/WebCore/testing/Internals.h (working copy) >@@ -169,6 +169,8 @@ public: > Vector<String> consoleMessageArgumentCounts(Document*) const; > #endif > >+ String counterValueForElementById(String elementId); >+ > #if ENABLE(FULLSCREEN_API) > void webkitWillEnterFullScreenForElement(Document*, Element*); > void webkitDidEnterFullScreenForElement(Document*, Element*); >Index: Source/WebCore/testing/Internals.idl >=================================================================== >--- Source/WebCore/testing/Internals.idl (revision 116304) >+++ Source/WebCore/testing/Internals.idl (working copy) >@@ -144,6 +144,8 @@ module window { > [Conditional=INSPECTOR] unsigned long numberOfLiveDocuments(); > [Conditional=INSPECTOR] sequence<String> consoleMessageArgumentCounts(in Document document); > >+ DOMString counterValueForElementById(in DOMString elementId); >+ > #if defined(ENABLE_FULLSCREEN_API) && ENABLE_FULLSCREEN_API > void webkitWillEnterFullScreenForElement(in Document document, in Element element); > void webkitDidEnterFullScreenForElement(in Document document, in Element element); >Index: Source/WebKit/chromium/ChangeLog >=================================================================== >--- Source/WebKit/chromium/ChangeLog (revision 116304) >+++ Source/WebKit/chromium/ChangeLog (working copy) >@@ -1,3 +1,20 @@ >+2012-05-07 Kaustubh Atrawalkar <kaustubh@motorola.com> >+ >+ [DRT] LTC:: counterValueForElementById() could be moved to Internals. >+ https://bugs.webkit.org/show_bug.cgi?id=84406 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Move the counterValueForElementById from LayoutTestCotroller to Internals and >+ remove the old platform specific implementations as it exclusively tests WebCore functionality. >+ >+ * public/WebFrame.h: >+ (WebFrame): >+ * src/WebFrameImpl.cpp: >+ (WebKit): >+ * src/WebFrameImpl.h: >+ (WebFrameImpl): >+ > 2012-05-07 Kinuko Yasuda <kinuko@chromium.org> > > Unreviewed: the same fix in another file for chromium win build. Adding WebCore namespace to FileSystemTypes. >Index: Source/WebKit/chromium/public/WebFrame.h >=================================================================== >--- Source/WebKit/chromium/public/WebFrame.h (revision 116304) >+++ Source/WebKit/chromium/public/WebFrame.h (working copy) >@@ -613,10 +613,6 @@ public: > // to support layout tests. > virtual WebString renderTreeAsText(RenderAsTextControls toShow = RenderAsTextNormal) const = 0; > >- // Returns the counter value for the specified element. This method is >- // used to support layout tests. >- virtual WebString counterValueForElementById(const WebString& id) const = 0; >- > // Calls markerTextForListItem() defined in WebCore/rendering/RenderTreeAsText.h. > virtual WebString markerTextForListItem(const WebElement&) const = 0; > >Index: Source/WebKit/chromium/src/WebFrameImpl.cpp >=================================================================== >--- Source/WebKit/chromium/src/WebFrameImpl.cpp (revision 116304) >+++ Source/WebKit/chromium/src/WebFrameImpl.cpp (working copy) >@@ -1922,18 +1922,6 @@ WebString WebFrameImpl::renderTreeAsText > return externalRepresentation(m_frame, behavior); > } > >-WebString WebFrameImpl::counterValueForElementById(const WebString& id) const >-{ >- if (!m_frame) >- return WebString(); >- >- Element* element = m_frame->document()->getElementById(id); >- if (!element) >- return WebString(); >- >- return counterValueForElement(element); >-} >- > WebString WebFrameImpl::markerTextForListItem(const WebElement& webElement) const > { > return WebCore::markerTextForListItem(const_cast<Element*>(webElement.constUnwrap<Element>())); >Index: Source/WebKit/chromium/src/WebFrameImpl.h >=================================================================== >--- Source/WebKit/chromium/src/WebFrameImpl.h (revision 116304) >+++ Source/WebKit/chromium/src/WebFrameImpl.h (working copy) >@@ -217,7 +217,6 @@ public: > virtual WebString contentAsText(size_t maxChars) const; > virtual WebString contentAsMarkup() const; > virtual WebString renderTreeAsText(RenderAsTextControls toShow = RenderAsTextNormal) const; >- virtual WebString counterValueForElementById(const WebString& id) const; > virtual WebString markerTextForListItem(const WebElement&) const; > virtual int pageNumberForElementById(const WebString& id, > float pageWidthInPixels, >Index: Source/WebKit/efl/ChangeLog >=================================================================== >--- Source/WebKit/efl/ChangeLog (revision 116304) >+++ Source/WebKit/efl/ChangeLog (working copy) >@@ -1,3 +1,15 @@ >+2012-05-07 Kaustubh Atrawalkar <kaustubh@motorola.com> >+ >+ [DRT] LTC:: counterValueForElementById() could be moved to Internals. >+ https://bugs.webkit.org/show_bug.cgi?id=84406 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Move the counterValueForElementById from LayoutTestCotroller to Internals and >+ remove the old platform specific implementations as it exclusively tests WebCore functionality. >+ >+ * WebCoreSupport/DumpRenderTreeSupportEfl.cpp: >+ > 2012-05-07 Grzegorz Czajkowski <g.czajkowski@samsung.com> > > [EFL] Icon database path may be NULL when a new path was set. >Index: Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp >=================================================================== >--- Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp (revision 116304) >+++ Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp (working copy) >@@ -87,21 +87,6 @@ void DumpRenderTreeSupportEfl::clearOpen > frame->loader()->setOpener(0); > } > >-String DumpRenderTreeSupportEfl::counterValueByElementId(const Evas_Object* ewkFrame, const char* elementId) >-{ >- WebCore::Frame* frame = EWKPrivate::coreFrame(ewkFrame); >- >- if (!frame) >- return String(); >- >- WebCore::Element* element = frame->document()->getElementById(elementId); >- >- if (!element) >- return String(); >- >- return WebCore::counterValueForElement(element); >-} >- > bool DumpRenderTreeSupportEfl::elementDoesAutoCompleteForElementWithId(const Evas_Object* ewkFrame, const String& elementId) > { > WebCore::Frame* frame = EWKPrivate::coreFrame(ewkFrame); >Index: Source/WebKit/gtk/ChangeLog >=================================================================== >--- Source/WebKit/gtk/ChangeLog (revision 116304) >+++ Source/WebKit/gtk/ChangeLog (working copy) >@@ -1,3 +1,17 @@ >+2012-05-07 Kaustubh Atrawalkar <kaustubh@motorola.com> >+ >+ [DRT] LTC:: counterValueForElementById() could be moved to Internals. >+ https://bugs.webkit.org/show_bug.cgi?id=84406 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Move the counterValueForElementById from LayoutTestCotroller to Internals and >+ remove the old platform specific implementations as it exclusively tests WebCore functionality. >+ >+ * WebCoreSupport/DumpRenderTreeSupportGtk.cpp: >+ * WebCoreSupport/DumpRenderTreeSupportGtk.h: >+ (DumpRenderTreeSupportGtk): >+ > 2012-05-06 Gyuyoung Kim <gyuyoung.kim@samsung.com> > > Convert isPageBoxVisible to use Internals interface. >Index: Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp >=================================================================== >--- Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp (revision 116304) >+++ Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp (working copy) >@@ -188,28 +188,6 @@ CString DumpRenderTreeSupportGtk::dumpRe > } > > /** >- * counterValueForElementById: >- * @frame: a #WebKitWebFrame >- * @id: an element ID string >- * >- * Return value: The counter value of element @id in @frame >- */ >-CString DumpRenderTreeSupportGtk::counterValueForElementById(WebKitWebFrame* frame, const char* id) >-{ >- g_return_val_if_fail(WEBKIT_IS_WEB_FRAME(frame), CString()); >- >- Frame* coreFrame = core(frame); >- if (!coreFrame) >- return CString(); >- >- Element* coreElement = coreFrame->document()->getElementById(AtomicString(id)); >- if (!coreElement) >- return CString(); >- >- return counterValueForElement(coreElement).utf8(); >-} >- >-/** > * numberForElementById > * @frame: a #WebKitWebFrame > * @id: an element ID string >Index: Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h >=================================================================== >--- Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h (revision 116304) >+++ Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h (working copy) >@@ -61,7 +61,6 @@ public: > static GSList* getFrameChildren(WebKitWebFrame*); > static WTF::CString getInnerText(WebKitWebFrame*); > static WTF::CString dumpRenderTree(WebKitWebFrame*); >- static WTF::CString counterValueForElementById(WebKitWebFrame*, const char* id); > static int pageNumberForElementById(WebKitWebFrame*, const char* id, float pageWidth, float pageHeight); > static int numberOfPagesForFrame(WebKitWebFrame*, float pageWidth, float pageHeight); > static WTF::CString pageProperty(WebKitWebFrame*, const char* propertyName, int pageNumber); >Index: Source/WebKit/mac/ChangeLog >=================================================================== >--- Source/WebKit/mac/ChangeLog (revision 116304) >+++ Source/WebKit/mac/ChangeLog (working copy) >@@ -1,3 +1,17 @@ >+2012-05-07 Kaustubh Atrawalkar <kaustubh@motorola.com> >+ >+ [DRT] LTC:: counterValueForElementById() could be moved to Internals. >+ https://bugs.webkit.org/show_bug.cgi?id=84406 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Move the counterValueForElementById from LayoutTestCotroller to Internals and >+ remove the old platform specific implementations as it exclusively tests WebCore functionality. >+ >+ * Misc/WebCoreStatistics.h: >+ * Misc/WebCoreStatistics.mm: >+ * WebKit.order: >+ > 2012-05-05 Dean Jackson <dino@apple.com> > > Add new Setting/Preference to disable requestAnimationFrame >Index: Source/WebKit/mac/WebKit.order >=================================================================== >--- Source/WebKit/mac/WebKit.order (revision 116304) >+++ Source/WebKit/mac/WebKit.order (working copy) >@@ -1753,7 +1753,6 @@ __ZNK20WebFrameLoaderClient21shouldGoToH > -[WebDefaultPolicyDelegate webView:shouldGoToHistoryItem:] > -[WebView(WebPendingPublic) zoomPageOut:] > -[WebView _zoomOut:isTextOnly:] >--[WebFrame(WebKitDebug) counterValueForElement:] > __ZN15WebChromeClient10windowRectEv > __ZN15WebChromeClient11canRunModalEv > __ZN20WebFrameLoaderClient27dispatchWillSendSubmitEventEPN7WebCore15HTMLFormElementE >Index: Source/WebKit/mac/Misc/WebCoreStatistics.h >=================================================================== >--- Source/WebKit/mac/Misc/WebCoreStatistics.h (revision 116304) >+++ Source/WebKit/mac/Misc/WebCoreStatistics.h (working copy) >@@ -84,7 +84,6 @@ @interface WebCoreStatistics : NSObject > > @interface WebFrame (WebKitDebug) > - (NSString *)renderTreeAsExternalRepresentationForPrinting:(BOOL)forPrinting; >-- (NSString *)counterValueForElement:(DOMElement*)element; > - (int)pageNumberForElement:(DOMElement*)element:(float)pageWidthInPixels:(float)pageHeightInPixels; > - (int)numberOfPages:(float)pageWidthInPixels:(float)pageHeightInPixels; > - (NSString *)pageProperty:(const char*)propertyName:(int)pageNumber; >Index: Source/WebKit/mac/Misc/WebCoreStatistics.mm >=================================================================== >--- Source/WebKit/mac/Misc/WebCoreStatistics.mm (revision 116304) >+++ Source/WebKit/mac/Misc/WebCoreStatistics.mm (working copy) >@@ -268,11 +268,6 @@ - (NSString *)renderTreeAsExternalRepres > return externalRepresentation(_private->coreFrame, forPrinting ? RenderAsTextPrintingMode : RenderAsTextBehaviorNormal); > } > >-- (NSString *)counterValueForElement:(DOMElement*)element >-{ >- return counterValueForElement(core(element)); >-} >- > - (int)pageNumberForElement:(DOMElement*)element:(float)pageWidthInPixels:(float)pageHeightInPixels > { > return PrintContext::pageNumberForElement(core(element), FloatSize(pageWidthInPixels, pageHeightInPixels)); >Index: Source/WebKit/qt/ChangeLog >=================================================================== >--- Source/WebKit/qt/ChangeLog (revision 116304) >+++ Source/WebKit/qt/ChangeLog (working copy) >@@ -1,3 +1,16 @@ >+2012-05-07 Kaustubh Atrawalkar <kaustubh@motorola.com> >+ >+ [DRT] LTC:: counterValueForElementById() could be moved to Internals. >+ https://bugs.webkit.org/show_bug.cgi?id=84406 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Move the counterValueForElementById from LayoutTestCotroller to Internals and >+ remove the old platform specific implementations as it exclusively tests WebCore functionality. >+ >+ * WebCoreSupport/DumpRenderTreeSupportQt.cpp: >+ * WebCoreSupport/DumpRenderTreeSupportQt.h: >+ > 2012-05-06 Gyuyoung Kim <gyuyoung.kim@samsung.com> > > Convert isPageBoxVisible to use Internals interface. >Index: Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp >=================================================================== >--- Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp (revision 116304) >+++ Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp (working copy) >@@ -445,17 +445,6 @@ void DumpRenderTreeSupportQt::garbageCol > #endif > } > >-// Returns the value of counter in the element specified by \a id. >-QString DumpRenderTreeSupportQt::counterValueForElementById(QWebFrame* frame, const QString& id) >-{ >- Frame* coreFrame = QWebFramePrivate::core(frame); >- if (Document* document = coreFrame->document()) { >- if (Element* element = document->getElementById(id)) >- return WebCore::counterValueForElement(element); >- } >- return QString(); >-} >- > int DumpRenderTreeSupportQt::pageNumberForElementById(QWebFrame* frame, const QString& id, float width, float height) > { > Frame* coreFrame = QWebFramePrivate::core(frame); >Index: Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h >=================================================================== >--- Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h (revision 116304) >+++ Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h (working copy) >@@ -136,7 +136,6 @@ public: > static void webInspectorClose(QWebPage* page); > > static QString webPageGroupName(QWebPage *page); >- static QString counterValueForElementById(QWebFrame* frame, const QString& id); > static void webPageSetGroupName(QWebPage* page, const QString& groupName); > static void clearFrameName(QWebFrame* frame); > static void overwritePluginDirectories(); >Index: Source/WebKit/win/ChangeLog >=================================================================== >--- Source/WebKit/win/ChangeLog (revision 116304) >+++ Source/WebKit/win/ChangeLog (working copy) >@@ -1,3 +1,17 @@ >+2012-05-07 Kaustubh Atrawalkar <kaustubh@motorola.com> >+ >+ [DRT] LTC:: counterValueForElementById() could be moved to Internals. >+ https://bugs.webkit.org/show_bug.cgi?id=84406 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Move the counterValueForElementById from LayoutTestCotroller to Internals and >+ remove the old platform specific implementations as it exclusively tests WebCore functionality. >+ >+ * Interfaces/IWebFramePrivate.idl: >+ * WebFrame.cpp: >+ * WebFrame.h: >+ > 2012-05-05 Dean Jackson <dino@apple.com> > > Add new Setting/Preference to disable requestAnimationFrame >Index: Source/WebKit/win/WebFrame.cpp >=================================================================== >--- Source/WebKit/win/WebFrame.cpp (revision 116304) >+++ Source/WebKit/win/WebFrame.cpp (working copy) >@@ -888,25 +888,6 @@ HRESULT WebFrame::renderTreeAsExternalRe > return S_OK; > } > >-HRESULT STDMETHODCALLTYPE WebFrame::counterValueForElementById( >- /* [in] */ BSTR id, /* [retval][out] */ BSTR *result) >-{ >- if (!result) >- return E_POINTER; >- >- Frame* coreFrame = core(this); >- if (!coreFrame) >- return E_FAIL; >- >- String coreId = String(id, SysStringLen(id)); >- >- Element* element = coreFrame->document()->getElementById(coreId); >- if (!element) >- return E_FAIL; >- *result = BString(counterValueForElement(element)).release(); >- return S_OK; >-} >- > HRESULT STDMETHODCALLTYPE WebFrame::pageNumberForElementById( > /* [in] */ BSTR id, > /* [in] */ float pageWidthInPixels, >Index: Source/WebKit/win/WebFrame.h >=================================================================== >--- Source/WebKit/win/WebFrame.h (revision 116304) >+++ Source/WebKit/win/WebFrame.h (working copy) >@@ -163,10 +163,6 @@ public: > virtual HRESULT STDMETHODCALLTYPE unused1(BSTR*) { return E_NOTIMPL; } > virtual HRESULT STDMETHODCALLTYPE renderTreeAsExternalRepresentation(BOOL forPrinting, BSTR *result); > >- virtual HRESULT STDMETHODCALLTYPE counterValueForElementById( >- /* [in] */ BSTR id, >- /* [retval][out] */ BSTR *result); >- > virtual HRESULT STDMETHODCALLTYPE pageNumberForElementById( > /* [in] */ BSTR id, > /* [in] */ float pageWidthInPixels, >Index: Source/WebKit/win/Interfaces/IWebFramePrivate.idl >=================================================================== >--- Source/WebKit/win/Interfaces/IWebFramePrivate.idl (revision 116304) >+++ Source/WebKit/win/Interfaces/IWebFramePrivate.idl (working copy) >@@ -96,8 +96,6 @@ interface IWebFramePrivate : IUnknown > > [local] JSGlobalContextRef globalContextForScriptWorld([in] IWebScriptWorld*); > >- HRESULT counterValueForElementById([in] BSTR id, [out, retval] BSTR* result); >- > HRESULT visibleContentRect([out, retval] RECT*); > > HRESULT pageNumberForElementById([in] BSTR id, [in] float pageWidthInPixels, [in] float pageHeightInPixels, [out, retval] int* pageNumber); >Index: Source/autotools/symbols.filter >=================================================================== >--- Source/autotools/symbols.filter (revision 116304) >+++ Source/autotools/symbols.filter (working copy) >@@ -105,6 +105,8 @@ _ZNK7WebCore8Document8settingsEv; > _ZNK7WebCore8Document4viewEv; > _ZNK7WebCore5Range4textEv; > _ZNK7WebCore9TreeScope14getElementByIdERKN3WTF12AtomicStringE; >+_ZNK7WebCore8Document14getElementByIdERKN3WTF12AtomicStringE; >+_ZN7WebCore22counterValueForElementEPNS_7ElementE; > _ZNK7WebCore14DocumentMarker11descriptionEv; > _ZN7WebCore8Document16isPageBoxVisibleEi; > _ZNK7WebCore19InspectorController12getHighlightEPNS_9HighlightE; >Index: Tools/ChangeLog >=================================================================== >--- Tools/ChangeLog (revision 116304) >+++ Tools/ChangeLog (working copy) >@@ -1,3 +1,32 @@ >+2012-05-07 Kaustubh Atrawalkar <kaustubh@motorola.com> >+ >+ [DRT] LTC:: counterValueForElementById() could be moved to Internals. >+ https://bugs.webkit.org/show_bug.cgi?id=84406 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Move the counterValueForElementById from LayoutTestCotroller to Internals and >+ remove the old platform specific implementations as it exclusively tests WebCore functionality. >+ >+ * DumpRenderTree/LayoutTestController.cpp: >+ (LayoutTestController::staticFunctions): >+ * DumpRenderTree/LayoutTestController.h: >+ (LayoutTestController): >+ * DumpRenderTree/blackberry/LayoutTestControllerBlackBerry.cpp: >+ * DumpRenderTree/chromium/LayoutTestController.cpp: >+ (LayoutTestController::LayoutTestController): >+ * DumpRenderTree/chromium/LayoutTestController.h: >+ (LayoutTestController): >+ * DumpRenderTree/efl/LayoutTestControllerEfl.cpp: >+ * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp: >+ * DumpRenderTree/mac/LayoutTestControllerMac.mm: >+ * DumpRenderTree/qt/LayoutTestControllerQt.cpp: >+ * DumpRenderTree/qt/LayoutTestControllerQt.h: >+ (LayoutTestController): >+ * DumpRenderTree/win/LayoutTestControllerWin.cpp: >+ * DumpRenderTree/wx/LayoutTestControllerWx.cpp: >+ * WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl: >+ > 2012-05-07 Sheriff Bot <webkit.review.bot@gmail.com> > > Unreviewed, rolling out r116299, r116301, and r116303. >Index: Tools/DumpRenderTree/LayoutTestController.cpp >=================================================================== >--- Tools/DumpRenderTree/LayoutTestController.cpp (revision 116304) >+++ Tools/DumpRenderTree/LayoutTestController.cpp (working copy) >@@ -661,22 +661,6 @@ static JSValueRef findStringCallback(JSC > return JSValueMakeBoolean(context, controller->findString(context, target.get(), options)); > } > >-static JSValueRef counterValueForElementByIdCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception) >-{ >- if (argumentCount < 1) >- return JSValueMakeUndefined(context); >- >- JSRetainPtr<JSStringRef> elementId(Adopt, JSValueToStringCopy(context, arguments[0], exception)); >- if (*exception) >- return JSValueMakeUndefined(context); >- >- LayoutTestController* controller = static_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject)); >- JSRetainPtr<JSStringRef> counterValue(controller->counterValueForElementById(elementId.get())); >- if (!counterValue.get()) >- return JSValueMakeUndefined(context); >- return JSValueMakeString(context, counterValue.get()); >-} >- > static JSValueRef goBackCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception) > { > LayoutTestController* controller = static_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject)); >@@ -2341,7 +2325,6 @@ JSStaticFunction* LayoutTestController:: > { "evaluateScriptInIsolatedWorld", evaluateScriptInIsolatedWorldCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete }, > { "execCommand", execCommandCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete }, > { "findString", findStringCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete }, >- { "counterValueForElementById", counterValueForElementByIdCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete }, > { "originsWithApplicationCache", originsWithApplicationCacheCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete }, > { "goBack", goBackCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete }, > { "grantDesktopNotificationPermission", grantDesktopNotificationPermissionCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete }, >Index: Tools/DumpRenderTree/LayoutTestController.h >=================================================================== >--- Tools/DumpRenderTree/LayoutTestController.h (revision 116304) >+++ Tools/DumpRenderTree/LayoutTestController.h (working copy) >@@ -56,7 +56,6 @@ public: > bool callShouldCloseOnWebView(); > JSStringRef copyDecodedHostName(JSStringRef name); > JSStringRef copyEncodedHostName(JSStringRef name); >- JSRetainPtr<JSStringRef> counterValueForElementById(JSStringRef id); > void disableImageLoading(); > void dispatchPendingLoadRequests(); > void display(); >Index: Tools/DumpRenderTree/blackberry/LayoutTestControllerBlackBerry.cpp >=================================================================== >--- Tools/DumpRenderTree/blackberry/LayoutTestControllerBlackBerry.cpp (revision 116304) >+++ Tools/DumpRenderTree/blackberry/LayoutTestControllerBlackBerry.cpp (working copy) >@@ -435,21 +435,6 @@ void LayoutTestController::disableImageL > BlackBerry::WebKit::DumpRenderTree::currentInstance()->page()->settings()->setLoadsImagesAutomatically(false); > } > >-JSRetainPtr<JSStringRef> LayoutTestController::counterValueForElementById(JSStringRef id) >-{ >- String idStr = jsStringRefToWebCoreString(id); >- WebCore::Element* coreElement = mainFrame->document()->getElementById(AtomicString(idStr)); >- if (!coreElement) >- return 0; >- >- CString counterValueStr = counterValueForElement(coreElement).utf8(); >- if (counterValueStr.isNull()) >- return 0; >- >- JSRetainPtr<JSStringRef> counterValue(Adopt, JSStringCreateWithUTF8CString(counterValueStr.data())); >- return counterValue; >-} >- > void LayoutTestController::overridePreference(JSStringRef key, JSStringRef value) > { > if (!mainFrame) >Index: Tools/DumpRenderTree/chromium/LayoutTestController.cpp >=================================================================== >--- Tools/DumpRenderTree/chromium/LayoutTestController.cpp (revision 116304) >+++ Tools/DumpRenderTree/chromium/LayoutTestController.cpp (working copy) >@@ -100,7 +100,6 @@ LayoutTestController::LayoutTestControll > bindMethod("addUserStyleSheet", &LayoutTestController::addUserStyleSheet); > bindMethod("clearAllDatabases", &LayoutTestController::clearAllDatabases); > bindMethod("closeWebInspector", &LayoutTestController::closeWebInspector); >- bindMethod("counterValueForElementById", &LayoutTestController::counterValueForElementById); > #if ENABLE(POINTER_LOCK) > bindMethod("didLosePointerLock", &LayoutTestController::didLosePointerLock); > #endif >@@ -1662,20 +1661,6 @@ void LayoutTestController::setPOSIXLocal > setlocale(LC_ALL, arguments[0].toString().c_str()); > } > >-void LayoutTestController::counterValueForElementById(const CppArgumentList& arguments, CppVariant* result) >-{ >- result->setNull(); >- if (arguments.size() < 1 || !arguments[0].isString()) >- return; >- WebFrame* frame = m_shell->webView()->mainFrame(); >- if (!frame) >- return; >- WebString counterValue = frame->counterValueForElementById(cppVariantToWebString(arguments[0])); >- if (counterValue.isNull()) >- return; >- result->set(counterValue.utf8()); >-} >- > // Parse a single argument. The method returns true if there is an argument that > // is a number or if there is no argument at all. It returns false only if there > // is some argument that is not a number. The value parameter is filled with the >Index: Tools/DumpRenderTree/chromium/LayoutTestController.h >=================================================================== >--- Tools/DumpRenderTree/chromium/LayoutTestController.h (revision 116304) >+++ Tools/DumpRenderTree/chromium/LayoutTestController.h (working copy) >@@ -324,9 +324,6 @@ public: > // Resets between tests. > void setPOSIXLocale(const CppArgumentList&, CppVariant*); > >- // Gets the value of the counter in the element specified by its ID. >- void counterValueForElementById(const CppArgumentList&, CppVariant*); >- > // Causes layout to happen as if targetted to printed pages. > void setPrinting(const CppArgumentList&, CppVariant*); > >Index: Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp >=================================================================== >--- Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp (revision 116304) >+++ Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp (working copy) >@@ -99,13 +99,6 @@ void LayoutTestController::display() > displayWebView(); > } > >-JSRetainPtr<JSStringRef> LayoutTestController::counterValueForElementById(JSStringRef id) >-{ >- const Evas_Object* mainFrame = browser->mainFrame(); >- const String counterValue(DumpRenderTreeSupportEfl::counterValueByElementId(mainFrame, id->ustring().utf8().data())); >- return JSRetainPtr<JSStringRef>(Adopt, JSStringCreateWithUTF8CString(counterValue.utf8().data())); >-} >- > void LayoutTestController::keepWebHistory() > { > notImplemented(); >Index: Tools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp >=================================================================== >--- Tools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp (revision 116304) >+++ Tools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp (working copy) >@@ -102,17 +102,6 @@ void LayoutTestController::display() > displayWebView(); > } > >-JSRetainPtr<JSStringRef> LayoutTestController::counterValueForElementById(JSStringRef id) >-{ >- gchar* idGChar = JSStringCopyUTF8CString(id); >- CString counterValueGChar = DumpRenderTreeSupportGtk::counterValueForElementById(mainFrame, idGChar); >- g_free(idGChar); >- if (counterValueGChar.isNull()) >- return 0; >- JSRetainPtr<JSStringRef> counterValue(Adopt, JSStringCreateWithUTF8CString(counterValueGChar.data())); >- return counterValue; >-} >- > void LayoutTestController::keepWebHistory() > { > // FIXME: implement >Index: Tools/DumpRenderTree/mac/LayoutTestControllerMac.mm >=================================================================== >--- Tools/DumpRenderTree/mac/LayoutTestControllerMac.mm (revision 116304) >+++ Tools/DumpRenderTree/mac/LayoutTestControllerMac.mm (working copy) >@@ -249,19 +249,6 @@ void LayoutTestController::display() > displayWebView(); > } > >-JSRetainPtr<JSStringRef> LayoutTestController::counterValueForElementById(JSStringRef id) >-{ >- RetainPtr<CFStringRef> idCF(AdoptCF, JSStringCopyCFString(kCFAllocatorDefault, id)); >- NSString *idNS = (NSString *)idCF.get(); >- >- DOMElement *element = [[mainFrame DOMDocument] getElementById:idNS]; >- if (!element) >- return 0; >- >- JSRetainPtr<JSStringRef> counterValue(Adopt, JSStringCreateWithCFString((CFStringRef)[mainFrame counterValueForElement:element])); >- return counterValue; >-} >- > void LayoutTestController::keepWebHistory() > { > if (![WebHistory optionalSharedHistory]) { >Index: Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp >=================================================================== >--- Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp (revision 116304) >+++ Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp (working copy) >@@ -155,11 +155,6 @@ void LayoutTestController::waitUntilDone > m_timeoutTimer.start(m_timeout, this); > } > >-QString LayoutTestController::counterValueForElementById(const QString& id) >-{ >- return DumpRenderTreeSupportQt::counterValueForElementById(m_drt->webPage()->mainFrame(), id); >-} >- > void LayoutTestController::setViewModeMediaFeature(const QString& mode) > { > m_drt->webPage()->setProperty("_q_viewMode", mode); >Index: Tools/DumpRenderTree/qt/LayoutTestControllerQt.h >=================================================================== >--- Tools/DumpRenderTree/qt/LayoutTestControllerQt.h (revision 116304) >+++ Tools/DumpRenderTree/qt/LayoutTestControllerQt.h (working copy) >@@ -105,7 +105,6 @@ public slots: > void setCanOpenWindows() { m_canOpenWindows = true; } > void setPrinting() { m_isPrinting = true; } > void waitUntilDone(); >- QString counterValueForElementById(const QString& id); > int webHistoryItemCount(); > void keepWebHistory(); > void notifyDone(); >Index: Tools/DumpRenderTree/win/LayoutTestControllerWin.cpp >=================================================================== >--- Tools/DumpRenderTree/win/LayoutTestControllerWin.cpp (revision 116304) >+++ Tools/DumpRenderTree/win/LayoutTestControllerWin.cpp (working copy) >@@ -1336,25 +1336,6 @@ void LayoutTestController::removeAllVisi > sharedHistoryPrivate->removeAllVisitedLinks(); > } > >-JSRetainPtr<JSStringRef> LayoutTestController::counterValueForElementById(JSStringRef id) >-{ >- COMPtr<IWebFramePrivate> framePrivate(Query, frame); >- if (!framePrivate) >- return 0; >- >- wstring idWstring = jsStringRefToWString(id); >- BSTR idBSTR = SysAllocStringLen((OLECHAR*)idWstring.c_str(), idWstring.length()); >- BSTR counterValueBSTR; >- if (FAILED(framePrivate->counterValueForElementById(idBSTR, &counterValueBSTR))) >- return 0; >- >- wstring counterValue(counterValueBSTR, SysStringLen(counterValueBSTR)); >- SysFreeString(idBSTR); >- SysFreeString(counterValueBSTR); >- JSRetainPtr<JSStringRef> counterValueJS(Adopt, JSStringCreateWithCharacters(counterValue.data(), counterValue.length())); >- return counterValueJS; >-} >- > int LayoutTestController::pageNumberForElementById(JSStringRef id, float pageWidthInPixels, float pageHeightInPixels) > { > COMPtr<IWebFramePrivate> framePrivate(Query, frame); >Index: Tools/DumpRenderTree/wx/LayoutTestControllerWx.cpp >=================================================================== >--- Tools/DumpRenderTree/wx/LayoutTestControllerWx.cpp (revision 116304) >+++ Tools/DumpRenderTree/wx/LayoutTestControllerWx.cpp (working copy) >@@ -486,11 +486,6 @@ void LayoutTestController::setScrollbarP > // FIXME: implement > } > >-JSRetainPtr<JSStringRef> LayoutTestController::counterValueForElementById(JSStringRef id) >-{ >- return 0; >-} >- > int LayoutTestController::pageNumberForElementById(JSStringRef, float, float) > { > // FIXME: implement >Index: Tools/WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl >=================================================================== >--- Tools/WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl (revision 116304) >+++ Tools/WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl (working copy) >@@ -63,7 +63,6 @@ module WTR { > // Special DOM functions. > void clearBackForwardList(); > object computedStyleIncludingVisitedInfo(in object element); >- DOMString counterValueForElementById(in DOMString elementId); > void execCommand(in DOMString name, in DOMString argument); > boolean isCommandEnabled(in DOMString name); > DOMString markerTextForListItem(in object element); >Index: LayoutTests/ChangeLog >=================================================================== >--- LayoutTests/ChangeLog (revision 116304) >+++ LayoutTests/ChangeLog (working copy) >@@ -1,3 +1,41 @@ >+2012-05-07 Kaustubh Atrawalkar <kaustubh@motorola.com> >+ >+ [DRT] LTC:: counterValueForElementById() could be moved to Internals. >+ https://bugs.webkit.org/show_bug.cgi?id=84406 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Move the counterValueForElementById from LayoutTestCotroller to Internals and >+ remove the old platform specific implementations as it exclusively tests WebCore functionality. >+ >+ * fast/css/counters/2displays-expected.txt: >+ * fast/css/counters/2displays.html: >+ * fast/css/counters/adding-nodes.html: >+ * fast/css/counters/after-continuation-expected.txt: >+ * fast/css/counters/after-continuation.html: >+ * fast/css/counters/content-021-expected.txt: >+ * fast/css/counters/content-021.html: >+ * fast/css/counters/counter-before-content-not-incremented.html: >+ * fast/css/counters/counter-increment-000-expected.txt: >+ * fast/css/counters/counter-increment-000.html: >+ * fast/css/counters/counter-increment-001-expected.txt: >+ * fast/css/counters/counter-increment-001.html: >+ * fast/css/counters/counter-increment-002.html: >+ * fast/css/counters/counter-increment-inherit-expected.txt: >+ * fast/css/counters/counter-increment-inherit.htm: >+ * fast/css/counters/counter-increment-overflow.html: >+ * fast/css/counters/counter-increment-tests-expected.txt: >+ * fast/css/counters/counter-increment-tests.htm: >+ * fast/css/counters/counter-reset-000.html: >+ * fast/css/counters/counter-reset-001.html: >+ * fast/css/counters/counter-reset-002.html: >+ * fast/css/counters/counterValueForElementById-expected.txt: >+ * fast/css/counters/counterValueForElementById.html: >+ * fast/css/counters/deep-before-expected.txt: >+ * fast/css/counters/deep-before.html: >+ * fast/css/counters/invalidate-cached-counter-node.html: >+ * fast/css/counters/nesting.html: >+ > 2012-05-07 Alexis Menard <alexis.menard@openbossa.org> > > [Qt] Enable fullscreen api layout tests on WebKit2. >Index: LayoutTests/fast/css/counters/2displays-expected.txt >=================================================================== >--- LayoutTests/fast/css/counters/2displays-expected.txt (revision 116304) >+++ LayoutTests/fast/css/counters/2displays-expected.txt (working copy) >@@ -6,5 +6,5 @@ On success, you will see a series of "PA > PASS successfullyParsed is true > > TEST COMPLETE >-PASS layoutTestController.counterValueForElementById('testView') is '1000 1000' >+PASS window.internals.counterValueForElementById('testView') is '1000 1000' > >Index: LayoutTests/fast/css/counters/2displays.html >=================================================================== >--- LayoutTests/fast/css/counters/2displays.html (revision 116304) >+++ LayoutTests/fast/css/counters/2displays.html (working copy) >@@ -31,7 +31,7 @@ function run() > document.getElementById("testView").setAttribute("class", "counter1000"); > if (!window.layoutTestController) > return; >- shouldBe("layoutTestController.counterValueForElementById('testView')", "'1000 1000'"); >+ shouldBe("window.internals.counterValueForElementById('testView')", "'1000 1000'"); > > if (window.layoutTestController) > layoutTestController.notifyDone(); >Index: LayoutTests/fast/css/counters/adding-nodes.html >=================================================================== >--- LayoutTests/fast/css/counters/adding-nodes.html (revision 116304) >+++ LayoutTests/fast/css/counters/adding-nodes.html (working copy) >@@ -34,7 +34,7 @@ > newSpanElement = document.createElement("span"); > id = spanList.item(i).getAttribute("id"); > if (id != null) >- newSpanElement.innerText = layoutTestController.counterValueForElementById(id); >+ newSpanElement.innerText = window.internals.counterValueForElementById(id); > if (newSpanElement.innerText.length) > newSpanElement.innerText = newSpanElement.innerText + "-"; > console.appendChild(newSpanElement); >Index: LayoutTests/fast/css/counters/after-continuation-expected.txt >=================================================================== >--- LayoutTests/fast/css/counters/after-continuation-expected.txt (revision 116304) >+++ LayoutTests/fast/css/counters/after-continuation-expected.txt (working copy) >@@ -1,6 +1,6 @@ > This test passes if the numbers displayed below are 1 and 2 in this order. > >-PASS layoutTestController.counterValueForElementById('c2') is '2' >+PASS window.internals.counterValueForElementById('c2') is '2' > > TEST COMPLETE > >Index: LayoutTests/fast/css/counters/after-continuation.html >=================================================================== >--- LayoutTests/fast/css/counters/after-continuation.html (revision 116304) >+++ LayoutTests/fast/css/counters/after-continuation.html (working copy) >@@ -10,7 +10,7 @@ > } > function run() > { >- shouldBe("layoutTestController.counterValueForElementById('c2')", "'2'"); >+ shouldBe("window.internals.counterValueForElementById('c2')", "'2'"); > > debug(''); > debug('TEST COMPLETE'); >Index: LayoutTests/fast/css/counters/content-021-expected.txt >=================================================================== >--- LayoutTests/fast/css/counters/content-021-expected.txt (revision 116304) >+++ LayoutTests/fast/css/counters/content-021-expected.txt (working copy) >@@ -1,7 +1,7 @@ > This is the WebKit version of CSS Test: Content using a 'counters()' function with a string value. > >-PASS layoutTestController.counterValueForElementById('div1') is '0' >-PASS layoutTestController.counterValueForElementById('div2') is '0.0' >+PASS window.internals.counterValueForElementById('div1') is '0' >+PASS window.internals.counterValueForElementById('div2') is '0.0' > > TEST COMPLETE > >Index: LayoutTests/fast/css/counters/content-021.html >=================================================================== >--- LayoutTests/fast/css/counters/content-021.html (revision 116304) >+++ LayoutTests/fast/css/counters/content-021.html (working copy) >@@ -28,8 +28,8 @@ > { > if (!window.layoutTestController) > return; >- shouldBe("layoutTestController.counterValueForElementById('div1')", "'0'"); >- shouldBe("layoutTestController.counterValueForElementById('div2')", "'0.0'"); >+ shouldBe("window.internals.counterValueForElementById('div1')", "'0'"); >+ shouldBe("window.internals.counterValueForElementById('div2')", "'0.0'"); > > debug(''); > debug('TEST COMPLETE'); >Index: LayoutTests/fast/css/counters/counter-before-content-not-incremented.html >=================================================================== >--- LayoutTests/fast/css/counters/counter-before-content-not-incremented.html (revision 116304) >+++ LayoutTests/fast/css/counters/counter-before-content-not-incremented.html (working copy) >@@ -43,7 +43,7 @@ > for (var i = 0; i < spanList.length; ++i ) { > var divItem = spanList.item(i); > counters += '-'; >- counters += layoutTestController.counterValueForElementById(divItem.getAttribute("id")); >+ counters += window.internals.counterValueForElementById(divItem.getAttribute("id")); > counters += divItem.textContent; > } > document.getElementById("container").innerHTML = counters; >Index: LayoutTests/fast/css/counters/counter-increment-000-expected.txt >=================================================================== >--- LayoutTests/fast/css/counters/counter-increment-000-expected.txt (revision 116304) >+++ LayoutTests/fast/css/counters/counter-increment-000-expected.txt (working copy) >@@ -1,14 +1,14 @@ > This is the WebKit version of CSS 2.1 Test Suite: dynamic changes to 'counter-increment'. > > Before the dynamic change: >-PASS layoutTestController.counterValueForElementById('one') is '1' >-PASS layoutTestController.counterValueForElementById('three') is '2' >-PASS layoutTestController.counterValueForElementById('four') is '3' >+PASS window.internals.counterValueForElementById('one') is '1' >+PASS window.internals.counterValueForElementById('three') is '2' >+PASS window.internals.counterValueForElementById('four') is '3' > After the dynamic change: >-PASS layoutTestController.counterValueForElementById('one') is '1' >-PASS layoutTestController.counterValueForElementById('two') is '2' >-PASS layoutTestController.counterValueForElementById('three') is '3' >-PASS layoutTestController.counterValueForElementById('four') is '4' >+PASS window.internals.counterValueForElementById('one') is '1' >+PASS window.internals.counterValueForElementById('two') is '2' >+PASS window.internals.counterValueForElementById('three') is '3' >+PASS window.internals.counterValueForElementById('four') is '4' > > TEST COMPLETE > >Index: LayoutTests/fast/css/counters/counter-increment-000.html >=================================================================== >--- LayoutTests/fast/css/counters/counter-increment-000.html (revision 116304) >+++ LayoutTests/fast/css/counters/counter-increment-000.html (working copy) >@@ -18,18 +18,18 @@ > function checkCounterValuesBeforeChange() > { > debug('Before the dynamic change:'); >- shouldBe("layoutTestController.counterValueForElementById('one')", "'1'"); >- shouldBe("layoutTestController.counterValueForElementById('three')", "'2'"); >- shouldBe("layoutTestController.counterValueForElementById('four')", "'3'"); >+ shouldBe("window.internals.counterValueForElementById('one')", "'1'"); >+ shouldBe("window.internals.counterValueForElementById('three')", "'2'"); >+ shouldBe("window.internals.counterValueForElementById('four')", "'3'"); > } > > function checkCounterValuesAfterChange() > { > debug('After the dynamic change:'); >- shouldBe("layoutTestController.counterValueForElementById('one')", "'1'"); >- shouldBe("layoutTestController.counterValueForElementById('two')", "'2'"); >- shouldBe("layoutTestController.counterValueForElementById('three')", "'3'"); >- shouldBe("layoutTestController.counterValueForElementById('four')", "'4'"); >+ shouldBe("window.internals.counterValueForElementById('one')", "'1'"); >+ shouldBe("window.internals.counterValueForElementById('two')", "'2'"); >+ shouldBe("window.internals.counterValueForElementById('three')", "'3'"); >+ shouldBe("window.internals.counterValueForElementById('four')", "'4'"); > > debug(''); > debug('TEST COMPLETE'); >Index: LayoutTests/fast/css/counters/counter-increment-001-expected.txt >=================================================================== >--- LayoutTests/fast/css/counters/counter-increment-001-expected.txt (revision 116304) >+++ LayoutTests/fast/css/counters/counter-increment-001-expected.txt (working copy) >@@ -1,13 +1,13 @@ > This is the WebKit version of CSS 2.1 Test Suite: dynamic changes to 'counter-increment'. > > Before the dynamic change: >-PASS layoutTestController.counterValueForElementById('one') is '1' >-PASS layoutTestController.counterValueForElementById('two') is '3' >-PASS layoutTestController.counterValueForElementById('three') is '4' >+PASS window.internals.counterValueForElementById('one') is '1' >+PASS window.internals.counterValueForElementById('two') is '3' >+PASS window.internals.counterValueForElementById('three') is '4' > After the dynamic change: >-PASS layoutTestController.counterValueForElementById('one') is '1' >-PASS layoutTestController.counterValueForElementById('two') is '2' >-PASS layoutTestController.counterValueForElementById('three') is '3' >+PASS window.internals.counterValueForElementById('one') is '1' >+PASS window.internals.counterValueForElementById('two') is '2' >+PASS window.internals.counterValueForElementById('three') is '3' > > TEST COMPLETE > >Index: LayoutTests/fast/css/counters/counter-increment-001.html >=================================================================== >--- LayoutTests/fast/css/counters/counter-increment-001.html (revision 116304) >+++ LayoutTests/fast/css/counters/counter-increment-001.html (working copy) >@@ -18,17 +18,17 @@ > function checkCounterValuesBeforeChange() > { > debug('Before the dynamic change:'); >- shouldBe("layoutTestController.counterValueForElementById('one')", "'1'"); >- shouldBe("layoutTestController.counterValueForElementById('two')", "'3'"); >- shouldBe("layoutTestController.counterValueForElementById('three')", "'4'"); >+ shouldBe("window.internals.counterValueForElementById('one')", "'1'"); >+ shouldBe("window.internals.counterValueForElementById('two')", "'3'"); >+ shouldBe("window.internals.counterValueForElementById('three')", "'4'"); > } > > function checkCounterValuesAfterChange() > { > debug('After the dynamic change:'); >- shouldBe("layoutTestController.counterValueForElementById('one')", "'1'"); >- shouldBe("layoutTestController.counterValueForElementById('two')", "'2'"); >- shouldBe("layoutTestController.counterValueForElementById('three')", "'3'"); >+ shouldBe("window.internals.counterValueForElementById('one')", "'1'"); >+ shouldBe("window.internals.counterValueForElementById('two')", "'2'"); >+ shouldBe("window.internals.counterValueForElementById('three')", "'3'"); > > debug(''); > debug('TEST COMPLETE'); >Index: LayoutTests/fast/css/counters/counter-increment-002.html >=================================================================== >--- LayoutTests/fast/css/counters/counter-increment-002.html (revision 116304) >+++ LayoutTests/fast/css/counters/counter-increment-002.html (working copy) >@@ -32,7 +32,7 @@ > for (i = 0; i < spanList.length; ++i ) { > newSpanElement = document.createElement("span"); > newSpanElement.innerText = >- layoutTestController.counterValueForElementById(spanList.item(i).getAttribute("id")); >+ window.internals.counterValueForElementById(spanList.item(i).getAttribute("id")); > if (newSpanElement.innerText.length) > newSpanElement.innerText = newSpanElement.innerText + "-"; > console.appendChild(newSpanElement); >Index: LayoutTests/fast/css/counters/counter-increment-inherit-expected.txt >=================================================================== >--- LayoutTests/fast/css/counters/counter-increment-inherit-expected.txt (revision 116304) >+++ LayoutTests/fast/css/counters/counter-increment-inherit-expected.txt (working copy) >@@ -1,7 +1,7 @@ >-PASS layoutTestController.counterValueForElementById('wrapper90') is '5' >-PASS layoutTestController.counterValueForElementById('test90') is '10' >-PASS layoutTestController.counterValueForElementById('test90a') is '15' >-PASS layoutTestController.counterValueForElementById('wrapper91') is '10' >-PASS layoutTestController.counterValueForElementById('test91') is '20' >-PASS layoutTestController.counterValueForElementById('test91a') is '30' >+PASS window.internals.counterValueForElementById('wrapper90') is '5' >+PASS window.internals.counterValueForElementById('test90') is '10' >+PASS window.internals.counterValueForElementById('test90a') is '15' >+PASS window.internals.counterValueForElementById('wrapper91') is '10' >+PASS window.internals.counterValueForElementById('test91') is '20' >+PASS window.internals.counterValueForElementById('test91a') is '30' > >Index: LayoutTests/fast/css/counters/counter-increment-inherit.htm >=================================================================== >--- LayoutTests/fast/css/counters/counter-increment-inherit.htm (revision 116304) >+++ LayoutTests/fast/css/counters/counter-increment-inherit.htm (working copy) >@@ -13,12 +13,12 @@ > function run() > { > // Some extra WebKit testing for counter-increment inherit >- shouldBe("layoutTestController.counterValueForElementById('wrapper90')", "'5'"); >- shouldBe("layoutTestController.counterValueForElementById('test90')", "'10'"); >- shouldBe("layoutTestController.counterValueForElementById('test90a')", "'15'"); >- shouldBe("layoutTestController.counterValueForElementById('wrapper91')", "'10'"); >- shouldBe("layoutTestController.counterValueForElementById('test91')", "'20'"); >- shouldBe("layoutTestController.counterValueForElementById('test91a')", "'30'"); >+ shouldBe("window.internals.counterValueForElementById('wrapper90')", "'5'"); >+ shouldBe("window.internals.counterValueForElementById('test90')", "'10'"); >+ shouldBe("window.internals.counterValueForElementById('test90a')", "'15'"); >+ shouldBe("window.internals.counterValueForElementById('wrapper91')", "'10'"); >+ shouldBe("window.internals.counterValueForElementById('test91')", "'20'"); >+ shouldBe("window.internals.counterValueForElementById('test91a')", "'30'"); > if (window.layoutTestController) > layoutTestController.notifyDone(); > } >Index: LayoutTests/fast/css/counters/counter-increment-overflow.html >=================================================================== >--- LayoutTests/fast/css/counters/counter-increment-overflow.html (revision 116304) >+++ LayoutTests/fast/css/counters/counter-increment-overflow.html (working copy) >@@ -18,7 +18,7 @@ > function doTest() > { > if (window.layoutTestController) >- document.getElementById('counted').innerText = layoutTestController.counterValueForElementById('counted'); >+ document.getElementById('counted').innerText = window.internals.counterValueForElementById('counted'); > } > > window.addEventListener('load', doTest, false); >Index: LayoutTests/fast/css/counters/counter-increment-tests-expected.txt >=================================================================== >--- LayoutTests/fast/css/counters/counter-increment-tests-expected.txt (revision 116304) >+++ LayoutTests/fast/css/counters/counter-increment-tests-expected.txt (working copy) >@@ -1,58 +1,58 @@ >-PASS layoutTestController.counterValueForElementById('test3') is '-2147483648' >-PASS layoutTestController.counterValueForElementById('test4') is '-2147483647' >-PASS layoutTestController.counterValueForElementById('test5') is '0' >-PASS layoutTestController.counterValueForElementById('test6') is '0' >-PASS layoutTestController.counterValueForElementById('test7') is '0' >-PASS layoutTestController.counterValueForElementById('test8') is '10' >-PASS layoutTestController.counterValueForElementById('test9') is '10' >-PASS layoutTestController.counterValueForElementById('test10') is '2147483646' >-PASS layoutTestController.counterValueForElementById('test11') is '2147483647' >-PASS layoutTestController.counterValueForElementById('test12') is '2147483647' >-PASS layoutTestController.counterValueForElementById('test13') is '2147483647' >-PASS layoutTestController.counterValueForElementById('test14') is '2' >-PASS layoutTestController.counterValueForElementById('test15') is '-2147483648' >-PASS layoutTestController.counterValueForElementById('test16') is '-2147483648' >-PASS layoutTestController.counterValueForElementById('test17') is '-2147483648' >-PASS layoutTestController.counterValueForElementById('test18') is '0' >-PASS layoutTestController.counterValueForElementById('test19') is '0' >-PASS layoutTestController.counterValueForElementById('test20') is '0' >-PASS layoutTestController.counterValueForElementById('test21') is '20' >-PASS layoutTestController.counterValueForElementById('test22') is '20' >-PASS layoutTestController.counterValueForElementById('test23') is '2147483647' >-PASS layoutTestController.counterValueForElementById('test24') is '2147483647' >-PASS layoutTestController.counterValueForElementById('test25') is '2147483647' >-PASS layoutTestController.counterValueForElementById('test26') is '2147483647' >-PASS layoutTestController.counterValueForElementById('test27') is '3' >-PASS layoutTestController.counterValueForElementById('test28') is '-2147483648' >-PASS layoutTestController.counterValueForElementById('test29') is '-2147483648' >-PASS layoutTestController.counterValueForElementById('test30') is '-2147483648' >-PASS layoutTestController.counterValueForElementById('test31') is '0' >-PASS layoutTestController.counterValueForElementById('test32') is '0' >-PASS layoutTestController.counterValueForElementById('test33') is '0' >-PASS layoutTestController.counterValueForElementById('test34') is '30' >-PASS layoutTestController.counterValueForElementById('test35') is '30' >-PASS layoutTestController.counterValueForElementById('test36') is '2147483647' >-PASS layoutTestController.counterValueForElementById('test37') is '2147483647' >-PASS layoutTestController.counterValueForElementById('test38') is '2147483647' >-PASS layoutTestController.counterValueForElementById('test39') is '2147483647' >-PASS layoutTestController.counterValueForElementById('test40') is '32' >-PASS layoutTestController.counterValueForElementById('test41') is '-2147483648' >-PASS layoutTestController.counterValueForElementById('test42') is '-2147483648' >-PASS layoutTestController.counterValueForElementById('test43') is '-2147483648' >-PASS layoutTestController.counterValueForElementById('test44') is '0' >-PASS layoutTestController.counterValueForElementById('test45') is '0' >-PASS layoutTestController.counterValueForElementById('test46') is '0' >-PASS layoutTestController.counterValueForElementById('test47') is '320' >-PASS layoutTestController.counterValueForElementById('test48') is '320' >-PASS layoutTestController.counterValueForElementById('test49') is '2147483647' >-PASS layoutTestController.counterValueForElementById('test50') is '2147483647' >-PASS layoutTestController.counterValueForElementById('test51') is '2147483647' >-PASS layoutTestController.counterValueForElementById('test52') is '2147483647' >-PASS layoutTestController.counterValueForElementById('test53') is '5' >-PASS layoutTestController.counterValueForElementById('none53') is '5' >-PASS layoutTestController.counterValueForElementById('test53a') is '10' >-PASS layoutTestController.counterValueForElementById('wrapper54') is '5' >-PASS layoutTestController.counterValueForElementById('test54') is '10' >-PASS layoutTestController.counterValueForElementById('test55') is '1' >-PASS layoutTestController.counterValueForElementById('test56') is '-2147483648' >+PASS window.internals.counterValueForElementById('test3') is '-2147483648' >+PASS window.internals.counterValueForElementById('test4') is '-2147483647' >+PASS window.internals.counterValueForElementById('test5') is '0' >+PASS window.internals.counterValueForElementById('test6') is '0' >+PASS window.internals.counterValueForElementById('test7') is '0' >+PASS window.internals.counterValueForElementById('test8') is '10' >+PASS window.internals.counterValueForElementById('test9') is '10' >+PASS window.internals.counterValueForElementById('test10') is '2147483646' >+PASS window.internals.counterValueForElementById('test11') is '2147483647' >+PASS window.internals.counterValueForElementById('test12') is '2147483647' >+PASS window.internals.counterValueForElementById('test13') is '2147483647' >+PASS window.internals.counterValueForElementById('test14') is '2' >+PASS window.internals.counterValueForElementById('test15') is '-2147483648' >+PASS window.internals.counterValueForElementById('test16') is '-2147483648' >+PASS window.internals.counterValueForElementById('test17') is '-2147483648' >+PASS window.internals.counterValueForElementById('test18') is '0' >+PASS window.internals.counterValueForElementById('test19') is '0' >+PASS window.internals.counterValueForElementById('test20') is '0' >+PASS window.internals.counterValueForElementById('test21') is '20' >+PASS window.internals.counterValueForElementById('test22') is '20' >+PASS window.internals.counterValueForElementById('test23') is '2147483647' >+PASS window.internals.counterValueForElementById('test24') is '2147483647' >+PASS window.internals.counterValueForElementById('test25') is '2147483647' >+PASS window.internals.counterValueForElementById('test26') is '2147483647' >+PASS window.internals.counterValueForElementById('test27') is '3' >+PASS window.internals.counterValueForElementById('test28') is '-2147483648' >+PASS window.internals.counterValueForElementById('test29') is '-2147483648' >+PASS window.internals.counterValueForElementById('test30') is '-2147483648' >+PASS window.internals.counterValueForElementById('test31') is '0' >+PASS window.internals.counterValueForElementById('test32') is '0' >+PASS window.internals.counterValueForElementById('test33') is '0' >+PASS window.internals.counterValueForElementById('test34') is '30' >+PASS window.internals.counterValueForElementById('test35') is '30' >+PASS window.internals.counterValueForElementById('test36') is '2147483647' >+PASS window.internals.counterValueForElementById('test37') is '2147483647' >+PASS window.internals.counterValueForElementById('test38') is '2147483647' >+PASS window.internals.counterValueForElementById('test39') is '2147483647' >+PASS window.internals.counterValueForElementById('test40') is '32' >+PASS window.internals.counterValueForElementById('test41') is '-2147483648' >+PASS window.internals.counterValueForElementById('test42') is '-2147483648' >+PASS window.internals.counterValueForElementById('test43') is '-2147483648' >+PASS window.internals.counterValueForElementById('test44') is '0' >+PASS window.internals.counterValueForElementById('test45') is '0' >+PASS window.internals.counterValueForElementById('test46') is '0' >+PASS window.internals.counterValueForElementById('test47') is '320' >+PASS window.internals.counterValueForElementById('test48') is '320' >+PASS window.internals.counterValueForElementById('test49') is '2147483647' >+PASS window.internals.counterValueForElementById('test50') is '2147483647' >+PASS window.internals.counterValueForElementById('test51') is '2147483647' >+PASS window.internals.counterValueForElementById('test52') is '2147483647' >+PASS window.internals.counterValueForElementById('test53') is '5' >+PASS window.internals.counterValueForElementById('none53') is '5' >+PASS window.internals.counterValueForElementById('test53a') is '10' >+PASS window.internals.counterValueForElementById('wrapper54') is '5' >+PASS window.internals.counterValueForElementById('test54') is '10' >+PASS window.internals.counterValueForElementById('test55') is '1' >+PASS window.internals.counterValueForElementById('test56') is '-2147483648' > >Index: LayoutTests/fast/css/counters/counter-increment-tests.htm >=================================================================== >--- LayoutTests/fast/css/counters/counter-increment-tests.htm (revision 116304) >+++ LayoutTests/fast/css/counters/counter-increment-tests.htm (working copy) >@@ -15,63 +15,63 @@ > /* These are text versions of the counter-increment-* tests in the CSS 2.1 test suite. > So 'test3' here is equivalent to counter-increment-003.htm, and so on. > WebKit dumpAsText versions of counter-increment-001 and 002 already exist in fast/css/counters */ >- shouldBe("layoutTestController.counterValueForElementById('test3')", "'-2147483648'"); >- shouldBe("layoutTestController.counterValueForElementById('test4')", "'-2147483647'"); >- shouldBe("layoutTestController.counterValueForElementById('test5')", "'0'"); >- shouldBe("layoutTestController.counterValueForElementById('test6')", "'0'"); >- shouldBe("layoutTestController.counterValueForElementById('test7')", "'0'"); >- shouldBe("layoutTestController.counterValueForElementById('test8')", "'10'"); >- shouldBe("layoutTestController.counterValueForElementById('test9')", "'10'"); >- shouldBe("layoutTestController.counterValueForElementById('test10')", "'2147483646'"); >- shouldBe("layoutTestController.counterValueForElementById('test11')", "'2147483647'"); >- shouldBe("layoutTestController.counterValueForElementById('test12')", "'2147483647'"); >- shouldBe("layoutTestController.counterValueForElementById('test13')", "'2147483647'"); >- shouldBe("layoutTestController.counterValueForElementById('test14')", "'2'"); >- shouldBe("layoutTestController.counterValueForElementById('test15')", "'-2147483648'"); >- shouldBe("layoutTestController.counterValueForElementById('test16')", "'-2147483648'"); >- shouldBe("layoutTestController.counterValueForElementById('test17')", "'-2147483648'"); >- shouldBe("layoutTestController.counterValueForElementById('test18')", "'0'"); >- shouldBe("layoutTestController.counterValueForElementById('test19')", "'0'"); >- shouldBe("layoutTestController.counterValueForElementById('test20')", "'0'"); >- shouldBe("layoutTestController.counterValueForElementById('test21')", "'20'"); >- shouldBe("layoutTestController.counterValueForElementById('test22')", "'20'"); >- shouldBe("layoutTestController.counterValueForElementById('test23')", "'2147483647'"); >- shouldBe("layoutTestController.counterValueForElementById('test24')", "'2147483647'"); >- shouldBe("layoutTestController.counterValueForElementById('test25')", "'2147483647'"); >- shouldBe("layoutTestController.counterValueForElementById('test26')", "'2147483647'"); >- shouldBe("layoutTestController.counterValueForElementById('test27')", "'3'"); >- shouldBe("layoutTestController.counterValueForElementById('test28')", "'-2147483648'"); >- shouldBe("layoutTestController.counterValueForElementById('test29')", "'-2147483648'"); >- shouldBe("layoutTestController.counterValueForElementById('test30')", "'-2147483648'"); >- shouldBe("layoutTestController.counterValueForElementById('test31')", "'0'"); >- shouldBe("layoutTestController.counterValueForElementById('test32')", "'0'"); >- shouldBe("layoutTestController.counterValueForElementById('test33')", "'0'"); >- shouldBe("layoutTestController.counterValueForElementById('test34')", "'30'"); >- shouldBe("layoutTestController.counterValueForElementById('test35')", "'30'"); >- shouldBe("layoutTestController.counterValueForElementById('test36')", "'2147483647'"); >- shouldBe("layoutTestController.counterValueForElementById('test37')", "'2147483647'"); >- shouldBe("layoutTestController.counterValueForElementById('test38')", "'2147483647'"); >- shouldBe("layoutTestController.counterValueForElementById('test39')", "'2147483647'"); >- shouldBe("layoutTestController.counterValueForElementById('test40')", "'32'"); >- shouldBe("layoutTestController.counterValueForElementById('test41')", "'-2147483648'"); >- shouldBe("layoutTestController.counterValueForElementById('test42')", "'-2147483648'"); >- shouldBe("layoutTestController.counterValueForElementById('test43')", "'-2147483648'"); >- shouldBe("layoutTestController.counterValueForElementById('test44')", "'0'"); >- shouldBe("layoutTestController.counterValueForElementById('test45')", "'0'"); >- shouldBe("layoutTestController.counterValueForElementById('test46')", "'0'"); >- shouldBe("layoutTestController.counterValueForElementById('test47')", "'320'"); >- shouldBe("layoutTestController.counterValueForElementById('test48')", "'320'"); >- shouldBe("layoutTestController.counterValueForElementById('test49')", "'2147483647'"); >- shouldBe("layoutTestController.counterValueForElementById('test50')", "'2147483647'"); >- shouldBe("layoutTestController.counterValueForElementById('test51')", "'2147483647'"); >- shouldBe("layoutTestController.counterValueForElementById('test52')", "'2147483647'"); >- shouldBe("layoutTestController.counterValueForElementById('test53')", "'5'"); >- shouldBe("layoutTestController.counterValueForElementById('none53')", "'5'"); >- shouldBe("layoutTestController.counterValueForElementById('test53a')", "'10'"); >- shouldBe("layoutTestController.counterValueForElementById('wrapper54')", "'5'"); >- shouldBe("layoutTestController.counterValueForElementById('test54')", "'10'"); >- shouldBe("layoutTestController.counterValueForElementById('test55')", "'1'"); >- shouldBe("layoutTestController.counterValueForElementById('test56')", "'-2147483648'"); >+ shouldBe("window.internals.counterValueForElementById('test3')", "'-2147483648'"); >+ shouldBe("window.internals.counterValueForElementById('test4')", "'-2147483647'"); >+ shouldBe("window.internals.counterValueForElementById('test5')", "'0'"); >+ shouldBe("window.internals.counterValueForElementById('test6')", "'0'"); >+ shouldBe("window.internals.counterValueForElementById('test7')", "'0'"); >+ shouldBe("window.internals.counterValueForElementById('test8')", "'10'"); >+ shouldBe("window.internals.counterValueForElementById('test9')", "'10'"); >+ shouldBe("window.internals.counterValueForElementById('test10')", "'2147483646'"); >+ shouldBe("window.internals.counterValueForElementById('test11')", "'2147483647'"); >+ shouldBe("window.internals.counterValueForElementById('test12')", "'2147483647'"); >+ shouldBe("window.internals.counterValueForElementById('test13')", "'2147483647'"); >+ shouldBe("window.internals.counterValueForElementById('test14')", "'2'"); >+ shouldBe("window.internals.counterValueForElementById('test15')", "'-2147483648'"); >+ shouldBe("window.internals.counterValueForElementById('test16')", "'-2147483648'"); >+ shouldBe("window.internals.counterValueForElementById('test17')", "'-2147483648'"); >+ shouldBe("window.internals.counterValueForElementById('test18')", "'0'"); >+ shouldBe("window.internals.counterValueForElementById('test19')", "'0'"); >+ shouldBe("window.internals.counterValueForElementById('test20')", "'0'"); >+ shouldBe("window.internals.counterValueForElementById('test21')", "'20'"); >+ shouldBe("window.internals.counterValueForElementById('test22')", "'20'"); >+ shouldBe("window.internals.counterValueForElementById('test23')", "'2147483647'"); >+ shouldBe("window.internals.counterValueForElementById('test24')", "'2147483647'"); >+ shouldBe("window.internals.counterValueForElementById('test25')", "'2147483647'"); >+ shouldBe("window.internals.counterValueForElementById('test26')", "'2147483647'"); >+ shouldBe("window.internals.counterValueForElementById('test27')", "'3'"); >+ shouldBe("window.internals.counterValueForElementById('test28')", "'-2147483648'"); >+ shouldBe("window.internals.counterValueForElementById('test29')", "'-2147483648'"); >+ shouldBe("window.internals.counterValueForElementById('test30')", "'-2147483648'"); >+ shouldBe("window.internals.counterValueForElementById('test31')", "'0'"); >+ shouldBe("window.internals.counterValueForElementById('test32')", "'0'"); >+ shouldBe("window.internals.counterValueForElementById('test33')", "'0'"); >+ shouldBe("window.internals.counterValueForElementById('test34')", "'30'"); >+ shouldBe("window.internals.counterValueForElementById('test35')", "'30'"); >+ shouldBe("window.internals.counterValueForElementById('test36')", "'2147483647'"); >+ shouldBe("window.internals.counterValueForElementById('test37')", "'2147483647'"); >+ shouldBe("window.internals.counterValueForElementById('test38')", "'2147483647'"); >+ shouldBe("window.internals.counterValueForElementById('test39')", "'2147483647'"); >+ shouldBe("window.internals.counterValueForElementById('test40')", "'32'"); >+ shouldBe("window.internals.counterValueForElementById('test41')", "'-2147483648'"); >+ shouldBe("window.internals.counterValueForElementById('test42')", "'-2147483648'"); >+ shouldBe("window.internals.counterValueForElementById('test43')", "'-2147483648'"); >+ shouldBe("window.internals.counterValueForElementById('test44')", "'0'"); >+ shouldBe("window.internals.counterValueForElementById('test45')", "'0'"); >+ shouldBe("window.internals.counterValueForElementById('test46')", "'0'"); >+ shouldBe("window.internals.counterValueForElementById('test47')", "'320'"); >+ shouldBe("window.internals.counterValueForElementById('test48')", "'320'"); >+ shouldBe("window.internals.counterValueForElementById('test49')", "'2147483647'"); >+ shouldBe("window.internals.counterValueForElementById('test50')", "'2147483647'"); >+ shouldBe("window.internals.counterValueForElementById('test51')", "'2147483647'"); >+ shouldBe("window.internals.counterValueForElementById('test52')", "'2147483647'"); >+ shouldBe("window.internals.counterValueForElementById('test53')", "'5'"); >+ shouldBe("window.internals.counterValueForElementById('none53')", "'5'"); >+ shouldBe("window.internals.counterValueForElementById('test53a')", "'10'"); >+ shouldBe("window.internals.counterValueForElementById('wrapper54')", "'5'"); >+ shouldBe("window.internals.counterValueForElementById('test54')", "'10'"); >+ shouldBe("window.internals.counterValueForElementById('test55')", "'1'"); >+ shouldBe("window.internals.counterValueForElementById('test56')", "'-2147483648'"); > if (window.layoutTestController) > layoutTestController.notifyDone(); > } >Index: LayoutTests/fast/css/counters/counter-reset-000.html >=================================================================== >--- LayoutTests/fast/css/counters/counter-reset-000.html (revision 116304) >+++ LayoutTests/fast/css/counters/counter-reset-000.html (working copy) >@@ -33,7 +33,7 @@ > for (i = 0; i < spanList.length; ++i ) { > newSpanElement = document.createElement("span"); > newSpanElement.innerText = >- layoutTestController.counterValueForElementById(spanList.item(i).getAttribute("id")); >+ window.internals.counterValueForElementById(spanList.item(i).getAttribute("id")); > if (newSpanElement.innerText.length) > newSpanElement.innerText = newSpanElement.innerText + "-" > console.appendChild(newSpanElement); >Index: LayoutTests/fast/css/counters/counter-reset-001.html >=================================================================== >--- LayoutTests/fast/css/counters/counter-reset-001.html (revision 116304) >+++ LayoutTests/fast/css/counters/counter-reset-001.html (working copy) >@@ -22,7 +22,7 @@ > if (window.layoutTestController) { > layoutTestController.dumpAsText(); > // This call ensures the layout happened before we modify the DOM tree. >- layoutTestController.counterValueForElementById("span1"); >+ window.internals.counterValueForElementById("span1"); > } > > var t = document.getElementById("test"); >@@ -34,7 +34,7 @@ > spanList = testElement.getElementsByTagName("span"); > for (i = 0; i < spanList.length; ++i ) { > newSpanElement = document.createElement("span"); >- newSpanElement.innerText = layoutTestController.counterValueForElementById(spanList.item(i).getAttribute("id")); >+ newSpanElement.innerText = window.internals.counterValueForElementById(spanList.item(i).getAttribute("id")); > if (newSpanElement.innerText.length) > newSpanElement.innerText = newSpanElement.innerText + "-"; > console.appendChild(newSpanElement); >Index: LayoutTests/fast/css/counters/counter-reset-002.html >=================================================================== >--- LayoutTests/fast/css/counters/counter-reset-002.html (revision 116304) >+++ LayoutTests/fast/css/counters/counter-reset-002.html (working copy) >@@ -30,7 +30,7 @@ > for (i = 0; i < spanList.length; ++i ) { > newSpanElement = document.createElement("span"); > newSpanElement.innerText = >- layoutTestController.counterValueForElementById(spanList.item(i).getAttribute("id")); >+ window.internals.counterValueForElementById(spanList.item(i).getAttribute("id")); > if (newSpanElement.innerText.length) > newSpanElement.innerText = newSpanElement.innerText + "-"; > console.appendChild(newSpanElement); >Index: LayoutTests/fast/css/counters/counterValueForElementById-expected.txt >=================================================================== >--- LayoutTests/fast/css/counters/counterValueForElementById-expected.txt (revision 116304) >+++ LayoutTests/fast/css/counters/counterValueForElementById-expected.txt (working copy) >@@ -1,11 +1,11 @@ >-This is the test for layoutTestController.counterValueForElementById >+This is the test for window.internals.counterValueForElementById > >-PASS layoutTestController.counterValueForElementById('before') is '0' >-PASS layoutTestController.counterValueForElementById('after') is '0' >-PASS layoutTestController.counterValueForElementById('before_after') is '0 0' >-PASS layoutTestController.counterValueForElementById('twice') is '0 0' >-PASS layoutTestController.counterValueForElementById('point') is '0.1' >-PASS layoutTestController.counterValueForElementById('two-points') is '0.1.2' >-PASS layoutTestController.counterValueForElementById('greek') is '0.α.β' >-PASS layoutTestController.counterValueForElementById('three-greeks') is '0.α.β 0.α.β 0.α.β' >+PASS window.internals.counterValueForElementById('before') is '0' >+PASS window.internals.counterValueForElementById('after') is '0' >+PASS window.internals.counterValueForElementById('before_after') is '0 0' >+PASS window.internals.counterValueForElementById('twice') is '0 0' >+PASS window.internals.counterValueForElementById('point') is '0.1' >+PASS window.internals.counterValueForElementById('two-points') is '0.1.2' >+PASS window.internals.counterValueForElementById('greek') is '0.α.β' >+PASS window.internals.counterValueForElementById('three-greeks') is '0.α.β 0.α.β 0.α.β' > >Index: LayoutTests/fast/css/counters/counterValueForElementById.html >=================================================================== >--- LayoutTests/fast/css/counters/counterValueForElementById.html (revision 116304) >+++ LayoutTests/fast/css/counters/counterValueForElementById.html (working copy) >@@ -14,7 +14,7 @@ > <script src="../../js/resources/js-test-pre.js"></script> > </head> > <body> >- <div>This is the test for layoutTestController.counterValueForElementById</div> >+ <div>This is the test for window.internals.counterValueForElementById</div> > > <div class="reset"><span id="before" class="show-before"></span></div> > <div class="reset"><span id="after" class="show-after"></span></div> >@@ -35,14 +35,14 @@ > if (window.layoutTestController) { > layoutTestController.dumpAsText(); > >- shouldBe("layoutTestController.counterValueForElementById('before')", "'0'"); >- shouldBe("layoutTestController.counterValueForElementById('after')", "'0'"); >- shouldBe("layoutTestController.counterValueForElementById('before_after')", "'0 0'"); >- shouldBe("layoutTestController.counterValueForElementById('twice')", "'0 0'"); >- shouldBe("layoutTestController.counterValueForElementById('point')", "'0.1'"); >- shouldBe("layoutTestController.counterValueForElementById('two-points')", "'0.1.2'"); >- shouldBe("layoutTestController.counterValueForElementById('greek')", "'0.\u03b1.\u03b2'"); >- shouldBe("layoutTestController.counterValueForElementById('three-greeks')", "'0.\u03b1.\u03b2 0.\u03b1.\u03b2 0.\u03b1.\u03b2'"); >+ shouldBe("window.internals.counterValueForElementById('before')", "'0'"); >+ shouldBe("window.internals.counterValueForElementById('after')", "'0'"); >+ shouldBe("window.internals.counterValueForElementById('before_after')", "'0 0'"); >+ shouldBe("window.internals.counterValueForElementById('twice')", "'0 0'"); >+ shouldBe("window.internals.counterValueForElementById('point')", "'0.1'"); >+ shouldBe("window.internals.counterValueForElementById('two-points')", "'0.1.2'"); >+ shouldBe("window.internals.counterValueForElementById('greek')", "'0.\u03b1.\u03b2'"); >+ shouldBe("window.internals.counterValueForElementById('three-greeks')", "'0.\u03b1.\u03b2 0.\u03b1.\u03b2 0.\u03b1.\u03b2'"); > } > </script> > </body> >Index: LayoutTests/fast/css/counters/deep-before-expected.txt >=================================================================== >--- LayoutTests/fast/css/counters/deep-before-expected.txt (revision 116304) >+++ LayoutTests/fast/css/counters/deep-before-expected.txt (working copy) >@@ -1,4 +1,4 @@ >-PASS layoutTestController.counterValueForElementById('div1') is '0' >+PASS window.internals.counterValueForElementById('div1') is '0' > > TEST COMPLETE > >Index: LayoutTests/fast/css/counters/deep-before.html >=================================================================== >--- LayoutTests/fast/css/counters/deep-before.html (revision 116304) >+++ LayoutTests/fast/css/counters/deep-before.html (working copy) >@@ -26,7 +26,7 @@ > { > if (!window.layoutTestController) > return; >- shouldBe("layoutTestController.counterValueForElementById('div1')", "'0'"); >+ shouldBe("window.internals.counterValueForElementById('div1')", "'0'"); > > debug(''); > debug('TEST COMPLETE'); >Index: LayoutTests/fast/css/counters/invalidate-cached-counter-node.html >=================================================================== >--- LayoutTests/fast/css/counters/invalidate-cached-counter-node.html (revision 116304) >+++ LayoutTests/fast/css/counters/invalidate-cached-counter-node.html (working copy) >@@ -22,7 +22,7 @@ > if (window.layoutTestController) { > layoutTestController.dumpAsText(); > var testResult; >- var counterValue = layoutTestController.counterValueForElementById("keep-me"); >+ var counterValue = window.internals.counterValueForElementById("keep-me"); > if (counterValue == "1") > testResult = "PASS"; > else >Index: LayoutTests/fast/css/counters/nesting.html >=================================================================== >--- LayoutTests/fast/css/counters/nesting.html (revision 116304) >+++ LayoutTests/fast/css/counters/nesting.html (working copy) >@@ -29,7 +29,7 @@ > for (i = 0; i < spanList.length; ++i ) { > newSpanElement = document.createElement("span"); > newSpanElement.innerText = >- layoutTestController.counterValueForElementById(spanList.item(i).getAttribute("id")); >+ window.internals.counterValueForElementById(spanList.item(i).getAttribute("id")); > if (newSpanElement.innerText.length) > newSpanElement.innerText = newSpanElement.innerText + "- "; > console.appendChild(newSpanElement);
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=140520">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 84406
:
138458
|
140520
|
146548
|
146804
|
146828
|
146831
|
147005