From f08f95e9d8e6f36be7162c77acefc834764209e1 Mon Sep 17 00:00:00 2001 From: "darin@google.com" Date: Thu, 18 Dec 2008 21:38:04 +0000 Subject: Remove some files that are not needed. Cleanup the Xcode project. Some stuff was in the port group that belonged in the webcore group. R=awalker Review URL: http://codereview.chromium.org/15049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7255 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/port/platform/MIMETypeRegistry.cpp | 1 - webkit/port/platform/mac/DragDataMac.mm | 135 ------------------------------ webkit/webkit.xcodeproj/project.pbxproj | 70 ++++++++-------- 3 files changed, 37 insertions(+), 169 deletions(-) delete mode 100644 webkit/port/platform/MIMETypeRegistry.cpp delete mode 100644 webkit/port/platform/mac/DragDataMac.mm (limited to 'webkit') diff --git a/webkit/port/platform/MIMETypeRegistry.cpp b/webkit/port/platform/MIMETypeRegistry.cpp deleted file mode 100644 index e18a5d6..0000000 --- a/webkit/port/platform/MIMETypeRegistry.cpp +++ /dev/null @@ -1 +0,0 @@ -// TODO(darin): remove this file once xcode projects are fixed. diff --git a/webkit/port/platform/mac/DragDataMac.mm b/webkit/port/platform/mac/DragDataMac.mm deleted file mode 100644 index ee37bba..0000000 --- a/webkit/port/platform/mac/DragDataMac.mm +++ /dev/null @@ -1,135 +0,0 @@ -/* - * Copyright (C) 2007 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 COMPUTER, INC. ``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 COMPUTER, INC. OR - * 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. - */ - -#import "config.h" -#import "DragData.h" - -#import "ClipboardMac.h" -#import "ClipboardAccessPolicy.h" -#import "Document.h" -#import "DocumentFragment.h" -#import "MIMETypeRegistry.h" -#import "Pasteboard.h" -#import "PasteboardHelper.h" - -namespace WebCore { - -DragData::DragData(DragDataRef data, const IntPoint& clientPosition, const IntPoint& globalPosition, - DragOperation sourceOperationMask, PasteboardHelper* pasteboardHelper) - : m_clientPosition(clientPosition) - , m_globalPosition(globalPosition) - , m_platformDragData(data) - , m_draggingSourceOperationMask(sourceOperationMask) - , m_pasteboardHelper(pasteboardHelper) -{ - ASSERT(pasteboardHelper); -} - -bool DragData::canSmartReplace() const -{ - //Need to call this so that the various Pasteboard type strings are intialised - Pasteboard::generalPasteboard(); - return [[[m_platformDragData draggingPasteboard] types] containsObject:WebSmartPastePboardType]; -} - -bool DragData::containsColor() const -{ - return [[[m_platformDragData draggingPasteboard] types] containsObject:NSColorPboardType]; -} - -bool DragData::containsFiles() const -{ - return [[[m_platformDragData draggingPasteboard] types] containsObject:NSFilenamesPboardType]; -} - -void DragData::asFilenames(Vector& result) const -{ - NSArray *filenames = [[m_platformDragData draggingPasteboard] propertyListForType:NSFilenamesPboardType]; - NSEnumerator *fileEnumerator = [filenames objectEnumerator]; - - while (NSString *filename = [fileEnumerator nextObject]) - result.append(filename); -} - -bool DragData::containsPlainText() const -{ - NSPasteboard *pasteboard = [m_platformDragData draggingPasteboard]; - NSArray *types = [pasteboard types]; - - return [types containsObject:NSStringPboardType] - || [types containsObject:NSRTFDPboardType] - || [types containsObject:NSRTFPboardType] - || [types containsObject:NSFilenamesPboardType] - || [NSURL URLFromPasteboard:pasteboard]; -} - -String DragData::asPlainText() const -{ - return m_pasteboardHelper->plainTextFromPasteboard([m_platformDragData draggingPasteboard]); -} - -Color DragData::asColor() const -{ - NSColor *color = [NSColor colorFromPasteboard:[m_platformDragData draggingPasteboard]]; - return makeRGBA((int)([color redComponent] * 255.0 + 0.5), (int)([color greenComponent] * 255.0 + 0.5), - (int)([color blueComponent] * 255.0 + 0.5), (int)([color alphaComponent] * 255.0 + 0.5)); -} - -PassRefPtr DragData::createClipboard(ClipboardAccessPolicy policy) const -{ - return ClipboardMac::create(true, [m_platformDragData draggingPasteboard], policy, 0); -} - -bool DragData::containsCompatibleContent() const -{ - - NSPasteboard *pasteboard = [m_platformDragData draggingPasteboard]; - NSMutableSet *types = [NSMutableSet setWithArray:[pasteboard types]]; - [types intersectSet:[NSSet setWithArray:m_pasteboardHelper->insertablePasteboardTypes()]]; - return [types count] != 0; -} - -bool DragData::containsURL() const -{ - return !asURL().isEmpty(); -} - -String DragData::asURL(String* title) const -{ - return m_pasteboardHelper->urlFromPasteboard([m_platformDragData draggingPasteboard], title); -} - - -PassRefPtr DragData::asFragment(Document* doc) const -{ -#if 0 - // TODO(pinkerton): Find how to get this without objc dom bindings. - return [m_pasteboardHelper->fragmentFromPasteboard([m_platformDragData draggingPasteboard]) _documentFragment]; -#endif - return NULL; -} - -} - diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj index 9a00f2f..9b78f7c 100644 --- a/webkit/webkit.xcodeproj/project.pbxproj +++ b/webkit/webkit.xcodeproj/project.pbxproj @@ -482,6 +482,13 @@ 93AF4BAB0EF6D4FB0073C62D /* PluginsChromium.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93AF4BAA0EF6D4FB0073C62D /* PluginsChromium.cpp */; }; 93AF4BDA0EF6FB960073C62D /* IconChromiumMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93AF4BD90EF6FB960073C62D /* IconChromiumMac.cpp */; }; 93AF4BF30EF6FCD20073C62D /* SoundChromiumPosix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93AF4BF20EF6FCD20073C62D /* SoundChromiumPosix.cpp */; }; + 93AF4CE00EFAEDF80073C62D /* PlatformScreenMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93AF4CDF0EFAEDF80073C62D /* PlatformScreenMac.mm */; }; + 93AF4CE60EFAEE440073C62D /* SSLKeyGeneratorChromium.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93AF4CE20EFAEE440073C62D /* SSLKeyGeneratorChromium.cpp */; }; + 93AF4CE70EFAEE440073C62D /* SystemTimeChromium.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93AF4CE30EFAEE440073C62D /* SystemTimeChromium.cpp */; }; + 93AF4CE80EFAEE440073C62D /* TemporaryLinkStubs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93AF4CE40EFAEE440073C62D /* TemporaryLinkStubs.cpp */; }; + 93AF4CE90EFAEE440073C62D /* TextBreakIteratorInternalICUChromium.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93AF4CE50EFAEE440073C62D /* TextBreakIteratorInternalICUChromium.cpp */; }; + 93AF4D050EFAF0090073C62D /* ScrollView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93AF4D040EFAF0090073C62D /* ScrollView.cpp */; }; + 93AF4D090EFAF2770073C62D /* TextBoundariesChromium.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93AF4D080EFAF2770073C62D /* TextBoundariesChromium.cpp */; }; 93BF8E990EA6B0E50030F05C /* AuthenticationChallengeChromium.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93BF8E600EA6AED30030F05C /* AuthenticationChallengeChromium.cpp */; }; 93BF8E9A0EA6B0EA0030F05C /* CookieJarChromium.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93BF8E610EA6AED30030F05C /* CookieJarChromium.cpp */; }; 93BF8E9B0EA6B0EF0030F05C /* DNSChromium.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93BF8E620EA6AED30030F05C /* DNSChromium.cpp */; }; @@ -574,7 +581,6 @@ E40060DB0EA69E0B0055B38E /* ScriptController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E40060DA0EA69E0B0055B38E /* ScriptController.cpp */; }; E40064540EA90AA10055B38E /* Console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E8E3D0D7F3C48001ECF42 /* Console.cpp */; }; E4006ABA0EC235870055B38E /* AXObjectCacheChromium.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4006AB90EC235870055B38E /* AXObjectCacheChromium.cpp */; }; - E40FB28F0EAFF0BC006F380A /* PlatformScreenMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = E40FB28E0EAFF0BC006F380A /* PlatformScreenMac.mm */; }; E45063BA0E4104700025A81A /* localized_strings.cc in Sources */ = {isa = PBXBuildFile; fileRef = 8254051A0D92E3DA0006B936 /* localized_strings.cc */; }; E4506C0C0EF039DE003BE099 /* dom_serializer.cc in Sources */ = {isa = PBXBuildFile; fileRef = E4506C0A0EF039DE003BE099 /* dom_serializer.cc */; }; E4506C100EF03A2F003BE099 /* entity_map.cc in Sources */ = {isa = PBXBuildFile; fileRef = E4506C0F0EF03A2F003BE099 /* entity_map.cc */; }; @@ -921,7 +927,6 @@ E45625130E268E87005E4685 /* WebCoreTextRenderer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E910A0D7F3CC2001ECF42 /* WebCoreTextRenderer.mm */; }; E45625140E268E87005E4685 /* WebCoreView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E910C0D7F3CC2001ECF42 /* WebCoreView.m */; }; E45625150E268E87005E4685 /* WebFontCache.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E910E0D7F3CC2001ECF42 /* WebFontCache.mm */; }; - E45625180E268E87005E4685 /* MIMETypeRegistry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E91120D7F3CC2001ECF42 /* MIMETypeRegistry.cpp */; }; E456251A0E268E87005E4685 /* Credential.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E91240D7F3CC2001ECF42 /* Credential.cpp */; }; E456251B0E268E87005E4685 /* FormData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E912C0D7F3CC2001ECF42 /* FormData.cpp */; }; E456251C0E268E87005E4685 /* HTTPParsers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E912F0D7F3CC2001ECF42 /* HTTPParsers.cpp */; }; @@ -1287,14 +1292,8 @@ E473F64E0EAE0005006C2098 /* MimeTypeRegistryChromium.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E473F64D0EAE0005006C2098 /* MimeTypeRegistryChromium.cpp */; }; E473F6530EAE002F006C2098 /* PlatformKeyboardEventChromium.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E473F6500EAE002F006C2098 /* PlatformKeyboardEventChromium.cpp */; }; E473F6600EAE00A6006C2098 /* PopupMenuChromium.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E473F65E0EAE00A6006C2098 /* PopupMenuChromium.cpp */; }; - E473F6620EAE00D5006C2098 /* ScrollView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E473F6610EAE00D5006C2098 /* ScrollView.cpp */; }; E473F6640EAE00E4006C2098 /* SearchPopupMenuChromium.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E473F6630EAE00E4006C2098 /* SearchPopupMenuChromium.cpp */; }; E473F6660EAE00F4006C2098 /* SharedTimerChromium.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E473F6650EAE00F4006C2098 /* SharedTimerChromium.cpp */; }; - E473F66E0EAE012D006C2098 /* SSLKeyGeneratorChromium.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E473F66D0EAE012D006C2098 /* SSLKeyGeneratorChromium.cpp */; }; - E473F6700EAE016A006C2098 /* SystemTimeChromium.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E473F66F0EAE016A006C2098 /* SystemTimeChromium.cpp */; }; - E473F6750EAE0199006C2098 /* TemporaryLinkStubs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E473F6740EAE0199006C2098 /* TemporaryLinkStubs.cpp */; }; - E473F6780EAE01A1006C2098 /* TextBoundariesChromium.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E473F6760EAE01A1006C2098 /* TextBoundariesChromium.cpp */; }; - E473F6790EAE01A1006C2098 /* TextBreakIteratorInternalICUChromium.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E473F6770EAE01A1006C2098 /* TextBreakIteratorInternalICUChromium.cpp */; }; E473F6810EAE01BE006C2098 /* WidgetChromium.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E473F67F0EAE01BE006C2098 /* WidgetChromium.cpp */; }; E473F6860EAE01F5006C2098 /* EventHandlerChromium.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E473F6850EAE01F5006C2098 /* EventHandlerChromium.cpp */; }; E473F6880EAE021B006C2098 /* FrameChromium.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E473F6870EAE021B006C2098 /* FrameChromium.cpp */; }; @@ -3140,7 +3139,6 @@ 7B5E910C0D7F3CC2001ECF42 /* WebCoreView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebCoreView.m; sourceTree = ""; }; 7B5E910D0D7F3CC2001ECF42 /* WebFontCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebFontCache.h; sourceTree = ""; }; 7B5E910E0D7F3CC2001ECF42 /* WebFontCache.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebFontCache.mm; sourceTree = ""; }; - 7B5E91120D7F3CC2001ECF42 /* MIMETypeRegistry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MIMETypeRegistry.cpp; sourceTree = ""; }; 7B5E91130D7F3CC2001ECF42 /* MIMETypeRegistry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MIMETypeRegistry.h; sourceTree = ""; }; 7B5E91240D7F3CC2001ECF42 /* Credential.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Credential.cpp; sourceTree = ""; }; 7B5E91250D7F3CC2001ECF42 /* Credential.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Credential.h; sourceTree = ""; }; @@ -3995,6 +3993,13 @@ 93AF4BAA0EF6D4FB0073C62D /* PluginsChromium.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PluginsChromium.cpp; path = chromium/PluginsChromium.cpp; sourceTree = ""; }; 93AF4BD90EF6FB960073C62D /* IconChromiumMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IconChromiumMac.cpp; sourceTree = ""; }; 93AF4BF20EF6FCD20073C62D /* SoundChromiumPosix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SoundChromiumPosix.cpp; sourceTree = ""; }; + 93AF4CDF0EFAEDF80073C62D /* PlatformScreenMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = PlatformScreenMac.mm; path = mac/PlatformScreenMac.mm; sourceTree = ""; }; + 93AF4CE20EFAEE440073C62D /* SSLKeyGeneratorChromium.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SSLKeyGeneratorChromium.cpp; sourceTree = ""; }; + 93AF4CE30EFAEE440073C62D /* SystemTimeChromium.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SystemTimeChromium.cpp; sourceTree = ""; }; + 93AF4CE40EFAEE440073C62D /* TemporaryLinkStubs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TemporaryLinkStubs.cpp; sourceTree = ""; }; + 93AF4CE50EFAEE440073C62D /* TextBreakIteratorInternalICUChromium.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextBreakIteratorInternalICUChromium.cpp; sourceTree = ""; }; + 93AF4D040EFAF0090073C62D /* ScrollView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollView.cpp; sourceTree = ""; }; + 93AF4D080EFAF2770073C62D /* TextBoundariesChromium.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextBoundariesChromium.cpp; sourceTree = ""; }; 93BF8E5F0EA6AED30030F05C /* AuthenticationChallenge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AuthenticationChallenge.h; path = chromium/AuthenticationChallenge.h; sourceTree = ""; }; 93BF8E600EA6AED30030F05C /* AuthenticationChallengeChromium.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AuthenticationChallengeChromium.cpp; path = chromium/AuthenticationChallengeChromium.cpp; sourceTree = ""; }; 93BF8E610EA6AED30030F05C /* CookieJarChromium.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CookieJarChromium.cpp; path = chromium/CookieJarChromium.cpp; sourceTree = ""; }; @@ -4230,7 +4235,6 @@ E40060DA0EA69E0B0055B38E /* ScriptController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptController.cpp; sourceTree = ""; }; E40063760EA908220055B38E /* ScriptCallContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ScriptCallContext.cpp; path = ../third_party/WebKit/WebCore/bindings/js/ScriptCallContext.cpp; sourceTree = SOURCE_ROOT; }; E4006AB90EC235870055B38E /* AXObjectCacheChromium.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AXObjectCacheChromium.cpp; sourceTree = ""; }; - E40FB28E0EAFF0BC006F380A /* PlatformScreenMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = PlatformScreenMac.mm; path = mac/PlatformScreenMac.mm; sourceTree = ""; }; E4506C0A0EF039DE003BE099 /* dom_serializer.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dom_serializer.cc; sourceTree = ""; }; E4506C0B0EF039DE003BE099 /* dom_serializer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dom_serializer.h; sourceTree = ""; }; E4506C0E0EF03A2F003BE099 /* entity_map.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = entity_map.h; sourceTree = ""; }; @@ -4256,14 +4260,8 @@ E473F65D0EAE009A006C2098 /* PlatformWidget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformWidget.h; sourceTree = ""; }; E473F65E0EAE00A6006C2098 /* PopupMenuChromium.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PopupMenuChromium.cpp; sourceTree = ""; }; E473F65F0EAE00A6006C2098 /* PopupMenuPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PopupMenuPrivate.h; sourceTree = ""; }; - E473F6610EAE00D5006C2098 /* ScrollView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ScrollView.cpp; path = ../../../third_party/WebKit/WebCore/platform/ScrollView.cpp; sourceTree = ""; }; E473F6630EAE00E4006C2098 /* SearchPopupMenuChromium.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SearchPopupMenuChromium.cpp; sourceTree = ""; }; E473F6650EAE00F4006C2098 /* SharedTimerChromium.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SharedTimerChromium.cpp; sourceTree = ""; }; - E473F66D0EAE012D006C2098 /* SSLKeyGeneratorChromium.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SSLKeyGeneratorChromium.cpp; path = chromium/SSLKeyGeneratorChromium.cpp; sourceTree = ""; }; - E473F66F0EAE016A006C2098 /* SystemTimeChromium.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SystemTimeChromium.cpp; path = chromium/SystemTimeChromium.cpp; sourceTree = ""; }; - E473F6740EAE0199006C2098 /* TemporaryLinkStubs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TemporaryLinkStubs.cpp; path = chromium/TemporaryLinkStubs.cpp; sourceTree = ""; }; - E473F6760EAE01A1006C2098 /* TextBoundariesChromium.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TextBoundariesChromium.cpp; path = chromium/TextBoundariesChromium.cpp; sourceTree = ""; }; - E473F6770EAE01A1006C2098 /* TextBreakIteratorInternalICUChromium.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TextBreakIteratorInternalICUChromium.cpp; path = chromium/TextBreakIteratorInternalICUChromium.cpp; sourceTree = ""; }; E473F67F0EAE01BE006C2098 /* WidgetChromium.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WidgetChromium.cpp; sourceTree = ""; }; E473F6850EAE01F5006C2098 /* EventHandlerChromium.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EventHandlerChromium.cpp; sourceTree = ""; }; E473F6870EAE021B006C2098 /* FrameChromium.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FrameChromium.cpp; sourceTree = ""; }; @@ -5646,7 +5644,6 @@ 7B5E90D00D7F3CC2001ECF42 /* LocalizedStrings.h */, 7B5E90D20D7F3CC2001ECF42 /* Logging.cpp */, 7B5E90D30D7F3CC2001ECF42 /* Logging.h */, - 7B5E91120D7F3CC2001ECF42 /* MIMETypeRegistry.cpp */, 7B5E91130D7F3CC2001ECF42 /* MIMETypeRegistry.h */, 7B5E91530D7F3CC2001ECF42 /* NotImplemented.h */, 7B5E91540D7F3CC2001ECF42 /* Pasteboard.h */, @@ -5666,6 +5663,7 @@ ABBD24C30EB7C17E00BEC658 /* ScrollbarThemeComposite.cpp */, ABBD24C40EB7C17E00BEC658 /* ScrollbarThemeComposite.h */, 7B5E91890D7F3CC2001ECF42 /* ScrollTypes.h */, + 93AF4D040EFAF0090073C62D /* ScrollView.cpp */, 7B5E918A0D7F3CC2001ECF42 /* ScrollView.h */, 7B5E918B0D7F3CC2001ECF42 /* SearchPopupMenu.h */, 7B5E91900D7F3CC2001ECF42 /* SharedBuffer.cpp */, @@ -7404,17 +7402,11 @@ isa = PBXGroup; children = ( E473F6310EADFEBC006C2098 /* chromium */, - 82C260620DCB9FFE005CFE91 /* image-decoders */, 822B1BE70DC77910005C9A96 /* graphics */, + 82C260620DCB9FFE005CFE91 /* image-decoders */, + 93AF4CDE0EFAEDC20073C62D /* mac */, E45628270E269688005E4685 /* network */, AB8FE8A40E9BCD3E0051E7B4 /* GKURL.cpp */, - E40FB28E0EAFF0BC006F380A /* PlatformScreenMac.mm */, - E473F6610EAE00D5006C2098 /* ScrollView.cpp */, - E473F66D0EAE012D006C2098 /* SSLKeyGeneratorChromium.cpp */, - E473F66F0EAE016A006C2098 /* SystemTimeChromium.cpp */, - E473F6740EAE0199006C2098 /* TemporaryLinkStubs.cpp */, - E473F6760EAE01A1006C2098 /* TextBoundariesChromium.cpp */, - E473F6770EAE01A1006C2098 /* TextBreakIteratorInternalICUChromium.cpp */, ); path = platform; sourceTree = ""; @@ -7660,6 +7652,14 @@ name = chromium; sourceTree = ""; }; + 93AF4CDE0EFAEDC20073C62D /* mac */ = { + isa = PBXGroup; + children = ( + 93AF4CDF0EFAEDF80073C62D /* PlatformScreenMac.mm */, + ); + name = mac; + sourceTree = ""; + }; 93BF8E5D0EA6AE880030F05C /* chromium */ = { isa = PBXGroup; children = ( @@ -7849,6 +7849,11 @@ E473F6630EAE00E4006C2098 /* SearchPopupMenuChromium.cpp */, E473F6650EAE00F4006C2098 /* SharedTimerChromium.cpp */, 93AF4BF20EF6FCD20073C62D /* SoundChromiumPosix.cpp */, + 93AF4CE20EFAEE440073C62D /* SSLKeyGeneratorChromium.cpp */, + 93AF4CE30EFAEE440073C62D /* SystemTimeChromium.cpp */, + 93AF4CE40EFAEE440073C62D /* TemporaryLinkStubs.cpp */, + 93AF4D080EFAF2770073C62D /* TextBoundariesChromium.cpp */, + 93AF4CE50EFAEE440073C62D /* TextBreakIteratorInternalICUChromium.cpp */, E473F67F0EAE01BE006C2098 /* WidgetChromium.cpp */, ); path = chromium; @@ -8844,7 +8849,6 @@ ABBD246E0EB7B1DA00BEC658 /* MessagePort.cpp in Sources */, 4DDC62B60EAD142D00FB5EBE /* MimeType.cpp in Sources */, 4DDC62B70EAD142D00FB5EBE /* MimeTypeArray.cpp in Sources */, - E45625180E268E87005E4685 /* MIMETypeRegistry.cpp in Sources */, E45624070E268E87005E4685 /* ModifySelectionListLevel.cpp in Sources */, E45623CC0E268E87005E4685 /* MouseEvent.cpp in Sources */, E45624AE0E268E87005E4685 /* MouseEventWithHitTestResults.cpp in Sources */, @@ -8986,6 +8990,7 @@ E456252A0E268E87005E4685 /* Scrollbar.cpp in Sources */, ABBD24C60EB7C17E00BEC658 /* ScrollbarThemeComposite.cpp in Sources */, ABBD24E80EB7C35500BEC658 /* ScrollbarThemeMac.mm in Sources */, + 93AF4D050EFAF0090073C62D /* ScrollView.cpp in Sources */, E456252B0E268E87005E4685 /* SecurityOrigin.cpp in Sources */, E45624E70E268E87005E4685 /* SegmentedFontData.cpp in Sources */, E456253A0E268E87005E4685 /* SegmentedString.cpp in Sources */, @@ -9422,23 +9427,22 @@ 532E351C0ECA0F290097577C /* PasteboardChromium.cpp in Sources */, 93817B980EF1CD9600993F02 /* PlatformContextSkia.cpp in Sources */, E473F6530EAE002F006C2098 /* PlatformKeyboardEventChromium.cpp in Sources */, - E40FB28F0EAFF0BC006F380A /* PlatformScreenMac.mm in Sources */, + 93AF4CE00EFAEDF80073C62D /* PlatformScreenMac.mm in Sources */, 938181440EF6D27600993F02 /* PluginDataChromium.cpp in Sources */, 93AF4BAB0EF6D4FB0073C62D /* PluginsChromium.cpp in Sources */, 7B2B0A650E3143EC00D4C6B7 /* PNGImageDecoder.cpp in Sources */, E473F6600EAE00A6006C2098 /* PopupMenuChromium.cpp in Sources */, 4D11C5520E9AC23100EF7617 /* RenderThemeMac.mm in Sources */, E40060DB0EA69E0B0055B38E /* ScriptController.cpp in Sources */, - E473F6620EAE00D5006C2098 /* ScrollView.cpp in Sources */, E473F6640EAE00E4006C2098 /* SearchPopupMenuChromium.cpp in Sources */, E473F6660EAE00F4006C2098 /* SharedTimerChromium.cpp in Sources */, 93817B990EF1CD9600993F02 /* SkiaUtils.cpp in Sources */, 93AF4BF30EF6FCD20073C62D /* SoundChromiumPosix.cpp in Sources */, - E473F66E0EAE012D006C2098 /* SSLKeyGeneratorChromium.cpp in Sources */, - E473F6700EAE016A006C2098 /* SystemTimeChromium.cpp in Sources */, - E473F6750EAE0199006C2098 /* TemporaryLinkStubs.cpp in Sources */, - E473F6780EAE01A1006C2098 /* TextBoundariesChromium.cpp in Sources */, - E473F6790EAE01A1006C2098 /* TextBreakIteratorInternalICUChromium.cpp in Sources */, + 93AF4CE60EFAEE440073C62D /* SSLKeyGeneratorChromium.cpp in Sources */, + 93AF4CE70EFAEE440073C62D /* SystemTimeChromium.cpp in Sources */, + 93AF4CE80EFAEE440073C62D /* TemporaryLinkStubs.cpp in Sources */, + 93AF4CE90EFAEE440073C62D /* TextBreakIteratorInternalICUChromium.cpp in Sources */, + 93AF4D090EFAF2770073C62D /* TextBoundariesChromium.cpp in Sources */, 4DB7F55D0E9BD66300C66CE0 /* V8XMLHttpRequestCustom.cpp in Sources */, E473F6810EAE01BE006C2098 /* WidgetChromium.cpp in Sources */, E45627EC0E2694B8005E4685 /* XBMImageDecoder.cpp in Sources */, -- cgit v1.1