diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-07-13 15:29:47 (GMT) |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-07-13 15:30:27 (GMT) |
commit | 06af27069497a693f5b1a867b29d96297f68eb75 (patch) | |
tree | 3a707766cef1180152bbcfdd7d71587e70730553 /src/3rdparty/webkit/JavaScriptCore/generated/Grammar.h | |
parent | 650353f402d725688821b83904fe6319c8afa4da (diff) | |
download | Qt-06af27069497a693f5b1a867b29d96297f68eb75.zip Qt-06af27069497a693f5b1a867b29d96297f68eb75.tar.gz Qt-06af27069497a693f5b1a867b29d96297f68eb75.tar.bz2 |
Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.6-staging ( b2abc0c271880b8135507861056af497f895adf5 )
Changes in WebKit since the last update:
++ b/WebKit/qt/ChangeLog
2009-07-13 Simon Hausmann <simon.hausmann@nokia.com>
Reviewed by Ariya Hidayat.
Fix qdoc warnings for QWebPage::shouldInterruptJavaScript() and mention
how to re-implement it.
* Api/qwebpage.cpp:
2009-07-13 Simon Hausmann <hausmann@webkit.org>
Reviewed by Ariya Hidayat.
Fix crash with plugins when the plugin stream is cancelled.
Similar to r26667 handle the case where didReceiveResponse on the
plugin view results in failure to set up the stream and
setMainDocumentError being called instead. This will set the
m_pluginView back to 0 and we need check for it before calling
didReceiveData.
This was triggered by consecutive execution of
LayoutTests/plugins/return-error-from-new-stream-callback-in-full-frame-plugin.html
followed by LayoutTests/scrollbars/scrollbar-crash-on-refresh.html
* WebCoreSupport/FrameLoaderClientQt.cpp:
(WebCore::FrameLoaderClientQt::committedLoad):
2009-07-13 Simon Hausmann <hausmann@webkit.org>
Reviewed by Ariya Hidayat.
Added QWebDatabase::removeAllDatabases, as a way to delete all
databases from the offline storage path.
Used by the Qt DRT.
* Api/qwebdatabase.cpp:
(QWebDatabase::removeAllDatabases):
* Api/qwebdatabase.h:
2009-07-13 Simon Hausmann <hausmann@webkit.org>
Reviewed by Ariya Hidayat.
Added loadStarted() and loadFinished() signals to QWebFrame,
to allow load tracking of individual frames, as opposed to
QWebPage's loadStarted/loadFinished signals that are emitted
whenever _any_ child frame loads/finishes.
* Api/qwebframe.cpp: Document new signals.
* Api/qwebframe.h: Add new signals.
* WebCoreSupport/FrameLoaderClientQt.cpp:
(WebCore::FrameLoaderClientQt::setFrame): Connect new signals.
2009-07-13 Simon Hausmann <hausmann@webkit.org>
Reviewed by Ariya Hidayat.
Add hooks for the GCController JavaScript interface needed by the
Qt DRT.
Fixed sort order of includes in qwebframe.cpp.
* Api/qwebframe.cpp:
(qt_drt_javaScriptObjectsCount):
(qt_drt_garbageCollector_collect):
(qt_drt_garbageCollector_collectOnAlternateThread):
2009-07-13 Simon Hausmann <hausmann@webkit.org>
Reviewed by Ariya Hidayat.
Add hooks for the GCController JavaScript interface needed by the
Qt DRT.
Fixed sort order of includes in qwebframe.cpp.
* Api/qwebframe.cpp:
(qt_drt_javaScriptObjectsCount):
(qt_drt_garbageCollector_collect):
(qt_drt_garbageCollector_collectOnAlternateThread):
2009-07-12 Brent Fulgham <bfulgham@gmail.com>
Speculative build fix after http://trac.webkit.org/changeset/45786.
* WebCoreSupport/ChromeClientQt.cpp:
(WebCore::ChromeClientQt::addMessageToConsole):
* WebCoreSupport/ChromeClientQt.h:
2009-07-10 Yael Aharon <yael.aharon@nokia.com>
Reviewed by Holger Freyther.
https://bugs.webkit.org/show_bug.cgi?id=27136
Fix a bug where webkit hangs when executing infinite JavaScript loop.
* Api/qwebpage.cpp:
(QWebPage::shouldInterruptJavaScript):
* Api/qwebpage.h:
* WebCoreSupport/ChromeClientQt.cpp:
(WebCore::ChromeClientQt::shouldInterruptJavaScript):
* tests/qwebpage/tst_qwebpage.cpp:
(JSTestPage::JSTestPage):
(JSTestPage::shouldInterruptJavaScript):
(tst_QWebPage::infiniteLoopJS):
2009-07-10 Simon Hausmann <simon.hausmann@nokia.com>
Reviewed by Holger Freyther.
https://bugs.webkit.org/show_bug.cgi?id=27108
Fix crash when in frame tree of a new frame before the new frame
has been installed in the frame tree, similar to r35088.
After calling Frame::init() the frame it may have been removed from the
frame tree again through JavaScript. Detect this by checking the page()
afterwards.
To make this check safe the Frame::init() code was moved into
QWebFrameData's constructor, where a RefPtr holds a reference to the frame.
After the check back in FrameLoaderClientQt we would hold the single
reference left and after release() the frame, its frame loader, its
client as well as the QWebFrame should have disappeared then.
* Api/qwebframe.cpp:
(QWebFramePrivate::init): Only call Frame::init here, the rest is
done in QWebFrameData's constructor.
(QWebFrame::QWebFrame):
* Api/qwebframe_p.h: Adjust declaration.
(QWebFrameData::QWebFrameData): Create the Frame here.
* Api/qwebpage.cpp:
(QWebPagePrivate::createMainFrame): Adjust and simplify
to new QWebFrame constructor.
* WebCoreSupport/FrameLoaderClientQt.cpp:
(WebCore::FrameLoaderClientQt::createFrame): Adjust to
new QWebFrame construction using QWebFrameData and add the
check like in r35088.
2009-07-09 Beth Dakin <bdakin@apple.com>
Reviewed by Dave Hyatt.
Make Widget RefCounted to fix:
<rdar://problem/7038831> REGRESSION (TOT): In Mail, a crash occurs
at WebCore::Widget::afterMouseDown() after clicking To Do's close
box
<rdar://problem/6978804> WER #16: Repro Access Violation in
WebCore::PluginView::bindingInstance (1310178023)
-and-
<rdar://problem/6991251> WER #13: Crash in WebKit!
WebCore::PluginView::performRequest+203 (1311461169)
* WebCoreSupport/FrameLoaderClientQt.cpp:
(WebCore::FrameLoaderClientQt::createPlugin):
(WebCore::FrameLoaderClientQt::createJavaAppletWidget):
* WebCoreSupport/FrameLoaderClientQt.h:
2009-07-08 Pradeepto Bhattacharya <pradeepto@kde.org>
Reviewed by Ariya Hidayat.
Build fix.
* WebCoreSupport/FrameLoaderClientQt.h: Removed the slot slotCallPolicyFunction().
2009-07-08 Simon Hausmann <hausmann@webkit.org>
Reviewed by Tor Arne Vestbø.
https://bugs.webkit.org/show_bug.cgi?id=27080
Fix DRT instability issues with fast/loader/submit-form-while-parsing-2.html
When the form is submitted we call the policy function in the frame
loader delayed with a queued connection. That queued connection
sometimes interferes with the javascript timeout set in the testcase.
Eliminate the entire delayed policy function mechanism and instead always
call back directly, like in the other ports. In most other places we called
the slot directly anyway.
* WebCoreSupport/FrameLoaderClientQt.cpp:
(WebCore::FrameLoaderClientQt::FrameLoaderClientQt): Remove m_policyFunction.
(WebCore::FrameLoaderClientQt::callPolicyFunction): Call the policy function directly instead
of emitting the queued signal.
(WebCore::FrameLoaderClientQt::cancelPolicyCheck): Call callPolicyFunction directly.
(WebCore::FrameLoaderClientQt::dispatchWillSubmitForm): Ditto.
(WebCore::FrameLoaderClientQt::dispatchDecidePolicyForMIMEType): Ditto.
(WebCore::FrameLoaderClientQt::dispatchDecidePolicyForNewWindowAction): Ditto.
(WebCore::FrameLoaderClientQt::dispatchDecidePolicyForNavigationAction): Ditto.
* WebCoreSupport/FrameLoaderClientQt.h: Remove m_policyFunction as well as the associated
signal.
2009-07-07 Simon Hausmann <hausmann@webkit.org>
Reviewed by Holger Freyther.
Add Qt DRT hook for clearing the frame name.
* Api/qwebframe.cpp:
(qt_drt_clearFrameName):
2009-07-05 Simon Hausmann <hausmann@webkit.org>
Reviewed by Holger Freyther.
Fix two qdoc warnings.
Added missing \property for QWebFrame::hasFocus and added \a
tag for pos of QWebPage::frameAt.
* Api/qwebframe.cpp:
* Api/qwebpage.cpp:
2009-07-04 Holger Hans Peter Freyther <zecke@selfish.org>
Reviewed by Simon Hausmann.
Use the recently introduced FocusController::setFocused
Use the recently introduced FocusController::setFocused
in the Qt platform. The SelectionController will be updated
from within the FocusController now.
* Api/qwebpage.cpp:
(QWebPagePrivate::focusInEvent):
(QWebPagePrivate::focusOutEvent):
2009-07-02 Simon Hausmann <simon.hausmann@nokia.com>
Reviewed by Ariya Hidayat.
Improve documentation of QWebFrame::setFocus and hasFocus()
Added missing Q_PROPERTY for QWebFrame::hasFocus.
* Api/qwebframe.cpp: Clarify the docs.
* Api/qwebframe.h: add Q_PROPERTY(focus).
2009-07-02 Joe Ligman <joseph.ligman@nokia.com>
Reviewed by Simon Hausmann.
Bug 26855: [Qt] New methods for QWebFrame to check and set focus.
Added new public methods QWebFrame::hasFocus() and QWebFrame::setFocus()
Added auto test.
* Api/qwebframe.cpp:
(QWebFrame::hasFocus):
(QWebFrame::setFocus):
* Api/qwebframe.h:
* tests/qwebframe/tst_qwebframe.cpp:
2009-07-01 Robert Hogan <robert@roberthogan.net>
Reviewed by NOBODY.
Fix Qt segfault when javascript disabled.
If clients call addToJavaScriptWindowObject even though JavascriptEnabled is false
webkit will segfault on the assert:
ASSERTION FAILED: _rootObject
(../../../WebCore/bridge/runtime.cpp:52
JSC::Bindings::Instance::Instance(WTF::PassRefPtr<JSC::Bindings::RootObject>))
Fix is to ensure JavaScript is enabled when client calls addToJavaScriptWindowObject.
https://bugs.webkit.org/show_bug.cgi?id=26906
* Api/qwebframe.cpp:
(QWebFrame::addToJavaScriptWindowObject):
2009-07-01 Jakub Wieczorek <faw217@gmail.com>
Reviewed by Simon Hausmann.
[Qt] Move some API headers from WebCore.pro to headers.pri so that they
get installed when running make install from the build directory.
* Api/headers.pri:
2009-07-01 Balazs Kelemen <kelemen.balazs.3@stud.u-szeged.hu>
Reviewed by Simon Hausmann.
Fixed robotized QtLauncher to work when there is no index.html in the user's home.
* QtLauncher/main.cpp:
(main):
2009-06-30 Brian Weinstein <bweinstein@apple.com>
Reviewed by Adam Roben.
Renamed scrollbarUnderPoint to scrollbarAtPoint to follow conventions.
* Api/qwebpage.cpp:
(QWebPage::swallowContextMenuEvent):
2009-06-30 Joe Ligman <joseph.ligman@nokia.com>
Reviewed by Adam Treat.
Bug 26422: [Qt] QWebPagePrivate::frameAt calculates wrong frame
Added a public method QWebPage::frameAt
Removed QWebPagePrivate::frameAt, which calcuated the wrong frame
Modified QWebPage::swallowContextMenuEvent to use the new frameAt method
New test case for frameAt added to tst_qwebpage.cpp
* Api/qwebpage.cpp:
(QWebPage::frameAt):
(QWebPage::swallowContextMenuEvent):
* Api/qwebpage.h:
* Api/qwebpage_p.h:
* tests/qwebpage/frametest/iframe.html: Added.
* tests/qwebpage/frametest/iframe2.html: Added.
* tests/qwebpage/frametest/iframe3.html: Added.
* tests/qwebpage/tst_qwebpage.cpp:
(frameAtHelper):
(tst_QWebPage::frameAt):
* tests/qwebpage/tst_qwebpage.qrc:
2009-06-30 Jakub Wieczorek <faw217@gmail.com>
Reviewed by Simon Hausmann.
Add QWebFrame::baseUrl() function that exposes the base URL of a frame.
Autotests included.
* Api/qwebframe.cpp:
(QWebFrame::baseUrl):
* Api/qwebframe.h:
* tests/qwebframe/tst_qwebframe.cpp:
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/generated/Grammar.h')
-rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/generated/Grammar.h | 109 |
1 files changed, 25 insertions, 84 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/generated/Grammar.h b/src/3rdparty/webkit/JavaScriptCore/generated/Grammar.h index ebd30c8..c7d3837 100644 --- a/src/3rdparty/webkit/JavaScriptCore/generated/Grammar.h +++ b/src/3rdparty/webkit/JavaScriptCore/generated/Grammar.h @@ -1,24 +1,23 @@ -/* A Bison parser, made by GNU Bison 2.3. */ -/* Skeleton interface for Bison's Yacc-like parsers in C +/* A Bison parser, made by GNU Bison 2.4.1. */ - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +/* Skeleton interface for Bison's Yacc-like parsers in C + + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify + + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + along with this program. If not, see <http://www.gnu.org/licenses/>. */ /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work @@ -29,10 +28,11 @@ special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception. - + This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ + /* Tokens. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE @@ -104,78 +104,16 @@ AUTOMINUSMINUS = 320 }; #endif -/* Tokens. */ -#define NULLTOKEN 258 -#define TRUETOKEN 259 -#define FALSETOKEN 260 -#define BREAK 261 -#define CASE 262 -#define DEFAULT 263 -#define FOR 264 -#define NEW 265 -#define VAR 266 -#define CONSTTOKEN 267 -#define CONTINUE 268 -#define FUNCTION 269 -#define RETURN 270 -#define VOIDTOKEN 271 -#define DELETETOKEN 272 -#define IF 273 -#define THISTOKEN 274 -#define DO 275 -#define WHILE 276 -#define INTOKEN 277 -#define INSTANCEOF 278 -#define TYPEOF 279 -#define SWITCH 280 -#define WITH 281 -#define RESERVED 282 -#define THROW 283 -#define TRY 284 -#define CATCH 285 -#define FINALLY 286 -#define DEBUGGER 287 -#define IF_WITHOUT_ELSE 288 -#define ELSE 289 -#define EQEQ 290 -#define NE 291 -#define STREQ 292 -#define STRNEQ 293 -#define LE 294 -#define GE 295 -#define OR 296 -#define AND 297 -#define PLUSPLUS 298 -#define MINUSMINUS 299 -#define LSHIFT 300 -#define RSHIFT 301 -#define URSHIFT 302 -#define PLUSEQUAL 303 -#define MINUSEQUAL 304 -#define MULTEQUAL 305 -#define DIVEQUAL 306 -#define LSHIFTEQUAL 307 -#define RSHIFTEQUAL 308 -#define URSHIFTEQUAL 309 -#define ANDEQUAL 310 -#define MODEQUAL 311 -#define XOREQUAL 312 -#define OREQUAL 313 -#define OPENBRACE 314 -#define CLOSEBRACE 315 -#define NUMBER 316 -#define IDENT 317 -#define STRING 318 -#define AUTOPLUSPLUS 319 -#define AUTOMINUSMINUS 320 - #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 157 "../parser/Grammar.y" { + +/* Line 1676 of yacc.c */ +#line 157 "../parser/Grammar.y" + int intValue; double doubleValue; Identifier* ident; @@ -205,13 +143,15 @@ typedef union YYSTYPE ParameterListInfo parameterList; Operator op; -} -/* Line 1489 of yacc.c. */ -#line 211 "JavaScriptCore/tmp/../generated/Grammar.tab.h" - YYSTYPE; + + + +/* Line 1676 of yacc.c */ +#line 151 "JavaScriptCore/tmp/../generated/Grammar.tab.h" +} YYSTYPE; +# define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 -# define YYSTYPE_IS_TRIVIAL 1 #endif @@ -230,3 +170,4 @@ typedef struct YYLTYPE #endif + |