Changeset 39903 in webkit
- Timestamp:
- Jan 14, 2009 11:52:21 AM (15 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 24 added
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r39902 r39903 88 88 * platform/graphics/chromium/MediaPlayerPrivateChromium.h: Added. 89 89 * platform/graphics/chromium/PlatformIcon.h: Added. 90 91 2009-01-14 Darin Fisher <darin@chromium.org> 92 93 Reviewed by Eric Seidel. 94 95 https://bugs.webkit.org/show_bug.cgi?id=23328 96 Upstream remaining files from platform/chromium/ 97 98 * platform/chromium/CursorChromium.cpp: 99 (WebCore::pointerCursor): 100 (WebCore::crossCursor): 101 (WebCore::handCursor): 102 (WebCore::iBeamCursor): 103 (WebCore::waitCursor): 104 (WebCore::helpCursor): 105 (WebCore::eastResizeCursor): 106 (WebCore::northResizeCursor): 107 (WebCore::northEastResizeCursor): 108 (WebCore::northWestResizeCursor): 109 (WebCore::southResizeCursor): 110 (WebCore::southEastResizeCursor): 111 (WebCore::southWestResizeCursor): 112 (WebCore::westResizeCursor): 113 (WebCore::northSouthResizeCursor): 114 (WebCore::eastWestResizeCursor): 115 (WebCore::northEastSouthWestResizeCursor): 116 (WebCore::northWestSouthEastResizeCursor): 117 (WebCore::columnResizeCursor): 118 (WebCore::rowResizeCursor): 119 (WebCore::middlePanningCursor): 120 (WebCore::eastPanningCursor): 121 (WebCore::northPanningCursor): 122 (WebCore::northEastPanningCursor): 123 (WebCore::northWestPanningCursor): 124 (WebCore::southPanningCursor): 125 (WebCore::southEastPanningCursor): 126 (WebCore::southWestPanningCursor): 127 (WebCore::westPanningCursor): 128 (WebCore::moveCursor): 129 (WebCore::verticalTextCursor): 130 (WebCore::cellCursor): 131 (WebCore::contextMenuCursor): 132 (WebCore::aliasCursor): 133 (WebCore::progressCursor): 134 (WebCore::noDropCursor): 135 (WebCore::copyCursor): 136 (WebCore::noneCursor): 137 (WebCore::notAllowedCursor): 138 (WebCore::zoomInCursor): 139 (WebCore::zoomOutCursor): 140 * platform/chromium/DragDataRef.h: Added. 141 * platform/chromium/DragImageChromium.cpp: Added. 142 (WebCore::dragImageSize): 143 (WebCore::deleteDragImage): 144 (WebCore::scaleDragImage): 145 (WebCore::dissolveDragImageToFraction): 146 (WebCore::createDragImageFromImage): 147 (WebCore::createDragImageIconForCachedImage): 148 * platform/chromium/DragImageRef.h: 149 * platform/chromium/KeyCodeConversion.h: Added. 150 * platform/chromium/KeyCodeConversionGtk.cpp: Added. 151 (WebCore::windowsKeyCodeForKeyEvent): 152 * platform/chromium/KeyboardCodes.h: Added. 153 * platform/chromium/KeyboardCodesPosix.h: Added. 154 (WebCore::): 155 * platform/chromium/KeyboardCodesWin.h: Added. 156 (WebCore::): 157 * platform/chromium/Language.cpp: Added. 158 (WebCore::defaultLanguage): 159 * platform/chromium/LinkHashChromium.cpp: Added. 160 (WebCore::visitedLinkHash): 161 * platform/chromium/MimeTypeRegistryChromium.cpp: Added. 162 (WebCore::MIMETypeRegistry::getMIMETypeForExtension): 163 (WebCore::MIMETypeRegistry::getPreferredExtensionForMIMEType): 164 (WebCore::MIMETypeRegistry::getMIMETypeForPath): 165 (WebCore::MIMETypeRegistry::isSupportedImageMIMEType): 166 (WebCore::MIMETypeRegistry::isSupportedImageResourceMIMEType): 167 (WebCore::MIMETypeRegistry::isSupportedImageMIMETypeForEncoding): 168 (WebCore::MIMETypeRegistry::isSupportedJavaScriptMIMEType): 169 (WebCore::MIMETypeRegistry::isSupportedNonImageMIMEType): 170 (WebCore::MIMETypeRegistry::isSupportedMediaMIMEType): 171 (WebCore::MIMETypeRegistry::isJavaAppletMIMEType): 172 (WebCore::dummyHashSet): 173 (WebCore::MIMETypeRegistry::getSupportedImageMIMETypes): 174 (WebCore::MIMETypeRegistry::getSupportedImageResourceMIMETypes): 175 (WebCore::MIMETypeRegistry::getSupportedImageMIMETypesForEncoding): 176 (WebCore::MIMETypeRegistry::getSupportedNonImageMIMETypes): 177 (WebCore::MIMETypeRegistry::getSupportedMediaMIMETypes): 178 * platform/chromium/PasteboardChromium.cpp: Added. 179 (WebCore::Pasteboard::generalPasteboard): 180 (WebCore::Pasteboard::Pasteboard): 181 (WebCore::Pasteboard::clear): 182 (WebCore::Pasteboard::writeSelection): 183 (WebCore::Pasteboard::writeURL): 184 (WebCore::Pasteboard::writeImage): 185 (WebCore::Pasteboard::canSmartReplace): 186 (WebCore::Pasteboard::plainText): 187 (WebCore::Pasteboard::documentFragment): 188 * platform/chromium/PasteboardPrivate.h: 189 * platform/chromium/PlatformCursor.h: Added. 190 (WebCore::PlatformCursor::): 191 (WebCore::PlatformCursor::PlatformCursor): 192 (WebCore::PlatformCursor::customImage): 193 (WebCore::PlatformCursor::hotSpot): 194 (WebCore::PlatformCursor::type): 195 * platform/chromium/PlatformKeyboardEventChromium.cpp: Added. 196 (WebCore::PlatformKeyboardEvent::disambiguateKeyDownEvent): 197 (WebCore::PlatformKeyboardEvent::currentCapsLockState): 198 * platform/chromium/PlatformScreenChromium.cpp: Added. 199 (WebCore::screenDepth): 200 (WebCore::screenDepthPerComponent): 201 (WebCore::screenIsMonochrome): 202 (WebCore::screenRect): 203 (WebCore::screenAvailableRect): 204 * platform/chromium/PlatformWidget.h: 205 * platform/chromium/PopupMenuChromium.cpp: Added. 206 (WebCore::PopupListBox::selectedIndex): 207 (WebCore::PopupListBox::numItems): 208 (WebCore::PopupListBox::setBaseWidth): 209 (WebCore::PopupListBox::setTextOnIndexChange): 210 (WebCore::PopupListBox::setAcceptOnAbandon): 211 (WebCore::PopupListBox::): 212 (WebCore::PopupListBox::ListItem::ListItem): 213 (WebCore::PopupListBox::PopupListBox): 214 (WebCore::PopupListBox::~PopupListBox): 215 (WebCore::PopupListBox::disconnectClient): 216 (WebCore::PopupListBox::scrollToRevealSelection): 217 (WebCore::constructRelativeMouseEvent): 218 (WebCore::constructRelativeWheelEvent): 219 (WebCore::PopupContainer::create): 220 (WebCore::PopupContainer::PopupContainer): 221 (WebCore::PopupContainer::~PopupContainer): 222 (WebCore::PopupContainer::showPopup): 223 (WebCore::PopupContainer::hidePopup): 224 (WebCore::PopupContainer::layout): 225 (WebCore::PopupContainer::handleMouseDownEvent): 226 (WebCore::PopupContainer::handleMouseMoveEvent): 227 (WebCore::PopupContainer::handleMouseReleaseEvent): 228 (WebCore::PopupContainer::handleWheelEvent): 229 (WebCore::PopupContainer::handleKeyEvent): 230 (WebCore::PopupContainer::hide): 231 (WebCore::PopupContainer::paint): 232 (WebCore::PopupContainer::paintBorder): 233 (WebCore::PopupContainer::isInterestedInEventForKey): 234 (WebCore::PopupContainer::show): 235 (WebCore::PopupContainer::setTextOnIndexChange): 236 (WebCore::PopupContainer::setAcceptOnAbandon): 237 (WebCore::PopupContainer::refresh): 238 (WebCore::PopupListBox::handleMouseDownEvent): 239 (WebCore::PopupListBox::handleMouseMoveEvent): 240 (WebCore::PopupListBox::handleMouseReleaseEvent): 241 (WebCore::PopupListBox::handleWheelEvent): 242 (WebCore::PopupListBox::isInterestedInEventForKey): 243 (WebCore::PopupListBox::handleKeyEvent): 244 (WebCore::PopupListBox::hostWindow): 245 (WebCore::PopupListBox::invalidateRect): 246 (WebCore::stripLeadingWhiteSpace): 247 (WebCore::PopupListBox::typeAheadFind): 248 (WebCore::PopupListBox::paint): 249 (WebCore::PopupListBox::paintRow): 250 (WebCore::PopupListBox::getRowFont): 251 (WebCore::PopupListBox::abandon): 252 (WebCore::PopupListBox::pointToRowIndex): 253 (WebCore::PopupListBox::acceptIndex): 254 (WebCore::PopupListBox::selectIndex): 255 (WebCore::PopupListBox::setOriginalIndex): 256 (WebCore::PopupListBox::getRowHeight): 257 (WebCore::PopupListBox::getRowBounds): 258 (WebCore::PopupListBox::invalidateRow): 259 (WebCore::PopupListBox::scrollToRevealRow): 260 (WebCore::PopupListBox::isSelectableItem): 261 (WebCore::PopupListBox::adjustSelectedIndex): 262 (WebCore::PopupListBox::updateFromElement): 263 (WebCore::PopupListBox::layout): 264 (WebCore::PopupListBox::clear): 265 (WebCore::PopupListBox::isPointInBounds): 266 (WebCore::PopupMenu::PopupMenu): 267 (WebCore::PopupMenu::~PopupMenu): 268 (WebCore::PopupMenu::show): 269 (WebCore::PopupMenu::hide): 270 (WebCore::PopupMenu::updateFromElement): 271 (WebCore::PopupMenu::itemWritingDirectionIsNatural): 272 * platform/chromium/PopupMenuChromium.h: Added. 273 (WebCore::PopupContainer::listBox): 274 * platform/chromium/PopupMenuPrivate.h: Added. 275 * platform/chromium/SSLKeyGeneratorChromium.cpp: Added. 276 (WebCore::supportedKeySizes): 277 * platform/chromium/ScrollbarThemeChromium.cpp: Added. 278 (WebCore::ScrollbarTheme::nativeTheme): 279 (WebCore::ScrollbarThemeChromium::ScrollbarThemeChromium): 280 (WebCore::ScrollbarThemeChromium::~ScrollbarThemeChromium): 281 (WebCore::ScrollbarThemeChromium::themeChanged): 282 (WebCore::ScrollbarThemeChromium::hasThumb): 283 (WebCore::ScrollbarThemeChromium::backButtonRect): 284 (WebCore::ScrollbarThemeChromium::forwardButtonRect): 285 (WebCore::ScrollbarThemeChromium::trackRect): 286 (WebCore::ScrollbarThemeChromium::paintTrackBackground): 287 (WebCore::ScrollbarThemeChromium::paintTickmarks): 288 (WebCore::ScrollbarThemeChromium::paintScrollCorner): 289 (WebCore::ScrollbarThemeChromium::shouldCenterOnThumb): 290 (WebCore::ScrollbarThemeChromium::buttonSize): 291 * platform/chromium/ScrollbarThemeChromium.h: Added. 292 (WebCore::ScrollbarThemeChromium::hasButtons): 293 * platform/chromium/ScrollbarThemeChromiumLinux.cpp: Added. 294 (WebCore::ScrollbarThemeChromium::scrollbarThickness): 295 (WebCore::ScrollbarThemeChromium::invalidateOnMouseEnterExit): 296 (WebCore::initMozState): 297 (WebCore::paintScrollbarWidget): 298 (WebCore::ScrollbarThemeChromium::paintTrackPiece): 299 (WebCore::ScrollbarThemeChromium::paintButton): 300 (WebCore::ScrollbarThemeChromium::paintThumb): 301 * platform/chromium/ScrollbarThemeChromiumWin.cpp: 302 * platform/chromium/SearchPopupMenuChromium.cpp: Added. 303 (WebCore::SearchPopupMenu::SearchPopupMenu): 304 (WebCore::SearchPopupMenu::enabled): 305 (WebCore::SearchPopupMenu::saveRecentSearches): 306 (WebCore::SearchPopupMenu::loadRecentSearches): 307 * platform/chromium/SharedTimerChromium.cpp: Added. 308 (WebCore::setSharedTimerFiredFunction): 309 (WebCore::setSharedTimerFireTime): 310 (WebCore::stopSharedTimer): 311 * platform/chromium/TemporaryLinkStubs.cpp: Added. 312 (WebCore::signedPublicKeyAndChallengeString): 313 (WebCore::getSupportedKeySizes): 314 (WebCore::KURL::fileSystemPath): 315 (WebCore::SharedBuffer::createWithContentsOfFile): 316 (WTF::scheduleDispatchFunctionsOnMainThread): 90 317 91 318 2009-01-14 Darin Fisher <darin@chromium.org> -
trunk/WebCore/platform/chromium/ClipboardChromium.cpp
r39861 r39903 218 218 // the id to be copied as well. 219 219 NamedAttrMap* attrs = element->attributes(); 220 unsigned intlength = attrs->length();221 for (unsigned i nt i= 0; i < length; ++i) {220 unsigned length = attrs->length(); 221 for (unsigned i = 0; i < length; ++i) { 222 222 Attribute* attr = attrs->attributeItem(i); 223 223 if (attr->localName() == "src") -
trunk/WebCore/platform/chromium/ContextMenuChromium.cpp
r39861 r39903 58 58 } 59 59 60 void ContextMenu::insertItem(unsigned intposition, ContextMenuItem& item)60 void ContextMenu::insertItem(unsigned position, ContextMenuItem& item) 61 61 { 62 62 } -
trunk/WebCore/platform/chromium/CursorChromium.cpp
r39861 r39903 61 61 const Cursor& pointerCursor() 62 62 { 63 static const Cursor c(PlatformCursor:: typePointer);63 static const Cursor c(PlatformCursor::TypePointer); 64 64 return c; 65 65 } … … 67 67 const Cursor& crossCursor() 68 68 { 69 static const Cursor c(PlatformCursor:: typeCross);69 static const Cursor c(PlatformCursor::TypeCross); 70 70 return c; 71 71 } … … 73 73 const Cursor& handCursor() 74 74 { 75 static const Cursor c(PlatformCursor:: typeHand);75 static const Cursor c(PlatformCursor::TypeHand); 76 76 return c; 77 77 } … … 79 79 const Cursor& iBeamCursor() 80 80 { 81 static const Cursor c(PlatformCursor:: typeIBeam);81 static const Cursor c(PlatformCursor::TypeIBeam); 82 82 return c; 83 83 } … … 85 85 const Cursor& waitCursor() 86 86 { 87 static const Cursor c(PlatformCursor:: typeWait);87 static const Cursor c(PlatformCursor::TypeWait); 88 88 return c; 89 89 } … … 91 91 const Cursor& helpCursor() 92 92 { 93 static const Cursor c(PlatformCursor:: typeHelp);93 static const Cursor c(PlatformCursor::TypeHelp); 94 94 return c; 95 95 } … … 97 97 const Cursor& eastResizeCursor() 98 98 { 99 static const Cursor c(PlatformCursor:: typeEastResize);99 static const Cursor c(PlatformCursor::TypeEastResize); 100 100 return c; 101 101 } … … 103 103 const Cursor& northResizeCursor() 104 104 { 105 static const Cursor c(PlatformCursor:: typeNorthResize);105 static const Cursor c(PlatformCursor::TypeNorthResize); 106 106 return c; 107 107 } … … 109 109 const Cursor& northEastResizeCursor() 110 110 { 111 static const Cursor c(PlatformCursor:: typeNorthEastResize);111 static const Cursor c(PlatformCursor::TypeNorthEastResize); 112 112 return c; 113 113 } … … 115 115 const Cursor& northWestResizeCursor() 116 116 { 117 static const Cursor c(PlatformCursor:: typeNorthWestResize);117 static const Cursor c(PlatformCursor::TypeNorthWestResize); 118 118 return c; 119 119 } … … 121 121 const Cursor& southResizeCursor() 122 122 { 123 static const Cursor c(PlatformCursor:: typeSouthResize);123 static const Cursor c(PlatformCursor::TypeSouthResize); 124 124 return c; 125 125 } … … 127 127 const Cursor& southEastResizeCursor() 128 128 { 129 static const Cursor c(PlatformCursor:: typeSouthEastResize);129 static const Cursor c(PlatformCursor::TypeSouthEastResize); 130 130 return c; 131 131 } … … 133 133 const Cursor& southWestResizeCursor() 134 134 { 135 static const Cursor c(PlatformCursor:: typeSouthWestResize);135 static const Cursor c(PlatformCursor::TypeSouthWestResize); 136 136 return c; 137 137 } … … 139 139 const Cursor& westResizeCursor() 140 140 { 141 static const Cursor c(PlatformCursor:: typeWestResize);141 static const Cursor c(PlatformCursor::TypeWestResize); 142 142 return c; 143 143 } … … 145 145 const Cursor& northSouthResizeCursor() 146 146 { 147 static const Cursor c(PlatformCursor:: typeNorthSouthResize);147 static const Cursor c(PlatformCursor::TypeNorthSouthResize); 148 148 return c; 149 149 } … … 151 151 const Cursor& eastWestResizeCursor() 152 152 { 153 static const Cursor c(PlatformCursor:: typeEastWestResize);153 static const Cursor c(PlatformCursor::TypeEastWestResize); 154 154 return c; 155 155 } … … 157 157 const Cursor& northEastSouthWestResizeCursor() 158 158 { 159 static const Cursor c(PlatformCursor:: typeNorthEastSouthWestResize);159 static const Cursor c(PlatformCursor::TypeNorthEastSouthWestResize); 160 160 return c; 161 161 } … … 163 163 const Cursor& northWestSouthEastResizeCursor() 164 164 { 165 static const Cursor c(PlatformCursor:: typeNorthWestSouthEastResize);165 static const Cursor c(PlatformCursor::TypeNorthWestSouthEastResize); 166 166 return c; 167 167 } … … 169 169 const Cursor& columnResizeCursor() 170 170 { 171 static const Cursor c(PlatformCursor:: typeColumnResize);171 static const Cursor c(PlatformCursor::TypeColumnResize); 172 172 return c; 173 173 } … … 175 175 const Cursor& rowResizeCursor() 176 176 { 177 static const Cursor c(PlatformCursor:: typeRowResize);177 static const Cursor c(PlatformCursor::TypeRowResize); 178 178 return c; 179 179 } … … 181 181 const Cursor& middlePanningCursor() 182 182 { 183 static const Cursor c(PlatformCursor:: typeMiddlePanning);183 static const Cursor c(PlatformCursor::TypeMiddlePanning); 184 184 return c; 185 185 } … … 187 187 const Cursor& eastPanningCursor() 188 188 { 189 static const Cursor c(PlatformCursor:: typeEastPanning);189 static const Cursor c(PlatformCursor::TypeEastPanning); 190 190 return c; 191 191 } … … 193 193 const Cursor& northPanningCursor() 194 194 { 195 static const Cursor c(PlatformCursor:: typeNorthPanning);195 static const Cursor c(PlatformCursor::TypeNorthPanning); 196 196 return c; 197 197 } … … 199 199 const Cursor& northEastPanningCursor() 200 200 { 201 static const Cursor c(PlatformCursor:: typeNorthEastPanning);201 static const Cursor c(PlatformCursor::TypeNorthEastPanning); 202 202 return c; 203 203 } … … 205 205 const Cursor& northWestPanningCursor() 206 206 { 207 static const Cursor c(PlatformCursor:: typeNorthWestPanning);207 static const Cursor c(PlatformCursor::TypeNorthWestPanning); 208 208 return c; 209 209 } … … 211 211 const Cursor& southPanningCursor() 212 212 { 213 static const Cursor c(PlatformCursor:: typeSouthPanning);213 static const Cursor c(PlatformCursor::TypeSouthPanning); 214 214 return c; 215 215 } … … 217 217 const Cursor& southEastPanningCursor() 218 218 { 219 static const Cursor c(PlatformCursor:: typeSouthEastPanning);219 static const Cursor c(PlatformCursor::TypeSouthEastPanning); 220 220 return c; 221 221 } … … 223 223 const Cursor& southWestPanningCursor() 224 224 { 225 static const Cursor c(PlatformCursor:: typeSouthWestPanning);225 static const Cursor c(PlatformCursor::TypeSouthWestPanning); 226 226 return c; 227 227 } … … 229 229 const Cursor& westPanningCursor() 230 230 { 231 static const Cursor c(PlatformCursor:: typeWestPanning);231 static const Cursor c(PlatformCursor::TypeWestPanning); 232 232 return c; 233 233 } … … 235 235 const Cursor& moveCursor() 236 236 { 237 static const Cursor c(PlatformCursor:: typeMove);237 static const Cursor c(PlatformCursor::TypeMove); 238 238 return c; 239 239 } … … 241 241 const Cursor& verticalTextCursor() 242 242 { 243 static const Cursor c(PlatformCursor:: typeVerticalText);243 static const Cursor c(PlatformCursor::TypeVerticalText); 244 244 return c; 245 245 } … … 247 247 const Cursor& cellCursor() 248 248 { 249 static const Cursor c(PlatformCursor:: typeCell);249 static const Cursor c(PlatformCursor::TypeCell); 250 250 return c; 251 251 } … … 253 253 const Cursor& contextMenuCursor() 254 254 { 255 static const Cursor c(PlatformCursor:: typeContextMenu);255 static const Cursor c(PlatformCursor::TypeContextMenu); 256 256 return c; 257 257 } … … 259 259 const Cursor& aliasCursor() 260 260 { 261 static const Cursor c(PlatformCursor:: typeAlias);261 static const Cursor c(PlatformCursor::TypeAlias); 262 262 return c; 263 263 } … … 265 265 const Cursor& progressCursor() 266 266 { 267 static const Cursor c(PlatformCursor:: typeProgress);267 static const Cursor c(PlatformCursor::TypeProgress); 268 268 return c; 269 269 } … … 271 271 const Cursor& noDropCursor() 272 272 { 273 static const Cursor c(PlatformCursor:: typeNoDrop);273 static const Cursor c(PlatformCursor::TypeNoDrop); 274 274 return c; 275 275 } … … 277 277 const Cursor& copyCursor() 278 278 { 279 static const Cursor c(PlatformCursor:: typeCopy);279 static const Cursor c(PlatformCursor::TypeCopy); 280 280 return c; 281 281 } … … 283 283 const Cursor& noneCursor() 284 284 { 285 static const Cursor c(PlatformCursor:: typeNone);285 static const Cursor c(PlatformCursor::TypeNone); 286 286 return c; 287 287 } … … 289 289 const Cursor& notAllowedCursor() 290 290 { 291 static const Cursor c(PlatformCursor:: typeNotAllowed);291 static const Cursor c(PlatformCursor::TypeNotAllowed); 292 292 return c; 293 293 } … … 295 295 const Cursor& zoomInCursor() 296 296 { 297 static const Cursor c(PlatformCursor:: typeZoomIn);297 static const Cursor c(PlatformCursor::TypeZoomIn); 298 298 return c; 299 299 } … … 301 301 const Cursor& zoomOutCursor() 302 302 { 303 static const Cursor c(PlatformCursor:: typeZoomOut);303 static const Cursor c(PlatformCursor::TypeZoomOut); 304 304 return c; 305 305 } -
trunk/WebCore/platform/chromium/DragImageRef.h
r38980 r39903 1 /* 2 * Copyright (C) 2008 Google Inc. All rights reserved. 3 * 4 * Redistribution and use in source and binary forms, with or without 5 * modification, are permitted provided that the following conditions 6 * are met: 7 * 1. Redistributions of source code must retain the above copyright 8 * notice, this list of conditions and the following disclaimer. 9 * 2. Redistributions in binary form must reproduce the above copyright 10 * notice, this list of conditions and the following disclaimer in the 11 * documentation and/or other materials provided with the distribution. 12 * 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 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. 24 */ 1 // Copyright (c) 2008, 2009, Google Inc. All rights reserved. 2 // 3 // Redistribution and use in source and binary forms, with or without 4 // modification, are permitted provided that the following conditions are 5 // met: 6 // 7 // * Redistributions of source code must retain the above copyright 8 // notice, this list of conditions and the following disclaimer. 9 // * Redistributions in binary form must reproduce the above 10 // copyright notice, this list of conditions and the following disclaimer 11 // in the documentation and/or other materials provided with the 12 // distribution. 13 // * Neither the name of Google Inc. nor the names of its 14 // contributors may be used to endorse or promote products derived from 15 // this software without specific prior written permission. 16 // 17 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 18 // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 19 // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 20 // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 21 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 22 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 23 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 28 26 29 #ifndef DragImageRef_h 27 30 #define DragImageRef_h 28 31 29 #if PLATFORM(WIN_OS)30 typedef struct HBITMAP__* HBITMAP;31 #elif PLATFORM(DARWIN)32 #if __OBJC__33 @class NSImage;34 #else35 class NSImage;36 #endif37 #endif38 39 32 namespace WebCore { 40 33 41 #if PLATFORM(WIN_OS) 42 typedef HBITMAP DragImageRef; 43 #elif PLATFORM(DARWIN) 44 typedef NSImage* DragImageRef; 45 #endif 34 // FIXME: Need to support image drag-n-drop. For now, we just allow things 35 // to compile by defining this dummy type. 36 typedef void* DragImageRef; 46 37 47 } 38 } // namespace WebCore 48 39 49 40 #endif -
trunk/WebCore/platform/chromium/PasteboardPrivate.h
r39668 r39903 44 44 }; 45 45 46 } 46 } // namespace WebCore 47 47 48 48 #endif -
trunk/WebCore/platform/chromium/PlatformWidget.h
r39661 r39903 1 // Copyright (c) 2008, Google Inc. 2 // All rights reserved. 3 // 4 // Redistribution and use in source and binary forms, with or without 5 // modification, are permitted provided that the following conditions are 6 // met: 7 // * Redistributions of source code must retain the above copyright 8 // notice, this list of conditions and the following disclaimer. 9 // * Redistributions in binary form must reproduce the above 10 // copyright notice, this list of conditions and the following disclaimer 11 // in the documentation and/or other materials provided with the 12 // distribution. 13 // * Neither the name of Google Inc. nor the names of its 14 // contributors may be used to endorse or promote products derived from 15 // this software without specific prior written permission. 16 // 17 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 18 // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 19 // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 20 // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 21 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 22 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 23 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 1 /* 2 * Copyright (c) 2008, 2009, Google Inc. All rights reserved. 3 * 4 * Redistribution and use in source and binary forms, with or without 5 * modification, are permitted provided that the following conditions are 6 * met: 7 * 8 * * Redistributions of source code must retain the above copyright 9 * notice, this list of conditions and the following disclaimer. 10 * * Redistributions in binary form must reproduce the above 11 * copyright notice, this list of conditions and the following disclaimer 12 * in the documentation and/or other materials provided with the 13 * distribution. 14 * * Neither the name of Google Inc. nor the names of its 15 * contributors may be used to endorse or promote products derived from 16 * this software without specific prior written permission. 17 * 18 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 19 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 20 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 */ 28 30 29 31 #ifndef PlatformWidget_h -
trunk/WebCore/platform/chromium/ScrollbarThemeChromiumWin.cpp
r39861 r39903 205 205 } 206 206 207 } 207 } // namespace WebCore
Note: See TracChangeset
for help on using the changeset viewer.