Update platform/iphone to platform/ios
authorbenjamin@webkit.org <benjamin@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 2 Dec 2011 23:36:06 +0000 (23:36 +0000)
committerbenjamin@webkit.org <benjamin@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 2 Dec 2011 23:36:06 +0000 (23:36 +0000)
https://bugs.webkit.org/show_bug.cgi?id=73708

Patch by Benjamin Poulain <bpoulain@apple.com> on 2011-12-02
Reviewed by Darin Adler.

The platform is now best known as iOS, update the platform layer accordingly.

* Configurations/WebCore.xcconfig:
* WebCore.gypi:
* WebCore.xcodeproj/project.pbxproj:
* platform/cocoa/KeyEventCocoa.mm:
* platform/ios/KeyEventCodesIOS.h: Renamed from Source/WebCore/platform/iphone/KeyEventCodesIPhone.h.
* platform/ios/KeyEventIOS.mm: Renamed from Source/WebCore/platform/iphone/KeyEventIPhone.mm.
(WebCore::keyIdentifierForKeyEvent):
(WebCore::PlatformKeyboardEvent::PlatformKeyboardEvent):
(WebCore::PlatformKeyboardEvent::disambiguateKeyDownEvent):
(WebCore::PlatformKeyboardEvent::currentCapsLockState):
(WebCore::PlatformKeyboardEvent::getCurrentModifierState):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@101867 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/Configurations/WebCore.xcconfig
Source/WebCore/WebCore.gypi
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/platform/cocoa/KeyEventCocoa.mm
Source/WebCore/platform/ios/KeyEventCodesIOS.h [moved from Source/WebCore/platform/iphone/KeyEventCodesIPhone.h with 98% similarity]
Source/WebCore/platform/ios/KeyEventIOS.mm [moved from Source/WebCore/platform/iphone/KeyEventIPhone.mm with 94% similarity]

index f1d3d23732e26f622bd8f6b8d8569cc469cebf04..bd61b199402b37a4340d4e381e70708f5f8122cc 100644 (file)
@@ -1,3 +1,24 @@
+2011-12-02  Benjamin Poulain  <bpoulain@apple.com>
+
+        Update platform/iphone to platform/ios
+        https://bugs.webkit.org/show_bug.cgi?id=73708
+
+        Reviewed by Darin Adler.
+
+        The platform is now best known as iOS, update the platform layer accordingly.
+
+        * Configurations/WebCore.xcconfig:
+        * WebCore.gypi:
+        * WebCore.xcodeproj/project.pbxproj:
+        * platform/cocoa/KeyEventCocoa.mm:
+        * platform/ios/KeyEventCodesIOS.h: Renamed from Source/WebCore/platform/iphone/KeyEventCodesIPhone.h.
+        * platform/ios/KeyEventIOS.mm: Renamed from Source/WebCore/platform/iphone/KeyEventIPhone.mm.
+        (WebCore::keyIdentifierForKeyEvent):
+        (WebCore::PlatformKeyboardEvent::PlatformKeyboardEvent):
+        (WebCore::PlatformKeyboardEvent::disambiguateKeyDownEvent):
+        (WebCore::PlatformKeyboardEvent::currentCapsLockState):
+        (WebCore::PlatformKeyboardEvent::getCurrentModifierState):
+
 2011-12-02  Jonathan Backer  <backer@chromium.org>
 
         [chromium] Eliminate unnecessary state on previous CL
index ec4f6d8816527c9700910690407a432f27bac835..27fbdedb2239de0c79258e37fad6742b8b549de8 100644 (file)
@@ -83,6 +83,7 @@ EXCLUDED_SOURCE_FILE_NAMES_SVG_DOM_OBJC_BINDINGS_ENABLE_SVG_DOM_OBJC_BINDINGS =
 EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(REAL_PLATFORM_NAME)) $(EXCLUDED_SOURCE_FILE_NAMES_SVG_DOM_OBJC_BINDINGS);
 EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.tiff *Cursor.png localizedStrings.js;
 EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
+EXCLUDED_SOURCE_FILE_NAMES_macosx = *IOS.h *IOS.cpp *IOS.mm
 
 SQLITE3_LIBRARY = $(SQLITE3_LIBRARY_$(REAL_PLATFORM_NAME));
 SQLITE3_LIBRARY_iphoneos = sqlite3;
