Title: [153634] trunk
Revision
153634
Author
[email protected]
Date
2013-08-01 19:39:15 -0700 (Thu, 01 Aug 2013)

Log Message

Unreviewed, rolling out r153608.
http://trac.webkit.org/changeset/153608
https://bugs.webkit.org/show_bug.cgi?id=119425

Snorkled fast/multicol/overflow-content-expected.html
(Requested by kling on #webkit).

Source/WebCore:

* css/StyleResolver.cpp:
(WebCore::StyleResolver::applyMatchedProperties):

LayoutTests:

* fast/css/identical-logical-height-decl-expected.html: Removed.
* fast/css/identical-logical-height-decl.html: Removed.

Modified Paths

Removed Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (153633 => 153634)


--- trunk/LayoutTests/ChangeLog	2013-08-02 02:07:34 UTC (rev 153633)
+++ trunk/LayoutTests/ChangeLog	2013-08-02 02:39:15 UTC (rev 153634)
@@ -1,3 +1,15 @@
+2013-08-01  Commit Queue  <[email protected]>
+
+        Unreviewed, rolling out r153608.
+        http://trac.webkit.org/changeset/153608
+        https://bugs.webkit.org/show_bug.cgi?id=119425
+
+        Snorkled fast/multicol/overflow-content-expected.html
+        (Requested by kling on #webkit).
+
+        * fast/css/identical-logical-height-decl-expected.html: Removed.
+        * fast/css/identical-logical-height-decl.html: Removed.
+
 2013-08-01  Rob Buis  <[email protected]>
 
         selectors should match attribute name with case sensitivity based on element & document type

Deleted: trunk/LayoutTests/fast/css/identical-logical-height-decl-expected.html (153633 => 153634)


--- trunk/LayoutTests/fast/css/identical-logical-height-decl-expected.html	2013-08-02 02:07:34 UTC (rev 153633)
+++ trunk/LayoutTests/fast/css/identical-logical-height-decl-expected.html	2013-08-02 02:39:15 UTC (rev 153634)
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Identical style declaration on elements with different writing modes</title>
-  </head>
-  <body style="overflow:hidden;">
-    <p>There should be no red on this page.</p>
-  </body>
-</html>

Deleted: trunk/LayoutTests/fast/css/identical-logical-height-decl.html (153633 => 153634)


--- trunk/LayoutTests/fast/css/identical-logical-height-decl.html	2013-08-02 02:07:34 UTC (rev 153633)
+++ trunk/LayoutTests/fast/css/identical-logical-height-decl.html	2013-08-02 02:39:15 UTC (rev 153634)
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Identical style declaration on elements with different writing modes</title>
-  </head>
-  <body style="overflow:hidden;">
-    <p>There should be no red on this page.</p>
-    <div style="-webkit-logical-height:10px;"></div> <!-- set height -->
-    <div style="-webkit-writing-mode:vertical-lr; width:100px; height:100px; background:red;">
-      <div style="-webkit-logical-height:10px;"> <!-- set width! -->
-        <div style="width:100px; background:white;"></div>
-      </div>
-    </div>
-  </body>
-</html>

Modified: trunk/Source/WebCore/ChangeLog (153633 => 153634)


--- trunk/Source/WebCore/ChangeLog	2013-08-02 02:07:34 UTC (rev 153633)
+++ trunk/Source/WebCore/ChangeLog	2013-08-02 02:39:15 UTC (rev 153634)
@@ -1,3 +1,15 @@
+2013-08-01  Commit Queue  <[email protected]>
+
+        Unreviewed, rolling out r153608.
+        http://trac.webkit.org/changeset/153608
+        https://bugs.webkit.org/show_bug.cgi?id=119425
+
+        Snorkled fast/multicol/overflow-content-expected.html
+        (Requested by kling on #webkit).
+
+        * css/StyleResolver.cpp:
+        (WebCore::StyleResolver::applyMatchedProperties):
+
 2013-08-01  Ruth Fong  <[email protected]>
 
         [Forms: color] <input type='color'> popover color well implementation

Modified: trunk/Source/WebCore/css/StyleResolver.cpp (153633 => 153634)


--- trunk/Source/WebCore/css/StyleResolver.cpp	2013-08-02 02:07:34 UTC (rev 153633)
+++ trunk/Source/WebCore/css/StyleResolver.cpp	2013-08-02 02:39:15 UTC (rev 153634)
@@ -1846,8 +1846,7 @@
     unsigned cacheHash = matchResult.isCacheable ? computeMatchedPropertiesHash(matchResult.matchedProperties.data(), matchResult.matchedProperties.size()) : 0;
     bool applyInheritedOnly = false;
     const MatchedPropertiesCacheItem* cacheItem = 0;
-    if (cacheHash && (cacheItem = findFromMatchedPropertiesCache(cacheHash, matchResult))
-        && isCacheableInMatchedPropertiesCache(element, state.style(), state.parentStyle())) {
+    if (cacheHash && (cacheItem = findFromMatchedPropertiesCache(cacheHash, matchResult))) {
         // We can build up the style by copying non-inherited properties from an earlier style object built using the same exact
         // style declarations. We then only need to apply the inherited properties, if any, as their values can depend on the 
         // element context. This is fast and saves memory by reusing the style data structures.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to