From 49233e234e5c787396cadb2cea33b31ae0cd65c1 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 20 Jun 2012 13:01:08 +0200 Subject: Imported WebKit commit 3a8c29f35d00659d2ce7a0ccdfa8304f14e82327 (http://svn.webkit.org/repository/webkit/trunk@120813) New snapshot with Windows build fixes --- Tools/DumpRenderTree/chromium/LayoutTestController.h | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'Tools/DumpRenderTree/chromium/LayoutTestController.h') diff --git a/Tools/DumpRenderTree/chromium/LayoutTestController.h b/Tools/DumpRenderTree/chromium/LayoutTestController.h index 37978657e..5a8729388 100644 --- a/Tools/DumpRenderTree/chromium/LayoutTestController.h +++ b/Tools/DumpRenderTree/chromium/LayoutTestController.h @@ -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*); @@ -374,6 +371,10 @@ public: #if ENABLE(INPUT_SPEECH) void addMockSpeechInputResult(const CppArgumentList&, CppVariant*); void setMockSpeechInputDumpRect(const CppArgumentList&, CppVariant*); +#endif +#if ENABLE(SCRIPTED_SPEECH) + void addMockSpeechRecognitionResult(const CppArgumentList&, CppVariant*); + void setMockSpeechRecognitionError(const CppArgumentList&, CppVariant*); #endif void startSpeechInput(const CppArgumentList&, CppVariant*); @@ -444,6 +445,13 @@ public: // Cause the web intent to be delivered to this context. void deliverWebIntent(const CppArgumentList&, CppVariant*); + // Enables or disables subpixel positioning (i.e. fractional X positions for + // glyphs) in text rendering on Linux. Since this method changes global + // settings, tests that call it must use their own custom font family for + // all text that they render. If not, an already-cached style will be used, + // resulting in the changed setting being ignored. + void setTextSubpixelPositioning(const CppArgumentList&, CppVariant*); + public: // The following methods are not exposed to JavaScript. void setWorkQueueFrozen(bool frozen) { m_workQueue.setFrozen(frozen); } -- cgit v1.2.1