Title: [248397] branches/safari-608.1-branch/Source/WebCore
- Revision
- 248397
- Author
- [email protected]
- Date
- 2019-08-07 17:38:42 -0700 (Wed, 07 Aug 2019)
Log Message
Revert r248173. rdar://problem/54036774
Modified Paths
Diff
Modified: branches/safari-608.1-branch/Source/WebCore/ChangeLog (248396 => 248397)
--- branches/safari-608.1-branch/Source/WebCore/ChangeLog 2019-08-07 23:52:20 UTC (rev 248396)
+++ branches/safari-608.1-branch/Source/WebCore/ChangeLog 2019-08-08 00:38:42 UTC (rev 248397)
@@ -1,5 +1,9 @@
2019-08-07 Kocsen Chung <[email protected]>
+ Revert r248173. rdar://problem/54036774
+
+2019-08-07 Kocsen Chung <[email protected]>
+
Cherry-pick r248368. rdar://problem/54037160
Extra space inserted at start of line when inserting a newline in Mail compose
Modified: branches/safari-608.1-branch/Source/WebCore/dom/Node.cpp (248396 => 248397)
--- branches/safari-608.1-branch/Source/WebCore/dom/Node.cpp 2019-08-07 23:52:20 UTC (rev 248396)
+++ branches/safari-608.1-branch/Source/WebCore/dom/Node.cpp 2019-08-08 00:38:42 UTC (rev 248397)
@@ -2554,9 +2554,6 @@
void Node::decrementConnectedSubframeCount(unsigned amount)
{
- ASSERT(rareData());
- if (!hasRareData())
- return; // Defend against type confusion when the above assertion fails. See webkit.org/b/200300.
rareData()->decrementConnectedSubframeCount(amount);
}
Modified: branches/safari-608.1-branch/Source/WebCore/dom/NodeRareData.h (248396 => 248397)
--- branches/safari-608.1-branch/Source/WebCore/dom/NodeRareData.h 2019-08-07 23:52:20 UTC (rev 248396)
+++ branches/safari-608.1-branch/Source/WebCore/dom/NodeRareData.h 2019-08-08 00:38:42 UTC (rev 248397)
@@ -29,7 +29,6 @@
#include "QualifiedName.h"
#include "TagCollection.h"
#include <wtf/HashSet.h>
-#include <wtf/StdLibExtras.h>
#include <wtf/text/AtomString.h>
namespace WebCore {
@@ -320,7 +319,7 @@
#endif
private:
- unsigned m_connectedFrameCount; // Must fit Page::maxNumberOfFrames.
+ unsigned m_connectedFrameCount : 10; // Must fit Page::maxNumberOfFrames.
std::unique_ptr<NodeListsNodeData> m_nodeLists;
std::unique_ptr<NodeMutationObserverData> m_mutationObserverData;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
