Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1266)

Side by Side Diff: webkit/port/platform/chromium/ClipboardChromium.cpp

Issue 11801: Wrap MSVC-specific pragmas. As -Wunknown-pragmas has been disabled for wtf,... (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 12 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (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.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 27
28 #pragma warning(push, 0) 28 #if COMPILER(MSVC)
29 __pragma(warning(push, 0))
30 #endif
29 #include "CachedImage.h" 31 #include "CachedImage.h"
30 #include "ChromiumBridge.h" 32 #include "ChromiumBridge.h"
31 #include "ChromiumDataObject.h" 33 #include "ChromiumDataObject.h"
32 #include "ClipboardChromium.h" 34 #include "ClipboardChromium.h"
33 #include "ClipboardUtilitiesChromium.h" 35 #include "ClipboardUtilitiesChromium.h"
34 #include "CSSHelper.h" 36 #include "CSSHelper.h"
35 #include "CString.h" 37 #include "CString.h"
36 #include "Document.h" 38 #include "Document.h"
37 #include "DragData.h" 39 #include "DragData.h"
38 #include "Editor.h" 40 #include "Editor.h"
39 #include "Element.h" 41 #include "Element.h"
40 #include "EventHandler.h" 42 #include "EventHandler.h"
41 #include "Frame.h" 43 #include "Frame.h"
42 #include "FrameLoader.h" 44 #include "FrameLoader.h"
43 #include "FrameView.h" 45 #include "FrameView.h"
44 #include "HTMLNames.h" 46 #include "HTMLNames.h"
45 #include "Image.h" 47 #include "Image.h"
46 #include "MIMETypeRegistry.h" 48 #include "MIMETypeRegistry.h"
47 #include "markup.h" 49 #include "markup.h"
48 #include "Page.h" 50 #include "Page.h"
49 #include "Pasteboard.h" 51 #include "Pasteboard.h"
50 #include "PlatformString.h" 52 #include "PlatformString.h"
51 #include "Range.h" 53 #include "Range.h"
52 #include "RenderImage.h" 54 #include "RenderImage.h"
53 #include "StringBuilder.h" 55 #include "StringBuilder.h"
54 #include "StringHash.h" 56 #include "StringHash.h"
55 #include <wtf/RefPtr.h> 57 #include <wtf/RefPtr.h>
56 #pragma warning(pop) 58 #if COMPILER(MSVC)
59 __pragma(warning(pop))
60 #endif
57 61
58 namespace WebCore { 62 namespace WebCore {
59 63
60 using namespace HTMLNames; 64 using namespace HTMLNames;
61 65
62 // We provide the IE clipboard types (URL and Text), and the clipboard types spe cified in the WHATWG Web Applications 1.0 draft 66 // We provide the IE clipboard types (URL and Text), and the clipboard types spe cified in the WHATWG Web Applications 1.0 draft
63 // see http://www.whatwg.org/specs/web-apps/current-work/ Section 6.3.5.3 67 // see http://www.whatwg.org/specs/web-apps/current-work/ Section 6.3.5.3
64 68
65 enum ClipboardDataType { ClipboardDataTypeNone, ClipboardDataTypeURL, ClipboardD ataTypeText }; 69 enum ClipboardDataType { ClipboardDataTypeNone, ClipboardDataTypeURL, ClipboardD ataTypeText };
66 70
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 356
353 bool ClipboardChromium::hasData() 357 bool ClipboardChromium::hasData()
354 { 358 {
355 if (!m_dataObject) 359 if (!m_dataObject)
356 return false; 360 return false;
357 361
358 return m_dataObject->hasData(); 362 return m_dataObject->hasData();
359 } 363 }
360 364
361 } // namespace WebCore 365 } // namespace WebCore
OLDNEW
« no previous file with comments | « webkit/port/loader/IconLoader.cpp ('k') | webkit/port/platform/chromium/FileChooserChromium.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698