index 414d2e29480738b5137bb83d545cf29ef9024a52..cc6e8138f2177adcee452a18b93bf92657ce0504 100644 (file)
             'platform/image-encoders/skia/PNGImageEncoder.h',
             'platform/image-encoders/skia/WEBPImageEncoder.cpp',
             'platform/image-encoders/skia/WEBPImageEncoder.h',
-            'platform/iphone/KeyEventCodesIPhone.h',
-            'platform/iphone/KeyEventIPhone.mm',
+            'platform/ios/KeyEventCodesIOS.h',
+            'platform/ios/KeyEventIOS.mm',
             'platform/mac/AutodrainedPool.mm',
             'platform/mac/BlockExceptions.mm',
             'platform/mac/ClipboardMac.mm',
index b3b21da8342331684293be77c1606662700831de..3f183dbd986c4ae5f4850fabb0a3ff544944f41c 100644 (file)
                24F54EAD101FE914000AE741 /* ApplicationCacheHost.h in Headers */ = {isa = PBXBuildFile; fileRef = 24F54EAB101FE914000AE741 /* ApplicationCacheHost.h */; settings = {ATTRIBUTES = (); }; };
                2542F4DA1166C25A00E89A86 /* UserGestureIndicator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2542F4D81166C25A00E89A86 /* UserGestureIndicator.cpp */; };
                2542F4DB1166C25A00E89A86 /* UserGestureIndicator.h in Headers */ = {isa = PBXBuildFile; fileRef = 2542F4D91166C25A00E89A86 /* UserGestureIndicator.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               265541391489811C000DFC5D /* KeyEventCodesIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 265541371489811C000DFC5D /* KeyEventCodesIOS.h */; };
+               2655413A1489811C000DFC5D /* KeyEventIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 265541381489811C000DFC5D /* KeyEventIOS.mm */; };
                26E98A10130A9FCA008EB7B2 /* TextCodecASCIIFastPath.h in Headers */ = {isa = PBXBuildFile; fileRef = 26E98A0F130A9FCA008EB7B2 /* TextCodecASCIIFastPath.h */; };
                2917B5611473496C0052C9D0 /* LayerFlushScheduler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2917B55E1473496C0052C9D0 /* LayerFlushScheduler.cpp */; };
                2917B5621473496C0052C9D0 /* LayerFlushScheduler.h in Headers */ = {isa = PBXBuildFile; fileRef = 2917B55F1473496C0052C9D0 /* LayerFlushScheduler.h */; settings = {ATTRIBUTES = (Private, ); }; };
                A5732B0B136A161D005C8D7C /* DateComponents.h in Headers */ = {isa = PBXBuildFile; fileRef = A5732B09136A161D005C8D7C /* DateComponents.h */; };
                A5732B0D136A16C4005C8D7C /* LocalizedDate.h in Headers */ = {isa = PBXBuildFile; fileRef = A5732B0C136A16C4005C8D7C /* LocalizedDate.h */; };
                A5732B0F136A1715005C8D7C /* LocalizedDateNone.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5732B0E136A1715005C8D7C /* LocalizedDateNone.cpp */; };
