⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 215605 in webkit


Ignore:
Timestamp:
Apr 20, 2017, 11:04:20 PM (9 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r215597.
​https://bugs.webkit.org/show_bug.cgi?id=171102

Made all tests crash under GuardMalloc (Requested by ap on
#webkit).

Reverted changeset:

"Expose obscured insets to web content (as "safe area
insets")"
​https://bugs.webkit.org/show_bug.cgi?id=171013
​http://trac.webkit.org/changeset/215597

Location:
trunk
Files:
3 deleted
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r215597 r215605  
     12017-04-20  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r215597.
     4        https://bugs.webkit.org/show_bug.cgi?id=171102
     5
     6        Made all tests crash under GuardMalloc (Requested by ap on
     7        #webkit).
     8
     9        Reverted changeset:
     10
     11        "Expose obscured insets to web content (as "safe area
     12        insets")"
     13        https://bugs.webkit.org/show_bug.cgi?id=171013
     14        http://trac.webkit.org/changeset/215597
     15
    1162017-04-20  Timothy Horton  <timothy_horton@apple.com>
    217

  • trunk/LayoutTests/TestExpectations

    r215597 r215605  
    3535media/controls/ipad [ Skip ]
    3636fast/text-autosizing [ Skip ]
    37 fast/css/variables/constants/ios [ Skip ]
    3837
    3938# window.showModalDialog is only tested in DumpRenderTree on Mac.

  • trunk/LayoutTests/platform/ios-wk2/TestExpectations

    r215597 r215605  
    1515tiled-drawing/ios [ Pass ]
    1616editing/selection/character-granularity-rect.html [ Pass ]
    17 fast/css/variables/constants/ios [ Pass ]
    1817
    1918fast/media/mq-inverted-colors-live-update.html [ Pass ]

  • trunk/Source/WebCore/CMakeLists.txt

    r215597 r215605  
    14541454    dom/ComposedTreeIterator.cpp
    14551455    dom/CompositionEvent.cpp
    1456     dom/ConstantPropertyMap.cpp
    14571456    dom/ContainerNode.cpp
    14581457    dom/ContainerNodeAlgorithms.cpp

  • trunk/Source/WebCore/ChangeLog

    r215603 r215605  
     12017-04-20  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r215597.
     4        https://bugs.webkit.org/show_bug.cgi?id=171102
     5
     6        Made all tests crash under GuardMalloc (Requested by ap on
     7        #webkit).
     8
     9        Reverted changeset:
     10
     11        "Expose obscured insets to web content (as "safe area
     12        insets")"
     13        https://bugs.webkit.org/show_bug.cgi?id=171013
     14        http://trac.webkit.org/changeset/215597
     15
    1162017-04-20  Dean Jackson  <dino@apple.com>
    217

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r215597 r215605  
    12591259                2D9BF74A1DBFDDFF007A7D99 /* JSMediaKeySessionCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D9BF7481DBFDDF8007A7D99 /* JSMediaKeySessionCustom.cpp */; };
    12601260                2D9F0E1314FF1CBF00BA0FF7 /* linearSRGB.icc in Resources */ = {isa = PBXBuildFile; fileRef = 2D9F0E1214FF1CBF00BA0FF7 /* linearSRGB.icc */; };
    1261                 2DAF343C1EA7E0F100382CD3 /* ConstantPropertyMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2DAF343A1EA7E0F100382CD3 /* ConstantPropertyMap.cpp */; };
    1262                 2DAF343D1EA7E0F100382CD3 /* ConstantPropertyMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DAF343B1EA7E0F100382CD3 /* ConstantPropertyMap.h */; };
    12631261                2DB9C4AA1B3231F40070F27F /* NSEventSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DB9C4A91B3231F40070F27F /* NSEventSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
    12641262                2DC4CF791D2DD98900ECCC94 /* DataDetectorsUISPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DC4CF781D2DD98900ECCC94 /* DataDetectorsUISPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    88038801                2DAAE32C19DCAF6000E002D2 /* MockPageOverlayClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MockPageOverlayClient.cpp; sourceTree = "<group>"; };
    88048802                2DAAE32D19DCAF6000E002D2 /* MockPageOverlayClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MockPageOverlayClient.h; sourceTree = "<group>"; };
    8805                 2DAF343A1EA7E0F100382CD3 /* ConstantPropertyMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ConstantPropertyMap.cpp; sourceTree = "<group>"; };
    8806                 2DAF343B1EA7E0F100382CD3 /* ConstantPropertyMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConstantPropertyMap.h; sourceTree = "<group>"; };
    88078803                2DB9C4A91B3231F40070F27F /* NSEventSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSEventSPI.h; sourceTree = "<group>"; };
    88088804                2DC4CF781D2DD98900ECCC94 /* DataDetectorsUISPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DataDetectorsUISPI.h; sourceTree = "<group>"; };
    … …  
    2546025456                                79F2F59F1091939A000D87CB /* CompositionEvent.h */,
    2546125457                                79F2F5A01091939A000D87CB /* CompositionEvent.idl */,
    25462                                 2DAF343A1EA7E0F100382CD3 /* ConstantPropertyMap.cpp */,
    25463                                 2DAF343B1EA7E0F100382CD3 /* ConstantPropertyMap.h */,
    2546425458                                A81872140977D3C0005826D9 /* ContainerNode.cpp */,
    2546525459                                A81872110977D3C0005826D9 /* ContainerNode.h */,
    … …  
    2649426488                                E1C94AF9191303F000D5A893 /* BlobPart.h in Headers */,
    2649526489                                7C77C3D11DEE472400A50BFA /* BlobPropertyBag.h in Headers */,
    26496                                 2DAF343D1EA7E0F100382CD3 /* ConstantPropertyMap.h in Headers */,
    2649726490                                2EDEF1F5121B0EFC00726DB2 /* BlobRegistry.h in Headers */,
    2649826491                                2EDEF1F7121B0EFC00726DB2 /* BlobRegistryImpl.h in Headers */,
    … …  
    3184031833                                BC17F9660B64EBB8004A65CB /* JSHTMLSelectElementCustom.cpp in Sources */,
    3184131834                                9B69D3B81B99100700E3512B /* JSHTMLSlotElement.cpp in Sources */,
    31842                                 2DAF343C1EA7E0F100382CD3 /* ConstantPropertyMap.cpp in Sources */,
    3184331835                                E446143B0CD689CC00FADA75 /* JSHTMLSourceElement.cpp in Sources */,
    3184431836                                9752D38D1413104B003305BD /* JSHTMLSpanElement.cpp in Sources */,

  • trunk/Source/WebCore/css/CSSValueKeywords.in

    r215597 r215605  
    845845
    846846//
    847 // UA Constants
    848 //
    849 constant
    850 
    851 //
    852847// CSS_PROP_BREAK_BEFORE/AFTER/INSIDE
    853848//

  • trunk/Source/WebCore/css/CSSVariableData.cpp

    r215597 r215605  
    102102{
    103103    while (!range.atEnd()) {
    104         if (range.peek().functionId() == CSSValueVar || range.peek().functionId() == CSSValueConstant) {
     104        if (range.peek().functionId() == CSSValueVar) {
    105105            CSSParserTokenRange block = range.consumeBlock();
    106106           
    … …  
    172172    bool success = true;
    173173    while (!range.atEnd()) {
    174         if (range.peek().functionId() == CSSValueVar || range.peek().functionId() == CSSValueConstant)
     174        if (range.peek().functionId() == CSSValueVar)
    175175            success &= resolveVariableReference(customProperties, range.consumeBlock(), result);
    176176        else

  • trunk/Source/WebCore/css/parser/CSSVariableParser.cpp

    r215597 r215605  
    5050}
    5151
    52 static bool isValidConstantName(const CSSParserToken& token)
    53 {
    54     return token.type() == IdentToken;
    55 }
    56 
    5752bool isValidVariableReference(CSSParserTokenRange, bool& hasAtApplyRule);
    58 bool isValidConstantReference(CSSParserTokenRange, bool& hasAtApplyRule);
    5953
    6054static bool classifyBlock(CSSParserTokenRange range, bool& hasReferences, bool& hasAtApplyRule, bool isTopLevelBlock = true)
    … …  
    6660            if (token.functionId() == CSSValueVar) {
    6761                if (!isValidVariableReference(block, hasAtApplyRule))
    68                     return false; // Bail if any references are invalid
    69                 hasReferences = true;
    70                 continue;
    71             }
    72             if (token.functionId() == CSSValueConstant) {
    73                 if (!isValidConstantReference(block, hasAtApplyRule))
    7462                    return false; // Bail if any references are invalid
    7563                hasReferences = true;
    … …  
    135123}
    136124
    137 bool isValidConstantReference(CSSParserTokenRange range, bool& hasAtApplyRule)
    138 {
    139     range.consumeWhitespace();
    140     if (!isValidConstantName(range.consumeIncludingWhitespace()))
    141         return false;
    142     if (range.atEnd())
    143         return true;
    144 
    145     if (range.consume().type() != CommaToken)
    146         return false;
    147     if (range.atEnd())
    148         return false;
    149 
    150     bool hasReferences = false;
    151     return classifyBlock(range, hasReferences, hasAtApplyRule);
    152 }
    153 
    154125static CSSValueID classifyVariableRange(CSSParserTokenRange range, bool& hasReferences, bool& hasAtApplyRule)
    155126{

  • trunk/Source/WebCore/dom/Document.cpp

    r215597 r215605  
    4444#include "CommonVM.h"
    4545#include "CompositionEvent.h"
    46 #include "ConstantPropertyMap.h"
    4746#include "ContentSecurityPolicy.h"
    4847#include "CookieJar.h"
    … …  
    454453    , m_moduleLoader(std::make_unique<ScriptModuleLoader>(*this))
    455454    , m_xmlVersion(ASCIILiteral("1.0"))
    456     , m_constantPropertyMap(std::make_unique<ConstantPropertyMap>(*this))
    457455    , m_documentClasses(documentClasses)
    458456    , m_eventQueue(*this)
    … …  
    20532051void Document::fontsNeedUpdate(FontSelector&)
    20542052{
    2055     invalidateMatchedPropertiesCacheAndForceStyleRecalc();
    2056 }
    2057 
    2058 void Document::invalidateMatchedPropertiesCacheAndForceStyleRecalc()
    2059 {
    20602053    if (auto* resolver = styleScope().resolverIfExists())
    20612054        resolver->invalidateMatchedPropertiesCache();

  • trunk/Source/WebCore/dom/Document.h

    r215597 r215605  
    7474class Attr;
    7575class CDATASection;
    76 class CSSCustomPropertyValue;
    7776class CSSFontSelector;
    7877class CSSStyleDeclaration;
    … …  
    8584class CharacterData;
    8685class Comment;
    87 class ConstantPropertyMap;
    8886class DOMImplementation;
    8987class DOMNamedFlowCollection;
    … …  
    12091207    DocumentSharedObjectPool* sharedObjectPool() { return m_sharedObjectPool.get(); }
    12101208
    1211     void invalidateMatchedPropertiesCacheAndForceStyleRecalc();
    1212 
    12131209    void didRemoveAllPendingStylesheet();
    12141210    void didClearStyleResolver();
    … …  
    13041300    void detachFromCachedFrame(CachedFrameBase&);
    13051301
    1306     ConstantPropertyMap& constantProperties() const { return *m_constantPropertyMap; }
    1307 
    13081302protected:
    13091303    enum ConstructionFlags { Synthesized = 1, NonRenderedPlaceholder = 1 << 1 };
    … …  
    15411535
    15421536    DocumentOrderedMap m_imagesByUsemap;
    1543 
    1544     std::unique_ptr<ConstantPropertyMap> m_constantPropertyMap;
    15451537
    15461538    std::unique_ptr<SelectorQueryCache> m_selectorQueryCache;

  • trunk/Source/WebCore/page/Page.cpp

    r215597 r215605  
    3030#include "ChromeClient.h"
    3131#include "ClientRectList.h"
    32 #include "ConstantPropertyMap.h"
    3332#include "ContextMenuClient.h"
    3433#include "ContextMenuController.h"
    … …  
    22912290}
    22922291
    2293 void Page::setObscuredInsets(const FloatBoxExtent& insets)
    2294 {
    2295     if (m_obscuredInsets == insets)
    2296         return;
    2297 
    2298     m_obscuredInsets = insets;
    2299 
    2300     for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext()) {
    2301         if (!frame->document())
    2302             continue;
    2303         frame->document()->constantProperties().didChangeObscuredInsets();
    2304     }
    2305 }
    2306 
    23072292#if ENABLE(DATA_INTERACTION)
    23082293

  • trunk/Source/WebCore/page/Page.h

    r215597 r215605  
    330330    WEBCORE_EXPORT void setTopContentInset(float);
    331331
     332#if PLATFORM(IOS)
    332333    const FloatBoxExtent& obscuredInsets() const { return m_obscuredInsets; }
    333     WEBCORE_EXPORT void setObscuredInsets(const FloatBoxExtent&);
    334 
    335 #if PLATFORM(IOS)
     334    void setObscuredInsets(FloatBoxExtent insets) { m_obscuredInsets = insets; }
     335   
    336336    bool enclosedInScrollableAncestorView() const { return m_enclosedInScrollableAncestorView; }
    337337    void setEnclosedInScrollableAncestorView(bool f) { m_enclosedInScrollableAncestorView = f; }
    … …  
    687687
    688688    float m_topContentInset;
     689
     690#if PLATFORM(IOS)
     691    // This is only used for history scroll position restoration.
    689692    FloatBoxExtent m_obscuredInsets;
    690 
    691 #if PLATFORM(IOS)
    692693    bool m_enclosedInScrollableAncestorView { false };
    693694#endif

  • trunk/Source/WebCore/style/StyleResolveForDocument.cpp

    r215597 r215605  
    3131
    3232#include "CSSFontSelector.h"
    33 #include "ConstantPropertyMap.h"
    3433#include "Document.h"
    3534#include "Frame.h"
    … …  
    126125    documentStyle.fontCascade().update(&const_cast<Document&>(document).fontSelector());
    127126
    128     for (auto& it : document.constantProperties().values())
    129         documentStyle.setCustomPropertyValue(it.key, makeRef(it.value.get()));
    130 
    131127    return documentStyle;
    132128}
Note: See TracChangeset for help on using the changeset viewer.