diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-09 12:15:52 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-09 12:16:06 +0100 |
| commit | de4f791e30be4e4239b381c11745ffa4d87ddb8b (patch) | |
| tree | 885e3a5d6670828b454cf676b4d42f78e28b1f0e /Source/WebCore | |
| parent | b022df48697d40cdabdeafb2c29bb14fe489b6fe (diff) | |
| download | qtwebkit-de4f791e30be4e4239b381c11745ffa4d87ddb8b.tar.gz | |
Imported WebKit commit e2c32e2f53e02d388e70b9db88b91d8d9d28fc84 (http://svn.webkit.org/repository/webkit/trunk@133952)
Revert back to an older snapshot that should build on ARM
Diffstat (limited to 'Source/WebCore')
177 files changed, 582 insertions, 1794 deletions
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 8404ca624..dca59ce3d 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,1113 +1,3 @@ -2012-11-08 Eugene Klyuchnikov <eustas.bug@gmail.com> - - Web Inspector: Timeline: "Send Request" events are shown out of order. - https://bugs.webkit.org/show_bug.cgi?id=101544 - - Reviewed by Yury Semikhatsky. - - Solution: replace obsolete out-of-order record pushing with frontend - record reparenting. - - * inspector/InspectorTimelineAgent.cpp: - (WebCore::InspectorTimelineAgent::willSendResourceRequest): Replaced - direct record pushing with standard appendRecord invokation. - * inspector/front-end/TimelinePresentationModel.js: - (WebInspector.TimelinePresentationModel.prototype._findParentRecord): - Made "Send Request" records top-level if gluing is on. - -2012-11-08 Sheriff Bot <webkit.review.bot@gmail.com> - - Unreviewed, rolling out r134010. - http://trac.webkit.org/changeset/134010 - https://bugs.webkit.org/show_bug.cgi?id=101716 - - Broke the chromium windows build. (Requested by noel_ on - #webkit). - - * Modules/indexeddb/IDBAny.cpp: - * Modules/indexeddb/IDBCallbacks.h: - * Modules/indexeddb/IDBDatabase.cpp: - (WebCore::IDBDatabase::createObjectStore): - (WebCore::IDBDatabase::deleteObjectStore): - (WebCore::IDBDatabase::transaction): - * Modules/indexeddb/IDBDatabase.h: - (IDBDatabase): - * Modules/indexeddb/IDBDatabaseBackendImpl.cpp: - (WebCore::IDBDatabaseBackendImpl::getObjectStoreId): - (WebCore): - (WebCore::IDBDatabaseBackendImpl::setVersion): - (WebCore::IDBDatabaseBackendImpl::transaction): - (WebCore::IDBDatabaseBackendImpl::runIntVersionChangeTransaction): - * Modules/indexeddb/IDBDatabaseBackendImpl.h: - (WebCore::IDBDatabaseBackendImpl::deleteObjectStore): - (IDBDatabaseBackendImpl): - * Modules/indexeddb/IDBDatabaseBackendInterface.h: - (WebCore): - (IDBDatabaseBackendInterface): - * Modules/indexeddb/IDBMetadata.h: - (WebCore::IDBObjectStoreMetadata::containsIndex): - (WebCore::IDBDatabaseMetadata::findObjectStore): - (IDBDatabaseMetadata): - (WebCore::IDBDatabaseMetadata::containsObjectStore): - * Modules/indexeddb/IDBObjectStore.cpp: - (WebCore::IDBObjectStore::put): - (WebCore): - (WebCore::IDBObjectStore::createIndex): - (WebCore::IDBObjectStore::index): - (WebCore::IDBObjectStore::deleteIndex): - * Modules/indexeddb/IDBObjectStore.h: - (WebCore::IDBObjectStore::openCursor): - (IDBObjectStore): - * Modules/indexeddb/IDBObjectStoreBackendImpl.cpp: - (WebCore::IDBObjectStoreBackendImpl::put): - (WebCore::IDBObjectStoreBackendImpl::putWithIndexKeys): - (WebCore): - (WebCore::IDBObjectStoreBackendImpl::setIndexKeys): - (WebCore::IDBObjectStoreBackendImpl::setIndexesReady): - (WebCore::IDBObjectStoreBackendImpl::index): - (WebCore::IDBObjectStoreBackendImpl::getIndexId): - (WebCore::IDBObjectStoreBackendImpl::getIndexIds): - (WebCore::IDBObjectStoreBackendImpl::deleteIndex): - * Modules/indexeddb/IDBObjectStoreBackendImpl.h: - (IDBObjectStoreBackendImpl): - * Modules/indexeddb/IDBObjectStoreBackendInterface.h: - (WebCore): - * Modules/indexeddb/IDBTransaction.cpp: - (WebCore::IDBTransaction::objectStore): - * Modules/indexeddb/IDBTransactionBackendImpl.cpp: - (WebCore::IDBTransactionBackendImpl::objectStore): - (WebCore): - * Modules/indexeddb/IDBTransactionBackendImpl.h: - (IDBTransactionBackendImpl): - * Modules/indexeddb/IDBTransactionBackendInterface.h: - -2012-11-08 Grzegorz Czajkowski <g.czajkowski@samsung.com> - - [EFL] Add a method to the TextCheckerEnchant class to check whether any dictionary is loaded - https://bugs.webkit.org/show_bug.cgi?id=101570 - - Reviewed by Gustavo Noronha Silva. - - Expose a new method to check whether a vector of loaded languages is empty. - WK2-EFL needs it to set the default language (if the client didn't set any) when - spelling setting is being enabled. This change makes it more convenient to check - whether the dictionaries vector is empty. - - No new tests, no behavior change. - - * platform/text/enchant/TextCheckerEnchant.cpp: - (TextCheckerEnchant::checkSpellingOfString): - (TextCheckerEnchant::getGuessesForWord): - (TextCheckerEnchant::loadedSpellCheckingLanguages): - A newly exposed method is used internally too. - - * platform/text/enchant/TextCheckerEnchant.h: - (WebCore::TextCheckerEnchant::hasDictionary): - Add an inline hasDictionary() method. - -2012-11-08 Shinya Kawanaka <shinyak@chromium.org> - - [Refactoring] Remove shadowPseudoId() and use pseudo() instead in TextTrackCue - https://bugs.webkit.org/show_bug.cgi?id=101702 - - Reviewed by Hajime Morita. - - We're migrating shadowPseudoId() to pseudo(). We remove shadowPseudoId() from TextTrackCue and use - setPseudo()/pseudo() instead. - - No new tests, simple refactoring. - - * html/track/TextTrackCue.cpp: - (WebCore::TextTrackCueBox::TextTrackCueBox): - * html/track/TextTrackCue.h: - (TextTrackCueBox): - -2012-11-08 Arpita Bahuguna <arpitabahuguna@gmail.com> - - table not aligned in center column and seems shrunk because of float:right (table-layout: fixed and width: 100%) - https://bugs.webkit.org/show_bug.cgi?id=18153 - - Reviewed by Beth Dakin. - - Preferred logical width is computed incorrectly for fixed layout tables - with 100% percent width, in standards mode. - - According to our fixed table layout algorithm (CSS2 specification - 17.5.2.1) - the ultimate width of the table is the greater of the value of the - 'width' property for the table elements and the sum of the column - widths. - - For our specific scenario we have a fixed layout table with 100% width - consisting of columns with fixed widths, the sum of which is less than - the specified width of the table (i.e. 100% of the containing block). - Even then the applied width is the cummulative of the width of the - columns. - - This happens because of the quirks mode check added in - FixedTableLayout::computePreferredLogicalWidths(), which prohibits the - setting of maxWidth to our fixed layout table with percent width, and - which perhaps is not required anymore. - - Test: fast/table/fixed-table-layout/table-with-percent-width.html - - * rendering/FixedTableLayout.cpp: - (WebCore::FixedTableLayout::computePreferredLogicalWidths): - Removed the quirks mode check. - -2012-11-08 Sheriff Bot <webkit.review.bot@gmail.com> - - Unreviewed, rolling out r134004. - http://trac.webkit.org/changeset/134004 - https://bugs.webkit.org/show_bug.cgi?id=101713 - - multiple crashes (Requested by hayato on #webkit). - - * rendering/RenderThemeMac.mm: - (WebCore::RenderThemeMac::adjustMediaSliderThumbSize): - (WebCore::RenderThemeMac::paintMediaFullscreenButton): - (WebCore::RenderThemeMac::paintMediaMuteButton): - (WebCore::RenderThemeMac::paintMediaPlayButton): - (WebCore::RenderThemeMac::paintMediaSeekBackButton): - (WebCore::RenderThemeMac::paintMediaSeekForwardButton): - (WebCore::RenderThemeMac::paintMediaSliderTrack): - (WebCore::RenderThemeMac::paintMediaSliderThumb): - (WebCore::RenderThemeMac::paintMediaRewindButton): - (WebCore::RenderThemeMac::paintMediaReturnToRealtimeButton): - (WebCore::RenderThemeMac::paintMediaToggleClosedCaptionsButton): - (WebCore::RenderThemeMac::paintMediaControlsBackground): - (WebCore::RenderThemeMac::paintMediaCurrentTime): - (WebCore::RenderThemeMac::paintMediaTimeRemaining): - (WebCore::RenderThemeMac::paintMediaVolumeSliderContainer): - (WebCore::RenderThemeMac::paintMediaVolumeSliderTrack): - (WebCore::RenderThemeMac::paintMediaVolumeSliderThumb): - (WebCore::RenderThemeMac::paintMediaFullScreenVolumeSliderTrack): - (WebCore::RenderThemeMac::paintMediaFullScreenVolumeSliderThumb): - -2012-11-08 Jan Keromnes <janx@linux.com> - - Web Inspector: stop using cursorCoords in CodeMirrorTextEditor - https://bugs.webkit.org/show_bug.cgi?id=101607 - - Reviewed by Vsevolod Vlasov. - - API changes completing migration to v3. - - * inspector/front-end/CodeMirrorTextEditor.js: - (WebInspector.CodeMirrorTextEditor): - (WebInspector.CodeMirrorTextEditor.prototype.revealLine): - (WebInspector.CodeMirrorTextEditor.prototype.selection): - -2012-11-08 Alexei Filippov <alph@chromium.org> - - Web Inspector: make "Other" bar color darker in NMI snapshot. - https://bugs.webkit.org/show_bug.cgi?id=101602 - - Reviewed by Vsevolod Vlasov. - - * inspector/front-end/NativeMemorySnapshotView.js: - (WebInspector.MemoryBlockViewProperties._initialize): - -2012-11-08 Alec Flett <alecflett@chromium.org> - - IndexedDB: switch frontend to use int64_t-based references - https://bugs.webkit.org/show_bug.cgi?id=100426 - - Reviewed by Tony Chang. - - Remove String-based objectStore/index references, obsoleted by - https://bugs.webkit.org/show_bug.cgi?id=100425. - - No new tests as this is the second half of a refactor. - - * Modules/indexeddb/IDBCallbacks.h: - * Modules/indexeddb/IDBDatabase.cpp: - (WebCore::IDBDatabase::deleteObjectStore): - (WebCore::IDBDatabase::transaction): - * Modules/indexeddb/IDBDatabaseBackendImpl.cpp: - (WebCore::IDBDatabaseBackendImpl::setVersion): - (WebCore::IDBDatabaseBackendImpl::transaction): - (WebCore::IDBDatabaseBackendImpl::runIntVersionChangeTransaction): - * Modules/indexeddb/IDBDatabaseBackendImpl.h: - (IDBDatabaseBackendImpl): - * Modules/indexeddb/IDBDatabaseBackendInterface.h: - (IDBDatabaseBackendInterface): - * Modules/indexeddb/IDBMetadata.h: - (WebCore::IDBObjectStoreMetadata::findIndex): - (IDBObjectStoreMetadata): - (WebCore::IDBObjectStoreMetadata::containsIndex): - * Modules/indexeddb/IDBObjectStore.cpp: - (WebCore::IDBObjectStore::put): - (WebCore): - (WebCore::IDBObjectStore::index): - (WebCore::IDBObjectStore::deleteIndex): - * Modules/indexeddb/IDBObjectStoreBackendImpl.cpp: - (WebCore::IDBObjectStoreBackendImpl::put): - (WebCore): - * Modules/indexeddb/IDBObjectStoreBackendImpl.h: - (IDBObjectStoreBackendImpl): - * Modules/indexeddb/IDBObjectStoreBackendInterface.h: - * inspector/Inspector-1.0.json: - * inspector/Inspector.json: - * inspector/InspectorIndexedDBAgent.cpp: - (WebCore): - (WebCore::InspectorIndexedDBAgent::requestData): - * inspector/InspectorIndexedDBAgent.h: - (InspectorIndexedDBAgent): - -2012-11-08 Shinya Kawanaka <shinyak@chromium.org> - - [Refactoring] Expose collectFeaturesFromSelector from RuleSet.cpp - https://bugs.webkit.org/show_bug.cgi?id=101692 - - Reviewed by Dimitri Glazkov. - - We expose collectFeaturesFromSelector in RuleSet.cpp to use it for collecting ShadowDOM select attribute features. - - No new tests, simple refactoring. - - * css/RuleFeature.cpp: - (WebCore::RuleFeatureSet::collectFeaturesFromSelector): Moved from RuleSet.cpp. - (WebCore): - * css/RuleFeature.h: - (WebCore): - (RuleFeatureSet): - * css/RuleSet.cpp: - (WebCore::collectFeaturesFromRuleData): - -2012-11-08 Robert Sesek <rsesek@chromium.org> - - Guard calls to WebKitSystemInterface media control drawing functions in RenderThemeMac with PLATFORM(MAC) - https://bugs.webkit.org/show_bug.cgi?id=101634 - - Reviewed by Adam Barth. - - No new tests, just disabling unused code in Chromium port. - - * rendering/RenderThemeMac.mm: - (WebCore::RenderThemeMac::adjustMediaSliderThumbSize): - (WebCore::RenderThemeMac::paintMediaFullscreenButton): - (WebCore::RenderThemeMac::paintMediaMuteButton): - (WebCore::RenderThemeMac::paintMediaPlayButton): - (WebCore::RenderThemeMac::paintMediaSeekBackButton): - (WebCore::RenderThemeMac::paintMediaSeekForwardButton): - (WebCore::RenderThemeMac::paintMediaSliderTrack): - (WebCore::RenderThemeMac::paintMediaSliderThumb): - (WebCore::RenderThemeMac::paintMediaRewindButton): - (WebCore::RenderThemeMac::paintMediaReturnToRealtimeButton): - (WebCore::RenderThemeMac::paintMediaToggleClosedCaptionsButton): - (WebCore::RenderThemeMac::paintMediaControlsBackground): - (WebCore::RenderThemeMac::paintMediaCurrentTime): - (WebCore::RenderThemeMac::paintMediaTimeRemaining): - (WebCore::RenderThemeMac::paintMediaVolumeSliderContainer): - (WebCore::RenderThemeMac::paintMediaVolumeSliderTrack): - (WebCore::RenderThemeMac::paintMediaVolumeSliderThumb): - (WebCore::RenderThemeMac::paintMediaFullScreenVolumeSliderTrack): - (WebCore::RenderThemeMac::paintMediaFullScreenVolumeSliderThumb): - -2012-11-08 Keishi Hattori <keishi@webkit.org> - - Enable calendar picker for input types week/month - https://bugs.webkit.org/show_bug.cgi?id=101553 - - Reviewed by Kent Tamura. - - Enabling calendar picker for <input type=week/month> - - No new tests. Tests will be added later in Bug 101556 and Bug 101555. - - * rendering/RenderThemeChromiumCommon.cpp: - (WebCore::RenderThemeChromiumCommon::supportsCalendarPicker): - -2012-11-08 Robin Cao <robin.cao@torchmobile.com.cn> - - [BlackBerry] Change the default return value of MediaPlayerPrivate::hasSingleSecurityOrigin - https://bugs.webkit.org/show_bug.cgi?id=101681 - - Reviewed by George Staikos. - - Since the platform player in BlackBerry disallows resources that come from different origins, - so it's safe to directly returns true here. - - * platform/graphics/blackberry/MediaPlayerPrivateBlackBerry.cpp: - (WebCore::MediaPlayerPrivate::hasSingleSecurityOrigin): - -2012-11-08 Mark Lam <mark.lam@apple.com> - - Renamed ...InlineMethods.h files to ...Inlines.h. - https://bugs.webkit.org/show_bug.cgi?id=101145. - - Reviewed by Geoffrey Garen. - - This is only a refactoring effort to rename the files. There are no - functionality changes. - - No new tests. - - * GNUmakefile.list.am: - * Target.pri: - * WebCore.gypi: - * WebCore.vcproj/WebCore.vcproj: - * WebCore.xcodeproj/project.pbxproj: - * html/parser/HTMLEntityParser.cpp: - * html/parser/HTMLTokenizer.cpp: - * html/track/WebVTTTokenizer.cpp: - * xml/parser/CharacterReferenceParserInlineMethods.h: Removed. - * xml/parser/CharacterReferenceParserInlines.h: Copied from Source/WebCore/xml/parser/CharacterReferenceParserInlineMethods.h. - * xml/parser/MarkupTokenizerInlineMethods.h: Removed. - * xml/parser/MarkupTokenizerInlines.h: Copied from Source/WebCore/xml/parser/MarkupTokenizerInlineMethods.h. - * xml/parser/XMLCharacterReferenceParser.cpp: - * xml/parser/XMLTokenizer.cpp: - -2012-11-08 Sheriff Bot <webkit.review.bot@gmail.com> - - Unreviewed, rolling out r133984. - http://trac.webkit.org/changeset/133984 - https://bugs.webkit.org/show_bug.cgi?id=101684 - - windows build error. (Requested by hayato on #webkit). - - * Modules/indexeddb/IDBCallbacks.h: - * Modules/indexeddb/IDBDatabase.cpp: - (WebCore::IDBDatabase::createObjectStore): - (WebCore::IDBDatabase::deleteObjectStore): - (WebCore::IDBDatabase::transaction): - * Modules/indexeddb/IDBDatabase.h: - (IDBDatabase): - * Modules/indexeddb/IDBDatabaseBackendImpl.cpp: - (WebCore::IDBDatabaseBackendImpl::getObjectStoreId): - (WebCore): - (WebCore::IDBDatabaseBackendImpl::setVersion): - (WebCore::IDBDatabaseBackendImpl::transaction): - (WebCore::IDBDatabaseBackendImpl::runIntVersionChangeTransaction): - * Modules/indexeddb/IDBDatabaseBackendImpl.h: - (WebCore::IDBDatabaseBackendImpl::deleteObjectStore): - (IDBDatabaseBackendImpl): - * Modules/indexeddb/IDBDatabaseBackendInterface.h: - (IDBDatabaseBackendInterface): - * Modules/indexeddb/IDBMetadata.h: - (WebCore::IDBObjectStoreMetadata::containsIndex): - (WebCore::IDBDatabaseMetadata::findObjectStore): - (IDBDatabaseMetadata): - (WebCore::IDBDatabaseMetadata::containsObjectStore): - * Modules/indexeddb/IDBObjectStore.cpp: - (WebCore::IDBObjectStore::put): - (WebCore): - (WebCore::IDBObjectStore::createIndex): - (WebCore::IDBObjectStore::index): - (WebCore::IDBObjectStore::deleteIndex): - * Modules/indexeddb/IDBObjectStore.h: - (WebCore::IDBObjectStore::openCursor): - (IDBObjectStore): - * Modules/indexeddb/IDBObjectStoreBackendImpl.cpp: - (WebCore::IDBObjectStoreBackendImpl::put): - (WebCore::IDBObjectStoreBackendImpl::putWithIndexKeys): - (WebCore): - (WebCore::IDBObjectStoreBackendImpl::setIndexKeys): - (WebCore::IDBObjectStoreBackendImpl::setIndexesReady): - (WebCore::IDBObjectStoreBackendImpl::index): - (WebCore::IDBObjectStoreBackendImpl::getIndexId): - (WebCore::IDBObjectStoreBackendImpl::getIndexIds): - (WebCore::IDBObjectStoreBackendImpl::deleteIndex): - * Modules/indexeddb/IDBObjectStoreBackendImpl.h: - (IDBObjectStoreBackendImpl): - * Modules/indexeddb/IDBObjectStoreBackendInterface.h: - * Modules/indexeddb/IDBTransaction.cpp: - (WebCore::IDBTransaction::objectStore): - * Modules/indexeddb/IDBTransactionBackendImpl.cpp: - (WebCore::IDBTransactionBackendImpl::objectStore): - (WebCore): - * Modules/indexeddb/IDBTransactionBackendImpl.h: - (IDBTransactionBackendImpl): - * Modules/indexeddb/IDBTransactionBackendInterface.h: - -2012-11-08 Shinya Kawanaka <shinyak@chromium.org> - - HTMLContentElement should preserve parsed CSSSelectorList - https://bugs.webkit.org/show_bug.cgi?id=101543 - - Reviewed by Dimitri Glazkov. - - We would like to preserve CSSSelectorList for select attribute of HTMLContentElement. - - Before, we parsed and validated select attribute every time distribution happens. If we preserve the parsed - CSSSelectorList, we can reduce distribution time. - - This is also a prepration patch for Bug 101180. It also needs the parsed CSSSelectorList. We don't want to - parse and validate it again. - - No new tests, covered by exising tests. - - * html/shadow/ContentSelectorQuery.cpp: - (WebCore::ContentSelectorQuery::ContentSelectorQuery): We don't parse select attribute here anymore. - if it's already parsed. - (WebCore::ContentSelectorQuery::matches): - * html/shadow/ContentSelectorQuery.h: - (ContentSelectorQuery): - * html/shadow/HTMLContentElement.cpp: - (WebCore::HTMLContentElement::HTMLContentElement): - (WebCore::HTMLContentElement::isSelectValid): - (WebCore::HTMLContentElement::ensureSelectParsed): If we don't have parsed the current select attribute, - we parse and validate it. - (WebCore::HTMLContentElement::parseAttribute): When select attribute is changed, we have to have a flag enabled - to parse select attrite again. - (WebCore::validateSubSelector): Moved from ContentSelectorQuery. - (WebCore): - (WebCore::validateSelector): Moved from ContentSelectorQuery. - (WebCore::HTMLContentElement::validateSelect): - * html/shadow/HTMLContentElement.h: - (HTMLContentElement): - (WebCore::HTMLContentElement::setSelect): - (WebCore): - (WebCore::HTMLContentElement::selectorList): - * html/shadow/HTMLShadowElement.cpp: - (WebCore::HTMLShadowElement::emptySelectorList): - (WebCore): - * html/shadow/HTMLShadowElement.h: - (HTMLShadowElement): - (WebCore::HTMLShadowElement::selectorList): - * html/shadow/InsertionPoint.h: - (InsertionPoint): - -2012-11-08 Alec Flett <alecflett@chromium.org> - - IndexedDB: switch frontend to use int64_t-based references - https://bugs.webkit.org/show_bug.cgi?id=100426 - - Reviewed by Tony Chang. - - Remove String-based objectStore/index references, obsoleted by - https://bugs.webkit.org/show_bug.cgi?id=100425. - - No new tests as this is the second half of a refactor. - - * Modules/indexeddb/IDBCallbacks.h: - * Modules/indexeddb/IDBDatabase.cpp: - (WebCore::IDBDatabase::deleteObjectStore): - (WebCore::IDBDatabase::transaction): - * Modules/indexeddb/IDBDatabaseBackendImpl.cpp: - (WebCore::IDBDatabaseBackendImpl::setVersion): - (WebCore::IDBDatabaseBackendImpl::transaction): - (WebCore::IDBDatabaseBackendImpl::runIntVersionChangeTransaction): - * Modules/indexeddb/IDBDatabaseBackendImpl.h: - (IDBDatabaseBackendImpl): - * Modules/indexeddb/IDBDatabaseBackendInterface.h: - (IDBDatabaseBackendInterface): - * Modules/indexeddb/IDBMetadata.h: - (WebCore::IDBObjectStoreMetadata::findIndex): - (IDBObjectStoreMetadata): - (WebCore::IDBObjectStoreMetadata::containsIndex): - * Modules/indexeddb/IDBObjectStore.cpp: - (WebCore::IDBObjectStore::put): - (WebCore): - (WebCore::IDBObjectStore::index): - (WebCore::IDBObjectStore::deleteIndex): - * Modules/indexeddb/IDBObjectStoreBackendImpl.cpp: - (WebCore::IDBObjectStoreBackendImpl::put): - (WebCore): - * Modules/indexeddb/IDBObjectStoreBackendImpl.h: - (IDBObjectStoreBackendImpl): - * Modules/indexeddb/IDBObjectStoreBackendInterface.h: - * inspector/Inspector-1.0.json: - * inspector/Inspector.json: - * inspector/InspectorIndexedDBAgent.cpp: - (WebCore): - (WebCore::InspectorIndexedDBAgent::requestData): - * inspector/InspectorIndexedDBAgent.h: - (InspectorIndexedDBAgent): - -2012-11-08 Kenichi Ishibashi <bashi@chromium.org> - - [Chromium] Arabic digits should appear left-to-right - https://bugs.webkit.org/show_bug.cgi?id=101440 - - Reviewed by Tony Chang. - - Call hb_buffer_set_direction() to set direction when drawing glyphs or - direction should be overridden. Leave direction setting to HarfBuzz when - WebKit is calculating widths because the direction is LTR by default while - calculating widths. Set script before shaping so that HarfBuzz can estimate - appropriate direction. - - Test: fast/text/international/arabic-digits.html - - * platform/graphics/harfbuzz/ng/HarfBuzzShaper.cpp: - (WebCore::HarfBuzzShaper::HarfBuzzRun::HarfBuzzRun): - Add m_script. This holds the script of the run. - (WebCore::HarfBuzzShaper::shape): - Tell shapeHarfBuzzRuns() to set direction when drawing glyphs or - direction should be overridden. - (WebCore::HarfBuzzShaper::collectHarfBuzzRuns): - Set script of HarfBuzzRuns. - (WebCore::HarfBuzzShaper::shapeHarfBuzzRuns): - Add an argument that indicates it should set direction. - * platform/graphics/harfbuzz/ng/HarfBuzzShaper.h: - (WebCore::HarfBuzzShaper::HarfBuzzRun::create): - (WebCore::HarfBuzzShaper::HarfBuzzRun::rtl): - (WebCore::HarfBuzzShaper::HarfBuzzRun::script): - (HarfBuzzRun): - (HarfBuzzShaper): - -2012-11-08 Huang Dongsung <luxtella@company100.net> - - [TexMap] Remove contentsLayer() in GraphicsLayerTextureMapper. - https://bugs.webkit.org/show_bug.cgi?id=101658 - - Reviewed by Noam Rosenthal. - - GraphicsLayerTextureMapper::contentsLayer() is duplicated to - GraphicsLayer::platformLayer(), so we remove it. - - No new tests, this is just a refactor. - - * platform/graphics/texmap/GraphicsLayerTextureMapper.h: - (WebCore::GraphicsLayerTextureMapper::platformLayer): - * platform/graphics/texmap/TextureMapperLayer.cpp: - (WebCore::TextureMapperLayer::flushCompositingStateSelf): - -2012-11-08 Benjamin Poulain <benjamin@webkit.org> - - Improve the use of AtomicString with literals - https://bugs.webkit.org/show_bug.cgi?id=101298 - - Reviewed by Darin Adler. - - Fix a bunch of cases of AtomicString with literals: - -Do not create temporary AtomicString to perform a comparison, that is very wasteful. - -Use the ConstructFromLiteral constructor whenever it makes sense. - -Make "x-frame-options" static instead of creating it for each response. - -Use ASCIILiteral() instead of AtomicString() in EventHandler, the function takes a String, - not an AtomicString. - - * Modules/battery/BatteryController.cpp: - (WebCore::BatteryController::supplementName): - * Modules/battery/NavigatorBattery.cpp: - (WebCore::NavigatorBattery::from): - * Modules/filesystem/chromium/DraggedIsolatedFileSystem.cpp: - (WebCore::DraggedIsolatedFileSystem::supplementName): - * Modules/gamepad/NavigatorGamepad.cpp: - (WebCore::NavigatorGamepad::from): - * Modules/geolocation/GeolocationController.cpp: - (WebCore::GeolocationController::supplementName): - * Modules/geolocation/NavigatorGeolocation.cpp: - (WebCore::NavigatorGeolocation::from): - * Modules/indexeddb/DOMWindowIndexedDatabase.cpp: - (WebCore::DOMWindowIndexedDatabase::from): - * Modules/indexeddb/IDBCursor.cpp: - (WebCore::IDBCursor::directionNext): - (WebCore::IDBCursor::directionNextUnique): - (WebCore::IDBCursor::directionPrev): - (WebCore::IDBCursor::directionPrevUnique): - * Modules/indexeddb/IDBRequest.cpp: - (WebCore::IDBRequest::readyState): - * Modules/indexeddb/IDBTransaction.cpp: - (WebCore::IDBTransaction::modeReadOnly): - (WebCore::IDBTransaction::modeReadWrite): - (WebCore::IDBTransaction::modeVersionChange): - (WebCore::IDBTransaction::modeReadOnlyLegacy): - (WebCore::IDBTransaction::modeReadWriteLegacy): - * Modules/indexeddb/PageGroupIndexedDatabase.cpp: - (WebCore::PageGroupIndexedDatabase::from): - * Modules/intents/DOMWindowIntents.cpp: - (WebCore::DOMWindowIntents::from): - * Modules/mediastream/UserMediaController.cpp: - (WebCore::UserMediaController::supplementName): - * Modules/navigatorcontentutils/NavigatorContentUtils.cpp: - (WebCore::NavigatorContentUtils::supplementName): - * Modules/networkinfo/NavigatorNetworkInfoConnection.cpp: - (WebCore::NavigatorNetworkInfoConnection::from): - * Modules/networkinfo/NetworkInfoController.cpp: - (WebCore::NetworkInfoController::supplementName): - * Modules/notifications/DOMWindowNotifications.cpp: - (WebCore::DOMWindowNotifications::from): - * Modules/notifications/NotificationController.cpp: - (WebCore::NotificationController::supplementName): - * Modules/quota/DOMWindowQuota.cpp: - (WebCore::DOMWindowQuota::from): - * Modules/speech/SpeechRecognitionController.cpp: - (WebCore::SpeechRecognitionController::supplementName): - * Modules/vibration/Vibration.cpp: - (WebCore::Vibration::supplementName): - * accessibility/AccessibilityObject.cpp: - (WebCore::AccessibilityObject::invalidStatus): - * accessibility/AccessibilityRenderObject.cpp: - (WebCore::AccessibilityRenderObject::ariaLiveRegionStatus): - (WebCore::AccessibilityRenderObject::ariaLiveRegionRelevant): - * bindings/v8/custom/V8DOMWindowCustom.cpp: - (WebCore::V8DOMWindow::namedSecurityCheck): - * bindings/v8/custom/V8NodeListCustom.cpp: - (WebCore::V8NodeList::namedPropertyGetter): - * dom/ContextFeatures.cpp: - (WebCore::ContextFeatures::supplementName): - * dom/DeviceMotionController.cpp: - (WebCore::DeviceMotionController::supplementName): - * dom/DeviceOrientationController.cpp: - (WebCore::DeviceOrientationController::supplementName): - * dom/Element.cpp: - (WebCore::Element::webkitRegionOverset): - * dom/MutationRecord.cpp: - * html/FileInputType.cpp: - (WebCore::UploadButtonElement::shadowPseudoId): - * html/FormController.cpp: - (WebCore::SavedFormState::getReferencedFilePaths): - (WebCore::FormKeyGenerator::formKey): - * html/HTMLButtonElement.cpp: - (WebCore::HTMLButtonElement::formControlType): - * html/HTMLDetailsElement.cpp: - (WebCore::summaryQuerySelector): - * html/HTMLFieldSetElement.cpp: - (WebCore::HTMLFieldSetElement::formControlType): - * html/HTMLKeygenElement.cpp: - (WebCore::KeygenSelectElement::shadowPseudoId): - (WebCore::HTMLKeygenElement::formControlType): - * html/HTMLOptGroupElement.cpp: - (WebCore::HTMLOptGroupElement::formControlType): - * html/HTMLOutputElement.cpp: - (WebCore::HTMLOutputElement::formControlType): - * html/HTMLSelectElement.cpp: - (WebCore::HTMLSelectElement::formControlType): - * html/HTMLTextAreaElement.cpp: - (WebCore::HTMLTextAreaElement::formControlType): - * html/HTMLTextFormControlElement.cpp: - (WebCore::directionString): - * html/shadow/DateTimeEditElement.cpp: - (WebCore::DateTimeEditElement::DateTimeEditElement): - * html/shadow/DateTimeFieldElements.cpp: - (WebCore::DateTimeAMPMFieldElement::create): - (WebCore::DateTimeDayFieldElement::create): - (WebCore::DateTimeHourFieldElement::create): - (WebCore::DateTimeMillisecondFieldElement::create): - (WebCore::DateTimeMinuteFieldElement::create): - (WebCore::DateTimeMonthFieldElement::create): - (WebCore::DateTimeSecondFieldElement::create): - (WebCore::DateTimeSymbolicMonthFieldElement::create): - (WebCore::DateTimeWeekFieldElement::create): - (WebCore::DateTimeYearFieldElement::create): - * html/shadow/DetailsMarkerControl.cpp: - (WebCore::DetailsMarkerControl::shadowPseudoId): - * html/shadow/ImageInnerElement.cpp: - (WebCore::ImageInnerElement::shadowPseudoId): - * html/shadow/MediaControlElements.cpp: - (WebCore::MediaControlPanelElement::shadowPseudoId): - (WebCore::MediaControlTimelineContainerElement::shadowPseudoId): - (WebCore::MediaControlVolumeSliderContainerElement::shadowPseudoId): - (WebCore::MediaControlStatusDisplayElement::shadowPseudoId): - (WebCore::MediaControlPanelMuteButtonElement::shadowPseudoId): - (WebCore::MediaControlVolumeSliderMuteButtonElement::shadowPseudoId): - (WebCore::MediaControlPlayButtonElement::shadowPseudoId): - (WebCore::MediaControlOverlayPlayButtonElement::shadowPseudoId): - (WebCore::MediaControlSeekForwardButtonElement::shadowPseudoId): - (WebCore::MediaControlSeekBackButtonElement::shadowPseudoId): - (WebCore::MediaControlRewindButtonElement::shadowPseudoId): - (WebCore::MediaControlReturnToRealtimeButtonElement::shadowPseudoId): - (WebCore::MediaControlToggleClosedCaptionsButtonElement::shadowPseudoId): - (WebCore::MediaControlTimelineElement::shadowPseudoId): - (WebCore::MediaControlVolumeSliderElement::shadowPseudoId): - (WebCore::MediaControlFullscreenVolumeSliderElement::shadowPseudoId): - (WebCore::MediaControlFullscreenButtonElement::shadowPseudoId): - (WebCore::MediaControlFullscreenVolumeMinButtonElement::shadowPseudoId): - (WebCore::MediaControlFullscreenVolumeMaxButtonElement::shadowPseudoId): - (WebCore::MediaControlTimeRemainingDisplayElement::shadowPseudoId): - (WebCore::MediaControlCurrentTimeDisplayElement::shadowPseudoId): - (WebCore::MediaControlTextTrackContainerElement::shadowPseudoId): - * html/shadow/MediaControlRootElement.cpp: - (WebCore::MediaControlRootElement::shadowPseudoId): - * html/shadow/MediaControlRootElementChromium.cpp: - (WebCore::MediaControlPanelEnclosureElement::shadowPseudoId): - (WebCore::MediaControlRootElementChromium::shadowPseudoId): - * html/shadow/MediaControlRootElementChromiumAndroid.cpp: - (WebCore::MediaControlOverlayEnclosureElement::shadowPseudoId): - * html/shadow/MeterShadowElement.cpp: - (WebCore::MeterInnerElement::shadowPseudoId): - (WebCore::MeterBarElement::shadowPseudoId): - (WebCore::MeterValueElement::shadowPseudoId): - * html/shadow/ProgressShadowElement.cpp: - (WebCore::ProgressInnerElement::shadowPseudoId): - (WebCore::ProgressBarElement::shadowPseudoId): - (WebCore::ProgressValueElement::shadowPseudoId): - * html/shadow/SliderThumbElement.cpp: - (WebCore::sliderThumbShadowPseudoId): - (WebCore::mediaSliderThumbShadowPseudoId): - (WebCore::SliderContainerElement::shadowPseudoId): - * html/shadow/SpinButtonElement.cpp: - (WebCore::SpinButtonElement::shadowPseudoId): - * html/shadow/TextControlInnerElements.cpp: - (WebCore::SearchFieldResultsButtonElement::shadowPseudoId): - (WebCore::SearchFieldCancelButtonElement::shadowPseudoId): - (WebCore::InputFieldSpeechButtonElement::shadowPseudoId): - * html/track/TextTrackCue.cpp: - (WebCore::TextTrackCueBox::textTrackCueBoxShadowPseudoId): - * loader/CrossOriginAccessControl.cpp: - (WebCore::passesAccessControlCheck): - * loader/MainResourceLoader.cpp: - (WebCore::MainResourceLoader::didReceiveResponse): - * loader/PrerendererClient.cpp: - (WebCore::PrerendererClient::supplementName): - * loader/cache/CachedResource.cpp: - (WebCore::CachedResource::updateResponseAfterRevalidation): - * page/DOMWindowPagePopup.cpp: - (WebCore::DOMWindowPagePopup::supplementName): - * page/EventHandler.cpp: - (WebCore::EventHandler::handlePasteGlobalSelection): - (WebCore::focusDirectionForKey): - * page/SpeechInput.cpp: - (WebCore::SpeechInput::supplementName): - * page/animation/CompositeAnimation.cpp: - (WebCore::CompositeAnimation::updateKeyframeAnimations): - * platform/graphics/FontCache.cpp: - (WebCore::alternateFamilyName): - * platform/graphics/MediaPlayer.cpp: - (WebCore::applicationOctetStream): - (WebCore::textPlain): - (WebCore::codecs): - * platform/graphics/chromium/FontCacheAndroid.cpp: - (WebCore::FontCache::getLastResortFallbackFont): - * platform/graphics/filters/SourceAlpha.cpp: - (WebCore::SourceAlpha::effectName): - * platform/graphics/filters/SourceGraphic.cpp: - (WebCore::SourceGraphic::effectName): - * platform/graphics/mac/FontCacheMac.mm: - (WebCore::FontCache::getSimilarFontPlatformData): - (WebCore::FontCache::getLastResortFallbackFont): - * platform/graphics/skia/FontCacheSkia.cpp: - (WebCore::FontCache::getLastResortFallbackFont): - * platform/graphics/win/FontCacheWin.cpp: - (WebCore::FontCache::getLastResortFallbackFont): - * platform/graphics/wx/FontCacheWx.cpp: - (WebCore::FontCache::getSimilarFontPlatformData): - * platform/network/ResourceResponseBase.cpp: - (WebCore::ResourceResponseBase::setHTTPHeaderField): - (WebCore::ResourceResponseBase::parseCacheControlDirectives): - (WebCore::ResourceResponseBase::hasCacheValidatorFields): - (WebCore::ResourceResponseBase::date): - (WebCore::ResourceResponseBase::age): - (WebCore::ResourceResponseBase::expires): - (WebCore::ResourceResponseBase::lastModified): - (WebCore::ResourceResponseBase::isAttachment): - * rendering/RenderTextControlMultiLine.cpp: - (WebCore::RenderTextControlMultiLine::getAvgCharWidth): - * rendering/RenderTextControlSingleLine.cpp: - (WebCore::RenderTextControlSingleLine::getAvgCharWidth): - (WebCore::RenderTextControlSingleLine::preferredContentWidth): - * svg/SVGAnimateColorElement.cpp: - (WebCore::attributeValueIsCurrentColor): - * svg/SVGAnimateMotionElement.cpp: - (WebCore::SVGAnimateMotionElement::rotateMode): - * svg/SVGAnimationElement.cpp: - (WebCore::SVGAnimationElement::setCalcMode): - (WebCore::SVGAnimationElement::setAttributeType): - (WebCore::SVGAnimationElement::isAdditive): - (WebCore::SVGAnimationElement::isAccumulated): - (WebCore::inheritsFromProperty): - * svg/SVGFEConvolveMatrixElement.cpp: - (WebCore::SVGFEConvolveMatrixElement::kernelUnitLengthXIdentifier): - (WebCore::SVGFEConvolveMatrixElement::kernelUnitLengthYIdentifier): - (WebCore::SVGFEConvolveMatrixElement::orderXIdentifier): - (WebCore::SVGFEConvolveMatrixElement::orderYIdentifier): - * svg/SVGFEDiffuseLightingElement.cpp: - (WebCore::SVGFEDiffuseLightingElement::kernelUnitLengthXIdentifier): - (WebCore::SVGFEDiffuseLightingElement::kernelUnitLengthYIdentifier): - * svg/SVGFEDropShadowElement.cpp: - (WebCore::SVGFEDropShadowElement::stdDeviationXIdentifier): - (WebCore::SVGFEDropShadowElement::stdDeviationYIdentifier): - * svg/SVGFEGaussianBlurElement.cpp: - (WebCore::SVGFEGaussianBlurElement::stdDeviationXIdentifier): - (WebCore::SVGFEGaussianBlurElement::stdDeviationYIdentifier): - * svg/SVGFEMorphologyElement.cpp: - (WebCore::SVGFEMorphologyElement::radiusXIdentifier): - (WebCore::SVGFEMorphologyElement::radiusYIdentifier): - * svg/SVGFESpecularLightingElement.cpp: - (WebCore::SVGFESpecularLightingElement::kernelUnitLengthXIdentifier): - (WebCore::SVGFESpecularLightingElement::kernelUnitLengthYIdentifier): - * svg/SVGFETurbulenceElement.cpp: - (WebCore::SVGFETurbulenceElement::baseFrequencyXIdentifier): - (WebCore::SVGFETurbulenceElement::baseFrequencyYIdentifier): - * svg/SVGFilterElement.cpp: - (WebCore::SVGFilterElement::filterResXIdentifier): - (WebCore::SVGFilterElement::filterResYIdentifier): - * svg/SVGLangSpace.cpp: - (WebCore::SVGLangSpace::xmlspace): - (WebCore::SVGLangSpace::addSupportedAttributes): - * svg/SVGMarkerElement.cpp: - (WebCore::SVGMarkerElement::orientTypeIdentifier): - (WebCore::SVGMarkerElement::orientAngleIdentifier): - (WebCore::SVGMarkerElement::synchronizeOrientType): - * svg/SVGSVGElement.cpp: - (WebCore::SVGSVGElement::contentScriptType): - (WebCore::SVGSVGElement::contentStyleType): - * svg/SVGStyleElement.cpp: - (WebCore::SVGStyleElement::type): - (WebCore::SVGStyleElement::media): - * svg/SVGTextContentElement.cpp: - (WebCore::SVGTextContentElement::collectStyleForAttribute): - * svg/SVGViewSpec.cpp: - (WebCore::SVGViewSpec::viewBoxIdentifier): - (WebCore::SVGViewSpec::preserveAspectRatioIdentifier): - (WebCore::SVGViewSpec::transformIdentifier): - * svg/animation/SVGSMILElement.cpp: - (WebCore::SVGSMILElement::parseClockValue): - (WebCore::SVGSMILElement::restart): - (WebCore::SVGSMILElement::fill): - (WebCore::SVGSMILElement::repeatCount): - * testing/InternalSettings.cpp: - (WebCore::InternalSettings::from): - * xml/parser/XMLTreeBuilder.cpp: - (WebCore::XMLTreeBuilder::processDOCTYPE): - (WebCore::XMLTreeBuilder::processXMLEntity): - -2012-11-08 Beth Dakin <bdakin@apple.com> - - https://bugs.webkit.org/show_bug.cgi?id=101644 - Fixed header on Facebook news feed becomes detached from top of - viewport after rubber band scrolling - -and corresponding- - <rdar://problem/12651944> - - Reviewed by Simon Fraser. - - There is code to handle this for non-threaded scrolling on FrameView. - This patch moves most of that code into a convenience function on - ScrollingCoordinator. - - Have FrameView::scrollOffsetForFixedPosition() call - WebCore::scrollOffsetForFixedPosition() with all the right - parameters. - * page/FrameView.cpp: - (WebCore::FrameView::scrollOffsetForFixedPosition): - - Here's where all the math happens. - * page/scrolling/ScrollingCoordinator.cpp: - (WebCore::fixedPositionScrollOffset): - (WebCore::scrollOffsetForFixedPosition): - - The viewportRect in these three places needs to have the - adjusted-for-fixed offset. - (WebCore::ScrollingCoordinator::updateMainFrameScrollPosition): - * page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm: - (WebCore::ScrollingTreeScrollingNodeMac::setScrollLayerPosition): - * rendering/RenderLayerCompositor.cpp: - (WebCore::RenderLayerCompositor::computeFixedViewportConstraints): - -2012-11-08 Alpha Lam <hclam@chromium.org> - - [chromium] Deferred image decoding fails with image orientation - https://bugs.webkit.org/show_bug.cgi?id=101648 - - Reviewed by Stephen White. - - When an image is deferred save the orientation state. Once this state - is cached it can be used to reply future queries since this state is - static. - - No new tests but platform/chromium/virtual/deferred/fast/images/image-orientation.html is passing now. - - * platform/graphics/chromium/DeferredImageDecoder.cpp: - (WebCore::DeferredImageDecoder::DeferredImageDecoder): - (WebCore::DeferredImageDecoder::frameBufferAtIndex): - (WebCore::DeferredImageDecoder::orientation): - * platform/graphics/chromium/DeferredImageDecoder.h: - (DeferredImageDecoder): - -2012-11-08 Andreas Kling <kling@webkit.org> - - DocumentLoader: Shrink-to-fit the ResourceResponse vector after loading completes. - <http://webkit.org/b/101657> - - Reviewed by Anders Carlsson. - - Shrink DocumentLoader::m_responses to exact size when we stop adding responses to it, - as we know it won't grow after that. - - 520kB progression on Membuster3. - - * loader/DocumentLoader.cpp: - (WebCore::DocumentLoader::stopRecordingResponses): - -2012-11-08 Hans Muller <hmuller@adobe.com> - - [CSS Exclusions] Polygon with horizontal bottom edges returns incorrect segments - https://bugs.webkit.org/show_bug.cgi?id=100874 - - Reviewed by Dirk Schulze. - - Revised the way that computeXIntersections() handles intersections with horizotal polygon edges. - Deciding if a vertex intersection corresponds to a polygon "edge crossing", i.e. a change from inside - to outside or outside to inside, now depends on which side of the horizontal line the function's - y parameter corresponds to. If the y corresponds to the top of the line, then isaMinY the parameter - is true, and an intersection with a horizontal edge is only considered to be an edge crossing if - if the inside of the polygon is just below the horizontal edge. When isMinY is false then the inside - of the polygon must be just above the horizontal edge. - - Tests: fast/exclusions/shape-inside/shape-inside-rectilinear-polygon-003.html - fast/exclusions/shape-inside/shape-inside-rectilinear-polygon-004.html - - * rendering/ExclusionPolygon.cpp: - (WebCore::getVertexIntersectionVertices): Corrected two cases where the next/previous vertex was determined incorrectly. - (WebCore::ExclusionPolygon::computeXIntersections): Added a bool isMinY parameter which specifies if the y parameter corresponds to the top or bottom a horizontal line. - (WebCore::ExclusionPolygon::getExcludedIntervals): Added the new computeXIntersections() parameter. - (WebCore::ExclusionPolygon::getIncludedIntervals): Ditto. - * rendering/ExclusionPolygon.h: - (WebCore::ExclusionPolygonEdge::previousEdge): Corrected the previousEdge() function. - -2012-11-08 Otto Derek Cheung <otcheung@rim.com> - - [BlackBerry] Disable cookies on file:// - https://bugs.webkit.org/show_bug.cgi?id=101646 - - Reviewed by Rob Buis. - - Disabling cookies on file and local in the browser app. - - PR 239779 - - Tested by trying to set and retrieve cookies on WI while browsing - files on the file scheme. - - * platform/blackberry/CookieManager.cpp: - (WebCore): - (WebCore::shouldIgnoreScheme): - (WebCore::CookieManager::getRawCookies): - (WebCore::CookieManager::checkAndTreatCookie): - -2012-11-08 Joshua Bell <jsbell@chromium.org> - - Expose snapshots in platform/leveldb wrapper API - https://bugs.webkit.org/show_bug.cgi?id=100786 - - Reviewed by Tony Chang. - - Expose leveldb "snapshots" in the LevelDB API. A snapshot lets you observe the database - as it was when the snapshot was taken. This can be used to implement parallel transactions, - e.g. where a read transaction won't see updates made by a later write transaction. - - Tests: webkit_unit_tests --gtest_filter='LevelDBDatabaseTest.Transaction*' - - * platform/leveldb/LevelDBDatabase.cpp: - (WebCore::LevelDBSnapshot::LevelDBSnapshot): New (but for now internal-only) wrapper type. - (WebCore): - (WebCore::LevelDBSnapshot::~LevelDBSnapshot): Release the leveldb::Snapshot. - (WebCore::LevelDBDatabase::get): Optional snapshot argument, for use by transactions. - (WebCore::LevelDBDatabase::createIterator): Ditto. - * platform/leveldb/LevelDBDatabase.h: - (leveldb): - (WebCore): - (LevelDBSnapshot): - (LevelDBDatabase): - * platform/leveldb/LevelDBTransaction.cpp: - (WebCore::LevelDBTransaction::LevelDBTransaction): Initialize a snapshot. - (WebCore::LevelDBTransaction::get): - (WebCore::LevelDBTransaction::TransactionIterator::TransactionIterator): - * platform/leveldb/LevelDBTransaction.h: - (LevelDBTransaction): - -2012-11-08 Brady Eidson <beidson@apple.com> - - Have NetworkProcess do the actual loading of subresources. - https://bugs.webkit.org/show_bug.cgi?id=101640 - - Reviewed by Alexey Proskuryakov. - - No new tests (No change in behavior in any configuration we test.) - - * WebCore.exp.in: - * loader/ResourceBuffer.h: Virtualize a few methods for ports to override. - -2012-11-08 Huang Dongsung <luxtella@company100.net> - - Coordinated Graphics: Remove an invisible TiledBackingStore of CoordinatedGraphicsLayer. - https://bugs.webkit.org/show_bug.cgi?id=101424 - - Reviewed by Noam Rosenthal. - - This patch adds ASSERT to TextureMapperLayer while fixing this bug in - WebKit2. - - * platform/graphics/texmap/TextureMapperLayer.cpp: - (WebCore::TextureMapperLayer::paintSelf): - -2012-11-08 Sheriff Bot <webkit.review.bot@gmail.com> - - Unreviewed, rolling out r133945. - http://trac.webkit.org/changeset/133945 - https://bugs.webkit.org/show_bug.cgi?id=101645 - - Numerous layout and unit test failures (Requested by - jsbell|gardener on #webkit). - - * bindings/scripts/CodeGeneratorV8.pm: - (GenerateHeader): - * bindings/scripts/test/V8/V8Float64Array.h: - (WebCore::V8Float64Array::toNative): - * bindings/scripts/test/V8/V8TestActiveDOMObject.h: - (WebCore::V8TestActiveDOMObject::toNative): - * bindings/scripts/test/V8/V8TestCustomNamedGetter.h: - (WebCore::V8TestCustomNamedGetter::toNative): - * bindings/scripts/test/V8/V8TestEventConstructor.h: - (WebCore::V8TestEventConstructor::toNative): - * bindings/scripts/test/V8/V8TestEventTarget.h: - (WebCore::V8TestEventTarget::toNative): - * bindings/scripts/test/V8/V8TestException.h: - (WebCore::V8TestException::toNative): - * bindings/scripts/test/V8/V8TestInterface.h: - (WebCore::V8TestInterface::toNative): - * bindings/scripts/test/V8/V8TestMediaQueryListListener.h: - (WebCore::V8TestMediaQueryListListener::toNative): - * bindings/scripts/test/V8/V8TestNamedConstructor.h: - (WebCore::V8TestNamedConstructor::toNative): - * bindings/scripts/test/V8/V8TestNode.h: - (WebCore::V8TestNode::toNative): - * bindings/scripts/test/V8/V8TestObj.h: - (WebCore::V8TestObj::toNative): - * bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.h: - (WebCore::V8TestSerializedScriptValueInterface::toNative): - * bindings/v8/NPV8Object.cpp: - (WebCore::v8ObjectToNPObject): - (WebCore::npCreateV8ScriptObject): - * bindings/v8/V8Collection.h: - (WebCore::toNativeCollection): - * bindings/v8/V8DOMWindowShell.cpp: - (WebCore::setIsolatedWorldField): - (WebCore::V8DOMWindowShell::enteredIsolatedWorldContext): - * bindings/v8/V8DOMWrapper.cpp: - (WebCore::V8DOMWrapper::isWrapperOfType): - * bindings/v8/V8DOMWrapper.h: - (WebCore::V8DOMWrapper::setDOMWrapper): - (WebCore::V8DOMWrapper::clearDOMWrapper): - * bindings/v8/WrapperTypeInfo.h: - (WebCore::toNative): - (WebCore::toWrapperTypeInfo): - -2012-11-01 Filip Pizlo <fpizlo@apple.com> - - JSC should infer when indexed storage contains only integers or doubles - https://bugs.webkit.org/show_bug.cgi?id=98606 - - Reviewed by Oliver Hunt. - - Just refactoring WebCore to pass 0 for the ArrayAllocationProfile*. - - * bindings/js/JSCanvasRenderingContext2DCustom.cpp: - (WebCore::JSCanvasRenderingContext2D::webkitLineDash): - * bindings/js/JSClipboardCustom.cpp: - (WebCore::JSClipboard::types): - * bindings/js/JSDOMBinding.cpp: - (WebCore::jsArray): - * bindings/js/JSDOMBinding.h: - (WebCore::jsArray): - * bindings/js/JSInjectedScriptHostCustom.cpp: - (WebCore::getJSListenerFunctions): - * bindings/js/JSJavaScriptCallFrameCustom.cpp: - (WebCore::JSJavaScriptCallFrame::scopeChain): - * bindings/js/JSMessageEventCustom.cpp: - (WebCore::JSMessageEvent::ports): - * bindings/js/JSMutationCallbackCustom.cpp: - (WebCore::JSMutationCallback::handleEvent): - * bindings/js/JSWebGLRenderingContextCustom.cpp: - (WebCore::toJS): - (WebCore::JSWebGLRenderingContext::getAttachedShaders): - (WebCore::JSWebGLRenderingContext::getSupportedExtensions): - * bindings/js/SerializedScriptValue.cpp: - (WebCore::CloneDeserializer::deserialize): - 2012-11-08 Tiancheng Jiang <tijiang@rim.com> [BlackBerry] Update BB10 date input form. diff --git a/Source/WebCore/GNUmakefile.list.am b/Source/WebCore/GNUmakefile.list.am index 3df9dd910..fa6bb12cc 100644 --- a/Source/WebCore/GNUmakefile.list.am +++ b/Source/WebCore/GNUmakefile.list.am @@ -5824,10 +5824,10 @@ webcore_sources += \ Source/WebCore/workers/WorkerScriptLoader.h \ Source/WebCore/workers/WorkerThread.cpp \ Source/WebCore/workers/WorkerThread.h \ - Source/WebCore/xml/parser/CharacterReferenceParserInlines.h \ + Source/WebCore/xml/parser/CharacterReferenceParserInlineMethods.h \ Source/WebCore/xml/parser/MarkupTokenBase.h \ Source/WebCore/xml/parser/MarkupTokenizerBase.h \ - Source/WebCore/xml/parser/MarkupTokenizerInlines.h \ + Source/WebCore/xml/parser/MarkupTokenizerInlineMethods.h \ Source/WebCore/xml/parser/NewXMLDocumentParser.cpp \ Source/WebCore/xml/parser/NewXMLDocumentParser.h \ Source/WebCore/xml/parser/XMLCharacterReferenceParser.cpp \ diff --git a/Source/WebCore/Modules/battery/BatteryController.cpp b/Source/WebCore/Modules/battery/BatteryController.cpp index 390f24834..c342e5b38 100644 --- a/Source/WebCore/Modules/battery/BatteryController.cpp +++ b/Source/WebCore/Modules/battery/BatteryController.cpp @@ -91,7 +91,7 @@ void BatteryController::didChangeBatteryStatus(const AtomicString& eventType, Pa const AtomicString& BatteryController::supplementName() { - DEFINE_STATIC_LOCAL(AtomicString, name, ("BatteryController", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, name, ("BatteryController")); return name; } diff --git a/Source/WebCore/Modules/battery/NavigatorBattery.cpp b/Source/WebCore/Modules/battery/NavigatorBattery.cpp index 73d892e83..0790602b6 100644 --- a/Source/WebCore/Modules/battery/NavigatorBattery.cpp +++ b/Source/WebCore/Modules/battery/NavigatorBattery.cpp @@ -50,7 +50,7 @@ BatteryManager* NavigatorBattery::webkitBattery(Navigator* navigator) NavigatorBattery* NavigatorBattery::from(Navigator* navigator) { - DEFINE_STATIC_LOCAL(AtomicString, name, ("NavigatorBattery", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, name, ("NavigatorBattery")); NavigatorBattery* supplement = static_cast<NavigatorBattery*>(Supplement<Navigator>::from(navigator, name)); if (!supplement) { supplement = new NavigatorBattery(); diff --git a/Source/WebCore/Modules/filesystem/chromium/DraggedIsolatedFileSystem.cpp b/Source/WebCore/Modules/filesystem/chromium/DraggedIsolatedFileSystem.cpp index 91bea3e57..eb3eb632d 100644 --- a/Source/WebCore/Modules/filesystem/chromium/DraggedIsolatedFileSystem.cpp +++ b/Source/WebCore/Modules/filesystem/chromium/DraggedIsolatedFileSystem.cpp @@ -59,7 +59,7 @@ DOMFileSystem* DraggedIsolatedFileSystem::getDOMFileSystem(ScriptExecutionContex const AtomicString& DraggedIsolatedFileSystem::supplementName() { ASSERT(isMainThread()); - DEFINE_STATIC_LOCAL(AtomicString, name, ("DraggedIsolatedFileSystem", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, name, ("DraggedIsolatedFileSystem")); return name; } diff --git a/Source/WebCore/Modules/gamepad/NavigatorGamepad.cpp b/Source/WebCore/Modules/gamepad/NavigatorGamepad.cpp index 8648f0b5a..462d3d5b9 100644 --- a/Source/WebCore/Modules/gamepad/NavigatorGamepad.cpp +++ b/Source/WebCore/Modules/gamepad/NavigatorGamepad.cpp @@ -45,7 +45,7 @@ NavigatorGamepad::~NavigatorGamepad() NavigatorGamepad* NavigatorGamepad::from(Navigator* navigator) { - DEFINE_STATIC_LOCAL(AtomicString, name, ("NavigatorGamepad", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, name, ("NavigatorGamepad")); NavigatorGamepad* supplement = static_cast<NavigatorGamepad*>(Supplement<Navigator>::from(navigator, name)); if (!supplement) { supplement = new NavigatorGamepad(); diff --git a/Source/WebCore/Modules/geolocation/GeolocationController.cpp b/Source/WebCore/Modules/geolocation/GeolocationController.cpp index 3e50ae9cd..7abf83181 100644 --- a/Source/WebCore/Modules/geolocation/GeolocationController.cpp +++ b/Source/WebCore/Modules/geolocation/GeolocationController.cpp @@ -134,7 +134,7 @@ GeolocationPosition* GeolocationController::lastPosition() const AtomicString& GeolocationController::supplementName() { - DEFINE_STATIC_LOCAL(AtomicString, name, ("GeolocationController", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, name, ("GeolocationController")); return name; } diff --git a/Source/WebCore/Modules/geolocation/NavigatorGeolocation.cpp b/Source/WebCore/Modules/geolocation/NavigatorGeolocation.cpp index b7c24bb28..da0ebf54a 100644 --- a/Source/WebCore/Modules/geolocation/NavigatorGeolocation.cpp +++ b/Source/WebCore/Modules/geolocation/NavigatorGeolocation.cpp @@ -44,7 +44,7 @@ NavigatorGeolocation::~NavigatorGeolocation() NavigatorGeolocation* NavigatorGeolocation::from(Navigator* navigator) { - DEFINE_STATIC_LOCAL(AtomicString, name, ("NavigatorGeolocation", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, name, ("NavigatorGeolocation")); NavigatorGeolocation* supplement = static_cast<NavigatorGeolocation*>(Supplement<Navigator>::from(navigator, name)); if (!supplement) { supplement = new NavigatorGeolocation(navigator->frame()); diff --git a/Source/WebCore/Modules/indexeddb/DOMWindowIndexedDatabase.cpp b/Source/WebCore/Modules/indexeddb/DOMWindowIndexedDatabase.cpp index 8db5e9dda..168028b63 100644 --- a/Source/WebCore/Modules/indexeddb/DOMWindowIndexedDatabase.cpp +++ b/Source/WebCore/Modules/indexeddb/DOMWindowIndexedDatabase.cpp @@ -49,7 +49,7 @@ DOMWindowIndexedDatabase::~DOMWindowIndexedDatabase() DOMWindowIndexedDatabase* DOMWindowIndexedDatabase::from(DOMWindow* window) { - DEFINE_STATIC_LOCAL(AtomicString, name, ("DOMWindowIndexedDatabase", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, name, ("DOMWindowIndexedDatabase")); DOMWindowIndexedDatabase* supplement = static_cast<DOMWindowIndexedDatabase*>(Supplement<DOMWindow>::from(window, name)); if (!supplement) { supplement = new DOMWindowIndexedDatabase(window); diff --git a/Source/WebCore/Modules/indexeddb/IDBCursor.cpp b/Source/WebCore/Modules/indexeddb/IDBCursor.cpp index beb01c462..a69d4c3f1 100644 --- a/Source/WebCore/Modules/indexeddb/IDBCursor.cpp +++ b/Source/WebCore/Modules/indexeddb/IDBCursor.cpp @@ -50,25 +50,25 @@ PassRefPtr<IDBCursor> IDBCursor::create(PassRefPtr<IDBCursorBackendInterface> ba const AtomicString& IDBCursor::directionNext() { - DEFINE_STATIC_LOCAL(AtomicString, next, ("next", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, next, ("next")); return next; } const AtomicString& IDBCursor::directionNextUnique() { - DEFINE_STATIC_LOCAL(AtomicString, nextunique, ("nextunique", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, nextunique, ("nextunique")); return nextunique; } const AtomicString& IDBCursor::directionPrev() { - DEFINE_STATIC_LOCAL(AtomicString, prev, ("prev", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, prev, ("prev")); return prev; } const AtomicString& IDBCursor::directionPrevUnique() { - DEFINE_STATIC_LOCAL(AtomicString, prevunique, ("prevunique", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, prevunique, ("prevunique")); return prevunique; } diff --git a/Source/WebCore/Modules/indexeddb/IDBRequest.cpp b/Source/WebCore/Modules/indexeddb/IDBRequest.cpp index ce8aaa372..7046a24da 100644 --- a/Source/WebCore/Modules/indexeddb/IDBRequest.cpp +++ b/Source/WebCore/Modules/indexeddb/IDBRequest.cpp @@ -142,8 +142,8 @@ PassRefPtr<IDBTransaction> IDBRequest::transaction() const const String& IDBRequest::readyState() const { ASSERT(m_readyState == PENDING || m_readyState == DONE); - DEFINE_STATIC_LOCAL(AtomicString, pending, ("pending", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(AtomicString, done, ("done", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, pending, ("pending")); + DEFINE_STATIC_LOCAL(AtomicString, done, ("done")); if (m_readyState == PENDING) return pending; diff --git a/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp b/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp index 5d8ac5fca..47005c3b7 100644 --- a/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp +++ b/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp @@ -59,31 +59,31 @@ PassRefPtr<IDBTransaction> IDBTransaction::create(ScriptExecutionContext* contex const AtomicString& IDBTransaction::modeReadOnly() { - DEFINE_STATIC_LOCAL(AtomicString, readonly, ("readonly", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, readonly, ("readonly")); return readonly; } const AtomicString& IDBTransaction::modeReadWrite() { - DEFINE_STATIC_LOCAL(AtomicString, readwrite, ("readwrite", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, readwrite, ("readwrite")); return readwrite; } const AtomicString& IDBTransaction::modeVersionChange() { - DEFINE_STATIC_LOCAL(AtomicString, versionchange, ("versionchange", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, versionchange, ("versionchange")); return versionchange; } const AtomicString& IDBTransaction::modeReadOnlyLegacy() { - DEFINE_STATIC_LOCAL(AtomicString, readonly, ("0", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, readonly, ("0")); return readonly; } const AtomicString& IDBTransaction::modeReadWriteLegacy() { - DEFINE_STATIC_LOCAL(AtomicString, readwrite, ("1", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, readwrite, ("1")); return readwrite; } diff --git a/Source/WebCore/Modules/indexeddb/PageGroupIndexedDatabase.cpp b/Source/WebCore/Modules/indexeddb/PageGroupIndexedDatabase.cpp index ad3d59658..5803fc0c5 100644 --- a/Source/WebCore/Modules/indexeddb/PageGroupIndexedDatabase.cpp +++ b/Source/WebCore/Modules/indexeddb/PageGroupIndexedDatabase.cpp @@ -43,7 +43,7 @@ PageGroupIndexedDatabase::~PageGroupIndexedDatabase() PageGroupIndexedDatabase* PageGroupIndexedDatabase::from(PageGroup& group) { - DEFINE_STATIC_LOCAL(AtomicString, name, ("PageGroupIndexedDatabase", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, name, ("PageGroupIndexedDatabase")); PageGroupIndexedDatabase* supplement = static_cast<PageGroupIndexedDatabase*>(Supplement<PageGroup>::from(&group, name)); if (!supplement) { supplement = new PageGroupIndexedDatabase(); diff --git a/Source/WebCore/Modules/intents/DOMWindowIntents.cpp b/Source/WebCore/Modules/intents/DOMWindowIntents.cpp index 7addb0610..b89fefe2a 100644 --- a/Source/WebCore/Modules/intents/DOMWindowIntents.cpp +++ b/Source/WebCore/Modules/intents/DOMWindowIntents.cpp @@ -46,7 +46,7 @@ DOMWindowIntents::~DOMWindowIntents() DOMWindowIntents* DOMWindowIntents::from(DOMWindow* window) { ASSERT(window); - DEFINE_STATIC_LOCAL(AtomicString, name, ("DOMWindowIntents", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, name, ("DOMWindowIntents")); DOMWindowIntents* supplement = static_cast<DOMWindowIntents*>(Supplement<DOMWindow>::from(window, name)); if (!supplement) { supplement = new DOMWindowIntents(window); diff --git a/Source/WebCore/Modules/mediastream/UserMediaController.cpp b/Source/WebCore/Modules/mediastream/UserMediaController.cpp index 69bf014d0..3077d411b 100644 --- a/Source/WebCore/Modules/mediastream/UserMediaController.cpp +++ b/Source/WebCore/Modules/mediastream/UserMediaController.cpp @@ -31,7 +31,7 @@ namespace WebCore { const AtomicString& UserMediaController::supplementName() { - DEFINE_STATIC_LOCAL(AtomicString, name, ("UserMediaController", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, name, ("UserMediaController")); return name; } diff --git a/Source/WebCore/Modules/navigatorcontentutils/NavigatorContentUtils.cpp b/Source/WebCore/Modules/navigatorcontentutils/NavigatorContentUtils.cpp index e8dd49339..0bc7f12c2 100644 --- a/Source/WebCore/Modules/navigatorcontentutils/NavigatorContentUtils.cpp +++ b/Source/WebCore/Modules/navigatorcontentutils/NavigatorContentUtils.cpp @@ -203,7 +203,7 @@ void NavigatorContentUtils::unregisterProtocolHandler(Navigator* navigator, cons const AtomicString& NavigatorContentUtils::supplementName() { - DEFINE_STATIC_LOCAL(AtomicString, name, ("NavigatorContentUtils", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, name, ("NavigatorContentUtils")); return name; } diff --git a/Source/WebCore/Modules/networkinfo/NavigatorNetworkInfoConnection.cpp b/Source/WebCore/Modules/networkinfo/NavigatorNetworkInfoConnection.cpp index fd7697175..c226d747f 100644 --- a/Source/WebCore/Modules/networkinfo/NavigatorNetworkInfoConnection.cpp +++ b/Source/WebCore/Modules/networkinfo/NavigatorNetworkInfoConnection.cpp @@ -45,7 +45,7 @@ NavigatorNetworkInfoConnection::~NavigatorNetworkInfoConnection() NavigatorNetworkInfoConnection* NavigatorNetworkInfoConnection::from(Navigator* navigator) { - DEFINE_STATIC_LOCAL(AtomicString, name, ("NavigatorNetworkInfoConnection", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, name, ("NavigatorNetworkInfoConnection")); NavigatorNetworkInfoConnection* supplement = static_cast<NavigatorNetworkInfoConnection*>(Supplement<Navigator>::from(navigator, name)); if (!supplement) { supplement = new NavigatorNetworkInfoConnection(); diff --git a/Source/WebCore/Modules/networkinfo/NetworkInfoController.cpp b/Source/WebCore/Modules/networkinfo/NetworkInfoController.cpp index e70671ae8..aa695ec1c 100644 --- a/Source/WebCore/Modules/networkinfo/NetworkInfoController.cpp +++ b/Source/WebCore/Modules/networkinfo/NetworkInfoController.cpp @@ -77,7 +77,7 @@ void NetworkInfoController::didChangeNetworkInformation(const AtomicString& even const AtomicString& NetworkInfoController::supplementName() { - DEFINE_STATIC_LOCAL(AtomicString, name, ("NetworkInfoController", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, name, ("NetworkInfoController")); return name; } diff --git a/Source/WebCore/Modules/notifications/DOMWindowNotifications.cpp b/Source/WebCore/Modules/notifications/DOMWindowNotifications.cpp index 4c556de16..40173ee75 100644 --- a/Source/WebCore/Modules/notifications/DOMWindowNotifications.cpp +++ b/Source/WebCore/Modules/notifications/DOMWindowNotifications.cpp @@ -49,7 +49,7 @@ DOMWindowNotifications::~DOMWindowNotifications() DOMWindowNotifications* DOMWindowNotifications::from(DOMWindow* window) { - DEFINE_STATIC_LOCAL(AtomicString, supplementName, ("DOMWindowNotifications", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, supplementName, ("DOMWindowNotifications")); DOMWindowNotifications* supplement = static_cast<DOMWindowNotifications*>(Supplement<DOMWindow>::from(window, supplementName)); if (!supplement) { supplement = new DOMWindowNotifications(window); diff --git a/Source/WebCore/Modules/notifications/NotificationController.cpp b/Source/WebCore/Modules/notifications/NotificationController.cpp index 0dc197369..9bbd9bf3c 100644 --- a/Source/WebCore/Modules/notifications/NotificationController.cpp +++ b/Source/WebCore/Modules/notifications/NotificationController.cpp @@ -58,7 +58,7 @@ NotificationClient* NotificationController::clientFrom(Page* page) const AtomicString& NotificationController::supplementName() { - DEFINE_STATIC_LOCAL(AtomicString, name, ("NotificationController", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, name, ("NotificationController")); return name; } diff --git a/Source/WebCore/Modules/quota/DOMWindowQuota.cpp b/Source/WebCore/Modules/quota/DOMWindowQuota.cpp index f6e28926d..65fe82490 100644 --- a/Source/WebCore/Modules/quota/DOMWindowQuota.cpp +++ b/Source/WebCore/Modules/quota/DOMWindowQuota.cpp @@ -51,7 +51,7 @@ DOMWindowQuota::~DOMWindowQuota() // static DOMWindowQuota* DOMWindowQuota::from(DOMWindow* window) { - DEFINE_STATIC_LOCAL(AtomicString, name, ("DOMWindowQuota", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, name, ("DOMWindowQuota")); DOMWindowQuota* supplement = static_cast<DOMWindowQuota*>(Supplement<DOMWindow>::from(window, name)); if (!supplement) { supplement = new DOMWindowQuota(window); diff --git a/Source/WebCore/Modules/speech/SpeechRecognitionController.cpp b/Source/WebCore/Modules/speech/SpeechRecognitionController.cpp index 5148110a0..d4bcc85fe 100644 --- a/Source/WebCore/Modules/speech/SpeechRecognitionController.cpp +++ b/Source/WebCore/Modules/speech/SpeechRecognitionController.cpp @@ -32,7 +32,7 @@ namespace WebCore { const AtomicString& SpeechRecognitionController::supplementName() { - DEFINE_STATIC_LOCAL(AtomicString, name, ("SpeechRecognitionController", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, name, ("SpeechRecognitionController")); return name; } diff --git a/Source/WebCore/Modules/vibration/Vibration.cpp b/Source/WebCore/Modules/vibration/Vibration.cpp index 936f7768d..2a531fddd 100644 --- a/Source/WebCore/Modules/vibration/Vibration.cpp +++ b/Source/WebCore/Modules/vibration/Vibration.cpp @@ -128,7 +128,7 @@ void Vibration::timerStopFired(Timer<Vibration>* timer) const AtomicString& Vibration::supplementName() { - DEFINE_STATIC_LOCAL(AtomicString, name, ("Vibration", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, name, ("Vibration")); return name; } diff --git a/Source/WebCore/Target.pri b/Source/WebCore/Target.pri index 74665e1a9..3bd4619ee 100644 --- a/Source/WebCore/Target.pri +++ b/Source/WebCore/Target.pri @@ -2736,10 +2736,10 @@ HEADERS += \ workers/WorkerRunLoop.h \ workers/WorkerScriptLoader.h \ workers/WorkerThread.h \ - xml/parser/CharacterReferenceParserInlines.h \ + xml/parser/CharacterReferenceParserInlineMethods.h \ xml/parser/MarkupTokenBase.h \ xml/parser/MarkupTokenizerBase.h \ - xml/parser/MarkupTokenizerInlines.h \ + xml/parser/MarkupTokenizerInlineMethods.h \ xml/parser/NewXMLDocumentParser.h \ xml/parser/XMLCharacterReferenceParser.h \ xml/parser/XMLDocumentParser.h \ diff --git a/Source/WebCore/WebCore.exp.in b/Source/WebCore/WebCore.exp.in index a5f2367ab..b6871852f 100644 --- a/Source/WebCore/WebCore.exp.in +++ b/Source/WebCore/WebCore.exp.in @@ -273,16 +273,10 @@ __ZN7WebCore9FrameView17setTracksRepaintsEb __ZN7WebCore9FrameView20resetTrackedRepaintsEv __ZN7WebCore14PluginDocument12pluginWidgetEv __ZN7WebCore14ResourceBuffer12createNSDataEv -__ZN7WebCore14ResourceBuffer6appendEPKcj -__ZN7WebCore14ResourceBufferC1EPKci -__ZN7WebCore14ResourceBufferC1Ev -__ZN7WebCore14ResourceBufferC2Ev __ZN7WebCore14ResourceBufferD1Ev -__ZN7WebCore14ResourceBufferD2Ev __ZN7WebCore14ResourceHandle20forceContentSniffingEv __ZN7WebCore14ResourceHandle26synchronousLoadRunLoopModeEv __ZN7WebCore14ResourceHandle35createPrivateBrowsingStorageSessionEPK10__CFString -__ZN7WebCore14ResourceHandle6createEPNS_17NetworkingContextERKNS_15ResourceRequestEPNS_20ResourceHandleClientEbb __ZN7WebCore14ResourceLoader13setIdentifierEm __ZN7WebCore14ResourceLoader14cancelledErrorEv __ZN7WebCore14SchemeRegistry24registerURLSchemeAsLocalERKN3WTF6StringE @@ -1250,7 +1244,6 @@ __ZNK7WebCore14InsertionPoint8isActiveEv __ZNK7WebCore14RenderListItem10markerTextEv __ZNK7WebCore14ResourceBuffer4dataEv __ZNK7WebCore14ResourceBuffer4sizeEv -__ZNK7WebCore14ResourceBuffer7isEmptyEv __ZNK7WebCore14ResourceHandle10connectionEv __ZNK7WebCore14ResourceLoader11frameLoaderEv __ZNK7WebCore14ScrollableArea14scrollAnimatorEv diff --git a/Source/WebCore/WebCore.gypi b/Source/WebCore/WebCore.gypi index 8bd1fc4cd..9e75c8d8b 100644 --- a/Source/WebCore/WebCore.gypi +++ b/Source/WebCore/WebCore.gypi @@ -3670,10 +3670,10 @@ 'workers/WorkerScriptLoader.h', 'workers/WorkerScriptLoaderClient.h', 'workers/WorkerThread.cpp', - 'xml/parser/CharacterReferenceParserInlines.h', + 'xml/parser/CharacterReferenceParserInlineMethods.h', 'xml/parser/MarkupTokenBase.h', 'xml/parser/MarkupTokenizerBase.h', - 'xml/parser/MarkupTokenizerInlines.h', + 'xml/parser/MarkupTokenizerInlineMethods.h', 'xml/parser/NewXMLDocumentParser.cpp', 'xml/parser/NewXMLDocumentParser.h', 'xml/parser/XMLCharacterReferenceParser.cpp', diff --git a/Source/WebCore/WebCore.vcproj/WebCore.vcproj b/Source/WebCore/WebCore.vcproj/WebCore.vcproj index f1a4cf163..5b69c1561 100755 --- a/Source/WebCore/WebCore.vcproj/WebCore.vcproj +++ b/Source/WebCore/WebCore.vcproj/WebCore.vcproj @@ -48398,7 +48398,7 @@ Name="parser"
>
<File
- RelativePath="..\xml\parser\CharacterReferenceInlines.h"
+ RelativePath="..\xml\parser\CharacterReferenceInlineMethods.h"
>
</File>
<File
@@ -48410,7 +48410,7 @@ >
</File>
<File
- RelativePath="..\xml\parser\MarkupTokenizerInlines.h"
+ RelativePath="..\xml\parser\MarkupTokenizerInlineMethods.h"
>
</File>
<File
diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj index 18933264b..41e9af371 100644 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj @@ -45,7 +45,7 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ - 00022E6913CE1BBA00282D5B /* CharacterReferenceParserInlines.h in Headers */ = {isa = PBXBuildFile; fileRef = 00022E6813CE1BBA00282D5B /* CharacterReferenceParserInlines.h */; }; + 00022E6913CE1BBA00282D5B /* CharacterReferenceParserInlineMethods.h in Headers */ = {isa = PBXBuildFile; fileRef = 00022E6813CE1BBA00282D5B /* CharacterReferenceParserInlineMethods.h */; }; 0002EC5813C3F67D00040D47 /* XMLToken.h in Headers */ = {isa = PBXBuildFile; fileRef = 0002EC5513C3F67D00040D47 /* XMLToken.h */; }; 0002EC5913C3F67D00040D47 /* XMLTokenizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0002EC5613C3F67D00040D47 /* XMLTokenizer.cpp */; }; 0002EC5A13C3F67D00040D47 /* XMLTokenizer.h in Headers */ = {isa = PBXBuildFile; fileRef = 0002EC5713C3F67D00040D47 /* XMLTokenizer.h */; }; @@ -60,7 +60,7 @@ 00B9318913BA8DBC0035A948 /* XMLDocumentParserLibxml2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00B9318313BA867F0035A948 /* XMLDocumentParserLibxml2.cpp */; }; 00B9318B13BA8DC90035A948 /* XMLDocumentParserScope.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00B9318513BA867F0035A948 /* XMLDocumentParserScope.cpp */; }; 00B9318C13BA8DCC0035A948 /* XMLDocumentParserScope.h in Headers */ = {isa = PBXBuildFile; fileRef = 00B9318613BA867F0035A948 /* XMLDocumentParserScope.h */; }; - 00C60E3F13D76D7E0092A275 /* MarkupTokenizerInlines.h in Headers */ = {isa = PBXBuildFile; fileRef = 00C60E3E13D76D7E0092A275 /* MarkupTokenizerInlines.h */; }; + 00C60E3F13D76D7E0092A275 /* MarkupTokenizerInlineMethods.h in Headers */ = {isa = PBXBuildFile; fileRef = 00C60E3E13D76D7E0092A275 /* MarkupTokenizerInlineMethods.h */; }; 00C60E4213D797AE0092A275 /* MarkupTokenizerBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 00C60E4113D797AE0092A275 /* MarkupTokenizerBase.h */; }; 00CA93B213C6691600F7FE95 /* NewXMLDocumentParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 00CA93B113C6691600F7FE95 /* NewXMLDocumentParser.h */; }; 00CA93B513C6697C00F7FE95 /* NewXMLDocumentParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00CA93B413C6697C00F7FE95 /* NewXMLDocumentParser.cpp */; }; @@ -7094,7 +7094,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 00022E6813CE1BBA00282D5B /* CharacterReferenceParserInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CharacterReferenceParserInlines.h; sourceTree = "<group>"; }; + 00022E6813CE1BBA00282D5B /* CharacterReferenceParserInlineMethods.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CharacterReferenceParserInlineMethods.h; sourceTree = "<group>"; }; 0002EC5513C3F67D00040D47 /* XMLToken.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XMLToken.h; sourceTree = "<group>"; }; 0002EC5613C3F67D00040D47 /* XMLTokenizer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XMLTokenizer.cpp; sourceTree = "<group>"; }; 0002EC5713C3F67D00040D47 /* XMLTokenizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XMLTokenizer.h; sourceTree = "<group>"; }; @@ -7109,7 +7109,7 @@ 00B9318313BA867F0035A948 /* XMLDocumentParserLibxml2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XMLDocumentParserLibxml2.cpp; sourceTree = "<group>"; }; 00B9318513BA867F0035A948 /* XMLDocumentParserScope.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XMLDocumentParserScope.cpp; sourceTree = "<group>"; }; 00B9318613BA867F0035A948 /* XMLDocumentParserScope.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XMLDocumentParserScope.h; sourceTree = "<group>"; }; - 00C60E3E13D76D7E0092A275 /* MarkupTokenizerInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MarkupTokenizerInlines.h; sourceTree = "<group>"; }; + 00C60E3E13D76D7E0092A275 /* MarkupTokenizerInlineMethods.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MarkupTokenizerInlineMethods.h; sourceTree = "<group>"; }; 00C60E4113D797AE0092A275 /* MarkupTokenizerBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MarkupTokenizerBase.h; sourceTree = "<group>"; }; 00CA93B113C6691600F7FE95 /* NewXMLDocumentParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NewXMLDocumentParser.h; sourceTree = "<group>"; }; 00CA93B413C6697C00F7FE95 /* NewXMLDocumentParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NewXMLDocumentParser.cpp; sourceTree = "<group>"; }; @@ -14139,10 +14139,10 @@ 00B9318013BA867F0035A948 /* parser */ = { isa = PBXGroup; children = ( - 00022E6813CE1BBA00282D5B /* CharacterReferenceParserInlines.h */, + 00022E6813CE1BBA00282D5B /* CharacterReferenceParserInlineMethods.h */, 00A629C013D0BEC70050AC52 /* MarkupTokenBase.h */, 00C60E4113D797AE0092A275 /* MarkupTokenizerBase.h */, - 00C60E3E13D76D7E0092A275 /* MarkupTokenizerInlines.h */, + 00C60E3E13D76D7E0092A275 /* MarkupTokenizerInlineMethods.h */, 00CA93B413C6697C00F7FE95 /* NewXMLDocumentParser.cpp */, 00CA93B113C6691600F7FE95 /* NewXMLDocumentParser.h */, 00D0464813C4D14500326FCC /* XMLCharacterReferenceParser.cpp */, @@ -22568,7 +22568,7 @@ FD315FFF12B0267600C1A359 /* ChannelMergerNode.h in Headers */, FD31600212B0267600C1A359 /* ChannelSplitterNode.h in Headers */, 6550B6A0099DF0270090D781 /* CharacterData.h in Headers */, - 00022E6913CE1BBA00282D5B /* CharacterReferenceParserInlines.h in Headers */, + 00022E6913CE1BBA00282D5B /* CharacterReferenceParserInlineMethods.h in Headers */, B2C3DA2A0D006C1D00EF6F26 /* CharsetData.h in Headers */, F55B3DB21251F12D003EF269 /* CheckboxInputType.h in Headers */, A00B721A11DE6428008AB9FF /* CheckedInt.h in Headers */, @@ -24524,7 +24524,7 @@ 9728C3141268E4390041E89B /* MarkupAccumulator.h in Headers */, 00A629C113D0BEC70050AC52 /* MarkupTokenBase.h in Headers */, 00C60E4213D797AE0092A275 /* MarkupTokenizerBase.h in Headers */, - 00C60E3F13D76D7E0092A275 /* MarkupTokenizerInlines.h in Headers */, + 00C60E3F13D76D7E0092A275 /* MarkupTokenizerInlineMethods.h in Headers */, FABE72F51059C1EB00D999DD /* MathMLElement.h in Headers */, 44A28AAC12DFB8AC00AE923B /* MathMLElementFactory.h in Headers */, FABE72F71059C1EB00D999DD /* MathMLInlineContainerElement.h in Headers */, diff --git a/Source/WebCore/accessibility/AccessibilityObject.cpp b/Source/WebCore/accessibility/AccessibilityObject.cpp index 3ef84370c..e675be2f3 100644 --- a/Source/WebCore/accessibility/AccessibilityObject.cpp +++ b/Source/WebCore/accessibility/AccessibilityObject.cpp @@ -1284,7 +1284,7 @@ bool AccessibilityObject::ariaIsMultiline() const const AtomicString& AccessibilityObject::invalidStatus() const { - DEFINE_STATIC_LOCAL(const AtomicString, invalidStatusFalse, ("false", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, invalidStatusFalse, ("false")); // aria-invalid can return false (default), grammer, spelling, or true. const AtomicString& ariaInvalid = getAttribute(aria_invalidAttr); diff --git a/Source/WebCore/accessibility/AccessibilityRenderObject.cpp b/Source/WebCore/accessibility/AccessibilityRenderObject.cpp index 429adc7e7..6d67328d7 100644 --- a/Source/WebCore/accessibility/AccessibilityRenderObject.cpp +++ b/Source/WebCore/accessibility/AccessibilityRenderObject.cpp @@ -2866,9 +2866,9 @@ bool AccessibilityRenderObject::canHaveChildren() const const AtomicString& AccessibilityRenderObject::ariaLiveRegionStatus() const { - DEFINE_STATIC_LOCAL(const AtomicString, liveRegionStatusAssertive, ("assertive", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(const AtomicString, liveRegionStatusPolite, ("polite", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(const AtomicString, liveRegionStatusOff, ("off", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, liveRegionStatusAssertive, ("assertive")); + DEFINE_STATIC_LOCAL(const AtomicString, liveRegionStatusPolite, ("polite")); + DEFINE_STATIC_LOCAL(const AtomicString, liveRegionStatusOff, ("off")); const AtomicString& liveRegionStatus = getAttribute(aria_liveAttr); // These roles have implicit live region status. @@ -2893,7 +2893,7 @@ const AtomicString& AccessibilityRenderObject::ariaLiveRegionStatus() const const AtomicString& AccessibilityRenderObject::ariaLiveRegionRelevant() const { - DEFINE_STATIC_LOCAL(const AtomicString, defaultLiveRegionRelevant, ("additions text", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, defaultLiveRegionRelevant, ("additions text")); const AtomicString& relevant = getAttribute(aria_relevantAttr); // Default aria-relevant = "additions text". diff --git a/Source/WebCore/bindings/js/JSCanvasRenderingContext2DCustom.cpp b/Source/WebCore/bindings/js/JSCanvasRenderingContext2DCustom.cpp index bc9c8ee28..da0fea9b8 100644 --- a/Source/WebCore/bindings/js/JSCanvasRenderingContext2DCustom.cpp +++ b/Source/WebCore/bindings/js/JSCanvasRenderingContext2DCustom.cpp @@ -100,7 +100,7 @@ JSValue JSCanvasRenderingContext2D::webkitLineDash(ExecState* exec) const Vector<float>::const_iterator end = dash.end(); for (Vector<float>::const_iterator it = dash.begin(); it != end; ++it) list.append(JSValue(*it)); - return constructArray(exec, 0, globalObject(), list); + return constructArray(exec, globalObject(), list); } void JSCanvasRenderingContext2D::setWebkitLineDash(ExecState* exec, JSValue value) diff --git a/Source/WebCore/bindings/js/JSClipboardCustom.cpp b/Source/WebCore/bindings/js/JSClipboardCustom.cpp index e36c6032f..09b87d69d 100644 --- a/Source/WebCore/bindings/js/JSClipboardCustom.cpp +++ b/Source/WebCore/bindings/js/JSClipboardCustom.cpp @@ -59,7 +59,7 @@ JSValue JSClipboard::types(ExecState* exec) const ListHashSet<String>::const_iterator end = types.end(); for (ListHashSet<String>::const_iterator it = types.begin(); it != end; ++it) list.append(jsStringWithCache(exec, *it)); - return constructArray(exec, 0, globalObject(), list); + return constructArray(exec, globalObject(), list); } JSValue JSClipboard::clearData(ExecState* exec) diff --git a/Source/WebCore/bindings/js/JSDOMBinding.cpp b/Source/WebCore/bindings/js/JSDOMBinding.cpp index d76e0e1dc..df7d15f2b 100644 --- a/Source/WebCore/bindings/js/JSDOMBinding.cpp +++ b/Source/WebCore/bindings/js/JSDOMBinding.cpp @@ -142,7 +142,7 @@ JSC::JSValue jsArray(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, Pass for (unsigned i = 0; i < stringList->length(); ++i) list.append(jsStringWithCache(exec, stringList->item(i))); } - return JSC::constructArray(exec, 0, globalObject, list); + return JSC::constructArray(exec, globalObject, list); } void reportException(ExecState* exec, JSValue exception) diff --git a/Source/WebCore/bindings/js/JSDOMBinding.h b/Source/WebCore/bindings/js/JSDOMBinding.h index 3c2f1153e..0812cbeef 100644 --- a/Source/WebCore/bindings/js/JSDOMBinding.h +++ b/Source/WebCore/bindings/js/JSDOMBinding.h @@ -369,7 +369,7 @@ enum ParameterDefaultPolicy { for (typename Vector<T, inlineCapacity>::const_iterator iter = iterator.begin(); iter != end; ++iter) list.append(TraitsType::arrayJSValue(exec, globalObject, *iter)); - return JSC::constructArray(exec, 0, globalObject, list); + return JSC::constructArray(exec, globalObject, list); } JSC::JSValue jsArray(JSC::ExecState*, JSDOMGlobalObject*, PassRefPtr<DOMStringList>); diff --git a/Source/WebCore/bindings/js/JSInjectedScriptHostCustom.cpp b/Source/WebCore/bindings/js/JSInjectedScriptHostCustom.cpp index 7e66e601a..fe673f5c3 100644 --- a/Source/WebCore/bindings/js/JSInjectedScriptHostCustom.cpp +++ b/Source/WebCore/bindings/js/JSInjectedScriptHostCustom.cpp @@ -197,7 +197,7 @@ JSValue JSInjectedScriptHost::getInternalProperties(ExecState*) static JSArray* getJSListenerFunctions(ExecState* exec, Document* document, const EventListenerInfo& listenerInfo) { - JSArray* result = constructEmptyArray(exec, 0); + JSArray* result = constructEmptyArray(exec); size_t handlersCount = listenerInfo.eventListenerVector.size(); for (size_t i = 0, outputIndex = 0; i < handlersCount; ++i) { const JSEventListener* jsListener = JSEventListener::cast(listenerInfo.eventListenerVector[i].listener.get()); diff --git a/Source/WebCore/bindings/js/JSJavaScriptCallFrameCustom.cpp b/Source/WebCore/bindings/js/JSJavaScriptCallFrameCustom.cpp index a068084af..a71ff0c51 100644 --- a/Source/WebCore/bindings/js/JSJavaScriptCallFrameCustom.cpp +++ b/Source/WebCore/bindings/js/JSJavaScriptCallFrameCustom.cpp @@ -90,7 +90,7 @@ JSValue JSJavaScriptCallFrame::scopeChain(ExecState* exec) const ++iter; } while (iter != end); - return constructArray(exec, 0, globalObject(), list); + return constructArray(exec, globalObject(), list); } JSValue JSJavaScriptCallFrame::scopeType(ExecState* exec) diff --git a/Source/WebCore/bindings/js/JSMessageEventCustom.cpp b/Source/WebCore/bindings/js/JSMessageEventCustom.cpp index 0df73957b..e44cddda9 100644 --- a/Source/WebCore/bindings/js/JSMessageEventCustom.cpp +++ b/Source/WebCore/bindings/js/JSMessageEventCustom.cpp @@ -92,12 +92,12 @@ JSValue JSMessageEvent::ports(ExecState* exec) const { MessagePortArray* ports = static_cast<MessageEvent*>(impl())->ports(); if (!ports) - return constructEmptyArray(exec, 0, globalObject()); + return constructEmptyArray(exec, globalObject()); MarkedArgumentBuffer list; for (size_t i = 0; i < ports->size(); i++) list.append(toJS(exec, globalObject(), (*ports)[i].get())); - return constructArray(exec, 0, globalObject(), list); + return constructArray(exec, globalObject(), list); } static JSC::JSValue handleInitMessageEvent(JSMessageEvent* jsEvent, JSC::ExecState* exec) diff --git a/Source/WebCore/bindings/js/JSMutationCallbackCustom.cpp b/Source/WebCore/bindings/js/JSMutationCallbackCustom.cpp index 68c4e6663..e3de7b794 100644 --- a/Source/WebCore/bindings/js/JSMutationCallbackCustom.cpp +++ b/Source/WebCore/bindings/js/JSMutationCallbackCustom.cpp @@ -62,7 +62,7 @@ bool JSMutationCallback::handleEvent(MutationRecordArray* mutations, MutationObs JSValue jsObserver = toJS(exec, m_data->globalObject(), observer); MarkedArgumentBuffer args; - args.append(constructArray(exec, 0, m_data->globalObject(), mutationList)); + args.append(constructArray(exec, m_data->globalObject(), mutationList)); args.append(jsObserver); bool raisedException = false; diff --git a/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp b/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp index 243afa15e..c93f3401e 100644 --- a/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp +++ b/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp @@ -100,7 +100,7 @@ static JSValue toJS(ExecState* exec, JSDOMGlobalObject* globalObject, const WebG const Vector<bool>& value = info.getBoolArray(); for (size_t ii = 0; ii < value.size(); ++ii) list.append(jsBoolean(value[ii])); - return constructArray(exec, 0, globalObject, list); + return constructArray(exec, globalObject, list); } case WebGLGetInfo::kTypeFloat: return jsNumber(info.getFloat()); @@ -249,7 +249,7 @@ JSValue JSWebGLRenderingContext::getAttachedShaders(ExecState* exec) MarkedArgumentBuffer list; for (size_t ii = 0; ii < shaders.size(); ++ii) list.append(toJS(exec, globalObject(), shaders[ii].get())); - return constructArray(exec, 0, globalObject(), list); + return constructArray(exec, globalObject(), list); } JSValue JSWebGLRenderingContext::getExtension(ExecState* exec) @@ -368,7 +368,7 @@ JSValue JSWebGLRenderingContext::getSupportedExtensions(ExecState* exec) MarkedArgumentBuffer list; for (size_t ii = 0; ii < value.size(); ++ii) list.append(jsStringWithCache(exec, value[ii])); - return constructArray(exec, 0, globalObject(), list); + return constructArray(exec, globalObject(), list); } JSValue JSWebGLRenderingContext::getTexParameter(ExecState* exec) diff --git a/Source/WebCore/bindings/js/SerializedScriptValue.cpp b/Source/WebCore/bindings/js/SerializedScriptValue.cpp index 45812bb21..520814ea3 100644 --- a/Source/WebCore/bindings/js/SerializedScriptValue.cpp +++ b/Source/WebCore/bindings/js/SerializedScriptValue.cpp @@ -1628,7 +1628,7 @@ DeserializationResult CloneDeserializer::deserialize() fail(); goto error; } - JSArray* outArray = constructEmptyArray(m_exec, 0, m_globalObject, length); + JSArray* outArray = constructEmptyArray(m_exec, m_globalObject, length); m_gcBuffer.append(outArray); outputArrayStack.append(outArray); // fallthrough diff --git a/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm b/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm index fbddae7ba..1cd92ffec 100644 --- a/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm +++ b/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm @@ -379,7 +379,7 @@ END static v8::Persistent<v8::FunctionTemplate> GetTemplate(); static ${nativeType}* toNative(v8::Handle<v8::Object> object) { - return reinterpret_cast<${nativeType}*>(object->GetPointerFromInternalField(v8DOMWrapperObjectIndex)); + return reinterpret_cast<${nativeType}*>(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex)); } inline static v8::Handle<v8::Object> wrap(${nativeType}*, v8::Handle<v8::Object> creationContext = v8::Handle<v8::Object>(), v8::Isolate* = 0); static void derefObject(void*); diff --git a/Source/WebCore/bindings/scripts/test/V8/V8Float64Array.h b/Source/WebCore/bindings/scripts/test/V8/V8Float64Array.h index be01b1c06..213466f00 100644 --- a/Source/WebCore/bindings/scripts/test/V8/V8Float64Array.h +++ b/Source/WebCore/bindings/scripts/test/V8/V8Float64Array.h @@ -40,7 +40,7 @@ public: static v8::Persistent<v8::FunctionTemplate> GetTemplate(); static Float64Array* toNative(v8::Handle<v8::Object> object) { - return reinterpret_cast<Float64Array*>(object->GetPointerFromInternalField(v8DOMWrapperObjectIndex)); + return reinterpret_cast<Float64Array*>(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex)); } inline static v8::Handle<v8::Object> wrap(Float64Array*, v8::Handle<v8::Object> creationContext = v8::Handle<v8::Object>(), v8::Isolate* = 0); static void derefObject(void*); diff --git a/Source/WebCore/bindings/scripts/test/V8/V8TestActiveDOMObject.h b/Source/WebCore/bindings/scripts/test/V8/V8TestActiveDOMObject.h index 1923810ab..28af94528 100644 --- a/Source/WebCore/bindings/scripts/test/V8/V8TestActiveDOMObject.h +++ b/Source/WebCore/bindings/scripts/test/V8/V8TestActiveDOMObject.h @@ -39,7 +39,7 @@ public: static v8::Persistent<v8::FunctionTemplate> GetTemplate(); static TestActiveDOMObject* toNative(v8::Handle<v8::Object> object) { - return reinterpret_cast<TestActiveDOMObject*>(object->GetPointerFromInternalField(v8DOMWrapperObjectIndex)); + return reinterpret_cast<TestActiveDOMObject*>(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex)); } inline static v8::Handle<v8::Object> wrap(TestActiveDOMObject*, v8::Handle<v8::Object> creationContext = v8::Handle<v8::Object>(), v8::Isolate* = 0); static void derefObject(void*); diff --git a/Source/WebCore/bindings/scripts/test/V8/V8TestCustomNamedGetter.h b/Source/WebCore/bindings/scripts/test/V8/V8TestCustomNamedGetter.h index 8c89c0a29..0d7aff19f 100644 --- a/Source/WebCore/bindings/scripts/test/V8/V8TestCustomNamedGetter.h +++ b/Source/WebCore/bindings/scripts/test/V8/V8TestCustomNamedGetter.h @@ -39,7 +39,7 @@ public: static v8::Persistent<v8::FunctionTemplate> GetTemplate(); static TestCustomNamedGetter* toNative(v8::Handle<v8::Object> object) { - return reinterpret_cast<TestCustomNamedGetter*>(object->GetPointerFromInternalField(v8DOMWrapperObjectIndex)); + return reinterpret_cast<TestCustomNamedGetter*>(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex)); } inline static v8::Handle<v8::Object> wrap(TestCustomNamedGetter*, v8::Handle<v8::Object> creationContext = v8::Handle<v8::Object>(), v8::Isolate* = 0); static void derefObject(void*); diff --git a/Source/WebCore/bindings/scripts/test/V8/V8TestEventConstructor.h b/Source/WebCore/bindings/scripts/test/V8/V8TestEventConstructor.h index 629a5b55e..0488a48c4 100644 --- a/Source/WebCore/bindings/scripts/test/V8/V8TestEventConstructor.h +++ b/Source/WebCore/bindings/scripts/test/V8/V8TestEventConstructor.h @@ -40,7 +40,7 @@ public: static v8::Persistent<v8::FunctionTemplate> GetTemplate(); static TestEventConstructor* toNative(v8::Handle<v8::Object> object) { - return reinterpret_cast<TestEventConstructor*>(object->GetPointerFromInternalField(v8DOMWrapperObjectIndex)); + return reinterpret_cast<TestEventConstructor*>(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex)); } inline static v8::Handle<v8::Object> wrap(TestEventConstructor*, v8::Handle<v8::Object> creationContext = v8::Handle<v8::Object>(), v8::Isolate* = 0); static void derefObject(void*); diff --git a/Source/WebCore/bindings/scripts/test/V8/V8TestEventTarget.h b/Source/WebCore/bindings/scripts/test/V8/V8TestEventTarget.h index 9b68e34e1..a52e8a4e0 100644 --- a/Source/WebCore/bindings/scripts/test/V8/V8TestEventTarget.h +++ b/Source/WebCore/bindings/scripts/test/V8/V8TestEventTarget.h @@ -39,7 +39,7 @@ public: static v8::Persistent<v8::FunctionTemplate> GetTemplate(); static TestEventTarget* toNative(v8::Handle<v8::Object> object) { - return reinterpret_cast<TestEventTarget*>(object->GetPointerFromInternalField(v8DOMWrapperObjectIndex)); + return reinterpret_cast<TestEventTarget*>(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex)); } inline static v8::Handle<v8::Object> wrap(TestEventTarget*, v8::Handle<v8::Object> creationContext = v8::Handle<v8::Object>(), v8::Isolate* = 0); static void derefObject(void*); diff --git a/Source/WebCore/bindings/scripts/test/V8/V8TestException.h b/Source/WebCore/bindings/scripts/test/V8/V8TestException.h index 71b9478d3..efbaac91f 100644 --- a/Source/WebCore/bindings/scripts/test/V8/V8TestException.h +++ b/Source/WebCore/bindings/scripts/test/V8/V8TestException.h @@ -39,7 +39,7 @@ public: static v8::Persistent<v8::FunctionTemplate> GetTemplate(); static TestException* toNative(v8::Handle<v8::Object> object) { - return reinterpret_cast<TestException*>(object->GetPointerFromInternalField(v8DOMWrapperObjectIndex)); + return reinterpret_cast<TestException*>(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex)); } inline static v8::Handle<v8::Object> wrap(TestException*, v8::Handle<v8::Object> creationContext = v8::Handle<v8::Object>(), v8::Isolate* = 0); static void derefObject(void*); diff --git a/Source/WebCore/bindings/scripts/test/V8/V8TestInterface.h b/Source/WebCore/bindings/scripts/test/V8/V8TestInterface.h index 75fd11ff2..08082c3a9 100644 --- a/Source/WebCore/bindings/scripts/test/V8/V8TestInterface.h +++ b/Source/WebCore/bindings/scripts/test/V8/V8TestInterface.h @@ -41,7 +41,7 @@ public: static v8::Persistent<v8::FunctionTemplate> GetTemplate(); static TestInterface* toNative(v8::Handle<v8::Object> object) { - return reinterpret_cast<TestInterface*>(object->GetPointerFromInternalField(v8DOMWrapperObjectIndex)); + return reinterpret_cast<TestInterface*>(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex)); } inline static v8::Handle<v8::Object> wrap(TestInterface*, v8::Handle<v8::Object> creationContext = v8::Handle<v8::Object>(), v8::Isolate* = 0); static void derefObject(void*); diff --git a/Source/WebCore/bindings/scripts/test/V8/V8TestMediaQueryListListener.h b/Source/WebCore/bindings/scripts/test/V8/V8TestMediaQueryListListener.h index 7ba4a5641..8afda72cc 100644 --- a/Source/WebCore/bindings/scripts/test/V8/V8TestMediaQueryListListener.h +++ b/Source/WebCore/bindings/scripts/test/V8/V8TestMediaQueryListListener.h @@ -39,7 +39,7 @@ public: static v8::Persistent<v8::FunctionTemplate> GetTemplate(); static TestMediaQueryListListener* toNative(v8::Handle<v8::Object> object) { - return reinterpret_cast<TestMediaQueryListListener*>(object->GetPointerFromInternalField(v8DOMWrapperObjectIndex)); + return reinterpret_cast<TestMediaQueryListListener*>(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex)); } inline static v8::Handle<v8::Object> wrap(TestMediaQueryListListener*, v8::Handle<v8::Object> creationContext = v8::Handle<v8::Object>(), v8::Isolate* = 0); static void derefObject(void*); diff --git a/Source/WebCore/bindings/scripts/test/V8/V8TestNamedConstructor.h b/Source/WebCore/bindings/scripts/test/V8/V8TestNamedConstructor.h index b0f3471c8..5d33fea16 100644 --- a/Source/WebCore/bindings/scripts/test/V8/V8TestNamedConstructor.h +++ b/Source/WebCore/bindings/scripts/test/V8/V8TestNamedConstructor.h @@ -45,7 +45,7 @@ public: static v8::Persistent<v8::FunctionTemplate> GetTemplate(); static TestNamedConstructor* toNative(v8::Handle<v8::Object> object) { - return reinterpret_cast<TestNamedConstructor*>(object->GetPointerFromInternalField(v8DOMWrapperObjectIndex)); + return reinterpret_cast<TestNamedConstructor*>(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex)); } inline static v8::Handle<v8::Object> wrap(TestNamedConstructor*, v8::Handle<v8::Object> creationContext = v8::Handle<v8::Object>(), v8::Isolate* = 0); static void derefObject(void*); diff --git a/Source/WebCore/bindings/scripts/test/V8/V8TestNode.h b/Source/WebCore/bindings/scripts/test/V8/V8TestNode.h index fd3338839..5e8ec28f5 100644 --- a/Source/WebCore/bindings/scripts/test/V8/V8TestNode.h +++ b/Source/WebCore/bindings/scripts/test/V8/V8TestNode.h @@ -39,7 +39,7 @@ public: static v8::Persistent<v8::FunctionTemplate> GetTemplate(); static TestNode* toNative(v8::Handle<v8::Object> object) { - return reinterpret_cast<TestNode*>(object->GetPointerFromInternalField(v8DOMWrapperObjectIndex)); + return reinterpret_cast<TestNode*>(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex)); } inline static v8::Handle<v8::Object> wrap(TestNode*, v8::Handle<v8::Object> creationContext = v8::Handle<v8::Object>(), v8::Isolate* = 0); static void derefObject(void*); diff --git a/Source/WebCore/bindings/scripts/test/V8/V8TestObj.h b/Source/WebCore/bindings/scripts/test/V8/V8TestObj.h index 9438952c8..b1855b492 100644 --- a/Source/WebCore/bindings/scripts/test/V8/V8TestObj.h +++ b/Source/WebCore/bindings/scripts/test/V8/V8TestObj.h @@ -39,7 +39,7 @@ public: static v8::Persistent<v8::FunctionTemplate> GetTemplate(); static TestObj* toNative(v8::Handle<v8::Object> object) { - return reinterpret_cast<TestObj*>(object->GetPointerFromInternalField(v8DOMWrapperObjectIndex)); + return reinterpret_cast<TestObj*>(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex)); } inline static v8::Handle<v8::Object> wrap(TestObj*, v8::Handle<v8::Object> creationContext = v8::Handle<v8::Object>(), v8::Isolate* = 0); static void derefObject(void*); diff --git a/Source/WebCore/bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.h b/Source/WebCore/bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.h index 397016850..94d9d06cd 100644 --- a/Source/WebCore/bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.h +++ b/Source/WebCore/bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.h @@ -41,7 +41,7 @@ public: static v8::Persistent<v8::FunctionTemplate> GetTemplate(); static TestSerializedScriptValueInterface* toNative(v8::Handle<v8::Object> object) { - return reinterpret_cast<TestSerializedScriptValueInterface*>(object->GetPointerFromInternalField(v8DOMWrapperObjectIndex)); + return reinterpret_cast<TestSerializedScriptValueInterface*>(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex)); } inline static v8::Handle<v8::Object> wrap(TestSerializedScriptValueInterface*, v8::Handle<v8::Object> creationContext = v8::Handle<v8::Object>(), v8::Isolate* = 0); static void derefObject(void*); diff --git a/Source/WebCore/bindings/v8/NPV8Object.cpp b/Source/WebCore/bindings/v8/NPV8Object.cpp index 9cf9e5fad..2f273e12c 100644 --- a/Source/WebCore/bindings/v8/NPV8Object.cpp +++ b/Source/WebCore/bindings/v8/NPV8Object.cpp @@ -120,7 +120,7 @@ static v8::Local<v8::String> npIdentifierToV8Identifier(NPIdentifier name) NPObject* v8ObjectToNPObject(v8::Handle<v8::Object> object) { - return reinterpret_cast<NPObject*>(object->GetPointerFromInternalField(v8DOMWrapperObjectIndex)); + return reinterpret_cast<NPObject*>(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex)); } static NPClass V8NPObjectClass = { NP_CLASS_STRUCT_VERSION, @@ -135,7 +135,7 @@ NPObject* npCreateV8ScriptObject(NPP npp, v8::Handle<v8::Object> object, DOMWind { // Check to see if this object is already wrapped. if (object->InternalFieldCount() == npObjectInternalFieldCount) { - WrapperTypeInfo* typeInfo = static_cast<WrapperTypeInfo*>(object->GetPointerFromInternalField(v8DOMWrapperTypeIndex)); + WrapperTypeInfo* typeInfo = static_cast<WrapperTypeInfo*>(object->GetAlignedPointerFromInternalField(v8DOMWrapperTypeIndex)); if (typeInfo == npObjectTypeInfo()) { NPObject* returnValue = v8ObjectToNPObject(object); diff --git a/Source/WebCore/bindings/v8/V8Collection.h b/Source/WebCore/bindings/v8/V8Collection.h index fc80a5a7e..f739f50bc 100644 --- a/Source/WebCore/bindings/v8/V8Collection.h +++ b/Source/WebCore/bindings/v8/V8Collection.h @@ -50,7 +50,7 @@ template<class T> static v8::Handle<v8::Value> getV8Object(T* implementation, v8 template<class Collection> static Collection* toNativeCollection(v8::Local<v8::Object> object) { - return reinterpret_cast<Collection*>(object->GetPointerFromInternalField(v8DOMWrapperObjectIndex)); + return reinterpret_cast<Collection*>(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex)); } template<class T> static v8::Handle<v8::Value> getV8Object(PassRefPtr<T> implementation, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate) diff --git a/Source/WebCore/bindings/v8/V8DOMWindowShell.cpp b/Source/WebCore/bindings/v8/V8DOMWindowShell.cpp index 02b347dc2..94eee8e54 100644 --- a/Source/WebCore/bindings/v8/V8DOMWindowShell.cpp +++ b/Source/WebCore/bindings/v8/V8DOMWindowShell.cpp @@ -171,12 +171,12 @@ static void checkDocumentWrapper(v8::Handle<v8::Object> wrapper, Document* docum static void setIsolatedWorldField(V8DOMWindowShell* shell, v8::Local<v8::Context> context) { - toInnerGlobalObject(context)->SetPointerInInternalField(V8DOMWindow::enteredIsolatedWorldIndex, shell); + toInnerGlobalObject(context)->SetAlignedPointerInInternalField(V8DOMWindow::enteredIsolatedWorldIndex, shell); } V8DOMWindowShell* V8DOMWindowShell::enteredIsolatedWorldContext() { - return static_cast<V8DOMWindowShell*>(toInnerGlobalObject(v8::Context::GetEntered())->GetPointerFromInternalField(V8DOMWindow::enteredIsolatedWorldIndex)); + return static_cast<V8DOMWindowShell*>(toInnerGlobalObject(v8::Context::GetEntered())->GetAlignedPointerFromInternalField(V8DOMWindow::enteredIsolatedWorldIndex)); } static void setInjectedScriptContextDebugId(v8::Handle<v8::Context> targetContext, int debugId) diff --git a/Source/WebCore/bindings/v8/V8DOMWrapper.cpp b/Source/WebCore/bindings/v8/V8DOMWrapper.cpp index aac95dbee..e10997707 100644 --- a/Source/WebCore/bindings/v8/V8DOMWrapper.cpp +++ b/Source/WebCore/bindings/v8/V8DOMWrapper.cpp @@ -157,7 +157,7 @@ bool V8DOMWrapper::isWrapperOfType(v8::Handle<v8::Value> value, WrapperTypeInfo* v8::Handle<v8::Value> wrapper = object->GetInternalField(v8DOMWrapperObjectIndex); ASSERT_UNUSED(wrapper, wrapper->IsNumber() || wrapper->IsExternal()); - WrapperTypeInfo* typeInfo = static_cast<WrapperTypeInfo*>(object->GetPointerFromInternalField(v8DOMWrapperTypeIndex)); + WrapperTypeInfo* typeInfo = static_cast<WrapperTypeInfo*>(object->GetAlignedPointerFromInternalField(v8DOMWrapperTypeIndex)); return typeInfo == type; } diff --git a/Source/WebCore/bindings/v8/V8DOMWrapper.h b/Source/WebCore/bindings/v8/V8DOMWrapper.h index ab6c2cd48..824c239ef 100644 --- a/Source/WebCore/bindings/v8/V8DOMWrapper.h +++ b/Source/WebCore/bindings/v8/V8DOMWrapper.h @@ -69,16 +69,16 @@ namespace WebCore { static void setDOMWrapper(v8::Handle<v8::Object> object, WrapperTypeInfo* type, void* cptr) { ASSERT(object->InternalFieldCount() >= 2); - object->SetPointerInInternalField(v8DOMWrapperObjectIndex, cptr); - object->SetPointerInInternalField(v8DOMWrapperTypeIndex, type); + object->SetAlignedPointerInInternalField(v8DOMWrapperObjectIndex, cptr); + object->SetAlignedPointerInInternalField(v8DOMWrapperTypeIndex, type); } static void clearDOMWrapper(v8::Handle<v8::Object> object, WrapperTypeInfo* type) { ASSERT(object->InternalFieldCount() >= 2); ASSERT(type); - object->SetPointerInInternalField(v8DOMWrapperTypeIndex, type); - object->SetPointerInInternalField(v8DOMWrapperObjectIndex, 0); + object->SetAlignedPointerInInternalField(v8DOMWrapperTypeIndex, type); + object->SetAlignedPointerInInternalField(v8DOMWrapperObjectIndex, 0); } static v8::Handle<v8::Object> lookupDOMWrapper(v8::Handle<v8::FunctionTemplate> functionTemplate, v8::Handle<v8::Object> object) diff --git a/Source/WebCore/bindings/v8/WrapperTypeInfo.h b/Source/WebCore/bindings/v8/WrapperTypeInfo.h index 0cb4b959b..ebec2de02 100644 --- a/Source/WebCore/bindings/v8/WrapperTypeInfo.h +++ b/Source/WebCore/bindings/v8/WrapperTypeInfo.h @@ -122,13 +122,13 @@ namespace WebCore { inline void* toNative(v8::Handle<v8::Object> object) { ASSERT(object->InternalFieldCount() >= v8DOMWrapperObjectIndex); - return object->GetPointerFromInternalField(v8DOMWrapperObjectIndex); + return object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex); } inline WrapperTypeInfo* toWrapperTypeInfo(v8::Handle<v8::Object> object) { ASSERT(object->InternalFieldCount() >= v8DOMWrapperTypeIndex); - return static_cast<WrapperTypeInfo*>(object->GetPointerFromInternalField(v8DOMWrapperTypeIndex)); + return static_cast<WrapperTypeInfo*>(object->GetAlignedPointerFromInternalField(v8DOMWrapperTypeIndex)); } } diff --git a/Source/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp b/Source/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp index a559bedb3..7c9af3721 100644 --- a/Source/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp +++ b/Source/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp @@ -557,7 +557,7 @@ bool V8DOMWindow::namedSecurityCheck(v8::Local<v8::Object> host, v8::Local<v8::V return false; if (key->IsString()) { - DEFINE_STATIC_LOCAL(AtomicString, nameOfProtoProperty, ("__proto__", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, nameOfProtoProperty, ("__proto__")); String name = toWebCoreString(key); Frame* childFrame = target->tree()->scopedChild(name); diff --git a/Source/WebCore/bindings/v8/custom/V8NodeListCustom.cpp b/Source/WebCore/bindings/v8/custom/V8NodeListCustom.cpp index e8b704c7a..e42589e69 100644 --- a/Source/WebCore/bindings/v8/custom/V8NodeListCustom.cpp +++ b/Source/WebCore/bindings/v8/custom/V8NodeListCustom.cpp @@ -49,7 +49,7 @@ v8::Handle<v8::Value> V8NodeList::namedPropertyGetter(v8::Local<v8::String> name AtomicString key = toWebCoreAtomicString(name); // Length property cannot be overridden. - DEFINE_STATIC_LOCAL(const AtomicString, length, ("length", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, length, ("length")); if (key == length) return v8Integer(list->length(), info.GetIsolate()); diff --git a/Source/WebCore/css/RuleFeature.cpp b/Source/WebCore/css/RuleFeature.cpp index 1b11c8fae..b1f929687 100644 --- a/Source/WebCore/css/RuleFeature.cpp +++ b/Source/WebCore/css/RuleFeature.cpp @@ -29,7 +29,6 @@ #include "config.h" #include "RuleFeature.h" -#include "CSSSelector.h" #include "WebCoreMemoryInstrumentation.h" #include <wtf/MemoryInstrumentationHashMap.h> #include <wtf/MemoryInstrumentationHashSet.h> @@ -37,27 +36,6 @@ namespace WebCore { -void RuleFeatureSet::collectFeaturesFromSelector(const CSSSelector* selector) -{ - if (selector->m_match == CSSSelector::Id) - idsInRules.add(selector->value().impl()); - else if (selector->m_match == CSSSelector::Class) - classesInRules.add(selector->value().impl()); - else if (selector->isAttributeSelector()) - attrsInRules.add(selector->attribute().localName().impl()); - switch (selector->pseudoType()) { - case CSSSelector::PseudoFirstLine: - usesFirstLineRules = true; - break; - case CSSSelector::PseudoBefore: - case CSSSelector::PseudoAfter: - usesBeforeAfterRules = true; - break; - default: - break; - } -} - void RuleFeatureSet::add(const RuleFeatureSet& other) { HashSet<AtomicStringImpl*>::const_iterator end = other.idsInRules.end(); diff --git a/Source/WebCore/css/RuleFeature.h b/Source/WebCore/css/RuleFeature.h index 0ffc6e5ee..ce6d04e66 100644 --- a/Source/WebCore/css/RuleFeature.h +++ b/Source/WebCore/css/RuleFeature.h @@ -30,7 +30,6 @@ namespace WebCore { class StyleRule; -class CSSSelector; struct RuleFeature { RuleFeature(StyleRule* rule, unsigned selectorIndex, bool hasDocumentSecurityOrigin) @@ -52,11 +51,7 @@ struct RuleFeatureSet { void add(const RuleFeatureSet&); void clear(); - - void collectFeaturesFromSelector(const CSSSelector*); - void reportMemoryUsage(MemoryObjectInfo*) const; - HashSet<AtomicStringImpl*> idsInRules; HashSet<AtomicStringImpl*> classesInRules; HashSet<AtomicStringImpl*> attrsInRules; diff --git a/Source/WebCore/css/RuleSet.cpp b/Source/WebCore/css/RuleSet.cpp index a5367ee82..e92d1768b 100644 --- a/Source/WebCore/css/RuleSet.cpp +++ b/Source/WebCore/css/RuleSet.cpp @@ -157,17 +157,38 @@ void RuleSet::RuleSetSelectorPair::reportMemoryUsage(MemoryObjectInfo* memoryObj info.addMember(ruleSet); } +static inline void collectFeaturesFromSelector(RuleFeatureSet& features, const CSSSelector* selector) +{ + if (selector->m_match == CSSSelector::Id) + features.idsInRules.add(selector->value().impl()); + else if (selector->m_match == CSSSelector::Class) + features.classesInRules.add(selector->value().impl()); + else if (selector->isAttributeSelector()) + features.attrsInRules.add(selector->attribute().localName().impl()); + switch (selector->pseudoType()) { + case CSSSelector::PseudoFirstLine: + features.usesFirstLineRules = true; + break; + case CSSSelector::PseudoBefore: + case CSSSelector::PseudoAfter: + features.usesBeforeAfterRules = true; + break; + default: + break; + } +} + static void collectFeaturesFromRuleData(RuleFeatureSet& features, const RuleData& ruleData) { bool foundSiblingSelector = false; for (CSSSelector* selector = ruleData.selector(); selector; selector = selector->tagHistory()) { - features.collectFeaturesFromSelector(selector); + collectFeaturesFromSelector(features, selector); if (CSSSelectorList* selectorList = selector->selectorList()) { for (CSSSelector* subSelector = selectorList->first(); subSelector; subSelector = CSSSelectorList::next(subSelector)) { if (!foundSiblingSelector && selector->isSiblingSelector()) foundSiblingSelector = true; - features.collectFeaturesFromSelector(subSelector); + collectFeaturesFromSelector(features, subSelector); } } else if (!foundSiblingSelector && selector->isSiblingSelector()) foundSiblingSelector = true; diff --git a/Source/WebCore/dom/ContextFeatures.cpp b/Source/WebCore/dom/ContextFeatures.cpp index 71ce8ac50..3afbe3889 100644 --- a/Source/WebCore/dom/ContextFeatures.cpp +++ b/Source/WebCore/dom/ContextFeatures.cpp @@ -41,7 +41,7 @@ ContextFeaturesClient* ContextFeaturesClient::empty() const AtomicString& ContextFeatures::supplementName() { - DEFINE_STATIC_LOCAL(AtomicString, name, ("ContextFeatures", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, name, ("ContextFeatures")); return name; } diff --git a/Source/WebCore/dom/DeviceMotionController.cpp b/Source/WebCore/dom/DeviceMotionController.cpp index cedfa4a26..23d60549a 100644 --- a/Source/WebCore/dom/DeviceMotionController.cpp +++ b/Source/WebCore/dom/DeviceMotionController.cpp @@ -137,7 +137,7 @@ void DeviceMotionController::didChangeDeviceMotion(DeviceMotionData* deviceMotio const AtomicString& DeviceMotionController::supplementName() { - DEFINE_STATIC_LOCAL(AtomicString, name, ("DeviceMotionController", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, name, ("DeviceMotionController")); return name; } diff --git a/Source/WebCore/dom/DeviceOrientationController.cpp b/Source/WebCore/dom/DeviceOrientationController.cpp index 91bfffc4a..302db6124 100644 --- a/Source/WebCore/dom/DeviceOrientationController.cpp +++ b/Source/WebCore/dom/DeviceOrientationController.cpp @@ -141,7 +141,7 @@ void DeviceOrientationController::didChangeDeviceOrientation(DeviceOrientationDa const AtomicString& DeviceOrientationController::supplementName() { - DEFINE_STATIC_LOCAL(AtomicString, name, ("DeviceOrientationController", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, name, ("DeviceOrientationController")); return name; } diff --git a/Source/WebCore/dom/Element.cpp b/Source/WebCore/dom/Element.cpp index 8c112dfa5..d84ce37a1 100644 --- a/Source/WebCore/dom/Element.cpp +++ b/Source/WebCore/dom/Element.cpp @@ -2166,21 +2166,21 @@ const AtomicString& Element::webkitRegionOverset() const { document()->updateLayoutIgnorePendingStylesheets(); - DEFINE_STATIC_LOCAL(AtomicString, undefinedState, ("undefined", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, undefinedState, ("undefined")); if (!document()->cssRegionsEnabled() || !renderRegion()) return undefinedState; switch (renderRegion()->regionState()) { case RenderRegion::RegionFit: { - DEFINE_STATIC_LOCAL(AtomicString, fitState, ("fit", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, fitState, ("fit")); return fitState; } case RenderRegion::RegionEmpty: { - DEFINE_STATIC_LOCAL(AtomicString, emptyState, ("empty", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, emptyState, ("empty")); return emptyState; } case RenderRegion::RegionOverset: { - DEFINE_STATIC_LOCAL(AtomicString, overflowState, ("overset", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, overflowState, ("overset")); return overflowState; } case RenderRegion::RegionUndefined: diff --git a/Source/WebCore/dom/MutationRecord.cpp b/Source/WebCore/dom/MutationRecord.cpp index 1eaaa4484..1fedd1dbf 100644 --- a/Source/WebCore/dom/MutationRecord.cpp +++ b/Source/WebCore/dom/MutationRecord.cpp @@ -134,19 +134,19 @@ private: const AtomicString& ChildListRecord::type() { - DEFINE_STATIC_LOCAL(AtomicString, childList, ("childList", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, childList, ("childList")); return childList; } const AtomicString& AttributesRecord::type() { - DEFINE_STATIC_LOCAL(AtomicString, attributes, ("attributes", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, attributes, ("attributes")); return attributes; } const AtomicString& CharacterDataRecord::type() { - DEFINE_STATIC_LOCAL(AtomicString, characterData, ("characterData", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, characterData, ("characterData")); return characterData; } diff --git a/Source/WebCore/html/FileInputType.cpp b/Source/WebCore/html/FileInputType.cpp index f6105ca94..89fcc878e 100644 --- a/Source/WebCore/html/FileInputType.cpp +++ b/Source/WebCore/html/FileInputType.cpp @@ -82,7 +82,7 @@ UploadButtonElement::UploadButtonElement(Document* document) const AtomicString& UploadButtonElement::shadowPseudoId() const { - DEFINE_STATIC_LOCAL(AtomicString, pseudoId, ("-webkit-file-upload-button", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, pseudoId, ("-webkit-file-upload-button")); return pseudoId; } diff --git a/Source/WebCore/html/FormController.cpp b/Source/WebCore/html/FormController.cpp index 8a8af05a9..7f87b97ff 100644 --- a/Source/WebCore/html/FormController.cpp +++ b/Source/WebCore/html/FormController.cpp @@ -272,7 +272,7 @@ Vector<String> SavedFormState::getReferencedFilePaths() const Vector<String> toReturn; for (FormElementStateMap::const_iterator it = m_stateForNewFormElements.begin(); it != m_stateForNewFormElements.end(); ++it) { const FormElementKey& key = it->key; - if (!equal(key.type(), "file", 4)) + if (AtomicString(key.type()) != AtomicString("file")) continue; const Deque<FormControlState>& queue = it->value; for (Deque<FormControlState>::const_iterator queIterator = queue.begin(); queIterator != queue.end(); ++queIterator) { @@ -344,7 +344,7 @@ AtomicString FormKeyGenerator::formKey(const HTMLFormControlElementWithState& co { HTMLFormElement* form = ownerFormForState(control); if (!form) { - DEFINE_STATIC_LOCAL(AtomicString, formKeyForNoOwner, ("No owner", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, formKeyForNoOwner, ("No owner")); return formKeyForNoOwner; } FormToKeyMap::const_iterator it = m_formToKeyMap.find(form); diff --git a/Source/WebCore/html/HTMLButtonElement.cpp b/Source/WebCore/html/HTMLButtonElement.cpp index 205e96269..cbd1f2998 100644 --- a/Source/WebCore/html/HTMLButtonElement.cpp +++ b/Source/WebCore/html/HTMLButtonElement.cpp @@ -71,15 +71,15 @@ const AtomicString& HTMLButtonElement::formControlType() const { switch (m_type) { case SUBMIT: { - DEFINE_STATIC_LOCAL(const AtomicString, submit, ("submit", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, submit, ("submit")); return submit; } case BUTTON: { - DEFINE_STATIC_LOCAL(const AtomicString, button, ("button", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, button, ("button")); return button; } case RESET: { - DEFINE_STATIC_LOCAL(const AtomicString, reset, ("reset", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, reset, ("reset")); return reset; } } diff --git a/Source/WebCore/html/HTMLDetailsElement.cpp b/Source/WebCore/html/HTMLDetailsElement.cpp index ce53ce1cc..86a7b48ca 100644 --- a/Source/WebCore/html/HTMLDetailsElement.cpp +++ b/Source/WebCore/html/HTMLDetailsElement.cpp @@ -39,7 +39,7 @@ using namespace HTMLNames; static const AtomicString& summaryQuerySelector() { - DEFINE_STATIC_LOCAL(AtomicString, selector, ("summary:first-of-type", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, selector, ("summary:first-of-type")); return selector; }; diff --git a/Source/WebCore/html/HTMLFieldSetElement.cpp b/Source/WebCore/html/HTMLFieldSetElement.cpp index 73ff537cd..6b01019be 100644 --- a/Source/WebCore/html/HTMLFieldSetElement.cpp +++ b/Source/WebCore/html/HTMLFieldSetElement.cpp @@ -79,7 +79,7 @@ bool HTMLFieldSetElement::supportsFocus() const const AtomicString& HTMLFieldSetElement::formControlType() const { - DEFINE_STATIC_LOCAL(const AtomicString, fieldset, ("fieldset", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, fieldset, ("fieldset")); return fieldset; } diff --git a/Source/WebCore/html/HTMLKeygenElement.cpp b/Source/WebCore/html/HTMLKeygenElement.cpp index 7436496a2..cfe2d8e49 100644 --- a/Source/WebCore/html/HTMLKeygenElement.cpp +++ b/Source/WebCore/html/HTMLKeygenElement.cpp @@ -52,7 +52,7 @@ public: virtual const AtomicString& shadowPseudoId() const { - DEFINE_STATIC_LOCAL(AtomicString, pseudoId, ("-webkit-keygen-select", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, pseudoId, ("-webkit-keygen-select")); return pseudoId; } @@ -120,7 +120,7 @@ bool HTMLKeygenElement::appendFormData(FormDataList& encoded_values, bool) const AtomicString& HTMLKeygenElement::formControlType() const { - DEFINE_STATIC_LOCAL(const AtomicString, keygen, ("keygen", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, keygen, ("keygen")); return keygen; } diff --git a/Source/WebCore/html/HTMLOptGroupElement.cpp b/Source/WebCore/html/HTMLOptGroupElement.cpp index c5e526f54..c95b1ff41 100644 --- a/Source/WebCore/html/HTMLOptGroupElement.cpp +++ b/Source/WebCore/html/HTMLOptGroupElement.cpp @@ -68,7 +68,7 @@ bool HTMLOptGroupElement::isFocusable() const const AtomicString& HTMLOptGroupElement::formControlType() const { - DEFINE_STATIC_LOCAL(const AtomicString, optgroup, ("optgroup", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, optgroup, ("optgroup")); return optgroup; } diff --git a/Source/WebCore/html/HTMLOutputElement.cpp b/Source/WebCore/html/HTMLOutputElement.cpp index 277fe5aa7..5432c92f1 100644 --- a/Source/WebCore/html/HTMLOutputElement.cpp +++ b/Source/WebCore/html/HTMLOutputElement.cpp @@ -52,7 +52,7 @@ PassRefPtr<HTMLOutputElement> HTMLOutputElement::create(const QualifiedName& tag const AtomicString& HTMLOutputElement::formControlType() const { - DEFINE_STATIC_LOCAL(const AtomicString, output, ("output", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, output, ("output")); return output; } diff --git a/Source/WebCore/html/HTMLSelectElement.cpp b/Source/WebCore/html/HTMLSelectElement.cpp index 1ceae8c18..9583dae5f 100644 --- a/Source/WebCore/html/HTMLSelectElement.cpp +++ b/Source/WebCore/html/HTMLSelectElement.cpp @@ -90,8 +90,8 @@ PassRefPtr<HTMLSelectElement> HTMLSelectElement::create(const QualifiedName& tag const AtomicString& HTMLSelectElement::formControlType() const { - DEFINE_STATIC_LOCAL(const AtomicString, selectMultiple, ("select-multiple", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(const AtomicString, selectOne, ("select-one", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, selectMultiple, ("select-multiple")); + DEFINE_STATIC_LOCAL(const AtomicString, selectOne, ("select-one")); return m_multiple ? selectMultiple : selectOne; } diff --git a/Source/WebCore/html/HTMLTextAreaElement.cpp b/Source/WebCore/html/HTMLTextAreaElement.cpp index 0585e914e..c8c2ae972 100644 --- a/Source/WebCore/html/HTMLTextAreaElement.cpp +++ b/Source/WebCore/html/HTMLTextAreaElement.cpp @@ -111,7 +111,7 @@ void HTMLTextAreaElement::createShadowSubtree() const AtomicString& HTMLTextAreaElement::formControlType() const { - DEFINE_STATIC_LOCAL(const AtomicString, textarea, ("textarea", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, textarea, ("textarea")); return textarea; } diff --git a/Source/WebCore/html/HTMLTextFormControlElement.cpp b/Source/WebCore/html/HTMLTextFormControlElement.cpp index a2f952a53..d52a82571 100644 --- a/Source/WebCore/html/HTMLTextFormControlElement.cpp +++ b/Source/WebCore/html/HTMLTextFormControlElement.cpp @@ -394,9 +394,9 @@ int HTMLTextFormControlElement::computeSelectionEnd() const static const AtomicString& directionString(TextFieldSelectionDirection direction) { - DEFINE_STATIC_LOCAL(const AtomicString, none, ("none", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(const AtomicString, forward, ("forward", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(const AtomicString, backward, ("backward", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, none, ("none")); + DEFINE_STATIC_LOCAL(const AtomicString, forward, ("forward")); + DEFINE_STATIC_LOCAL(const AtomicString, backward, ("backward")); switch (direction) { case SelectionHasNoDirection: diff --git a/Source/WebCore/html/parser/HTMLEntityParser.cpp b/Source/WebCore/html/parser/HTMLEntityParser.cpp index 72f91cb78..18718054b 100644 --- a/Source/WebCore/html/parser/HTMLEntityParser.cpp +++ b/Source/WebCore/html/parser/HTMLEntityParser.cpp @@ -28,7 +28,7 @@ #include "config.h" #include "HTMLEntityParser.h" -#include "CharacterReferenceParserInlines.h" +#include "CharacterReferenceParserInlineMethods.h" #include "HTMLEntitySearch.h" #include "HTMLEntityTable.h" #include <wtf/text/StringBuilder.h> diff --git a/Source/WebCore/html/parser/HTMLTokenizer.cpp b/Source/WebCore/html/parser/HTMLTokenizer.cpp index c3856780e..4ffd319c0 100644 --- a/Source/WebCore/html/parser/HTMLTokenizer.cpp +++ b/Source/WebCore/html/parser/HTMLTokenizer.cpp @@ -32,7 +32,7 @@ #include "HTMLToken.h" #include "HTMLTreeBuilder.h" #include "HTMLNames.h" -#include "MarkupTokenizerInlines.h" +#include "MarkupTokenizerInlineMethods.h" #include "NotImplemented.h" #include <wtf/ASCIICType.h> #include <wtf/CurrentTime.h> diff --git a/Source/WebCore/html/shadow/ContentSelectorQuery.cpp b/Source/WebCore/html/shadow/ContentSelectorQuery.cpp index dbe5a8e95..0a6ec32ee 100644 --- a/Source/WebCore/html/shadow/ContentSelectorQuery.cpp +++ b/Source/WebCore/html/shadow/ContentSelectorQuery.cpp @@ -27,6 +27,7 @@ #include "config.h" #include "ContentSelectorQuery.h" +#include "CSSParser.h" #include "CSSSelectorList.h" #include "InsertionPoint.h" #include "SelectorChecker.h" @@ -64,12 +65,26 @@ bool ContentSelectorDataList::matches(const ContentSelectorChecker& selectorChec return false; } -ContentSelectorQuery::ContentSelectorQuery(InsertionPoint* insertionPoint) +ContentSelectorQuery::ContentSelectorQuery(const InsertionPoint* insertionPoint) : m_insertionPoint(insertionPoint) , m_selectorChecker(insertionPoint->document(), !insertionPoint->document()->inQuirksMode()) { - if (insertionPoint->isSelectValid()) - m_selectors.initialize(insertionPoint->selectorList()); + if (insertionPoint->select().isNull() || insertionPoint->select().isEmpty()) { + m_isValidSelector = true; + return; + } + + CSSParser parser(insertionPoint->document()); + parser.parseSelector(insertionPoint->select(), m_selectorList); + + m_isValidSelector = ContentSelectorQuery::validateSelectorList(); + if (m_isValidSelector) + m_selectors.initialize(m_selectorList); +} + +bool ContentSelectorQuery::isValidSelector() const +{ + return m_isValidSelector; } bool ContentSelectorQuery::matches(const Vector<RefPtr<Node> >& siblings, int nth) const @@ -80,7 +95,7 @@ bool ContentSelectorQuery::matches(const Vector<RefPtr<Node> >& siblings, int nt if (m_insertionPoint->select().isNull() || m_insertionPoint->select().isEmpty()) return true; - if (!m_insertionPoint->isSelectValid()) + if (!m_isValidSelector) return false; if (!node->isElementNode()) @@ -89,4 +104,85 @@ bool ContentSelectorQuery::matches(const Vector<RefPtr<Node> >& siblings, int nt return m_selectors.matches(m_selectorChecker, siblings, nth); } +static bool validateSubSelector(CSSSelector* selector) +{ + switch (selector->m_match) { + case CSSSelector::None: + case CSSSelector::Id: + case CSSSelector::Class: + case CSSSelector::Exact: + case CSSSelector::Set: + case CSSSelector::List: + case CSSSelector::Hyphen: + case CSSSelector::Contain: + case CSSSelector::Begin: + case CSSSelector::End: + return true; + case CSSSelector::PseudoElement: + return false; + case CSSSelector::PagePseudoClass: + case CSSSelector::PseudoClass: + break; + } + + switch (selector->pseudoType()) { + case CSSSelector::PseudoEmpty: + case CSSSelector::PseudoLink: + case CSSSelector::PseudoVisited: + case CSSSelector::PseudoTarget: + case CSSSelector::PseudoEnabled: + case CSSSelector::PseudoDisabled: + case CSSSelector::PseudoChecked: + case CSSSelector::PseudoIndeterminate: + case CSSSelector::PseudoNthChild: + case CSSSelector::PseudoNthLastChild: + case CSSSelector::PseudoNthOfType: + case CSSSelector::PseudoNthLastOfType: + case CSSSelector::PseudoFirstChild: + case CSSSelector::PseudoLastChild: + case CSSSelector::PseudoFirstOfType: + case CSSSelector::PseudoLastOfType: + case CSSSelector::PseudoOnlyOfType: + return true; + default: + return false; + } +} + +static bool validateSelector(CSSSelector* selector) +{ + ASSERT(selector); + + if (!validateSubSelector(selector)) + return false; + + CSSSelector* prevSubSelector = selector; + CSSSelector* subSelector = selector->tagHistory(); + + while (subSelector) { + if (prevSubSelector->relation() != CSSSelector::SubSelector) + return false; + if (!validateSubSelector(subSelector)) + return false; + + prevSubSelector = subSelector; + subSelector = subSelector->tagHistory(); + } + + return true; +} + +bool ContentSelectorQuery::validateSelectorList() +{ + if (!m_selectorList.first()) + return false; + + for (CSSSelector* selector = m_selectorList.first(); selector; selector = m_selectorList.next(selector)) { + if (!validateSelector(selector)) + return false; + } + + return true; +} + } diff --git a/Source/WebCore/html/shadow/ContentSelectorQuery.h b/Source/WebCore/html/shadow/ContentSelectorQuery.h index 78a082454..2c710a585 100644 --- a/Source/WebCore/html/shadow/ContentSelectorQuery.h +++ b/Source/WebCore/html/shadow/ContentSelectorQuery.h @@ -64,14 +64,18 @@ private: class ContentSelectorQuery { WTF_MAKE_NONCOPYABLE(ContentSelectorQuery); public: - explicit ContentSelectorQuery(InsertionPoint*); + explicit ContentSelectorQuery(const InsertionPoint*); + bool isValidSelector() const; bool matches(const Vector<RefPtr<Node> >& siblings, int nthNode) const; private: + bool validateSelectorList(); - InsertionPoint* m_insertionPoint; + const InsertionPoint* m_insertionPoint; ContentSelectorDataList m_selectors; + CSSSelectorList m_selectorList; ContentSelectorChecker m_selectorChecker; + bool m_isValidSelector; }; } diff --git a/Source/WebCore/html/shadow/DateTimeFieldElements.cpp b/Source/WebCore/html/shadow/DateTimeFieldElements.cpp index 84dc52da3..b5c9ef1e6 100644 --- a/Source/WebCore/html/shadow/DateTimeFieldElements.cpp +++ b/Source/WebCore/html/shadow/DateTimeFieldElements.cpp @@ -42,7 +42,7 @@ DateTimeAMPMFieldElement::DateTimeAMPMFieldElement(Document* document, FieldOwne PassRefPtr<DateTimeAMPMFieldElement> DateTimeAMPMFieldElement::create(Document* document, FieldOwner& fieldOwner, const Vector<String>& ampmLabels) { - DEFINE_STATIC_LOCAL(AtomicString, ampmPsuedoId, ("-webkit-datetime-edit-ampm-field", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, ampmPsuedoId, ("-webkit-datetime-edit-ampm-field")); RefPtr<DateTimeAMPMFieldElement> field = adoptRef(new DateTimeAMPMFieldElement(document, fieldOwner, ampmLabels)); field->initialize(ampmPsuedoId, AXAMPMFieldText()); return field.release(); @@ -78,7 +78,7 @@ DateTimeDayFieldElement::DateTimeDayFieldElement(Document* document, FieldOwner& PassRefPtr<DateTimeDayFieldElement> DateTimeDayFieldElement::create(Document* document, FieldOwner& fieldOwner, const String& placeholder) { - DEFINE_STATIC_LOCAL(AtomicString, dayPsuedoId, ("-webkit-datetime-edit-day-field", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, dayPsuedoId, ("-webkit-datetime-edit-day-field")); RefPtr<DateTimeDayFieldElement> field = adoptRef(new DateTimeDayFieldElement(document, fieldOwner, placeholder.isEmpty() ? ASCIILiteral("--") : placeholder)); field->initialize(dayPsuedoId, AXDayOfMonthFieldText()); return field.release(); @@ -121,7 +121,7 @@ DateTimeHourFieldElement::DateTimeHourFieldElement(Document* document, FieldOwne PassRefPtr<DateTimeHourFieldElement> DateTimeHourFieldElement::create(Document* document, FieldOwner& fieldOwner, int minimum, int maximum) { - DEFINE_STATIC_LOCAL(AtomicString, hourPsuedoId, ("-webkit-datetime-edit-hour-field", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, hourPsuedoId, ("-webkit-datetime-edit-hour-field")); RefPtr<DateTimeHourFieldElement> field = adoptRef(new DateTimeHourFieldElement(document, fieldOwner, minimum, maximum)); field->initialize(hourPsuedoId, AXHourFieldText()); return field.release(); @@ -224,7 +224,7 @@ DateTimeMillisecondFieldElement::DateTimeMillisecondFieldElement(Document* docum PassRefPtr<DateTimeMillisecondFieldElement> DateTimeMillisecondFieldElement::create(Document* document, FieldOwner& fieldOwner) { - DEFINE_STATIC_LOCAL(AtomicString, millisecondPsuedoId, ("-webkit-datetime-edit-millisecond-field", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, millisecondPsuedoId, ("-webkit-datetime-edit-millisecond-field")); RefPtr<DateTimeMillisecondFieldElement> field = adoptRef(new DateTimeMillisecondFieldElement(document, fieldOwner)); field->initialize(millisecondPsuedoId, AXMillisecondFieldText()); return field.release(); @@ -265,7 +265,7 @@ DateTimeMinuteFieldElement::DateTimeMinuteFieldElement(Document* document, Field PassRefPtr<DateTimeMinuteFieldElement> DateTimeMinuteFieldElement::create(Document* document, FieldOwner& fieldOwner) { - DEFINE_STATIC_LOCAL(AtomicString, minutePsuedoId, ("-webkit-datetime-edit-minute-field", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, minutePsuedoId, ("-webkit-datetime-edit-minute-field")); RefPtr<DateTimeMinuteFieldElement> field = adoptRef(new DateTimeMinuteFieldElement(document, fieldOwner)); field->initialize(minutePsuedoId, AXMinuteFieldText()); return field.release(); @@ -306,7 +306,7 @@ DateTimeMonthFieldElement::DateTimeMonthFieldElement(Document* document, FieldOw PassRefPtr<DateTimeMonthFieldElement> DateTimeMonthFieldElement::create(Document* document, FieldOwner& fieldOwner, const String& placeholder) { - DEFINE_STATIC_LOCAL(AtomicString, monthPsuedoId, ("-webkit-datetime-edit-month-field", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, monthPsuedoId, ("-webkit-datetime-edit-month-field")); RefPtr<DateTimeMonthFieldElement> field = adoptRef(new DateTimeMonthFieldElement(document, fieldOwner, placeholder.isEmpty() ? ASCIILiteral("--") : placeholder)); field->initialize(monthPsuedoId, AXMonthFieldText()); return field.release(); @@ -347,7 +347,7 @@ DateTimeSecondFieldElement::DateTimeSecondFieldElement(Document* document, Field PassRefPtr<DateTimeSecondFieldElement> DateTimeSecondFieldElement::create(Document* document, FieldOwner& fieldOwner) { - DEFINE_STATIC_LOCAL(AtomicString, secondPsuedoId, ("-webkit-datetime-edit-second-field", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, secondPsuedoId, ("-webkit-datetime-edit-second-field")); RefPtr<DateTimeSecondFieldElement> field = adoptRef(new DateTimeSecondFieldElement(document, fieldOwner)); field->initialize(secondPsuedoId, AXSecondFieldText()); return field.release(); @@ -388,7 +388,7 @@ DateTimeSymbolicMonthFieldElement::DateTimeSymbolicMonthFieldElement(Document* d PassRefPtr<DateTimeSymbolicMonthFieldElement> DateTimeSymbolicMonthFieldElement::create(Document* document, FieldOwner& fieldOwner, const Vector<String>& labels) { - DEFINE_STATIC_LOCAL(AtomicString, monthPsuedoId, ("-webkit-datetime-edit-month-field", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, monthPsuedoId, ("-webkit-datetime-edit-month-field")); RefPtr<DateTimeSymbolicMonthFieldElement> field = adoptRef(new DateTimeSymbolicMonthFieldElement(document, fieldOwner, labels)); field->initialize(monthPsuedoId, AXMonthFieldText()); return field.release(); @@ -432,7 +432,7 @@ DateTimeWeekFieldElement::DateTimeWeekFieldElement(Document* document, FieldOwne PassRefPtr<DateTimeWeekFieldElement> DateTimeWeekFieldElement::create(Document* document, FieldOwner& fieldOwner) { - DEFINE_STATIC_LOCAL(AtomicString, weekPsuedoId, ("-webkit-datetime-edit-week-field", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, weekPsuedoId, ("-webkit-datetime-edit-week-field")); RefPtr<DateTimeWeekFieldElement> field = adoptRef(new DateTimeWeekFieldElement(document, fieldOwner)); field->initialize(weekPsuedoId, AXWeekOfYearFieldText()); return field.release(); @@ -477,7 +477,7 @@ DateTimeYearFieldElement::DateTimeYearFieldElement(Document* document, FieldOwne PassRefPtr<DateTimeYearFieldElement> DateTimeYearFieldElement::create(Document* document, FieldOwner& fieldOwner, const DateTimeYearFieldElement::Parameters& parameters) { - DEFINE_STATIC_LOCAL(AtomicString, yearPsuedoId, ("-webkit-datetime-edit-year-field", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, yearPsuedoId, ("-webkit-datetime-edit-year-field")); RefPtr<DateTimeYearFieldElement> field = adoptRef(new DateTimeYearFieldElement(document, fieldOwner, parameters)); field->initialize(yearPsuedoId, AXYearFieldText()); return field.release(); diff --git a/Source/WebCore/html/shadow/DetailsMarkerControl.cpp b/Source/WebCore/html/shadow/DetailsMarkerControl.cpp index 7b83b7ba8..b109ef8eb 100644 --- a/Source/WebCore/html/shadow/DetailsMarkerControl.cpp +++ b/Source/WebCore/html/shadow/DetailsMarkerControl.cpp @@ -57,7 +57,7 @@ bool DetailsMarkerControl::rendererIsNeeded(const NodeRenderingContext& context) const AtomicString& DetailsMarkerControl::shadowPseudoId() const { - DEFINE_STATIC_LOCAL(AtomicString, pseudId, ("-webkit-details-marker", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, pseudId, ("-webkit-details-marker")); return pseudId; } diff --git a/Source/WebCore/html/shadow/HTMLContentElement.cpp b/Source/WebCore/html/shadow/HTMLContentElement.cpp index 71489f9f3..c0b9bba80 100644 --- a/Source/WebCore/html/shadow/HTMLContentElement.cpp +++ b/Source/WebCore/html/shadow/HTMLContentElement.cpp @@ -27,7 +27,6 @@ #include "config.h" #include "HTMLContentElement.h" -#include "CSSParser.h" #include "ContentDistributor.h" #include "ContentSelectorQuery.h" #include "ElementShadow.h" @@ -65,8 +64,6 @@ PassRefPtr<HTMLContentElement> HTMLContentElement::create(const QualifiedName& t HTMLContentElement::HTMLContentElement(const QualifiedName& name, Document* document) : InsertionPoint(name, document) , m_registeredWithShadowRoot(false) - , m_shouldParseSelectorList(false) - , m_isValidSelector(true) { } @@ -79,23 +76,15 @@ const AtomicString& HTMLContentElement::select() const return getAttribute(selectAttr); } -bool HTMLContentElement::isSelectValid() +bool HTMLContentElement::isSelectValid() const { - ensureSelectParsed(); - return m_isValidSelector; + ContentSelectorQuery query(this); + return query.isValidSelector(); } -void HTMLContentElement::ensureSelectParsed() +void HTMLContentElement::setSelect(const AtomicString& selectValue) { - if (!m_shouldParseSelectorList) - return; - - CSSParser parser(document()); - parser.parseSelector(select(), m_selectorList); - m_shouldParseSelectorList = false; - m_isValidSelector = validateSelect(); - if (!m_isValidSelector) - m_selectorList = CSSSelectorList(); + setAttribute(selectAttr, selectValue); } void HTMLContentElement::parseAttribute(const Attribute& attribute) @@ -103,7 +92,6 @@ void HTMLContentElement::parseAttribute(const Attribute& attribute) if (attribute.name() == selectAttr) { if (ShadowRoot* root = shadowRoot()) root->owner()->invalidateDistribution(); - m_shouldParseSelectorList = true; } else InsertionPoint::parseAttribute(attribute); } @@ -133,91 +121,4 @@ void HTMLContentElement::removedFrom(ContainerNode* insertionPoint) InsertionPoint::removedFrom(insertionPoint); } -static bool validateSubSelector(CSSSelector* selector) -{ - switch (selector->m_match) { - case CSSSelector::None: - case CSSSelector::Id: - case CSSSelector::Class: - case CSSSelector::Exact: - case CSSSelector::Set: - case CSSSelector::List: - case CSSSelector::Hyphen: - case CSSSelector::Contain: - case CSSSelector::Begin: - case CSSSelector::End: - return true; - case CSSSelector::PseudoElement: - return false; - case CSSSelector::PagePseudoClass: - case CSSSelector::PseudoClass: - break; - } - - switch (selector->pseudoType()) { - case CSSSelector::PseudoEmpty: - case CSSSelector::PseudoLink: - case CSSSelector::PseudoVisited: - case CSSSelector::PseudoTarget: - case CSSSelector::PseudoEnabled: - case CSSSelector::PseudoDisabled: - case CSSSelector::PseudoChecked: - case CSSSelector::PseudoIndeterminate: - case CSSSelector::PseudoNthChild: - case CSSSelector::PseudoNthLastChild: - case CSSSelector::PseudoNthOfType: - case CSSSelector::PseudoNthLastOfType: - case CSSSelector::PseudoFirstChild: - case CSSSelector::PseudoLastChild: - case CSSSelector::PseudoFirstOfType: - case CSSSelector::PseudoLastOfType: - case CSSSelector::PseudoOnlyOfType: - return true; - default: - return false; - } -} - -static bool validateSelector(CSSSelector* selector) -{ - ASSERT(selector); - - if (!validateSubSelector(selector)) - return false; - - CSSSelector* prevSubSelector = selector; - CSSSelector* subSelector = selector->tagHistory(); - - while (subSelector) { - if (prevSubSelector->relation() != CSSSelector::SubSelector) - return false; - if (!validateSubSelector(subSelector)) - return false; - - prevSubSelector = subSelector; - subSelector = subSelector->tagHistory(); - } - - return true; -} - -bool HTMLContentElement::validateSelect() const -{ - ASSERT(!m_shouldParseSelectorList); - - if (select().isNull() || select().isEmpty()) - return true; - - if (!m_selectorList.first()) - return false; - - for (CSSSelector* selector = m_selectorList.first(); selector; selector = m_selectorList.next(selector)) { - if (!validateSelector(selector)) - return false; - } - - return true; -} - - } diff --git a/Source/WebCore/html/shadow/HTMLContentElement.h b/Source/WebCore/html/shadow/HTMLContentElement.h index 04254e12b..2a3a32cea 100644 --- a/Source/WebCore/html/shadow/HTMLContentElement.h +++ b/Source/WebCore/html/shadow/HTMLContentElement.h @@ -31,7 +31,6 @@ #ifndef HTMLContentElement_h #define HTMLContentElement_h -#include "CSSSelectorList.h" #include "InsertionPoint.h" #include <wtf/Forward.h> @@ -45,10 +44,9 @@ public: virtual ~HTMLContentElement(); + const AtomicString& select() const; void setSelect(const AtomicString&); - virtual const AtomicString& select() const; - virtual bool isSelectValid(); - virtual const CSSSelectorList& selectorList(); + virtual bool isSelectValid() const; protected: HTMLContentElement(const QualifiedName&, Document*); @@ -58,28 +56,10 @@ protected: private: virtual void parseAttribute(const Attribute&) OVERRIDE; - void ensureSelectParsed(); - bool validateSelect() const; bool m_registeredWithShadowRoot; - - bool m_shouldParseSelectorList; - bool m_isValidSelector; - CSSSelectorList m_selectorList; }; -inline void HTMLContentElement::setSelect(const AtomicString& selectValue) -{ - setAttribute(HTMLNames::selectAttr, selectValue); - m_shouldParseSelectorList = true; -} - -inline const CSSSelectorList& HTMLContentElement::selectorList() -{ - ensureSelectParsed(); - return m_selectorList; -} - inline bool isHTMLContentElement(const Node* node) { ASSERT(node); diff --git a/Source/WebCore/html/shadow/HTMLShadowElement.cpp b/Source/WebCore/html/shadow/HTMLShadowElement.cpp index da18ba8ea..7d7e41529 100644 --- a/Source/WebCore/html/shadow/HTMLShadowElement.cpp +++ b/Source/WebCore/html/shadow/HTMLShadowElement.cpp @@ -87,10 +87,4 @@ void HTMLShadowElement::removedFrom(ContainerNode* insertionPoint) InsertionPoint::removedFrom(insertionPoint); } -const CSSSelectorList& HTMLShadowElement::emptySelectorList() -{ - DEFINE_STATIC_LOCAL(CSSSelectorList, selectorList, (CSSSelectorList())); - return selectorList; -} - } // namespace WebCore diff --git a/Source/WebCore/html/shadow/HTMLShadowElement.h b/Source/WebCore/html/shadow/HTMLShadowElement.h index 87059896f..bac2b92b5 100644 --- a/Source/WebCore/html/shadow/HTMLShadowElement.h +++ b/Source/WebCore/html/shadow/HTMLShadowElement.h @@ -42,9 +42,8 @@ public: virtual ~HTMLShadowElement(); - virtual const AtomicString& select() const; - virtual bool isSelectValid() OVERRIDE { return true; } - virtual const CSSSelectorList& selectorList() { return emptySelectorList(); } + const AtomicString& select() const; + bool isSelectValid() const OVERRIDE { return true; } protected: virtual InsertionNotificationRequest insertedInto(ContainerNode*) OVERRIDE; @@ -53,8 +52,6 @@ protected: private: HTMLShadowElement(const QualifiedName&, Document*); - static const CSSSelectorList& emptySelectorList(); - bool m_registeredWithShadowRoot; }; diff --git a/Source/WebCore/html/shadow/ImageInnerElement.cpp b/Source/WebCore/html/shadow/ImageInnerElement.cpp index 839cc9203..b23d6b1a5 100644 --- a/Source/WebCore/html/shadow/ImageInnerElement.cpp +++ b/Source/WebCore/html/shadow/ImageInnerElement.cpp @@ -70,7 +70,7 @@ RenderObject* ImageInnerElement::createRenderer(RenderArena* arena, RenderStyle* const AtomicString& ImageInnerElement::shadowPseudoId() const { - DEFINE_STATIC_LOCAL(AtomicString, pseudoId, ("-webkit-image-inner-element", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, pseudoId, ("-webkit-image-inner-element")); return pseudoId; } diff --git a/Source/WebCore/html/shadow/InsertionPoint.h b/Source/WebCore/html/shadow/InsertionPoint.h index 23dad8dca..243a08c18 100644 --- a/Source/WebCore/html/shadow/InsertionPoint.h +++ b/Source/WebCore/html/shadow/InsertionPoint.h @@ -31,7 +31,6 @@ #ifndef InsertionPoint_h #define InsertionPoint_h -#include "CSSSelectorList.h" #include "ContentDistributor.h" #include "ElementShadow.h" #include "HTMLElement.h" @@ -54,8 +53,7 @@ public: PassRefPtr<NodeList> getDistributedNodes() const; virtual const AtomicString& select() const = 0; - virtual bool isSelectValid() = 0; - virtual const CSSSelectorList& selectorList() = 0; + virtual bool isSelectValid() const = 0; bool resetStyleInheritance() const; void setResetStyleInheritance(bool); diff --git a/Source/WebCore/html/shadow/MediaControlElements.cpp b/Source/WebCore/html/shadow/MediaControlElements.cpp index 0bbf763a8..906466013 100644 --- a/Source/WebCore/html/shadow/MediaControlElements.cpp +++ b/Source/WebCore/html/shadow/MediaControlElements.cpp @@ -138,7 +138,7 @@ MediaControlElementType MediaControlPanelElement::displayType() const const AtomicString& MediaControlPanelElement::shadowPseudoId() const { - DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-panel", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-panel")); return id; } @@ -334,7 +334,7 @@ MediaControlElementType MediaControlTimelineContainerElement::displayType() cons const AtomicString& MediaControlTimelineContainerElement::shadowPseudoId() const { - DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-timeline-container", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-timeline-container")); return id; } @@ -410,7 +410,7 @@ MediaControlElementType MediaControlVolumeSliderContainerElement::displayType() const AtomicString& MediaControlVolumeSliderContainerElement::shadowPseudoId() const { - DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-volume-slider-container", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-volume-slider-container")); return id; } @@ -471,7 +471,7 @@ MediaControlElementType MediaControlStatusDisplayElement::displayType() const const AtomicString& MediaControlStatusDisplayElement::shadowPseudoId() const { - DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-status-display", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-status-display")); return id; } @@ -560,7 +560,7 @@ void MediaControlPanelMuteButtonElement::defaultEventHandler(Event* event) const AtomicString& MediaControlPanelMuteButtonElement::shadowPseudoId() const { - DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-mute-button", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-mute-button")); return id; } @@ -581,7 +581,7 @@ PassRefPtr<MediaControlVolumeSliderMuteButtonElement> MediaControlVolumeSliderMu const AtomicString& MediaControlVolumeSliderMuteButtonElement::shadowPseudoId() const { - DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-volume-slider-mute-button", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-volume-slider-mute-button")); return id; } @@ -620,7 +620,7 @@ void MediaControlPlayButtonElement::updateDisplayType() const AtomicString& MediaControlPlayButtonElement::shadowPseudoId() const { - DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-play-button", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-play-button")); return id; } @@ -660,7 +660,7 @@ void MediaControlOverlayPlayButtonElement::updateDisplayType() const AtomicString& MediaControlOverlayPlayButtonElement::shadowPseudoId() const { - DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-overlay-play-button", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-overlay-play-button")); return id; } @@ -762,7 +762,7 @@ PassRefPtr<MediaControlSeekForwardButtonElement> MediaControlSeekForwardButtonEl const AtomicString& MediaControlSeekForwardButtonElement::shadowPseudoId() const { - DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-seek-forward-button", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-seek-forward-button")); return id; } @@ -783,7 +783,7 @@ PassRefPtr<MediaControlSeekBackButtonElement> MediaControlSeekBackButtonElement: const AtomicString& MediaControlSeekBackButtonElement::shadowPseudoId() const { - DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-seek-back-button", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-seek-back-button")); return id; } @@ -814,7 +814,7 @@ void MediaControlRewindButtonElement::defaultEventHandler(Event* event) const AtomicString& MediaControlRewindButtonElement::shadowPseudoId() const { - DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-rewind-button", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-rewind-button")); return id; } @@ -845,7 +845,7 @@ void MediaControlReturnToRealtimeButtonElement::defaultEventHandler(Event* event const AtomicString& MediaControlReturnToRealtimeButtonElement::shadowPseudoId() const { - DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-return-to-realtime-button", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-return-to-realtime-button")); return id; } @@ -884,7 +884,7 @@ void MediaControlToggleClosedCaptionsButtonElement::updateDisplayType() const AtomicString& MediaControlToggleClosedCaptionsButtonElement::shadowPseudoId() const { - DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-toggle-closed-captions-button", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-toggle-closed-captions-button")); return id; } @@ -959,7 +959,7 @@ void MediaControlTimelineElement::setDuration(float duration) const AtomicString& MediaControlTimelineElement::shadowPseudoId() const { - DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-timeline", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-timeline")); return id; } @@ -1034,7 +1034,7 @@ void MediaControlVolumeSliderElement::setClearMutedOnUserInteraction(bool clearM const AtomicString& MediaControlVolumeSliderElement::shadowPseudoId() const { - DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-volume-slider", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-volume-slider")); return id; } @@ -1057,7 +1057,7 @@ PassRefPtr<MediaControlFullscreenVolumeSliderElement> MediaControlFullscreenVolu const AtomicString& MediaControlFullscreenVolumeSliderElement::shadowPseudoId() const { - DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-fullscreen-volume-slider", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-fullscreen-volume-slider")); return id; } @@ -1103,7 +1103,7 @@ void MediaControlFullscreenButtonElement::defaultEventHandler(Event* event) const AtomicString& MediaControlFullscreenButtonElement::shadowPseudoId() const { - DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-fullscreen-button", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-fullscreen-button")); return id; } @@ -1139,7 +1139,7 @@ void MediaControlFullscreenVolumeMinButtonElement::defaultEventHandler(Event* ev const AtomicString& MediaControlFullscreenVolumeMinButtonElement::shadowPseudoId() const { - DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-fullscreen-volume-min-button", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-fullscreen-volume-min-button")); return id; } @@ -1170,7 +1170,7 @@ void MediaControlFullscreenVolumeMaxButtonElement::defaultEventHandler(Event* ev const AtomicString& MediaControlFullscreenVolumeMaxButtonElement::shadowPseudoId() const { - DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-fullscreen-volume-max-button", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-fullscreen-volume-max-button")); return id; } @@ -1239,7 +1239,7 @@ MediaControlElementType MediaControlTimeRemainingDisplayElement::displayType() c const AtomicString& MediaControlTimeRemainingDisplayElement::shadowPseudoId() const { - DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-time-remaining-display", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-time-remaining-display")); return id; } @@ -1262,7 +1262,7 @@ MediaControlElementType MediaControlCurrentTimeDisplayElement::displayType() con const AtomicString& MediaControlCurrentTimeDisplayElement::shadowPseudoId() const { - DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-current-time-display", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-current-time-display")); return id; } @@ -1315,7 +1315,7 @@ RenderObject* MediaControlTextTrackContainerElement::createRenderer(RenderArena* const AtomicString& MediaControlTextTrackContainerElement::shadowPseudoId() const { - DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-text-track-container", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-text-track-container")); return id; } diff --git a/Source/WebCore/html/shadow/MediaControlRootElement.cpp b/Source/WebCore/html/shadow/MediaControlRootElement.cpp index 22a018fd9..ef541baa3 100644 --- a/Source/WebCore/html/shadow/MediaControlRootElement.cpp +++ b/Source/WebCore/html/shadow/MediaControlRootElement.cpp @@ -656,7 +656,7 @@ void MediaControlRootElement::updateTextTrackDisplay() const AtomicString& MediaControlRootElement::shadowPseudoId() const { - DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls")); return id; } diff --git a/Source/WebCore/html/shadow/MediaControlRootElementChromium.cpp b/Source/WebCore/html/shadow/MediaControlRootElementChromium.cpp index 82d8f9260..6b3913bb6 100644 --- a/Source/WebCore/html/shadow/MediaControlRootElementChromium.cpp +++ b/Source/WebCore/html/shadow/MediaControlRootElementChromium.cpp @@ -71,7 +71,7 @@ PassRefPtr<MediaControlPanelEnclosureElement> MediaControlPanelEnclosureElement: const AtomicString& MediaControlPanelEnclosureElement::shadowPseudoId() const { - DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-enclosure", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-enclosure")); return id; } @@ -519,7 +519,7 @@ void MediaControlRootElementChromium::updateTextTrackDisplay() const AtomicString& MediaControlRootElementChromium::shadowPseudoId() const { - DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls")); return id; } diff --git a/Source/WebCore/html/shadow/MediaControlRootElementChromiumAndroid.cpp b/Source/WebCore/html/shadow/MediaControlRootElementChromiumAndroid.cpp index dfe848dc8..45634a847 100644 --- a/Source/WebCore/html/shadow/MediaControlRootElementChromiumAndroid.cpp +++ b/Source/WebCore/html/shadow/MediaControlRootElementChromiumAndroid.cpp @@ -44,7 +44,7 @@ PassRefPtr<MediaControlOverlayEnclosureElement> MediaControlOverlayEnclosureElem const AtomicString& MediaControlOverlayEnclosureElement::shadowPseudoId() const { - DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-overlay-enclosure", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-overlay-enclosure")); return id; } diff --git a/Source/WebCore/html/shadow/MeterShadowElement.cpp b/Source/WebCore/html/shadow/MeterShadowElement.cpp index 3c48b5f2b..441f01397 100644 --- a/Source/WebCore/html/shadow/MeterShadowElement.cpp +++ b/Source/WebCore/html/shadow/MeterShadowElement.cpp @@ -81,21 +81,21 @@ RenderObject* MeterInnerElement::createRenderer(RenderArena* arena, RenderStyle* const AtomicString& MeterInnerElement::shadowPseudoId() const { - DEFINE_STATIC_LOCAL(AtomicString, pseudId, ("-webkit-meter-inner-element", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, pseudId, ("-webkit-meter-inner-element")); return pseudId; } const AtomicString& MeterBarElement::shadowPseudoId() const { - DEFINE_STATIC_LOCAL(AtomicString, pseudId, ("-webkit-meter-bar", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, pseudId, ("-webkit-meter-bar")); return pseudId; } const AtomicString& MeterValueElement::shadowPseudoId() const { - DEFINE_STATIC_LOCAL(AtomicString, optimumPseudId, ("-webkit-meter-optimum-value", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(AtomicString, suboptimumPseudId, ("-webkit-meter-suboptimum-value", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(AtomicString, evenLessGoodPseudId, ("-webkit-meter-even-less-good-value", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, optimumPseudId, ("-webkit-meter-optimum-value")); + DEFINE_STATIC_LOCAL(AtomicString, suboptimumPseudId, ("-webkit-meter-suboptimum-value")); + DEFINE_STATIC_LOCAL(AtomicString, evenLessGoodPseudId, ("-webkit-meter-even-less-good-value")); HTMLMeterElement* meter = meterElement(); if (!meter) diff --git a/Source/WebCore/html/shadow/ProgressShadowElement.cpp b/Source/WebCore/html/shadow/ProgressShadowElement.cpp index fdfae05f0..465d5ba8f 100644 --- a/Source/WebCore/html/shadow/ProgressShadowElement.cpp +++ b/Source/WebCore/html/shadow/ProgressShadowElement.cpp @@ -68,7 +68,7 @@ PassRefPtr<ProgressInnerElement> ProgressInnerElement::create(Document* document const AtomicString& ProgressInnerElement::shadowPseudoId() const { - DEFINE_STATIC_LOCAL(AtomicString, pseudId, ("-webkit-progress-inner-element", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, pseudId, ("-webkit-progress-inner-element")); return pseudId; } @@ -88,14 +88,14 @@ bool ProgressInnerElement::rendererIsNeeded(const NodeRenderingContext& context) const AtomicString& ProgressBarElement::shadowPseudoId() const { - DEFINE_STATIC_LOCAL(AtomicString, pseudId, ("-webkit-progress-bar", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, pseudId, ("-webkit-progress-bar")); return pseudId; } const AtomicString& ProgressValueElement::shadowPseudoId() const { - DEFINE_STATIC_LOCAL(AtomicString, pseudId, ("-webkit-progress-value", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, pseudId, ("-webkit-progress-value")); return pseudId; } diff --git a/Source/WebCore/html/shadow/SliderThumbElement.cpp b/Source/WebCore/html/shadow/SliderThumbElement.cpp index 8dc0fd2eb..5e53eced1 100644 --- a/Source/WebCore/html/shadow/SliderThumbElement.cpp +++ b/Source/WebCore/html/shadow/SliderThumbElement.cpp @@ -400,13 +400,13 @@ HTMLInputElement* SliderThumbElement::hostInput() const static const AtomicString& sliderThumbShadowPseudoId() { - DEFINE_STATIC_LOCAL(const AtomicString, sliderThumb, ("-webkit-slider-thumb", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, sliderThumb, ("-webkit-slider-thumb")); return sliderThumb; } static const AtomicString& mediaSliderThumbShadowPseudoId() { - DEFINE_STATIC_LOCAL(const AtomicString, mediaSliderThumb, ("-webkit-media-slider-thumb", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, mediaSliderThumb, ("-webkit-media-slider-thumb")); return mediaSliderThumb; } @@ -501,8 +501,8 @@ RenderObject* SliderContainerElement::createRenderer(RenderArena* arena, RenderS const AtomicString& SliderContainerElement::shadowPseudoId() const { - DEFINE_STATIC_LOCAL(const AtomicString, mediaSliderContainer, ("-webkit-media-slider-container", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(const AtomicString, sliderContainer, ("-webkit-slider-container", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, mediaSliderContainer, ("-webkit-media-slider-container")); + DEFINE_STATIC_LOCAL(const AtomicString, sliderContainer, ("-webkit-slider-container")); HTMLInputElement* input = shadowHost()->toInputElement(); if (!input) diff --git a/Source/WebCore/html/shadow/SpinButtonElement.cpp b/Source/WebCore/html/shadow/SpinButtonElement.cpp index e9b0eec66..99dd71947 100644 --- a/Source/WebCore/html/shadow/SpinButtonElement.cpp +++ b/Source/WebCore/html/shadow/SpinButtonElement.cpp @@ -57,7 +57,7 @@ PassRefPtr<SpinButtonElement> SpinButtonElement::create(Document* document, Spin const AtomicString& SpinButtonElement::shadowPseudoId() const { - DEFINE_STATIC_LOCAL(AtomicString, innerPseudoId, ("-webkit-inner-spin-button", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, innerPseudoId, ("-webkit-inner-spin-button")); return innerPseudoId; } diff --git a/Source/WebCore/html/shadow/TextControlInnerElements.cpp b/Source/WebCore/html/shadow/TextControlInnerElements.cpp index c79c5b881..6a565b300 100644 --- a/Source/WebCore/html/shadow/TextControlInnerElements.cpp +++ b/Source/WebCore/html/shadow/TextControlInnerElements.cpp @@ -124,9 +124,9 @@ PassRefPtr<SearchFieldResultsButtonElement> SearchFieldResultsButtonElement::cre const AtomicString& SearchFieldResultsButtonElement::shadowPseudoId() const { - DEFINE_STATIC_LOCAL(AtomicString, resultsId, ("-webkit-search-results-button", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(AtomicString, resultsDecorationId, ("-webkit-search-results-decoration", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(AtomicString, decorationId, ("-webkit-search-decoration", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, resultsId, ("-webkit-search-results-button")); + DEFINE_STATIC_LOCAL(AtomicString, resultsDecorationId, ("-webkit-search-results-decoration")); + DEFINE_STATIC_LOCAL(AtomicString, decorationId, ("-webkit-search-decoration")); Element* host = shadowHost(); if (!host) return resultsId; @@ -179,7 +179,7 @@ PassRefPtr<SearchFieldCancelButtonElement> SearchFieldCancelButtonElement::creat const AtomicString& SearchFieldCancelButtonElement::shadowPseudoId() const { - DEFINE_STATIC_LOCAL(AtomicString, pseudoId, ("-webkit-search-cancel-button", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, pseudoId, ("-webkit-search-cancel-button")); return pseudoId; } @@ -438,7 +438,7 @@ void InputFieldSpeechButtonElement::stopSpeechInput() const AtomicString& InputFieldSpeechButtonElement::shadowPseudoId() const { - DEFINE_STATIC_LOCAL(AtomicString, pseudoId, ("-webkit-input-speech-button", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, pseudoId, ("-webkit-input-speech-button")); return pseudoId; } diff --git a/Source/WebCore/html/track/TextTrackCue.cpp b/Source/WebCore/html/track/TextTrackCue.cpp index 39d02e52f..29a393ff7 100644 --- a/Source/WebCore/html/track/TextTrackCue.cpp +++ b/Source/WebCore/html/track/TextTrackCue.cpp @@ -95,7 +95,6 @@ TextTrackCueBox::TextTrackCueBox(Document* document, TextTrackCue* cue) : HTMLElement(divTag, document) , m_cue(cue) { - setPseudo(textTrackCueBoxShadowPseudoId()); } TextTrackCue* TextTrackCueBox::getCue() const @@ -170,10 +169,15 @@ void TextTrackCueBox::applyCSSProperties() const AtomicString& TextTrackCueBox::textTrackCueBoxShadowPseudoId() { - DEFINE_STATIC_LOCAL(const AtomicString, trackDisplayBoxShadowPseudoId, ("-webkit-media-text-track-display", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, trackDisplayBoxShadowPseudoId, ("-webkit-media-text-track-display")); return trackDisplayBoxShadowPseudoId; } +const AtomicString& TextTrackCueBox::shadowPseudoId() const +{ + return textTrackCueBoxShadowPseudoId(); +} + RenderObject* TextTrackCueBox::createRenderer(RenderArena* arena, RenderStyle*) { return new (arena) RenderTextTrackCue(this); diff --git a/Source/WebCore/html/track/TextTrackCue.h b/Source/WebCore/html/track/TextTrackCue.h index 5b8e3f131..01a0e6603 100644 --- a/Source/WebCore/html/track/TextTrackCue.h +++ b/Source/WebCore/html/track/TextTrackCue.h @@ -59,6 +59,7 @@ public: TextTrackCue* getCue() const; void applyCSSProperties(); + virtual const AtomicString& shadowPseudoId() const OVERRIDE; static const AtomicString& textTrackCueBoxShadowPseudoId(); private: diff --git a/Source/WebCore/html/track/WebVTTTokenizer.cpp b/Source/WebCore/html/track/WebVTTTokenizer.cpp index 3b3f38ace..4d2d8b300 100644 --- a/Source/WebCore/html/track/WebVTTTokenizer.cpp +++ b/Source/WebCore/html/track/WebVTTTokenizer.cpp @@ -34,7 +34,7 @@ #include "WebVTTTokenizer.h" -#include "MarkupTokenizerInlines.h" +#include "MarkupTokenizerInlineMethods.h" namespace WebCore { diff --git a/Source/WebCore/inspector/InspectorTimelineAgent.cpp b/Source/WebCore/inspector/InspectorTimelineAgent.cpp index e12101010..aad827ef7 100644 --- a/Source/WebCore/inspector/InspectorTimelineAgent.cpp +++ b/Source/WebCore/inspector/InspectorTimelineAgent.cpp @@ -398,8 +398,19 @@ void InspectorTimelineAgent::didScheduleResourceRequest(const String& url, Frame void InspectorTimelineAgent::willSendResourceRequest(unsigned long identifier, const ResourceRequest& request, Frame* frame) { + pushGCEventRecords(); + RefPtr<InspectorObject> recordRaw = TimelineRecordFactory::createGenericRecord(timestamp(), m_maxCallStackDepth); String requestId = IdentifiersFactory::requestId(identifier); - appendRecord(TimelineRecordFactory::createResourceSendRequestData(requestId, request), TimelineRecordType::ResourceSendRequest, true, frame); + recordRaw->setObject("data", TimelineRecordFactory::createResourceSendRequestData(requestId, request)); + recordRaw->setString("type", TimelineRecordType::ResourceSendRequest); + if (frame && m_pageAgent) { + String frameId(m_pageAgent->frameId(frame)); + recordRaw->setString("frameId", frameId); + } + setHeapSizeStatistics(recordRaw.get()); + // FIXME: runtimeCast is a hack. We do it because we can't build TimelineEvent directly now. + RefPtr<TypeBuilder::Timeline::TimelineEvent> record = TypeBuilder::Timeline::TimelineEvent::runtimeCast(recordRaw.release()); + m_frontend->eventRecorded(record.release()); } void InspectorTimelineAgent::willReceiveResourceData(unsigned long identifier, Frame* frame, int length) diff --git a/Source/WebCore/inspector/front-end/CodeMirrorTextEditor.js b/Source/WebCore/inspector/front-end/CodeMirrorTextEditor.js index ff61bdbf0..7af304679 100644 --- a/Source/WebCore/inspector/front-end/CodeMirrorTextEditor.js +++ b/Source/WebCore/inspector/front-end/CodeMirrorTextEditor.js @@ -54,9 +54,8 @@ WebInspector.CodeMirrorTextEditor = function(url, delegate) lineNumbers: true, gutters: ["CodeMirror-linenumbers", "breakpoints"] }); - - this._codeMirror.on("change", this._change.bind(this)); - this._codeMirror.on("gutterClick", this._gutterClick.bind(this)); + CodeMirror.on(this._codeMirror, "change", this._change.bind(this)); + CodeMirror.on(this._codeMirror, "gutterClick", this._gutterClick.bind(this)); this._lastRange = this.range(); @@ -118,7 +117,8 @@ WebInspector.CodeMirrorTextEditor.prototype = { revealLine: function(lineNumber) { this._codeMirror.setCursor({ line: lineNumber, ch: 0 }); - this._codeMirror.scrollIntoView(); + var coords = this._codeMirror.cursorCoords(); + this._codeMirror.scrollTo(coords.x, coords.y); }, _gutterClick: function(instance, lineNumber, gutter, event) @@ -276,8 +276,8 @@ WebInspector.CodeMirrorTextEditor.prototype = { */ selection: function(textRange) { - var start = this._codeMirror.getCursor(true); - var end = this._codeMirror.getCursor(false); + var start = this._codeMirror.cursorCoords(true); + var end = this._codeMirror.cursorCoords(false); if (start.line > end.line || (start.line == end.line && start.ch > end.ch)) return this._toRange(end, start); diff --git a/Source/WebCore/inspector/front-end/NativeMemorySnapshotView.js b/Source/WebCore/inspector/front-end/NativeMemorySnapshotView.js index 8f1b01872..8a5cf157e 100644 --- a/Source/WebCore/inspector/front-end/NativeMemorySnapshotView.js +++ b/Source/WebCore/inspector/front-end/NativeMemorySnapshotView.js @@ -314,7 +314,7 @@ WebInspector.MemoryBlockViewProperties._initialize = function() } addBlock("hsl( 0, 0%, 60%)", "ProcessPrivateMemory", "Total"); addBlock("hsl( 0, 0%, 80%)", "OwnersTypePlaceholder", "OwnersTypePlaceholder"); - addBlock("hsl( 0, 0%, 60%)", "Other", "Other"); + addBlock("hsl( 0, 0%, 80%)", "Other", "Other"); addBlock("hsl(220, 80%, 70%)", "Page", "Page structures"); addBlock("hsl(100, 60%, 50%)", "JSHeap", "JavaScript heap"); addBlock("hsl( 90, 40%, 80%)", "JSExternalResources", "JavaScript external resources"); diff --git a/Source/WebCore/inspector/front-end/TimelinePresentationModel.js b/Source/WebCore/inspector/front-end/TimelinePresentationModel.js index cce0c3ad3..ceb271fa6 100644 --- a/Source/WebCore/inspector/front-end/TimelinePresentationModel.js +++ b/Source/WebCore/inspector/front-end/TimelinePresentationModel.js @@ -368,9 +368,6 @@ WebInspector.TimelinePresentationModel.prototype = { case recordTypes.ResourceReceivedData: return this._sendRequestRecords[record.data["requestId"]]; - case recordTypes.ResourceSendRequest: - return this._rootRecord; - case recordTypes.TimerFire: return this._timerRecords[record.data["timerId"]]; diff --git a/Source/WebCore/loader/CrossOriginAccessControl.cpp b/Source/WebCore/loader/CrossOriginAccessControl.cpp index 23c6e1cc7..9b26fc86c 100644 --- a/Source/WebCore/loader/CrossOriginAccessControl.cpp +++ b/Source/WebCore/loader/CrossOriginAccessControl.cpp @@ -134,8 +134,8 @@ ResourceRequest createAccessControlPreflightRequest(const ResourceRequest& reque bool passesAccessControlCheck(const ResourceResponse& response, StoredCredentials includeCredentials, SecurityOrigin* securityOrigin, String& errorDescription) { - AtomicallyInitializedStatic(AtomicString&, accessControlAllowOrigin = *new AtomicString("access-control-allow-origin", AtomicString::ConstructFromLiteral)); - AtomicallyInitializedStatic(AtomicString&, accessControlAllowCredentials = *new AtomicString("access-control-allow-credentials", AtomicString::ConstructFromLiteral)); + AtomicallyInitializedStatic(AtomicString&, accessControlAllowOrigin = *new AtomicString("access-control-allow-origin")); + AtomicallyInitializedStatic(AtomicString&, accessControlAllowCredentials = *new AtomicString("access-control-allow-credentials")); // A wildcard Access-Control-Allow-Origin can not be used if credentials are to be sent, // even with Access-Control-Allow-Credentials set to true. diff --git a/Source/WebCore/loader/DocumentLoader.cpp b/Source/WebCore/loader/DocumentLoader.cpp index 218db822f..950cdccdb 100644 --- a/Source/WebCore/loader/DocumentLoader.cpp +++ b/Source/WebCore/loader/DocumentLoader.cpp @@ -714,7 +714,6 @@ void DocumentLoader::addResponse(const ResourceResponse& r) void DocumentLoader::stopRecordingResponses() { m_stopRecordingResponses = true; - m_responses.shrinkToFit(); } void DocumentLoader::setTitle(const StringWithDirection& title) diff --git a/Source/WebCore/loader/MainResourceLoader.cpp b/Source/WebCore/loader/MainResourceLoader.cpp index 1b113a0d3..805cd15ab 100644 --- a/Source/WebCore/loader/MainResourceLoader.cpp +++ b/Source/WebCore/loader/MainResourceLoader.cpp @@ -368,8 +368,7 @@ void MainResourceLoader::didReceiveResponse(const ResourceResponse& r) if (documentLoader()->applicationCacheHost()->maybeLoadFallbackForMainResponse(request(), r)) return; - DEFINE_STATIC_LOCAL(AtomicString, xFrameOptionHeader, ("x-frame-options", AtomicString::ConstructFromLiteral)); - HTTPHeaderMap::const_iterator it = r.httpHeaderFields().find(xFrameOptionHeader); + HTTPHeaderMap::const_iterator it = r.httpHeaderFields().find(AtomicString("x-frame-options")); if (it != r.httpHeaderFields().end()) { String content = it->value; if (m_frame->loader()->shouldInterruptLoadForXFrameOptions(content, r.url(), identifier())) { diff --git a/Source/WebCore/loader/PrerendererClient.cpp b/Source/WebCore/loader/PrerendererClient.cpp index dad289c51..f8c298928 100644 --- a/Source/WebCore/loader/PrerendererClient.cpp +++ b/Source/WebCore/loader/PrerendererClient.cpp @@ -43,7 +43,7 @@ namespace WebCore { // static const AtomicString& PrerendererClient::supplementName() { - DEFINE_STATIC_LOCAL(AtomicString, name, ("PrerendererClient", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, name, ("PrerendererClient")); return name; } diff --git a/Source/WebCore/loader/ResourceBuffer.h b/Source/WebCore/loader/ResourceBuffer.h index b809a4355..6dc2dc7fc 100644 --- a/Source/WebCore/loader/ResourceBuffer.h +++ b/Source/WebCore/loader/ResourceBuffer.h @@ -48,10 +48,10 @@ public: static PassRefPtr<ResourceBuffer> create(const char* data, int size) { return adoptRef(new ResourceBuffer(data, size)); } static PassRefPtr<ResourceBuffer> adoptSharedBuffer(PassRefPtr<SharedBuffer> shared) { return shared ? adoptRef(new ResourceBuffer(shared)) : 0; } - virtual ~ResourceBuffer(); + ~ResourceBuffer(); - virtual const char* data() const; - virtual unsigned size() const; + const char* data() const; + unsigned size() const; bool isEmpty() const; void append(const char*, unsigned); @@ -79,13 +79,11 @@ public: void reportMemoryUsage(MemoryObjectInfo*) const; -protected: - ResourceBuffer(); - private: + ResourceBuffer(); ResourceBuffer(const char*, int); ResourceBuffer(PassRefPtr<SharedBuffer>); - + RefPtr<SharedBuffer> m_sharedBuffer; }; diff --git a/Source/WebCore/loader/cache/CachedResource.cpp b/Source/WebCore/loader/cache/CachedResource.cpp index 109b76bcc..ca3fe1363 100644 --- a/Source/WebCore/loader/cache/CachedResource.cpp +++ b/Source/WebCore/loader/cache/CachedResource.cpp @@ -710,7 +710,7 @@ void CachedResource::updateResponseAfterRevalidation(const ResourceResponse& val { m_responseTimestamp = currentTime(); - DEFINE_STATIC_LOCAL(const AtomicString, contentHeaderPrefix, ("content-", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, contentHeaderPrefix, ("content-")); // RFC2616 10.3.5 // Update cached headers from the 304 response const HTTPHeaderMap& newHeaders = validatingResponse.httpHeaderFields(); diff --git a/Source/WebCore/page/DOMWindowPagePopup.cpp b/Source/WebCore/page/DOMWindowPagePopup.cpp index b9fc7ca69..86076dab6 100644 --- a/Source/WebCore/page/DOMWindowPagePopup.cpp +++ b/Source/WebCore/page/DOMWindowPagePopup.cpp @@ -50,7 +50,7 @@ DOMWindowPagePopup::~DOMWindowPagePopup() const AtomicString& DOMWindowPagePopup::supplementName() { - DEFINE_STATIC_LOCAL(AtomicString, name, ("DOMWindowPagePopup", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, name, ("DOMWindowPagePopup")); return name; } diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp index 07e1b73ab..92055a123 100644 --- a/Source/WebCore/page/EventHandler.cpp +++ b/Source/WebCore/page/EventHandler.cpp @@ -1985,7 +1985,7 @@ bool EventHandler::handlePasteGlobalSelection(const PlatformMouseEvent& mouseEve Frame* focusFrame = m_frame->page()->focusController()->focusedOrMainFrame(); // Do not paste here if the focus was moved somewhere else. if (m_frame == focusFrame && m_frame->editor()->client()->supportsGlobalSelection()) - return m_frame->editor()->command(ASCIILiteral("PasteGlobalSelection")).execute(); + return m_frame->editor()->command(AtomicString("PasteGlobalSelection")).execute(); return false; } @@ -3112,10 +3112,10 @@ bool EventHandler::keyEvent(const PlatformKeyboardEvent& initialKeyEvent) static FocusDirection focusDirectionForKey(const AtomicString& keyIdentifier) { - DEFINE_STATIC_LOCAL(AtomicString, Down, ("Down", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(AtomicString, Up, ("Up", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(AtomicString, Left, ("Left", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(AtomicString, Right, ("Right", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, Down, ("Down")); + DEFINE_STATIC_LOCAL(AtomicString, Up, ("Up")); + DEFINE_STATIC_LOCAL(AtomicString, Left, ("Left")); + DEFINE_STATIC_LOCAL(AtomicString, Right, ("Right")); FocusDirection retVal = FocusDirectionNone; diff --git a/Source/WebCore/page/FrameView.cpp b/Source/WebCore/page/FrameView.cpp index 768d5d256..6acd1087f 100644 --- a/Source/WebCore/page/FrameView.cpp +++ b/Source/WebCore/page/FrameView.cpp @@ -1465,14 +1465,45 @@ void FrameView::removeViewportConstrainedObject(RenderObject* object) } } +static int fixedPositionScrollOffset(int scrollPosition, int maxValue, int scrollOrigin, float dragFactor) +{ + if (!maxValue) + return 0; + + if (!scrollOrigin) { + if (scrollPosition < 0) + scrollPosition = 0; + else if (scrollPosition > maxValue) + scrollPosition = maxValue; + } else { + if (scrollPosition > 0) + scrollPosition = 0; + else if (scrollPosition < -maxValue) + scrollPosition = -maxValue; + } + + return scrollPosition * dragFactor; +} + IntSize FrameView::scrollOffsetForFixedPosition() const { IntRect visibleContentRect = this->visibleContentRect(); IntSize contentsSize = this->contentsSize(); IntPoint scrollPosition = this->scrollPosition(); IntPoint scrollOrigin = this->scrollOrigin(); + + IntSize maxOffset(contentsSize.width() - visibleContentRect.width(), contentsSize.height() - visibleContentRect.height()); + float frameScaleFactor = m_frame ? m_frame->frameScaleFactor() : 1; - return WebCore::scrollOffsetForFixedPosition(visibleContentRect, contentsSize, scrollPosition, scrollOrigin, frameScaleFactor, fixedElementsLayoutRelativeToFrame()); + + FloatSize dragFactor = fixedElementsLayoutRelativeToFrame() ? FloatSize(1, 1) : FloatSize( + (contentsSize.width() - visibleContentRect.width() * frameScaleFactor) / maxOffset.width(), + (contentsSize.height() - visibleContentRect.height() * frameScaleFactor) / maxOffset.height()); + + int x = fixedPositionScrollOffset(scrollPosition.x(), maxOffset.width(), scrollOrigin.x(), dragFactor.width() / frameScaleFactor); + int y = fixedPositionScrollOffset(scrollPosition.y(), maxOffset.height(), scrollOrigin.y(), dragFactor.height() / frameScaleFactor); + + return IntSize(x, y); } bool FrameView::fixedElementsLayoutRelativeToFrame() const diff --git a/Source/WebCore/page/SpeechInput.cpp b/Source/WebCore/page/SpeechInput.cpp index cb4a21f2d..8328c5d4d 100644 --- a/Source/WebCore/page/SpeechInput.cpp +++ b/Source/WebCore/page/SpeechInput.cpp @@ -119,7 +119,7 @@ void SpeechInput::cancelRecognition(int listenerId) const AtomicString& SpeechInput::supplementName() { - DEFINE_STATIC_LOCAL(AtomicString, name, ("SpeechInput", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, name, ("SpeechInput")); return name; } diff --git a/Source/WebCore/page/animation/CompositeAnimation.cpp b/Source/WebCore/page/animation/CompositeAnimation.cpp index 1bb5059e6..0b0f379d5 100644 --- a/Source/WebCore/page/animation/CompositeAnimation.cpp +++ b/Source/WebCore/page/animation/CompositeAnimation.cpp @@ -218,7 +218,7 @@ void CompositeAnimation::updateKeyframeAnimations(RenderObject* renderer, Render // Toss the animation order map. m_keyframeAnimationOrderMap.clear(); - DEFINE_STATIC_LOCAL(const AtomicString, none, ("none", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, none, ("none")); // Now mark any still active animations as active and add any new animations. if (targetStyle->animations()) { diff --git a/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp b/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp index 4d373cb4c..cb79f3d4d 100644 --- a/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp +++ b/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp @@ -65,40 +65,6 @@ PassRefPtr<ScrollingCoordinator> ScrollingCoordinator::create(Page* page) return adoptRef(new ScrollingCoordinator(page)); } -static int fixedPositionScrollOffset(int scrollPosition, int maxValue, int scrollOrigin, float dragFactor) -{ - if (!maxValue) - return 0; - - if (!scrollOrigin) { - if (scrollPosition < 0) - scrollPosition = 0; - else if (scrollPosition > maxValue) - scrollPosition = maxValue; - } else { - if (scrollPosition > 0) - scrollPosition = 0; - else if (scrollPosition < -maxValue) - scrollPosition = -maxValue; - } - - return scrollPosition * dragFactor; -} - -IntSize scrollOffsetForFixedPosition(const IntRect& visibleContentRect, const IntSize& contentsSize, const IntPoint& scrollPosition, const IntPoint& scrollOrigin, float frameScaleFactor, bool fixedElementsLayoutRelativeToFrame) -{ - IntSize maxOffset(contentsSize.width() - visibleContentRect.width(), contentsSize.height() - visibleContentRect.height()); - - FloatSize dragFactor = fixedElementsLayoutRelativeToFrame ? FloatSize(1, 1) : FloatSize( - (contentsSize.width() - visibleContentRect.width() * frameScaleFactor) / maxOffset.width(), - (contentsSize.height() - visibleContentRect.height() * frameScaleFactor) / maxOffset.height()); - - int x = fixedPositionScrollOffset(scrollPosition.x(), maxOffset.width(), scrollOrigin.x(), dragFactor.width() / frameScaleFactor); - int y = fixedPositionScrollOffset(scrollPosition.y(), maxOffset.height(), scrollOrigin.y(), dragFactor.height() / frameScaleFactor); - - return IntSize(x, y); -} - ScrollingCoordinator::ScrollingCoordinator(Page* page) : m_page(page) , m_forceMainThreadScrollLayerPositionUpdates(false) @@ -276,9 +242,7 @@ void ScrollingCoordinator::updateMainFrameScrollPosition(const IntPoint& scrollP scrollLayer->setPosition(-frameView->scrollPosition()); else { scrollLayer->syncPosition(-frameView->scrollPosition()); - LayoutRect viewportRect = frameView->visibleContentRect(); - viewportRect.setLocation(toPoint(frameView->scrollOffsetForFixedPosition())); - syncChildPositions(viewportRect); + syncChildPositions(frameView->visibleContentRect()); } } #endif diff --git a/Source/WebCore/page/scrolling/ScrollingCoordinator.h b/Source/WebCore/page/scrolling/ScrollingCoordinator.h index e96e96f80..13591cd6c 100644 --- a/Source/WebCore/page/scrolling/ScrollingCoordinator.h +++ b/Source/WebCore/page/scrolling/ScrollingCoordinator.h @@ -62,9 +62,6 @@ class ViewportConstraints; class ScrollingTree; #endif -IntSize scrollOffsetForFixedPosition(const IntRect& visibleContentRect, const IntSize& contentsSize, const IntPoint& scrollPosition, - const IntPoint& scrollOrigin, float frameScaleFactor, bool fixedElementsLayoutRelativeToFrame); - class ScrollingCoordinator : public ThreadSafeRefCounted<ScrollingCoordinator> { public: static PassRefPtr<ScrollingCoordinator> create(Page*); diff --git a/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm b/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm index 0376159d4..bd6d7280a 100644 --- a/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm +++ b/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm @@ -279,14 +279,9 @@ void ScrollingTreeScrollingNodeMac::setScrollLayerPosition(const IntPoint& posit if (!m_children) return; - IntSize scrollOffsetForFixedChildren = WebCore::scrollOffsetForFixedPosition(viewportRect(), contentsSize(), position, - scrollOrigin(), 1, false); - IntRect viewportRect = this->viewportRect(); - viewportRect.setLocation(toPoint(scrollOffsetForFixedChildren)); - size_t size = m_children->size(); for (size_t i = 0; i < size; ++i) - m_children->at(i)->parentScrollPositionDidChange(viewportRect); + m_children->at(i)->parentScrollPositionDidChange(IntRect(position, viewportRect().size())); } IntPoint ScrollingTreeScrollingNodeMac::minimumScrollPosition() const diff --git a/Source/WebCore/platform/blackberry/CookieManager.cpp b/Source/WebCore/platform/blackberry/CookieManager.cpp index 1377658ad..f2554941b 100644 --- a/Source/WebCore/platform/blackberry/CookieManager.cpp +++ b/Source/WebCore/platform/blackberry/CookieManager.cpp @@ -118,10 +118,10 @@ static bool cookieSorter(ParsedCookie* a, ParsedCookie* b) return a->path().length() > b->path().length(); } -// Return whether we should ignore the scheme -static bool shouldIgnoreScheme(const String& protocol) +// Returns whether the protocol supports domains +static bool shouldIgnoreDomain(const String protocol) { - // We want to ignore file and local schemes + // ignore domain security for file and local return protocol == "file" || protocol == "local"; } @@ -212,9 +212,8 @@ void CookieManager::getRawCookies(Vector<ParsedCookie*> &stackOfCookies, const K { CookieLog("CookieManager - getRawCookies - processing url with domain - %s & protocol: %s & path: %s\n", requestURL.host().utf8().data(), requestURL.protocol().utf8().data(), requestURL.path().utf8().data()); - const bool invalidScheme = shouldIgnoreScheme(requestURL.protocol()); - const bool specialCaseForWebWorks = invalidScheme && m_shouldDumpAllCookies; - const bool isConnectionSecure = requestURL.protocolIs("https") || requestURL.protocolIs("wss") || specialCaseForWebWorks; + bool specialCaseForLocal = (requestURL.protocolIs("local") || requestURL.protocolIs("file")) && m_shouldDumpAllCookies; + bool isConnectionSecure = requestURL.protocolIs("https") || requestURL.protocolIs("wss") || specialCaseForLocal; Vector<ParsedCookie*> cookieCandidates; Vector<CookieMap*> protocolsToSearch; @@ -231,13 +230,8 @@ void CookieManager::getRawCookies(Vector<ParsedCookie*> &stackOfCookies, const K targetMap = m_managerMap.get("ws"); } - // Decide which scheme tree we should look at. - // Return on invalid schemes. cookies are currently disabled on file and local. - // We only want to enable them for WebWorks that enabled a special flag. - if (specialCaseForWebWorks) + if (specialCaseForLocal) copyValuesToVector(m_managerMap, protocolsToSearch); - else if (invalidScheme) - return; else { protocolsToSearch.append(targetMap); // FIXME: this is a hack for webworks apps; RFC 6265 says "Cookies do not provide isolation by scheme" @@ -270,7 +264,7 @@ void CookieManager::getRawCookies(Vector<ParsedCookie*> &stackOfCookies, const K CookieLog("CookieManager - looking at protocol map %s \n", currentMap->getName().utf8().data()); // Special case for local and files - because WebApps expect to get ALL cookies from the backing-store on local protocol - if (specialCaseForWebWorks) { + if (specialCaseForLocal) { CookieLog("CookieManager - special case find in protocol map - %s\n", currentMap->getName().utf8().data()); currentMap->getAllChildCookies(&cookieCandidates); } else { @@ -306,7 +300,7 @@ void CookieManager::getRawCookies(Vector<ParsedCookie*> &stackOfCookies, const K if (!equalIgnoringCase(path, requestURL.path()) && !path.endsWith("/", false)) path = path + "/"; - // Only secure connections have access to secure cookies. Unless specialCaseForWebWorks is true. + // Only secure connections have access to secure cookies. Unless specialCaseForLocal is true // Get the cookies filtering out HttpOnly cookies if requested. if (requestURL.path().startsWith(path, false) && (isConnectionSecure || !cookie->isSecure()) && (filter == WithHttpOnlyCookies || !cookie->isHttpOnly())) { CookieLog("CookieManager - cookie chosen - %s\n", cookie->toString().utf8().data()); @@ -340,15 +334,13 @@ void CookieManager::checkAndTreatCookie(ParsedCookie* candidateCookie, BackingSt { CookieLog("CookieManager - checkAndTreatCookie - processing url with domain - %s & protocol %s\n", candidateCookie->domain().utf8().data(), candidateCookie->protocol().utf8().data()); - // Delete invalid cookies: - // 1) A cookie which is not from http shouldn't have a httpOnly property. - // 2) Cookies coming from schemes that we do not support and the special flag isn't on - if ((filter == NoHttpOnlyCookie && candidateCookie->isHttpOnly()) || (shouldIgnoreScheme(candidateCookie->protocol()) && !m_shouldDumpAllCookies)) { + // A cookie which is not from http shouldn't have a httpOnly property. + if (filter == NoHttpOnlyCookie && candidateCookie->isHttpOnly()) { delete candidateCookie; return; } - const bool ignoreDomain = (candidateCookie->protocol() == "file" || candidateCookie->protocol() == "local"); + const bool ignoreDomain = shouldIgnoreDomain(candidateCookie->protocol()); // Determine which protocol tree to add the cookie to. Create one if necessary. CookieMap* curMap = 0; diff --git a/Source/WebCore/platform/graphics/FontCache.cpp b/Source/WebCore/platform/graphics/FontCache.cpp index a4ac7ea36..f60883ab3 100644 --- a/Source/WebCore/platform/graphics/FontCache.cpp +++ b/Source/WebCore/platform/graphics/FontCache.cpp @@ -134,8 +134,8 @@ static FontPlatformDataCache* gFontPlatformDataCache = 0; static const AtomicString& alternateFamilyName(const AtomicString& familyName) { // Alias Courier <-> Courier New - DEFINE_STATIC_LOCAL(AtomicString, courier, ("Courier", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(AtomicString, courierNew, ("Courier New", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, courier, ("Courier")); + DEFINE_STATIC_LOCAL(AtomicString, courierNew, ("Courier New")); if (equalIgnoringCase(familyName, courier)) return courierNew; #if !OS(WINDOWS) @@ -147,16 +147,16 @@ static const AtomicString& alternateFamilyName(const AtomicString& familyName) #endif // Alias Times and Times New Roman. - DEFINE_STATIC_LOCAL(AtomicString, times, ("Times", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(AtomicString, timesNewRoman, ("Times New Roman", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, times, ("Times")); + DEFINE_STATIC_LOCAL(AtomicString, timesNewRoman, ("Times New Roman")); if (equalIgnoringCase(familyName, times)) return timesNewRoman; if (equalIgnoringCase(familyName, timesNewRoman)) return times; // Alias Arial and Helvetica - DEFINE_STATIC_LOCAL(AtomicString, arial, ("Arial", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(AtomicString, helvetica, ("Helvetica", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, arial, ("Arial")); + DEFINE_STATIC_LOCAL(AtomicString, helvetica, ("Helvetica")); if (equalIgnoringCase(familyName, arial)) return helvetica; if (equalIgnoringCase(familyName, helvetica)) @@ -165,14 +165,14 @@ static const AtomicString& alternateFamilyName(const AtomicString& familyName) #if OS(WINDOWS) // On Windows, bitmap fonts are blocked altogether so that we have to // alias MS Sans Serif (bitmap font) -> Microsoft Sans Serif (truetype font) - DEFINE_STATIC_LOCAL(AtomicString, msSans, ("MS Sans Serif", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(AtomicString, microsoftSans, ("Microsoft Sans Serif", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, msSans, ("MS Sans Serif")); + DEFINE_STATIC_LOCAL(AtomicString, microsoftSans, ("Microsoft Sans Serif")); if (equalIgnoringCase(familyName, msSans)) return microsoftSans; // Alias MS Serif (bitmap) -> Times New Roman (truetype font). There's no - // 'Microsoft Sans Serif-equivalent' for Serif. - DEFINE_STATIC_LOCAL(AtomicString, msSerif, ("MS Serif", AtomicString::ConstructFromLiteral)); + // 'Microsoft Sans Serif-equivalent' for Serif. + static AtomicString msSerif("MS Serif"); if (equalIgnoringCase(familyName, msSerif)) return timesNewRoman; #endif diff --git a/Source/WebCore/platform/graphics/MediaPlayer.cpp b/Source/WebCore/platform/graphics/MediaPlayer.cpp index da93570a0..377e8dc7a 100644 --- a/Source/WebCore/platform/graphics/MediaPlayer.cpp +++ b/Source/WebCore/platform/graphics/MediaPlayer.cpp @@ -239,19 +239,19 @@ static void addMediaEngine(CreateMediaEnginePlayer constructor, MediaEngineSuppo static const AtomicString& applicationOctetStream() { - DEFINE_STATIC_LOCAL(const AtomicString, applicationOctetStream, ("application/octet-stream", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, applicationOctetStream, ("application/octet-stream")); return applicationOctetStream; } static const AtomicString& textPlain() { - DEFINE_STATIC_LOCAL(const AtomicString, textPlain, ("text/plain", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, textPlain, ("text/plain")); return textPlain; } static const AtomicString& codecs() { - DEFINE_STATIC_LOCAL(const AtomicString, codecs, ("codecs", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, codecs, ("codecs")); return codecs; } diff --git a/Source/WebCore/platform/graphics/blackberry/MediaPlayerPrivateBlackBerry.cpp b/Source/WebCore/platform/graphics/blackberry/MediaPlayerPrivateBlackBerry.cpp index cdf6006d7..431e96545 100644 --- a/Source/WebCore/platform/graphics/blackberry/MediaPlayerPrivateBlackBerry.cpp +++ b/Source/WebCore/platform/graphics/blackberry/MediaPlayerPrivateBlackBerry.cpp @@ -402,7 +402,7 @@ bool MediaPlayerPrivate::hasAvailableVideoFrame() const bool MediaPlayerPrivate::hasSingleSecurityOrigin() const { - return true; + return false; } MediaPlayer::MovieLoadType MediaPlayerPrivate::movieLoadType() const diff --git a/Source/WebCore/platform/graphics/chromium/DeferredImageDecoder.cpp b/Source/WebCore/platform/graphics/chromium/DeferredImageDecoder.cpp index 863ca127e..e9424dfc5 100644 --- a/Source/WebCore/platform/graphics/chromium/DeferredImageDecoder.cpp +++ b/Source/WebCore/platform/graphics/chromium/DeferredImageDecoder.cpp @@ -34,7 +34,6 @@ namespace WebCore { DeferredImageDecoder::DeferredImageDecoder(ImageDecoder* actualDecoder) : m_allDataReceived(false) , m_actualDecoder(adoptPtr(actualDecoder)) - , m_orientation(DefaultImageOrientation) { } @@ -73,7 +72,6 @@ ImageFrame* DeferredImageDecoder::frameBufferAtIndex(size_t index) m_size = m_actualDecoder->size(); m_filenameExtension = m_actualDecoder->filenameExtension(); - m_orientation = m_actualDecoder->orientation(); SkBitmap lazyDecodedSkBitmap = ImageDecodingStore::instanceOnMainThread()->createLazyDecodedSkBitmap(m_actualDecoder.release()); m_lazyDecodedFrame.setSkBitmap(lazyDecodedSkBitmap); @@ -155,7 +153,8 @@ unsigned DeferredImageDecoder::frameBytesAtIndex(size_t index) const ImageOrientation DeferredImageDecoder::orientation() const { - return m_actualDecoder ? m_actualDecoder->orientation() : m_orientation; + // FIXME: Make this work with deferred decoding. + return m_actualDecoder ? m_actualDecoder->orientation() : DefaultImageOrientation; } } // namespace WebCore diff --git a/Source/WebCore/platform/graphics/chromium/DeferredImageDecoder.h b/Source/WebCore/platform/graphics/chromium/DeferredImageDecoder.h index 60d8cc108..d82aec872 100644 --- a/Source/WebCore/platform/graphics/chromium/DeferredImageDecoder.h +++ b/Source/WebCore/platform/graphics/chromium/DeferredImageDecoder.h @@ -67,7 +67,6 @@ private: String m_filenameExtension; IntSize m_size; - ImageOrientation m_orientation; ImageFrame m_lazyDecodedFrame; }; diff --git a/Source/WebCore/platform/graphics/chromium/FontCacheAndroid.cpp b/Source/WebCore/platform/graphics/chromium/FontCacheAndroid.cpp index aa54dc101..eba224a83 100644 --- a/Source/WebCore/platform/graphics/chromium/FontCacheAndroid.cpp +++ b/Source/WebCore/platform/graphics/chromium/FontCacheAndroid.cpp @@ -122,9 +122,9 @@ PassRefPtr<SimpleFontData> FontCache::getSimilarFontPlatformData(const Font& fon PassRefPtr<SimpleFontData> FontCache::getLastResortFallbackFont(const FontDescription& description, ShouldRetain shouldRetain) { - DEFINE_STATIC_LOCAL(const AtomicString, serif, ("Serif", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(const AtomicString, monospace, ("Monospace", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(const AtomicString, sans, ("Sans", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, serif, ("Serif")); + DEFINE_STATIC_LOCAL(const AtomicString, monospace, ("Monospace")); + DEFINE_STATIC_LOCAL(const AtomicString, sans, ("Sans")); FontPlatformData* fontPlatformData = 0; switch (description.genericFamily()) { diff --git a/Source/WebCore/platform/graphics/filters/SourceAlpha.cpp b/Source/WebCore/platform/graphics/filters/SourceAlpha.cpp index 4cc5622f0..283501c53 100644 --- a/Source/WebCore/platform/graphics/filters/SourceAlpha.cpp +++ b/Source/WebCore/platform/graphics/filters/SourceAlpha.cpp @@ -39,7 +39,7 @@ PassRefPtr<SourceAlpha> SourceAlpha::create(Filter* filter) const AtomicString& SourceAlpha::effectName() { - DEFINE_STATIC_LOCAL(const AtomicString, s_effectName, ("SourceAlpha", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, s_effectName, ("SourceAlpha")); return s_effectName; } diff --git a/Source/WebCore/platform/graphics/filters/SourceGraphic.cpp b/Source/WebCore/platform/graphics/filters/SourceGraphic.cpp index 197d802f5..75b11ddf7 100644 --- a/Source/WebCore/platform/graphics/filters/SourceGraphic.cpp +++ b/Source/WebCore/platform/graphics/filters/SourceGraphic.cpp @@ -38,7 +38,7 @@ PassRefPtr<SourceGraphic> SourceGraphic::create(Filter* filter) const AtomicString& SourceGraphic::effectName() { - DEFINE_STATIC_LOCAL(const AtomicString, s_effectName, ("SourceGraphic", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, s_effectName, ("SourceGraphic")); return s_effectName; } diff --git a/Source/WebCore/platform/graphics/harfbuzz/ng/HarfBuzzShaper.cpp b/Source/WebCore/platform/graphics/harfbuzz/ng/HarfBuzzShaper.cpp index 91c239c0c..b7d444f08 100644 --- a/Source/WebCore/platform/graphics/harfbuzz/ng/HarfBuzzShaper.cpp +++ b/Source/WebCore/platform/graphics/harfbuzz/ng/HarfBuzzShaper.cpp @@ -72,12 +72,11 @@ static inline float harfbuzzPositionToFloat(hb_position_t value) return static_cast<float>(value) / (1 << 16); } -HarfBuzzShaper::HarfBuzzRun::HarfBuzzRun(const SimpleFontData* fontData, unsigned startIndex, unsigned numCharacters, TextDirection direction, hb_script_t script) +HarfBuzzShaper::HarfBuzzRun::HarfBuzzRun(const SimpleFontData* fontData, unsigned startIndex, unsigned numCharacters, TextDirection direction) : m_fontData(fontData) , m_startIndex(startIndex) , m_numCharacters(numCharacters) , m_direction(direction) - , m_script(script) { } @@ -231,9 +230,7 @@ bool HarfBuzzShaper::shape(GlyphBuffer* glyphBuffer) return false; m_totalWidth = 0; - // WebKit doesn't set direction when calulating widths. Leave the direction setting to - // HarfBuzz when we are calculating widths (except when directionalOverride() is set). - if (!shapeHarfBuzzRuns(glyphBuffer || m_run.directionalOverride())) + if (!shapeHarfBuzzRuns()) return false; m_totalWidth = roundf(m_totalWidth); @@ -304,8 +301,7 @@ bool HarfBuzzShaper::collectHarfBuzzRuns() currentCharacterPosition = iterator.characters(); } unsigned numCharactersOfCurrentRun = iterator.currentCharacter() - startIndexOfCurrentRun; - hb_script_t script = hb_icu_script_to_script(currentScript); - m_harfbuzzRuns.append(HarfBuzzRun::create(currentFontData, startIndexOfCurrentRun, numCharactersOfCurrentRun, m_run.direction(), script)); + m_harfbuzzRuns.append(HarfBuzzRun::create(currentFontData, startIndexOfCurrentRun, numCharactersOfCurrentRun, m_run.direction())); currentFontData = nextFontData; startIndexOfCurrentRun = iterator.currentCharacter(); } while (iterator.consume(character, clusterLength)); @@ -313,21 +309,19 @@ bool HarfBuzzShaper::collectHarfBuzzRuns() return !m_harfbuzzRuns.isEmpty(); } -bool HarfBuzzShaper::shapeHarfBuzzRuns(bool shouldSetDirection) +bool HarfBuzzShaper::shapeHarfBuzzRuns() { HarfBuzzScopedPtr<hb_buffer_t> harfbuzzBuffer(hb_buffer_create(), hb_buffer_destroy); hb_buffer_set_unicode_funcs(harfbuzzBuffer.get(), hb_icu_get_unicode_funcs()); + if (m_run.rtl() || m_run.directionalOverride()) + hb_buffer_set_direction(harfbuzzBuffer.get(), m_run.rtl() ? HB_DIRECTION_RTL : HB_DIRECTION_LTR); for (unsigned i = 0; i < m_harfbuzzRuns.size(); ++i) { unsigned runIndex = m_run.rtl() ? m_harfbuzzRuns.size() - i - 1 : i; HarfBuzzRun* currentRun = m_harfbuzzRuns[runIndex].get(); const SimpleFontData* currentFontData = currentRun->fontData(); - hb_buffer_set_script(harfbuzzBuffer.get(), currentRun->script()); - if (shouldSetDirection) - hb_buffer_set_direction(harfbuzzBuffer.get(), currentRun->rtl() ? HB_DIRECTION_RTL : HB_DIRECTION_LTR); - // This #if should be removed after all ports update harfbuzz-ng. #if PLATFORM(CHROMIUM) // Add a space as pre-context to the buffer. This prevents showing dotted-circle @@ -360,6 +354,8 @@ bool HarfBuzzShaper::shapeHarfBuzzRuns(bool shouldSetDirection) setGlyphPositionsForHarfBuzzRun(currentRun, harfbuzzBuffer.get()); hb_buffer_reset(harfbuzzBuffer.get()); + if (m_run.rtl() || m_run.directionalOverride()) + hb_buffer_set_direction(harfbuzzBuffer.get(), m_run.rtl() ? HB_DIRECTION_RTL : HB_DIRECTION_LTR); } return true; diff --git a/Source/WebCore/platform/graphics/harfbuzz/ng/HarfBuzzShaper.h b/Source/WebCore/platform/graphics/harfbuzz/ng/HarfBuzzShaper.h index 92ed1911d..c3c402ba4 100644 --- a/Source/WebCore/platform/graphics/harfbuzz/ng/HarfBuzzShaper.h +++ b/Source/WebCore/platform/graphics/harfbuzz/ng/HarfBuzzShaper.h @@ -61,9 +61,9 @@ public: private: class HarfBuzzRun { public: - static PassOwnPtr<HarfBuzzRun> create(const SimpleFontData* fontData, unsigned startIndex, unsigned numCharacters, TextDirection direction, hb_script_t script) + static PassOwnPtr<HarfBuzzRun> create(const SimpleFontData* fontData, unsigned startIndex, unsigned numCharacters, TextDirection direction) { - return adoptPtr(new HarfBuzzRun(fontData, startIndex, numCharacters, direction, script)); + return adoptPtr(new HarfBuzzRun(fontData, startIndex, numCharacters, direction)); } void applyShapeResult(hb_buffer_t*); @@ -82,18 +82,16 @@ private: FloatPoint* offsets() { return &m_offsets[0]; } uint16_t* glyphToCharacterIndexes() { return &m_glyphToCharacterIndexes[0]; } float width() { return m_width; } - bool rtl() { return m_direction == RTL; } - hb_script_t script() { return m_script; } private: - HarfBuzzRun(const SimpleFontData*, unsigned startIndex, unsigned numCharacters, TextDirection, hb_script_t); + HarfBuzzRun(const SimpleFontData*, unsigned startIndex, unsigned numCharacters, TextDirection); + bool rtl() { return m_direction == RTL; } const SimpleFontData* m_fontData; unsigned m_startIndex; size_t m_numCharacters; unsigned m_numGlyphs; TextDirection m_direction; - hb_script_t m_script; Vector<uint16_t, 256> m_glyphs; Vector<float, 256> m_advances; Vector<uint16_t, 256> m_glyphToCharacterIndexes; @@ -104,7 +102,7 @@ private: void setFontFeatures(); bool collectHarfBuzzRuns(); - bool shapeHarfBuzzRuns(bool shouldSetDirection); + bool shapeHarfBuzzRuns(); bool fillGlyphBuffer(GlyphBuffer*); void fillGlyphBufferFromHarfBuzzRun(GlyphBuffer*, HarfBuzzRun*, FloatPoint& firstOffsetOfNextRun); void setGlyphPositionsForHarfBuzzRun(HarfBuzzRun*, hb_buffer_t*); diff --git a/Source/WebCore/platform/graphics/mac/FontCacheMac.mm b/Source/WebCore/platform/graphics/mac/FontCacheMac.mm index 3fa433f3d..d1dc8162a 100644 --- a/Source/WebCore/platform/graphics/mac/FontCacheMac.mm +++ b/Source/WebCore/platform/graphics/mac/FontCacheMac.mm @@ -182,7 +182,7 @@ PassRefPtr<SimpleFontData> FontCache::getSimilarFontPlatformData(const Font& fon while (currFamily && !simpleFontData) { if (currFamily->family().length()) { static String* matchWords[3] = { new String("Arabic"), new String("Pashto"), new String("Urdu") }; - DEFINE_STATIC_LOCAL(AtomicString, geezaStr, ("Geeza Pro", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, geezaStr, ("Geeza Pro")); for (int j = 0; j < 3 && !simpleFontData; ++j) if (currFamily->family().contains(*matchWords[j], false)) simpleFontData = getCachedFontData(font.fontDescription(), geezaStr); @@ -195,7 +195,7 @@ PassRefPtr<SimpleFontData> FontCache::getSimilarFontPlatformData(const Font& fon PassRefPtr<SimpleFontData> FontCache::getLastResortFallbackFont(const FontDescription& fontDescription, ShouldRetain shouldRetain) { - DEFINE_STATIC_LOCAL(AtomicString, timesStr, ("Times", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, timesStr, ("Times")); // FIXME: Would be even better to somehow get the user's default font here. For now we'll pick // the default that the user would get without changing any prefs. @@ -207,7 +207,7 @@ PassRefPtr<SimpleFontData> FontCache::getLastResortFallbackFont(const FontDescri // the user doesn't have it, we fall back on Lucida Grande because that's // guaranteed to be there, according to Nathan Taylor. This is good enough // to avoid a crash at least. - DEFINE_STATIC_LOCAL(AtomicString, lucidaGrandeStr, ("Lucida Grande", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, lucidaGrandeStr, ("Lucida Grande")); return getCachedFontData(fontDescription, lucidaGrandeStr, false, shouldRetain); } diff --git a/Source/WebCore/platform/graphics/skia/FontCacheSkia.cpp b/Source/WebCore/platform/graphics/skia/FontCacheSkia.cpp index e59efa5d9..336abc430 100644 --- a/Source/WebCore/platform/graphics/skia/FontCacheSkia.cpp +++ b/Source/WebCore/platform/graphics/skia/FontCacheSkia.cpp @@ -95,9 +95,9 @@ PassRefPtr<SimpleFontData> FontCache::getSimilarFontPlatformData(const Font& fon PassRefPtr<SimpleFontData> FontCache::getLastResortFallbackFont(const FontDescription& description, ShouldRetain shouldRetain) { - DEFINE_STATIC_LOCAL(const AtomicString, sansStr, ("Sans", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(const AtomicString, serifStr, ("Serif", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(const AtomicString, monospaceStr, ("Monospace", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, sansStr, ("Sans")); + DEFINE_STATIC_LOCAL(const AtomicString, serifStr, ("Serif")); + DEFINE_STATIC_LOCAL(const AtomicString, monospaceStr, ("Monospace")); FontPlatformData* fontPlatformData = 0; switch (description.genericFamily()) { @@ -115,7 +115,7 @@ PassRefPtr<SimpleFontData> FontCache::getLastResortFallbackFont(const FontDescri if (!fontPlatformData) { // we should at least have Arial; this is the SkFontHost_fontconfig last resort fallback - DEFINE_STATIC_LOCAL(const AtomicString, arialStr, ("Arial", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, arialStr, ("Arial")); fontPlatformData = getCachedFontPlatformData(description, arialStr); } diff --git a/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h b/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h index 6ca6d286d..510b23f5c 100644 --- a/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h +++ b/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h @@ -72,7 +72,7 @@ public: virtual void flushCompositingState(const FloatRect&); virtual void flushCompositingStateForThisLayerOnly(); virtual void setName(const String& name); - virtual PlatformLayer* platformLayer() const { return m_contentsLayer; } + virtual PlatformLayer* platformLayer() const { return 0; } void notifyChange(TextureMapperLayer::ChangeMask); inline int changeMask() const { return m_changeMask; } @@ -84,6 +84,7 @@ public: void setAnimations(const GraphicsLayerAnimations&); TextureMapperLayer* layer() const { return m_layer.get(); } + TextureMapperPlatformLayer* contentsLayer() const { return m_contentsLayer; } bool needsDisplay() const { return m_needsDisplay; } IntRect needsDisplayRect() const { return enclosingIntRect(m_needsDisplayRect); } diff --git a/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp b/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp index fe6b6c0e1..401af8c3e 100644 --- a/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp +++ b/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp @@ -169,15 +169,11 @@ void TextureMapperLayer::paintSelf(const TextureMapperPaintOptions& options) float opacity = options.opacity; RefPtr<BitmapTexture> mask = options.mask; - if (m_backingStore) { - ASSERT(!layerRect().isEmpty()); + if (m_backingStore) m_backingStore->paintToTextureMapper(options.textureMapper, layerRect(), transform, opacity, mask.get()); - } - if (m_contentsLayer) { - ASSERT(!layerRect().isEmpty()); + if (m_contentsLayer) m_contentsLayer->paintToTextureMapper(options.textureMapper, m_state.contentsRect, transform, opacity, mask.get()); - } } int TextureMapperLayer::compareGraphicsLayersZValue(const void* a, const void* b) @@ -492,7 +488,7 @@ void TextureMapperLayer::flushCompositingStateSelf(GraphicsLayerTextureMapper* g m_state.needsDisplay = m_state.needsDisplay || graphicsLayer->needsDisplay(); if (!m_state.needsDisplay) m_state.needsDisplayRect.unite(graphicsLayer->needsDisplayRect()); - m_contentsLayer = graphicsLayer->platformLayer(); + m_contentsLayer = graphicsLayer->contentsLayer(); m_transform.setPosition(adjustedPosition()); m_transform.setAnchorPoint(m_state.anchorPoint); diff --git a/Source/WebCore/platform/graphics/win/FontCacheWin.cpp b/Source/WebCore/platform/graphics/win/FontCacheWin.cpp index 2bec62a4d..2540fae97 100644 --- a/Source/WebCore/platform/graphics/win/FontCacheWin.cpp +++ b/Source/WebCore/platform/graphics/win/FontCacheWin.cpp @@ -323,11 +323,11 @@ PassRefPtr<SimpleFontData> FontCache::getLastResortFallbackFont(const FontDescri // Sorted by most to least glyphs according to http://en.wikipedia.org/wiki/Unicode_typefaces // Start with Times New Roman also since it is the default if the user doesn't change prefs. static AtomicString fallbackFonts[] = { - AtomicString("Times New Roman", AtomicString::ConstructFromLiteral), - AtomicString("Microsoft Sans Serif", AtomicString::ConstructFromLiteral), - AtomicString("Tahoma", AtomicString::ConstructFromLiteral), - AtomicString("Lucida Sans Unicode", AtomicString::ConstructFromLiteral), - AtomicString("Arial", AtomicString::ConstructFromLiteral) + AtomicString("Times New Roman"), + AtomicString("Microsoft Sans Serif"), + AtomicString("Tahoma"), + AtomicString("Lucida Sans Unicode"), + AtomicString("Arial") }; RefPtr<SimpleFontData> simpleFont; for (size_t i = 0; i < WTF_ARRAY_LENGTH(fallbackFonts); ++i) { diff --git a/Source/WebCore/platform/graphics/wx/FontCacheWx.cpp b/Source/WebCore/platform/graphics/wx/FontCacheWx.cpp index 5e90e059a..acd1dc3e1 100644 --- a/Source/WebCore/platform/graphics/wx/FontCacheWx.cpp +++ b/Source/WebCore/platform/graphics/wx/FontCacheWx.cpp @@ -67,7 +67,7 @@ PassRefPtr<SimpleFontData> FontCache::getSimilarFontPlatformData(const Font& fon while (currFamily && !simpleFontData) { if (currFamily->family().length()) { static String* matchWords[3] = { new String("Arabic"), new String("Pashto"), new String("Urdu") }; - DEFINE_STATIC_LOCAL(AtomicString, geezaStr, ("Geeza Pro", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, geezaStr, ("Geeza Pro")); for (int j = 0; j < 3 && !simpleFontData; ++j) if (currFamily->family().contains(*matchWords[j], false)) simpleFontData = getCachedFontData(font.fontDescription(), geezaStr); diff --git a/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp b/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp index edf9db257..273afd4de 100644 --- a/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp +++ b/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp @@ -89,17 +89,6 @@ private: const LevelDBComparator* m_comparator; }; -LevelDBSnapshot::LevelDBSnapshot(LevelDBDatabase* db) - : m_db(db->m_db.get()) - , m_snapshot(m_db->GetSnapshot()) -{ -} - -LevelDBSnapshot::~LevelDBSnapshot() -{ - m_db->ReleaseSnapshot(m_snapshot); -} - LevelDBDatabase::LevelDBDatabase() { } @@ -198,12 +187,11 @@ bool LevelDBDatabase::remove(const LevelDBSlice& key) return false; } -bool LevelDBDatabase::get(const LevelDBSlice& key, Vector<char>& value, const LevelDBSnapshot* snapshot) +bool LevelDBDatabase::get(const LevelDBSlice& key, Vector<char>& value) { std::string result; leveldb::ReadOptions readOptions; readOptions.verify_checksums = true; // FIXME: Disable this if the performance impact is too great. - readOptions.snapshot = snapshot ? snapshot->m_snapshot : 0; const leveldb::Status s = m_db->Get(readOptions, makeSlice(key), &result); if (s.ok()) { @@ -305,11 +293,10 @@ LevelDBSlice IteratorImpl::value() const return makeLevelDBSlice(m_iterator->value()); } -PassOwnPtr<LevelDBIterator> LevelDBDatabase::createIterator(const LevelDBSnapshot* snapshot) +PassOwnPtr<LevelDBIterator> LevelDBDatabase::createIterator() { leveldb::ReadOptions readOptions; readOptions.verify_checksums = true; // FIXME: Disable this if the performance impact is too great. - readOptions.snapshot = snapshot ? snapshot->m_snapshot : 0; OwnPtr<leveldb::Iterator> i = adoptPtr(m_db->NewIterator(readOptions)); if (!i) // FIXME: Double check if we actually need to check this. return nullptr; diff --git a/Source/WebCore/platform/leveldb/LevelDBDatabase.h b/Source/WebCore/platform/leveldb/LevelDBDatabase.h index 2d32cd736..e80b49a24 100644 --- a/Source/WebCore/platform/leveldb/LevelDBDatabase.h +++ b/Source/WebCore/platform/leveldb/LevelDBDatabase.h @@ -37,29 +37,15 @@ namespace leveldb { class Comparator; class DB; class Env; -class Snapshot; } namespace WebCore { class LevelDBComparator; -class LevelDBDatabase; class LevelDBIterator; class LevelDBSlice; class LevelDBWriteBatch; -class LevelDBSnapshot { -private: - friend class LevelDBDatabase; - friend class LevelDBTransaction; - - explicit LevelDBSnapshot(LevelDBDatabase*); - ~LevelDBSnapshot(); - - leveldb::DB* m_db; - const leveldb::Snapshot* m_snapshot; -}; - class LevelDBDatabase { public: static PassOwnPtr<LevelDBDatabase> open(const String& fileName, const LevelDBComparator*); @@ -69,13 +55,12 @@ public: bool put(const LevelDBSlice& key, const Vector<char>& value); bool remove(const LevelDBSlice& key); - bool get(const LevelDBSlice& key, Vector<char>& value, const LevelDBSnapshot* = 0); + bool get(const LevelDBSlice& key, Vector<char>& value); bool write(LevelDBWriteBatch&); - PassOwnPtr<LevelDBIterator> createIterator(const LevelDBSnapshot* = 0); + PassOwnPtr<LevelDBIterator> createIterator(); const LevelDBComparator* comparator() const; private: - friend class LevelDBSnapshot; LevelDBDatabase(); OwnPtr<leveldb::Env> m_env; diff --git a/Source/WebCore/platform/leveldb/LevelDBTransaction.cpp b/Source/WebCore/platform/leveldb/LevelDBTransaction.cpp index fe8262a24..bf5ccbb7f 100644 --- a/Source/WebCore/platform/leveldb/LevelDBTransaction.cpp +++ b/Source/WebCore/platform/leveldb/LevelDBTransaction.cpp @@ -26,13 +26,12 @@ #include "config.h" #include "LevelDBTransaction.h" -#if ENABLE(INDEXED_DATABASE) -#if USE(LEVELDB) - #include "LevelDBDatabase.h" #include "LevelDBSlice.h" #include "LevelDBWriteBatch.h" -#include <leveldb/db.h> + +#if ENABLE(INDEXED_DATABASE) +#if USE(LEVELDB) namespace WebCore { @@ -43,7 +42,6 @@ PassRefPtr<LevelDBTransaction> LevelDBTransaction::create(LevelDBDatabase* db) LevelDBTransaction::LevelDBTransaction(LevelDBDatabase* db) : m_db(db) - , m_snapshot(db) , m_comparator(db->comparator()) , m_finished(false) { @@ -120,7 +118,7 @@ bool LevelDBTransaction::get(const LevelDBSlice& key, Vector<char>& value) return true; } - return m_db->get(key, value, &m_snapshot); + return m_db->get(key, value); } bool LevelDBTransaction::commit() @@ -259,7 +257,7 @@ LevelDBTransaction::TransactionIterator::TransactionIterator(PassRefPtr<LevelDBT : m_transaction(transaction) , m_comparator(m_transaction->m_comparator) , m_treeIterator(TreeIterator::create(m_transaction.get())) - , m_dbIterator(m_transaction->m_db->createIterator(&m_transaction->m_snapshot)) + , m_dbIterator(m_transaction->m_db->createIterator()) , m_current(0) , m_direction(kForward) , m_treeChanged(false) diff --git a/Source/WebCore/platform/leveldb/LevelDBTransaction.h b/Source/WebCore/platform/leveldb/LevelDBTransaction.h index 94236ff76..85b734ff0 100644 --- a/Source/WebCore/platform/leveldb/LevelDBTransaction.h +++ b/Source/WebCore/platform/leveldb/LevelDBTransaction.h @@ -30,7 +30,6 @@ #if USE(LEVELDB) #include "LevelDBComparator.h" -#include "LevelDBDatabase.h" #include "LevelDBIterator.h" #include "LevelDBSlice.h" #include <wtf/AVLTree.h> @@ -43,6 +42,7 @@ namespace WebCore { +class LevelDBDatabase; class LevelDBWriteBatch; using WTF::AVLTree; @@ -164,7 +164,6 @@ private: void notifyIteratorsOfTreeChange(); LevelDBDatabase* m_db; - const LevelDBSnapshot m_snapshot; const LevelDBComparator* m_comparator; TreeType m_tree; bool m_finished; diff --git a/Source/WebCore/platform/network/ResourceResponseBase.cpp b/Source/WebCore/platform/network/ResourceResponseBase.cpp index 5902e7961..48568ef6f 100644 --- a/Source/WebCore/platform/network/ResourceResponseBase.cpp +++ b/Source/WebCore/platform/network/ResourceResponseBase.cpp @@ -280,12 +280,12 @@ void ResourceResponseBase::setHTTPHeaderField(const AtomicString& name, const St { lazyInit(CommonAndUncommonFields); - DEFINE_STATIC_LOCAL(const AtomicString, ageHeader, ("age", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(const AtomicString, cacheControlHeader, ("cache-control", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(const AtomicString, dateHeader, ("date", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(const AtomicString, expiresHeader, ("expires", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(const AtomicString, lastModifiedHeader, ("last-modified", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(const AtomicString, pragmaHeader, ("pragma", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, ageHeader, ("age")); + DEFINE_STATIC_LOCAL(const AtomicString, cacheControlHeader, ("cache-control")); + DEFINE_STATIC_LOCAL(const AtomicString, dateHeader, ("date")); + DEFINE_STATIC_LOCAL(const AtomicString, expiresHeader, ("expires")); + DEFINE_STATIC_LOCAL(const AtomicString, lastModifiedHeader, ("last-modified")); + DEFINE_STATIC_LOCAL(const AtomicString, pragmaHeader, ("pragma")); if (equalIgnoringCase(name, ageHeader)) m_haveParsedAgeHeader = false; else if (equalIgnoringCase(name, cacheControlHeader) || equalIgnoringCase(name, pragmaHeader)) @@ -319,11 +319,11 @@ void ResourceResponseBase::parseCacheControlDirectives() const m_cacheControlContainsNoCache = false; m_cacheControlMaxAge = numeric_limits<double>::quiet_NaN(); - DEFINE_STATIC_LOCAL(const AtomicString, cacheControlString, ("cache-control", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(const AtomicString, noCacheDirective, ("no-cache", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(const AtomicString, noStoreDirective, ("no-store", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(const AtomicString, mustRevalidateDirective, ("must-revalidate", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(const AtomicString, maxAgeDirective, ("max-age", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, cacheControlString, ("cache-control")); + DEFINE_STATIC_LOCAL(const AtomicString, noCacheDirective, ("no-cache")); + DEFINE_STATIC_LOCAL(const AtomicString, noStoreDirective, ("no-store")); + DEFINE_STATIC_LOCAL(const AtomicString, mustRevalidateDirective, ("must-revalidate")); + DEFINE_STATIC_LOCAL(const AtomicString, maxAgeDirective, ("max-age")); String cacheControlValue = m_httpHeaderFields.get(cacheControlString); if (!cacheControlValue.isEmpty()) { @@ -357,7 +357,7 @@ void ResourceResponseBase::parseCacheControlDirectives() const // Handle Pragma: no-cache // This is deprecated and equivalent to Cache-control: no-cache // Don't bother tokenizing the value, it is not important - DEFINE_STATIC_LOCAL(const AtomicString, pragmaHeader, ("pragma", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, pragmaHeader, ("pragma")); String pragmaValue = m_httpHeaderFields.get(pragmaHeader); m_cacheControlContainsNoCache = pragmaValue.lower().contains(noCacheDirective); @@ -389,8 +389,8 @@ bool ResourceResponseBase::hasCacheValidatorFields() const { lazyInit(CommonFieldsOnly); - DEFINE_STATIC_LOCAL(const AtomicString, lastModifiedHeader, ("last-modified", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(const AtomicString, eTagHeader, ("etag", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, lastModifiedHeader, ("last-modified")); + DEFINE_STATIC_LOCAL(const AtomicString, eTagHeader, ("etag")); return !m_httpHeaderFields.get(lastModifiedHeader).isEmpty() || !m_httpHeaderFields.get(eTagHeader).isEmpty(); } @@ -421,7 +421,7 @@ double ResourceResponseBase::date() const lazyInit(CommonFieldsOnly); if (!m_haveParsedDateHeader) { - DEFINE_STATIC_LOCAL(const AtomicString, headerName, ("date", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, headerName, ("date")); m_date = parseDateValueInHeader(m_httpHeaderFields, headerName); m_haveParsedDateHeader = true; } @@ -433,7 +433,7 @@ double ResourceResponseBase::age() const lazyInit(CommonFieldsOnly); if (!m_haveParsedAgeHeader) { - DEFINE_STATIC_LOCAL(const AtomicString, headerName, ("age", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, headerName, ("age")); String headerValue = m_httpHeaderFields.get(headerName); bool ok; m_age = headerValue.toDouble(&ok); @@ -449,7 +449,7 @@ double ResourceResponseBase::expires() const lazyInit(CommonFieldsOnly); if (!m_haveParsedExpiresHeader) { - DEFINE_STATIC_LOCAL(const AtomicString, headerName, ("expires", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, headerName, ("expires")); m_expires = parseDateValueInHeader(m_httpHeaderFields, headerName); m_haveParsedExpiresHeader = true; } @@ -461,7 +461,7 @@ double ResourceResponseBase::lastModified() const lazyInit(CommonFieldsOnly); if (!m_haveParsedLastModifiedHeader) { - DEFINE_STATIC_LOCAL(const AtomicString, headerName, ("last-modified", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, headerName, ("last-modified")); m_lastModified = parseDateValueInHeader(m_httpHeaderFields, headerName); m_haveParsedLastModifiedHeader = true; } @@ -472,13 +472,13 @@ bool ResourceResponseBase::isAttachment() const { lazyInit(CommonAndUncommonFields); - DEFINE_STATIC_LOCAL(const AtomicString, headerName, ("content-disposition", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, headerName, ("content-disposition")); String value = m_httpHeaderFields.get(headerName); size_t loc = value.find(';'); if (loc != notFound) value = value.left(loc); value = value.stripWhiteSpace(); - DEFINE_STATIC_LOCAL(const AtomicString, attachmentString, ("attachment", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, attachmentString, ("attachment")); return equalIgnoringCase(value, attachmentString); } diff --git a/Source/WebCore/platform/text/enchant/TextCheckerEnchant.cpp b/Source/WebCore/platform/text/enchant/TextCheckerEnchant.cpp index f9b30df6a..28633f15f 100644 --- a/Source/WebCore/platform/text/enchant/TextCheckerEnchant.cpp +++ b/Source/WebCore/platform/text/enchant/TextCheckerEnchant.cpp @@ -72,7 +72,7 @@ void TextCheckerEnchant::checkSpellingOfString(const String& string, int& misspe misspellingLocation = -1; misspellingLength = 0; - if (!hasDictionary()) + if (m_enchantDictionaries.isEmpty()) return; size_t numberOfCharacters = string.length(); @@ -121,7 +121,7 @@ void TextCheckerEnchant::checkSpellingOfString(const String& string, int& misspe Vector<String> TextCheckerEnchant::getGuessesForWord(const String& word) { Vector<String> guesses; - if (!hasDictionary()) + if (m_enchantDictionaries.isEmpty()) return guesses; for (Vector<EnchantDict*>::const_iterator iter = m_enchantDictionaries.begin(); iter != m_enchantDictionaries.end(); ++iter) { @@ -180,7 +180,7 @@ void TextCheckerEnchant::updateSpellCheckingLanguages(const Vector<String>& lang Vector<String> TextCheckerEnchant::loadedSpellCheckingLanguages() const { Vector<String> languages; - if (!hasDictionary()) + if (m_enchantDictionaries.isEmpty()) return languages; // Get a Vector<CString> with the list of languages in use. diff --git a/Source/WebCore/platform/text/enchant/TextCheckerEnchant.h b/Source/WebCore/platform/text/enchant/TextCheckerEnchant.h index 0fe2caaa9..787f8bf5a 100644 --- a/Source/WebCore/platform/text/enchant/TextCheckerEnchant.h +++ b/Source/WebCore/platform/text/enchant/TextCheckerEnchant.h @@ -43,7 +43,6 @@ public: Vector<String> getGuessesForWord(const String&); void updateSpellCheckingLanguages(const Vector<String>& languages); Vector<String> loadedSpellCheckingLanguages() const; - bool hasDictionary() const { return !m_enchantDictionaries.isEmpty(); } Vector<String> availableSpellCheckingLanguages() const; private: diff --git a/Source/WebCore/rendering/ExclusionPolygon.cpp b/Source/WebCore/rendering/ExclusionPolygon.cpp index 21beac1ec..efb6acddb 100644 --- a/Source/WebCore/rendering/ExclusionPolygon.cpp +++ b/Source/WebCore/rendering/ExclusionPolygon.cpp @@ -190,13 +190,13 @@ static inline bool getVertexIntersectionVertices(const EdgeIntersection& interse if ((intersection.type == VertexMinY && (thisEdge.vertex1().y() < thisEdge.vertex2().y())) || (intersection.type == VertexMaxY && (thisEdge.vertex1().y() > thisEdge.vertex2().y()))) { - prevVertex = polygon.vertexAt(thisEdge.previousEdge().vertexIndex1); + prevVertex = polygon.vertexAt(thisEdge.previousEdge().vertexIndex2); thisVertex = polygon.vertexAt(thisEdge.vertexIndex1); nextVertex = polygon.vertexAt(thisEdge.vertexIndex2); } else { prevVertex = polygon.vertexAt(thisEdge.vertexIndex1); thisVertex = polygon.vertexAt(thisEdge.vertexIndex2); - nextVertex = polygon.vertexAt(thisEdge.nextEdge().vertexIndex2); + nextVertex = polygon.vertexAt(thisEdge.nextEdge().vertexIndex1); } return true; @@ -219,7 +219,7 @@ static bool compareEdgeIntersectionX(const EdgeIntersection& intersection1, cons return (x1 == x2) ? intersection1.type < intersection2.type : x1 < x2; } -void ExclusionPolygon::computeXIntersections(float y, bool isMinY, Vector<ExclusionInterval>& result) const +void ExclusionPolygon::computeXIntersections(float y, Vector<ExclusionInterval>& result) const { Vector<ExclusionPolygon::EdgeInterval> overlappingEdges; m_edgeTree.allOverlaps(ExclusionPolygon::EdgeInterval(y, y, 0), overlappingEdges); @@ -265,19 +265,19 @@ void ExclusionPolygon::computeXIntersections(float y, bool isMinY, Vector<Exclus } if (evenOddCrossing) { - bool edgeCrossing = thisIntersection.type == Normal; - if (!edgeCrossing) { + bool edgeCrossing = false; + if (thisIntersection.type == Normal || !inside || index == intersections.size() - 1) + edgeCrossing = true; + else { FloatPoint prevVertex; FloatPoint thisVertex; FloatPoint nextVertex; if (getVertexIntersectionVertices(thisIntersection, prevVertex, thisVertex, nextVertex)) { - if (nextVertex.y() == y) - edgeCrossing = (isMinY) ? prevVertex.y() > y : prevVertex.y() < y; - else if (prevVertex.y() == y) - edgeCrossing = (isMinY) ? nextVertex.y() > y : nextVertex.y() < y; + if (prevVertex.y() == y) + edgeCrossing = (thisVertex.x() > prevVertex.x()) ? nextVertex.y() > y : nextVertex.y() < y; else - edgeCrossing = true; + edgeCrossing = (nextVertex.y() != y); } } if (edgeCrossing) @@ -331,8 +331,8 @@ void ExclusionPolygon::getExcludedIntervals(float logicalTop, float logicalHeigh float y2 = maxYForLogicalLine(logicalTop, logicalHeight); Vector<ExclusionInterval> y1XIntervals, y2XIntervals; - computeXIntersections(y1, true, y1XIntervals); - computeXIntersections(y2, false, y2XIntervals); + computeXIntersections(y1, y1XIntervals); + computeXIntersections(y2, y2XIntervals); Vector<ExclusionInterval> mergedIntervals; mergeExclusionIntervals(y1XIntervals, y2XIntervals, mergedIntervals); @@ -358,8 +358,8 @@ void ExclusionPolygon::getIncludedIntervals(float logicalTop, float logicalHeigh float y2 = maxYForLogicalLine(logicalTop, logicalHeight); Vector<ExclusionInterval> y1XIntervals, y2XIntervals; - computeXIntersections(y1, true, y1XIntervals); - computeXIntersections(y2, false, y2XIntervals); + computeXIntersections(y1, y1XIntervals); + computeXIntersections(y2, y2XIntervals); Vector<ExclusionInterval> commonIntervals; intersectExclusionIntervals(y1XIntervals, y2XIntervals, commonIntervals); diff --git a/Source/WebCore/rendering/ExclusionPolygon.h b/Source/WebCore/rendering/ExclusionPolygon.h index 647eb172e..ce7a23c0d 100644 --- a/Source/WebCore/rendering/ExclusionPolygon.h +++ b/Source/WebCore/rendering/ExclusionPolygon.h @@ -68,7 +68,7 @@ public: virtual void getIncludedIntervals(float logicalTop, float logicalHeight, SegmentList&) const OVERRIDE; private: - void computeXIntersections(float y, bool isMinY, Vector<ExclusionInterval>&) const; + void computeXIntersections(float y, Vector<ExclusionInterval>&) const; void computeEdgeIntersections(float minY, float maxY, Vector<ExclusionInterval>&) const; unsigned findNextEdgeVertexIndex(unsigned vertexIndex1, bool clockwise) const; @@ -102,7 +102,7 @@ struct ExclusionPolygonEdge { const ExclusionPolygonEdge& previousEdge() const { ASSERT(polygon && polygon->numberOfEdges() > 1); - return polygon->edgeAt((edgeIndex + polygon->numberOfEdges() - 1) % polygon->numberOfEdges()); + return polygon->edgeAt((edgeIndex + polygon->numberOfEdges() - 2) % polygon->numberOfEdges()); } const ExclusionPolygonEdge& nextEdge() const diff --git a/Source/WebCore/rendering/FixedTableLayout.cpp b/Source/WebCore/rendering/FixedTableLayout.cpp index e75764ac7..2a08ad6b5 100644 --- a/Source/WebCore/rendering/FixedTableLayout.cpp +++ b/Source/WebCore/rendering/FixedTableLayout.cpp @@ -199,7 +199,7 @@ void FixedTableLayout::computePreferredLogicalWidths(LayoutUnit& minWidth, Layou // In this example, the two inner tables should be as large as the outer table. // We can achieve this effect by making the maxwidth of fixed tables with percentage // widths be infinite. - if (m_table->style()->logicalWidth().isPercent() && maxWidth < tableMaxWidth) + if (m_table->document()->inQuirksMode() && m_table->style()->logicalWidth().isPercent() && maxWidth < tableMaxWidth) maxWidth = tableMaxWidth; } diff --git a/Source/WebCore/rendering/RenderLayerCompositor.cpp b/Source/WebCore/rendering/RenderLayerCompositor.cpp index b5b456b3a..f026d02d6 100644 --- a/Source/WebCore/rendering/RenderLayerCompositor.cpp +++ b/Source/WebCore/rendering/RenderLayerCompositor.cpp @@ -2590,9 +2590,7 @@ const FixedPositionViewportConstraints RenderLayerCompositor::computeFixedViewpo ASSERT(layer->isComposited()); FrameView* frameView = m_renderView->frameView(); - LayoutRect viewportRect = frameView->visibleContentRect(); - viewportRect.setLocation(toPoint(frameView->scrollOffsetForFixedPosition())); FixedPositionViewportConstraints constraints = FixedPositionViewportConstraints(); diff --git a/Source/WebCore/rendering/RenderTextControlMultiLine.cpp b/Source/WebCore/rendering/RenderTextControlMultiLine.cpp index f40994326..92d002829 100644 --- a/Source/WebCore/rendering/RenderTextControlMultiLine.cpp +++ b/Source/WebCore/rendering/RenderTextControlMultiLine.cpp @@ -59,7 +59,7 @@ float RenderTextControlMultiLine::getAvgCharWidth(AtomicString family) // Since Lucida Grande is the default font, we want this to match the width // of Courier New, the default font for textareas in IE, Firefox and Safari Win. // 1229 is the avgCharWidth value in the OS/2 table for Courier New. - if (family == "Lucida Grande") + if (family == AtomicString("Lucida Grande")) return scaleEmToUnits(1229); return RenderTextControl::getAvgCharWidth(family); diff --git a/Source/WebCore/rendering/RenderTextControlSingleLine.cpp b/Source/WebCore/rendering/RenderTextControlSingleLine.cpp index c7f075a4b..967fb2acc 100644 --- a/Source/WebCore/rendering/RenderTextControlSingleLine.cpp +++ b/Source/WebCore/rendering/RenderTextControlSingleLine.cpp @@ -283,7 +283,7 @@ float RenderTextControlSingleLine::getAvgCharWidth(AtomicString family) // of MS Shell Dlg, the default font for textareas in Firefox, Safari Win and // IE for some encodings (in IE, the default font is encoding specific). // 901 is the avgCharWidth value in the OS/2 table for MS Shell Dlg. - if (family == "Lucida Grande") + if (family == AtomicString("Lucida Grande")) return scaleEmToUnits(901); return RenderTextControl::getAvgCharWidth(family); @@ -304,7 +304,7 @@ LayoutUnit RenderTextControlSingleLine::preferredContentWidth(float charWidth) c // of MS Shell Dlg, the default font for textareas in Firefox, Safari Win and // IE for some encodings (in IE, the default font is encoding specific). // 4027 is the (xMax - xMin) value in the "head" font table for MS Shell Dlg. - if (family == "Lucida Grande") + if (family == AtomicString("Lucida Grande")) maxCharWidth = scaleEmToUnits(4027); else if (hasValidAvgCharWidth(family)) maxCharWidth = roundf(style()->font().primaryFont()->maxCharWidth()); diff --git a/Source/WebCore/rendering/RenderThemeChromiumCommon.cpp b/Source/WebCore/rendering/RenderThemeChromiumCommon.cpp index 7b420c835..6e9079535 100644 --- a/Source/WebCore/rendering/RenderThemeChromiumCommon.cpp +++ b/Source/WebCore/rendering/RenderThemeChromiumCommon.cpp @@ -49,10 +49,8 @@ bool RenderThemeChromiumCommon::supportsDataListUI(const AtomicString& type) #if ENABLE(INPUT_MULTIPLE_FIELDS_UI) bool RenderThemeChromiumCommon::supportsCalendarPicker(const AtomicString& type) { - // FIXME: We'd like to support datetime, and datetime-local too. - return type == InputTypeNames::date() - || type == InputTypeNames::month() - || type == InputTypeNames::week(); + // FIXME: We'd like to support datetime, datetime-local, month, and week too. + return type == InputTypeNames::date(); } #endif diff --git a/Source/WebCore/svg/SVGAnimateColorElement.cpp b/Source/WebCore/svg/SVGAnimateColorElement.cpp index a5995fb33..ddaa10e26 100644 --- a/Source/WebCore/svg/SVGAnimateColorElement.cpp +++ b/Source/WebCore/svg/SVGAnimateColorElement.cpp @@ -40,7 +40,7 @@ PassRefPtr<SVGAnimateColorElement> SVGAnimateColorElement::create(const Qualifie static bool attributeValueIsCurrentColor(const String& value) { - DEFINE_STATIC_LOCAL(const AtomicString, currentColor, ("currentColor", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, currentColor, ("currentColor")); return value == currentColor; } diff --git a/Source/WebCore/svg/SVGAnimateMotionElement.cpp b/Source/WebCore/svg/SVGAnimateMotionElement.cpp index 32684ac01..f2e4a8a35 100644 --- a/Source/WebCore/svg/SVGAnimateMotionElement.cpp +++ b/Source/WebCore/svg/SVGAnimateMotionElement.cpp @@ -121,8 +121,8 @@ void SVGAnimateMotionElement::parseAttribute(const Attribute& attribute) SVGAnimateMotionElement::RotateMode SVGAnimateMotionElement::rotateMode() const { - DEFINE_STATIC_LOCAL(const AtomicString, autoVal, ("auto", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(const AtomicString, autoReverse, ("auto-reverse", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, autoVal, ("auto")); + DEFINE_STATIC_LOCAL(const AtomicString, autoReverse, ("auto-reverse")); const AtomicString& rotate = getAttribute(SVGNames::rotateAttr); if (rotate == autoVal) return RotateAuto; diff --git a/Source/WebCore/svg/SVGAnimationElement.cpp b/Source/WebCore/svg/SVGAnimationElement.cpp index 53765c378..8edf81843 100644 --- a/Source/WebCore/svg/SVGAnimationElement.cpp +++ b/Source/WebCore/svg/SVGAnimationElement.cpp @@ -293,10 +293,10 @@ void SVGAnimationElement::updateAnimationMode() void SVGAnimationElement::setCalcMode(const AtomicString& calcMode) { - DEFINE_STATIC_LOCAL(const AtomicString, discrete, ("discrete", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(const AtomicString, linear, ("linear", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(const AtomicString, paced, ("paced", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(const AtomicString, spline, ("spline", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, discrete, ("discrete")); + DEFINE_STATIC_LOCAL(const AtomicString, linear, ("linear")); + DEFINE_STATIC_LOCAL(const AtomicString, paced, ("paced")); + DEFINE_STATIC_LOCAL(const AtomicString, spline, ("spline")); if (calcMode == discrete) setCalcMode(CalcModeDiscrete); else if (calcMode == linear) @@ -311,8 +311,8 @@ void SVGAnimationElement::setCalcMode(const AtomicString& calcMode) void SVGAnimationElement::setAttributeType(const AtomicString& attributeType) { - DEFINE_STATIC_LOCAL(const AtomicString, css, ("CSS", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(const AtomicString, xml, ("XML", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, css, ("CSS")); + DEFINE_STATIC_LOCAL(const AtomicString, xml, ("XML")); if (attributeType == css) m_attributeType = AttributeTypeCSS; else if (attributeType == xml) @@ -339,14 +339,14 @@ String SVGAnimationElement::fromValue() const bool SVGAnimationElement::isAdditive() const { - DEFINE_STATIC_LOCAL(const AtomicString, sum, ("sum", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, sum, ("sum")); const AtomicString& value = fastGetAttribute(SVGNames::additiveAttr); return value == sum || animationMode() == ByAnimation; } bool SVGAnimationElement::isAccumulated() const { - DEFINE_STATIC_LOCAL(const AtomicString, sum, ("sum", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, sum, ("sum")); const AtomicString& value = fastGetAttribute(SVGNames::accumulateAttr); return value == sum && animationMode() != ToAnimation; } @@ -658,7 +658,7 @@ void SVGAnimationElement::adjustForInheritance(SVGElement* targetElement, const static bool inheritsFromProperty(SVGElement* targetElement, const QualifiedName& attributeName, const String& value) { ASSERT(targetElement); - DEFINE_STATIC_LOCAL(const AtomicString, inherit, ("inherit", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, inherit, ("inherit")); if (value.isEmpty() || value != inherit || !targetElement->isStyled()) return false; diff --git a/Source/WebCore/svg/SVGFEConvolveMatrixElement.cpp b/Source/WebCore/svg/SVGFEConvolveMatrixElement.cpp index 5c973d71e..9a44ef836 100644 --- a/Source/WebCore/svg/SVGFEConvolveMatrixElement.cpp +++ b/Source/WebCore/svg/SVGFEConvolveMatrixElement.cpp @@ -79,25 +79,25 @@ PassRefPtr<SVGFEConvolveMatrixElement> SVGFEConvolveMatrixElement::create(const const AtomicString& SVGFEConvolveMatrixElement::kernelUnitLengthXIdentifier() { - DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGKernelUnitLengthX", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGKernelUnitLengthX")); return s_identifier; } const AtomicString& SVGFEConvolveMatrixElement::kernelUnitLengthYIdentifier() { - DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGKernelUnitLengthY", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGKernelUnitLengthY")); return s_identifier; } const AtomicString& SVGFEConvolveMatrixElement::orderXIdentifier() { - DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGOrderX", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGOrderX")); return s_identifier; } const AtomicString& SVGFEConvolveMatrixElement::orderYIdentifier() { - DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGOrderY", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGOrderY")); return s_identifier; } diff --git a/Source/WebCore/svg/SVGFEDiffuseLightingElement.cpp b/Source/WebCore/svg/SVGFEDiffuseLightingElement.cpp index 451a203e1..694785518 100644 --- a/Source/WebCore/svg/SVGFEDiffuseLightingElement.cpp +++ b/Source/WebCore/svg/SVGFEDiffuseLightingElement.cpp @@ -67,13 +67,13 @@ PassRefPtr<SVGFEDiffuseLightingElement> SVGFEDiffuseLightingElement::create(cons const AtomicString& SVGFEDiffuseLightingElement::kernelUnitLengthXIdentifier() { - DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGKernelUnitLengthX", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGKernelUnitLengthX")); return s_identifier; } const AtomicString& SVGFEDiffuseLightingElement::kernelUnitLengthYIdentifier() { - DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGKernelUnitLengthY", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGKernelUnitLengthY")); return s_identifier; } diff --git a/Source/WebCore/svg/SVGFEDropShadowElement.cpp b/Source/WebCore/svg/SVGFEDropShadowElement.cpp index 65ee0761e..552351a63 100644 --- a/Source/WebCore/svg/SVGFEDropShadowElement.cpp +++ b/Source/WebCore/svg/SVGFEDropShadowElement.cpp @@ -66,13 +66,13 @@ PassRefPtr<SVGFEDropShadowElement> SVGFEDropShadowElement::create(const Qualifie const AtomicString& SVGFEDropShadowElement::stdDeviationXIdentifier() { - DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGStdDeviationX", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGStdDeviationX")); return s_identifier; } const AtomicString& SVGFEDropShadowElement::stdDeviationYIdentifier() { - DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGStdDeviationY", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGStdDeviationY")); return s_identifier; } diff --git a/Source/WebCore/svg/SVGFEGaussianBlurElement.cpp b/Source/WebCore/svg/SVGFEGaussianBlurElement.cpp index 2e432c743..89fb3a5d8 100644 --- a/Source/WebCore/svg/SVGFEGaussianBlurElement.cpp +++ b/Source/WebCore/svg/SVGFEGaussianBlurElement.cpp @@ -58,13 +58,13 @@ PassRefPtr<SVGFEGaussianBlurElement> SVGFEGaussianBlurElement::create(const Qual const AtomicString& SVGFEGaussianBlurElement::stdDeviationXIdentifier() { - DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGStdDeviationX", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGStdDeviationX")); return s_identifier; } const AtomicString& SVGFEGaussianBlurElement::stdDeviationYIdentifier() { - DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGStdDeviationY", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGStdDeviationY")); return s_identifier; } diff --git a/Source/WebCore/svg/SVGFEMorphologyElement.cpp b/Source/WebCore/svg/SVGFEMorphologyElement.cpp index d1e434e9d..d688d851e 100644 --- a/Source/WebCore/svg/SVGFEMorphologyElement.cpp +++ b/Source/WebCore/svg/SVGFEMorphologyElement.cpp @@ -60,13 +60,13 @@ PassRefPtr<SVGFEMorphologyElement> SVGFEMorphologyElement::create(const Qualifie const AtomicString& SVGFEMorphologyElement::radiusXIdentifier() { - DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGRadiusX", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGRadiusX")); return s_identifier; } const AtomicString& SVGFEMorphologyElement::radiusYIdentifier() { - DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGRadiusY", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGRadiusY")); return s_identifier; } diff --git a/Source/WebCore/svg/SVGFESpecularLightingElement.cpp b/Source/WebCore/svg/SVGFESpecularLightingElement.cpp index e62822039..ceb2fbaa5 100644 --- a/Source/WebCore/svg/SVGFESpecularLightingElement.cpp +++ b/Source/WebCore/svg/SVGFESpecularLightingElement.cpp @@ -71,13 +71,13 @@ PassRefPtr<SVGFESpecularLightingElement> SVGFESpecularLightingElement::create(co const AtomicString& SVGFESpecularLightingElement::kernelUnitLengthXIdentifier() { - DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGKernelUnitLengthX", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGKernelUnitLengthX")); return s_identifier; } const AtomicString& SVGFESpecularLightingElement::kernelUnitLengthYIdentifier() { - DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGKernelUnitLengthY", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGKernelUnitLengthY")); return s_identifier; } diff --git a/Source/WebCore/svg/SVGFETurbulenceElement.cpp b/Source/WebCore/svg/SVGFETurbulenceElement.cpp index 4fe16f6b1..aa177994a 100644 --- a/Source/WebCore/svg/SVGFETurbulenceElement.cpp +++ b/Source/WebCore/svg/SVGFETurbulenceElement.cpp @@ -65,13 +65,13 @@ PassRefPtr<SVGFETurbulenceElement> SVGFETurbulenceElement::create(const Qualifie const AtomicString& SVGFETurbulenceElement::baseFrequencyXIdentifier() { - DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGBaseFrequencyX", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGBaseFrequencyX")); return s_identifier; } const AtomicString& SVGFETurbulenceElement::baseFrequencyYIdentifier() { - DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGBaseFrequencyY", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGBaseFrequencyY")); return s_identifier; } diff --git a/Source/WebCore/svg/SVGFilterElement.cpp b/Source/WebCore/svg/SVGFilterElement.cpp index 3e98d08bc..9b81667e0 100644 --- a/Source/WebCore/svg/SVGFilterElement.cpp +++ b/Source/WebCore/svg/SVGFilterElement.cpp @@ -84,13 +84,13 @@ PassRefPtr<SVGFilterElement> SVGFilterElement::create(const QualifiedName& tagNa const AtomicString& SVGFilterElement::filterResXIdentifier() { - DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGFilterResX", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGFilterResX")); return s_identifier; } const AtomicString& SVGFilterElement::filterResYIdentifier() { - DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGFilterResY", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGFilterResY")); return s_identifier; } diff --git a/Source/WebCore/svg/SVGLangSpace.cpp b/Source/WebCore/svg/SVGLangSpace.cpp index b8b1013d6..445084537 100644 --- a/Source/WebCore/svg/SVGLangSpace.cpp +++ b/Source/WebCore/svg/SVGLangSpace.cpp @@ -38,7 +38,7 @@ void SVGLangSpace::setXmllang(const AtomicString& xmlLang) const AtomicString& SVGLangSpace::xmlspace() const { if (!m_space) { - DEFINE_STATIC_LOCAL(const AtomicString, defaultString, ("default", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, defaultString, ("default")); return defaultString; } @@ -71,7 +71,7 @@ bool SVGLangSpace::isKnownAttribute(const QualifiedName& attrName) void SVGLangSpace::addSupportedAttributes(HashSet<QualifiedName>& supportedAttributes) { - DEFINE_STATIC_LOCAL(AtomicString, xmlPrefix, ("xml", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, xmlPrefix, ("xml")); QualifiedName langWithPrefix = XMLNames::langAttr; langWithPrefix.setPrefix(xmlPrefix); diff --git a/Source/WebCore/svg/SVGMarkerElement.cpp b/Source/WebCore/svg/SVGMarkerElement.cpp index fde03a297..2a6ebb1ef 100644 --- a/Source/WebCore/svg/SVGMarkerElement.cpp +++ b/Source/WebCore/svg/SVGMarkerElement.cpp @@ -94,13 +94,13 @@ PassRefPtr<SVGMarkerElement> SVGMarkerElement::create(const QualifiedName& tagNa const AtomicString& SVGMarkerElement::orientTypeIdentifier() { - DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGOrientType", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGOrientType")); return s_identifier; } const AtomicString& SVGMarkerElement::orientAngleIdentifier() { - DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGOrientAngle", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGOrientAngle")); return s_identifier; } @@ -239,7 +239,7 @@ void SVGMarkerElement::synchronizeOrientType(void* contextElement) if (ownerType->m_orientType.value != SVGMarkerOrientAuto) return; - DEFINE_STATIC_LOCAL(AtomicString, autoString, ("auto", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, autoString, ("auto")); ownerType->m_orientType.synchronize(ownerType, orientTypePropertyInfo()->attributeName, autoString); } diff --git a/Source/WebCore/svg/SVGSVGElement.cpp b/Source/WebCore/svg/SVGSVGElement.cpp index 9aca90610..871985f70 100644 --- a/Source/WebCore/svg/SVGSVGElement.cpp +++ b/Source/WebCore/svg/SVGSVGElement.cpp @@ -121,7 +121,7 @@ void SVGSVGElement::didMoveToNewDocument(Document* oldDocument) const AtomicString& SVGSVGElement::contentScriptType() const { - DEFINE_STATIC_LOCAL(const AtomicString, defaultValue, ("text/ecmascript", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, defaultValue, ("text/ecmascript")); const AtomicString& n = fastGetAttribute(SVGNames::contentScriptTypeAttr); return n.isNull() ? defaultValue : n; } @@ -133,7 +133,7 @@ void SVGSVGElement::setContentScriptType(const AtomicString& type) const AtomicString& SVGSVGElement::contentStyleType() const { - DEFINE_STATIC_LOCAL(const AtomicString, defaultValue, ("text/css", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, defaultValue, ("text/css")); const AtomicString& n = fastGetAttribute(SVGNames::contentStyleTypeAttr); return n.isNull() ? defaultValue : n; } diff --git a/Source/WebCore/svg/SVGStyleElement.cpp b/Source/WebCore/svg/SVGStyleElement.cpp index 84881e3b2..e4d6f6bc0 100644 --- a/Source/WebCore/svg/SVGStyleElement.cpp +++ b/Source/WebCore/svg/SVGStyleElement.cpp @@ -68,7 +68,7 @@ void SVGStyleElement::setDisabled(bool setDisabled) const AtomicString& SVGStyleElement::type() const { - DEFINE_STATIC_LOCAL(const AtomicString, defaultValue, ("text/css", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, defaultValue, ("text/css")); const AtomicString& n = getAttribute(SVGNames::typeAttr); return n.isNull() ? defaultValue : n; } @@ -80,7 +80,7 @@ void SVGStyleElement::setType(const AtomicString& type, ExceptionCode&) const AtomicString& SVGStyleElement::media() const { - DEFINE_STATIC_LOCAL(const AtomicString, defaultValue, ("all", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, defaultValue, ("all")); const AtomicString& n = fastGetAttribute(SVGNames::mediaAttr); return n.isNull() ? defaultValue : n; } diff --git a/Source/WebCore/svg/SVGTextContentElement.cpp b/Source/WebCore/svg/SVGTextContentElement.cpp index 587d3f7c6..8b7041f89 100644 --- a/Source/WebCore/svg/SVGTextContentElement.cpp +++ b/Source/WebCore/svg/SVGTextContentElement.cpp @@ -241,7 +241,7 @@ void SVGTextContentElement::collectStyleForAttribute(const Attribute& attribute, if (!isSupportedAttribute(attribute.name())) SVGStyledElement::collectStyleForAttribute(attribute, style); else if (attribute.name().matches(XMLNames::spaceAttr)) { - DEFINE_STATIC_LOCAL(const AtomicString, preserveString, ("preserve", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, preserveString, ("preserve")); if (attribute.value() == preserveString) addPropertyToAttributeStyle(style, CSSPropertyWhiteSpace, CSSValuePre); diff --git a/Source/WebCore/svg/SVGViewSpec.cpp b/Source/WebCore/svg/SVGViewSpec.cpp index 3c1e78034..08ab852f0 100644 --- a/Source/WebCore/svg/SVGViewSpec.cpp +++ b/Source/WebCore/svg/SVGViewSpec.cpp @@ -87,19 +87,19 @@ SVGViewSpec::SVGViewSpec(SVGElement* contextElement) const AtomicString& SVGViewSpec::viewBoxIdentifier() { - DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGViewSpecViewBoxAttribute", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGViewSpecViewBoxAttribute")); return s_identifier; } const AtomicString& SVGViewSpec::preserveAspectRatioIdentifier() { - DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGViewSpecPreserveAspectRatioAttribute", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGViewSpecPreserveAspectRatioAttribute")); return s_identifier; } const AtomicString& SVGViewSpec::transformIdentifier() { - DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGViewSpecTransformAttribute", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGViewSpecTransformAttribute")); return s_identifier; } diff --git a/Source/WebCore/svg/animation/SVGSMILElement.cpp b/Source/WebCore/svg/animation/SVGSMILElement.cpp index 2b4e0d55b..1e3b01641 100644 --- a/Source/WebCore/svg/animation/SVGSMILElement.cpp +++ b/Source/WebCore/svg/animation/SVGSMILElement.cpp @@ -280,7 +280,7 @@ SMILTime SVGSMILElement::parseClockValue(const String& data) String parse = data.stripWhiteSpace(); - DEFINE_STATIC_LOCAL(const AtomicString, indefiniteValue, ("indefinite", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, indefiniteValue, ("indefinite")); if (parse == indefiniteValue) return SMILTime::indefinite(); @@ -632,8 +632,8 @@ bool SVGSMILElement::isFrozen() const SVGSMILElement::Restart SVGSMILElement::restart() const { - DEFINE_STATIC_LOCAL(const AtomicString, never, ("never", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(const AtomicString, whenNotActive, ("whenNotActive", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, never, ("never")); + DEFINE_STATIC_LOCAL(const AtomicString, whenNotActive, ("whenNotActive")); const AtomicString& value = fastGetAttribute(SVGNames::restartAttr); if (value == never) return RestartNever; @@ -644,7 +644,7 @@ SVGSMILElement::Restart SVGSMILElement::restart() const SVGSMILElement::FillMode SVGSMILElement::fill() const { - DEFINE_STATIC_LOCAL(const AtomicString, freeze, ("freeze", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, freeze, ("freeze")); const AtomicString& value = fastGetAttribute(SVGNames::fillAttr); return value == freeze ? FillFreeze : FillRemove; } @@ -677,7 +677,7 @@ SMILTime SVGSMILElement::repeatCount() const if (value.isNull()) return SMILTime::unresolved(); - DEFINE_STATIC_LOCAL(const AtomicString, indefiniteValue, ("indefinite", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(const AtomicString, indefiniteValue, ("indefinite")); if (value == indefiniteValue) return SMILTime::indefinite(); bool ok; diff --git a/Source/WebCore/testing/InternalSettings.cpp b/Source/WebCore/testing/InternalSettings.cpp index 186ee662b..aa7703bc6 100644 --- a/Source/WebCore/testing/InternalSettings.cpp +++ b/Source/WebCore/testing/InternalSettings.cpp @@ -159,7 +159,7 @@ void InternalSettings::Backup::restoreTo(Page* page, Settings* settings) InternalSettings* InternalSettings::from(Page* page) { - DEFINE_STATIC_LOCAL(AtomicString, name, ("InternalSettings", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, name, ("InternalSettings")); if (!SuperType::from(page, name)) SuperType::provideTo(page, name, adoptRef(new InternalSettings(page))); return static_cast<InternalSettings*>(SuperType::from(page, name)); diff --git a/Source/WebCore/xml/parser/CharacterReferenceParserInlines.h b/Source/WebCore/xml/parser/CharacterReferenceParserInlineMethods.h index fe20e527a..92df6361c 100644 --- a/Source/WebCore/xml/parser/CharacterReferenceParserInlines.h +++ b/Source/WebCore/xml/parser/CharacterReferenceParserInlineMethods.h @@ -24,8 +24,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef CharacterReferenceParserInlines_h -#define CharacterReferenceParserInlines_h +#ifndef CharacterReferenceParserInlineMethods_h +#define CharacterReferenceParserInlineMethods_h #include <wtf/text/StringBuilder.h> @@ -170,4 +170,4 @@ bool consumeCharacterReference(SegmentedString& source, StringBuilder& decodedCh } -#endif // CharacterReferenceParserInlines_h +#endif // CharacterReferenceParserInlineMethods_h diff --git a/Source/WebCore/xml/parser/MarkupTokenizerInlines.h b/Source/WebCore/xml/parser/MarkupTokenizerInlineMethods.h index e0b3156bb..814b8f216 100644 --- a/Source/WebCore/xml/parser/MarkupTokenizerInlines.h +++ b/Source/WebCore/xml/parser/MarkupTokenizerInlineMethods.h @@ -25,8 +25,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef MarkupTokenizerInlines_h -#define MarkupTokenizerInlines_h +#ifndef MarkupTokenizerInlineMethods_h +#define MarkupTokenizerInlineMethods_h #include "SegmentedString.h" @@ -92,4 +92,4 @@ inline void advanceStringAndASSERT(SegmentedString& source, const char* expected } -#endif // MarkupTokenizerInlines_h +#endif // MarkupTokenizerInlineMethods_h diff --git a/Source/WebCore/xml/parser/XMLCharacterReferenceParser.cpp b/Source/WebCore/xml/parser/XMLCharacterReferenceParser.cpp index 7bee228e6..962ca1d44 100644 --- a/Source/WebCore/xml/parser/XMLCharacterReferenceParser.cpp +++ b/Source/WebCore/xml/parser/XMLCharacterReferenceParser.cpp @@ -30,7 +30,7 @@ using namespace WTF; -#include "CharacterReferenceParserInlines.h" +#include "CharacterReferenceParserInlineMethods.h" namespace WebCore { diff --git a/Source/WebCore/xml/parser/XMLTokenizer.cpp b/Source/WebCore/xml/parser/XMLTokenizer.cpp index 322301949..bb3e68cd8 100644 --- a/Source/WebCore/xml/parser/XMLTokenizer.cpp +++ b/Source/WebCore/xml/parser/XMLTokenizer.cpp @@ -28,7 +28,7 @@ #include "config.h" #include "XMLTokenizer.h" -#include "MarkupTokenizerInlines.h" +#include "MarkupTokenizerInlineMethods.h" #include "NotImplemented.h" #include "XMLCharacterReferenceParser.h" #include "XMLToken.h" diff --git a/Source/WebCore/xml/parser/XMLTreeBuilder.cpp b/Source/WebCore/xml/parser/XMLTreeBuilder.cpp index 7faadf582..12defe586 100644 --- a/Source/WebCore/xml/parser/XMLTreeBuilder.cpp +++ b/Source/WebCore/xml/parser/XMLTreeBuilder.cpp @@ -198,14 +198,14 @@ void XMLTreeBuilder::processXMLDeclaration(const AtomicXMLToken& token) void XMLTreeBuilder::processDOCTYPE(const AtomicXMLToken& token) { - DEFINE_STATIC_LOCAL(AtomicString, xhtmlTransitional, ("-//W3C//DTD XHTML 1.0 Transitional//EN", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(AtomicString, xhtml11, ("-//W3C//DTD XHTML 1.1//EN", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(AtomicString, xhtmlStrict, ("-//W3C//DTD XHTML 1.0 Strict//EN", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(AtomicString, xhtmlFrameset, ("-//W3C//DTD XHTML 1.0 Frameset//EN", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(AtomicString, xhtmlBasic, ("-//W3C//DTD XHTML Basic 1.0//EN", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(AtomicString, xhtmlMathML, ("-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(AtomicString, xhtmlMathMLSVG, ("-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(AtomicString, xhtmlMobile, ("-//WAPFORUM//DTD XHTML Mobile 1.0//EN", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, xhtmlTransitional, ("-//W3C//DTD XHTML 1.0 Transitional//EN")); + DEFINE_STATIC_LOCAL(AtomicString, xhtml11, ("-//W3C//DTD XHTML 1.1//EN")); + DEFINE_STATIC_LOCAL(AtomicString, xhtmlStrict, ("-//W3C//DTD XHTML 1.0 Strict//EN")); + DEFINE_STATIC_LOCAL(AtomicString, xhtmlFrameset, ("-//W3C//DTD XHTML 1.0 Frameset//EN")); + DEFINE_STATIC_LOCAL(AtomicString, xhtmlBasic, ("-//W3C//DTD XHTML Basic 1.0//EN")); + DEFINE_STATIC_LOCAL(AtomicString, xhtmlMathML, ("-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN")); + DEFINE_STATIC_LOCAL(AtomicString, xhtmlMathMLSVG, ("-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN")); + DEFINE_STATIC_LOCAL(AtomicString, xhtmlMobile, ("-//WAPFORUM//DTD XHTML Mobile 1.0//EN")); if (!failOnText()) return; @@ -330,11 +330,11 @@ void XMLTreeBuilder::processAttributes(const AtomicXMLToken& token, NodeStackIte void XMLTreeBuilder::processXMLEntity(const AtomicXMLToken& token) { - DEFINE_STATIC_LOCAL(AtomicString, amp, ("amp", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(AtomicString, apos, ("apos", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(AtomicString, gt, ("gt", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(AtomicString, lt, ("lt", AtomicString::ConstructFromLiteral)); - DEFINE_STATIC_LOCAL(AtomicString, quot, ("quot", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, amp, ("amp")); + DEFINE_STATIC_LOCAL(AtomicString, apos, ("apos")); + DEFINE_STATIC_LOCAL(AtomicString, gt, ("gt")); + DEFINE_STATIC_LOCAL(AtomicString, lt, ("lt")); + DEFINE_STATIC_LOCAL(AtomicString, quot, ("quot")); DEFINE_STATIC_LOCAL(String, ampS, (ASCIILiteral("&"))); DEFINE_STATIC_LOCAL(String, aposS, (ASCIILiteral("'"))); DEFINE_STATIC_LOCAL(String, gtS, (ASCIILiteral(">"))); |