Diff
Modified: trunk/Source/WTF/ChangeLog (170481 => 170482)
--- trunk/Source/WTF/ChangeLog 2014-06-26 16:52:21 UTC (rev 170481)
+++ trunk/Source/WTF/ChangeLog 2014-06-26 17:01:13 UTC (rev 170482)
@@ -1,3 +1,14 @@
+2014-06-26 Chris Fleizach <[email protected]>
+
+ Add an undo group for each dictated utterance in WebKit
+ https://bugs.webkit.org/show_bug.cgi?id=134086
+
+ Applied review comments from Sam Weinig.
+
+ Move the associated USE #define into Platform.h.
+
+ * wtf/Platform.h:
+
2014-06-25 Geoffrey Garen <[email protected]>
Unreviewed, rolling out r166876.
Modified: trunk/Source/WTF/wtf/Platform.h (170481 => 170482)
--- trunk/Source/WTF/wtf/Platform.h 2014-06-26 16:52:21 UTC (rev 170481)
+++ trunk/Source/WTF/wtf/Platform.h 2014-06-26 17:01:13 UTC (rev 170482)
@@ -1003,6 +1003,10 @@
#define WTF_USE_MARKER_REMOVAL_UPON_EDITING 1
#endif
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 10100
+#define WTF_USE_INSERTION_UNDO_GROUPING 1
+#endif
+
#if PLATFORM(IOS)
#define WTF_USE_PLATFORM_TEXT_TRACK_MENU 1
#endif
Modified: trunk/Source/WebCore/ChangeLog (170481 => 170482)
--- trunk/Source/WebCore/ChangeLog 2014-06-26 16:52:21 UTC (rev 170481)
+++ trunk/Source/WebCore/ChangeLog 2014-06-26 17:01:13 UTC (rev 170482)
@@ -1,3 +1,16 @@
+2014-06-26 Chris Fleizach <[email protected]>
+
+ Add an undo group for each dictated utterance in WebKit
+ https://bugs.webkit.org/show_bug.cgi?id=134086
+
+ Applied review comments from Sam Weinig.
+
+ Move the associated USE #define into Platform.h.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ * editing/mac/TextUndoInsertionMarkup.h: Removed.
+ * editing/mac/TextUndoInsertionMarkupMac.h:
+
2014-06-26 Shivakumar JM <[email protected]>
[EFL][WK2] Fix Debug Build Error in Webcore module.
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (170481 => 170482)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-06-26 16:52:21 UTC (rev 170481)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-06-26 17:01:13 UTC (rev 170482)
@@ -1037,7 +1037,6 @@
293EAE1F1356B2FE0067ACF9 /* RuntimeApplicationChecks.h in Headers */ = {isa = PBXBuildFile; fileRef = 293EAE1E1356B2FE0067ACF9 /* RuntimeApplicationChecks.h */; settings = {ATTRIBUTES = (Private, ); }; };
293EAE211356B32E0067ACF9 /* RuntimeApplicationChecks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 293EAE201356B32E0067ACF9 /* RuntimeApplicationChecks.cpp */; };
29489FC712C00F0300D83F0F /* AccessibilityScrollView.h in Headers */ = {isa = PBXBuildFile; fileRef = 29489FC512C00F0300D83F0F /* AccessibilityScrollView.h */; };
- 29498682195341940072D2BD /* TextUndoInsertionMarkup.h in Headers */ = {isa = PBXBuildFile; fileRef = 29498680195341940072D2BD /* TextUndoInsertionMarkup.h */; settings = {ATTRIBUTES = (Private, ); }; };
29498683195341940072D2BD /* TextUndoInsertionMarkupMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29498681195341940072D2BD /* TextUndoInsertionMarkupMac.mm */; };
297BE3D516C03C08003316BD /* PlatformSpeechSynthesisUtterance.h in Headers */ = {isa = PBXBuildFile; fileRef = 2527CC9116BF8BA1009DDAC0 /* PlatformSpeechSynthesisUtterance.h */; };
297BE3D616C03C0B003316BD /* PlatformSpeechSynthesisVoice.h in Headers */ = {isa = PBXBuildFile; fileRef = 2527CC9216BF90B4009DDAC0 /* PlatformSpeechSynthesisVoice.h */; };
@@ -8005,7 +8004,6 @@
293EAE1E1356B2FE0067ACF9 /* RuntimeApplicationChecks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RuntimeApplicationChecks.h; sourceTree = "<group>"; };
293EAE201356B32E0067ACF9 /* RuntimeApplicationChecks.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RuntimeApplicationChecks.cpp; sourceTree = "<group>"; };
29489FC512C00F0300D83F0F /* AccessibilityScrollView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccessibilityScrollView.h; sourceTree = "<group>"; };
- 29498680195341940072D2BD /* TextUndoInsertionMarkup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TextUndoInsertionMarkup.h; path = mac/TextUndoInsertionMarkup.h; sourceTree = "<group>"; };
29498681195341940072D2BD /* TextUndoInsertionMarkupMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = TextUndoInsertionMarkupMac.mm; path = mac/TextUndoInsertionMarkupMac.mm; sourceTree = "<group>"; };
297BE3D916C043D8003316BD /* PlatformSpeechSynthesizer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlatformSpeechSynthesizer.cpp; sourceTree = "<group>"; };
2981CA9D131822EC00D12F2A /* AccessibilityARIAGrid.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = AccessibilityARIAGrid.cpp; sourceTree = "<group>"; };
@@ -17460,7 +17458,6 @@
93309DCC099E64910056E581 /* TextIterator.cpp */,
93309DCD099E64910056E581 /* TextIterator.h */,
9392146818A6D791000EE688 /* TextIteratorBehavior.h */,
- 29498680195341940072D2BD /* TextUndoInsertionMarkup.h */,
93309DCA099E64910056E581 /* TypingCommand.cpp */,
93309DCB099E64910056E581 /* TypingCommand.h */,
9B2D8A7814997CCF00ECEF3E /* UndoStep.h */,
@@ -26184,7 +26181,6 @@
B2227A690D00BF220071B782 /* SVGPathSegCurvetoCubicSmooth.h in Headers */,
83C1D429178D5AB400141E68 /* SVGPathSegCurvetoCubicSmoothAbs.h in Headers */,
83C1D42A178D5AB400141E68 /* SVGPathSegCurvetoCubicSmoothRel.h in Headers */,
- 29498682195341940072D2BD /* TextUndoInsertionMarkup.h in Headers */,
B2227A6D0D00BF220071B782 /* SVGPathSegCurvetoQuadratic.h in Headers */,
83C1D42B178D5AB400141E68 /* SVGPathSegCurvetoQuadraticAbs.h in Headers */,
83C1D42C178D5AB500141E68 /* SVGPathSegCurvetoQuadraticRel.h in Headers */,
Deleted: trunk/Source/WebCore/editing/mac/TextUndoInsertionMarkup.h (170481 => 170482)
--- trunk/Source/WebCore/editing/mac/TextUndoInsertionMarkup.h 2014-06-26 16:52:21 UTC (rev 170481)
+++ trunk/Source/WebCore/editing/mac/TextUndoInsertionMarkup.h 2014-06-26 17:01:13 UTC (rev 170482)
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2014 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef TextUndoInsertionMarkup_h
-#define TextUndoInsertionMarkup_h
-
-#if !PLATFORM(IOS)
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 10100
-#define WTF_USE_INSERTION_UNDO_GROUPING 1
-#endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 10100
-#endif
-
-#endif
Modified: trunk/Source/WebCore/editing/mac/TextUndoInsertionMarkupMac.h (170481 => 170482)
--- trunk/Source/WebCore/editing/mac/TextUndoInsertionMarkupMac.h 2014-06-26 16:52:21 UTC (rev 170481)
+++ trunk/Source/WebCore/editing/mac/TextUndoInsertionMarkupMac.h 2014-06-26 17:01:13 UTC (rev 170482)
@@ -26,8 +26,6 @@
#ifndef TextUndoInsertionMarkupMac_h
#define TextUndoInsertionMarkupMac_h
-#import <WebCore/TextUndoInsertionMarkup.h>
-
#if USE(INSERTION_UNDO_GROUPING)
#if __has_include(<AppKit/NSTextInputContext_Private.h>)
Modified: trunk/Source/WebKit2/ChangeLog (170481 => 170482)
--- trunk/Source/WebKit2/ChangeLog 2014-06-26 16:52:21 UTC (rev 170481)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-26 17:01:13 UTC (rev 170482)
@@ -1,3 +1,14 @@
+2014-06-26 Chris Fleizach <[email protected]>
+
+ Add an undo group for each dictated utterance in WebKit
+ https://bugs.webkit.org/show_bug.cgi?id=134086
+
+ Applied review comments from Sam Weinig.
+
+ Move the associated USE #define into Platform.h.
+
+ * UIProcess/PageClient.h:
+
2014-06-24 Roger Fong <[email protected]>
Don't allow sudden termination while writing to local storage.
Modified: trunk/Source/WebKit2/UIProcess/PageClient.h (170481 => 170482)
--- trunk/Source/WebKit2/UIProcess/PageClient.h 2014-06-26 16:52:21 UTC (rev 170481)
+++ trunk/Source/WebKit2/UIProcess/PageClient.h 2014-06-26 17:01:13 UTC (rev 170482)
@@ -36,7 +36,6 @@
#if PLATFORM(COCOA)
#include "PluginComplexTextInputState.h"
-#include <WebCore/TextUndoInsertionMarkup.h>
OBJC_CLASS CALayer;