-               A59E3C1E11580F510072928E /* KeyEventCodesIPhone.h in Headers */ = {isa = PBXBuildFile; fileRef = A59E3C1C11580F510072928E /* KeyEventCodesIPhone.h */; };
-               A59E3C1F11580F510072928E /* KeyEventIPhone.mm in Sources */ = {isa = PBXBuildFile; fileRef = A59E3C1D11580F510072928E /* KeyEventIPhone.mm */; };
                A5ABB78713B904BC00F197E3 /* LineBreakIteratorPoolICU.h in Headers */ = {isa = PBXBuildFile; fileRef = A5ABB78613B904BC00F197E3 /* LineBreakIteratorPoolICU.h */; };
                A5AFB34F115151A700B045CB /* StepRange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5AFB34D115151A700B045CB /* StepRange.cpp */; };
                A5AFB350115151A700B045CB /* StepRange.h in Headers */ = {isa = PBXBuildFile; fileRef = A5AFB34E115151A700B045CB /* StepRange.h */; };
                24F54EAB101FE914000AE741 /* ApplicationCacheHost.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ApplicationCacheHost.h; sourceTree = "<group>"; };
                2542F4D81166C25A00E89A86 /* UserGestureIndicator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UserGestureIndicator.cpp; sourceTree = "<group>"; };
                2542F4D91166C25A00E89A86 /* UserGestureIndicator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserGestureIndicator.h; sourceTree = "<group>"; };
+               265541371489811C000DFC5D /* KeyEventCodesIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KeyEventCodesIOS.h; path = ios/KeyEventCodesIOS.h; sourceTree = "<group>"; };
+               265541381489811C000DFC5D /* KeyEventIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = KeyEventIOS.mm; path = ios/KeyEventIOS.mm; sourceTree = "<group>"; };
                26E98A0F130A9FCA008EB7B2 /* TextCodecASCIIFastPath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextCodecASCIIFastPath.h; sourceTree = "<group>"; };
                2917B55E1473496C0052C9D0 /* LayerFlushScheduler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LayerFlushScheduler.cpp; path = ca/LayerFlushScheduler.cpp; sourceTree = "<group>"; };
                2917B55F1473496C0052C9D0 /* LayerFlushScheduler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LayerFlushScheduler.h; path = ca/LayerFlushScheduler.h; sourceTree = "<group>"; };
                A5732B09136A161D005C8D7C /* DateComponents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DateComponents.h; sourceTree = "<group>"; };
                A5732B0C136A16C4005C8D7C /* LocalizedDate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocalizedDate.h; sourceTree = "<group>"; };
                A5732B0E136A1715005C8D7C /* LocalizedDateNone.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LocalizedDateNone.cpp; sourceTree = "<group>"; };
-               A59E3C1C11580F510072928E /* KeyEventCodesIPhone.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KeyEventCodesIPhone.h; path = iphone/KeyEventCodesIPhone.h; sourceTree = "<group>"; };
-               A59E3C1D11580F510072928E /* KeyEventIPhone.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = KeyEventIPhone.mm; path = iphone/KeyEventIPhone.mm; sourceTree = "<group>"; };
                A5ABB78613B904BC00F197E3 /* LineBreakIteratorPoolICU.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LineBreakIteratorPoolICU.h; sourceTree = "<group>"; };
                A5AFB34D115151A700B045CB /* StepRange.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StepRange.cpp; sourceTree = "<group>"; };
                A5AFB34E115151A700B045CB /* StepRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StepRange.h; sourceTree = "<group>"; };
                        name = parser;
                        sourceTree = "<group>";
                };
-               A59E3C1B11580F340072928E /* iphone */ = {
+               A59E3C1B11580F340072928E /* ios */ = {
                        isa = PBXGroup;
                        children = (
-                               A59E3C1C11580F510072928E /* KeyEventCodesIPhone.h */,
-                               A59E3C1D11580F510072928E /* KeyEventIPhone.mm */,
+                               265541371489811C000DFC5D /* KeyEventCodesIOS.h */,
+                               265541381489811C000DFC5D /* KeyEventIOS.mm */,
                        );
-                       name = iphone;
+                       name = ios;
                        sourceTree = "<group>";
                };
                A5C974CE11485FDA0066F2AB /* cocoa */ = {
                                1AE42F670AA4B8CB00C8612D /* cf */,
                                A5C974CE11485FDA0066F2AB /* cocoa */,
                                B2A015910AF6CD53006BCE0E /* graphics */,
-                               A59E3C1B11580F340072928E /* iphone */,
+                               A59E3C1B11580F340072928E /* ios */,
                                8CADF2A2135C7B36009EF43F /* leveldb */,
                                6582A14809999D6C00BEEB6D /* mac */,
                                59C77F101054591C00506104 /* mock */,
                                BCEFE1EB0DCA5F6400739219 /* JSXSLTProcessor.h in Headers */,
                                85031B440A44EFC700F992E0 /* KeyboardEvent.h in Headers */,
                                A513B3D7114B1666001C429B /* KeyEventCocoa.h in Headers */,
-                               A59E3C1E11580F510072928E /* KeyEventCodesIPhone.h in Headers */,
                                316FE11A0E6E1DA700BF6088 /* KeyframeAnimation.h in Headers */,
                                BC5EBA110E823E4700B25965 /* KeyframeList.h in Headers */,
                                521D46F811AEC9B100514613 /* KillRing.h in Headers */,
                                5038BF2B14750F190095E0D1 /* FilterOperations.h in Headers */,
                                6E3FAD3914733F4000E42306 /* JSWebGLCompressedTextures.h in Headers */,
                                6E3FAE8F14733FDB00E42306 /* WebGLCompressedTextures.h in Headers */,
+                               265541391489811C000DFC5D /* KeyEventCodesIOS.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                                BCEFE1E50DCA5F3300739219 /* JSXSLTProcessorCustom.cpp in Sources */,
                                85031B430A44EFC700F992E0 /* KeyboardEvent.cpp in Sources */,
                                A513B3D8114B166A001C429B /* KeyEventCocoa.mm in Sources */,
-                               A59E3C1F11580F510072928E /* KeyEventIPhone.mm in Sources */,
                                935C477009AC4D7300A6AAB4 /* KeyEventMac.mm in Sources */,
                                316FE1190E6E1DA700BF6088 /* KeyframeAnimation.cpp in Sources */,
                                BC5EBA100E823E4700B25965 /* KeyframeList.cpp in Sources */,
                                5038BF2A14750F190095E0D1 /* FilterOperations.cpp in Sources */,
                                6E3FAD3814733F4000E42306 /* JSWebGLCompressedTextures.cpp in Sources */,
                                6E3FAE8E14733FDB00E42306 /* WebGLCompressedTextures.cpp in Sources */,
+                               2655413A1489811C000DFC5D /* KeyEventIOS.mm in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
index a2b5c9c3c456ad1043b215b01c4064b64e18e290..27b04aecebef8f083e4b8b2e85e2c9869df61609 100644 (file)
@@ -32,7 +32,7 @@
 #import <wtf/ASCIICType.h>
 
 #if PLATFORM(IOS)
-#import "KeyEventCodesIPhone.h"
+#import "KeyEventCodesIOS.h"
 #endif
 
 using namespace WTF;
similarity index 98%
rename from Source/WebCore/platform/iphone/KeyEventCodesIPhone.h
rename to Source/WebCore/platform/ios/KeyEventCodesIOS.h
index 180d7089cd70cc85c677fcf357475f715afd8bf1..2fce80a89a664014b54a3b74422066aaed6d353b 100644 (file)
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef KeyEventCodesIPhone_h
-#define KeyEventCodesIPhone_h
+#ifndef KeyEventCodesIOS_h
+#define KeyEventCodesIOS_h
 
 // Unicodes we reserve for function keys on the keyboard,
 // OpenStep reserves the range 0xF700-0xF8FF for this purpose.
@@ -118,4 +118,4 @@ enum {
     NSDeleteCharacter = 0x007f
 };
 
-#endif // KeyEventCodesIPhone_h
+#endif // KeyEventCodesIOS_h
similarity index 94%
rename from Source/WebCore/platform/iphone/KeyEventIPhone.mm
rename to Source/WebCore/platform/ios/KeyEventIOS.mm
index 7e021b54dba14af2d5e342a9f62464d11677cba2..bd8256bc7e45a2d7b0cff67e6844d3e09bd9273f 100644 (file)
@@ -30,6 +30,7 @@
 
 #import "KeyEventCocoa.h"
 #import "Logging.h"
+#import "NotImplemented.h"
 #import "WebEvent.h"
 
 using namespace WTF;
@@ -111,7 +112,17 @@ void PlatformKeyboardEvent::disambiguateKeyDownEvent(Type type, bool backwardCom
 
 bool PlatformKeyboardEvent::currentCapsLockState()
 {
-    return 0;
+    notImplemented();
+    return false;
+}
+
+void PlatformKeyboardEvent::getCurrentModifierState(bool& shiftKey, bool& ctrlKey, bool& altKey, bool& metaKey)
+{
+    notImplemented();
+    shiftKey = false;
+    ctrlKey = false;
+    altKey = false;
+    metaKey = false;
 }
 
 }