Title: [200932] trunk/Source/WebCore
Revision
200932
Author
[email protected]
Date
2016-05-15 15:13:53 -0700 (Sun, 15 May 2016)

Log Message

Something tiny left out of the last patch.

* WebCore.xcodeproj/project.pbxproj: Allow Xcode to update this file.
* editing/ApplyStyleCommand.cpp:
(WebCore::ApplyStyleCommand::applyInlineStyleChange): Removed unneeded null check; all
code paths already have null checks.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (200931 => 200932)


--- trunk/Source/WebCore/ChangeLog	2016-05-15 22:08:52 UTC (rev 200931)
+++ trunk/Source/WebCore/ChangeLog	2016-05-15 22:13:53 UTC (rev 200932)
@@ -1,5 +1,14 @@
 2016-05-15  Darin Adler  <[email protected]>
 
+        Something tiny left out of the last patch.
+
+        * WebCore.xcodeproj/project.pbxproj: Allow Xcode to update this file.
+        * editing/ApplyStyleCommand.cpp:
+        (WebCore::ApplyStyleCommand::applyInlineStyleChange): Removed unneeded null check; all
+        code paths already have null checks.
+
+2016-05-15  Darin Adler  <[email protected]>
+
         More CTTE and other cleanups for HTML editing header
         https://bugs.webkit.org/show_bug.cgi?id=157722
 

Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (200931 => 200932)


--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2016-05-15 22:08:52 UTC (rev 200931)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2016-05-15 22:13:53 UTC (rev 200932)
@@ -11193,7 +11193,7 @@
 		932E16080AF578340025F408 /* FrameLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FrameLoader.cpp; sourceTree = "<group>"; };
 		93309D87099E64910056E581 /* AppendNodeCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AppendNodeCommand.cpp; sourceTree = "<group>"; };
 		93309D88099E64910056E581 /* AppendNodeCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppendNodeCommand.h; sourceTree = "<group>"; };
-		93309D89099E64910056E581 /* ApplyStyleCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = ApplyStyleCommand.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
+		93309D89099E64910056E581 /* ApplyStyleCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = ApplyStyleCommand.cpp; sourceTree = "<group>"; };
 		93309D8A099E64910056E581 /* ApplyStyleCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ApplyStyleCommand.h; sourceTree = "<group>"; };
 		93309D8B099E64910056E581 /* BreakBlockquoteCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BreakBlockquoteCommand.cpp; sourceTree = "<group>"; };
 		93309D8C099E64910056E581 /* BreakBlockquoteCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BreakBlockquoteCommand.h; sourceTree = "<group>"; };

Modified: trunk/Source/WebCore/editing/ApplyStyleCommand.cpp (200931 => 200932)


--- trunk/Source/WebCore/editing/ApplyStyleCommand.cpp	2016-05-15 22:08:52 UTC (rev 200931)
+++ trunk/Source/WebCore/editing/ApplyStyleCommand.cpp	2016-05-15 22:13:53 UTC (rev 200932)
@@ -1435,7 +1435,7 @@
     // Find appropriate font and span elements top-down.
     HTMLFontElement* fontContainer = nullptr;
     HTMLElement* styleContainer = nullptr;
-    while (startNode && startNode == endNode) {
+    while (startNode == endNode) {
         if (is<HTMLElement>(*startNode)) {
             auto& container = downcast<HTMLElement>(*startNode);
             if (is<HTMLFontElement>(container))
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to