Changeset 150049 in webkit


Ignore:
Timestamp:
May 13, 2013 7:21:12 PM (11 years ago)
Author:
ddkilzer@apple.com
Message:

Upstream iOS Clipboard and Pasteboard changes
<​http://webkit.org/b/116062>

Reviewed by Darin Adler.

  • WebCore.xcodeproj/project.pbxproj:
  • dom/Clipboard.h:
  • platform/Pasteboard.h:
  • platform/ios/ClipboardIOS.h: Added.
  • platform/ios/ClipboardIOS.mm: Added.
  • platform/ios/PasteboardIOS.mm: Added.
Location:
trunk/Source/WebCore
Files:
3 added
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r150047 r150049  
     12013-05-13  David Kilzer  <ddkilzer@apple.com>
     2
     3        Upstream iOS Clipboard and Pasteboard changes
     4        <http://webkit.org/b/116062>
     5
     6        Reviewed by Darin Adler.
     7
     8        * WebCore.xcodeproj/project.pbxproj:
     9        * dom/Clipboard.h:
     10        * platform/Pasteboard.h:
     11        * platform/ios/ClipboardIOS.h: Added.
     12        * platform/ios/ClipboardIOS.mm: Added.
     13        * platform/ios/PasteboardIOS.mm: Added.
     14
    1152013-05-13  Huang Dongsung  <luxtella@company100.net>
    216

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r150045 r150049  
    51675167                C572EE1F1201C9BC007D8F82 /* JSIDBIndex.h in Headers */ = {isa = PBXBuildFile; fileRef = C572EE1D1201C9BC007D8F82 /* JSIDBIndex.h */; };
    51685168                C57FEDE11212EE9C0097BE65 /* FileSystem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C57FEDE01212EE9C0097BE65 /* FileSystem.cpp */; };
     5169                C585381913A7DD4E00A3BBEE /* ClipboardIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = C585381713A7DD4E00A3BBEE /* ClipboardIOS.h */; };
     5170                C585381A13A7DD4E00A3BBEE /* ClipboardIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = C585381813A7DD4E00A3BBEE /* ClipboardIOS.mm */; };
    51695171                C585A66211D4FAC5004C3E4B /* IDBBindingUtilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C585A66011D4FAC5004C3E4B /* IDBBindingUtilities.cpp */; };
    51705172                C585A66311D4FAC5004C3E4B /* IDBBindingUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = C585A66111D4FAC5004C3E4B /* IDBBindingUtilities.h */; };
    … …  
    55415543                E45322AB140CE267005A0F92 /* SelectorQuery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E45322A9140CE267005A0F92 /* SelectorQuery.cpp */; };
    55425544                E45322AC140CE267005A0F92 /* SelectorQuery.h in Headers */ = {isa = PBXBuildFile; fileRef = E45322AA140CE267005A0F92 /* SelectorQuery.h */; };
     5545                E453901E0EAFCACA003695C8 /* PasteboardIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = E45390190EAFCACA003695C8 /* PasteboardIOS.mm */; };
    55435546                E45390460EAFD637003695C8 /* SharedTimerIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = E45390350EAFD637003695C8 /* SharedTimerIOS.mm */; };
    55445547                E462A4A1113E71BE004A4220 /* IntPointHash.h in Headers */ = {isa = PBXBuildFile; fileRef = E462A4A0113E71BE004A4220 /* IntPointHash.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    1190311906                C572EE1D1201C9BC007D8F82 /* JSIDBIndex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSIDBIndex.h; sourceTree = "<group>"; };
    1190411907                C57FEDE01212EE9C0097BE65 /* FileSystem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileSystem.cpp; sourceTree = "<group>"; };
     11908                C585381713A7DD4E00A3BBEE /* ClipboardIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ClipboardIOS.h; path = ios/ClipboardIOS.h; sourceTree = "<group>"; };
     11909                C585381813A7DD4E00A3BBEE /* ClipboardIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ClipboardIOS.mm; path = ios/ClipboardIOS.mm; sourceTree = "<group>"; };
    1190511910                C585A66011D4FAC5004C3E4B /* IDBBindingUtilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBBindingUtilities.cpp; sourceTree = "<group>"; };
    1190611911                C585A66111D4FAC5004C3E4B /* IDBBindingUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBBindingUtilities.h; sourceTree = "<group>"; };
    … …  
    1234812353                E45322A9140CE267005A0F92 /* SelectorQuery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SelectorQuery.cpp; sourceTree = "<group>"; };
    1234912354                E45322AA140CE267005A0F92 /* SelectorQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelectorQuery.h; sourceTree = "<group>"; };
     12355                E45390190EAFCACA003695C8 /* PasteboardIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = PasteboardIOS.mm; path = ios/PasteboardIOS.mm; sourceTree = "<group>"; };
    1235012356                E45390350EAFD637003695C8 /* SharedTimerIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SharedTimerIOS.mm; path = ios/SharedTimerIOS.mm; sourceTree = "<group>"; };
    1235112357                E462A4A0113E71BE004A4220 /* IntPointHash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IntPointHash.h; sourceTree = "<group>"; };
    … …  
    1655616562                        isa = PBXGroup;
    1655716563                        children = (
     16564                                C585381713A7DD4E00A3BBEE /* ClipboardIOS.h */,
     16565                                C585381813A7DD4E00A3BBEE /* ClipboardIOS.mm */,
    1655816566                                2655414B1489AA2B000DFC5D /* CursorIOS.cpp */,
    1655916567                                26F40D4914904A6300CA67C4 /* EventLoopIOS.mm */,
    … …  
    1656216570                                265541371489811C000DFC5D /* KeyEventCodesIOS.h */,
    1656316571                                265541381489811C000DFC5D /* KeyEventIOS.mm */,
     16572                                E45390190EAFCACA003695C8 /* PasteboardIOS.mm */,
    1656416573                                E45390350EAFD637003695C8 /* SharedTimerIOS.mm */,
    1656516574                        );
    … …  
    2113921148                                4B8AF4AA0B1CE02B00687690 /* ClipboardAccessPolicy.h in Headers */,
    2114021149                                85031B400A44EFC700F992E0 /* ClipboardEvent.h in Headers */,
     21150                                C585381913A7DD4E00A3BBEE /* ClipboardIOS.h in Headers */,
    2114121151                                93F199E708245E59001E9ABC /* ClipboardMac.h in Headers */,
    2114221152                                FB92DF4B15FED08700994433 /* ClipPathOperation.h in Headers */,
    … …  
    2456524575                                A784941B0B5FE507001E237A /* Clipboard.cpp in Sources */,
    2456624576                                85031B3F0A44EFC700F992E0 /* ClipboardEvent.cpp in Sources */,
     24577                                C585381A13A7DD4E00A3BBEE /* ClipboardIOS.mm in Sources */,
    2456724578                                93F19AFF08245E59001E9ABC /* ClipboardMac.mm in Sources */,
    2456824579                                CDEA76351460B71A008B31F1 /* Clock.cpp in Sources */,
    … …  
    2616626177                                447958051643B4B2001E0A7F /* ParsedContentType.cpp in Sources */,
    2616726178                                F55B3DC91251F12D003EF269 /* PasswordInputType.cpp in Sources */,
     26179                                E453901E0EAFCACA003695C8 /* PasteboardIOS.mm in Sources */,
    2616826180                                4B2709830AF2E5E00065127F /* PasteboardMac.mm in Sources */,
    2616926181                                B275357F0B053814002CE64F /* Path.cpp in Sources */,

  • trunk/Source/WebCore/dom/Clipboard.h

    r150016 r150049  
    3535// Specifically, the class currently named Pasteboard. The legacy style instead
    3636// uses this as an abstract base class.
    37 #define WTF_USE_LEGACY_STYLE_ABSTRACT_CLIPBOARD_CLASS !PLATFORM(MAC)
     37#define WTF_USE_LEGACY_STYLE_ABSTRACT_CLIPBOARD_CLASS (!PLATFORM(MAC) || PLATFORM(IOS))
    3838
    3939#if USE(LEGACY_STYLE_ABSTRACT_CLIPBOARD_CLASS)

  • trunk/Source/WebCore/platform/Pasteboard.h

    r149985 r150049  
    2121 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
    2222 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
    23  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
     23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2424 */
    2525
    … …  
    5454
    5555#if PLATFORM(MAC)
     56#if PLATFORM(IOS)
     57// FIXME: This is only temporary until Pasteboard is refactored for iOS.
     58extern NSString *WebArchivePboardType;
     59#else
    5660extern const char* WebArchivePboardType;
     61#endif
    5762extern const char* WebSmartPastePboardType;
    5863extern const char* WebURLNamePboardType;
    … …  
    101106    void writeSelection(Range*, bool canSmartCopyOrDelete, Frame*, ShouldSerializeSelectedTextForClipboard = DefaultSelectedTextType);
    102107    void writePlainText(const String&, SmartReplaceOption);
     108#if !PLATFORM(IOS)
    103109    void writeURL(const KURL&, const String&, Frame* = 0);
    104110    void writeImage(Node*, const KURL&, const String& title);
     111#else
     112    void writeImage(Node*, Frame*);
     113    void writePlainText(const String&, Frame*);
     114    static NSArray* supportedPasteboardTypes();
     115#endif
    105116    void writeClipboard(Clipboard*);
    106117
    … …  
    130141    Pasteboard();
    131142
    132 #if PLATFORM(MAC)
     143#if PLATFORM(MAC) && !PLATFORM(IOS)
    133144    String m_pasteboardName;
    134145    long m_changeCount;
     146#endif
     147
     148#if PLATFORM(IOS)
     149    PassRefPtr<DocumentFragment> documentFragmentForPasteboardItemAtIndex(Frame*, int index, bool allowPlainText, bool& chosePlainText);
    135150#endif
    136151
Note: See TracChangeset for help on using the changeset viewer.