diff options
| author | Alexis Menard <alexis.menard@nokia.com> | 2011-06-02 12:10:40 -0300 |
|---|---|---|
| committer | Alexis Menard <alexis.menard@nokia.com> | 2011-06-02 12:10:40 -0300 |
| commit | 7a72bd5de1539b4346565175f591e3d9e3050044 (patch) | |
| tree | a145faccb2494229eea1824fe8cd92ac89bd0a04 | |
| parent | c3c0bb5fef8452b10bfaf38fe45fb29a606483b2 (diff) | |
Updated WebKit to 7e7119292e94f55a66d391cd183a4dd6ec1a8d65
Reviewed-by: Andreas Kling
82 files changed, 1705 insertions, 4251 deletions
diff --git a/src/3rdparty/webkit/.tag b/src/3rdparty/webkit/.tag index 3103954afe..efffe85f90 100644 --- a/src/3rdparty/webkit/.tag +++ b/src/3rdparty/webkit/.tag @@ -1 +1 @@ -efbf910ad7c49e8cdf81411b4ac0abeea0efd8f8 +7e7119292e94f55a66d391cd183a4dd6ec1a8d65 diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/COPYING.LIB b/src/3rdparty/webkit/Source/JavaScriptCore/COPYING.LIB new file mode 100644 index 0000000000..87c4a33dd8 --- /dev/null +++ b/src/3rdparty/webkit/Source/JavaScriptCore/COPYING.LIB @@ -0,0 +1,488 @@ + + +NOTE! The LGPL below is copyrighted by the Free Software Foundation, but +the instance of code that it refers to (the kde libraries) are copyrighted +by the authors who actually wrote it. + +--------------------------------------------------------------------------- + GNU LIBRARY GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1991 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor + Boston, MA 02110-1301, USA. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the library GPL. It is + numbered 2 because it goes with version 2 of the ordinary GPL.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Library General Public License, applies to some +specially designated Free Software Foundation software, and to any +other libraries whose authors decide to use it. You can use it for +your libraries, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if +you distribute copies of the library, or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link a program with the library, you must provide +complete object files to the recipients so that they can relink them +with the library, after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + Our method of protecting your rights has two steps: (1) copyright +the library, and (2) offer you this license which gives you legal +permission to copy, distribute and/or modify the library. + + Also, for each distributor's protection, we want to make certain +that everyone understands that there is no warranty for this free +library. If the library is modified by someone else and passed on, we +want its recipients to know that what they have is not the original +version, so that any problems introduced by others will not reflect on +the original authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that companies distributing free +software will individually obtain patent licenses, thus in effect +transforming the program into proprietary software. To prevent this, +we have made it clear that any patent must be licensed for everyone's +free use or not licensed at all. + + Most GNU software, including some libraries, is covered by the ordinary +GNU General Public License, which was designed for utility programs. This +license, the GNU Library General Public License, applies to certain +designated libraries. This license is quite different from the ordinary +one; be sure to read it in full, and don't assume that anything in it is +the same as in the ordinary license. + + The reason we have a separate public license for some libraries is that +they blur the distinction we usually make between modifying or adding to a +program and simply using it. Linking a program with a library, without +changing the library, is in some sense simply using the library, and is +analogous to running a utility program or application program. However, in +a textual and legal sense, the linked executable is a combined work, a +derivative of the original library, and the ordinary General Public License +treats it as such. + + Because of this blurred distinction, using the ordinary General +Public License for libraries did not effectively promote software +sharing, because most developers did not use the libraries. We +concluded that weaker conditions might promote sharing better. + + However, unrestricted linking of non-free programs would deprive the +users of those programs of all benefit from the free status of the +libraries themselves. This Library General Public License is intended to +permit developers of non-free programs to use free libraries, while +preserving your freedom as a user of such programs to change the free +libraries that are incorporated in them. (We have not seen how to achieve +this as regards changes in header files, but we have achieved it as regards +changes in the actual functions of the Library.) The hope is that this +will lead to faster development of free libraries. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, while the latter only +works together with the library. + + Note that it is possible for a library to be covered by the ordinary +General Public License rather than by this special one. + + GNU LIBRARY GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library which +contains a notice placed by the copyright holder or other authorized +party saying it may be distributed under the terms of this Library +General Public License (also called "this License"). Each licensee is +addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also compile or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + c) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + d) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the source code distributed need not include anything that is normally +distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Library General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + <one line to give the library's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + <signature of Ty Coon>, 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff --git a/src/3rdparty/webkit/Source/WebCore/ChangeLog b/src/3rdparty/webkit/Source/WebCore/ChangeLog index 55f0c772bb..e3fd8b063e 100644 --- a/src/3rdparty/webkit/Source/WebCore/ChangeLog +++ b/src/3rdparty/webkit/Source/WebCore/ChangeLog @@ -1,3 +1,39 @@ +2011-06-02 Andreas Kling <kling@webkit.org> + + Rubber-stamped by Simon Hausmann. + + Remove Qt's precompiled header hack as it was broken, and was not even + used unless building WebKit inside a Qt tree. + + * WebCore.pri: + +2011-06-01 David Carson <dacarson@apple.com> + + Reviewed by Antti Koivisto. + + https://bugs.webkit.org/show_bug.cgi?id=61831 + If width and height of an iframe is fixed and should not be visible, then + it shouldn't be flattened. + + Test: fast/frames/flattening/iframe-flattening-fixed-width-and-height-zero-size.html + + * rendering/RenderIFrame.cpp: + (WebCore::RenderIFrame::flattenFrame): add a check for a zero width or height + +2011-06-02 Aparna Nandyal <aparna.nand@wipro.com> + + Reviewed by Andreas Kling. + + [Qt] Multiple drop events when doing DnD of images. + https://bugs.webkit.org/show_bug.cgi?id=61504 + + Duplicate entries of the url were getting added into drag data + which is removed. The duplicate entries were causing the same image + url to be copied twice. The code changes now match other webkit ports. + + * platform/qt/ClipboardQt.cpp: + (WebCore::ClipboardQt::declareAndWriteDragImage): + 2011-05-31 Rafael Brandao <rafael.lobo@openbossa.org> Reviewed by Andreas Kling. diff --git a/src/3rdparty/webkit/Source/WebCore/WebCore.pri b/src/3rdparty/webkit/Source/WebCore/WebCore.pri index 51502578e8..ca2e46aed4 100644 --- a/src/3rdparty/webkit/Source/WebCore/WebCore.pri +++ b/src/3rdparty/webkit/Source/WebCore/WebCore.pri @@ -22,8 +22,6 @@ else: WEBCORE_DESTDIR = release CONFIG(standalone_package) { isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/../WebCore/generated - - PRECOMPILED_HEADER = $$PWD/../WebKit/qt/WebKit_pch.h } else { isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$OUTPUT_DIR/WebCore/generated } diff --git a/src/3rdparty/webkit/Source/WebCore/generated/CSSGrammar.cpp b/src/3rdparty/webkit/Source/WebCore/generated/CSSGrammar.cpp index a57ff6b306..fc43fcde0f 100644 --- a/src/3rdparty/webkit/Source/WebCore/generated/CSSGrammar.cpp +++ b/src/3rdparty/webkit/Source/WebCore/generated/CSSGrammar.cpp @@ -1,24 +1,22 @@ -/* A Bison parser, made by GNU Bison 2.3. */ +/* A Bison parser, made by GNU Bison 2.4.3. */ /* Skeleton implementation 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 + + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006, + 2009, 2010 Free Software Foundation, Inc. + + 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,7 +27,7 @@ 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. */ @@ -47,7 +45,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.3" +#define YYBISON_VERSION "2.4.3" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -55,17 +53,109 @@ /* Pure parsers. */ #define YYPURE 1 +/* Push parsers. */ +#define YYPUSH 0 + +/* Pull parsers. */ +#define YYPULL 1 + /* Using locations. */ #define YYLSP_NEEDED 0 /* Substitute the variable and function names. */ -#define yyparse cssyyparse -#define yylex cssyylex -#define yyerror cssyyerror -#define yylval cssyylval -#define yychar cssyychar -#define yydebug cssyydebug -#define yynerrs cssyynerrs +#define yyparse cssyyparse +#define yylex cssyylex +#define yyerror cssyyerror +#define yylval cssyylval +#define yychar cssyychar +#define yydebug cssyydebug +#define yynerrs cssyynerrs + + +/* Copy the first part of user declarations. */ + +/* Line 189 of yacc.c */ +#line 1 "../Source/WebCore/css/CSSGrammar.y" + + +/* + * Copyright (C) 2002-2003 Lars Knoll (knoll@kde.org) + * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. + * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com) + * Copyright (C) 2008 Eric Seidel <eric@webkit.org> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#include "config.h" + +#include "CSSMediaRule.h" +#include "CSSParser.h" +#include "CSSPrimitiveValue.h" +#include "CSSPropertyNames.h" +#include "CSSRuleList.h" +#include "CSSSelector.h" +#include "CSSStyleSheet.h" +#include "Document.h" +#include "HTMLNames.h" +#include "MediaList.h" +#include "MediaQueryExp.h" +#include "WebKitCSSKeyframeRule.h" +#include "WebKitCSSKeyframesRule.h" +#include <wtf/FastMalloc.h> +#include <stdlib.h> +#include <string.h> + +using namespace WebCore; +using namespace HTMLNames; + +#define YYMALLOC fastMalloc +#define YYFREE fastFree + +#define YYENABLE_NLS 0 +#define YYLTYPE_IS_TRIVIAL 1 +#define YYMAXDEPTH 10000 +#define YYDEBUG 0 + +// FIXME: Replace with %parse-param { CSSParser* parser } once we can depend on bison 2.x +#define YYPARSE_PARAM parser +#define YYLEX_PARAM parser + + + +/* Line 189 of yacc.c */ +#line 141 "/Source/WebCore/generated/CSSGrammar.tab.c" + +/* Enabling traces. */ +#ifndef YYDEBUG +# define YYDEBUG 0 +#endif + +/* Enabling verbose error messages. */ +#ifdef YYERROR_VERBOSE +# undef YYERROR_VERBOSE +# define YYERROR_VERBOSE 1 +#else +# define YYERROR_VERBOSE 0 +#endif + +/* Enabling the token table. */ +#ifndef YYTOKEN_TABLE +# define YYTOKEN_TABLE 0 +#endif /* Tokens. */ @@ -156,175 +246,16 @@ UNICODERANGE = 336 }; #endif -/* Tokens. */ -#define TOKEN_EOF 0 -#define LOWEST_PREC 258 -#define UNIMPORTANT_TOK 259 -#define WHITESPACE 260 -#define SGML_CD 261 -#define INCLUDES 262 -#define DASHMATCH 263 -#define BEGINSWITH 264 -#define ENDSWITH 265 -#define CONTAINS 266 -#define STRING 267 -#define IDENT 268 -#define NTH 269 -#define HEX 270 -#define IDSEL 271 -#define IMPORT_SYM 272 -#define PAGE_SYM 273 -#define MEDIA_SYM 274 -#define FONT_FACE_SYM 275 -#define CHARSET_SYM 276 -#define NAMESPACE_SYM 277 -#define WEBKIT_RULE_SYM 278 -#define WEBKIT_DECLS_SYM 279 -#define WEBKIT_KEYFRAME_RULE_SYM 280 -#define WEBKIT_KEYFRAMES_SYM 281 -#define WEBKIT_VALUE_SYM 282 -#define WEBKIT_MEDIAQUERY_SYM 283 -#define WEBKIT_SELECTOR_SYM 284 -#define TOPLEFTCORNER_SYM 285 -#define TOPLEFT_SYM 286 -#define TOPCENTER_SYM 287 -#define TOPRIGHT_SYM 288 -#define TOPRIGHTCORNER_SYM 289 -#define BOTTOMLEFTCORNER_SYM 290 -#define BOTTOMLEFT_SYM 291 -#define BOTTOMCENTER_SYM 292 -#define BOTTOMRIGHT_SYM 293 -#define BOTTOMRIGHTCORNER_SYM 294 -#define LEFTTOP_SYM 295 -#define LEFTMIDDLE_SYM 296 -#define LEFTBOTTOM_SYM 297 -#define RIGHTTOP_SYM 298 -#define RIGHTMIDDLE_SYM 299 -#define RIGHTBOTTOM_SYM 300 -#define ATKEYWORD 301 -#define IMPORTANT_SYM 302 -#define MEDIA_ONLY 303 -#define MEDIA_NOT 304 -#define MEDIA_AND 305 -#define REMS 306 -#define QEMS 307 -#define EMS 308 -#define EXS 309 -#define PXS 310 -#define CMS 311 -#define MMS 312 -#define INS 313 -#define PTS 314 -#define PCS 315 -#define DEGS 316 -#define RADS 317 -#define GRADS 318 -#define TURNS 319 -#define MSECS 320 -#define SECS 321 -#define HERTZ 322 -#define KHERTZ 323 -#define DIMEN 324 -#define INVALIDDIMEN 325 -#define PERCENTAGE 326 -#define FLOATTOKEN 327 -#define INTEGER 328 -#define URI 329 -#define FUNCTION 330 -#define ANYFUNCTION 331 -#define NOTFUNCTION 332 -#define CALCFUNCTION 333 -#define MINFUNCTION 334 -#define MAXFUNCTION 335 -#define UNICODERANGE 336 - - - - -/* Copy the first part of user declarations. */ -#line 1 "../Source/WebCore/css/CSSGrammar.y" -/* - * Copyright (C) 2002-2003 Lars Knoll (knoll@kde.org) - * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. - * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com) - * Copyright (C) 2008 Eric Seidel <eric@webkit.org> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -#include "config.h" - -#include "CSSMediaRule.h" -#include "CSSParser.h" -#include "CSSPrimitiveValue.h" -#include "CSSPropertyNames.h" -#include "CSSRuleList.h" -#include "CSSSelector.h" -#include "CSSStyleSheet.h" -#include "Document.h" -#include "HTMLNames.h" -#include "MediaList.h" -#include "MediaQueryExp.h" -#include "WebKitCSSKeyframeRule.h" -#include "WebKitCSSKeyframesRule.h" -#include <wtf/FastMalloc.h> -#include <stdlib.h> -#include <string.h> - -using namespace WebCore; -using namespace HTMLNames; - -#define YYMALLOC fastMalloc -#define YYFREE fastFree - -#define YYENABLE_NLS 0 -#define YYLTYPE_IS_TRIVIAL 1 -#define YYMAXDEPTH 10000 -#define YYDEBUG 0 - -// FIXME: Replace with %parse-param { CSSParser* parser } once we can depend on bison 2.x -#define YYPARSE_PARAM parser -#define YYLEX_PARAM parser - - - -/* Enabling traces. */ -#ifndef YYDEBUG -# define YYDEBUG 0 -#endif - -/* Enabling verbose error messages. */ -#ifdef YYERROR_VERBOSE -# undef YYERROR_VERBOSE -# define YYERROR_VERBOSE 1 -#else -# define YYERROR_VERBOSE 0 -#endif - -/* Enabling the token table. */ -#ifndef YYTOKEN_TABLE -# define YYTOKEN_TABLE 0 -#endif #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 63 "../Source/WebCore/css/CSSGrammar.y" { + +/* Line 214 of yacc.c */ +#line 63 "../Source/WebCore/css/CSSGrammar.y" + bool boolean; char character; int integer; @@ -347,18 +278,21 @@ typedef union YYSTYPE WebKitCSSKeyframeRule* keyframeRule; WebKitCSSKeyframesRule* keyframesRule; float val; -} -/* Line 193 of yacc.c. */ -#line 353 "/Source/WebCore/generated/CSSGrammar.tab.c" - YYSTYPE; + + + +/* Line 214 of yacc.c */ +#line 286 "/Source/WebCore/generated/CSSGrammar.tab.c" +} YYSTYPE; +# define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 -# define YYSTYPE_IS_TRIVIAL 1 #endif - /* Copy the second part of user declarations. */ + +/* Line 264 of yacc.c */ #line 88 "../Source/WebCore/css/CSSGrammar.y" @@ -374,8 +308,8 @@ static int cssyylex(YYSTYPE* yylval, void* parser) -/* Line 216 of yacc.c. */ -#line 379 "/Source/WebCore/generated/CSSGrammar.tab.c" +/* Line 264 of yacc.c */ +#line 313 "/Source/WebCore/generated/CSSGrammar.tab.c" #ifdef short # undef short @@ -450,14 +384,14 @@ typedef short int yytype_int16; #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) static int -YYID (int i) +YYID (int yyi) #else static int -YYID (i) - int i; +YYID (yyi) + int yyi; #endif { - return i; + return yyi; } #endif @@ -538,9 +472,9 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */ /* A type that is properly aligned for any stack member. */ union yyalloc { - yytype_int16 yyss; - YYSTYPE yyvs; - }; + yytype_int16 yyss_alloc; + YYSTYPE yyvs_alloc; +}; /* The size of the maximum gap between one aligned stack and the next. */ # define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) @@ -574,12 +508,12 @@ union yyalloc elements in the stack, and YYPTR gives the new location of the stack. Advance YYPTR to a properly aligned location for the next stack. */ -# define YYSTACK_RELOCATE(Stack) \ +# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ do \ { \ YYSIZE_T yynewbytes; \ - YYCOPY (&yyptr->Stack, Stack, yysize); \ - Stack = &yyptr->Stack; \ + YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ + Stack = &yyptr->Stack_alloc; \ yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ yyptr += yynewbytes / sizeof (*yyptr); \ } \ @@ -856,7 +790,7 @@ static const char *const yytname[] = "maybe_media_restrictor", "media_query", "maybe_media_list", "media_list", "media", "medium", "keyframes", "keyframe_name", "keyframes_rule", "keyframe_rule", "key_list", "key", "page", - "page_selector", "declarations_and_margins", "margin_box", "@1", + "page_selector", "declarations_and_margins", "margin_box", "$@1", "margin_sym", "font_face", "combinator", "maybe_unary_operator", "unary_operator", "maybe_space_before_declaration", "before_ruleset", "before_rule_opening_brace", "ruleset", "selector_list", @@ -1537,9 +1471,18 @@ static const yytype_uint8 yystos[] = /* Like YYERROR except do call yyerror. This remains here temporarily to ease the transition to the new meaning of YYERROR, for GCC. - Once GCC version 2 has supplanted version 1, this can go. */ + Once GCC version 2 has supplanted version 1, this can go. However, + YYFAIL appears to be in use. Nevertheless, it is formally deprecated + in Bison 2.4.2's NEWS entry, where a plan to phase it out is + discussed. */ #define YYFAIL goto yyerrlab +#if defined YYFAIL + /* This is here to suppress warnings from the GCC cpp's + -Wunused-macros. Normally we don't worry about that warning, but + some users do, and we want to make it easy for users to remove + YYFAIL uses, which will produce warnings from Bison 2.5. */ +#endif #define YYRECOVERING() (!!yyerrstatus) @@ -1707,17 +1650,20 @@ yy_symbol_print (yyoutput, yytype, yyvaluep) #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) static void -yy_stack_print (yytype_int16 *bottom, yytype_int16 *top) +yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop) #else static void -yy_stack_print (bottom, top) - yytype_int16 *bottom; - yytype_int16 *top; +yy_stack_print (yybottom, yytop) + yytype_int16 *yybottom; + yytype_int16 *yytop; #endif { YYFPRINTF (stderr, "Stack now"); - for (; bottom <= top; ++bottom) - YYFPRINTF (stderr, " %d", *bottom); + for (; yybottom <= yytop; yybottom++) + { + int yybot = *yybottom; + YYFPRINTF (stderr, " %d", yybot); + } YYFPRINTF (stderr, "\n"); } @@ -1751,11 +1697,11 @@ yy_reduce_print (yyvsp, yyrule) /* The symbols being reduced. */ for (yyi = 0; yyi < yynrhs; yyi++) { - fprintf (stderr, " $%d = ", yyi + 1); + YYFPRINTF (stderr, " $%d = ", yyi + 1); yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], &(yyvsp[(yyi + 1) - (yynrhs)]) ); - fprintf (stderr, "\n"); + YYFPRINTF (stderr, "\n"); } } @@ -2035,10 +1981,8 @@ yydestruct (yymsg, yytype, yyvaluep) break; } } - /* Prevent warnings from -Wmissing-prototypes. */ - #ifdef YYPARSE_PARAM #if defined __STDC__ || defined __cplusplus int yyparse (void *YYPARSE_PARAM); @@ -2057,10 +2001,9 @@ int yyparse (); - -/*----------. -| yyparse. | -`----------*/ +/*-------------------------. +| yyparse or yypush_parse. | +`-------------------------*/ #ifdef YYPARSE_PARAM #if (defined __STDC__ || defined __C99__FUNC__ \ @@ -2084,74 +2027,75 @@ yyparse () #endif #endif { - /* The look-ahead symbol. */ +/* The lookahead symbol. */ int yychar; -/* The semantic value of the look-ahead symbol. */ +/* The semantic value of the lookahead symbol. */ YYSTYPE yylval; -/* Number of syntax errors so far. */ -int yynerrs; + /* Number of syntax errors so far. */ + int yynerrs; - int yystate; - int yyn; - int yyresult; - /* Number of tokens to shift before error messages enabled. */ - int yyerrstatus; - /* Look-ahead token as an internal (translated) token number. */ - int yytoken = 0; -#if YYERROR_VERBOSE - /* Buffer for error messages, and its allocated size. */ - char yymsgbuf[128]; - char *yymsg = yymsgbuf; - YYSIZE_T yymsg_alloc = sizeof yymsgbuf; -#endif + int yystate; + /* Number of tokens to shift before error messages enabled. */ + int yyerrstatus; - /* Three stacks and their tools: - `yyss': related to states, - `yyvs': related to semantic values, - `yyls': related to locations. + /* The stacks and their tools: + `yyss': related to states. + `yyvs': related to semantic values. - Refer to the stacks thru separate pointers, to allow yyoverflow - to reallocate them elsewhere. */ + Refer to the stacks thru separate pointers, to allow yyoverflow + to reallocate them elsewhere. */ - /* The state stack. */ - yytype_int16 yyssa[YYINITDEPTH]; - yytype_int16 *yyss = yyssa; - yytype_int16 *yyssp; + /* The state stack. */ + yytype_int16 yyssa[YYINITDEPTH]; + yytype_int16 *yyss; + yytype_int16 *yyssp; - /* The semantic value stack. */ - YYSTYPE yyvsa[YYINITDEPTH]; - YYSTYPE *yyvs = yyvsa; - YYSTYPE *yyvsp; - - - -#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) + /* The semantic value stack. */ + YYSTYPE yyvsa[YYINITDEPTH]; + YYSTYPE *yyvs; + YYSTYPE *yyvsp; - YYSIZE_T yystacksize = YYINITDEPTH; + YYSIZE_T yystacksize; + int yyn; + int yyresult; + /* Lookahead token as an internal (translated) token number. */ + int yytoken; /* The variables used to return semantic value and location from the action routines. */ YYSTYPE yyval; +#if YYERROR_VERBOSE + /* Buffer for error messages, and its allocated size. */ + char yymsgbuf[128]; + char *yymsg = yymsgbuf; + YYSIZE_T yymsg_alloc = sizeof yymsgbuf; +#endif + +#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) /* The number of symbols on the RHS of the reduced rule. Keep to zero when no symbol should be popped. */ int yylen = 0; + yytoken = 0; + yyss = yyssa; + yyvs = yyvsa; + yystacksize = YYINITDEPTH; + YYDPRINTF ((stderr, "Starting parse\n")); yystate = 0; yyerrstatus = 0; yynerrs = 0; - yychar = YYEMPTY; /* Cause a token to be read. */ + yychar = YYEMPTY; /* Cause a token to be read. */ /* Initialize stack pointers. Waste one element of value and location stack so that they stay on the same level as the state stack. The wasted elements are never initialized. */ - yyssp = yyss; yyvsp = yyvs; @@ -2181,7 +2125,6 @@ int yynerrs; YYSTYPE *yyvs1 = yyvs; yytype_int16 *yyss1 = yyss; - /* Each stack pointer address is followed by the size of the data in use in that stack, in bytes. This used to be a conditional around just the two extra args, but that might @@ -2189,7 +2132,6 @@ int yynerrs; yyoverflow (YY_("memory exhausted"), &yyss1, yysize * sizeof (*yyssp), &yyvs1, yysize * sizeof (*yyvsp), - &yystacksize); yyss = yyss1; @@ -2212,9 +2154,8 @@ int yynerrs; (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); if (! yyptr) goto yyexhaustedlab; - YYSTACK_RELOCATE (yyss); - YYSTACK_RELOCATE (yyvs); - + YYSTACK_RELOCATE (yyss_alloc, yyss); + YYSTACK_RELOCATE (yyvs_alloc, yyvs); # undef YYSTACK_RELOCATE if (yyss1 != yyssa) YYSTACK_FREE (yyss1); @@ -2225,7 +2166,6 @@ int yynerrs; yyssp = yyss + yysize - 1; yyvsp = yyvs + yysize - 1; - YYDPRINTF ((stderr, "Stack size increased to %lu\n", (unsigned long int) yystacksize)); @@ -2235,6 +2175,9 @@ int yynerrs; YYDPRINTF ((stderr, "Entering state %d\n", yystate)); + if (yystate == YYFINAL) + YYACCEPT; + goto yybackup; /*-----------. @@ -2243,16 +2186,16 @@ int yynerrs; yybackup: /* Do appropriate processing given the current state. Read a - look-ahead token if we need one and don't already have one. */ + lookahead token if we need one and don't already have one. */ - /* First try to decide what to do without reference to look-ahead token. */ + /* First try to decide what to do without reference to lookahead token. */ yyn = yypact[yystate]; if (yyn == YYPACT_NINF) goto yydefault; - /* Not known => get a look-ahead token if don't already have one. */ + /* Not known => get a lookahead token if don't already have one. */ - /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */ + /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ if (yychar == YYEMPTY) { YYDPRINTF ((stderr, "Reading a token: ")); @@ -2284,20 +2227,16 @@ yybackup: goto yyreduce; } - if (yyn == YYFINAL) - YYACCEPT; - /* Count tokens shifted since error; after three, turn off error status. */ if (yyerrstatus) yyerrstatus--; - /* Shift the look-ahead token. */ + /* Shift the lookahead token. */ YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); - /* Discard the shifted token unless it is eof. */ - if (yychar != YYEOF) - yychar = YYEMPTY; + /* Discard the shifted token. */ + yychar = YYEMPTY; yystate = yyn; *++yyvsp = yylval; @@ -2337,6 +2276,8 @@ yyreduce: switch (yyn) { case 9: + +/* Line 1464 of yacc.c */ #line 303 "../Source/WebCore/css/CSSGrammar.y" { static_cast<CSSParser*>(parser)->m_rule = (yyvsp[(4) - (6)].rule); @@ -2344,6 +2285,8 @@ yyreduce: break; case 10: + +/* Line 1464 of yacc.c */ #line 309 "../Source/WebCore/css/CSSGrammar.y" { static_cast<CSSParser*>(parser)->m_keyframe = (yyvsp[(4) - (6)].keyframeRule); @@ -2351,6 +2294,8 @@ yyreduce: break; case 11: + +/* Line 1464 of yacc.c */ #line 315 "../Source/WebCore/css/CSSGrammar.y" { /* can be empty */ @@ -2358,6 +2303,8 @@ yyreduce: break; case 12: + +/* Line 1464 of yacc.c */ #line 321 "../Source/WebCore/css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); @@ -2373,6 +2320,8 @@ yyreduce: break; case 13: + +/* Line 1464 of yacc.c */ #line 335 "../Source/WebCore/css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); @@ -2381,6 +2330,8 @@ yyreduce: break; case 14: + +/* Line 1464 of yacc.c */ #line 342 "../Source/WebCore/css/CSSGrammar.y" { if ((yyvsp[(4) - (5)].selectorList)) { @@ -2392,12 +2343,16 @@ yyreduce: break; case 21: + +/* Line 1464 of yacc.c */ #line 364 "../Source/WebCore/css/CSSGrammar.y" { ;} break; case 24: + +/* Line 1464 of yacc.c */ #line 374 "../Source/WebCore/css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); @@ -2408,18 +2363,24 @@ yyreduce: break; case 25: + +/* Line 1464 of yacc.c */ #line 380 "../Source/WebCore/css/CSSGrammar.y" { ;} break; case 26: + +/* Line 1464 of yacc.c */ #line 382 "../Source/WebCore/css/CSSGrammar.y" { ;} break; case 27: + +/* Line 1464 of yacc.c */ #line 387 "../Source/WebCore/css/CSSGrammar.y" { // Ignore any @charset rule not at the beginning of the style sheet. @@ -2428,6 +2389,8 @@ yyreduce: break; case 29: + +/* Line 1464 of yacc.c */ #line 395 "../Source/WebCore/css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); @@ -2437,6 +2400,8 @@ yyreduce: break; case 30: + +/* Line 1464 of yacc.c */ #line 403 "../Source/WebCore/css/CSSGrammar.y" { (yyval.rule) = (yyvsp[(2) - (2)].rule); @@ -2444,6 +2409,8 @@ yyreduce: break; case 37: + +/* Line 1464 of yacc.c */ #line 415 "../Source/WebCore/css/CSSGrammar.y" { static_cast<CSSParser*>(parser)->m_hadSyntacticallyValidCSSRule = true; @@ -2451,11 +2418,15 @@ yyreduce: break; case 41: + +/* Line 1464 of yacc.c */ #line 424 "../Source/WebCore/css/CSSGrammar.y" { (yyval.ruleList) = 0; ;} break; case 42: + +/* Line 1464 of yacc.c */ #line 425 "../Source/WebCore/css/CSSGrammar.y" { (yyval.ruleList) = (yyvsp[(1) - (3)].ruleList); @@ -2468,6 +2439,8 @@ yyreduce: break; case 53: + +/* Line 1464 of yacc.c */ #line 453 "../Source/WebCore/css/CSSGrammar.y" { (yyval.rule) = static_cast<CSSParser*>(parser)->createImportRule((yyvsp[(3) - (6)].string), (yyvsp[(5) - (6)].mediaList)); @@ -2475,6 +2448,8 @@ yyreduce: break; case 54: + +/* Line 1464 of yacc.c */ #line 456 "../Source/WebCore/css/CSSGrammar.y" { (yyval.rule) = 0; @@ -2482,6 +2457,8 @@ yyreduce: break; case 55: + +/* Line 1464 of yacc.c */ #line 459 "../Source/WebCore/css/CSSGrammar.y" { (yyval.rule) = 0; @@ -2489,6 +2466,8 @@ yyreduce: break; case 56: + +/* Line 1464 of yacc.c */ #line 462 "../Source/WebCore/css/CSSGrammar.y" { (yyval.rule) = 0; @@ -2496,6 +2475,8 @@ yyreduce: break; case 57: + +/* Line 1464 of yacc.c */ #line 468 "../Source/WebCore/css/CSSGrammar.y" { static_cast<CSSParser*>(parser)->addNamespace((yyvsp[(3) - (6)].string), (yyvsp[(4) - (6)].string)); @@ -2504,6 +2485,8 @@ yyreduce: break; case 58: + +/* Line 1464 of yacc.c */ #line 472 "../Source/WebCore/css/CSSGrammar.y" { (yyval.rule) = 0; @@ -2511,6 +2494,8 @@ yyreduce: break; case 59: + +/* Line 1464 of yacc.c */ #line 475 "../Source/WebCore/css/CSSGrammar.y" { (yyval.rule) = 0; @@ -2518,6 +2503,8 @@ yyreduce: break; case 60: + +/* Line 1464 of yacc.c */ #line 478 "../Source/WebCore/css/CSSGrammar.y" { (yyval.rule) = 0; @@ -2525,16 +2512,22 @@ yyreduce: break; case 61: + +/* Line 1464 of yacc.c */ #line 484 "../Source/WebCore/css/CSSGrammar.y" { (yyval.string).characters = 0; ;} break; case 62: + +/* Line 1464 of yacc.c */ #line 485 "../Source/WebCore/css/CSSGrammar.y" { (yyval.string) = (yyvsp[(1) - (2)].string); ;} break; case 65: + +/* Line 1464 of yacc.c */ #line 494 "../Source/WebCore/css/CSSGrammar.y" { (yyval.string) = (yyvsp[(1) - (2)].string); @@ -2542,6 +2535,8 @@ yyreduce: break; case 66: + +/* Line 1464 of yacc.c */ #line 500 "../Source/WebCore/css/CSSGrammar.y" { (yyval.valueList) = 0; @@ -2549,6 +2544,8 @@ yyreduce: break; case 67: + +/* Line 1464 of yacc.c */ #line 503 "../Source/WebCore/css/CSSGrammar.y" { (yyval.valueList) = (yyvsp[(3) - (4)].valueList); @@ -2556,6 +2553,8 @@ yyreduce: break; case 68: + +/* Line 1464 of yacc.c */ #line 509 "../Source/WebCore/css/CSSGrammar.y" { (yyvsp[(3) - (7)].string).lower(); @@ -2564,6 +2563,8 @@ yyreduce: break; case 69: + +/* Line 1464 of yacc.c */ #line 516 "../Source/WebCore/css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); @@ -2573,6 +2574,8 @@ yyreduce: break; case 70: + +/* Line 1464 of yacc.c */ #line 521 "../Source/WebCore/css/CSSGrammar.y" { (yyval.mediaQueryExpList) = (yyvsp[(1) - (5)].mediaQueryExpList); @@ -2581,6 +2584,8 @@ yyreduce: break; case 71: + +/* Line 1464 of yacc.c */ #line 528 "../Source/WebCore/css/CSSGrammar.y" { (yyval.mediaQueryExpList) = static_cast<CSSParser*>(parser)->createFloatingMediaQueryExpList(); @@ -2588,6 +2593,8 @@ yyreduce: break; case 72: + +/* Line 1464 of yacc.c */ #line 531 "../Source/WebCore/css/CSSGrammar.y" { (yyval.mediaQueryExpList) = (yyvsp[(3) - (3)].mediaQueryExpList); @@ -2595,6 +2602,8 @@ yyreduce: break; case 73: + +/* Line 1464 of yacc.c */ #line 537 "../Source/WebCore/css/CSSGrammar.y" { (yyval.mediaQueryRestrictor) = MediaQuery::None; @@ -2602,6 +2611,8 @@ yyreduce: break; case 74: + +/* Line 1464 of yacc.c */ #line 540 "../Source/WebCore/css/CSSGrammar.y" { (yyval.mediaQueryRestrictor) = MediaQuery::Only; @@ -2609,6 +2620,8 @@ yyreduce: break; case 75: + +/* Line 1464 of yacc.c */ #line 543 "../Source/WebCore/css/CSSGrammar.y" { (yyval.mediaQueryRestrictor) = MediaQuery::Not; @@ -2616,6 +2629,8 @@ yyreduce: break; case 76: + +/* Line 1464 of yacc.c */ #line 549 "../Source/WebCore/css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); @@ -2624,6 +2639,8 @@ yyreduce: break; case 77: + +/* Line 1464 of yacc.c */ #line 554 "../Source/WebCore/css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); @@ -2633,6 +2650,8 @@ yyreduce: break; case 78: + +/* Line 1464 of yacc.c */ #line 562 "../Source/WebCore/css/CSSGrammar.y" { (yyval.mediaList) = static_cast<CSSParser*>(parser)->createMediaList(); @@ -2640,6 +2659,8 @@ yyreduce: break; case 80: + +/* Line 1464 of yacc.c */ #line 569 "../Source/WebCore/css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); @@ -2649,6 +2670,8 @@ yyreduce: break; case 81: + +/* Line 1464 of yacc.c */ #line 574 "../Source/WebCore/css/CSSGrammar.y" { (yyval.mediaList) = (yyvsp[(1) - (4)].mediaList); @@ -2658,6 +2681,8 @@ yyreduce: break; case 82: + +/* Line 1464 of yacc.c */ #line 579 "../Source/WebCore/css/CSSGrammar.y" { (yyval.mediaList) = 0; @@ -2665,6 +2690,8 @@ yyreduce: break; case 83: + +/* Line 1464 of yacc.c */ #line 585 "../Source/WebCore/css/CSSGrammar.y" { (yyval.rule) = static_cast<CSSParser*>(parser)->createMediaRule((yyvsp[(3) - (7)].mediaList), (yyvsp[(6) - (7)].ruleList)); @@ -2672,6 +2699,8 @@ yyreduce: break; case 84: + +/* Line 1464 of yacc.c */ #line 588 "../Source/WebCore/css/CSSGrammar.y" { (yyval.rule) = static_cast<CSSParser*>(parser)->createMediaRule(0, (yyvsp[(5) - (6)].ruleList)); @@ -2679,6 +2708,8 @@ yyreduce: break; case 85: + +/* Line 1464 of yacc.c */ #line 594 "../Source/WebCore/css/CSSGrammar.y" { (yyval.string) = (yyvsp[(1) - (2)].string); @@ -2686,6 +2717,8 @@ yyreduce: break; case 86: + +/* Line 1464 of yacc.c */ #line 600 "../Source/WebCore/css/CSSGrammar.y" { (yyval.rule) = (yyvsp[(7) - (8)].keyframesRule); @@ -2694,11 +2727,15 @@ yyreduce: break; case 89: + +/* Line 1464 of yacc.c */ #line 612 "../Source/WebCore/css/CSSGrammar.y" { (yyval.keyframesRule) = static_cast<CSSParser*>(parser)->createKeyframesRule(); ;} break; case 90: + +/* Line 1464 of yacc.c */ #line 613 "../Source/WebCore/css/CSSGrammar.y" { (yyval.keyframesRule) = (yyvsp[(1) - (3)].keyframesRule); @@ -2708,6 +2745,8 @@ yyreduce: break; case 91: + +/* Line 1464 of yacc.c */ #line 621 "../Source/WebCore/css/CSSGrammar.y" { (yyval.keyframeRule) = static_cast<CSSParser*>(parser)->createKeyframeRule((yyvsp[(1) - (6)].valueList)); @@ -2715,6 +2754,8 @@ yyreduce: break; case 92: + +/* Line 1464 of yacc.c */ #line 627 "../Source/WebCore/css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); @@ -2724,6 +2765,8 @@ yyreduce: break; case 93: + +/* Line 1464 of yacc.c */ #line 632 "../Source/WebCore/css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); @@ -2734,11 +2777,15 @@ yyreduce: break; case 94: + +/* Line 1464 of yacc.c */ #line 641 "../Source/WebCore/css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).isInt = false; (yyval.value).fValue = (yyvsp[(1) - (1)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_NUMBER; ;} break; case 95: + +/* Line 1464 of yacc.c */ #line 642 "../Source/WebCore/css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).isInt = false; (yyval.value).unit = CSSPrimitiveValue::CSS_NUMBER; @@ -2753,6 +2800,8 @@ yyreduce: break; case 96: + +/* Line 1464 of yacc.c */ #line 656 "../Source/WebCore/css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); @@ -2768,6 +2817,8 @@ yyreduce: break; case 97: + +/* Line 1464 of yacc.c */ #line 667 "../Source/WebCore/css/CSSGrammar.y" { (yyval.rule) = 0; @@ -2775,6 +2826,8 @@ yyreduce: break; case 98: + +/* Line 1464 of yacc.c */ #line 670 "../Source/WebCore/css/CSSGrammar.y" { (yyval.rule) = 0; @@ -2782,6 +2835,8 @@ yyreduce: break; case 99: + +/* Line 1464 of yacc.c */ #line 676 "../Source/WebCore/css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); @@ -2792,6 +2847,8 @@ yyreduce: break; case 100: + +/* Line 1464 of yacc.c */ #line 682 "../Source/WebCore/css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); @@ -2804,6 +2861,8 @@ yyreduce: break; case 101: + +/* Line 1464 of yacc.c */ #line 690 "../Source/WebCore/css/CSSGrammar.y" { (yyval.selector) = (yyvsp[(1) - (1)].selector); @@ -2813,6 +2872,8 @@ yyreduce: break; case 102: + +/* Line 1464 of yacc.c */ #line 695 "../Source/WebCore/css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); @@ -2822,6 +2883,8 @@ yyreduce: break; case 105: + +/* Line 1464 of yacc.c */ #line 708 "../Source/WebCore/css/CSSGrammar.y" { static_cast<CSSParser*>(parser)->startDeclarationsForMarginBox(); @@ -2829,6 +2892,8 @@ yyreduce: break; case 106: + +/* Line 1464 of yacc.c */ #line 710 "../Source/WebCore/css/CSSGrammar.y" { (yyval.rule) = static_cast<CSSParser*>(parser)->createMarginAtRule((yyvsp[(1) - (7)].marginBox)); @@ -2836,6 +2901,8 @@ yyreduce: break; case 107: + +/* Line 1464 of yacc.c */ #line 716 "../Source/WebCore/css/CSSGrammar.y" { (yyval.marginBox) = CSSSelector::TopLeftCornerMarginBox; @@ -2843,6 +2910,8 @@ yyreduce: break; case 108: + +/* Line 1464 of yacc.c */ #line 719 "../Source/WebCore/css/CSSGrammar.y" { (yyval.marginBox) = CSSSelector::TopLeftMarginBox; @@ -2850,6 +2919,8 @@ yyreduce: break; case 109: + +/* Line 1464 of yacc.c */ #line 722 "../Source/WebCore/css/CSSGrammar.y" { (yyval.marginBox) = CSSSelector::TopCenterMarginBox; @@ -2857,6 +2928,8 @@ yyreduce: break; case 110: + +/* Line 1464 of yacc.c */ #line 725 "../Source/WebCore/css/CSSGrammar.y" { (yyval.marginBox) = CSSSelector::TopRightMarginBox; @@ -2864,6 +2937,8 @@ yyreduce: break; case 111: + +/* Line 1464 of yacc.c */ #line 728 "../Source/WebCore/css/CSSGrammar.y" { (yyval.marginBox) = CSSSelector::TopRightCornerMarginBox; @@ -2871,6 +2946,8 @@ yyreduce: break; case 112: + +/* Line 1464 of yacc.c */ #line 731 "../Source/WebCore/css/CSSGrammar.y" { (yyval.marginBox) = CSSSelector::BottomLeftCornerMarginBox; @@ -2878,6 +2955,8 @@ yyreduce: break; case 113: + +/* Line 1464 of yacc.c */ #line 734 "../Source/WebCore/css/CSSGrammar.y" { (yyval.marginBox) = CSSSelector::BottomLeftMarginBox; @@ -2885,6 +2964,8 @@ yyreduce: break; case 114: + +/* Line 1464 of yacc.c */ #line 737 "../Source/WebCore/css/CSSGrammar.y" { (yyval.marginBox) = CSSSelector::BottomCenterMarginBox; @@ -2892,6 +2973,8 @@ yyreduce: break; case 115: + +/* Line 1464 of yacc.c */ #line 740 "../Source/WebCore/css/CSSGrammar.y" { (yyval.marginBox) = CSSSelector::BottomRightMarginBox; @@ -2899,6 +2982,8 @@ yyreduce: break; case 116: + +/* Line 1464 of yacc.c */ #line 743 "../Source/WebCore/css/CSSGrammar.y" { (yyval.marginBox) = CSSSelector::BottomRightCornerMarginBox; @@ -2906,6 +2991,8 @@ yyreduce: break; case 117: + +/* Line 1464 of yacc.c */ #line 746 "../Source/WebCore/css/CSSGrammar.y" { (yyval.marginBox) = CSSSelector::LeftTopMarginBox; @@ -2913,6 +3000,8 @@ yyreduce: break; case 118: + +/* Line 1464 of yacc.c */ #line 749 "../Source/WebCore/css/CSSGrammar.y" { (yyval.marginBox) = CSSSelector::LeftMiddleMarginBox; @@ -2920,6 +3009,8 @@ yyreduce: break; case 119: + +/* Line 1464 of yacc.c */ #line 752 "../Source/WebCore/css/CSSGrammar.y" { (yyval.marginBox) = CSSSelector::LeftBottomMarginBox; @@ -2927,6 +3018,8 @@ yyreduce: break; case 120: + +/* Line 1464 of yacc.c */ #line 755 "../Source/WebCore/css/CSSGrammar.y" { (yyval.marginBox) = CSSSelector::RightTopMarginBox; @@ -2934,6 +3027,8 @@ yyreduce: break; case 121: + +/* Line 1464 of yacc.c */ #line 758 "../Source/WebCore/css/CSSGrammar.y" { (yyval.marginBox) = CSSSelector::RightMiddleMarginBox; @@ -2941,6 +3036,8 @@ yyreduce: break; case 122: + +/* Line 1464 of yacc.c */ #line 761 "../Source/WebCore/css/CSSGrammar.y" { (yyval.marginBox) = CSSSelector::RightBottomMarginBox; @@ -2948,6 +3045,8 @@ yyreduce: break; case 123: + +/* Line 1464 of yacc.c */ #line 768 "../Source/WebCore/css/CSSGrammar.y" { (yyval.rule) = static_cast<CSSParser*>(parser)->createFontFaceRule(); @@ -2955,6 +3054,8 @@ yyreduce: break; case 124: + +/* Line 1464 of yacc.c */ #line 771 "../Source/WebCore/css/CSSGrammar.y" { (yyval.rule) = 0; @@ -2962,6 +3063,8 @@ yyreduce: break; case 125: + +/* Line 1464 of yacc.c */ #line 774 "../Source/WebCore/css/CSSGrammar.y" { (yyval.rule) = 0; @@ -2969,41 +3072,57 @@ yyreduce: break; case 126: + +/* Line 1464 of yacc.c */ #line 780 "../Source/WebCore/css/CSSGrammar.y" { (yyval.relation) = CSSSelector::DirectAdjacent; ;} break; case 127: + +/* Line 1464 of yacc.c */ #line 781 "../Source/WebCore/css/CSSGrammar.y" { (yyval.relation) = CSSSelector::IndirectAdjacent; ;} break; case 128: + +/* Line 1464 of yacc.c */ #line 782 "../Source/WebCore/css/CSSGrammar.y" { (yyval.relation) = CSSSelector::Child; ;} break; case 129: + +/* Line 1464 of yacc.c */ #line 786 "../Source/WebCore/css/CSSGrammar.y" { (yyval.integer) = (yyvsp[(1) - (1)].integer); ;} break; case 130: + +/* Line 1464 of yacc.c */ #line 787 "../Source/WebCore/css/CSSGrammar.y" { (yyval.integer) = 1; ;} break; case 131: + +/* Line 1464 of yacc.c */ #line 791 "../Source/WebCore/css/CSSGrammar.y" { (yyval.integer) = -1; ;} break; case 132: + +/* Line 1464 of yacc.c */ #line 792 "../Source/WebCore/css/CSSGrammar.y" { (yyval.integer) = 1; ;} break; case 133: + +/* Line 1464 of yacc.c */ #line 796 "../Source/WebCore/css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); @@ -3012,6 +3131,8 @@ yyreduce: break; case 134: + +/* Line 1464 of yacc.c */ #line 803 "../Source/WebCore/css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); @@ -3020,6 +3141,8 @@ yyreduce: break; case 135: + +/* Line 1464 of yacc.c */ #line 810 "../Source/WebCore/css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); @@ -3028,6 +3151,8 @@ yyreduce: break; case 136: + +/* Line 1464 of yacc.c */ #line 817 "../Source/WebCore/css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); @@ -3036,6 +3161,8 @@ yyreduce: break; case 137: + +/* Line 1464 of yacc.c */ #line 824 "../Source/WebCore/css/CSSGrammar.y" { if ((yyvsp[(1) - (1)].selector)) { @@ -3049,6 +3176,8 @@ yyreduce: break; case 138: + +/* Line 1464 of yacc.c */ #line 833 "../Source/WebCore/css/CSSGrammar.y" { if ((yyvsp[(1) - (4)].selectorList) && (yyvsp[(4) - (4)].selector)) { @@ -3062,6 +3191,8 @@ yyreduce: break; case 139: + +/* Line 1464 of yacc.c */ #line 842 "../Source/WebCore/css/CSSGrammar.y" { (yyval.selectorList) = 0; @@ -3069,6 +3200,8 @@ yyreduce: break; case 140: + +/* Line 1464 of yacc.c */ #line 848 "../Source/WebCore/css/CSSGrammar.y" { (yyval.selector) = (yyvsp[(1) - (2)].selector); @@ -3076,6 +3209,8 @@ yyreduce: break; case 141: + +/* Line 1464 of yacc.c */ #line 854 "../Source/WebCore/css/CSSGrammar.y" { (yyval.selector) = (yyvsp[(1) - (1)].selector); @@ -3083,6 +3218,8 @@ yyreduce: break; case 142: + +/* Line 1464 of yacc.c */ #line 858 "../Source/WebCore/css/CSSGrammar.y" { (yyval.selector) = (yyvsp[(1) - (1)].selector); @@ -3090,6 +3227,8 @@ yyreduce: break; case 143: + +/* Line 1464 of yacc.c */ #line 862 "../Source/WebCore/css/CSSGrammar.y" { (yyval.selector) = (yyvsp[(2) - (2)].selector); @@ -3107,6 +3246,8 @@ yyreduce: break; case 144: + +/* Line 1464 of yacc.c */ #line 875 "../Source/WebCore/css/CSSGrammar.y" { (yyval.selector) = (yyvsp[(3) - (3)].selector); @@ -3124,6 +3265,8 @@ yyreduce: break; case 145: + +/* Line 1464 of yacc.c */ #line 888 "../Source/WebCore/css/CSSGrammar.y" { (yyval.selector) = 0; @@ -3131,21 +3274,29 @@ yyreduce: break; case 146: + +/* Line 1464 of yacc.c */ #line 894 "../Source/WebCore/css/CSSGrammar.y" { (yyval.string).characters = 0; (yyval.string).length = 0; ;} break; case 147: + +/* Line 1464 of yacc.c */ #line 895 "../Source/WebCore/css/CSSGrammar.y" { static UChar star = '*'; (yyval.string).characters = ☆ (yyval.string).length = 1; ;} break; case 148: + +/* Line 1464 of yacc.c */ #line 896 "../Source/WebCore/css/CSSGrammar.y" { (yyval.string) = (yyvsp[(1) - (2)].string); ;} break; case 149: + +/* Line 1464 of yacc.c */ #line 900 "../Source/WebCore/css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); @@ -3155,6 +3306,8 @@ yyreduce: break; case 150: + +/* Line 1464 of yacc.c */ #line 905 "../Source/WebCore/css/CSSGrammar.y" { (yyval.selector) = (yyvsp[(2) - (2)].selector); @@ -3164,6 +3317,8 @@ yyreduce: break; case 151: + +/* Line 1464 of yacc.c */ #line 910 "../Source/WebCore/css/CSSGrammar.y" { (yyval.selector) = (yyvsp[(1) - (1)].selector); @@ -3173,6 +3328,8 @@ yyreduce: break; case 152: + +/* Line 1464 of yacc.c */ #line 915 "../Source/WebCore/css/CSSGrammar.y" { AtomicString namespacePrefix = (yyvsp[(1) - (2)].string); @@ -3187,6 +3344,8 @@ yyreduce: break; case 153: + +/* Line 1464 of yacc.c */ #line 925 "../Source/WebCore/css/CSSGrammar.y" { (yyval.selector) = (yyvsp[(3) - (3)].selector); @@ -3196,6 +3355,8 @@ yyreduce: break; case 154: + +/* Line 1464 of yacc.c */ #line 930 "../Source/WebCore/css/CSSGrammar.y" { (yyval.selector) = (yyvsp[(2) - (2)].selector); @@ -3205,6 +3366,8 @@ yyreduce: break; case 155: + +/* Line 1464 of yacc.c */ #line 938 "../Source/WebCore/css/CSSGrammar.y" { if ((yyvsp[(1) - (1)].selector)) { @@ -3217,6 +3380,8 @@ yyreduce: break; case 156: + +/* Line 1464 of yacc.c */ #line 946 "../Source/WebCore/css/CSSGrammar.y" { if ((yyvsp[(1) - (5)].selectorList) && (yyvsp[(5) - (5)].selector)) { @@ -3229,6 +3394,8 @@ yyreduce: break; case 157: + +/* Line 1464 of yacc.c */ #line 954 "../Source/WebCore/css/CSSGrammar.y" { (yyval.selectorList) = 0; @@ -3236,6 +3403,8 @@ yyreduce: break; case 158: + +/* Line 1464 of yacc.c */ #line 960 "../Source/WebCore/css/CSSGrammar.y" { CSSParserString& str = (yyvsp[(1) - (1)].string); @@ -3248,6 +3417,8 @@ yyreduce: break; case 159: + +/* Line 1464 of yacc.c */ #line 968 "../Source/WebCore/css/CSSGrammar.y" { static UChar star = '*'; @@ -3257,6 +3428,8 @@ yyreduce: break; case 160: + +/* Line 1464 of yacc.c */ #line 976 "../Source/WebCore/css/CSSGrammar.y" { (yyval.selector) = (yyvsp[(1) - (1)].selector); @@ -3264,6 +3437,8 @@ yyreduce: break; case 161: + +/* Line 1464 of yacc.c */ #line 979 "../Source/WebCore/css/CSSGrammar.y" { if (!(yyvsp[(2) - (2)].selector)) @@ -3274,6 +3449,8 @@ yyreduce: break; case 162: + +/* Line 1464 of yacc.c */ #line 985 "../Source/WebCore/css/CSSGrammar.y" { (yyval.selector) = 0; @@ -3281,6 +3458,8 @@ yyreduce: break; case 163: + +/* Line 1464 of yacc.c */ #line 991 "../Source/WebCore/css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); @@ -3293,6 +3472,8 @@ yyreduce: break; case 164: + +/* Line 1464 of yacc.c */ #line 999 "../Source/WebCore/css/CSSGrammar.y" { if ((yyvsp[(1) - (1)].string).characters[0] >= '0' && (yyvsp[(1) - (1)].string).characters[0] <= '9') { @@ -3309,6 +3490,8 @@ yyreduce: break; case 168: + +/* Line 1464 of yacc.c */ #line 1017 "../Source/WebCore/css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); @@ -3321,6 +3504,8 @@ yyreduce: break; case 169: + +/* Line 1464 of yacc.c */ #line 1028 "../Source/WebCore/css/CSSGrammar.y" { CSSParserString& str = (yyvsp[(1) - (2)].string); @@ -3333,6 +3518,8 @@ yyreduce: break; case 170: + +/* Line 1464 of yacc.c */ #line 1039 "../Source/WebCore/css/CSSGrammar.y" { (yyval.selector) = static_cast<CSSParser*>(parser)->createFloatingSelector(); @@ -3342,6 +3529,8 @@ yyreduce: break; case 171: + +/* Line 1464 of yacc.c */ #line 1044 "../Source/WebCore/css/CSSGrammar.y" { (yyval.selector) = static_cast<CSSParser*>(parser)->createFloatingSelector(); @@ -3352,6 +3541,8 @@ yyreduce: break; case 172: + +/* Line 1464 of yacc.c */ #line 1050 "../Source/WebCore/css/CSSGrammar.y" { AtomicString namespacePrefix = (yyvsp[(3) - (5)].string); @@ -3364,6 +3555,8 @@ yyreduce: break; case 173: + +/* Line 1464 of yacc.c */ #line 1058 "../Source/WebCore/css/CSSGrammar.y" { AtomicString namespacePrefix = (yyvsp[(3) - (9)].string); @@ -3377,6 +3570,8 @@ yyreduce: break; case 174: + +/* Line 1464 of yacc.c */ #line 1070 "../Source/WebCore/css/CSSGrammar.y" { (yyval.integer) = CSSSelector::Exact; @@ -3384,6 +3579,8 @@ yyreduce: break; case 175: + +/* Line 1464 of yacc.c */ #line 1073 "../Source/WebCore/css/CSSGrammar.y" { (yyval.integer) = CSSSelector::List; @@ -3391,6 +3588,8 @@ yyreduce: break; case 176: + +/* Line 1464 of yacc.c */ #line 1076 "../Source/WebCore/css/CSSGrammar.y" { (yyval.integer) = CSSSelector::Hyphen; @@ -3398,6 +3597,8 @@ yyreduce: break; case 177: + +/* Line 1464 of yacc.c */ #line 1079 "../Source/WebCore/css/CSSGrammar.y" { (yyval.integer) = CSSSelector::Begin; @@ -3405,6 +3606,8 @@ yyreduce: break; case 178: + +/* Line 1464 of yacc.c */ #line 1082 "../Source/WebCore/css/CSSGrammar.y" { (yyval.integer) = CSSSelector::End; @@ -3412,6 +3615,8 @@ yyreduce: break; case 179: + +/* Line 1464 of yacc.c */ #line 1085 "../Source/WebCore/css/CSSGrammar.y" { (yyval.integer) = CSSSelector::Contain; @@ -3419,6 +3624,8 @@ yyreduce: break; case 182: + +/* Line 1464 of yacc.c */ #line 1096 "../Source/WebCore/css/CSSGrammar.y" { (yyval.selector) = static_cast<CSSParser*>(parser)->createFloatingSelector(); @@ -3432,6 +3639,8 @@ yyreduce: break; case 183: + +/* Line 1464 of yacc.c */ #line 1107 "../Source/WebCore/css/CSSGrammar.y" { (yyval.selector) = static_cast<CSSParser*>(parser)->createFloatingSelector(); @@ -3445,6 +3654,8 @@ yyreduce: break; case 184: + +/* Line 1464 of yacc.c */ #line 1116 "../Source/WebCore/css/CSSGrammar.y" { (yyval.selector) = static_cast<CSSParser*>(parser)->createFloatingSelector(); @@ -3457,6 +3668,8 @@ yyreduce: break; case 185: + +/* Line 1464 of yacc.c */ #line 1129 "../Source/WebCore/css/CSSGrammar.y" { if ((yyvsp[(4) - (6)].selectorList)) { @@ -3475,6 +3688,8 @@ yyreduce: break; case 186: + +/* Line 1464 of yacc.c */ #line 1144 "../Source/WebCore/css/CSSGrammar.y" { CSSParser *p = static_cast<CSSParser*>(parser); @@ -3489,6 +3704,8 @@ yyreduce: break; case 187: + +/* Line 1464 of yacc.c */ #line 1155 "../Source/WebCore/css/CSSGrammar.y" { CSSParser *p = static_cast<CSSParser*>(parser); @@ -3503,6 +3720,8 @@ yyreduce: break; case 188: + +/* Line 1464 of yacc.c */ #line 1166 "../Source/WebCore/css/CSSGrammar.y" { CSSParser *p = static_cast<CSSParser*>(parser); @@ -3525,6 +3744,8 @@ yyreduce: break; case 189: + +/* Line 1464 of yacc.c */ #line 1185 "../Source/WebCore/css/CSSGrammar.y" { if (!(yyvsp[(4) - (6)].selector) || !(yyvsp[(4) - (6)].selector)->isSimple()) @@ -3545,6 +3766,8 @@ yyreduce: break; case 190: + +/* Line 1464 of yacc.c */ #line 1204 "../Source/WebCore/css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (1)].boolean); @@ -3552,6 +3775,8 @@ yyreduce: break; case 191: + +/* Line 1464 of yacc.c */ #line 1207 "../Source/WebCore/css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (2)].boolean); @@ -3561,6 +3786,8 @@ yyreduce: break; case 192: + +/* Line 1464 of yacc.c */ #line 1212 "../Source/WebCore/css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (1)].boolean); @@ -3568,6 +3795,8 @@ yyreduce: break; case 193: + +/* Line 1464 of yacc.c */ #line 1215 "../Source/WebCore/css/CSSGrammar.y" { (yyval.boolean) = false; @@ -3575,6 +3804,8 @@ yyreduce: break; case 194: + +/* Line 1464 of yacc.c */ #line 1218 "../Source/WebCore/css/CSSGrammar.y" { (yyval.boolean) = false; @@ -3582,6 +3813,8 @@ yyreduce: break; case 195: + +/* Line 1464 of yacc.c */ #line 1221 "../Source/WebCore/css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (2)].boolean); @@ -3589,6 +3822,8 @@ yyreduce: break; case 196: + +/* Line 1464 of yacc.c */ #line 1224 "../Source/WebCore/css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (2)].boolean); @@ -3596,6 +3831,8 @@ yyreduce: break; case 197: + +/* Line 1464 of yacc.c */ #line 1230 "../Source/WebCore/css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); @@ -3605,6 +3842,8 @@ yyreduce: break; case 198: + +/* Line 1464 of yacc.c */ #line 1235 "../Source/WebCore/css/CSSGrammar.y" { (yyval.boolean) = false; @@ -3612,6 +3851,8 @@ yyreduce: break; case 199: + +/* Line 1464 of yacc.c */ #line 1238 "../Source/WebCore/css/CSSGrammar.y" { (yyval.boolean) = false; @@ -3619,6 +3860,8 @@ yyreduce: break; case 200: + +/* Line 1464 of yacc.c */ #line 1241 "../Source/WebCore/css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); @@ -3628,6 +3871,8 @@ yyreduce: break; case 201: + +/* Line 1464 of yacc.c */ #line 1246 "../Source/WebCore/css/CSSGrammar.y" { (yyval.boolean) = false; @@ -3635,6 +3880,8 @@ yyreduce: break; case 202: + +/* Line 1464 of yacc.c */ #line 1249 "../Source/WebCore/css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); @@ -3646,6 +3893,8 @@ yyreduce: break; case 203: + +/* Line 1464 of yacc.c */ #line 1256 "../Source/WebCore/css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); @@ -3655,6 +3904,8 @@ yyreduce: break; case 204: + +/* Line 1464 of yacc.c */ #line 1261 "../Source/WebCore/css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); @@ -3664,6 +3915,8 @@ yyreduce: break; case 205: + +/* Line 1464 of yacc.c */ #line 1269 "../Source/WebCore/css/CSSGrammar.y" { (yyval.boolean) = false; @@ -3685,6 +3938,8 @@ yyreduce: break; case 206: + +/* Line 1464 of yacc.c */ #line 1287 "../Source/WebCore/css/CSSGrammar.y" { (yyval.boolean) = false; @@ -3692,6 +3947,8 @@ yyreduce: break; case 207: + +/* Line 1464 of yacc.c */ #line 1291 "../Source/WebCore/css/CSSGrammar.y" { /* The default movable type template has letter-spacing: .none; Handle this by looking for @@ -3704,6 +3961,8 @@ yyreduce: break; case 208: + +/* Line 1464 of yacc.c */ #line 1300 "../Source/WebCore/css/CSSGrammar.y" { /* When we encounter something like p {color: red !important fail;} we should drop the declaration */ @@ -3714,6 +3973,8 @@ yyreduce: break; case 209: + +/* Line 1464 of yacc.c */ #line 1307 "../Source/WebCore/css/CSSGrammar.y" { /* Handle this case: div { text-align: center; !important } Just reduce away the stray !important. */ @@ -3722,6 +3983,8 @@ yyreduce: break; case 210: + +/* Line 1464 of yacc.c */ #line 1312 "../Source/WebCore/css/CSSGrammar.y" { /* div { font-family: } Just reduce away this property with no value. */ @@ -3732,6 +3995,8 @@ yyreduce: break; case 211: + +/* Line 1464 of yacc.c */ #line 1319 "../Source/WebCore/css/CSSGrammar.y" { /* if we come across rules with invalid values like this case: p { weight: *; }, just discard the rule */ @@ -3742,6 +4007,8 @@ yyreduce: break; case 212: + +/* Line 1464 of yacc.c */ #line 1326 "../Source/WebCore/css/CSSGrammar.y" { /* if we come across: div { color{;color:maroon} }, ignore everything within curly brackets */ @@ -3750,6 +4017,8 @@ yyreduce: break; case 213: + +/* Line 1464 of yacc.c */ #line 1333 "../Source/WebCore/css/CSSGrammar.y" { (yyval.integer) = cssPropertyID((yyvsp[(1) - (2)].string)); @@ -3757,16 +4026,22 @@ yyreduce: break; case 214: + +/* Line 1464 of yacc.c */ #line 1339 "../Source/WebCore/css/CSSGrammar.y" { (yyval.boolean) = true; ;} break; case 215: + +/* Line 1464 of yacc.c */ #line 1340 "../Source/WebCore/css/CSSGrammar.y" { (yyval.boolean) = false; ;} break; case 216: + +/* Line 1464 of yacc.c */ #line 1344 "../Source/WebCore/css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); @@ -3776,6 +4051,8 @@ yyreduce: break; case 217: + +/* Line 1464 of yacc.c */ #line 1349 "../Source/WebCore/css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); @@ -3794,6 +4071,8 @@ yyreduce: break; case 218: + +/* Line 1464 of yacc.c */ #line 1363 "../Source/WebCore/css/CSSGrammar.y" { (yyval.valueList) = 0; @@ -3801,6 +4080,8 @@ yyreduce: break; case 219: + +/* Line 1464 of yacc.c */ #line 1366 "../Source/WebCore/css/CSSGrammar.y" { (yyval.valueList) = 0; @@ -3808,6 +4089,8 @@ yyreduce: break; case 220: + +/* Line 1464 of yacc.c */ #line 1369 "../Source/WebCore/css/CSSGrammar.y" { (yyval.valueList) = 0; @@ -3815,6 +4098,8 @@ yyreduce: break; case 221: + +/* Line 1464 of yacc.c */ #line 1375 "../Source/WebCore/css/CSSGrammar.y" { (yyval.character) = '/'; @@ -3822,6 +4107,8 @@ yyreduce: break; case 222: + +/* Line 1464 of yacc.c */ #line 1378 "../Source/WebCore/css/CSSGrammar.y" { (yyval.character) = ','; @@ -3829,6 +4116,8 @@ yyreduce: break; case 223: + +/* Line 1464 of yacc.c */ #line 1381 "../Source/WebCore/css/CSSGrammar.y" { (yyval.character) = 0; @@ -3836,21 +4125,29 @@ yyreduce: break; case 224: + +/* Line 1464 of yacc.c */ #line 1387 "../Source/WebCore/css/CSSGrammar.y" { (yyval.value) = (yyvsp[(1) - (1)].value); ;} break; case 225: + +/* Line 1464 of yacc.c */ #line 1388 "../Source/WebCore/css/CSSGrammar.y" { (yyval.value) = (yyvsp[(2) - (2)].value); (yyval.value).fValue *= (yyvsp[(1) - (2)].integer); ;} break; case 226: + +/* Line 1464 of yacc.c */ #line 1389 "../Source/WebCore/css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(1) - (2)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_STRING; ;} break; case 227: + +/* Line 1464 of yacc.c */ #line 1390 "../Source/WebCore/css/CSSGrammar.y" { (yyval.value).id = cssValueKeywordID((yyvsp[(1) - (2)].string)); @@ -3860,36 +4157,50 @@ yyreduce: break; case 228: + +/* Line 1464 of yacc.c */ #line 1396 "../Source/WebCore/css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(1) - (2)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_DIMENSION; ;} break; case 229: + +/* Line 1464 of yacc.c */ #line 1397 "../Source/WebCore/css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(2) - (3)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_DIMENSION; ;} break; case 230: + +/* Line 1464 of yacc.c */ #line 1398 "../Source/WebCore/css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(1) - (2)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_URI; ;} break; case 231: + +/* Line 1464 of yacc.c */ #line 1399 "../Source/WebCore/css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(1) - (2)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_UNICODE_RANGE; ;} break; case 232: + +/* Line 1464 of yacc.c */ #line 1400 "../Source/WebCore/css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(1) - (2)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_PARSER_HEXCOLOR; ;} break; case 233: + +/* Line 1464 of yacc.c */ #line 1401 "../Source/WebCore/css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).string = CSSParserString(); (yyval.value).unit = CSSPrimitiveValue::CSS_PARSER_HEXCOLOR; ;} break; case 234: + +/* Line 1464 of yacc.c */ #line 1403 "../Source/WebCore/css/CSSGrammar.y" { (yyval.value) = (yyvsp[(1) - (1)].value); @@ -3897,6 +4208,8 @@ yyreduce: break; case 235: + +/* Line 1464 of yacc.c */ #line 1406 "../Source/WebCore/css/CSSGrammar.y" { (yyval.value) = (yyvsp[(1) - (1)].value); @@ -3904,6 +4217,8 @@ yyreduce: break; case 236: + +/* Line 1464 of yacc.c */ #line 1409 "../Source/WebCore/css/CSSGrammar.y" { (yyval.value) = (yyvsp[(1) - (1)].value); @@ -3911,6 +4226,8 @@ yyreduce: break; case 237: + +/* Line 1464 of yacc.c */ #line 1412 "../Source/WebCore/css/CSSGrammar.y" { /* Handle width: %; */ (yyval.value).id = 0; (yyval.value).unit = 0; @@ -3918,106 +4235,148 @@ yyreduce: break; case 238: + +/* Line 1464 of yacc.c */ #line 1418 "../Source/WebCore/css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).isInt = true; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_NUMBER; ;} break; case 239: + +/* Line 1464 of yacc.c */ #line 1419 "../Source/WebCore/css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).isInt = false; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_NUMBER; ;} break; case 240: + +/* Line 1464 of yacc.c */ #line 1420 "../Source/WebCore/css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_PERCENTAGE; ;} break; case 241: + +/* Line 1464 of yacc.c */ #line 1421 "../Source/WebCore/css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_PX; ;} break; case 242: + +/* Line 1464 of yacc.c */ #line 1422 "../Source/WebCore/css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_CM; ;} break; case 243: + +/* Line 1464 of yacc.c */ #line 1423 "../Source/WebCore/css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_MM; ;} break; case 244: + +/* Line 1464 of yacc.c */ #line 1424 "../Source/WebCore/css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_IN; ;} break; case 245: + +/* Line 1464 of yacc.c */ #line 1425 "../Source/WebCore/css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_PT; ;} break; case 246: + +/* Line 1464 of yacc.c */ #line 1426 "../Source/WebCore/css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_PC; ;} break; case 247: + +/* Line 1464 of yacc.c */ #line 1427 "../Source/WebCore/css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_DEG; ;} break; case 248: + +/* Line 1464 of yacc.c */ #line 1428 "../Source/WebCore/css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_RAD; ;} break; case 249: + +/* Line 1464 of yacc.c */ #line 1429 "../Source/WebCore/css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_GRAD; ;} break; case 250: + +/* Line 1464 of yacc.c */ #line 1430 "../Source/WebCore/css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_TURN; ;} break; case 251: + +/* Line 1464 of yacc.c */ #line 1431 "../Source/WebCore/css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_MS; ;} break; case 252: + +/* Line 1464 of yacc.c */ #line 1432 "../Source/WebCore/css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_S; ;} break; case 253: + +/* Line 1464 of yacc.c */ #line 1433 "../Source/WebCore/css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_HZ; ;} break; case 254: + +/* Line 1464 of yacc.c */ #line 1434 "../Source/WebCore/css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_KHZ; ;} break; case 255: + +/* Line 1464 of yacc.c */ #line 1435 "../Source/WebCore/css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_EMS; ;} break; case 256: + +/* Line 1464 of yacc.c */ #line 1436 "../Source/WebCore/css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSParserValue::Q_EMS; ;} break; case 257: + +/* Line 1464 of yacc.c */ #line 1437 "../Source/WebCore/css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_EXS; ;} break; case 258: + +/* Line 1464 of yacc.c */ #line 1438 "../Source/WebCore/css/CSSGrammar.y" { (yyval.value).id = 0; @@ -4030,6 +4389,8 @@ yyreduce: break; case 259: + +/* Line 1464 of yacc.c */ #line 1449 "../Source/WebCore/css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); @@ -4043,6 +4404,8 @@ yyreduce: break; case 260: + +/* Line 1464 of yacc.c */ #line 1458 "../Source/WebCore/css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); @@ -4056,16 +4419,22 @@ yyreduce: break; case 261: + +/* Line 1464 of yacc.c */ #line 1470 "../Source/WebCore/css/CSSGrammar.y" { (yyval.value) = (yyvsp[(1) - (1)].value); ;} break; case 262: + +/* Line 1464 of yacc.c */ #line 1471 "../Source/WebCore/css/CSSGrammar.y" { (yyval.value) = (yyvsp[(2) - (2)].value); (yyval.value).fValue *= (yyvsp[(1) - (2)].integer); ;} break; case 263: + +/* Line 1464 of yacc.c */ #line 1475 "../Source/WebCore/css/CSSGrammar.y" { (yyval.character) = '+'; @@ -4073,6 +4442,8 @@ yyreduce: break; case 264: + +/* Line 1464 of yacc.c */ #line 1478 "../Source/WebCore/css/CSSGrammar.y" { (yyval.character) = '-'; @@ -4080,6 +4451,8 @@ yyreduce: break; case 265: + +/* Line 1464 of yacc.c */ #line 1481 "../Source/WebCore/css/CSSGrammar.y" { (yyval.character) = '*'; @@ -4087,6 +4460,8 @@ yyreduce: break; case 266: + +/* Line 1464 of yacc.c */ #line 1484 "../Source/WebCore/css/CSSGrammar.y" { (yyval.character) = '/'; @@ -4094,6 +4469,8 @@ yyreduce: break; case 267: + +/* Line 1464 of yacc.c */ #line 1487 "../Source/WebCore/css/CSSGrammar.y" { if (equalIgnoringCase("mod", (yyvsp[(1) - (2)].string).characters, (yyvsp[(1) - (2)].string).length)) @@ -4104,6 +4481,8 @@ yyreduce: break; case 268: + +/* Line 1464 of yacc.c */ #line 1496 "../Source/WebCore/css/CSSGrammar.y" { if ((yyvsp[(3) - (6)].valueList)) { @@ -4121,6 +4500,8 @@ yyreduce: break; case 269: + +/* Line 1464 of yacc.c */ #line 1511 "../Source/WebCore/css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); @@ -4130,6 +4511,8 @@ yyreduce: break; case 270: + +/* Line 1464 of yacc.c */ #line 1516 "../Source/WebCore/css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); @@ -4148,6 +4531,8 @@ yyreduce: break; case 271: + +/* Line 1464 of yacc.c */ #line 1530 "../Source/WebCore/css/CSSGrammar.y" { if ((yyvsp[(1) - (3)].valueList) && (yyvsp[(2) - (3)].character) && (yyvsp[(3) - (3)].valueList)) { @@ -4164,6 +4549,8 @@ yyreduce: break; case 273: + +/* Line 1464 of yacc.c */ #line 1543 "../Source/WebCore/css/CSSGrammar.y" { (yyval.valueList) = 0; @@ -4171,6 +4558,8 @@ yyreduce: break; case 274: + +/* Line 1464 of yacc.c */ #line 1549 "../Source/WebCore/css/CSSGrammar.y" { (yyval.valueList) = (yyvsp[(1) - (1)].valueList); @@ -4178,6 +4567,8 @@ yyreduce: break; case 275: + +/* Line 1464 of yacc.c */ #line 1552 "../Source/WebCore/css/CSSGrammar.y" { if ((yyvsp[(1) - (4)].valueList) && (yyvsp[(4) - (4)].valueList)) { @@ -4194,6 +4585,8 @@ yyreduce: break; case 276: + +/* Line 1464 of yacc.c */ #line 1567 "../Source/WebCore/css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); @@ -4207,6 +4600,8 @@ yyreduce: break; case 277: + +/* Line 1464 of yacc.c */ #line 1576 "../Source/WebCore/css/CSSGrammar.y" { YYERROR; @@ -4214,6 +4609,8 @@ yyreduce: break; case 278: + +/* Line 1464 of yacc.c */ #line 1583 "../Source/WebCore/css/CSSGrammar.y" { (yyval.string) = (yyvsp[(1) - (1)].string); @@ -4221,6 +4618,8 @@ yyreduce: break; case 279: + +/* Line 1464 of yacc.c */ #line 1586 "../Source/WebCore/css/CSSGrammar.y" { (yyval.string) = (yyvsp[(1) - (1)].string); @@ -4228,6 +4627,8 @@ yyreduce: break; case 280: + +/* Line 1464 of yacc.c */ #line 1592 "../Source/WebCore/css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); @@ -4241,6 +4642,8 @@ yyreduce: break; case 281: + +/* Line 1464 of yacc.c */ #line 1601 "../Source/WebCore/css/CSSGrammar.y" { YYERROR; @@ -4248,6 +4651,8 @@ yyreduce: break; case 282: + +/* Line 1464 of yacc.c */ #line 1609 "../Source/WebCore/css/CSSGrammar.y" { (yyval.rule) = 0; @@ -4255,6 +4660,8 @@ yyreduce: break; case 283: + +/* Line 1464 of yacc.c */ #line 1612 "../Source/WebCore/css/CSSGrammar.y" { (yyval.rule) = 0; @@ -4262,6 +4669,8 @@ yyreduce: break; case 284: + +/* Line 1464 of yacc.c */ #line 1618 "../Source/WebCore/css/CSSGrammar.y" { (yyval.rule) = 0; @@ -4269,6 +4678,8 @@ yyreduce: break; case 285: + +/* Line 1464 of yacc.c */ #line 1621 "../Source/WebCore/css/CSSGrammar.y" { (yyval.rule) = 0; @@ -4276,6 +4687,8 @@ yyreduce: break; case 286: + +/* Line 1464 of yacc.c */ #line 1627 "../Source/WebCore/css/CSSGrammar.y" { (yyval.rule) = 0; @@ -4283,6 +4696,8 @@ yyreduce: break; case 287: + +/* Line 1464 of yacc.c */ #line 1645 "../Source/WebCore/css/CSSGrammar.y" { static_cast<CSSParser*>(parser)->invalidBlockHit(); @@ -4290,6 +4705,8 @@ yyreduce: break; case 288: + +/* Line 1464 of yacc.c */ #line 1648 "../Source/WebCore/css/CSSGrammar.y" { static_cast<CSSParser*>(parser)->invalidBlockHit(); @@ -4297,8 +4714,9 @@ yyreduce: break; -/* Line 1267 of yacc.c. */ -#line 4302 "/Source/WebCore/generated/CSSGrammar.tab.c" + +/* Line 1464 of yacc.c */ +#line 4720 "/Source/WebCore/generated/CSSGrammar.tab.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -4309,7 +4727,6 @@ yyreduce: *++yyvsp = yyval; - /* Now `shift' the result of the reduction. Determine what state that goes to, based on the state we popped back to and the rule number reduced by. */ @@ -4374,7 +4791,7 @@ yyerrlab: if (yyerrstatus == 3) { - /* If just tried and failed to reuse look-ahead token after an + /* If just tried and failed to reuse lookahead token after an error, discard it. */ if (yychar <= YYEOF) @@ -4391,7 +4808,7 @@ yyerrlab: } } - /* Else will try to reuse look-ahead token after shifting the error + /* Else will try to reuse lookahead token after shifting the error token. */ goto yyerrlab1; @@ -4448,9 +4865,6 @@ yyerrlab1: YY_STACK_PRINT (yyss, yyssp); } - if (yyn == YYFINAL) - YYACCEPT; - *++yyvsp = yylval; @@ -4475,7 +4889,7 @@ yyabortlab: yyresult = 1; goto yyreturn; -#ifndef yyoverflow +#if !defined(yyoverflow) || YYERROR_VERBOSE /*-------------------------------------------------. | yyexhaustedlab -- memory exhaustion comes here. | `-------------------------------------------------*/ @@ -4486,7 +4900,7 @@ yyexhaustedlab: #endif yyreturn: - if (yychar != YYEOF && yychar != YYEMPTY) + if (yychar != YYEMPTY) yydestruct ("Cleanup: discarding lookahead", yytoken, &yylval); /* Do not reclaim the symbols of the rule which action triggered @@ -4512,6 +4926,8 @@ yyreturn: } + +/* Line 1684 of yacc.c */ #line 1658 "../Source/WebCore/css/CSSGrammar.y" diff --git a/src/3rdparty/webkit/Source/WebCore/generated/CSSGrammar.h b/src/3rdparty/webkit/Source/WebCore/generated/CSSGrammar.h index 22670ba650..2953e0dddf 100644 --- a/src/3rdparty/webkit/Source/WebCore/generated/CSSGrammar.h +++ b/src/3rdparty/webkit/Source/WebCore/generated/CSSGrammar.h @@ -1,26 +1,24 @@ #ifndef CSSGRAMMAR_H #define CSSGRAMMAR_H -/* A Bison parser, made by GNU Bison 2.3. */ +/* A Bison parser, made by GNU Bison 2.4.3. */ /* 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 + + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006, + 2009, 2010 Free Software Foundation, Inc. + + 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 @@ -31,10 +29,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 @@ -123,95 +122,16 @@ UNICODERANGE = 336 }; #endif -/* Tokens. */ -#define TOKEN_EOF 0 -#define LOWEST_PREC 258 -#define UNIMPORTANT_TOK 259 -#define WHITESPACE 260 -#define SGML_CD 261 -#define INCLUDES 262 -#define DASHMATCH 263 -#define BEGINSWITH 264 -#define ENDSWITH 265 -#define CONTAINS 266 -#define STRING 267 -#define IDENT 268 -#define NTH 269 -#define HEX 270 -#define IDSEL 271 -#define IMPORT_SYM 272 -#define PAGE_SYM 273 -#define MEDIA_SYM 274 -#define FONT_FACE_SYM 275 -#define CHARSET_SYM 276 -#define NAMESPACE_SYM 277 -#define WEBKIT_RULE_SYM 278 -#define WEBKIT_DECLS_SYM 279 -#define WEBKIT_KEYFRAME_RULE_SYM 280 -#define WEBKIT_KEYFRAMES_SYM 281 -#define WEBKIT_VALUE_SYM 282 -#define WEBKIT_MEDIAQUERY_SYM 283 -#define WEBKIT_SELECTOR_SYM 284 -#define TOPLEFTCORNER_SYM 285 -#define TOPLEFT_SYM 286 -#define TOPCENTER_SYM 287 -#define TOPRIGHT_SYM 288 -#define TOPRIGHTCORNER_SYM 289 -#define BOTTOMLEFTCORNER_SYM 290 -#define BOTTOMLEFT_SYM 291 -#define BOTTOMCENTER_SYM 292 -#define BOTTOMRIGHT_SYM 293 -#define BOTTOMRIGHTCORNER_SYM 294 -#define LEFTTOP_SYM 295 -#define LEFTMIDDLE_SYM 296 -#define LEFTBOTTOM_SYM 297 -#define RIGHTTOP_SYM 298 -#define RIGHTMIDDLE_SYM 299 -#define RIGHTBOTTOM_SYM 300 -#define ATKEYWORD 301 -#define IMPORTANT_SYM 302 -#define MEDIA_ONLY 303 -#define MEDIA_NOT 304 -#define MEDIA_AND 305 -#define REMS 306 -#define QEMS 307 -#define EMS 308 -#define EXS 309 -#define PXS 310 -#define CMS 311 -#define MMS 312 -#define INS 313 -#define PTS 314 -#define PCS 315 -#define DEGS 316 -#define RADS 317 -#define GRADS 318 -#define TURNS 319 -#define MSECS 320 -#define SECS 321 -#define HERTZ 322 -#define KHERTZ 323 -#define DIMEN 324 -#define INVALIDDIMEN 325 -#define PERCENTAGE 326 -#define FLOATTOKEN 327 -#define INTEGER 328 -#define URI 329 -#define FUNCTION 330 -#define ANYFUNCTION 331 -#define NOTFUNCTION 332 -#define CALCFUNCTION 333 -#define MINFUNCTION 334 -#define MAXFUNCTION 335 -#define UNICODERANGE 336 - #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 63 "../Source/WebCore/css/CSSGrammar.y" { + +/* Line 1685 of yacc.c */ +#line 63 "../Source/WebCore/css/CSSGrammar.y" + bool boolean; char character; int integer; @@ -234,15 +154,18 @@ typedef union YYSTYPE WebKitCSSKeyframeRule* keyframeRule; WebKitCSSKeyframesRule* keyframesRule; float val; -} -/* Line 1529 of yacc.c. */ -#line 238 "/Source/WebCore/generated/CSSGrammar.tab.h" - YYSTYPE; + + + +/* Line 1685 of yacc.c */ +#line 160 "/Source/WebCore/generated/CSSGrammar.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 + #endif diff --git a/src/3rdparty/webkit/Source/WebCore/generated/CSSPropertyNames.cpp b/src/3rdparty/webkit/Source/WebCore/generated/CSSPropertyNames.cpp index 1294a3409b..945ba7df48 100644 --- a/src/3rdparty/webkit/Source/WebCore/generated/CSSPropertyNames.cpp +++ b/src/3rdparty/webkit/Source/WebCore/generated/CSSPropertyNames.cpp @@ -1,4 +1,4 @@ -/* C++ code produced by gperf version 3.0.3 */ +/* C++ code produced by gperf version 3.0.4 */ /* Command-line: gperf --key-positions='*' -D -n -s 2 CSSPropertyNames.gperf */ #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ diff --git a/src/3rdparty/webkit/Source/WebCore/generated/CSSValueKeywords.cpp b/src/3rdparty/webkit/Source/WebCore/generated/CSSValueKeywords.cpp index 081d3239b7..92c75411c8 100644 --- a/src/3rdparty/webkit/Source/WebCore/generated/CSSValueKeywords.cpp +++ b/src/3rdparty/webkit/Source/WebCore/generated/CSSValueKeywords.cpp @@ -1,4 +1,4 @@ -/* C++ code produced by gperf version 3.0.3 */ +/* C++ code produced by gperf version 3.0.4 */ /* Command-line: gperf --key-positions='*' -D -n -s 2 CSSValueKeywords.gperf */ #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ diff --git a/src/3rdparty/webkit/Source/WebCore/generated/ColorData.cpp b/src/3rdparty/webkit/Source/WebCore/generated/ColorData.cpp index 3b09b89e34..da31ef88c7 100644 --- a/src/3rdparty/webkit/Source/WebCore/generated/ColorData.cpp +++ b/src/3rdparty/webkit/Source/WebCore/generated/ColorData.cpp @@ -1,4 +1,4 @@ -/* C++ code produced by gperf version 3.0.3 */ +/* C++ code produced by gperf version 3.0.4 */ /* Command-line: gperf --key-positions='*' -D -s 2 /Source/WebCore/platform/ColorData.gperf */ #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ diff --git a/src/3rdparty/webkit/Source/WebCore/generated/DocTypeStrings.cpp b/src/3rdparty/webkit/Source/WebCore/generated/DocTypeStrings.cpp index e0a2b4fcc3..566700900e 100644 --- a/src/3rdparty/webkit/Source/WebCore/generated/DocTypeStrings.cpp +++ b/src/3rdparty/webkit/Source/WebCore/generated/DocTypeStrings.cpp @@ -1,4 +1,4 @@ -/* C++ code produced by gperf version 3.0.3 */ +/* C++ code produced by gperf version 3.0.4 */ /* Command-line: gperf --key-positions='*' -s 2 /Source/WebCore/html/DocTypeStrings.gperf */ #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ diff --git a/src/3rdparty/webkit/Source/WebCore/generated/JSDOMWindow.cpp b/src/3rdparty/webkit/Source/WebCore/generated/JSDOMWindow.cpp index 6fa2ad3df2..515e9a1b0f 100644 --- a/src/3rdparty/webkit/Source/WebCore/generated/JSDOMWindow.cpp +++ b/src/3rdparty/webkit/Source/WebCore/generated/JSDOMWindow.cpp @@ -410,7 +410,7 @@ ASSERT_CLASS_FITS_IN_CELL(JSDOMWindow); #define THUNK_GENERATOR(generator) #endif -static const HashTableValue JSDOMWindowTableValues[456] = +static const HashTableValue JSDOMWindowTableValues[458] = { { "screen", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsDOMWindowScreen), (intptr_t)setJSDOMWindowScreen THUNK_GENERATOR(0) }, { "history", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsDOMWindowHistory), (intptr_t)setJSDOMWindowHistory THUNK_GENERATOR(0) }, @@ -458,6 +458,7 @@ static const HashTableValue JSDOMWindowTableValues[456] = { "sessionStorage", DontDelete | ReadOnly, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsDOMWindowSessionStorage), (intptr_t)0 THUNK_GENERATOR(0) }, { "localStorage", DontDelete | ReadOnly, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsDOMWindowLocalStorage), (intptr_t)0 THUNK_GENERATOR(0) }, { "webkitNotifications", DontDelete | ReadOnly, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsDOMWindowWebkitNotifications), (intptr_t)0 THUNK_GENERATOR(0) }, + { "orientation", DontDelete | ReadOnly, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsDOMWindowOrientation), (intptr_t)0 THUNK_GENERATOR(0) }, { "console", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsDOMWindowConsole), (intptr_t)setJSDOMWindowConsole THUNK_GENERATOR(0) }, { "onabort", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsDOMWindowOnabort), (intptr_t)setJSDOMWindowOnabort THUNK_GENERATOR(0) }, { "onbeforeunload", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsDOMWindowOnbeforeunload), (intptr_t)setJSDOMWindowOnbeforeunload THUNK_GENERATOR(0) }, @@ -526,6 +527,7 @@ static const HashTableValue JSDOMWindowTableValues[456] = { "onwebkitanimationiteration", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsDOMWindowOnwebkitanimationiteration), (intptr_t)setJSDOMWindowOnwebkitanimationiteration THUNK_GENERATOR(0) }, { "onwebkitanimationstart", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsDOMWindowOnwebkitanimationstart), (intptr_t)setJSDOMWindowOnwebkitanimationstart THUNK_GENERATOR(0) }, { "onwebkittransitionend", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsDOMWindowOnwebkittransitionend), (intptr_t)setJSDOMWindowOnwebkittransitionend THUNK_GENERATOR(0) }, + { "onorientationchange", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsDOMWindowOnorientationchange), (intptr_t)setJSDOMWindowOnorientationchange THUNK_GENERATOR(0) }, #if ENABLE(TOUCH_EVENTS) { "ontouchstart", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsDOMWindowOntouchstart), (intptr_t)setJSDOMWindowOntouchstart THUNK_GENERATOR(0) }, #endif @@ -1583,6 +1585,18 @@ JSValue jsDOMWindowWebkitNotifications(ExecState* exec, JSValue slotBase, const } +JSValue jsDOMWindowOrientation(ExecState* exec, JSValue slotBase, const Identifier&) +{ + JSDOMWindow* castedThis = static_cast<JSDOMWindow*>(asObject(slotBase)); + if (!castedThis->allowsAccessFrom(exec)) + return jsUndefined(); + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(castedThis->impl()); + JSValue result = jsNumber(imp->orientation()); + return result; +} + + JSValue jsDOMWindowConsole(ExecState* exec, JSValue slotBase, const Identifier&) { JSDOMWindow* castedThis = static_cast<JSDOMWindow*>(asObject(slotBase)); @@ -2734,6 +2748,23 @@ JSValue jsDOMWindowOnwebkittransitionend(ExecState* exec, JSValue slotBase, cons } +JSValue jsDOMWindowOnorientationchange(ExecState* exec, JSValue slotBase, const Identifier&) +{ + JSDOMWindow* castedThis = static_cast<JSDOMWindow*>(asObject(slotBase)); + if (!castedThis->allowsAccessFrom(exec)) + return jsUndefined(); + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(castedThis->impl()); + if (EventListener* listener = imp->onorientationchange()) { + if (const JSEventListener* jsListener = JSEventListener::cast(listener)) { + if (JSObject* jsFunction = jsListener->jsFunction(imp->scriptExecutionContext())) + return jsFunction; + } + } + return jsNull(); +} + + #if ENABLE(TOUCH_EVENTS) JSValue jsDOMWindowOntouchstart(ExecState* exec, JSValue slotBase, const Identifier&) { @@ -6970,6 +7001,17 @@ void setJSDOMWindowOnwebkittransitionend(ExecState* exec, JSObject* thisObject, } +void setJSDOMWindowOnorientationchange(ExecState* exec, JSObject* thisObject, JSValue value) +{ + if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) + return; + UNUSED_PARAM(exec); + JSDOMWindow* castedThis = static_cast<JSDOMWindow*>(thisObject); + DOMWindow* imp = static_cast<DOMWindow*>(castedThis->impl()); + imp->setOnorientationchange(createJSAttributeEventListener(exec, value, thisObject)); +} + + #if ENABLE(TOUCH_EVENTS) void setJSDOMWindowOntouchstart(ExecState* exec, JSObject* thisObject, JSValue value) { diff --git a/src/3rdparty/webkit/Source/WebCore/generated/JSDOMWindow.h b/src/3rdparty/webkit/Source/WebCore/generated/JSDOMWindow.h index c0125f7a08..39b91eb98b 100644 --- a/src/3rdparty/webkit/Source/WebCore/generated/JSDOMWindow.h +++ b/src/3rdparty/webkit/Source/WebCore/generated/JSDOMWindow.h @@ -240,6 +240,7 @@ JSC::JSValue jsDOMWindowApplicationCache(JSC::ExecState*, JSC::JSValue, const JS JSC::JSValue jsDOMWindowSessionStorage(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&); JSC::JSValue jsDOMWindowLocalStorage(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&); JSC::JSValue jsDOMWindowWebkitNotifications(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&); +JSC::JSValue jsDOMWindowOrientation(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&); JSC::JSValue jsDOMWindowConsole(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&); void setJSDOMWindowConsole(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); JSC::JSValue jsDOMWindowOnabort(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&); @@ -376,6 +377,8 @@ JSC::JSValue jsDOMWindowOnwebkitanimationstart(JSC::ExecState*, JSC::JSValue, co void setJSDOMWindowOnwebkitanimationstart(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); JSC::JSValue jsDOMWindowOnwebkittransitionend(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&); void setJSDOMWindowOnwebkittransitionend(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnorientationchange(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&); +void setJSDOMWindowOnorientationchange(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); JSC::JSValue jsDOMWindowOntouchstart(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&); void setJSDOMWindowOntouchstart(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); JSC::JSValue jsDOMWindowOntouchmove(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&); diff --git a/src/3rdparty/webkit/Source/WebCore/generated/JSHTMLBodyElement.cpp b/src/3rdparty/webkit/Source/WebCore/generated/JSHTMLBodyElement.cpp index 9f044ce5ee..8342694dec 100644 --- a/src/3rdparty/webkit/Source/WebCore/generated/JSHTMLBodyElement.cpp +++ b/src/3rdparty/webkit/Source/WebCore/generated/JSHTMLBodyElement.cpp @@ -42,7 +42,7 @@ ASSERT_CLASS_FITS_IN_CELL(JSHTMLBodyElement); #define THUNK_GENERATOR(generator) #endif -static const HashTableValue JSHTMLBodyElementTableValues[21] = +static const HashTableValue JSHTMLBodyElementTableValues[22] = { { "aLink", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsHTMLBodyElementALink), (intptr_t)setJSHTMLBodyElementALink THUNK_GENERATOR(0) }, { "background", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsHTMLBodyElementBackground), (intptr_t)setJSHTMLBodyElementBackground THUNK_GENERATOR(0) }, @@ -59,6 +59,7 @@ static const HashTableValue JSHTMLBodyElementTableValues[21] = { "onresize", DontDelete | DontEnum, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsHTMLBodyElementOnresize), (intptr_t)setJSHTMLBodyElementOnresize THUNK_GENERATOR(0) }, { "onstorage", DontDelete | DontEnum, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsHTMLBodyElementOnstorage), (intptr_t)setJSHTMLBodyElementOnstorage THUNK_GENERATOR(0) }, { "onunload", DontDelete | DontEnum, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsHTMLBodyElementOnunload), (intptr_t)setJSHTMLBodyElementOnunload THUNK_GENERATOR(0) }, + { "onorientationchange", DontDelete | DontEnum, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsHTMLBodyElementOnorientationchange), (intptr_t)setJSHTMLBodyElementOnorientationchange THUNK_GENERATOR(0) }, { "onblur", DontDelete | DontEnum, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsHTMLBodyElementOnblur), (intptr_t)setJSHTMLBodyElementOnblur THUNK_GENERATOR(0) }, { "onerror", DontDelete | DontEnum, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsHTMLBodyElementOnerror), (intptr_t)setJSHTMLBodyElementOnerror THUNK_GENERATOR(0) }, { "onfocus", DontDelete | DontEnum, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsHTMLBodyElementOnfocus), (intptr_t)setJSHTMLBodyElementOnfocus THUNK_GENERATOR(0) }, @@ -356,6 +357,21 @@ JSValue jsHTMLBodyElementOnunload(ExecState* exec, JSValue slotBase, const Ident } +JSValue jsHTMLBodyElementOnorientationchange(ExecState* exec, JSValue slotBase, const Identifier&) +{ + JSHTMLBodyElement* castedThis = static_cast<JSHTMLBodyElement*>(asObject(slotBase)); + UNUSED_PARAM(exec); + HTMLBodyElement* imp = static_cast<HTMLBodyElement*>(castedThis->impl()); + if (EventListener* listener = imp->onorientationchange()) { + if (const JSEventListener* jsListener = JSEventListener::cast(listener)) { + if (JSObject* jsFunction = jsListener->jsFunction(imp->scriptExecutionContext())) + return jsFunction; + } + } + return jsNull(); +} + + JSValue jsHTMLBodyElementOnblur(ExecState* exec, JSValue slotBase, const Identifier&) { JSHTMLBodyElement* castedThis = static_cast<JSHTMLBodyElement*>(asObject(slotBase)); @@ -565,6 +581,16 @@ void setJSHTMLBodyElementOnunload(ExecState* exec, JSObject* thisObject, JSValue } +void setJSHTMLBodyElementOnorientationchange(ExecState* exec, JSObject* thisObject, JSValue value) +{ + UNUSED_PARAM(exec); + JSHTMLBodyElement* castedThis = static_cast<JSHTMLBodyElement*>(thisObject); + JSDOMGlobalObject* globalObject = castedThis->globalObject(); + HTMLBodyElement* imp = static_cast<HTMLBodyElement*>(castedThis->impl()); + imp->setOnorientationchange(createJSAttributeEventListener(exec, value, globalObject)); +} + + void setJSHTMLBodyElementOnblur(ExecState* exec, JSObject* thisObject, JSValue value) { UNUSED_PARAM(exec); diff --git a/src/3rdparty/webkit/Source/WebCore/generated/JSHTMLBodyElement.h b/src/3rdparty/webkit/Source/WebCore/generated/JSHTMLBodyElement.h index de4b6f8328..d765070499 100644 --- a/src/3rdparty/webkit/Source/WebCore/generated/JSHTMLBodyElement.h +++ b/src/3rdparty/webkit/Source/WebCore/generated/JSHTMLBodyElement.h @@ -95,6 +95,8 @@ JSC::JSValue jsHTMLBodyElementOnstorage(JSC::ExecState*, JSC::JSValue, const JSC void setJSHTMLBodyElementOnstorage(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); JSC::JSValue jsHTMLBodyElementOnunload(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&); void setJSHTMLBodyElementOnunload(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLBodyElementOnorientationchange(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&); +void setJSHTMLBodyElementOnorientationchange(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); JSC::JSValue jsHTMLBodyElementOnblur(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&); void setJSHTMLBodyElementOnblur(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); JSC::JSValue jsHTMLBodyElementOnerror(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&); diff --git a/src/3rdparty/webkit/Source/WebCore/generated/JSHTMLFrameSetElement.cpp b/src/3rdparty/webkit/Source/WebCore/generated/JSHTMLFrameSetElement.cpp index c65718bbf7..3508b9a434 100644 --- a/src/3rdparty/webkit/Source/WebCore/generated/JSHTMLFrameSetElement.cpp +++ b/src/3rdparty/webkit/Source/WebCore/generated/JSHTMLFrameSetElement.cpp @@ -43,7 +43,7 @@ ASSERT_CLASS_FITS_IN_CELL(JSHTMLFrameSetElement); #define THUNK_GENERATOR(generator) #endif -static const HashTableValue JSHTMLFrameSetElementTableValues[17] = +static const HashTableValue JSHTMLFrameSetElementTableValues[18] = { { "cols", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsHTMLFrameSetElementCols), (intptr_t)setJSHTMLFrameSetElementCols THUNK_GENERATOR(0) }, { "rows", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsHTMLFrameSetElementRows), (intptr_t)setJSHTMLFrameSetElementRows THUNK_GENERATOR(0) }, @@ -56,6 +56,7 @@ static const HashTableValue JSHTMLFrameSetElementTableValues[17] = { "onresize", DontDelete | DontEnum, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsHTMLFrameSetElementOnresize), (intptr_t)setJSHTMLFrameSetElementOnresize THUNK_GENERATOR(0) }, { "onstorage", DontDelete | DontEnum, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsHTMLFrameSetElementOnstorage), (intptr_t)setJSHTMLFrameSetElementOnstorage THUNK_GENERATOR(0) }, { "onunload", DontDelete | DontEnum, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsHTMLFrameSetElementOnunload), (intptr_t)setJSHTMLFrameSetElementOnunload THUNK_GENERATOR(0) }, + { "onorientationchange", DontDelete | DontEnum, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsHTMLFrameSetElementOnorientationchange), (intptr_t)setJSHTMLFrameSetElementOnorientationchange THUNK_GENERATOR(0) }, { "onblur", DontDelete | DontEnum, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsHTMLFrameSetElementOnblur), (intptr_t)setJSHTMLFrameSetElementOnblur THUNK_GENERATOR(0) }, { "onerror", DontDelete | DontEnum, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsHTMLFrameSetElementOnerror), (intptr_t)setJSHTMLFrameSetElementOnerror THUNK_GENERATOR(0) }, { "onfocus", DontDelete | DontEnum, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsHTMLFrameSetElementOnfocus), (intptr_t)setJSHTMLFrameSetElementOnfocus THUNK_GENERATOR(0) }, @@ -65,7 +66,7 @@ static const HashTableValue JSHTMLFrameSetElementTableValues[17] = }; #undef THUNK_GENERATOR -static JSC_CONST_HASHTABLE HashTable JSHTMLFrameSetElementTable = { 33, 31, JSHTMLFrameSetElementTableValues, 0 }; +static JSC_CONST_HASHTABLE HashTable JSHTMLFrameSetElementTable = { 64, 63, JSHTMLFrameSetElementTableValues, 0 }; /* Hash table for constructor */ #if ENABLE(JIT) #define THUNK_GENERATOR(generator) , generator @@ -323,6 +324,21 @@ JSValue jsHTMLFrameSetElementOnunload(ExecState* exec, JSValue slotBase, const I } +JSValue jsHTMLFrameSetElementOnorientationchange(ExecState* exec, JSValue slotBase, const Identifier&) +{ + JSHTMLFrameSetElement* castedThis = static_cast<JSHTMLFrameSetElement*>(asObject(slotBase)); + UNUSED_PARAM(exec); + HTMLFrameSetElement* imp = static_cast<HTMLFrameSetElement*>(castedThis->impl()); + if (EventListener* listener = imp->onorientationchange()) { + if (const JSEventListener* jsListener = JSEventListener::cast(listener)) { + if (JSObject* jsFunction = jsListener->jsFunction(imp->scriptExecutionContext())) + return jsFunction; + } + } + return jsNull(); +} + + JSValue jsHTMLFrameSetElementOnblur(ExecState* exec, JSValue slotBase, const Identifier&) { JSHTMLFrameSetElement* castedThis = static_cast<JSHTMLFrameSetElement*>(asObject(slotBase)); @@ -500,6 +516,15 @@ void setJSHTMLFrameSetElementOnunload(ExecState* exec, JSObject* thisObject, JSV } +void setJSHTMLFrameSetElementOnorientationchange(ExecState* exec, JSObject* thisObject, JSValue value) +{ + UNUSED_PARAM(exec); + JSHTMLFrameSetElement* castedThis = static_cast<JSHTMLFrameSetElement*>(thisObject); + HTMLFrameSetElement* imp = static_cast<HTMLFrameSetElement*>(castedThis->impl()); + imp->setOnorientationchange(createJSAttributeEventListener(exec, value, thisObject)); +} + + void setJSHTMLFrameSetElementOnblur(ExecState* exec, JSObject* thisObject, JSValue value) { UNUSED_PARAM(exec); diff --git a/src/3rdparty/webkit/Source/WebCore/generated/JSHTMLFrameSetElement.h b/src/3rdparty/webkit/Source/WebCore/generated/JSHTMLFrameSetElement.h index c0a30ca638..c01f5e3293 100644 --- a/src/3rdparty/webkit/Source/WebCore/generated/JSHTMLFrameSetElement.h +++ b/src/3rdparty/webkit/Source/WebCore/generated/JSHTMLFrameSetElement.h @@ -90,6 +90,8 @@ JSC::JSValue jsHTMLFrameSetElementOnstorage(JSC::ExecState*, JSC::JSValue, const void setJSHTMLFrameSetElementOnstorage(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); JSC::JSValue jsHTMLFrameSetElementOnunload(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&); void setJSHTMLFrameSetElementOnunload(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLFrameSetElementOnorientationchange(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&); +void setJSHTMLFrameSetElementOnorientationchange(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); JSC::JSValue jsHTMLFrameSetElementOnblur(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&); void setJSHTMLFrameSetElementOnblur(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); JSC::JSValue jsHTMLFrameSetElementOnerror(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&); diff --git a/src/3rdparty/webkit/Source/WebCore/generated/JSNavigator.cpp b/src/3rdparty/webkit/Source/WebCore/generated/JSNavigator.cpp index ce3ac5a643..1c25b67233 100644 --- a/src/3rdparty/webkit/Source/WebCore/generated/JSNavigator.cpp +++ b/src/3rdparty/webkit/Source/WebCore/generated/JSNavigator.cpp @@ -24,9 +24,11 @@ #include "DOMMimeTypeArray.h" #include "DOMPluginArray.h" #include "ExceptionCode.h" +#include "Geolocation.h" #include "JSDOMBinding.h" #include "JSDOMMimeTypeArray.h" #include "JSDOMPluginArray.h" +#include "JSGeolocation.h" #include "KURL.h" #include "Navigator.h" #include <runtime/Error.h> @@ -46,7 +48,7 @@ ASSERT_CLASS_FITS_IN_CELL(JSNavigator); #define THUNK_GENERATOR(generator) #endif -static const HashTableValue JSNavigatorTableValues[15] = +static const HashTableValue JSNavigatorTableValues[16] = { { "appCodeName", DontDelete | ReadOnly, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsNavigatorAppCodeName), (intptr_t)0 THUNK_GENERATOR(0) }, { "appName", DontDelete | ReadOnly, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsNavigatorAppName), (intptr_t)0 THUNK_GENERATOR(0) }, @@ -62,6 +64,7 @@ static const HashTableValue JSNavigatorTableValues[15] = { "vendorSub", DontDelete | ReadOnly, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsNavigatorVendorSub), (intptr_t)0 THUNK_GENERATOR(0) }, { "cookieEnabled", DontDelete | ReadOnly, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsNavigatorCookieEnabled), (intptr_t)0 THUNK_GENERATOR(0) }, { "onLine", DontDelete | ReadOnly, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsNavigatorOnLine), (intptr_t)0 THUNK_GENERATOR(0) }, + { "geolocation", DontDelete | ReadOnly, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsNavigatorGeolocation), (intptr_t)0 THUNK_GENERATOR(0) }, { 0, 0, 0, 0 THUNK_GENERATOR(0) } }; @@ -264,6 +267,16 @@ JSValue jsNavigatorOnLine(ExecState* exec, JSValue slotBase, const Identifier&) } +JSValue jsNavigatorGeolocation(ExecState* exec, JSValue slotBase, const Identifier&) +{ + JSNavigator* castedThis = static_cast<JSNavigator*>(asObject(slotBase)); + UNUSED_PARAM(exec); + Navigator* imp = static_cast<Navigator*>(castedThis->impl()); + JSValue result = toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->geolocation())); + return result; +} + + EncodedJSValue JSC_HOST_CALL jsNavigatorPrototypeFunctionJavaEnabled(ExecState* exec) { JSValue thisValue = exec->hostThisValue(); diff --git a/src/3rdparty/webkit/Source/WebCore/generated/JSNavigator.h b/src/3rdparty/webkit/Source/WebCore/generated/JSNavigator.h index 243c490883..d632434b36 100644 --- a/src/3rdparty/webkit/Source/WebCore/generated/JSNavigator.h +++ b/src/3rdparty/webkit/Source/WebCore/generated/JSNavigator.h @@ -107,6 +107,7 @@ JSC::JSValue jsNavigatorVendor(JSC::ExecState*, JSC::JSValue, const JSC::Identif JSC::JSValue jsNavigatorVendorSub(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&); JSC::JSValue jsNavigatorCookieEnabled(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&); JSC::JSValue jsNavigatorOnLine(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&); +JSC::JSValue jsNavigatorGeolocation(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&); } // namespace WebCore diff --git a/src/3rdparty/webkit/Source/WebCore/generated/XPathGrammar.cpp b/src/3rdparty/webkit/Source/WebCore/generated/XPathGrammar.cpp index 4e8b9c4e5a..768d802a89 100644 --- a/src/3rdparty/webkit/Source/WebCore/generated/XPathGrammar.cpp +++ b/src/3rdparty/webkit/Source/WebCore/generated/XPathGrammar.cpp @@ -1,24 +1,22 @@ -/* A Bison parser, made by GNU Bison 2.3. */ +/* A Bison parser, made by GNU Bison 2.4.3. */ /* Skeleton implementation 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 + + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006, + 2009, 2010 Free Software Foundation, Inc. + + 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,7 +27,7 @@ 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. */ @@ -47,7 +45,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.3" +#define YYBISON_VERSION "2.4.3" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -55,69 +53,28 @@ /* Pure parsers. */ #define YYPURE 1 +/* Push parsers. */ +#define YYPUSH 0 + +/* Pull parsers. */ +#define YYPULL 1 + /* Using locations. */ #define YYLSP_NEEDED 0 /* Substitute the variable and function names. */ -#define yyparse xpathyyparse -#define yylex xpathyylex -#define yyerror xpathyyerror -#define yylval xpathyylval -#define yychar xpathyychar -#define yydebug xpathyydebug -#define yynerrs xpathyynerrs - - -/* Tokens. */ -#ifndef YYTOKENTYPE -# define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - MULOP = 258, - RELOP = 259, - EQOP = 260, - MINUS = 261, - PLUS = 262, - AND = 263, - OR = 264, - AXISNAME = 265, - NODETYPE = 266, - PI = 267, - FUNCTIONNAME = 268, - LITERAL = 269, - VARIABLEREFERENCE = 270, - NUMBER = 271, - DOTDOT = 272, - SLASHSLASH = 273, - NAMETEST = 274, - XPATH_ERROR = 275 - }; -#endif -/* Tokens. */ -#define MULOP 258 -#define RELOP 259 -#define EQOP 260 -#define MINUS 261 -#define PLUS 262 -#define AND 263 -#define OR 264 -#define AXISNAME 265 -#define NODETYPE 266 -#define PI 267 -#define FUNCTIONNAME 268 -#define LITERAL 269 -#define VARIABLEREFERENCE 270 -#define NUMBER 271 -#define DOTDOT 272 -#define SLASHSLASH 273 -#define NAMETEST 274 -#define XPATH_ERROR 275 - - +#define yyparse xpathyyparse +#define yylex xpathyylex +#define yyerror xpathyyerror +#define yylval xpathyylval +#define yychar xpathyychar +#define yydebug xpathyydebug +#define yynerrs xpathyynerrs /* Copy the first part of user declarations. */ + +/* Line 189 of yacc.c */ #line 28 "../Source/WebCore/xml/XPathGrammar.y" @@ -148,6 +105,9 @@ using namespace XPath; +/* Line 189 of yacc.c */ +#line 110 "/Source/WebCore/generated/XPathGrammar.tab.c" + /* Enabling traces. */ #ifndef YYDEBUG # define YYDEBUG 0 @@ -166,10 +126,43 @@ using namespace XPath; # define YYTOKEN_TABLE 0 #endif + +/* Tokens. */ +#ifndef YYTOKENTYPE +# define YYTOKENTYPE + /* Put the tokens into the symbol table, so that GDB and other debuggers + know about them. */ + enum yytokentype { + MULOP = 258, + RELOP = 259, + EQOP = 260, + MINUS = 261, + PLUS = 262, + AND = 263, + OR = 264, + AXISNAME = 265, + NODETYPE = 266, + PI = 267, + FUNCTIONNAME = 268, + LITERAL = 269, + VARIABLEREFERENCE = 270, + NUMBER = 271, + DOTDOT = 272, + SLASHSLASH = 273, + NAMETEST = 274, + XPATH_ERROR = 275 + }; +#endif + + + #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 60 "../Source/WebCore/xml/XPathGrammar.y" { + +/* Line 214 of yacc.c */ +#line 60 "../Source/WebCore/xml/XPathGrammar.y" + Step::Axis axis; Step::NodeTest* nodeTest; NumericOp::Opcode numop; @@ -180,18 +173,21 @@ typedef union YYSTYPE Vector<Expression*>* argList; Step* step; LocationPath* locationPath; -} -/* Line 193 of yacc.c. */ -#line 186 "/Source/WebCore/generated/XPathGrammar.tab.c" - YYSTYPE; + + + +/* Line 214 of yacc.c */ +#line 181 "/Source/WebCore/generated/XPathGrammar.tab.c" +} YYSTYPE; +# define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 -# define YYSTYPE_IS_TRIVIAL 1 #endif - /* Copy the second part of user declarations. */ + +/* Line 264 of yacc.c */ #line 73 "../Source/WebCore/xml/XPathGrammar.y" @@ -200,8 +196,8 @@ static void xpathyyerror(const char*) { } -/* Line 216 of yacc.c. */ -#line 205 "/Source/WebCore/generated/XPathGrammar.tab.c" +/* Line 264 of yacc.c */ +#line 201 "/Source/WebCore/generated/XPathGrammar.tab.c" #ifdef short # undef short @@ -276,14 +272,14 @@ typedef short int yytype_int16; #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) static int -YYID (int i) +YYID (int yyi) #else static int -YYID (i) - int i; +YYID (yyi) + int yyi; #endif { - return i; + return yyi; } #endif @@ -364,9 +360,9 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */ /* A type that is properly aligned for any stack member. */ union yyalloc { - yytype_int16 yyss; - YYSTYPE yyvs; - }; + yytype_int16 yyss_alloc; + YYSTYPE yyvs_alloc; +}; /* The size of the maximum gap between one aligned stack and the next. */ # define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) @@ -400,12 +396,12 @@ union yyalloc elements in the stack, and YYPTR gives the new location of the stack. Advance YYPTR to a properly aligned location for the next stack. */ -# define YYSTACK_RELOCATE(Stack) \ +# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ do \ { \ YYSIZE_T yynewbytes; \ - YYCOPY (&yyptr->Stack, Stack, yysize); \ - Stack = &yyptr->Stack; \ + YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ + Stack = &yyptr->Stack_alloc; \ yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ yyptr += yynewbytes / sizeof (*yyptr); \ } \ @@ -688,9 +684,18 @@ static const yytype_uint8 yystos[] = /* Like YYERROR except do call yyerror. This remains here temporarily to ease the transition to the new meaning of YYERROR, for GCC. - Once GCC version 2 has supplanted version 1, this can go. */ + Once GCC version 2 has supplanted version 1, this can go. However, + YYFAIL appears to be in use. Nevertheless, it is formally deprecated + in Bison 2.4.2's NEWS entry, where a plan to phase it out is + discussed. */ #define YYFAIL goto yyerrlab +#if defined YYFAIL + /* This is here to suppress warnings from the GCC cpp's + -Wunused-macros. Normally we don't worry about that warning, but + some users do, and we want to make it easy for users to remove + YYFAIL uses, which will produce warnings from Bison 2.5. */ +#endif #define YYRECOVERING() (!!yyerrstatus) @@ -858,17 +863,20 @@ yy_symbol_print (yyoutput, yytype, yyvaluep) #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) static void -yy_stack_print (yytype_int16 *bottom, yytype_int16 *top) +yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop) #else static void -yy_stack_print (bottom, top) - yytype_int16 *bottom; - yytype_int16 *top; +yy_stack_print (yybottom, yytop) + yytype_int16 *yybottom; + yytype_int16 *yytop; #endif { YYFPRINTF (stderr, "Stack now"); - for (; bottom <= top; ++bottom) - YYFPRINTF (stderr, " %d", *bottom); + for (; yybottom <= yytop; yybottom++) + { + int yybot = *yybottom; + YYFPRINTF (stderr, " %d", yybot); + } YYFPRINTF (stderr, "\n"); } @@ -902,11 +910,11 @@ yy_reduce_print (yyvsp, yyrule) /* The symbols being reduced. */ for (yyi = 0; yyi < yynrhs; yyi++) { - fprintf (stderr, " $%d = ", yyi + 1); + YYFPRINTF (stderr, " $%d = ", yyi + 1); yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], &(yyvsp[(yyi + 1) - (yynrhs)]) ); - fprintf (stderr, "\n"); + YYFPRINTF (stderr, "\n"); } } @@ -1186,10 +1194,8 @@ yydestruct (yymsg, yytype, yyvaluep) break; } } - /* Prevent warnings from -Wmissing-prototypes. */ - #ifdef YYPARSE_PARAM #if defined __STDC__ || defined __cplusplus int yyparse (void *YYPARSE_PARAM); @@ -1208,10 +1214,9 @@ int yyparse (); - -/*----------. -| yyparse. | -`----------*/ +/*-------------------------. +| yyparse or yypush_parse. | +`-------------------------*/ #ifdef YYPARSE_PARAM #if (defined __STDC__ || defined __C99__FUNC__ \ @@ -1235,74 +1240,75 @@ yyparse () #endif #endif { - /* The look-ahead symbol. */ +/* The lookahead symbol. */ int yychar; -/* The semantic value of the look-ahead symbol. */ +/* The semantic value of the lookahead symbol. */ YYSTYPE yylval; -/* Number of syntax errors so far. */ -int yynerrs; - - int yystate; - int yyn; - int yyresult; - /* Number of tokens to shift before error messages enabled. */ - int yyerrstatus; - /* Look-ahead token as an internal (translated) token number. */ - int yytoken = 0; -#if YYERROR_VERBOSE - /* Buffer for error messages, and its allocated size. */ - char yymsgbuf[128]; - char *yymsg = yymsgbuf; - YYSIZE_T yymsg_alloc = sizeof yymsgbuf; -#endif - - /* Three stacks and their tools: - `yyss': related to states, - `yyvs': related to semantic values, - `yyls': related to locations. - - Refer to the stacks thru separate pointers, to allow yyoverflow - to reallocate them elsewhere. */ + /* Number of syntax errors so far. */ + int yynerrs; - /* The state stack. */ - yytype_int16 yyssa[YYINITDEPTH]; - yytype_int16 *yyss = yyssa; - yytype_int16 *yyssp; + int yystate; + /* Number of tokens to shift before error messages enabled. */ + int yyerrstatus; - /* The semantic value stack. */ - YYSTYPE yyvsa[YYINITDEPTH]; - YYSTYPE *yyvs = yyvsa; - YYSTYPE *yyvsp; + /* The stacks and their tools: + `yyss': related to states. + `yyvs': related to semantic values. + Refer to the stacks thru separate pointers, to allow yyoverflow + to reallocate them elsewhere. */ + /* The state stack. */ + yytype_int16 yyssa[YYINITDEPTH]; + yytype_int16 *yyss; + yytype_int16 *yyssp; -#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) + /* The semantic value stack. */ + YYSTYPE yyvsa[YYINITDEPTH]; + YYSTYPE *yyvs; + YYSTYPE *yyvsp; - YYSIZE_T yystacksize = YYINITDEPTH; + YYSIZE_T yystacksize; + int yyn; + int yyresult; + /* Lookahead token as an internal (translated) token number. */ + int yytoken; /* The variables used to return semantic value and location from the action routines. */ YYSTYPE yyval; +#if YYERROR_VERBOSE + /* Buffer for error messages, and its allocated size. */ + char yymsgbuf[128]; + char *yymsg = yymsgbuf; + YYSIZE_T yymsg_alloc = sizeof yymsgbuf; +#endif + +#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) /* The number of symbols on the RHS of the reduced rule. Keep to zero when no symbol should be popped. */ int yylen = 0; + yytoken = 0; + yyss = yyssa; + yyvs = yyvsa; + yystacksize = YYINITDEPTH; + YYDPRINTF ((stderr, "Starting parse\n")); yystate = 0; yyerrstatus = 0; yynerrs = 0; - yychar = YYEMPTY; /* Cause a token to be read. */ + yychar = YYEMPTY; /* Cause a token to be read. */ /* Initialize stack pointers. Waste one element of value and location stack so that they stay on the same level as the state stack. The wasted elements are never initialized. */ - yyssp = yyss; yyvsp = yyvs; @@ -1332,7 +1338,6 @@ int yynerrs; YYSTYPE *yyvs1 = yyvs; yytype_int16 *yyss1 = yyss; - /* Each stack pointer address is followed by the size of the data in use in that stack, in bytes. This used to be a conditional around just the two extra args, but that might @@ -1340,7 +1345,6 @@ int yynerrs; yyoverflow (YY_("memory exhausted"), &yyss1, yysize * sizeof (*yyssp), &yyvs1, yysize * sizeof (*yyvsp), - &yystacksize); yyss = yyss1; @@ -1363,9 +1367,8 @@ int yynerrs; (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); if (! yyptr) goto yyexhaustedlab; - YYSTACK_RELOCATE (yyss); - YYSTACK_RELOCATE (yyvs); - + YYSTACK_RELOCATE (yyss_alloc, yyss); + YYSTACK_RELOCATE (yyvs_alloc, yyvs); # undef YYSTACK_RELOCATE if (yyss1 != yyssa) YYSTACK_FREE (yyss1); @@ -1376,7 +1379,6 @@ int yynerrs; yyssp = yyss + yysize - 1; yyvsp = yyvs + yysize - 1; - YYDPRINTF ((stderr, "Stack size increased to %lu\n", (unsigned long int) yystacksize)); @@ -1386,6 +1388,9 @@ int yynerrs; YYDPRINTF ((stderr, "Entering state %d\n", yystate)); + if (yystate == YYFINAL) + YYACCEPT; + goto yybackup; /*-----------. @@ -1394,16 +1399,16 @@ int yynerrs; yybackup: /* Do appropriate processing given the current state. Read a - look-ahead token if we need one and don't already have one. */ + lookahead token if we need one and don't already have one. */ - /* First try to decide what to do without reference to look-ahead token. */ + /* First try to decide what to do without reference to lookahead token. */ yyn = yypact[yystate]; if (yyn == YYPACT_NINF) goto yydefault; - /* Not known => get a look-ahead token if don't already have one. */ + /* Not known => get a lookahead token if don't already have one. */ - /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */ + /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ if (yychar == YYEMPTY) { YYDPRINTF ((stderr, "Reading a token: ")); @@ -1435,20 +1440,16 @@ yybackup: goto yyreduce; } - if (yyn == YYFINAL) - YYACCEPT; - /* Count tokens shifted since error; after three, turn off error status. */ if (yyerrstatus) yyerrstatus--; - /* Shift the look-ahead token. */ + /* Shift the lookahead token. */ YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); - /* Discard the shifted token unless it is eof. */ - if (yychar != YYEOF) - yychar = YYEMPTY; + /* Discard the shifted token. */ + yychar = YYEMPTY; yystate = yyn; *++yyvsp = yylval; @@ -1488,6 +1489,8 @@ yyreduce: switch (yyn) { case 2: + +/* Line 1464 of yacc.c */ #line 122 "../Source/WebCore/xml/XPathGrammar.y" { PARSER->m_topExpr = (yyvsp[(1) - (1)].expr); @@ -1495,6 +1498,8 @@ yyreduce: break; case 3: + +/* Line 1464 of yacc.c */ #line 129 "../Source/WebCore/xml/XPathGrammar.y" { (yyval.locationPath)->setAbsolute(false); @@ -1502,6 +1507,8 @@ yyreduce: break; case 4: + +/* Line 1464 of yacc.c */ #line 134 "../Source/WebCore/xml/XPathGrammar.y" { (yyval.locationPath)->setAbsolute(true); @@ -1509,6 +1516,8 @@ yyreduce: break; case 5: + +/* Line 1464 of yacc.c */ #line 141 "../Source/WebCore/xml/XPathGrammar.y" { (yyval.locationPath) = new LocationPath; @@ -1517,6 +1526,8 @@ yyreduce: break; case 6: + +/* Line 1464 of yacc.c */ #line 147 "../Source/WebCore/xml/XPathGrammar.y" { (yyval.locationPath) = (yyvsp[(2) - (2)].locationPath); @@ -1524,6 +1535,8 @@ yyreduce: break; case 7: + +/* Line 1464 of yacc.c */ #line 152 "../Source/WebCore/xml/XPathGrammar.y" { (yyval.locationPath) = (yyvsp[(2) - (2)].locationPath); @@ -1533,6 +1546,8 @@ yyreduce: break; case 8: + +/* Line 1464 of yacc.c */ #line 161 "../Source/WebCore/xml/XPathGrammar.y" { (yyval.locationPath) = new LocationPath; @@ -1543,6 +1558,8 @@ yyreduce: break; case 9: + +/* Line 1464 of yacc.c */ #line 169 "../Source/WebCore/xml/XPathGrammar.y" { (yyval.locationPath)->appendStep((yyvsp[(3) - (3)].step)); @@ -1551,6 +1568,8 @@ yyreduce: break; case 10: + +/* Line 1464 of yacc.c */ #line 175 "../Source/WebCore/xml/XPathGrammar.y" { (yyval.locationPath)->appendStep((yyvsp[(2) - (3)].step)); @@ -1561,6 +1580,8 @@ yyreduce: break; case 11: + +/* Line 1464 of yacc.c */ #line 185 "../Source/WebCore/xml/XPathGrammar.y" { if ((yyvsp[(2) - (2)].predList)) { @@ -1574,6 +1595,8 @@ yyreduce: break; case 12: + +/* Line 1464 of yacc.c */ #line 196 "../Source/WebCore/xml/XPathGrammar.y" { String localName; @@ -1594,6 +1617,8 @@ yyreduce: break; case 13: + +/* Line 1464 of yacc.c */ #line 214 "../Source/WebCore/xml/XPathGrammar.y" { if ((yyvsp[(3) - (3)].predList)) { @@ -1607,6 +1632,8 @@ yyreduce: break; case 14: + +/* Line 1464 of yacc.c */ #line 225 "../Source/WebCore/xml/XPathGrammar.y" { String localName; @@ -1627,6 +1654,8 @@ yyreduce: break; case 17: + +/* Line 1464 of yacc.c */ #line 249 "../Source/WebCore/xml/XPathGrammar.y" { (yyval.axis) = Step::AttributeAxis; @@ -1634,6 +1663,8 @@ yyreduce: break; case 18: + +/* Line 1464 of yacc.c */ #line 256 "../Source/WebCore/xml/XPathGrammar.y" { if (*(yyvsp[(1) - (3)].str) == "node") @@ -1649,6 +1680,8 @@ yyreduce: break; case 19: + +/* Line 1464 of yacc.c */ #line 269 "../Source/WebCore/xml/XPathGrammar.y" { (yyval.nodeTest) = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest); @@ -1658,6 +1691,8 @@ yyreduce: break; case 20: + +/* Line 1464 of yacc.c */ #line 276 "../Source/WebCore/xml/XPathGrammar.y" { (yyval.nodeTest) = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, (yyvsp[(3) - (4)].str)->stripWhiteSpace()); @@ -1668,6 +1703,8 @@ yyreduce: break; case 21: + +/* Line 1464 of yacc.c */ #line 286 "../Source/WebCore/xml/XPathGrammar.y" { (yyval.predList) = 0; @@ -1675,6 +1712,8 @@ yyreduce: break; case 23: + +/* Line 1464 of yacc.c */ #line 295 "../Source/WebCore/xml/XPathGrammar.y" { (yyval.predList) = new Vector<Predicate*>; @@ -1685,6 +1724,8 @@ yyreduce: break; case 24: + +/* Line 1464 of yacc.c */ #line 303 "../Source/WebCore/xml/XPathGrammar.y" { (yyval.predList)->append(new Predicate((yyvsp[(2) - (2)].expr))); @@ -1693,6 +1734,8 @@ yyreduce: break; case 25: + +/* Line 1464 of yacc.c */ #line 311 "../Source/WebCore/xml/XPathGrammar.y" { (yyval.expr) = (yyvsp[(2) - (3)].expr); @@ -1700,6 +1743,8 @@ yyreduce: break; case 26: + +/* Line 1464 of yacc.c */ #line 318 "../Source/WebCore/xml/XPathGrammar.y" { (yyval.step) = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); @@ -1708,6 +1753,8 @@ yyreduce: break; case 27: + +/* Line 1464 of yacc.c */ #line 326 "../Source/WebCore/xml/XPathGrammar.y" { (yyval.step) = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); @@ -1716,6 +1763,8 @@ yyreduce: break; case 28: + +/* Line 1464 of yacc.c */ #line 332 "../Source/WebCore/xml/XPathGrammar.y" { (yyval.step) = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); @@ -1724,6 +1773,8 @@ yyreduce: break; case 29: + +/* Line 1464 of yacc.c */ #line 340 "../Source/WebCore/xml/XPathGrammar.y" { (yyval.expr) = new VariableReference(*(yyvsp[(1) - (1)].str)); @@ -1733,6 +1784,8 @@ yyreduce: break; case 30: + +/* Line 1464 of yacc.c */ #line 347 "../Source/WebCore/xml/XPathGrammar.y" { (yyval.expr) = (yyvsp[(2) - (3)].expr); @@ -1740,6 +1793,8 @@ yyreduce: break; case 31: + +/* Line 1464 of yacc.c */ #line 352 "../Source/WebCore/xml/XPathGrammar.y" { (yyval.expr) = new StringExpression(*(yyvsp[(1) - (1)].str)); @@ -1749,6 +1804,8 @@ yyreduce: break; case 32: + +/* Line 1464 of yacc.c */ #line 359 "../Source/WebCore/xml/XPathGrammar.y" { (yyval.expr) = new Number((yyvsp[(1) - (1)].str)->toDouble()); @@ -1758,6 +1815,8 @@ yyreduce: break; case 34: + +/* Line 1464 of yacc.c */ #line 370 "../Source/WebCore/xml/XPathGrammar.y" { (yyval.expr) = createFunction(*(yyvsp[(1) - (3)].str)); @@ -1769,6 +1828,8 @@ yyreduce: break; case 35: + +/* Line 1464 of yacc.c */ #line 379 "../Source/WebCore/xml/XPathGrammar.y" { (yyval.expr) = createFunction(*(yyvsp[(1) - (4)].str), *(yyvsp[(3) - (4)].argList)); @@ -1781,6 +1842,8 @@ yyreduce: break; case 36: + +/* Line 1464 of yacc.c */ #line 391 "../Source/WebCore/xml/XPathGrammar.y" { (yyval.argList) = new Vector<Expression*>; @@ -1791,6 +1854,8 @@ yyreduce: break; case 37: + +/* Line 1464 of yacc.c */ #line 399 "../Source/WebCore/xml/XPathGrammar.y" { (yyval.argList)->append((yyvsp[(3) - (3)].expr)); @@ -1799,6 +1864,8 @@ yyreduce: break; case 40: + +/* Line 1464 of yacc.c */ #line 413 "../Source/WebCore/xml/XPathGrammar.y" { (yyval.expr) = new Union; @@ -1811,6 +1878,8 @@ yyreduce: break; case 41: + +/* Line 1464 of yacc.c */ #line 425 "../Source/WebCore/xml/XPathGrammar.y" { (yyval.expr) = (yyvsp[(1) - (1)].locationPath); @@ -1818,6 +1887,8 @@ yyreduce: break; case 43: + +/* Line 1464 of yacc.c */ #line 432 "../Source/WebCore/xml/XPathGrammar.y" { (yyvsp[(3) - (3)].locationPath)->setAbsolute(true); @@ -1829,6 +1900,8 @@ yyreduce: break; case 44: + +/* Line 1464 of yacc.c */ #line 441 "../Source/WebCore/xml/XPathGrammar.y" { (yyvsp[(3) - (3)].locationPath)->insertFirstStep((yyvsp[(2) - (3)].step)); @@ -1842,6 +1915,8 @@ yyreduce: break; case 46: + +/* Line 1464 of yacc.c */ #line 456 "../Source/WebCore/xml/XPathGrammar.y" { (yyval.expr) = new Filter((yyvsp[(1) - (2)].expr), *(yyvsp[(2) - (2)].predList)); @@ -1852,6 +1927,8 @@ yyreduce: break; case 48: + +/* Line 1464 of yacc.c */ #line 468 "../Source/WebCore/xml/XPathGrammar.y" { (yyval.expr) = new LogicalOp(LogicalOp::OP_Or, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); @@ -1862,6 +1939,8 @@ yyreduce: break; case 50: + +/* Line 1464 of yacc.c */ #line 480 "../Source/WebCore/xml/XPathGrammar.y" { (yyval.expr) = new LogicalOp(LogicalOp::OP_And, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); @@ -1872,6 +1951,8 @@ yyreduce: break; case 52: + +/* Line 1464 of yacc.c */ #line 492 "../Source/WebCore/xml/XPathGrammar.y" { (yyval.expr) = new EqTestOp((yyvsp[(2) - (3)].eqop), (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); @@ -1882,6 +1963,8 @@ yyreduce: break; case 54: + +/* Line 1464 of yacc.c */ #line 504 "../Source/WebCore/xml/XPathGrammar.y" { (yyval.expr) = new EqTestOp((yyvsp[(2) - (3)].eqop), (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); @@ -1892,6 +1975,8 @@ yyreduce: break; case 56: + +/* Line 1464 of yacc.c */ #line 516 "../Source/WebCore/xml/XPathGrammar.y" { (yyval.expr) = new NumericOp(NumericOp::OP_Add, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); @@ -1902,6 +1987,8 @@ yyreduce: break; case 57: + +/* Line 1464 of yacc.c */ #line 524 "../Source/WebCore/xml/XPathGrammar.y" { (yyval.expr) = new NumericOp(NumericOp::OP_Sub, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); @@ -1912,6 +1999,8 @@ yyreduce: break; case 59: + +/* Line 1464 of yacc.c */ #line 536 "../Source/WebCore/xml/XPathGrammar.y" { (yyval.expr) = new NumericOp((yyvsp[(2) - (3)].numop), (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); @@ -1922,6 +2011,8 @@ yyreduce: break; case 61: + +/* Line 1464 of yacc.c */ #line 548 "../Source/WebCore/xml/XPathGrammar.y" { (yyval.expr) = new Negative; @@ -1932,8 +2023,9 @@ yyreduce: break; -/* Line 1267 of yacc.c. */ -#line 1937 "/Source/WebCore/generated/XPathGrammar.tab.c" + +/* Line 1464 of yacc.c */ +#line 2029 "/Source/WebCore/generated/XPathGrammar.tab.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -1944,7 +2036,6 @@ yyreduce: *++yyvsp = yyval; - /* Now `shift' the result of the reduction. Determine what state that goes to, based on the state we popped back to and the rule number reduced by. */ @@ -2009,7 +2100,7 @@ yyerrlab: if (yyerrstatus == 3) { - /* If just tried and failed to reuse look-ahead token after an + /* If just tried and failed to reuse lookahead token after an error, discard it. */ if (yychar <= YYEOF) @@ -2026,7 +2117,7 @@ yyerrlab: } } - /* Else will try to reuse look-ahead token after shifting the error + /* Else will try to reuse lookahead token after shifting the error token. */ goto yyerrlab1; @@ -2083,9 +2174,6 @@ yyerrlab1: YY_STACK_PRINT (yyss, yyssp); } - if (yyn == YYFINAL) - YYACCEPT; - *++yyvsp = yylval; @@ -2110,7 +2198,7 @@ yyabortlab: yyresult = 1; goto yyreturn; -#ifndef yyoverflow +#if !defined(yyoverflow) || YYERROR_VERBOSE /*-------------------------------------------------. | yyexhaustedlab -- memory exhaustion comes here. | `-------------------------------------------------*/ @@ -2121,7 +2209,7 @@ yyexhaustedlab: #endif yyreturn: - if (yychar != YYEOF && yychar != YYEMPTY) + if (yychar != YYEMPTY) yydestruct ("Cleanup: discarding lookahead", yytoken, &yylval); /* Do not reclaim the symbols of the rule which action triggered @@ -2147,6 +2235,8 @@ yyreturn: } + +/* Line 1684 of yacc.c */ #line 556 "../Source/WebCore/xml/XPathGrammar.y" diff --git a/src/3rdparty/webkit/Source/WebCore/generated/XPathGrammar.h b/src/3rdparty/webkit/Source/WebCore/generated/XPathGrammar.h index 678818339b..8df658575f 100644 --- a/src/3rdparty/webkit/Source/WebCore/generated/XPathGrammar.h +++ b/src/3rdparty/webkit/Source/WebCore/generated/XPathGrammar.h @@ -1,24 +1,22 @@ -/* A Bison parser, made by GNU Bison 2.3. */ +/* A Bison parser, made by GNU Bison 2.4.3. */ /* 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 + + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006, + 2009, 2010 Free Software Foundation, Inc. + + 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 +27,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 @@ -59,33 +58,16 @@ XPATH_ERROR = 275 }; #endif -/* Tokens. */ -#define MULOP 258 -#define RELOP 259 -#define EQOP 260 -#define MINUS 261 -#define PLUS 262 -#define AND 263 -#define OR 264 -#define AXISNAME 265 -#define NODETYPE 266 -#define PI 267 -#define FUNCTIONNAME 268 -#define LITERAL 269 -#define VARIABLEREFERENCE 270 -#define NUMBER 271 -#define DOTDOT 272 -#define SLASHSLASH 273 -#define NAMETEST 274 -#define XPATH_ERROR 275 - #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 60 "../Source/WebCore/xml/XPathGrammar.y" { + +/* Line 1685 of yacc.c */ +#line 60 "../Source/WebCore/xml/XPathGrammar.y" + Step::Axis axis; Step::NodeTest* nodeTest; NumericOp::Opcode numop; @@ -96,14 +78,17 @@ typedef union YYSTYPE Vector<Expression*>* argList; Step* step; LocationPath* locationPath; -} -/* Line 1529 of yacc.c. */ -#line 102 "/Source/WebCore/generated/XPathGrammar.tab.h" - YYSTYPE; + + + +/* Line 1685 of yacc.c */ +#line 86 "/Source/WebCore/generated/XPathGrammar.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 + diff --git a/src/3rdparty/webkit/Source/WebCore/platform/qt/ClipboardQt.cpp b/src/3rdparty/webkit/Source/WebCore/platform/qt/ClipboardQt.cpp index bd7aa7c533..e43c670c15 100644 --- a/src/3rdparty/webkit/Source/WebCore/platform/qt/ClipboardQt.cpp +++ b/src/3rdparty/webkit/Source/WebCore/platform/qt/ClipboardQt.cpp @@ -298,11 +298,10 @@ void ClipboardQt::declareAndWriteDragImage(Element* element, const KURL& url, co QList<QUrl> urls; urls.append(url); - urls.append(fullURL); m_writableData->setText(title); m_writableData->setUrls(urls); - m_writableData->setHtml(createMarkup(element, IncludeNode, 0, AbsoluteURLs)); + m_writableData->setHtml(imageToMarkup(fullURL, element)); #ifndef QT_NO_CLIPBOARD if (isForCopyAndPaste()) QApplication::clipboard()->setMimeData(m_writableData); diff --git a/src/3rdparty/webkit/Source/WebCore/rendering/RenderIFrame.cpp b/src/3rdparty/webkit/Source/WebCore/rendering/RenderIFrame.cpp index a471b0e63d..366d9e73dd 100644 --- a/src/3rdparty/webkit/Source/WebCore/rendering/RenderIFrame.cpp +++ b/src/3rdparty/webkit/Source/WebCore/rendering/RenderIFrame.cpp @@ -85,9 +85,12 @@ bool RenderIFrame::flattenFrame() HTMLIFrameElement* element = static_cast<HTMLIFrameElement*>(node()); bool isScrollable = element->scrollingMode() != ScrollbarAlwaysOff; - if (!isScrollable && style()->width().isFixed() - && style()->height().isFixed()) - return false; + if (style()->width().isFixed() && style()->height().isFixed()) { + if (!isScrollable) + return false; + if (style()->width().value() <= 0 || style()->height().value() <= 0) + return false; + } Frame* frame = element->document()->frame(); bool enabled = frame && frame->settings()->frameFlatteningEnabled(); diff --git a/src/3rdparty/webkit/Source/WebKit/qt/ChangeLog b/src/3rdparty/webkit/Source/WebKit/qt/ChangeLog index 57f79be926..031deeef77 100644 --- a/src/3rdparty/webkit/Source/WebKit/qt/ChangeLog +++ b/src/3rdparty/webkit/Source/WebKit/qt/ChangeLog @@ -1,5 +1,34 @@ 2011-06-02 Andreas Kling <kling@webkit.org> + Rubber-stamped by Simon Hausmann. + + Remove Qt's precompiled header hack as it was broken, and was not even + used unless building WebKit inside a Qt tree. + + * WebKit_pch.h: Removed. + +2011-06-01 Andreas Kling <kling@webkit.org> + + Reviewed by Benjamin Poulain. + + REGRESSION: [Qt] QNetworkReply delivered by the unsupportedContent() signal does not contain downloaded data + https://bugs.webkit.org/show_bug.cgi?id=49650 + + Defer emission of QWebPage::unsupportedContent() until we're back in the event loop. + This lets the QNAM backend finish with the reply without handing over ownership to the user code. + + No new tests since this doesn't fail for qrc:// or file:// URLs and our tests can't depend on http:// URLs. + + To correctly solve this issue, we need changes to Qt, tracked here: + http://bugreports.qt.nokia.com/browse/QTBUG-18718 + + * WebCoreSupport/FrameLoaderClientQt.cpp: + (WebCore::FrameLoaderClientQt::setFrame): + (WebCore::FrameLoaderClientQt::download): + * WebCoreSupport/FrameLoaderClientQt.h: + +2011-06-02 Andreas Kling <kling@webkit.org> + Unreviewed build fix. To support building namespaced Qt, we require that forward-declarations diff --git a/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp b/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp index 62a3322c4a..6a17aa9c78 100644 --- a/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp +++ b/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp @@ -237,6 +237,12 @@ void FrameLoaderClientQt::setFrame(QWebFrame* webFrame, Frame* frame) m_webFrame->page(), SIGNAL(loadProgress(int))); connect(this, SIGNAL(loadFinished(bool)), m_webFrame->page(), SIGNAL(loadFinished(bool))); + + // FIXME: The queued connection here is needed because of a problem with QNetworkAccessManager. + // See http://bugreports.qt.nokia.com/browse/QTBUG-18718 + connect(this, SIGNAL(unsupportedContent(QNetworkReply*)), + m_webFrame->page(), SIGNAL(unsupportedContent(QNetworkReply*)), Qt::QueuedConnection); + connect(this, SIGNAL(loadFinished(bool)), m_webFrame, SIGNAL(loadFinished(bool))); connect(this, SIGNAL(titleChanged(QString)), @@ -1013,7 +1019,7 @@ void FrameLoaderClientQt::download(WebCore::ResourceHandle* handle, const WebCor if (reply) { QWebPage* page = m_webFrame->page(); if (page->forwardUnsupportedContent()) - emit page->unsupportedContent(reply); + emit unsupportedContent(reply); else reply->abort(); } diff --git a/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h b/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h index 0391a0b16f..bf7821bd62 100644 --- a/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h +++ b/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h @@ -43,6 +43,8 @@ #include <QUrl> #include <qobject.h> #include <wtf/Forward.h> + +class QNetworkReply; class QWebFrame; namespace WebCore { @@ -68,6 +70,7 @@ signals: void loadProgress(int d); void loadFinished(bool); void titleChanged(const QString& title); + void unsupportedContent(QNetworkReply*); public: FrameLoaderClientQt(); diff --git a/src/3rdparty/webkit/Source/WebKit/qt/WebKit_pch.h b/src/3rdparty/webkit/Source/WebKit/qt/WebKit_pch.h deleted file mode 100644 index f9f0fc1619..0000000000 --- a/src/3rdparty/webkit/Source/WebKit/qt/WebKit_pch.h +++ /dev/null @@ -1,80 +0,0 @@ -/* - * This file is part of the precompiled header for all of WebKit. - * - * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public License - * along with this library; see the file COPYING.LIB. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - * - */ - -/* - * This is a precompiled header file for use in Xcode / Mac GCC / - * GCC >= 3.4 / VC to greatly speed the building of QtWebKit. - * - * The order of the includes appears random and arbitrary. But unfortunately - * MSVC is very sensitive and behaves fairly strange when compiling with - * precompiled headers. Please be very careful when adding, removing or - * changing the order of included header files. - */ - - -#if defined __cplusplus - -#if defined(_WIN32) && !defined(_WIN32_WCE) -#define _CRT_RAND_S -#define _WIN32_WINNT 0x0500 -#include <windows.h> -#endif - -#include "../../Source/JavaScriptCore/config.h" - -#include <math.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <algorithm> -#include <assert.h> -#include <ctype.h> -#include <limits.h> - -#include <wtf/HashTable.h> -#include <wtf/Vector.h> -#include <wtf/ListHashSet.h> -#include <wtf/HashMap.h> -#include <wtf/HashSet.h> -#include <wtf/HashTraits.h> -#include <wtf/HashIterators.h> -#include <wtf/TCPageMap.h> -#include <wtf/Assertions.h> -#include <wtf/HashCountedSet.h> -#include <wtf/PassRefPtr.h> -#include <wtf/Platform.h> -#include <wtf/RefPtr.h> -#include <wtf/VectorTraits.h> -#include <wtf/MathExtras.h> -#include <wtf/HashFunctions.h> -#include <wtf/OwnPtr.h> -#include <wtf/OwnArrayPtr.h> -#include <wtf/ListRefPtr.h> -#include <wtf/FastMalloc.h> -#include <wtf/TCSystemAlloc.h> -#include <wtf/StringExtras.h> -#include <wtf/Noncopyable.h> -#include <wtf/Forward.h> -#include <wtf/UnusedParam.h> -#include <wtf/AlwaysInline.h> -#include <wtf/GetPtr.h> -#endif diff --git a/src/3rdparty/webkit/Tools/QtTestBrowser/QtTestBrowser.pro b/src/3rdparty/webkit/Tools/QtTestBrowser/QtTestBrowser.pro deleted file mode 100644 index a7826e5bba..0000000000 --- a/src/3rdparty/webkit/Tools/QtTestBrowser/QtTestBrowser.pro +++ /dev/null @@ -1,69 +0,0 @@ -TEMPLATE = app - -SOURCES += \ - locationedit.cpp \ - launcherwindow.cpp \ - main.cpp \ - mainwindow.cpp \ - urlloader.cpp \ - utils.cpp \ - webpage.cpp \ - webview.cpp \ - fpstimer.cpp \ - -HEADERS += \ - locationedit.h \ - launcherwindow.h \ - mainwindow.h \ - urlloader.h \ - utils.h \ - webinspector.h \ - webpage.h \ - webview.h \ - fpstimer.h \ - -!isEqual(QT_ARCH,sh4): CONFIG += uitools - -isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../.. -include(../../Source/WebKit.pri) -INCLUDEPATH += ../../Source/WebKit/qt/WebCoreSupport - -DESTDIR = $$OUTPUT_DIR/bin -!CONFIG(standalone_package): CONFIG -= app_bundle - -QT += network -macx:QT+=xml - -unix:!mac:!symbian:!embedded { - CONFIG += link_pkgconfig - PKGCONFIG += fontconfig -} - -linux-* { - # From Creator's src/rpath.pri: - # Do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR - # this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var. - QMAKE_RPATHDIR = \$\$ORIGIN/../lib $$QMAKE_RPATHDIR - MY_RPATH = $$join(QMAKE_RPATHDIR, ":") - - QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${MY_RPATH}\' - QMAKE_RPATHDIR = -} else { - QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR -} - -symbian { - TARGET.UID3 = 0xA000E543 - TARGET.CAPABILITY = ReadUserData WriteUserData NetworkServices Location - MMP_RULES *= pageddata -} - -contains(QT_CONFIG, opengl) { - QT += opengl - DEFINES += QT_CONFIGURED_WITH_OPENGL -} - -DEFINES -= QT_ASCII_CAST_WARNINGS - -RESOURCES += \ - QtTestBrowser.qrc diff --git a/src/3rdparty/webkit/Tools/QtTestBrowser/QtTestBrowser.qrc b/src/3rdparty/webkit/Tools/QtTestBrowser/QtTestBrowser.qrc deleted file mode 100644 index b6036e89d1..0000000000 --- a/src/3rdparty/webkit/Tools/QtTestBrowser/QtTestBrowser.qrc +++ /dev/null @@ -1,6 +0,0 @@ -<RCC> - <qresource prefix="/"> - <file>useragentlist.txt</file> - <file>favicon.png</file> - </qresource> -</RCC> diff --git a/src/3rdparty/webkit/Tools/QtTestBrowser/favicon.png b/src/3rdparty/webkit/Tools/QtTestBrowser/favicon.png Binary files differdeleted file mode 100644 index 4462752a53..0000000000 --- a/src/3rdparty/webkit/Tools/QtTestBrowser/favicon.png +++ /dev/null diff --git a/src/3rdparty/webkit/Tools/QtTestBrowser/fpstimer.cpp b/src/3rdparty/webkit/Tools/QtTestBrowser/fpstimer.cpp deleted file mode 100644 index eae3d9c008..0000000000 --- a/src/3rdparty/webkit/Tools/QtTestBrowser/fpstimer.cpp +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "fpstimer.h" - -#include <QDateTime> -#include <QTimerEvent> - -// We save a maximum of 10000 frames, and purge 2000 at a time -#define MAX_FRAMES_SAVED 10000 -#define FRAMES_TO_PURGE_WHEN_FULL 2000 -// 60 FPS -#define FPS_MEASURE_INTERVAL 1000 / 60 - -FpsTimer::FpsTimer(QObject* parent) - : QObject(parent) - , m_timer(0) -{ -} - -int FpsTimer::numFrames(int spanMillis) const -{ - const QTime now = QTime::currentTime(); - - int count = 0; - for (int i = m_frames.length() - 1; i >= 0; --i, ++count) { - int msecs = m_frames[i].msecsTo(now); - if (msecs < 0) - msecs += 24 * 60 * 60 * 1000; - if (msecs > spanMillis) - break; - } - return count; -} - -void FpsTimer::start() -{ - m_timer = startTimer(FPS_MEASURE_INTERVAL); -} - -void FpsTimer::stop() -{ - if (!m_timer) - return; - killTimer(m_timer); - m_frames.clear(); -} - -void FpsTimer::timerEvent(QTimerEvent* event) -{ - if (event->timerId() != m_timer) - return; - m_frames.append(QTime::currentTime()); - if (m_frames.length() > MAX_FRAMES_SAVED) - m_frames.erase(m_frames.begin(), m_frames.begin() + FRAMES_TO_PURGE_WHEN_FULL); -} diff --git a/src/3rdparty/webkit/Tools/QtTestBrowser/fpstimer.h b/src/3rdparty/webkit/Tools/QtTestBrowser/fpstimer.h deleted file mode 100644 index eed1198afe..0000000000 --- a/src/3rdparty/webkit/Tools/QtTestBrowser/fpstimer.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef fpstimer_h -#define fpstimer_h - -#include <QObject> -#include <QSet> -#include <QTime> - -class FpsTimer : public QObject { - Q_OBJECT - -public: - FpsTimer(QObject* parent = 0); - int numFrames(int spanMillis = 1000) const; - -public Q_SLOTS: - void start(); - void stop(); - -protected slots: - virtual void timerEvent(QTimerEvent*); - -private: - int m_timer; - QList<QTime> m_frames; -}; - -#endif // FPSMEASURE_H diff --git a/src/3rdparty/webkit/Tools/QtTestBrowser/launcherwindow.cpp b/src/3rdparty/webkit/Tools/QtTestBrowser/launcherwindow.cpp deleted file mode 100644 index 980fc58168..0000000000 --- a/src/3rdparty/webkit/Tools/QtTestBrowser/launcherwindow.cpp +++ /dev/null @@ -1,1066 +0,0 @@ -/* - * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) - * Copyright (C) 2011 University of Szeged - * Copyright (C) 2011 Kristof Kosztyo <Kosztyo.Kristof@stud.u-szeged.hu> - * Copyright (C) 2009 Girish Ramakrishnan <girish@forwardbias.in> - * Copyright (C) 2006 George Staikos <staikos@kde.org> - * Copyright (C) 2006 Dirk Mueller <mueller@kde.org> - * Copyright (C) 2006 Zack Rusin <zack@kde.org> - * Copyright (C) 2006 Simon Hausmann <hausmann@kde.org> - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "launcherwindow.h" -#include "urlloader.h" - -const int gExitClickArea = 80; -QVector<int> LauncherWindow::m_zoomLevels; - -LauncherWindow::LauncherWindow(WindowOptions* data, QGraphicsScene* sharedScene) - : MainWindow() - , m_currentZoom(100) - , m_urlLoader(0) - , m_view(0) - , m_inspector(0) - , m_formatMenuAction(0) - , m_zoomAnimation(0) -#ifndef QT_NO_LINEEDIT - , m_findFlag(0) -#endif -{ - if (data) - m_windowOptions = *data; - - init(); - if (sharedScene && data->useGraphicsView) - static_cast<QGraphicsView*>(m_view)->setScene(sharedScene); - - createChrome(); -} - -LauncherWindow::~LauncherWindow() -{ - grabZoomKeys(false); - delete m_urlLoader; -} - -void LauncherWindow::init() -{ - QSplitter* splitter = new QSplitter(Qt::Vertical, this); - setCentralWidget(splitter); - - if (m_windowOptions.startMaximized) - setWindowState(windowState() | Qt::WindowMaximized); - else - resize(800, 600); - - m_inspector = new WebInspector; -#ifndef QT_NO_PROPERTIES - if (!m_windowOptions.inspectorUrl.isEmpty()) - m_inspector->setProperty("_q_inspectorUrl", m_windowOptions.inspectorUrl); -#endif - connect(this, SIGNAL(destroyed()), m_inspector, SLOT(deleteLater())); - - // the zoom values are chosen to be like in Mozilla Firefox 3 - if (!m_zoomLevels.count()) { - m_zoomLevels << 30 << 50 << 67 << 80 << 90; - m_zoomLevels << 100; - m_zoomLevels << 110 << 120 << 133 << 150 << 170 << 200 << 240 << 300; - } - - grabZoomKeys(true); - - initializeView(); -} - -void LauncherWindow::initializeView() -{ - delete m_view; - - m_inputUrl = addressUrl(); - QUrl url = page()->mainFrame()->url(); - setPage(new WebPage(this)); - - QSplitter* splitter = static_cast<QSplitter*>(centralWidget()); - - if (!m_windowOptions.useGraphicsView) { - WebViewTraditional* view = new WebViewTraditional(splitter); - view->setPage(page()); - - view->installEventFilter(this); - - m_view = view; - } else { - WebViewGraphicsBased* view = new WebViewGraphicsBased(splitter); - m_view = view; -#if defined(QT_CONFIGURED_WITH_OPENGL) - toggleQGLWidgetViewport(m_windowOptions.useQGLWidgetViewport); -#endif - view->setPage(page()); - - connect(view, SIGNAL(currentFPSUpdated(int)), this, SLOT(updateFPS(int))); - - view->installEventFilter(this); - // The implementation of QAbstractScrollArea::eventFilter makes us need - // to install the event filter also on the viewport of a QGraphicsView. - view->viewport()->installEventFilter(this); - } - - m_touchMocking = false; - - connect(page(), SIGNAL(loadStarted()), this, SLOT(loadStarted())); - connect(page(), SIGNAL(loadFinished(bool)), this, SLOT(loadFinished())); - connect(page(), SIGNAL(linkHovered(const QString&, const QString&, const QString&)), - this, SLOT(showLinkHover(const QString&, const QString&))); - connect(this, SIGNAL(enteredFullScreenMode(bool)), this, SLOT(toggleFullScreenMode(bool))); - - if (m_windowOptions.printLoadedUrls) - connect(page()->mainFrame(), SIGNAL(urlChanged(QUrl)), this, SLOT(printURL(QUrl))); - - applyPrefs(); - - splitter->addWidget(m_inspector); - m_inspector->setPage(page()); - m_inspector->hide(); - - if (m_windowOptions.remoteInspectorPort) - page()->setProperty("_q_webInspectorServerPort", m_windowOptions.remoteInspectorPort); - - if (url.isValid()) - page()->mainFrame()->load(url); - else { - setAddressUrl(m_inputUrl); - m_inputUrl = QString(); - } -} - -void LauncherWindow::applyPrefs() -{ - QWebSettings* settings = page()->settings(); - settings->setAttribute(QWebSettings::AcceleratedCompositingEnabled, m_windowOptions.useCompositing); - settings->setAttribute(QWebSettings::TiledBackingStoreEnabled, m_windowOptions.useTiledBackingStore); - settings->setAttribute(QWebSettings::FrameFlatteningEnabled, m_windowOptions.useFrameFlattening); - settings->setAttribute(QWebSettings::WebGLEnabled, m_windowOptions.useWebGL); - - if (!isGraphicsBased()) - return; - - WebViewGraphicsBased* view = static_cast<WebViewGraphicsBased*>(m_view); - view->setViewportUpdateMode(m_windowOptions.viewportUpdateMode); - view->setFrameRateMeasurementEnabled(m_windowOptions.showFrameRate); - view->setItemCacheMode(m_windowOptions.cacheWebView ? QGraphicsItem::DeviceCoordinateCache : QGraphicsItem::NoCache); - - if (m_windowOptions.resizesToContents) - toggleResizesToContents(m_windowOptions.resizesToContents); -} - -void LauncherWindow::createChrome() -{ -#ifndef QT_NO_SHORTCUT - QMenu* fileMenu = menuBar()->addMenu("&File"); - fileMenu->addAction("New Window", this, SLOT(newWindow()), QKeySequence::New); - fileMenu->addAction(tr("Open File..."), this, SLOT(openFile()), QKeySequence::Open); - fileMenu->addAction(tr("Open Location..."), this, SLOT(openLocation()), QKeySequence(Qt::CTRL | Qt::Key_L)); - fileMenu->addAction("Close Window", this, SLOT(close()), QKeySequence::Close); - fileMenu->addSeparator(); - fileMenu->addAction("Take Screen Shot...", this, SLOT(screenshot())); -#ifndef QT_NO_PRINTER - fileMenu->addAction(tr("Print..."), this, SLOT(print()), QKeySequence::Print); -#endif - fileMenu->addSeparator(); - fileMenu->addAction("Quit", QApplication::instance(), SLOT(closeAllWindows()), QKeySequence(Qt::CTRL | Qt::Key_Q)); - - QMenu* editMenu = menuBar()->addMenu("&Edit"); - editMenu->addAction(page()->action(QWebPage::Undo)); - editMenu->addAction(page()->action(QWebPage::Redo)); - editMenu->addSeparator(); - editMenu->addAction(page()->action(QWebPage::Cut)); - editMenu->addAction(page()->action(QWebPage::Copy)); - editMenu->addAction(page()->action(QWebPage::Paste)); - editMenu->addSeparator(); -#ifndef QT_NO_LINEEDIT - editMenu->addAction("&Find", this, SLOT(showFindBar()), QKeySequence(Qt::CTRL | Qt::Key_F)); - editMenu->addSeparator(); -#endif - QAction* setEditable = editMenu->addAction("Set Editable", this, SLOT(setEditable(bool))); - setEditable->setCheckable(true); - - QMenu* viewMenu = menuBar()->addMenu("&View"); - viewMenu->addAction(page()->action(QWebPage::Stop)); - viewMenu->addAction(page()->action(QWebPage::Reload)); - viewMenu->addSeparator(); - QAction* zoomIn = viewMenu->addAction("Zoom &In", this, SLOT(zoomIn())); - QAction* zoomOut = viewMenu->addAction("Zoom &Out", this, SLOT(zoomOut())); - QAction* resetZoom = viewMenu->addAction("Reset Zoom", this, SLOT(resetZoom())); - QAction* zoomTextOnly = viewMenu->addAction("Zoom Text Only", this, SLOT(toggleZoomTextOnly(bool))); - zoomTextOnly->setCheckable(true); - zoomTextOnly->setChecked(false); - viewMenu->addSeparator(); - viewMenu->addAction("Dump HTML", this, SLOT(dumpHtml())); - // viewMenu->addAction("Dump plugins", this, SLOT(dumpPlugins())); - - zoomIn->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_Plus)); - zoomOut->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_Minus)); - resetZoom->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_0)); - - QMenu* formatMenu = new QMenu("F&ormat", this); - m_formatMenuAction = menuBar()->addMenu(formatMenu); - m_formatMenuAction->setVisible(false); - formatMenu->addAction(page()->action(QWebPage::ToggleBold)); - formatMenu->addAction(page()->action(QWebPage::ToggleItalic)); - formatMenu->addAction(page()->action(QWebPage::ToggleUnderline)); - QMenu* writingMenu = formatMenu->addMenu(tr("Writing Direction")); - writingMenu->addAction(page()->action(QWebPage::SetTextDirectionDefault)); - writingMenu->addAction(page()->action(QWebPage::SetTextDirectionLeftToRight)); - writingMenu->addAction(page()->action(QWebPage::SetTextDirectionRightToLeft)); - - QMenu* windowMenu = menuBar()->addMenu("&Window"); - QAction* toggleFullScreen = windowMenu->addAction("Toggle FullScreen", this, SIGNAL(enteredFullScreenMode(bool))); - toggleFullScreen->setShortcut(Qt::Key_F11); - toggleFullScreen->setCheckable(true); - toggleFullScreen->setChecked(false); - // When exit fullscreen mode by clicking on the exit area (bottom right corner) we must - // uncheck the Toggle FullScreen action. - toggleFullScreen->connect(this, SIGNAL(enteredFullScreenMode(bool)), SLOT(setChecked(bool))); - - QWebSettings* settings = page()->settings(); - - QMenu* toolsMenu = menuBar()->addMenu("&Develop"); - QMenu* graphicsViewMenu = toolsMenu->addMenu("QGraphicsView"); - QAction* toggleGraphicsView = graphicsViewMenu->addAction("Toggle use of QGraphicsView", this, SLOT(toggleWebView(bool))); - toggleGraphicsView->setCheckable(true); - toggleGraphicsView->setChecked(isGraphicsBased()); - - QAction* toggleWebGL = toolsMenu->addAction("Toggle WebGL", this, SLOT(toggleWebGL(bool))); - toggleWebGL->setCheckable(true); - toggleWebGL->setChecked(settings->testAttribute(QWebSettings::WebGLEnabled)); - - QAction* spatialNavigationAction = toolsMenu->addAction("Toggle Spatial Navigation", this, SLOT(toggleSpatialNavigation(bool))); - spatialNavigationAction->setCheckable(true); - spatialNavigationAction->setShortcut(QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_S)); - - QAction* toggleFrameFlattening = toolsMenu->addAction("Toggle Frame Flattening", this, SLOT(toggleFrameFlattening(bool))); - toggleFrameFlattening->setCheckable(true); - toggleFrameFlattening->setChecked(settings->testAttribute(QWebSettings::FrameFlatteningEnabled)); - - QAction* touchMockAction = toolsMenu->addAction("Toggle touch mocking", this, SLOT(setTouchMocking(bool))); - touchMockAction->setCheckable(true); - touchMockAction->setShortcut(QKeySequence(Qt::CTRL | Qt::ALT | Qt::Key_T)); - - toolsMenu->addSeparator(); - - QAction* toggleLocalStorage = toolsMenu->addAction("Enable Local Storage", this, SLOT(toggleLocalStorage(bool))); - toggleLocalStorage->setCheckable(true); - toggleLocalStorage->setChecked(m_windowOptions.useLocalStorage); - - QAction* toggleOfflineStorageDatabase = toolsMenu->addAction("Enable Offline Storage Database", this, SLOT(toggleOfflineStorageDatabase(bool))); - toggleOfflineStorageDatabase->setCheckable(true); - toggleOfflineStorageDatabase->setChecked(m_windowOptions.useOfflineStorageDatabase); - - QAction* toggleOfflineWebApplicationCache = toolsMenu->addAction("Enable Offline Web Application Cache", this, SLOT(toggleOfflineWebApplicationCache(bool))); - toggleOfflineWebApplicationCache->setCheckable(true); - toggleOfflineWebApplicationCache->setChecked(m_windowOptions.useOfflineWebApplicationCache); - - QAction* offlineStorageDefaultQuotaAction = toolsMenu->addAction("Set Offline Storage Default Quota Size", this, SLOT(setOfflineStorageDefaultQuota())); - offlineStorageDefaultQuotaAction->setCheckable(true); - offlineStorageDefaultQuotaAction->setChecked(m_windowOptions.offlineStorageDefaultQuotaSize); - - toolsMenu->addSeparator(); - - QAction* userAgentAction = toolsMenu->addAction("Change User Agent", this, SLOT(showUserAgentDialog())); - userAgentAction->setShortcut(QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_U)); - - toolsMenu->addAction("Select Elements...", this, SLOT(selectElements())); - - QAction* showInspectorAction = toolsMenu->addAction("Show Web Inspector", m_inspector, SLOT(setVisible(bool)), QKeySequence(Qt::CTRL | Qt::ALT | Qt::Key_I)); - showInspectorAction->setCheckable(true); - showInspectorAction->connect(m_inspector, SIGNAL(visibleChanged(bool)), SLOT(setChecked(bool))); - toolsMenu->addSeparator(); - toolsMenu->addAction("Load URLs from file", this, SLOT(loadURLListFromFile())); - - // GraphicsView sub menu. - QAction* toggleAcceleratedCompositing = graphicsViewMenu->addAction("Toggle Accelerated Compositing", this, SLOT(toggleAcceleratedCompositing(bool))); - toggleAcceleratedCompositing->setCheckable(true); - toggleAcceleratedCompositing->setChecked(settings->testAttribute(QWebSettings::AcceleratedCompositingEnabled)); - toggleAcceleratedCompositing->setEnabled(isGraphicsBased()); - toggleAcceleratedCompositing->connect(toggleGraphicsView, SIGNAL(toggled(bool)), SLOT(setEnabled(bool))); - - QAction* toggleResizesToContents = graphicsViewMenu->addAction("Toggle Resizes To Contents Mode", this, SLOT(toggleResizesToContents(bool))); - toggleResizesToContents->setCheckable(true); - toggleResizesToContents->setChecked(m_windowOptions.resizesToContents); - toggleResizesToContents->setEnabled(isGraphicsBased()); - toggleResizesToContents->connect(toggleGraphicsView, SIGNAL(toggled(bool)), SLOT(setEnabled(bool))); - - QAction* toggleTiledBackingStore = graphicsViewMenu->addAction("Toggle Tiled Backing Store", this, SLOT(toggleTiledBackingStore(bool))); - toggleTiledBackingStore->setCheckable(true); - toggleTiledBackingStore->setChecked(m_windowOptions.useTiledBackingStore); - toggleTiledBackingStore->setEnabled(isGraphicsBased()); - toggleTiledBackingStore->connect(toggleGraphicsView, SIGNAL(toggled(bool)), SLOT(setEnabled(bool))); - -#if defined(QT_CONFIGURED_WITH_OPENGL) - QAction* toggleQGLWidgetViewport = graphicsViewMenu->addAction("Toggle use of QGLWidget Viewport", this, SLOT(toggleQGLWidgetViewport(bool))); - toggleQGLWidgetViewport->setCheckable(true); - toggleQGLWidgetViewport->setChecked(m_windowOptions.useQGLWidgetViewport); - toggleQGLWidgetViewport->setEnabled(isGraphicsBased()); - toggleQGLWidgetViewport->connect(toggleGraphicsView, SIGNAL(toggled(bool)), SLOT(setEnabled(bool))); -#endif - - QMenu* viewportUpdateMenu = graphicsViewMenu->addMenu("Change Viewport Update Mode"); - viewportUpdateMenu->setEnabled(isGraphicsBased()); - viewportUpdateMenu->connect(toggleGraphicsView, SIGNAL(toggled(bool)), SLOT(setEnabled(bool))); - - QAction* fullUpdate = viewportUpdateMenu->addAction("FullViewportUpdate"); - fullUpdate->setCheckable(true); - fullUpdate->setChecked((m_windowOptions.viewportUpdateMode == QGraphicsView::FullViewportUpdate) ? true : false); - - QAction* minimalUpdate = viewportUpdateMenu->addAction("MinimalViewportUpdate"); - minimalUpdate->setCheckable(true); - minimalUpdate->setChecked((m_windowOptions.viewportUpdateMode == QGraphicsView::MinimalViewportUpdate) ? true : false); - - QAction* smartUpdate = viewportUpdateMenu->addAction("SmartViewportUpdate"); - smartUpdate->setCheckable(true); - smartUpdate->setChecked((m_windowOptions.viewportUpdateMode == QGraphicsView::SmartViewportUpdate) ? true : false); - - QAction* boundingRectUpdate = viewportUpdateMenu->addAction("BoundingRectViewportUpdate"); - boundingRectUpdate->setCheckable(true); - boundingRectUpdate->setChecked((m_windowOptions.viewportUpdateMode == QGraphicsView::BoundingRectViewportUpdate) ? true : false); - - QAction* noUpdate = viewportUpdateMenu->addAction("NoViewportUpdate"); - noUpdate->setCheckable(true); - noUpdate->setChecked((m_windowOptions.viewportUpdateMode == QGraphicsView::NoViewportUpdate) ? true : false); - - QSignalMapper* signalMapper = new QSignalMapper(viewportUpdateMenu); - signalMapper->setMapping(fullUpdate, QGraphicsView::FullViewportUpdate); - signalMapper->setMapping(minimalUpdate, QGraphicsView::MinimalViewportUpdate); - signalMapper->setMapping(smartUpdate, QGraphicsView::SmartViewportUpdate); - signalMapper->setMapping(boundingRectUpdate, QGraphicsView::BoundingRectViewportUpdate); - signalMapper->setMapping(noUpdate, QGraphicsView::NoViewportUpdate); - - connect(fullUpdate, SIGNAL(triggered()), signalMapper, SLOT(map())); - connect(minimalUpdate, SIGNAL(triggered()), signalMapper, SLOT(map())); - connect(smartUpdate, SIGNAL(triggered()), signalMapper, SLOT(map())); - connect(boundingRectUpdate, SIGNAL(triggered()), signalMapper, SLOT(map())); - connect(noUpdate, SIGNAL(triggered()), signalMapper, SLOT(map())); - - connect(signalMapper, SIGNAL(mapped(int)), this, SLOT(changeViewportUpdateMode(int))); - - QActionGroup* viewportUpdateModeActions = new QActionGroup(viewportUpdateMenu); - viewportUpdateModeActions->addAction(fullUpdate); - viewportUpdateModeActions->addAction(minimalUpdate); - viewportUpdateModeActions->addAction(smartUpdate); - viewportUpdateModeActions->addAction(boundingRectUpdate); - viewportUpdateModeActions->addAction(noUpdate); - - graphicsViewMenu->addSeparator(); - - QAction* flipAnimated = graphicsViewMenu->addAction("Animated Flip"); - flipAnimated->connect(toggleGraphicsView, SIGNAL(toggled(bool)), SLOT(setEnabled(bool))); - flipAnimated->setEnabled(isGraphicsBased()); - connect(flipAnimated, SIGNAL(triggered()), SLOT(animatedFlip())); - - QAction* flipYAnimated = graphicsViewMenu->addAction("Animated Y-Flip"); - flipYAnimated->connect(toggleGraphicsView, SIGNAL(toggled(bool)), SLOT(setEnabled(bool))); - flipYAnimated->setEnabled(isGraphicsBased()); - connect(flipYAnimated, SIGNAL(triggered()), SLOT(animatedYFlip())); - - QAction* cloneWindow = graphicsViewMenu->addAction("Clone Window", this, SLOT(cloneWindow())); - cloneWindow->connect(toggleGraphicsView, SIGNAL(toggled(bool)), SLOT(setEnabled(bool))); - cloneWindow->setEnabled(isGraphicsBased()); - - graphicsViewMenu->addSeparator(); - - QAction* showFPS = graphicsViewMenu->addAction("Show FPS", this, SLOT(showFPS(bool))); - showFPS->setCheckable(true); - showFPS->setEnabled(isGraphicsBased()); - showFPS->connect(toggleGraphicsView, SIGNAL(toggled(bool)), SLOT(setEnabled(bool))); - showFPS->setChecked(m_windowOptions.showFrameRate); - - QMenu* settingsMenu = menuBar()->addMenu("&Settings"); - - QAction* toggleAutoLoadImages = settingsMenu->addAction("Disable Auto Load Images", this, SLOT(toggleAutoLoadImages(bool))); - toggleAutoLoadImages->setCheckable(true); - toggleAutoLoadImages->setChecked(false); - - QAction* togglePlugins = settingsMenu->addAction("Disable Plugins", this, SLOT(togglePlugins(bool))); - togglePlugins->setCheckable(true); - togglePlugins->setChecked(false); - - QAction* toggleInterruptingJavaScripteEnabled = settingsMenu->addAction("Enable interrupting js scripts", this, SLOT(toggleInterruptingJavaScriptEnabled(bool))); - toggleInterruptingJavaScripteEnabled->setCheckable(true); - toggleInterruptingJavaScripteEnabled->setChecked(false); - - QAction* toggleJavascriptCanOpenWindows = settingsMenu->addAction("Enable js popup windows", this, SLOT(toggleJavascriptCanOpenWindows(bool))); - toggleJavascriptCanOpenWindows->setCheckable(true); - toggleJavascriptCanOpenWindows->setChecked(false); -#ifndef QT_NO_LINEEDIT - m_findBar = new QToolBar("Find", this); - addToolBar(Qt::BottomToolBarArea, m_findBar); - - QToolButton* findClose = new QToolButton(m_findBar); - findClose->setText("X"); - m_lineEdit = new QLineEdit(m_findBar); - m_lineEdit->setMaximumWidth(200); - QToolButton* findPrevious = new QToolButton(m_findBar); - findPrevious->setArrowType(Qt::LeftArrow); - QToolButton* findNext = new QToolButton(m_findBar); - findNext->setArrowType(Qt::RightArrow); - QCheckBox* findCaseSensitive = new QCheckBox("Case Sensitive", m_findBar); - QCheckBox* findWrapAround = new QCheckBox("Wrap Around", m_findBar); - QCheckBox* findHighLightAll = new QCheckBox("HighLight All", m_findBar); - - QSignalMapper* findSignalMapper = new QSignalMapper(m_findBar); - findSignalMapper->setMapping(m_lineEdit, s_findNormalFlag); - findSignalMapper->setMapping(findPrevious, QWebPage::FindBackward); - findSignalMapper->setMapping(findNext, s_findNormalFlag); - findSignalMapper->setMapping(findCaseSensitive, QWebPage::FindCaseSensitively); - findSignalMapper->setMapping(findWrapAround, QWebPage::FindWrapsAroundDocument); - findSignalMapper->setMapping(findHighLightAll, QWebPage::HighlightAllOccurrences); - - connect(findClose, SIGNAL(clicked()), this, SLOT(showFindBar())); - connect(m_lineEdit, SIGNAL(textChanged(const QString &)), findSignalMapper, SLOT(map())); - connect(findPrevious, SIGNAL(pressed()), findSignalMapper, SLOT(map())); - connect(findNext, SIGNAL(pressed()), findSignalMapper, SLOT(map())); - connect(findCaseSensitive, SIGNAL(stateChanged(int)), findSignalMapper, SLOT(map())); - connect(findWrapAround, SIGNAL(stateChanged(int)), findSignalMapper, SLOT(map())); - connect(findHighLightAll, SIGNAL(stateChanged(int)), findSignalMapper, SLOT(map())); - - connect(findSignalMapper, SIGNAL(mapped(int)), this, SLOT(find(int))); - - m_findBar->addWidget(findClose); - m_findBar->addWidget(m_lineEdit); - m_findBar->addWidget(findPrevious); - m_findBar->addWidget(findNext); - m_findBar->addWidget(findCaseSensitive); - m_findBar->addWidget(findWrapAround); - m_findBar->addWidget(findHighLightAll); - m_findBar->setMovable(false); - m_findBar->setVisible(false); -#endif -#endif -} - -bool LauncherWindow::isGraphicsBased() const -{ - return bool(qobject_cast<QGraphicsView*>(m_view)); -} - -void LauncherWindow::keyPressEvent(QKeyEvent* event) -{ -#ifdef Q_WS_MAEMO_5 - switch (event->key()) { - case Qt::Key_F7: - zoomIn(); - event->accept(); - break; - case Qt::Key_F8: - zoomOut(); - event->accept(); - break; - } -#endif - MainWindow::keyPressEvent(event); -} - -void LauncherWindow::grabZoomKeys(bool grab) -{ -#ifdef Q_WS_MAEMO_5 - if (!winId()) { - qWarning("Can't grab keys unless we have a window id"); - return; - } - - Atom atom = XInternAtom(QX11Info::display(), "_HILDON_ZOOM_KEY_ATOM", False); - if (!atom) { - qWarning("Unable to obtain _HILDON_ZOOM_KEY_ATOM"); - return; - } - - unsigned long val = (grab) ? 1 : 0; - XChangeProperty(QX11Info::display(), winId(), atom, XA_INTEGER, 32, PropModeReplace, reinterpret_cast<unsigned char*>(&val), 1); -#endif -} - -void LauncherWindow::sendTouchEvent() -{ - if (m_touchPoints.isEmpty()) - return; - - QEvent::Type type = QEvent::TouchUpdate; - if (m_touchPoints.size() == 1) { - if (m_touchPoints[0].state() == Qt::TouchPointReleased) - type = QEvent::TouchEnd; - else if (m_touchPoints[0].state() == Qt::TouchPointPressed) - type = QEvent::TouchBegin; - } - - QTouchEvent touchEv(type); - touchEv.setTouchPoints(m_touchPoints); - QCoreApplication::sendEvent(page(), &touchEv); - - // After sending the event, remove all touchpoints that were released - if (m_touchPoints[0].state() == Qt::TouchPointReleased) - m_touchPoints.removeAt(0); - if (m_touchPoints.size() > 1 && m_touchPoints[1].state() == Qt::TouchPointReleased) - m_touchPoints.removeAt(1); -} - -bool LauncherWindow::eventFilter(QObject* obj, QEvent* event) -{ - // If click pos is the bottom right corner (square with size defined by gExitClickArea) - // and the window is on FullScreen, the window must return to its original state. - if (event->type() == QEvent::MouseButtonRelease) { - QMouseEvent* ev = static_cast<QMouseEvent*>(event); - if (windowState() == Qt::WindowFullScreen - && ev->pos().x() > (width() - gExitClickArea) - && ev->pos().y() > (height() - gExitClickArea)) { - - emit enteredFullScreenMode(false); - } - } - - if (!m_touchMocking) - return QObject::eventFilter(obj, event); - - if (event->type() == QEvent::MouseButtonPress - || event->type() == QEvent::MouseButtonRelease - || event->type() == QEvent::MouseButtonDblClick - || event->type() == QEvent::MouseMove) { - - QMouseEvent* ev = static_cast<QMouseEvent*>(event); - if (ev->type() == QEvent::MouseMove - && !(ev->buttons() & Qt::LeftButton)) - return false; - - QTouchEvent::TouchPoint touchPoint; - touchPoint.setState(Qt::TouchPointMoved); - if ((ev->type() == QEvent::MouseButtonPress - || ev->type() == QEvent::MouseButtonDblClick)) - touchPoint.setState(Qt::TouchPointPressed); - else if (ev->type() == QEvent::MouseButtonRelease) - touchPoint.setState(Qt::TouchPointReleased); - - touchPoint.setId(0); - touchPoint.setScreenPos(ev->globalPos()); - touchPoint.setPos(ev->pos()); - touchPoint.setPressure(1); - - // If the point already exists, update it. Otherwise create it. - if (m_touchPoints.size() > 0 && !m_touchPoints[0].id()) - m_touchPoints[0] = touchPoint; - else if (m_touchPoints.size() > 1 && !m_touchPoints[1].id()) - m_touchPoints[1] = touchPoint; - else - m_touchPoints.append(touchPoint); - - sendTouchEvent(); - } else if (event->type() == QEvent::KeyPress - && static_cast<QKeyEvent*>(event)->key() == Qt::Key_F - && static_cast<QKeyEvent*>(event)->modifiers() == Qt::ControlModifier) { - - // If the keyboard point is already pressed, release it. - // Otherwise create it and append to m_touchPoints. - if (m_touchPoints.size() > 0 && m_touchPoints[0].id() == 1) { - m_touchPoints[0].setState(Qt::TouchPointReleased); - sendTouchEvent(); - } else if (m_touchPoints.size() > 1 && m_touchPoints[1].id() == 1) { - m_touchPoints[1].setState(Qt::TouchPointReleased); - sendTouchEvent(); - } else { - QTouchEvent::TouchPoint touchPoint; - touchPoint.setState(Qt::TouchPointPressed); - touchPoint.setId(1); - touchPoint.setScreenPos(QCursor::pos()); - touchPoint.setPos(m_view->mapFromGlobal(QCursor::pos())); - touchPoint.setPressure(1); - m_touchPoints.append(touchPoint); - sendTouchEvent(); - - // After sending the event, change the touchpoint state to stationary - m_touchPoints.last().setState(Qt::TouchPointStationary); - } - } - - return false; -} - -void LauncherWindow::loadStarted() -{ - m_view->setFocus(Qt::OtherFocusReason); -} - -void LauncherWindow::loadFinished() -{ - QUrl url = page()->mainFrame()->url(); - addCompleterEntry(url); - if (m_inputUrl.isEmpty()) - setAddressUrl(url.toString(QUrl::RemoveUserInfo)); - else { - setAddressUrl(m_inputUrl); - m_inputUrl = QString(); - } -} - -void LauncherWindow::showLinkHover(const QString &link, const QString &toolTip) -{ -#ifndef Q_WS_MAEMO_5 - statusBar()->showMessage(link); -#endif -#ifndef QT_NO_TOOLTIP - if (!toolTip.isEmpty()) - QToolTip::showText(QCursor::pos(), toolTip); -#endif -} - -void LauncherWindow::zoomAnimationFinished() -{ - if (!isGraphicsBased()) - return; - QGraphicsWebView* view = static_cast<WebViewGraphicsBased*>(m_view)->graphicsWebView(); - view->setTiledBackingStoreFrozen(false); -} - -void LauncherWindow::applyZoom() -{ -#ifndef QT_NO_ANIMATION - if (isGraphicsBased() && page()->settings()->testAttribute(QWebSettings::TiledBackingStoreEnabled)) { - QGraphicsWebView* view = static_cast<WebViewGraphicsBased*>(m_view)->graphicsWebView(); - view->setTiledBackingStoreFrozen(true); - if (!m_zoomAnimation) { - m_zoomAnimation = new QPropertyAnimation(view, "scale"); - m_zoomAnimation->setStartValue(view->scale()); - connect(m_zoomAnimation, SIGNAL(finished()), this, SLOT(zoomAnimationFinished())); - } else { - m_zoomAnimation->stop(); - m_zoomAnimation->setStartValue(m_zoomAnimation->currentValue()); - } - - m_zoomAnimation->setDuration(300); - m_zoomAnimation->setEndValue(qreal(m_currentZoom) / 100.); - m_zoomAnimation->start(); - return; - } -#endif - page()->mainFrame()->setZoomFactor(qreal(m_currentZoom) / 100.0); -} - -void LauncherWindow::zoomIn() -{ - int i = m_zoomLevels.indexOf(m_currentZoom); - Q_ASSERT(i >= 0); - if (i < m_zoomLevels.count() - 1) - m_currentZoom = m_zoomLevels[i + 1]; - - applyZoom(); -} - -void LauncherWindow::zoomOut() -{ - int i = m_zoomLevels.indexOf(m_currentZoom); - Q_ASSERT(i >= 0); - if (i > 0) - m_currentZoom = m_zoomLevels[i - 1]; - - applyZoom(); -} - -void LauncherWindow::resetZoom() -{ - m_currentZoom = 100; - applyZoom(); -} - -void LauncherWindow::toggleZoomTextOnly(bool b) -{ - page()->settings()->setAttribute(QWebSettings::ZoomTextOnly, b); -} - -void LauncherWindow::print() -{ -#if !defined(QT_NO_PRINTER) - QPrintPreviewDialog dlg(this); - connect(&dlg, SIGNAL(paintRequested(QPrinter*)), - page()->mainFrame(), SLOT(print(QPrinter*))); - dlg.exec(); -#endif -} - -void LauncherWindow::screenshot() -{ - QPixmap pixmap = QPixmap::grabWidget(m_view); - QLabel* label = 0; -#if !defined(Q_OS_SYMBIAN) - label = new QLabel; - label->setAttribute(Qt::WA_DeleteOnClose); - label->setWindowTitle("Screenshot - Preview"); - label->setPixmap(pixmap); - label->show(); -#endif - -#ifndef QT_NO_FILEDIALOG - QString fileName = QFileDialog::getSaveFileName(label, "Screenshot"); - if (!fileName.isEmpty()) { - pixmap.save(fileName, "png"); - if (label) - label->setWindowTitle(QString("Screenshot - Saved at %1").arg(fileName)); - } -#endif - -#if defined(QT_CONFIGURED_WITH_OPENGL) - toggleQGLWidgetViewport(m_windowOptions.useQGLWidgetViewport); -#endif -} - -void LauncherWindow::setEditable(bool on) -{ - page()->setContentEditable(on); - m_formatMenuAction->setVisible(on); -} - -/* -void LauncherWindow::dumpPlugins() { - QList<QWebPluginInfo> plugins = QWebSettings::pluginDatabase()->plugins(); - foreach (const QWebPluginInfo plugin, plugins) { - qDebug() << "Plugin:" << plugin.name(); - foreach (const QWebPluginInfo::MimeType mime, plugin.mimeTypes()) { - qDebug() << " " << mime.name; - } - } -} -*/ - -void LauncherWindow::dumpHtml() -{ - qDebug() << "HTML: " << page()->mainFrame()->toHtml(); -} - -void LauncherWindow::selectElements() -{ -#ifndef QT_NO_INPUTDIALOG - bool ok; - QString str = QInputDialog::getText(this, "Select elements", "Choose elements", - QLineEdit::Normal, "a", &ok); - - if (ok && !str.isEmpty()) { - QWebElementCollection result = page()->mainFrame()->findAllElements(str); - foreach (QWebElement e, result) - e.setStyleProperty("background-color", "yellow"); -#ifndef Q_WS_MAEMO_5 - statusBar()->showMessage(QString("%1 element(s) selected").arg(result.count()), 5000); -#endif - } -#endif -} - -void LauncherWindow::setTouchMocking(bool on) -{ - m_touchMocking = on; -} - -void LauncherWindow::toggleWebView(bool graphicsBased) -{ - m_windowOptions.useGraphicsView = graphicsBased; - initializeView(); - menuBar()->clear(); - createChrome(); -} - -void LauncherWindow::toggleAcceleratedCompositing(bool toggle) -{ - m_windowOptions.useCompositing = toggle; - page()->settings()->setAttribute(QWebSettings::AcceleratedCompositingEnabled, toggle); -} - -void LauncherWindow::toggleTiledBackingStore(bool toggle) -{ - page()->settings()->setAttribute(QWebSettings::TiledBackingStoreEnabled, toggle); -} - -void LauncherWindow::toggleResizesToContents(bool toggle) -{ - m_windowOptions.resizesToContents = toggle; - static_cast<WebViewGraphicsBased*>(m_view)->setResizesToContents(toggle); -} - -void LauncherWindow::toggleWebGL(bool toggle) -{ - m_windowOptions.useWebGL = toggle; - page()->settings()->setAttribute(QWebSettings::WebGLEnabled, toggle); -} - -void LauncherWindow::animatedFlip() -{ - qobject_cast<WebViewGraphicsBased*>(m_view)->animatedFlip(); -} - -void LauncherWindow::animatedYFlip() -{ - qobject_cast<WebViewGraphicsBased*>(m_view)->animatedYFlip(); -} -void LauncherWindow::toggleSpatialNavigation(bool b) -{ - page()->settings()->setAttribute(QWebSettings::SpatialNavigationEnabled, b); -} - -void LauncherWindow::toggleFullScreenMode(bool enable) -{ - bool alreadyEnabled = windowState() & Qt::WindowFullScreen; - if (enable ^ alreadyEnabled) - setWindowState(windowState() ^ Qt::WindowFullScreen); -} - -void LauncherWindow::toggleFrameFlattening(bool toggle) -{ - m_windowOptions.useFrameFlattening = toggle; - page()->settings()->setAttribute(QWebSettings::FrameFlatteningEnabled, toggle); -} - -void LauncherWindow::toggleInterruptingJavaScriptEnabled(bool enable) -{ - page()->setInterruptingJavaScriptEnabled(enable); -} - -void LauncherWindow::toggleJavascriptCanOpenWindows(bool enable) -{ - page()->settings()->setAttribute(QWebSettings::JavascriptCanOpenWindows, enable); -} - -void LauncherWindow::toggleAutoLoadImages(bool enable) -{ - page()->settings()->setAttribute(QWebSettings::AutoLoadImages, !enable); -} - -void LauncherWindow::togglePlugins(bool enable) -{ - page()->settings()->setAttribute(QWebSettings::PluginsEnabled, !enable); -} - -#if defined(QT_CONFIGURED_WITH_OPENGL) -void LauncherWindow::toggleQGLWidgetViewport(bool enable) -{ - if (!isGraphicsBased()) - return; - - m_windowOptions.useQGLWidgetViewport = enable; - WebViewGraphicsBased* view = static_cast<WebViewGraphicsBased*>(m_view); - - view->setViewport(enable ? new QGLWidget() : 0); -} -#endif - -void LauncherWindow::changeViewportUpdateMode(int mode) -{ - m_windowOptions.viewportUpdateMode = QGraphicsView::ViewportUpdateMode(mode); - - if (!isGraphicsBased()) - return; - - WebViewGraphicsBased* view = static_cast<WebViewGraphicsBased*>(m_view); - view->setViewportUpdateMode(m_windowOptions.viewportUpdateMode); -} - -void LauncherWindow::showFPS(bool enable) -{ - if (!isGraphicsBased()) - return; - - m_windowOptions.showFrameRate = enable; - WebViewGraphicsBased* view = static_cast<WebViewGraphicsBased*>(m_view); - view->setFrameRateMeasurementEnabled(enable); - - if (!enable) { -#if defined(Q_WS_MAEMO_5) && defined(Q_OS_SYMBIAN) - setWindowTitle(""); -#else - statusBar()->clearMessage(); -#endif - } -} - -void LauncherWindow::showUserAgentDialog() -{ - QStringList items; - QFile file(":/useragentlist.txt"); - if (file.open(QIODevice::ReadOnly)) { - while (!file.atEnd()) - items << file.readLine().trimmed(); - file.close(); - } - - QSettings settings; - QString customUserAgent = settings.value("CustomUserAgent").toString(); - if (!items.contains(customUserAgent) && !customUserAgent.isEmpty()) - items << customUserAgent; - - QDialog* dialog = new QDialog(this); - dialog->resize(size().width() * 0.7, dialog->size().height()); - dialog->setWindowTitle("Change User Agent"); - - QVBoxLayout* layout = new QVBoxLayout(dialog); - dialog->setLayout(layout); - -#ifndef QT_NO_COMBOBOX - QComboBox* combo = new QComboBox(dialog); - combo->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLength); - combo->setEditable(true); - combo->insertItems(0, items); - layout->addWidget(combo); - - int index = combo->findText(page()->userAgentForUrl(QUrl())); - combo->setCurrentIndex(index); -#endif - - QDialogButtonBox* buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok - | QDialogButtonBox::Cancel, Qt::Horizontal, dialog); - connect(buttonBox, SIGNAL(accepted()), dialog, SLOT(accept())); - connect(buttonBox, SIGNAL(rejected()), dialog, SLOT(reject())); - layout->addWidget(buttonBox); - -#ifndef QT_NO_COMBOBOX - if (dialog->exec() && !combo->currentText().isEmpty()) { - page()->setUserAgent(combo->currentText()); - if (!items.contains(combo->currentText())) - settings.setValue("CustomUserAgent", combo->currentText()); - } -#endif - - delete dialog; -} - -void LauncherWindow::loadURLListFromFile() -{ - QString selectedFile; -#ifndef QT_NO_FILEDIALOG - selectedFile = QFileDialog::getOpenFileName(this, tr("Load URL list from file") - , QString(), tr("Text Files (*.txt);;All Files (*)")); -#endif - if (selectedFile.isEmpty()) - return; - - m_urlLoader = new UrlLoader(this->page()->mainFrame(), selectedFile, 0, 0); - m_urlLoader->loadNext(); -} - -void LauncherWindow::printURL(const QUrl& url) -{ - QTextStream output(stdout); - output << "Loaded: " << url.toString() << endl; -} - -void LauncherWindow::updateFPS(int fps) -{ - QString fpsStatusText = QString("Current FPS: %1").arg(fps); - -#if defined(Q_WS_MAEMO_5) && defined(Q_OS_SYMBIAN) - setWindowTitle(fpsStatusText); -#else - statusBar()->showMessage(fpsStatusText); -#endif -} - -void LauncherWindow::toggleLocalStorage(bool toggle) -{ - m_windowOptions.useLocalStorage = toggle; - page()->settings()->setAttribute(QWebSettings::LocalStorageEnabled, toggle); -} - -void LauncherWindow::toggleOfflineStorageDatabase(bool toggle) -{ - m_windowOptions.useOfflineStorageDatabase = toggle; - page()->settings()->setAttribute(QWebSettings::OfflineStorageDatabaseEnabled, toggle); -} - -void LauncherWindow::toggleOfflineWebApplicationCache(bool toggle) -{ - m_windowOptions.useOfflineWebApplicationCache = toggle; - page()->settings()->setAttribute(QWebSettings::OfflineWebApplicationCacheEnabled, toggle); -} - -void LauncherWindow::setOfflineStorageDefaultQuota() -{ - // For command line execution, quota size is taken from command line. - if (m_windowOptions.offlineStorageDefaultQuotaSize) - page()->settings()->setOfflineStorageDefaultQuota(m_windowOptions.offlineStorageDefaultQuotaSize); - else { -#ifndef QT_NO_INPUTDIALOG - bool ok; - // Maximum size is set to 25 * 1024 * 1024. - int quotaSize = QInputDialog::getInt(this, "Offline Storage Default Quota Size" , "Quota Size", 0, 0, 26214400, 1, &ok); - if (ok) - page()->settings()->setOfflineStorageDefaultQuota(quotaSize); -#endif - } -} - -LauncherWindow* LauncherWindow::newWindow() -{ - LauncherWindow* mw = new LauncherWindow(&m_windowOptions); - mw->show(); - return mw; -} - -LauncherWindow* LauncherWindow::cloneWindow() -{ - LauncherWindow* mw = new LauncherWindow(&m_windowOptions, qobject_cast<QGraphicsView*>(m_view)->scene()); - mw->show(); - return mw; -} - -#ifndef QT_NO_LINEEDIT -void LauncherWindow::showFindBar() -{ - if (!m_findBar->isVisible()) { - m_findBar->setVisible(true); - m_lineEdit->setText(page()->selectedText()); - m_lineEdit->setFocus(Qt::PopupFocusReason); - } else { - m_findBar->setVisible(false); - page()->findText("", QWebPage::HighlightAllOccurrences); - } -} - -void LauncherWindow::find(int mode = s_findNormalFlag) -{ - QPalette palette; - bool found; - palette.setColor(m_lineEdit->backgroundRole(), Qt::white); - page()->findText("", QFlag(QWebPage::HighlightAllOccurrences)); - - m_findFlag = m_findFlag ^ mode; - if (mode == s_findNormalFlag || mode == QWebPage::FindBackward) { - found = page()->findText(m_lineEdit->text(), QFlag(m_findFlag & ~QWebPage::HighlightAllOccurrences)); - m_findFlag = m_findFlag ^ mode; - - if (found || m_lineEdit->text().isEmpty()) - m_lineEdit->setPalette(palette); - else { - palette.setColor(m_lineEdit->backgroundRole(), QColor(255, 0, 0, 127)); - m_lineEdit->setPalette(palette); - } - } - - if (m_findFlag & QWebPage::HighlightAllOccurrences) - page()->findText(m_lineEdit->text(), QFlag(m_findFlag)); -} -#endif diff --git a/src/3rdparty/webkit/Tools/QtTestBrowser/launcherwindow.h b/src/3rdparty/webkit/Tools/QtTestBrowser/launcherwindow.h deleted file mode 100644 index d68995883c..0000000000 --- a/src/3rdparty/webkit/Tools/QtTestBrowser/launcherwindow.h +++ /dev/null @@ -1,253 +0,0 @@ -/* - * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) - * Copyright (C) 2009 Girish Ramakrishnan <girish@forwardbias.in> - * Copyright (C) 2006 George Staikos <staikos@kde.org> - * Copyright (C) 2006 Dirk Mueller <mueller@kde.org> - * Copyright (C) 2006 Zack Rusin <zack@kde.org> - * Copyright (C) 2006 Simon Hausmann <hausmann@kde.org> - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef launcherwindow_h -#define launcherwindow_h - -#include <QtGui> -#include <QtNetwork/QNetworkRequest> - -#if defined(QT_CONFIGURED_WITH_OPENGL) -#include <QtOpenGL/QGLWidget> -#endif - -#if !defined(QT_NO_PRINTER) -#include <QPrintPreviewDialog> -#endif - -#ifndef QT_NO_UITOOLS -#include <QtUiTools/QUiLoader> -#endif - -#include <QDebug> - -#include <cstdio> -#include <qevent.h> -#include <qwebelement.h> -#include <qwebframe.h> -#include <qwebinspector.h> -#include <qwebsettings.h> - -#ifdef Q_WS_MAEMO_5 -#include <qx11info_x11.h> -#endif - -#include "DumpRenderTreeSupportQt.h" -#include "mainwindow.h" -#include "urlloader.h" -#include "utils.h" -#include "webinspector.h" -#include "webpage.h" -#include "webview.h" - -#ifdef Q_WS_MAEMO_5 -#include <X11/Xatom.h> -#include <X11/Xlib.h> -#undef KeyPress -#endif - -class QPropertyAnimation; - -class WindowOptions { -public: - WindowOptions() - : useGraphicsView(false) - , useCompositing(true) - , useTiledBackingStore(false) - , useWebGL(false) -#if defined(Q_WS_MAEMO_5) || defined(Q_OS_SYMBIAN) - , useFrameFlattening(true) -#else - , useFrameFlattening(false) -#endif - , cacheWebView(false) - , showFrameRate(false) - , resizesToContents(false) - , viewportUpdateMode(QGraphicsView::MinimalViewportUpdate) - , useLocalStorage(false) - , useOfflineStorageDatabase(false) - , useOfflineWebApplicationCache(false) - , offlineStorageDefaultQuotaSize(0) -#if defined(QT_CONFIGURED_WITH_OPENGL) - , useQGLWidgetViewport(false) -#endif -#if defined(Q_WS_X11) - , useTestFonts(false) -#endif - , printLoadedUrls(false) -#if defined(Q_OS_SYMBIAN) - , startMaximized(true) -#else - , startMaximized(false) -#endif - { - } - - bool useGraphicsView; - bool useCompositing; - bool useTiledBackingStore; - bool useWebGL; - bool useFrameFlattening; - bool cacheWebView; - bool showFrameRate; - bool resizesToContents; - QGraphicsView::ViewportUpdateMode viewportUpdateMode; - bool useLocalStorage; - bool useOfflineStorageDatabase; - bool useOfflineWebApplicationCache; - quint64 offlineStorageDefaultQuotaSize; -#if defined(QT_CONFIGURED_WITH_OPENGL) - bool useQGLWidgetViewport; -#endif -#if defined(Q_WS_X11) - bool useTestFonts; -#endif - bool printLoadedUrls; - QUrl inspectorUrl; - quint16 remoteInspectorPort; - bool startMaximized; -}; - -class LauncherWindow : public MainWindow { - Q_OBJECT - -public: - LauncherWindow(WindowOptions* data = 0, QGraphicsScene* sharedScene = 0); - virtual ~LauncherWindow(); - - virtual void keyPressEvent(QKeyEvent* event); - void grabZoomKeys(bool grab); - - void sendTouchEvent(); - - bool eventFilter(QObject* obj, QEvent* event); - -protected slots: - void loadStarted(); - void loadFinished(); - - void showLinkHover(const QString &link, const QString &toolTip); - - void zoomIn(); - void zoomOut(); - void resetZoom(); - void toggleZoomTextOnly(bool on); - void zoomAnimationFinished(); - - void print(); - void screenshot(); - - void setEditable(bool on); - - /* void dumpPlugins() */ - void dumpHtml(); - - void loadURLListFromFile(); - - void setTouchMocking(bool on); - void toggleWebView(bool graphicsBased); - void toggleAcceleratedCompositing(bool toggle); - void toggleTiledBackingStore(bool toggle); - void toggleResizesToContents(bool toggle); - void toggleWebGL(bool toggle); - void toggleSpatialNavigation(bool b); - void toggleFullScreenMode(bool enable); - void toggleFrameFlattening(bool toggle); - void toggleInterruptingJavaScriptEnabled(bool enable); - void toggleJavascriptCanOpenWindows(bool enable); - void toggleAutoLoadImages(bool enable); - void togglePlugins(bool enable); - void toggleLocalStorage(bool toggle); - void toggleOfflineStorageDatabase(bool toggle); - void toggleOfflineWebApplicationCache(bool toggle); - void setOfflineStorageDefaultQuota(); -#ifndef QT_NO_LINEEDIT - void showFindBar(); - void find(int mode); -#endif -#if defined(QT_CONFIGURED_WITH_OPENGL) - void toggleQGLWidgetViewport(bool enable); -#endif - - void changeViewportUpdateMode(int mode); - void animatedFlip(); - void animatedYFlip(); - void selectElements(); - void showFPS(bool enable); - void showUserAgentDialog(); - - void printURL(const QUrl&); - -public slots: - LauncherWindow* newWindow(); - LauncherWindow* cloneWindow(); - void updateFPS(int fps); - -signals: - void enteredFullScreenMode(bool on); - -private: - void init(); - void initializeView(); - void createChrome(); - void applyPrefs(); - void applyZoom(); - - bool isGraphicsBased() const; - -private: - static QVector<int> m_zoomLevels; - int m_currentZoom; - - UrlLoader* m_urlLoader; - - QWidget* m_view; - WebInspector* m_inspector; - - WindowOptions m_windowOptions; - - QAction* m_formatMenuAction; - - QPropertyAnimation* m_zoomAnimation; - QList<QTouchEvent::TouchPoint> m_touchPoints; - bool m_touchMocking; - - QString m_inputUrl; -#ifndef QT_NO_LINEEDIT - QToolBar* m_findBar; - QLineEdit* m_lineEdit; - int m_findFlag; - static const int s_findNormalFlag = 0; -#endif -}; - -#endif diff --git a/src/3rdparty/webkit/Tools/QtTestBrowser/locationedit.cpp b/src/3rdparty/webkit/Tools/QtTestBrowser/locationedit.cpp deleted file mode 100644 index 04a6018db1..0000000000 --- a/src/3rdparty/webkit/Tools/QtTestBrowser/locationedit.cpp +++ /dev/null @@ -1,132 +0,0 @@ -/* - * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) - * Copyright (C) 2011 Andreas Kling <kling@webkit.org> - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "locationedit.h" - -#ifndef QT_NO_INPUTDIALOG - -static const QSize gPageIconSize(16, 16); - -static QPixmap defaultPageIcon() -{ - static QPixmap icon; - if (icon.isNull()) - icon.load(":/favicon.png"); - - return icon; -} - -LocationEdit::LocationEdit(QWidget* parent) - : QLineEdit(parent) - , m_progress(0) -{ - m_clearTimer.setSingleShot(true); - connect(&m_clearTimer, SIGNAL(timeout()), this, SLOT(reset())); - - m_pageIconLabel = new QLabel(this); - m_pageIconLabel->setFixedSize(gPageIconSize); - m_pageIconLabel->setPixmap(defaultPageIcon()); -} - -void LocationEdit::setPageIcon(const QIcon& icon) -{ - if (icon.isNull()) - m_pageIconLabel->setPixmap(defaultPageIcon()); - else - m_pageIconLabel->setPixmap(icon.pixmap(gPageIconSize)); -} - -void LocationEdit::setProgress(int progress) -{ - m_clearTimer.stop(); - m_progress = progress; - update(); -} - -void LocationEdit::reset() -{ - setProgress(0); -} - -void LocationEdit::resizeEvent(QResizeEvent*) -{ - updateInternalGeometry(); -} - -void LocationEdit::updateInternalGeometry() -{ - QStyleOptionFrameV3 styleOption; - initStyleOption(&styleOption); - - QRect textRect = style()->subElementRect(QStyle::SE_LineEditContents, &styleOption, this); - - const int spacing = 2; - - int x = textRect.x() + spacing; - int y = (textRect.center().y() + 1) - gPageIconSize.height() / 2; - - m_pageIconLabel->move(x, y); - - QMargins margins = textMargins(); - margins.setLeft(m_pageIconLabel->sizeHint().width() + spacing); - setTextMargins(margins); -} - -void LocationEdit::paintEvent(QPaintEvent* ev) -{ - QColor backgroundColor = QApplication::palette().color(QPalette::Base); - QColor progressColor = QColor(120, 180, 240); - QPalette p = palette(); - - if (!m_progress) - p.setBrush(QPalette::Base, backgroundColor); - else { - QLinearGradient gradient(0, 0, width(), 0); - gradient.setColorAt(0, progressColor); - gradient.setColorAt(((double) m_progress) / 100, progressColor); - if (m_progress != 100) - gradient.setColorAt((double) m_progress / 100 + 0.001, backgroundColor); - p.setBrush(QPalette::Base, gradient); - } - setPalette(p); - - QLineEdit::paintEvent(ev); - - if (m_progress == 100) - m_clearTimer.start(100); -} - -void LocationEdit::focusInEvent(QFocusEvent* ev) -{ - QLineEdit::focusInEvent(ev); -#ifdef Q_WS_MAEMO_5 - QTimer::singleShot(0, this, SLOT(selectAll())); -#endif -} - -#endif diff --git a/src/3rdparty/webkit/Tools/QtTestBrowser/locationedit.h b/src/3rdparty/webkit/Tools/QtTestBrowser/locationedit.h deleted file mode 100644 index e8afe7051f..0000000000 --- a/src/3rdparty/webkit/Tools/QtTestBrowser/locationedit.h +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef locationedit_h -#define locationedit_h - -#include <qconfig.h> - -#ifndef QT_NO_INPUTDIALOG -#include <QtGui> - -class LocationEdit : public QLineEdit { - Q_OBJECT - -public: - LocationEdit(QWidget* parent = 0); - - void setPageIcon(const QIcon&); - -public slots: - void setProgress(int progress); - -private slots: - void reset(); - -protected: - virtual void paintEvent(QPaintEvent*); - virtual void focusInEvent(QFocusEvent*); - virtual void resizeEvent(QResizeEvent*); - -private: - void updateInternalGeometry(); - - int m_progress; - QTimer m_clearTimer; - QLabel* m_pageIconLabel; -}; - -#endif -#endif diff --git a/src/3rdparty/webkit/Tools/QtTestBrowser/main.cpp b/src/3rdparty/webkit/Tools/QtTestBrowser/main.cpp deleted file mode 100644 index c44c4c6caa..0000000000 --- a/src/3rdparty/webkit/Tools/QtTestBrowser/main.cpp +++ /dev/null @@ -1,362 +0,0 @@ -/* - * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies) - * Copyright (C) 2009 Girish Ramakrishnan <girish@forwardbias.in> - * Copyright (C) 2006 George Staikos <staikos@kde.org> - * Copyright (C) 2006 Dirk Mueller <mueller@kde.org> - * Copyright (C) 2006 Zack Rusin <zack@kde.org> - * Copyright (C) 2006 Simon Hausmann <hausmann@kde.org> - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "launcherwindow.h" -#include "urlloader.h" - -WindowOptions windowOptions; - - -#include <QDir> -#include <QFile> -#include <QFileInfo> -#include <QFontDatabase> - - -#if defined(Q_WS_X11) -#include <fontconfig/fontconfig.h> -#endif - - -#if defined(Q_WS_X11) -// Very similar to WebCore::DumpRenderTree::initializeFonts(); -// Duplicated here so that QtTestBrowser would display contents -// with the same fonts as run-webkit-tests/DumpRenderTree. -static void initTestFonts() -{ - static int numFonts = -1; - - // Some test cases may add or remove application fonts (via @font-face). - // Make sure to re-initialize the font set if necessary. - FcFontSet* appFontSet = FcConfigGetFonts(0, FcSetApplication); - if (appFontSet && numFonts >= 0 && appFontSet->nfont == numFonts) - return; - - QByteArray fontDir = getenv("WEBKIT_TESTFONTS"); - if (fontDir.isEmpty() || !QDir(fontDir).exists()) { - fprintf(stderr, - "\n\n" - "----------------------------------------------------------------------\n" - "WEBKIT_TESTFONTS environment variable is not set correctly.\n" - "This variable has to point to the directory containing the fonts\n" - "you can clone from git://gitorious.org/qtwebkit/testfonts.git\n" - "----------------------------------------------------------------------\n" - ); - exit(1); - } - // Looks for qt/fonts.conf relative to the directory of the QtTestBrowser - // executable. - QString configFileString = QCoreApplication::applicationDirPath(); - configFileString += "/../../../Tools/DumpRenderTree/qt/fonts.conf"; - QByteArray configFileArray = configFileString.toUtf8(); - FcConfig* config = FcConfigCreate(); - if (!FcConfigParseAndLoad (config, (FcChar8*) configFileArray.data(), true)) - qFatal("Couldn't load font configuration file"); - if (!FcConfigAppFontAddDir (config, (FcChar8*) fontDir.data())) - qFatal("Couldn't add font dir!"); - FcConfigSetCurrent(config); - - appFontSet = FcConfigGetFonts(config, FcSetApplication); - numFonts = appFontSet->nfont; -} -#endif - -int launcherMain(const QApplication& app) -{ -#ifdef Q_WS_X11 - if (windowOptions.useTestFonts) - initTestFonts(); -#endif - -#ifndef NDEBUG - int retVal = app.exec(); - DumpRenderTreeSupportQt::garbageCollectorCollect(); - QWebSettings::clearMemoryCaches(); - return retVal; -#else - return app.exec(); -#endif -} - -class LauncherApplication : public QApplication { - Q_OBJECT - -public: - LauncherApplication(int& argc, char** argv); - QStringList urls() const { return m_urls; } - bool isRobotized() const { return m_isRobotized; } - int robotTimeout() const { return m_robotTimeoutSeconds; } - int robotExtraTime() const { return m_robotExtraTimeSeconds; } - -private: - void handleUserOptions(); - void applyDefaultSettings(); - -private: - bool m_isRobotized; - int m_robotTimeoutSeconds; - int m_robotExtraTimeSeconds; - QStringList m_urls; -}; - -void LauncherApplication::applyDefaultSettings() -{ - QWebSettings::setMaximumPagesInCache(4); - - QWebSettings::setObjectCacheCapacities((16*1024*1024) / 8, (16*1024*1024) / 8, 16*1024*1024); - - QWebSettings::globalSettings()->setAttribute(QWebSettings::PluginsEnabled, true); - QWebSettings::globalSettings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, true); - QWebSettings::enablePersistentStorage(); -} - -LauncherApplication::LauncherApplication(int& argc, char** argv) - : QApplication(argc, argv, QApplication::GuiServer) - , m_isRobotized(false) - , m_robotTimeoutSeconds(0) - , m_robotExtraTimeSeconds(0) -{ - // To allow QWebInspector's configuration persistence - setOrganizationName("Nokia"); - setApplicationName("QtTestBrowser"); - setApplicationVersion("0.1"); - - applyDefaultSettings(); - - handleUserOptions(); -} - -static void requiresGraphicsView(const QString& option) -{ - if (windowOptions.useGraphicsView) - return; - appQuit(1, QString("%1 only works in combination with the -graphicsbased option").arg(option)); -} - -void LauncherApplication::handleUserOptions() -{ - QStringList args = arguments(); - QFileInfo program(args.at(0)); - QString programName("QtTestBrowser"); - if (program.exists()) - programName = program.baseName(); - - QList<QString> updateModes(enumToKeys(QGraphicsView::staticMetaObject, - "ViewportUpdateMode", "ViewportUpdate")); - - if (args.contains("-help")) { - qDebug() << "Usage:" << programName.toLatin1().data() - << "[-graphicsbased]" - << "[-no-compositing]" -#if defined(QT_CONFIGURED_WITH_OPENGL) - << "[-gl-viewport]" - << "[-webgl]" -#endif - << QString("[-viewport-update-mode %1]").arg(formatKeys(updateModes)).toLatin1().data() - << "[-cache-webview]" - << "[-maximize]" - << "[-show-fps]" - << "[-r list]" - << "[-robot-timeout seconds]" - << "[-robot-extra-time seconds]" - << "[-inspector-url location]" - << "[-tiled-backing-store]" - << "[-resizes-to-contents]" - << "[-local-storage-enabled]" - << "[-offline-storage-database-enabled]" - << "[-offline-web-application-cache-enabled]" - << "[-set-offline-storage-default-quota maxSize]" -#if defined(Q_WS_X11) - << "[-use-test-fonts]" -#endif - << "[-print-loaded-urls]" - << "URLs"; - appQuit(0); - } - - const bool defaultForAnimations = args.contains("-default-animations"); - if (args.contains("-graphicsbased") || defaultForAnimations) - windowOptions.useGraphicsView = true; - - if (args.contains("-no-compositing")) { - requiresGraphicsView("-no-compositing"); - windowOptions.useCompositing = false; - } - - if (args.contains("-show-fps")) { - requiresGraphicsView("-show-fps"); - windowOptions.showFrameRate = true; - } - - if (args.contains("-cache-webview") || defaultForAnimations) { - requiresGraphicsView("-cache-webview"); - windowOptions.cacheWebView = true; - } - - if (args.contains("-tiled-backing-store")) { - requiresGraphicsView("-tiled-backing-store"); - windowOptions.useTiledBackingStore = true; - } - - if (args.contains("-resizes-to-contents")) { - requiresGraphicsView("-resizes-to-contents"); - windowOptions.resizesToContents = true; - } - - if (args.contains("-local-storage-enabled")) - windowOptions.useLocalStorage = true; - - if (args.contains("-maximize")) - windowOptions.startMaximized = true; - - if (args.contains("-offline-storage-database-enabled")) - windowOptions.useOfflineStorageDatabase = true; - - if (args.contains("-offline-web-application-cache-enabled")) - windowOptions.useOfflineWebApplicationCache = true; - - int setOfflineStorageDefaultQuotaIndex = args.indexOf("-set-offline-storage-default-quota"); - if (setOfflineStorageDefaultQuotaIndex != -1) { - unsigned int maxSize = takeOptionValue(&args, setOfflineStorageDefaultQuotaIndex).toUInt(); - windowOptions.offlineStorageDefaultQuotaSize = maxSize; - } - - if (defaultForAnimations) - windowOptions.viewportUpdateMode = QGraphicsView::BoundingRectViewportUpdate; - - QString arg1("-viewport-update-mode"); - int modeIndex = args.indexOf(arg1); - if (modeIndex != -1) { - requiresGraphicsView(arg1); - - QString mode = takeOptionValue(&args, modeIndex); - if (mode.isEmpty()) - appQuit(1, QString("%1 needs a value of one of [%2]").arg(arg1).arg(formatKeys(updateModes))); - int idx = updateModes.indexOf(mode); - if (idx == -1) - appQuit(1, QString("%1 value has to be one of [%2]").arg(arg1).arg(formatKeys(updateModes))); - - windowOptions.viewportUpdateMode = static_cast<QGraphicsView::ViewportUpdateMode>(idx); - } -#ifdef QT_CONFIGURED_WITH_OPENGL - if (args.contains("-gl-viewport") || defaultForAnimations) { - requiresGraphicsView("-gl-viewport"); - windowOptions.useQGLWidgetViewport = true; - } - - if (args.contains("-webgl")) { - requiresGraphicsView("-webgl"); - windowOptions.useWebGL = true; - } -#endif - -#if defined(Q_WS_X11) - if (args.contains("-use-test-fonts")) - windowOptions.useTestFonts = true; -#endif - - if (args.contains("-print-loaded-urls")) - windowOptions.printLoadedUrls = true; - - QString inspectorUrlArg("-inspector-url"); - int inspectorUrlIndex = args.indexOf(inspectorUrlArg); - if (inspectorUrlIndex != -1) - windowOptions.inspectorUrl = takeOptionValue(&args, inspectorUrlIndex); - - QString remoteInspectorPortArg("-remote-inspector-port"); - int remoteInspectorPortIndex = args.indexOf(remoteInspectorPortArg); - if (remoteInspectorPortIndex != -1) - windowOptions.remoteInspectorPort = takeOptionValue(&args, remoteInspectorPortIndex).toInt(); - - int robotIndex = args.indexOf("-r"); - if (robotIndex != -1) { - QString listFile = takeOptionValue(&args, robotIndex); - if (listFile.isEmpty()) - appQuit(1, "-r needs a list file to start in robotized mode"); - if (!QFile::exists(listFile)) - appQuit(1, "The list file supplied to -r does not exist."); - - m_isRobotized = true; - m_urls = QStringList(listFile); - } else { - int lastArg = args.lastIndexOf(QRegExp("^-.*")); - m_urls = (lastArg != -1) ? args.mid(++lastArg) : args.mid(1); - } - - int robotTimeoutIndex = args.indexOf("-robot-timeout"); - if (robotTimeoutIndex != -1) - m_robotTimeoutSeconds = takeOptionValue(&args, robotTimeoutIndex).toInt(); - - int robotExtraTimeIndex = args.indexOf("-robot-extra-time"); - if (robotExtraTimeIndex != -1) - m_robotExtraTimeSeconds = takeOptionValue(&args, robotExtraTimeIndex).toInt(); -} - - -int main(int argc, char **argv) -{ - LauncherApplication app(argc, argv); - - if (app.isRobotized()) { - LauncherWindow* window = new LauncherWindow(); - UrlLoader loader(window->page()->mainFrame(), app.urls().at(0), app.robotTimeout(), app.robotExtraTime()); - loader.loadNext(); - window->show(); - return launcherMain(app); - } - - QStringList urls = app.urls(); - - if (urls.isEmpty()) { - QString defaultIndexFile = QString("%1/%2").arg(QDir::homePath()).arg(QLatin1String("index.html")); - if (QFile(defaultIndexFile).exists()) - urls.append(QString("file://") + defaultIndexFile); - else - urls.append(""); - } - - LauncherWindow* window = 0; - foreach (QString url, urls) { - LauncherWindow* newWindow; - if (!window) - newWindow = window = new LauncherWindow(&windowOptions); - else - newWindow = window->newWindow(); - - newWindow->load(url); - } - - window->show(); - return launcherMain(app); -} - -#include "main.moc" diff --git a/src/3rdparty/webkit/Tools/QtTestBrowser/mainwindow.cpp b/src/3rdparty/webkit/Tools/QtTestBrowser/mainwindow.cpp deleted file mode 100644 index dcd350d8fa..0000000000 --- a/src/3rdparty/webkit/Tools/QtTestBrowser/mainwindow.cpp +++ /dev/null @@ -1,244 +0,0 @@ -/* - * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies) - * Copyright (C) 2009 Girish Ramakrishnan <girish@forwardbias.in> - * Copyright (C) 2006 George Staikos <staikos@kde.org> - * Copyright (C) 2006 Dirk Mueller <mueller@kde.org> - * Copyright (C) 2006 Zack Rusin <zack@kde.org> - * Copyright (C) 2006 Simon Hausmann <hausmann@kde.org> - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "mainwindow.h" - -#include "locationedit.h" -#include "utils.h" - -MainWindow::MainWindow() - : m_page(new WebPage(this)) - , m_toolBar(0) - , urlEdit(0) -{ - setAttribute(Qt::WA_DeleteOnClose); - if (qgetenv("QTTESTBROWSER_USE_ARGB_VISUALS").toInt() == 1) - setAttribute(Qt::WA_TranslucentBackground); - - buildUI(); -} - -void MainWindow::buildUI() -{ -#if defined(Q_OS_SYMBIAN) - delete urlEdit; -#endif - delete m_toolBar; - - m_toolBar = addToolBar("Navigation"); -#if defined(Q_OS_SYMBIAN) - m_toolBar->setIconSize(QSize(16, 16)); -#endif - QAction* reloadAction = page()->action(QWebPage::Reload); - connect(reloadAction, SIGNAL(triggered()), this, SLOT(changeLocation())); - - m_toolBar->addAction(page()->action(QWebPage::Back)); - m_toolBar->addAction(page()->action(QWebPage::Forward)); - m_toolBar->addAction(reloadAction); - m_toolBar->addAction(page()->action(QWebPage::Stop)); - -#ifndef QT_NO_INPUTDIALOG - urlEdit = new LocationEdit(m_toolBar); - urlEdit->setSizePolicy(QSizePolicy::Expanding, urlEdit->sizePolicy().verticalPolicy()); - connect(urlEdit, SIGNAL(returnPressed()), SLOT(changeLocation())); - QCompleter* completer = new QCompleter(m_toolBar); - urlEdit->setCompleter(completer); - completer->setModel(&urlModel); -#if defined(Q_OS_SYMBIAN) - addToolBarBreak(); - addToolBar("Location")->addWidget(urlEdit); -#else - m_toolBar->addWidget(urlEdit); -#endif - - connect(page()->mainFrame(), SIGNAL(urlChanged(QUrl)), this, SLOT(setAddressUrl(QUrl))); - connect(page(), SIGNAL(loadProgress(int)), urlEdit, SLOT(setProgress(int))); -#endif - - connect(page()->mainFrame(), SIGNAL(loadStarted()), this, SLOT(onLoadStarted())); - connect(page()->mainFrame(), SIGNAL(iconChanged()), this, SLOT(onIconChanged())); - connect(page()->mainFrame(), SIGNAL(titleChanged(QString)), this, SLOT(onTitleChanged(QString))); - connect(page(), SIGNAL(windowCloseRequested()), this, SLOT(close())); - -#ifndef QT_NO_SHORTCUT - // short-cuts - page()->action(QWebPage::Back)->setShortcut(QKeySequence::Back); - page()->action(QWebPage::Stop)->setShortcut(Qt::Key_Escape); - page()->action(QWebPage::Forward)->setShortcut(QKeySequence::Forward); - page()->action(QWebPage::Reload)->setShortcut(QKeySequence::Refresh); -#ifndef QT_NO_UNDOSTACK - page()->action(QWebPage::Undo)->setShortcut(QKeySequence::Undo); - page()->action(QWebPage::Redo)->setShortcut(QKeySequence::Redo); -#endif - page()->action(QWebPage::Cut)->setShortcut(QKeySequence::Cut); - page()->action(QWebPage::Copy)->setShortcut(QKeySequence::Copy); - page()->action(QWebPage::Paste)->setShortcut(QKeySequence::Paste); - page()->action(QWebPage::SelectAll)->setShortcut(QKeySequence::SelectAll); - - page()->action(QWebPage::ToggleBold)->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_B)); - page()->action(QWebPage::ToggleItalic)->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_I)); - page()->action(QWebPage::ToggleUnderline)->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_U)); -#endif -} - -void MainWindow::setPage(WebPage* page) -{ - if (page && m_page) - page->setUserAgent(m_page->userAgentForUrl(QUrl())); - - delete m_page; - m_page = page; - - buildUI(); -} - -WebPage* MainWindow::page() const -{ - return m_page; -} - -void MainWindow::setAddressUrl(const QUrl& url) -{ - setAddressUrl(url.toString(QUrl::RemoveUserInfo)); -} - -void MainWindow::setAddressUrl(const QString& url) -{ -#ifndef QT_NO_INPUTDIALOG - if (!url.contains("about:")) - urlEdit->setText(url); -#endif -} - -void MainWindow::addCompleterEntry(const QUrl& url) -{ - QUrl::FormattingOptions opts; - opts |= QUrl::RemoveScheme; - opts |= QUrl::RemoveUserInfo; - opts |= QUrl::StripTrailingSlash; - QString s = url.toString(opts); - s = s.mid(2); - if (s.isEmpty()) - return; - - if (!urlList.contains(s)) - urlList += s; - urlModel.setStringList(urlList); -} - -void MainWindow::load(const QString& url) -{ - QUrl qurl = urlFromUserInput(url); - if (qurl.scheme().isEmpty()) - qurl = QUrl("http://" + url + "/"); - load(qurl); -} - -void MainWindow::load(const QUrl& url) -{ - if (!url.isValid()) - return; - - setAddressUrl(url.toString()); - page()->mainFrame()->load(url); -} - -QString MainWindow::addressUrl() const -{ -#ifndef QT_NO_INPUTDIALOG - return urlEdit->text(); -#endif - return QString(); -} - -void MainWindow::changeLocation() -{ -#ifndef QT_NO_INPUTDIALOG - QString string = urlEdit->text(); - QUrl mainFrameURL = page()->mainFrame()->url(); - - if (mainFrameURL.isValid() && string == mainFrameURL.toString()) { - page()->triggerAction(QWebPage::Reload); - return; - } - - load(string); -#endif -} - -void MainWindow::openFile() -{ -#ifndef QT_NO_FILEDIALOG - static const QString filter("HTML Files (*.htm *.html);;Text Files (*.txt);;Image Files (*.gif *.jpg *.png);;All Files (*)"); - - QFileDialog fileDialog(this, tr("Open"), QString(), filter); - fileDialog.setAcceptMode(QFileDialog::AcceptOpen); - fileDialog.setFileMode(QFileDialog::ExistingFile); - fileDialog.setOptions(QFileDialog::ReadOnly); - - if (fileDialog.exec()) { - QString selectedFile = fileDialog.selectedFiles()[0]; - if (!selectedFile.isEmpty()) - load(QUrl::fromLocalFile(selectedFile)); - } -#endif -} - -void MainWindow::openLocation() -{ -#ifndef QT_NO_INPUTDIALOG - urlEdit->selectAll(); - urlEdit->setFocus(); -#endif -} - -void MainWindow::onIconChanged() -{ -#ifndef QT_NO_INPUTDIALOG - urlEdit->setPageIcon(page()->mainFrame()->icon()); -#endif -} - -void MainWindow::onLoadStarted() -{ -#ifndef QT_NO_INPUTDIALOG - urlEdit->setPageIcon(QIcon()); -#endif -} - -void MainWindow::onTitleChanged(const QString& title) -{ - if (title.isEmpty()) - setWindowTitle(QCoreApplication::applicationName()); - else - setWindowTitle(QString::fromLatin1("%1 - %2").arg(title).arg(QCoreApplication::applicationName())); -} diff --git a/src/3rdparty/webkit/Tools/QtTestBrowser/mainwindow.h b/src/3rdparty/webkit/Tools/QtTestBrowser/mainwindow.h deleted file mode 100644 index f8baebc10a..0000000000 --- a/src/3rdparty/webkit/Tools/QtTestBrowser/mainwindow.h +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies) - * Copyright (C) 2009 Girish Ramakrishnan <girish@forwardbias.in> - * Copyright (C) 2006 George Staikos <staikos@kde.org> - * Copyright (C) 2006 Dirk Mueller <mueller@kde.org> - * Copyright (C) 2006 Zack Rusin <zack@kde.org> - * Copyright (C) 2006 Simon Hausmann <hausmann@kde.org> - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef mainwindow_h -#define mainwindow_h - -#include <QtGui> -#include "webpage.h" - -class LocationEdit; - -class MainWindow : public QMainWindow { - Q_OBJECT - -public: - MainWindow(); - - void addCompleterEntry(const QUrl& url); - - void load(const QString& url); - void load(const QUrl& url); - - WebPage* page() const; - void setPage(WebPage*); - -protected slots: - void setAddressUrl(const QString& url); - void setAddressUrl(const QUrl& url); - void openFile(); - void openLocation(); - void changeLocation(); - void onIconChanged(); - void onLoadStarted(); - void onTitleChanged(const QString&); - -protected: - QString addressUrl() const; - -private: - void buildUI(); - - WebPage* m_page; - QToolBar* m_toolBar; - QStringListModel urlModel; - QStringList urlList; - LocationEdit* urlEdit; -}; - -#endif diff --git a/src/3rdparty/webkit/Tools/QtTestBrowser/urlloader.cpp b/src/3rdparty/webkit/Tools/QtTestBrowser/urlloader.cpp deleted file mode 100644 index 2ae722bd98..0000000000 --- a/src/3rdparty/webkit/Tools/QtTestBrowser/urlloader.cpp +++ /dev/null @@ -1,130 +0,0 @@ -/* - * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) - * Copyright (C) 2009 University of Szeged - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "urlloader.h" - -#include <QFile> -#include <QDebug> -#include <QWebPage> - -UrlLoader::UrlLoader(QWebFrame* frame, const QString& inputFileName, int timeoutSeconds, int extraTimeSeconds) - : m_frame(frame) - , m_stdOut(stdout) - , m_loaded(0) - , m_numFramesLoading(0) -{ - m_checkIfFinishedTimer.setInterval(200); - m_checkIfFinishedTimer.setSingleShot(true); - connect(&m_checkIfFinishedTimer, SIGNAL(timeout()), this, SLOT(checkIfFinished())); - // loadStarted and loadFinished on QWebPage is emitted for each frame/sub-frame - connect(m_frame->page(), SIGNAL(loadStarted()), this, SLOT(frameLoadStarted())); - connect(m_frame->page(), SIGNAL(loadFinished(bool)), this, SLOT(frameLoadFinished())); - - if (timeoutSeconds) { - m_timeoutTimer.setInterval(timeoutSeconds * 1000); - m_timeoutTimer.setSingleShot(true); - connect(frame, SIGNAL(loadStarted()), &m_timeoutTimer, SLOT(start())); - connect(&m_timeoutTimer, SIGNAL(timeout()), this, SLOT(loadNext())); - } - if (extraTimeSeconds) { - m_extraTimeTimer.setInterval(extraTimeSeconds * 1000); - m_extraTimeTimer.setSingleShot(true); - connect(this, SIGNAL(pageLoadFinished()), &m_extraTimeTimer, SLOT(start())); - connect(&m_extraTimeTimer, SIGNAL(timeout()), this, SLOT(loadNext())); - } else - connect(this, SIGNAL(pageLoadFinished()), this, SLOT(loadNext())); - loadUrlList(inputFileName); -} - -void UrlLoader::loadNext() -{ - m_timeoutTimer.stop(); - m_extraTimeTimer.stop(); - m_checkIfFinishedTimer.stop(); - m_numFramesLoading = 0; - QString qstr; - if (getUrl(qstr)) { - QUrl url(qstr, QUrl::StrictMode); - if (url.isValid()) { - m_stdOut << "Loading " << qstr << " ......" << ++m_loaded << endl; - m_frame->load(url); - } else - loadNext(); - } else - disconnect(m_frame, 0, this, 0); -} - -void UrlLoader::checkIfFinished() -{ - if (!m_numFramesLoading) - emit pageLoadFinished(); -} - -void UrlLoader::frameLoadStarted() -{ - ++m_numFramesLoading; - m_checkIfFinishedTimer.stop(); -} - -void UrlLoader::frameLoadFinished() -{ - Q_ASSERT(m_numFramesLoading > 0); - --m_numFramesLoading; - // Once our frame has finished loading, wait a moment to call loadNext for cases - // where a sub-frame starts loading or another frame is loaded through JavaScript. - m_checkIfFinishedTimer.start(); -} - -void UrlLoader::loadUrlList(const QString& inputFileName) -{ - QFile inputFile(inputFileName); - if (inputFile.open(QIODevice::ReadOnly | QIODevice::Text)) { - QTextStream stream(&inputFile); - QString line; - while (true) { - line = stream.readLine(); - if (line.isNull()) - break; - m_urls.append(line); - } - } else { - qDebug() << "Can't open list file"; - exit(0); - } - m_index = 0; - inputFile.close(); -} - -bool UrlLoader::getUrl(QString& qstr) -{ - if (m_index == m_urls.size()) - return false; - - qstr = m_urls[m_index++]; - return true; -} diff --git a/src/3rdparty/webkit/Tools/QtTestBrowser/urlloader.h b/src/3rdparty/webkit/Tools/QtTestBrowser/urlloader.h deleted file mode 100644 index 8ce24c0d03..0000000000 --- a/src/3rdparty/webkit/Tools/QtTestBrowser/urlloader.h +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) - * Copyright (C) 2009 University of Szeged - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef urlloader_h -#define urlloader_h - -#include "qwebframe.h" - -#include <QTextStream> -#include <QTimer> -#include <QVector> - -class UrlLoader : public QObject { - Q_OBJECT - -public: - UrlLoader(QWebFrame* frame, const QString& inputFileName, int timeoutSeconds, int extraTimeSeconds); - -public slots: - void loadNext(); - -private slots: - void checkIfFinished(); - void frameLoadStarted(); - void frameLoadFinished(); - -signals: - void pageLoadFinished(); - -private: - void loadUrlList(const QString& inputFileName); - bool getUrl(QString& qstr); - -private: - QVector<QString> m_urls; - int m_index; - QWebFrame* m_frame; - QTextStream m_stdOut; - int m_loaded; - QTimer m_timeoutTimer; - QTimer m_extraTimeTimer; - QTimer m_checkIfFinishedTimer; - int m_numFramesLoading; -}; - -#endif diff --git a/src/3rdparty/webkit/Tools/QtTestBrowser/useragentlist.txt b/src/3rdparty/webkit/Tools/QtTestBrowser/useragentlist.txt deleted file mode 100644 index decf1043e1..0000000000 --- a/src/3rdparty/webkit/Tools/QtTestBrowser/useragentlist.txt +++ /dev/null @@ -1,13 +0,0 @@ -Mozilla/5.0 (X11; Linux i686) AppleWebKit/535.1 (KHTML, like Gecko) QtTestBrowser/0.1 Safari/535.1 -Mozilla/5.0 (SymbianOS/9.4; U; Series60/5.0) AppleWebKit/535.1 (KHTML, like Gecko) QtTestBrowser/0.1 Mobile Safari/535.1 -Mozilla/5.0 (Macintosh; PPC Mac OS X) AppleWebKit/125.2 (KHTML, like Gecko) Safari/125.8 -Mozilla/5.0 (Unknown; like Android 2.2; Intel Mac OS X 10_6) AppleWebKit/533.3 (KHTML, like Gecko) Version/4.0.3 Mobile Safari/533.3 -Mozilla/5.0 (iPhone; CPU OS 3_2 like Mac OS X) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B334b Safari/531.21.10 -Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7 -Mozilla/5.0 (iPad; U; CPU OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B334b Safari/531.21.10 -Opera/9.80 (Windows NT 6.0; U; en) Presto/2.8.99 Version/11.10 -Mozilla/5.0 (SymbianOS/9.4; U; Series60/5.0 Nokia5800d-1b/20.2.014; Profile/MIDP-2.1 Configuration/CLDC-1.1) AppleWebKit/413 (KHTML, like Gecko) Safari/413 -Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.2; Trident/4.0; SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729; .NET CLR 3.0.30729; Media Center PC 6.0) -Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0) -Mozilla/5.0 (Windows; Windows NT 5.1) AppleWebKit/534.24 (KHTML, like Gecko) Chrome/11.0.696.68 Safari/534.24 -Mozilla/5.0 (Windows NT 6.1; rv:2.0.1) Gecko/20100101 Firefox/4.0.1 diff --git a/src/3rdparty/webkit/Tools/QtTestBrowser/utils.cpp b/src/3rdparty/webkit/Tools/QtTestBrowser/utils.cpp deleted file mode 100644 index 567c989f7e..0000000000 --- a/src/3rdparty/webkit/Tools/QtTestBrowser/utils.cpp +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "utils.h" - - -QString takeOptionValue(QStringList* arguments, int index) -{ - QString result; - - if (++index < arguments->count() && !arguments->at(index).startsWith("-")) - result = arguments->takeAt(index); - - return result; -} - -QString formatKeys(QList<QString> keys) -{ - QString result; - for (int i = 0; i < keys.count() - 1; i++) - result.append(keys.at(i) + "|"); - result.append(keys.last()); - return result; -} - -QList<QString> enumToKeys(const QMetaObject o, const QString& name, const QString& strip) -{ - QList<QString> list; - - int enumIndex = o.indexOfEnumerator(name.toLatin1().data()); - QMetaEnum enumerator = o.enumerator(enumIndex); - - if (enumerator.isValid()) { - for (int i = 0; i < enumerator.keyCount(); i++) { - QString key(enumerator.valueToKey(i)); - list.append(key.remove(strip)); - } - } - - return list; -} - -void appQuit(int exitCode, const QString& msg) -{ - if (!msg.isEmpty()) { - if (exitCode > 0) - qDebug("ERROR: %s", msg.toLatin1().data()); - else - qDebug() << msg; - } - exit(exitCode); -} - -QUrl urlFromUserInput(const QString& string) -{ - QString input(string); - QFileInfo fi(input); - if (fi.exists() && fi.isRelative()) - input = fi.absoluteFilePath(); - - return QUrl::fromUserInput(input); -} - - diff --git a/src/3rdparty/webkit/Tools/QtTestBrowser/utils.h b/src/3rdparty/webkit/Tools/QtTestBrowser/utils.h deleted file mode 100644 index b67351e3d5..0000000000 --- a/src/3rdparty/webkit/Tools/QtTestBrowser/utils.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef utils_h -#define utils_h - -#include <QtCore> - -#ifndef NO_RETURN -#if defined(__CC_ARM) || defined(__ARMCC__) -#define NO_RETURN __declspec(noreturn) -#elif defined(__GNUC__) -#define NO_RETURN __attribute((__noreturn__)) -#else -#define NO_RETURN -#endif -#endif - -// options handling -QString takeOptionValue(QStringList* arguments, int index); -QString formatKeys(QList<QString> keys); -QList<QString> enumToKeys(const QMetaObject o, const QString& name, const QString& strip); - -NO_RETURN void appQuit(int status, const QString& msg = QString()); - -QUrl urlFromUserInput(const QString& input); - -#endif diff --git a/src/3rdparty/webkit/Tools/QtTestBrowser/webinspector.h b/src/3rdparty/webkit/Tools/QtTestBrowser/webinspector.h deleted file mode 100644 index 5cc7f8acbc..0000000000 --- a/src/3rdparty/webkit/Tools/QtTestBrowser/webinspector.h +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies) - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef webinspector_h -#define webinspector_h - -#include <QtGui> -#include "qwebinspector.h" - -class WebInspector : public QWebInspector { - Q_OBJECT - -public: - WebInspector(QWidget* parent = 0) : QWebInspector(parent) {} - -signals: - void visibleChanged(bool nowVisible); - -protected: - void showEvent(QShowEvent* event) - { - QWebInspector::showEvent(event); - emit visibleChanged(true); - } - void hideEvent(QHideEvent* event) - { - QWebInspector::hideEvent(event); - emit visibleChanged(false); - } -}; - -#endif diff --git a/src/3rdparty/webkit/Tools/QtTestBrowser/webpage.cpp b/src/3rdparty/webkit/Tools/QtTestBrowser/webpage.cpp deleted file mode 100644 index 9088ce25e8..0000000000 --- a/src/3rdparty/webkit/Tools/QtTestBrowser/webpage.cpp +++ /dev/null @@ -1,210 +0,0 @@ -/* - * Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies) - * Copyright (C) 2009 Girish Ramakrishnan <girish@forwardbias.in> - * Copyright (C) 2006 George Staikos <staikos@kde.org> - * Copyright (C) 2006 Dirk Mueller <mueller@kde.org> - * Copyright (C) 2006 Zack Rusin <zack@kde.org> - * Copyright (C) 2006 Simon Hausmann <hausmann@kde.org> - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "webpage.h" - -#include "launcherwindow.h" - -#include <QAuthenticator> -#include <QDesktopServices> -#include <QtGui> -#include <QtNetwork/QNetworkReply> -#include <QtNetwork/QNetworkRequest> -#include <QtNetwork/QNetworkProxy> - -WebPage::WebPage(QObject* parent) - : QWebPage(parent) - , m_userAgent() - , m_interruptingJavaScriptEnabled(false) -{ - applyProxy(); - - connect(networkAccessManager(), SIGNAL(authenticationRequired(QNetworkReply*, QAuthenticator*)), - this, SLOT(authenticationRequired(QNetworkReply*, QAuthenticator*))); - connect(this, SIGNAL(featurePermissionRequested(QWebFrame*, QWebPage::Feature)), this, SLOT(requestPermission(QWebFrame*, QWebPage::Feature))); - connect(this, SIGNAL(featurePermissionRequestCanceled(QWebFrame*, QWebPage::Feature)), this, SLOT(featurePermissionRequestCanceled(QWebFrame*, QWebPage::Feature))); -} - -void WebPage::applyProxy() -{ - QUrl proxyUrl(qgetenv("http_proxy")); - - if (proxyUrl.isValid() && !proxyUrl.host().isEmpty()) { - int proxyPort = (proxyUrl.port() > 0) ? proxyUrl.port() : 8080; - networkAccessManager()->setProxy(QNetworkProxy(QNetworkProxy::HttpProxy, proxyUrl.host(), proxyPort)); - } -} - -bool WebPage::supportsExtension(QWebPage::Extension extension) const -{ - if (extension == QWebPage::ErrorPageExtension) - return true; - return false; -} - -bool WebPage::extension(Extension extension, const ExtensionOption* option, ExtensionReturn* output) -{ - const QWebPage::ErrorPageExtensionOption* info = static_cast<const QWebPage::ErrorPageExtensionOption*>(option); - QWebPage::ErrorPageExtensionReturn* errorPage = static_cast<QWebPage::ErrorPageExtensionReturn*>(output); - - errorPage->content = QString("<html><head><title>Failed loading page</title></head><body>%1</body></html>") - .arg(info->errorString).toUtf8(); - - return true; -} - -bool WebPage::acceptNavigationRequest(QWebFrame* frame, const QNetworkRequest& request, NavigationType type) -{ - QObject* view = parent(); - - QVariant value = view->property("keyboardModifiers"); - - if (!value.isNull()) { - Qt::KeyboardModifiers modifiers = Qt::KeyboardModifiers(value.toInt()); - - if (modifiers & Qt::ShiftModifier) { - QWebPage* page = createWindow(QWebPage::WebBrowserWindow); - page->mainFrame()->load(request); - return false; - } - - if (modifiers & Qt::AltModifier) { - openUrlInDefaultBrowser(request.url()); - return false; - } - } - - return QWebPage::acceptNavigationRequest(frame, request, type); -} - -void WebPage::openUrlInDefaultBrowser(const QUrl& url) -{ -#ifndef QT_NO_DESKTOPSERVICES - if (QAction* action = qobject_cast<QAction*>(sender())) - QDesktopServices::openUrl(action->data().toUrl()); - else - QDesktopServices::openUrl(url); -#endif -} - -QString WebPage::userAgentForUrl(const QUrl& url) const -{ - if (!m_userAgent.isEmpty()) - return m_userAgent; - return QWebPage::userAgentForUrl(url); -} - -bool WebPage::shouldInterruptJavaScript() -{ - if (!m_interruptingJavaScriptEnabled) - return false; - return QWebPage::shouldInterruptJavaScript(); -} - -void WebPage::authenticationRequired(QNetworkReply* reply, QAuthenticator* authenticator) -{ - QDialog* dialog = new QDialog(QApplication::activeWindow()); - dialog->setWindowTitle("HTTP Authentication"); - - QGridLayout* layout = new QGridLayout(dialog); - dialog->setLayout(layout); - - QLabel* messageLabel = new QLabel(dialog); - messageLabel->setWordWrap(true); - QString messageStr = QString("Enter with username and password for: %1"); - messageLabel->setText(messageStr.arg(reply->url().toString())); - layout->addWidget(messageLabel, 0, 1); - -#ifndef QT_NO_LINEEDIT - QLabel* userLabel = new QLabel("Username:", dialog); - layout->addWidget(userLabel, 1, 0); - QLineEdit* userInput = new QLineEdit(dialog); - layout->addWidget(userInput, 1, 1); - - QLabel* passLabel = new QLabel("Password:", dialog); - layout->addWidget(passLabel, 2, 0); - QLineEdit* passInput = new QLineEdit(dialog); - passInput->setEchoMode(QLineEdit::Password); - layout->addWidget(passInput, 2, 1); -#endif - - QDialogButtonBox* buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok - | QDialogButtonBox::Cancel, Qt::Horizontal, dialog); - connect(buttonBox, SIGNAL(accepted()), dialog, SLOT(accept())); - connect(buttonBox, SIGNAL(rejected()), dialog, SLOT(reject())); - layout->addWidget(buttonBox, 3, 1); - - if (dialog->exec() == QDialog::Accepted) { -#ifndef QT_NO_LINEEDIT - authenticator->setUser(userInput->text()); - authenticator->setPassword(passInput->text()); -#endif - } - - delete dialog; -} - -void WebPage::requestPermission(QWebFrame* frame, QWebPage::Feature feature) -{ - setFeaturePermission(frame, feature, PermissionGrantedByUser); -} - -void WebPage::featurePermissionRequestCanceled(QWebFrame*, QWebPage::Feature) -{ -} - -QWebPage* WebPage::createWindow(QWebPage::WebWindowType type) -{ - LauncherWindow* mw = new LauncherWindow; - if (type == WebModalDialog) - mw->setWindowModality(Qt::ApplicationModal); - mw->show(); - return mw->page(); -} - -QObject* WebPage::createPlugin(const QString &classId, const QUrl&, const QStringList&, const QStringList&) -{ - if (classId == "alien_QLabel") { - QLabel* l = new QLabel; - l->winId(); - return l; - } - -#ifndef QT_NO_UITOOLS - QUiLoader loader; - return loader.createWidget(classId, view()); -#else - Q_UNUSED(classId); - return 0; -#endif -} - diff --git a/src/3rdparty/webkit/Tools/QtTestBrowser/webpage.h b/src/3rdparty/webkit/Tools/QtTestBrowser/webpage.h deleted file mode 100644 index 01f3f6a867..0000000000 --- a/src/3rdparty/webkit/Tools/QtTestBrowser/webpage.h +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies) - * Copyright (C) 2009 Girish Ramakrishnan <girish@forwardbias.in> - * Copyright (C) 2006 George Staikos <staikos@kde.org> - * Copyright (C) 2006 Dirk Mueller <mueller@kde.org> - * Copyright (C) 2006 Zack Rusin <zack@kde.org> - * Copyright (C) 2006 Simon Hausmann <hausmann@kde.org> - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef webpage_h -#define webpage_h - -#include <qwebframe.h> -#include <qwebpage.h> - -class WebPage : public QWebPage { - Q_OBJECT - -public: - WebPage(QObject* parent = 0); - - virtual QWebPage* createWindow(QWebPage::WebWindowType); - virtual QObject* createPlugin(const QString&, const QUrl&, const QStringList&, const QStringList&); - virtual bool supportsExtension(QWebPage::Extension extension) const; - virtual bool extension(Extension extension, const ExtensionOption* option, ExtensionReturn* output); - - virtual bool acceptNavigationRequest(QWebFrame* frame, const QNetworkRequest& request, NavigationType type); - - QString userAgentForUrl(const QUrl& url) const; - void setInterruptingJavaScriptEnabled(bool enabled) { m_interruptingJavaScriptEnabled = enabled; } - -public slots: - void openUrlInDefaultBrowser(const QUrl& url = QUrl()); - void setUserAgent(const QString& ua) { m_userAgent = ua; } - bool shouldInterruptJavaScript(); - void authenticationRequired(QNetworkReply*, QAuthenticator*); - void requestPermission(QWebFrame* frame, QWebPage::Feature feature); - void featurePermissionRequestCanceled(QWebFrame* frame, QWebPage::Feature feature); - -private: - void applyProxy(); - QString m_userAgent; - bool m_interruptingJavaScriptEnabled; -}; - -#endif diff --git a/src/3rdparty/webkit/Tools/QtTestBrowser/webview.cpp b/src/3rdparty/webkit/Tools/QtTestBrowser/webview.cpp deleted file mode 100644 index 8e336203ad..0000000000 --- a/src/3rdparty/webkit/Tools/QtTestBrowser/webview.cpp +++ /dev/null @@ -1,277 +0,0 @@ -/* - * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies) - * Copyright (C) 2009 Girish Ramakrishnan <girish@forwardbias.in> - * Copyright (C) 2006 George Staikos <staikos@kde.org> - * Copyright (C) 2006 Dirk Mueller <mueller@kde.org> - * Copyright (C) 2006 Zack Rusin <zack@kde.org> - * Copyright (C) 2006 Simon Hausmann <hausmann@kde.org> - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "webview.h" - -#include <QtGui> -#include <QGraphicsScene> - -WebViewGraphicsBased::WebViewGraphicsBased(QWidget* parent) - : QGraphicsView(parent) - , m_item(new GraphicsWebView) - , m_numPaintsTotal(0) - , m_numPaintsSinceLastMeasure(0) - , m_measureFps(false) - , m_resizesToContents(false) - , m_machine(0) -{ - setScene(new QGraphicsScene(this)); - scene()->addItem(m_item); - scene()->setFocusItem(m_item); - - setFrameShape(QFrame::NoFrame); - setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - - m_updateTimer = new QTimer(this); - m_updateTimer->setInterval(1000); - connect(m_updateTimer, SIGNAL(timeout()), this, SLOT(updateFrameRate())); -} - -void WebViewGraphicsBased::setPage(QWebPage* page) -{ - connect(page->mainFrame(), SIGNAL(contentsSizeChanged(const QSize&)), SLOT(contentsSizeChanged(const QSize&))); - connect(page, SIGNAL(scrollRequested(int, int, const QRect&)), SLOT(scrollRequested(int, int))); - graphicsWebView()->setPage(page); -} - -void WebViewGraphicsBased::scrollRequested(int x, int y) -{ - if (!m_resizesToContents) - return; - - // Turn off interactive mode while scrolling, or QGraphicsView will replay the - // last mouse event which may cause WebKit to initiate a drag operation. - bool interactive = isInteractive(); - setInteractive(false); - - verticalScrollBar()->setValue(-y); - horizontalScrollBar()->setValue(-x); - - setInteractive(interactive); -} - -void WebViewGraphicsBased::contentsSizeChanged(const QSize& size) -{ - if (m_resizesToContents) - scene()->setSceneRect(0, 0, size.width(), size.height()); -} - -void WebViewGraphicsBased::setResizesToContents(bool b) -{ - if (b == m_resizesToContents) - return; - - m_resizesToContents = b; - graphicsWebView()->setResizesToContents(m_resizesToContents); - - // When setting resizesToContents ON, our web view widget will always size as big as the - // web content being displayed, and so will the QWebPage's viewport. It implies that internally - // WebCore will work as if there was no content rendered offscreen, and then no scrollbars need - // drawing. In order to keep scrolling working, we: - // - // 1) Set QGraphicsView's scrollbars policy back to 'auto'. - // 2) Set scene's boundaries rect to an invalid size, which automatically makes it to be as big - // as it needs to enclose all items onto it. We do that because QGraphicsView also calculates - // the size of its scrollable area according to the amount of content in scene that is rendered - // offscreen. - // 3) Set QWebPage's preferredContentsSize according to the size of QGraphicsView's viewport, - // so WebCore properly lays pages out. - // - // On the other hand, when toggling resizesToContents OFF, we set back the default values, as - // opposite as described above. - if (m_resizesToContents) { - setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded); - setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); - graphicsWebView()->page()->setPreferredContentsSize(size()); - QRectF itemRect(graphicsWebView()->geometry().topLeft(), graphicsWebView()->page()->mainFrame()->contentsSize()); - graphicsWebView()->setGeometry(itemRect); - scene()->setSceneRect(itemRect); - } else { - setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - graphicsWebView()->page()->setPreferredContentsSize(QSize()); - QRect viewportRect(QPoint(0, 0), size()); - graphicsWebView()->setGeometry(viewportRect); - scene()->setSceneRect(viewportRect); - } -} - -void WebViewGraphicsBased::resizeEvent(QResizeEvent* event) -{ - QGraphicsView::resizeEvent(event); - - QSize size(event->size()); - - if (m_resizesToContents) { - graphicsWebView()->page()->setPreferredContentsSize(size); - return; - } - - QRectF rect(QPoint(0, 0), size); - graphicsWebView()->setGeometry(rect); - scene()->setSceneRect(rect); -} - -void WebViewGraphicsBased::setFrameRateMeasurementEnabled(bool enabled) -{ - m_measureFps = enabled; - if (m_measureFps) { - m_lastConsultTime = m_startTime = QTime::currentTime(); - m_fpsTimer.start(); - m_updateTimer->start(); - } else { - m_fpsTimer.stop(); - m_updateTimer->stop(); - } -} - -void WebViewGraphicsBased::updateFrameRate() -{ - const QTime now = QTime::currentTime(); - int interval = m_lastConsultTime.msecsTo(now); - int frames = m_fpsTimer.numFrames(interval); - int current = interval ? frames * 1000 / interval : 0; - - emit currentFPSUpdated(current); - - m_lastConsultTime = now; -} - -void WebViewGraphicsBased::animatedFlip() -{ -#ifndef QT_NO_ANIMATION - QSizeF center = graphicsWebView()->boundingRect().size() / 2; - QPointF centerPoint = QPointF(center.width(), center.height()); - graphicsWebView()->setTransformOriginPoint(centerPoint); - - QPropertyAnimation* animation = new QPropertyAnimation(graphicsWebView(), "rotation", this); - animation->setDuration(1000); - - int rotation = int(graphicsWebView()->rotation()); - - animation->setStartValue(rotation); - animation->setEndValue(rotation + 180 - (rotation % 180)); - - animation->start(QAbstractAnimation::DeleteWhenStopped); -#endif -} - -void WebViewGraphicsBased::animatedYFlip() -{ -#ifndef QT_NO_ANIMATION - if (!m_machine) { - m_machine = new QStateMachine(this); - - QState* s0 = new QState(m_machine); - s0->assignProperty(this, "yRotation", 0); - - QState* s1 = new QState(m_machine); - s1->assignProperty(this, "yRotation", 90); - - QAbstractTransition* t1 = s0->addTransition(s1); - QPropertyAnimation* yRotationAnim = new QPropertyAnimation(this, "yRotation", this); - t1->addAnimation(yRotationAnim); - - QState* s2 = new QState(m_machine); - s2->assignProperty(this, "yRotation", -90); - s1->addTransition(s1, SIGNAL(propertiesAssigned()), s2); - - QState* s3 = new QState(m_machine); - s3->assignProperty(this, "yRotation", 0); - - QAbstractTransition* t2 = s2->addTransition(s3); - t2->addAnimation(yRotationAnim); - - QFinalState* final = new QFinalState(m_machine); - s3->addTransition(s3, SIGNAL(propertiesAssigned()), final); - - m_machine->setInitialState(s0); - yRotationAnim->setDuration(1000); - } - - m_machine->start(); -#endif -} - -void WebViewGraphicsBased::paintEvent(QPaintEvent* event) -{ - QGraphicsView::paintEvent(event); - if (!m_measureFps) - return; -} - -static QMenu* createContextMenu(QWebPage* page, QPoint position) -{ - QMenu* menu = page->createStandardContextMenu(); - - QWebHitTestResult r = page->mainFrame()->hitTestContent(position); - - if (!r.linkUrl().isEmpty()) { - WebPage* webPage = qobject_cast<WebPage*>(page); - QAction* newTabAction = menu->addAction("Open in Default &Browser", webPage, SLOT(openUrlInDefaultBrowser())); - newTabAction->setData(r.linkUrl()); - menu->insertAction(menu->actions().at(2), newTabAction); - } - return menu; -} - -void GraphicsWebView::mousePressEvent(QGraphicsSceneMouseEvent* event) -{ - setProperty("mouseButtons", QVariant::fromValue(int(event->buttons()))); - setProperty("keyboardModifiers", QVariant::fromValue(int(event->modifiers()))); - - QGraphicsWebView::mousePressEvent(event); -} - -void WebViewTraditional::mousePressEvent(QMouseEvent* event) -{ - setProperty("mouseButtons", QVariant::fromValue(int(event->buttons()))); - setProperty("keyboardModifiers", QVariant::fromValue(int(event->modifiers()))); - - QWebView::mousePressEvent(event); -} - -void GraphicsWebView::contextMenuEvent(QGraphicsSceneContextMenuEvent* event) -{ - QMenu* menu = createContextMenu(page(), event->pos().toPoint()); - menu->exec(event->screenPos()); - delete menu; -} - -void WebViewTraditional::contextMenuEvent(QContextMenuEvent* event) -{ - QMenu* menu = createContextMenu(page(), event->pos()); - menu->exec(event->globalPos()); - delete menu; -} - diff --git a/src/3rdparty/webkit/Tools/QtTestBrowser/webview.h b/src/3rdparty/webkit/Tools/QtTestBrowser/webview.h deleted file mode 100644 index b50b764e6c..0000000000 --- a/src/3rdparty/webkit/Tools/QtTestBrowser/webview.h +++ /dev/null @@ -1,131 +0,0 @@ -/* - * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies) - * Copyright (C) 2009 Girish Ramakrishnan <girish@forwardbias.in> - * Copyright (C) 2006 George Staikos <staikos@kde.org> - * Copyright (C) 2006 Dirk Mueller <mueller@kde.org> - * Copyright (C) 2006 Zack Rusin <zack@kde.org> - * Copyright (C) 2006 Simon Hausmann <hausmann@kde.org> - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef webview_h -#define webview_h - -#include "fpstimer.h" -#include "webpage.h" -#include <qwebview.h> -#include <qgraphicswebview.h> -#include <QGraphicsView> -#include <QGraphicsWidget> -#include <QTime> - -QT_BEGIN_NAMESPACE -class QStateMachine; -QT_END_NAMESPACE - -class WebViewTraditional : public QWebView { - Q_OBJECT - -public: - WebViewTraditional(QWidget* parent) : QWebView(parent) {} - -protected: - virtual void contextMenuEvent(QContextMenuEvent*); - virtual void mousePressEvent(QMouseEvent*); -}; - - -class GraphicsWebView : public QGraphicsWebView { - Q_OBJECT - -public: - GraphicsWebView(QGraphicsItem* parent = 0) : QGraphicsWebView(parent) {}; - -protected: - virtual void contextMenuEvent(QGraphicsSceneContextMenuEvent*); - virtual void mousePressEvent(QGraphicsSceneMouseEvent*); -}; - - -class WebViewGraphicsBased : public QGraphicsView { - Q_OBJECT - Q_PROPERTY(qreal yRotation READ yRotation WRITE setYRotation) - -public: - WebViewGraphicsBased(QWidget* parent); - void setPage(QWebPage* page); - - void setItemCacheMode(QGraphicsItem::CacheMode mode) { graphicsWebView()->setCacheMode(mode); } - QGraphicsItem::CacheMode itemCacheMode() { return graphicsWebView()->cacheMode(); } - - void setFrameRateMeasurementEnabled(bool enabled); - bool frameRateMeasurementEnabled() const { return m_measureFps; } - - virtual void resizeEvent(QResizeEvent*); - virtual void paintEvent(QPaintEvent* event); - - void setResizesToContents(bool b); - bool resizesToContents() const { return m_resizesToContents; } - - void setYRotation(qreal angle); - qreal yRotation() const { return m_yRotation; } - - GraphicsWebView* graphicsWebView() const { return m_item; } - -public slots: - void updateFrameRate(); - void animatedFlip(); - void animatedYFlip(); - void contentsSizeChanged(const QSize&); - void scrollRequested(int, int); - -signals: - void currentFPSUpdated(int fps); - -private: - GraphicsWebView* m_item; - int m_numPaintsTotal; - int m_numPaintsSinceLastMeasure; - QTime m_startTime; - QTime m_lastConsultTime; - QTimer* m_updateTimer; - bool m_measureFps; - qreal m_yRotation; - bool m_resizesToContents; - QStateMachine* m_machine; - FpsTimer m_fpsTimer; -}; - -inline void WebViewGraphicsBased::setYRotation(qreal angle) -{ - QRectF r = graphicsWebView()->boundingRect(); - graphicsWebView()->setTransform(QTransform() - .translate(r.width() / 2, r.height() / 2) - .rotate(angle, Qt::YAxis) - .translate(-r.width() / 2, -r.height() / 2)); - m_yRotation = angle; -} - -#endif diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION index 4f4c1552b1..0459590d19 100644 --- a/src/3rdparty/webkit/VERSION +++ b/src/3rdparty/webkit/VERSION @@ -4,4 +4,4 @@ This is a snapshot of the Qt port of WebKit from and has the sha1 checksum - efbf910ad7c49e8cdf81411b4ac0abeea0efd8f8 + 7e7119292e94f55a66d391cd183a4dd6ec1a8d65 diff --git a/src/3rdparty/webkit/include/QtWebKit/QGraphicsWebView b/src/3rdparty/webkit/include/QtWebKit/QGraphicsWebView deleted file mode 100644 index 508a397f13..0000000000 --- a/src/3rdparty/webkit/include/QtWebKit/QGraphicsWebView +++ /dev/null @@ -1 +0,0 @@ -#include "qgraphicswebview.h" diff --git a/src/3rdparty/webkit/include/QtWebKit/QWebDatabase b/src/3rdparty/webkit/include/QtWebKit/QWebDatabase deleted file mode 100644 index ec02742be9..0000000000 --- a/src/3rdparty/webkit/include/QtWebKit/QWebDatabase +++ /dev/null @@ -1 +0,0 @@ -#include "qwebdatabase.h" diff --git a/src/3rdparty/webkit/include/QtWebKit/QWebElement b/src/3rdparty/webkit/include/QtWebKit/QWebElement deleted file mode 100644 index 32a17d0176..0000000000 --- a/src/3rdparty/webkit/include/QtWebKit/QWebElement +++ /dev/null @@ -1 +0,0 @@ -#include "qwebelement.h" diff --git a/src/3rdparty/webkit/include/QtWebKit/QWebElementCollection b/src/3rdparty/webkit/include/QtWebKit/QWebElementCollection deleted file mode 100644 index 32a17d0176..0000000000 --- a/src/3rdparty/webkit/include/QtWebKit/QWebElementCollection +++ /dev/null @@ -1 +0,0 @@ -#include "qwebelement.h" diff --git a/src/3rdparty/webkit/include/QtWebKit/QWebFrame b/src/3rdparty/webkit/include/QtWebKit/QWebFrame deleted file mode 100644 index 0748fde584..0000000000 --- a/src/3rdparty/webkit/include/QtWebKit/QWebFrame +++ /dev/null @@ -1 +0,0 @@ -#include "qwebframe.h" diff --git a/src/3rdparty/webkit/include/QtWebKit/QWebHistory b/src/3rdparty/webkit/include/QtWebKit/QWebHistory deleted file mode 100644 index 35e9da5a58..0000000000 --- a/src/3rdparty/webkit/include/QtWebKit/QWebHistory +++ /dev/null @@ -1 +0,0 @@ -#include "qwebhistory.h" diff --git a/src/3rdparty/webkit/include/QtWebKit/QWebHistoryInterface b/src/3rdparty/webkit/include/QtWebKit/QWebHistoryInterface deleted file mode 100644 index 7352319eb5..0000000000 --- a/src/3rdparty/webkit/include/QtWebKit/QWebHistoryInterface +++ /dev/null @@ -1 +0,0 @@ -#include "qwebhistoryinterface.h" diff --git a/src/3rdparty/webkit/include/QtWebKit/QWebHistoryItem b/src/3rdparty/webkit/include/QtWebKit/QWebHistoryItem deleted file mode 100644 index 35e9da5a58..0000000000 --- a/src/3rdparty/webkit/include/QtWebKit/QWebHistoryItem +++ /dev/null @@ -1 +0,0 @@ -#include "qwebhistory.h" diff --git a/src/3rdparty/webkit/include/QtWebKit/QWebHitTestResult b/src/3rdparty/webkit/include/QtWebKit/QWebHitTestResult deleted file mode 100644 index 0748fde584..0000000000 --- a/src/3rdparty/webkit/include/QtWebKit/QWebHitTestResult +++ /dev/null @@ -1 +0,0 @@ -#include "qwebframe.h" diff --git a/src/3rdparty/webkit/include/QtWebKit/QWebInspector b/src/3rdparty/webkit/include/QtWebKit/QWebInspector deleted file mode 100644 index 0923bb781b..0000000000 --- a/src/3rdparty/webkit/include/QtWebKit/QWebInspector +++ /dev/null @@ -1 +0,0 @@ -#include "qwebinspector.h" diff --git a/src/3rdparty/webkit/include/QtWebKit/QWebPage b/src/3rdparty/webkit/include/QtWebKit/QWebPage deleted file mode 100644 index e8e8c109ec..0000000000 --- a/src/3rdparty/webkit/include/QtWebKit/QWebPage +++ /dev/null @@ -1 +0,0 @@ -#include "qwebpage.h" diff --git a/src/3rdparty/webkit/include/QtWebKit/QWebPluginFactory b/src/3rdparty/webkit/include/QtWebKit/QWebPluginFactory deleted file mode 100644 index 3e4ee812ce..0000000000 --- a/src/3rdparty/webkit/include/QtWebKit/QWebPluginFactory +++ /dev/null @@ -1 +0,0 @@ -#include "qwebpluginfactory.h" diff --git a/src/3rdparty/webkit/include/QtWebKit/QWebSecurityOrigin b/src/3rdparty/webkit/include/QtWebKit/QWebSecurityOrigin deleted file mode 100644 index 6427a3b8e3..0000000000 --- a/src/3rdparty/webkit/include/QtWebKit/QWebSecurityOrigin +++ /dev/null @@ -1 +0,0 @@ -#include "qwebsecurityorigin.h" diff --git a/src/3rdparty/webkit/include/QtWebKit/QWebSettings b/src/3rdparty/webkit/include/QtWebKit/QWebSettings deleted file mode 100644 index f50c1a2a11..0000000000 --- a/src/3rdparty/webkit/include/QtWebKit/QWebSettings +++ /dev/null @@ -1 +0,0 @@ -#include "qwebsettings.h" diff --git a/src/3rdparty/webkit/include/QtWebKit/QWebView b/src/3rdparty/webkit/include/QtWebKit/QWebView deleted file mode 100644 index 3ec1eb95de..0000000000 --- a/src/3rdparty/webkit/include/QtWebKit/QWebView +++ /dev/null @@ -1 +0,0 @@ -#include "qwebview.h" diff --git a/src/3rdparty/webkit/include/QtWebKit/QtWebKit b/src/3rdparty/webkit/include/QtWebKit/QtWebKit deleted file mode 100644 index 155a55197a..0000000000 --- a/src/3rdparty/webkit/include/QtWebKit/QtWebKit +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef QT_QTWEBKIT_MODULE_H -#define QT_QTWEBKIT_MODULE_H -#include <QtNetwork/QtNetwork> -#include "qwebframe.h" -#include "qgraphicswebview.h" -#include "qwebkitglobal.h" -#include "qwebkitplatformplugin.h" -#include "qwebpage.h" -#include "qwebview.h" -#include "qwebsettings.h" -#include "qwebhistoryinterface.h" -#include "qwebdatabase.h" -#include "qwebsecurityorigin.h" -#include "qwebelement.h" -#include "qwebpluginfactory.h" -#include "qwebhistory.h" -#include "qwebinspector.h" -#include "qwebkitversion.h" -#endif // QT_QTWEBKIT_MODULE_H diff --git a/src/3rdparty/webkit/include/QtWebKit/ViewportAttributes b/src/3rdparty/webkit/include/QtWebKit/ViewportAttributes deleted file mode 100644 index e8e8c109ec..0000000000 --- a/src/3rdparty/webkit/include/QtWebKit/ViewportAttributes +++ /dev/null @@ -1 +0,0 @@ -#include "qwebpage.h" diff --git a/src/3rdparty/webkit/include/QtWebKit/classheaders.pri b/src/3rdparty/webkit/include/QtWebKit/classheaders.pri deleted file mode 100644 index 0e13e75bae..0000000000 --- a/src/3rdparty/webkit/include/QtWebKit/classheaders.pri +++ /dev/null @@ -1 +0,0 @@ -WEBKIT_CLASS_HEADERS = $$PWD/QtWebKit $$PWD/QWebHitTestResult $$PWD/QWebFrame $$PWD/QGraphicsWebView $$PWD/QWebPage $$PWD/ViewportAttributes $$PWD/QWebView $$PWD/QWebSettings $$PWD/QWebHistoryInterface $$PWD/QWebDatabase $$PWD/QWebSecurityOrigin $$PWD/QWebElement $$PWD/QWebElementCollection $$PWD/QWebPluginFactory $$PWD/QWebHistoryItem $$PWD/QWebHistory $$PWD/QWebInspector diff --git a/src/3rdparty/webkit/include/QtWebKit/qgraphicswebview.h b/src/3rdparty/webkit/include/QtWebKit/qgraphicswebview.h deleted file mode 100644 index 0584f1d59b..0000000000 --- a/src/3rdparty/webkit/include/QtWebKit/qgraphicswebview.h +++ /dev/null @@ -1 +0,0 @@ -#include "../../WebKit/qt/Api/qgraphicswebview.h" diff --git a/src/3rdparty/webkit/include/QtWebKit/qwebdatabase.h b/src/3rdparty/webkit/include/QtWebKit/qwebdatabase.h deleted file mode 100644 index f23fed44f0..0000000000 --- a/src/3rdparty/webkit/include/QtWebKit/qwebdatabase.h +++ /dev/null @@ -1 +0,0 @@ -#include "../../WebKit/qt/Api/qwebdatabase.h" diff --git a/src/3rdparty/webkit/include/QtWebKit/qwebelement.h b/src/3rdparty/webkit/include/QtWebKit/qwebelement.h deleted file mode 100644 index e11a84b19d..0000000000 --- a/src/3rdparty/webkit/include/QtWebKit/qwebelement.h +++ /dev/null @@ -1 +0,0 @@ -#include "../../WebKit/qt/Api/qwebelement.h" diff --git a/src/3rdparty/webkit/include/QtWebKit/qwebframe.h b/src/3rdparty/webkit/include/QtWebKit/qwebframe.h deleted file mode 100644 index d1393c5ed7..0000000000 --- a/src/3rdparty/webkit/include/QtWebKit/qwebframe.h +++ /dev/null @@ -1 +0,0 @@ -#include "../../WebKit/qt/Api/qwebframe.h" diff --git a/src/3rdparty/webkit/include/QtWebKit/qwebhistory.h b/src/3rdparty/webkit/include/QtWebKit/qwebhistory.h deleted file mode 100644 index edf6f81aa5..0000000000 --- a/src/3rdparty/webkit/include/QtWebKit/qwebhistory.h +++ /dev/null @@ -1 +0,0 @@ -#include "../../WebKit/qt/Api/qwebhistory.h" diff --git a/src/3rdparty/webkit/include/QtWebKit/qwebhistoryinterface.h b/src/3rdparty/webkit/include/QtWebKit/qwebhistoryinterface.h deleted file mode 100644 index da1a6a9bf7..0000000000 --- a/src/3rdparty/webkit/include/QtWebKit/qwebhistoryinterface.h +++ /dev/null @@ -1 +0,0 @@ -#include "../../WebKit/qt/Api/qwebhistoryinterface.h" diff --git a/src/3rdparty/webkit/include/QtWebKit/qwebinspector.h b/src/3rdparty/webkit/include/QtWebKit/qwebinspector.h deleted file mode 100644 index 47421055c3..0000000000 --- a/src/3rdparty/webkit/include/QtWebKit/qwebinspector.h +++ /dev/null @@ -1 +0,0 @@ -#include "../../WebKit/qt/Api/qwebinspector.h" diff --git a/src/3rdparty/webkit/include/QtWebKit/qwebkitglobal.h b/src/3rdparty/webkit/include/QtWebKit/qwebkitglobal.h deleted file mode 100644 index b9b26508de..0000000000 --- a/src/3rdparty/webkit/include/QtWebKit/qwebkitglobal.h +++ /dev/null @@ -1 +0,0 @@ -#include "../../WebKit/qt/Api/qwebkitglobal.h" diff --git a/src/3rdparty/webkit/include/QtWebKit/qwebkitplatformplugin.h b/src/3rdparty/webkit/include/QtWebKit/qwebkitplatformplugin.h deleted file mode 100644 index db4e554030..0000000000 --- a/src/3rdparty/webkit/include/QtWebKit/qwebkitplatformplugin.h +++ /dev/null @@ -1 +0,0 @@ -#include "../../WebKit/qt/Api/qwebkitplatformplugin.h" diff --git a/src/3rdparty/webkit/include/QtWebKit/qwebkitversion.h b/src/3rdparty/webkit/include/QtWebKit/qwebkitversion.h deleted file mode 100644 index af7be3bee6..0000000000 --- a/src/3rdparty/webkit/include/QtWebKit/qwebkitversion.h +++ /dev/null @@ -1 +0,0 @@ -#include "../../WebKit/qt/Api/qwebkitversion.h" diff --git a/src/3rdparty/webkit/include/QtWebKit/qwebpage.h b/src/3rdparty/webkit/include/QtWebKit/qwebpage.h deleted file mode 100644 index 2053ccb5a2..0000000000 --- a/src/3rdparty/webkit/include/QtWebKit/qwebpage.h +++ /dev/null @@ -1 +0,0 @@ -#include "../../WebKit/qt/Api/qwebpage.h" diff --git a/src/3rdparty/webkit/include/QtWebKit/qwebpluginfactory.h b/src/3rdparty/webkit/include/QtWebKit/qwebpluginfactory.h deleted file mode 100644 index db095b7ed1..0000000000 --- a/src/3rdparty/webkit/include/QtWebKit/qwebpluginfactory.h +++ /dev/null @@ -1 +0,0 @@ -#include "../../WebKit/qt/Api/qwebpluginfactory.h" diff --git a/src/3rdparty/webkit/include/QtWebKit/qwebsecurityorigin.h b/src/3rdparty/webkit/include/QtWebKit/qwebsecurityorigin.h deleted file mode 100644 index 1ce553c349..0000000000 --- a/src/3rdparty/webkit/include/QtWebKit/qwebsecurityorigin.h +++ /dev/null @@ -1 +0,0 @@ -#include "../../WebKit/qt/Api/qwebsecurityorigin.h" diff --git a/src/3rdparty/webkit/include/QtWebKit/qwebsettings.h b/src/3rdparty/webkit/include/QtWebKit/qwebsettings.h deleted file mode 100644 index cdedc07f7e..0000000000 --- a/src/3rdparty/webkit/include/QtWebKit/qwebsettings.h +++ /dev/null @@ -1 +0,0 @@ -#include "../../WebKit/qt/Api/qwebsettings.h" diff --git a/src/3rdparty/webkit/include/QtWebKit/qwebview.h b/src/3rdparty/webkit/include/QtWebKit/qwebview.h deleted file mode 100644 index 34906656c3..0000000000 --- a/src/3rdparty/webkit/include/QtWebKit/qwebview.h +++ /dev/null @@ -1 +0,0 @@ -#include "../../WebKit/qt/Api/qwebview.h" |
