<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[173949] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/173949">173949</a></dd>
<dt>Author</dt> <dd>ossy@webkit.org</dd>
<dt>Date</dt> <dd>2014-09-25 03:14:57 -0700 (Thu, 25 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove WinCE port from trunk
https://bugs.webkit.org/show_bug.cgi?id=136951
Reviewed by Alex Christensen.
.:
* Source/cmake/OptionsWinCE.cmake: Removed.
* Source/cmake/WebKitPackaging.cmake:
Source/JavaScriptCore:
* assembler/ARMAssembler.h:
(JSC::ARMAssembler::cacheFlush):
* assembler/ARMv7Assembler.h:
(JSC::ARMv7Assembler::cacheFlush):
* config.h:
* heap/MachineStackMarker.cpp:
(JSC::MachineThreads::gatherFromCurrentThread):
(JSC::MachineThreads::gatherFromOtherThread):
(JSC::swapIfBackwards): Deleted.
* jit/ExecutableAllocator.h:
* jsc.cpp:
(main):
* runtime/DateConstructor.cpp:
* runtime/Options.cpp:
(JSC::overrideOptionWithHeuristic):
* runtime/VM.cpp:
(JSC::VM::VM):
* testRegExp.cpp:
(main):
* tools/CodeProfiling.cpp:
(JSC::CodeProfiling::notifyAllocator):
Source/WebCore:
* Modules/encryptedmedia/CDMPrivateMediaPlayer.cpp:
* PlatformWinCE.cmake: Removed.
* accessibility/AXObjectCache.cpp:
* editing/FrameSelection.cpp:
(WebCore::FrameSelection::modifyMovingRight):
* loader/icon/wince/IconDatabaseWinCE.cpp: Removed.
* page/EventHandler.cpp:
(WebCore::EventHandler::sendContextMenuEventForKey):
* page/Settings.cpp:
* page/win/EventHandlerWin.cpp:
(WebCore::EventHandler::createDraggingDataTransfer):
* platform/ContextMenu.h:
* platform/DragImage.cpp:
* platform/FileSystem.h:
* platform/graphics/BitmapImage.cpp:
(WebCore::BitmapImage::mayFillWithSolidColor):
* platform/graphics/FontGlyphs.cpp:
(WebCore::FontGlyphs::glyphDataAndPageForCharacter):
* platform/graphics/FontPlatformData.h:
* platform/graphics/ImageBufferData.h:
* platform/graphics/MediaPlayer.cpp:
* platform/graphics/SimpleFontData.h:
* platform/graphics/opentype/OpenTypeUtilities.cpp:
(WebCore::renameAndActivateFont):
* platform/graphics/opentype/OpenTypeUtilities.h:
* platform/graphics/win/DIBPixelData.cpp:
(WebCore::DIBPixelData::setRGBABitmapAlpha):
* platform/graphics/win/GDIExtras.cpp: Removed.
* platform/graphics/win/GDIExtras.h:
(WebCore::hasAlphaBlendSupport):
(WebCore::alphaBlendIfSupported):
* platform/graphics/win/IconWin.cpp:
(WebCore::Icon::createIconForFiles):
(WebCore::Icon::paint):
* platform/graphics/win/SimpleFontDataWin.cpp:
(WebCore::SimpleFontData::initGDIFont):
(WebCore::SimpleFontData::platformDestroy):
(WebCore::SimpleFontData::boundsForGDIGlyph):
(WebCore::SimpleFontData::widthForGDIGlyph):
(WebCore::SimpleFontData::scriptFontProperties):
* platform/graphics/wince/FontCacheWinCE.cpp: Removed.
* platform/graphics/wince/FontCustomPlatformData.cpp: Removed.
* platform/graphics/wince/FontCustomPlatformData.h: Removed.
* platform/graphics/wince/FontPlatformData.cpp: Removed.
* platform/graphics/wince/FontPlatformData.h: Removed.
* platform/graphics/wince/FontWinCE.cpp: Removed.
* platform/graphics/wince/GlyphPageTreeNodeWinCE.cpp: Removed.
* platform/graphics/wince/GradientWinCE.cpp: Removed.
* platform/graphics/wince/GraphicsContextWinCE.cpp: Removed.
* platform/graphics/wince/ImageBufferDataWince.h: Removed.
* platform/graphics/wince/ImageBufferWinCE.cpp: Removed.
* platform/graphics/wince/ImageWinCE.cpp: Removed.
* platform/graphics/wince/MediaPlayerPrivateWinCE.h: Removed.
* platform/graphics/wince/MediaPlayerProxy.cpp: Removed.
* platform/graphics/wince/MediaPlayerProxy.h: Removed.
* platform/graphics/wince/PathWinCE.cpp: Removed.
* platform/graphics/wince/PlatformPathWinCE.cpp: Removed.
* platform/graphics/wince/PlatformPathWinCE.h: Removed.
* platform/graphics/wince/SharedBitmap.cpp: Removed.
* platform/graphics/wince/SharedBitmap.h: Removed.
* platform/graphics/wince/SimpleFontDataWinCE.cpp: Removed.
* platform/graphics/wince/WinCEGraphicsExtras.h: Removed.
* platform/image-decoders/jpeg/JPEGImageDecoder.h:
* platform/network/win/NetworkStateNotifierWin.cpp:
(WebCore::NetworkStateNotifier::NetworkStateNotifier):
* platform/win/COMPtr.h:
* platform/win/ClipboardUtilitiesWin.cpp:
* platform/win/ContextMenuItemWin.cpp:
* platform/win/ContextMenuWin.cpp:
(WebCore::ContextMenu::getContextMenuItems):
(WebCore::ContextMenu::createPlatformContextMenuFromItems):
* platform/win/DragImageWin.cpp:
(WebCore::dragLabelFont):
* platform/win/FileSystemWin.cpp:
(WebCore::pathByAppendingComponent):
(WebCore::pathGetFileName):
(WebCore::storageDirectory):
* platform/win/LoggingWin.cpp:
(WebCore::logLevelString):
* platform/win/PasteboardWin.cpp:
(WebCore::PasteboardOwnerWndProc):
(WebCore::Pasteboard::createForCopyAndPaste):
(WebCore::pathRemoveBadFSCharacters):
(WebCore::filesystemPathFromUrlOrTitle):
(WebCore::createGlobalHDropContent):
* platform/win/PlatformMouseEventWin.cpp:
(WebCore::messageToEventType):
(WebCore::PlatformMouseEvent::PlatformMouseEvent):
* platform/win/PlatformScreenWin.cpp:
(WebCore::deviceInfoForWidget):
(WebCore::screenIsMonochrome):
* platform/win/PopupMenuWin.cpp:
(WebCore::PopupMenuWin::show):
(WebCore::PopupMenuWin::paint):
(WebCore::PopupMenuWin::registerClass):
(WebCore::PopupMenuWin::wndProc):
* platform/win/ScrollbarThemeWin.cpp:
(WebCore::ScrollbarThemeWin::paintButton):
* platform/win/SharedBufferWin.cpp:
* platform/win/SharedTimerWin.cpp:
(WebCore::TimerWindowWndProc):
(WebCore::initializeOffScreenTimerWindow):
(WebCore::queueTimerProc):
(WebCore::setSharedTimerFireInterval):
(WebCore::stopSharedTimer):
* platform/win/SoftLinking.h:
* platform/win/SystemInfo.cpp:
(WebCore::windowsVersion):
(WebCore::processorArchitecture):
(WebCore::architectureTokenForUAString):
* platform/win/WCDataObject.cpp:
(WebCore::WCDataObject::CopyMedium):
* plugins/PluginDatabase.cpp:
* plugins/PluginView.cpp:
(WebCore::PluginView::stop):
* plugins/PluginViewNone.cpp:
* plugins/win/PluginDatabaseWin.cpp:
(WebCore::addWindowsMediaPlayerPluginDirectory):
(WebCore::addMacromediaPluginDirectories):
* plugins/win/PluginPackageWin.cpp:
(WebCore::PluginPackage::load):
* plugins/win/PluginViewWin.cpp:
(WebCore::setUpOffscreenPaintingHooks):
(WebCore::registerPluginView):
(WebCore::PluginView::wndProc):
(WebCore::PluginView::updatePluginWidget):
(WebCore::PluginView::paintIntoTransformedContext):
(WebCore::PluginView::paint):
(WebCore::PluginView::handleMouseEvent):
(WebCore::PluginView::setParent):
(WebCore::PluginView::setNPWindowRect):
(WebCore::PluginView::platformStart):
* rendering/RenderThemeWinCE.cpp: Removed.
* rendering/RenderThemeWinCE.h: Removed.
* storage/wince/DatabaseThreadWinCE.cpp: Removed.
* storage/wince/DatabaseThreadWinCE.h: Removed.
* storage/wince/StorageThreadWinCE.cpp: Removed.
* storage/wince/StorageThreadWinCE.h: Removed.
Source/WebKit:
* PlatformWinCE.cmake: Removed.
* wince/WebCoreSupport/ChromeClientWinCE.cpp: Removed.
* wince/WebCoreSupport/ChromeClientWinCE.h: Removed.
* wince/WebCoreSupport/ContextMenuClientWinCE.cpp: Removed.
* wince/WebCoreSupport/ContextMenuClientWinCE.h: Removed.
* wince/WebCoreSupport/DragClientWinCE.cpp: Removed.
* wince/WebCoreSupport/DragClientWinCE.h: Removed.
* wince/WebCoreSupport/EditorClientWinCE.cpp: Removed.
* wince/WebCoreSupport/EditorClientWinCE.h: Removed.
* wince/WebCoreSupport/FrameLoaderClientWinCE.cpp: Removed.
* wince/WebCoreSupport/FrameLoaderClientWinCE.h: Removed.
* wince/WebCoreSupport/FrameNetworkingContextWinCE.cpp: Removed.
* wince/WebCoreSupport/FrameNetworkingContextWinCE.h: Removed.
* wince/WebCoreSupport/InspectorClientWinCE.cpp: Removed.
* wince/WebCoreSupport/InspectorClientWinCE.h: Removed.
* wince/WebCoreSupport/PlatformStrategiesWinCE.cpp: Removed.
* wince/WebCoreSupport/PlatformStrategiesWinCE.h: Removed.
* wince/WebView.cpp: Removed.
* wince/WebView.h: Removed.
Source/WebKit/cf:
* WebCoreSupport/WebInspectorClientCF.cpp:
Source/WTF:
* config.h:
* wtf/Assertions.cpp:
* wtf/Assertions.h:
* wtf/Atomics.h:
(WTF::weakCompareAndSwap):
* wtf/CurrentTime.cpp:
(WTF::lowResUTCTime):
* wtf/DataLog.cpp:
* wtf/DateMath.cpp:
(WTF::getLocalTime):
(WTF::calculateDSTOffset):
* wtf/FastMalloc.cpp:
* wtf/FeatureDefines.h:
* wtf/OSAllocator.h:
(WTF::OSAllocator::decommitAndRelease):
* wtf/Platform.h:
* wtf/PlatformWin.cmake:
* wtf/RAMSize.cpp:
(WTF::computeRAMSize):
* wtf/RandomNumberSeed.h:
(WTF::initializeRandomNumberGenerator):
* wtf/StackBounds.cpp:
(WTF::StackBounds::initialize):
* wtf/StackBounds.h:
(WTF::StackBounds::isGrowingDownward):
* wtf/StdLibExtras.h:
(wtf_bsearch): Deleted.
* wtf/StringExtras.h:
(strnicmp): Deleted.
(stricmp): Deleted.
(strdup): Deleted.
* wtf/ThreadSpecific.h:
* wtf/ThreadingWin.cpp:
(WTF::createThreadInternal):
* wtf/WindowsExtras.h:
(WTF::getRegistryValue):
(WTF::getWindowPointer):
(WTF::setWindowPointer):
* wtf/dtoa/utils.h:
* wtf/text/WTFString.cpp:
(WTF::String::format):
Tools:
* BuildSlaveSupport/build.webkit.org-config/wkbuild.py:
(_should_file_trigger_build):
* BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py:
(ShouldBuildTest):
* CMakeLists.txt:
* DumpRenderTree/win/DRTDataObject.cpp:
(DRTDataObject::CopyMedium):
* Scripts/build-webkit:
* Scripts/webkit-build-directory:
* Scripts/webkitdirs.pm:
(argumentsForConfiguration):
(builtDylibPathForName):
(isAppleWinWebKit):
(launcherPath):
(launcherName):
(shouldRemoveCMakeCache):
(cmakeBasedPortArguments):
(cmakeBasedPortName):
(isCMakeBuild):
(isWinCE): Deleted.
(determineIsWinCE): Deleted.
* Scripts/webkitperl/FeatureList.pm:
* Scripts/webkitpy/port/port_testcase.py:
(test_apache_config_file_name_for_platform):
* TestWebKitAPI/config.h:
* WinCELauncher/CMakeLists.txt: Removed.
* WinCELauncher/main.cpp: Removed.
* gtk/manifest.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerARMAssemblerh">trunk/Source/JavaScriptCore/assembler/ARMAssembler.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerARMv7Assemblerh">trunk/Source/JavaScriptCore/assembler/ARMv7Assembler.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreconfigh">trunk/Source/JavaScriptCore/config.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapMachineStackMarkercpp">trunk/Source/JavaScriptCore/heap/MachineStackMarker.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitExecutableAllocatorh">trunk/Source/JavaScriptCore/jit/ExecutableAllocator.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejsccpp">trunk/Source/JavaScriptCore/jsc.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeDateConstructorcpp">trunk/Source/JavaScriptCore/runtime/DateConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeOptionscpp">trunk/Source/JavaScriptCore/runtime/Options.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeVMcpp">trunk/Source/JavaScriptCore/runtime/VM.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoretestRegExpcpp">trunk/Source/JavaScriptCore/testRegExp.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoretoolsCodeProfilingcpp">trunk/Source/JavaScriptCore/tools/CodeProfiling.cpp</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFconfigh">trunk/Source/WTF/config.h</a></li>
<li><a href="#trunkSourceWTFwtfAssertionscpp">trunk/Source/WTF/wtf/Assertions.cpp</a></li>
<li><a href="#trunkSourceWTFwtfAssertionsh">trunk/Source/WTF/wtf/Assertions.h</a></li>
<li><a href="#trunkSourceWTFwtfAtomicsh">trunk/Source/WTF/wtf/Atomics.h</a></li>
<li><a href="#trunkSourceWTFwtfCurrentTimecpp">trunk/Source/WTF/wtf/CurrentTime.cpp</a></li>
<li><a href="#trunkSourceWTFwtfDataLogcpp">trunk/Source/WTF/wtf/DataLog.cpp</a></li>
<li><a href="#trunkSourceWTFwtfDateMathcpp">trunk/Source/WTF/wtf/DateMath.cpp</a></li>
<li><a href="#trunkSourceWTFwtfFastMalloccpp">trunk/Source/WTF/wtf/FastMalloc.cpp</a></li>
<li><a href="#trunkSourceWTFwtfFeatureDefinesh">trunk/Source/WTF/wtf/FeatureDefines.h</a></li>
<li><a href="#trunkSourceWTFwtfOSAllocatorh">trunk/Source/WTF/wtf/OSAllocator.h</a></li>
<li><a href="#trunkSourceWTFwtfPageAllocationAlignedcpp">trunk/Source/WTF/wtf/PageAllocationAligned.cpp</a></li>
<li><a href="#trunkSourceWTFwtfPlatformh">trunk/Source/WTF/wtf/Platform.h</a></li>
<li><a href="#trunkSourceWTFwtfPlatformWincmake">trunk/Source/WTF/wtf/PlatformWin.cmake</a></li>
<li><a href="#trunkSourceWTFwtfRAMSizecpp">trunk/Source/WTF/wtf/RAMSize.cpp</a></li>
<li><a href="#trunkSourceWTFwtfRandomNumberSeedh">trunk/Source/WTF/wtf/RandomNumberSeed.h</a></li>
<li><a href="#trunkSourceWTFwtfStackBoundscpp">trunk/Source/WTF/wtf/StackBounds.cpp</a></li>
<li><a href="#trunkSourceWTFwtfStackBoundsh">trunk/Source/WTF/wtf/StackBounds.h</a></li>
<li><a href="#trunkSourceWTFwtfStdLibExtrash">trunk/Source/WTF/wtf/StdLibExtras.h</a></li>
<li><a href="#trunkSourceWTFwtfStringExtrash">trunk/Source/WTF/wtf/StringExtras.h</a></li>
<li><a href="#trunkSourceWTFwtfThreadSpecifich">trunk/Source/WTF/wtf/ThreadSpecific.h</a></li>
<li><a href="#trunkSourceWTFwtfThreadingWincpp">trunk/Source/WTF/wtf/ThreadingWin.cpp</a></li>
<li><a href="#trunkSourceWTFwtfWindowsExtrash">trunk/Source/WTF/wtf/WindowsExtras.h</a></li>
<li><a href="#trunkSourceWTFwtfdtoautilsh">trunk/Source/WTF/wtf/dtoa/utils.h</a></li>
<li><a href="#trunkSourceWTFwtftextWTFStringcpp">trunk/Source/WTF/wtf/text/WTFString.cpp</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaCDMPrivateMediaPlayercpp">trunk/Source/WebCore/Modules/encryptedmedia/CDMPrivateMediaPlayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAXObjectCachecpp">trunk/Source/WebCore/accessibility/AXObjectCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingFrameSelectioncpp">trunk/Source/WebCore/editing/FrameSelection.cpp</a></li>
<li><a href="#trunkSourceWebCorepageEventHandlercpp">trunk/Source/WebCore/page/EventHandler.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSettingscpp">trunk/Source/WebCore/page/Settings.cpp</a></li>
<li><a href="#trunkSourceWebCorepagewinEventHandlerWincpp">trunk/Source/WebCore/page/win/EventHandlerWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformContextMenuh">trunk/Source/WebCore/platform/ContextMenu.h</a></li>
<li><a href="#trunkSourceWebCoreplatformDragImagecpp">trunk/Source/WebCore/platform/DragImage.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformFileSystemh">trunk/Source/WebCore/platform/FileSystem.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsBitmapImagecpp">trunk/Source/WebCore/platform/graphics/BitmapImage.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontGlyphscpp">trunk/Source/WebCore/platform/graphics/FontGlyphs.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontPlatformDatah">trunk/Source/WebCore/platform/graphics/FontPlatformData.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsImageBufferDatah">trunk/Source/WebCore/platform/graphics/ImageBufferData.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayercpp">trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsSimpleFontDatah">trunk/Source/WebCore/platform/graphics/SimpleFontData.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsopentypeOpenTypeUtilitiescpp">trunk/Source/WebCore/platform/graphics/opentype/OpenTypeUtilities.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsopentypeOpenTypeUtilitiesh">trunk/Source/WebCore/platform/graphics/opentype/OpenTypeUtilities.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinDIBPixelDatacpp">trunk/Source/WebCore/platform/graphics/win/DIBPixelData.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinIconWincpp">trunk/Source/WebCore/platform/graphics/win/IconWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinSimpleFontDataWincpp">trunk/Source/WebCore/platform/graphics/win/SimpleFontDataWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformimagedecodersjpegJPEGImageDecoderh">trunk/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkwinNetworkStateNotifierWincpp">trunk/Source/WebCore/platform/network/win/NetworkStateNotifierWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformwinCOMPtrh">trunk/Source/WebCore/platform/win/COMPtr.h</a></li>
<li><a href="#trunkSourceWebCoreplatformwinClipboardUtilitiesWincpp">trunk/Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformwinContextMenuItemWincpp">trunk/Source/WebCore/platform/win/ContextMenuItemWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformwinContextMenuWincpp">trunk/Source/WebCore/platform/win/ContextMenuWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformwinDragImageWincpp">trunk/Source/WebCore/platform/win/DragImageWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformwinFileSystemWincpp">trunk/Source/WebCore/platform/win/FileSystemWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformwinLoggingWincpp">trunk/Source/WebCore/platform/win/LoggingWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformwinPasteboardWincpp">trunk/Source/WebCore/platform/win/PasteboardWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformwinPlatformMouseEventWincpp">trunk/Source/WebCore/platform/win/PlatformMouseEventWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformwinPlatformScreenWincpp">trunk/Source/WebCore/platform/win/PlatformScreenWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformwinPopupMenuWincpp">trunk/Source/WebCore/platform/win/PopupMenuWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformwinScrollbarThemeWincpp">trunk/Source/WebCore/platform/win/ScrollbarThemeWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformwinSharedBufferWincpp">trunk/Source/WebCore/platform/win/SharedBufferWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformwinSharedTimerWincpp">trunk/Source/WebCore/platform/win/SharedTimerWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformwinSoftLinkingh">trunk/Source/WebCore/platform/win/SoftLinking.h</a></li>
<li><a href="#trunkSourceWebCoreplatformwinSystemInfocpp">trunk/Source/WebCore/platform/win/SystemInfo.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformwinWCDataObjectcpp">trunk/Source/WebCore/platform/win/WCDataObject.cpp</a></li>
<li><a href="#trunkSourceWebCorepluginsPluginDatabasecpp">trunk/Source/WebCore/plugins/PluginDatabase.cpp</a></li>
<li><a href="#trunkSourceWebCorepluginsPluginViewcpp">trunk/Source/WebCore/plugins/PluginView.cpp</a></li>
<li><a href="#trunkSourceWebCorepluginsPluginViewNonecpp">trunk/Source/WebCore/plugins/PluginViewNone.cpp</a></li>
<li><a href="#trunkSourceWebCorepluginswinPluginDatabaseWincpp">trunk/Source/WebCore/plugins/win/PluginDatabaseWin.cpp</a></li>
<li><a href="#trunkSourceWebCorepluginswinPluginPackageWincpp">trunk/Source/WebCore/plugins/win/PluginPackageWin.cpp</a></li>
<li><a href="#trunkSourceWebCorepluginswinPluginViewWincpp">trunk/Source/WebCore/plugins/win/PluginViewWin.cpp</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitcfChangeLog">trunk/Source/WebKit/cf/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitcfWebCoreSupportWebInspectorClientCFcpp">trunk/Source/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp</a></li>
<li><a href="#trunkSourceWebKitwinceChangeLog">trunk/Source/WebKit/wince/ChangeLog</a></li>
<li><a href="#trunkSourcecmakeWebKitPackagingcmake">trunk/Source/cmake/WebKitPackaging.cmake</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigwkbuildpy">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild.py</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigwkbuild_unittestpy">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py</a></li>
<li><a href="#trunkToolsCMakeListstxt">trunk/Tools/CMakeLists.txt</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreewinDRTDataObjectcpp">trunk/Tools/DumpRenderTree/win/DRTDataObject.cpp</a></li>
<li><a href="#trunkToolsScriptsbuildwebkit">trunk/Tools/Scripts/build-webkit</a></li>
<li><a href="#trunkToolsScriptswebkitbuilddirectory">trunk/Tools/Scripts/webkit-build-directory</a></li>
<li><a href="#trunkToolsScriptswebkitdirspm">trunk/Tools/Scripts/webkitdirs.pm</a></li>
<li><a href="#trunkToolsScriptswebkitperlFeatureListpm">trunk/Tools/Scripts/webkitperl/FeatureList.pm</a></li>
<li><a href="#trunkToolsScriptswebkitpyportport_testcasepy">trunk/Tools/Scripts/webkitpy/port/port_testcase.py</a></li>
<li><a href="#trunkToolsTestWebKitAPIconfigh">trunk/Tools/TestWebKitAPI/config.h</a></li>
<li><a href="#trunkToolsgtkmanifesttxt">trunk/Tools/gtk/manifest.txt</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorePlatformWinCEcmake">trunk/Source/WebCore/PlatformWinCE.cmake</a></li>
<li><a href="#trunkSourceWebCoreloadericonwinceIconDatabaseWinCEcpp">trunk/Source/WebCore/loader/icon/wince/IconDatabaseWinCE.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinGDIExtrascpp">trunk/Source/WebCore/platform/graphics/win/GDIExtras.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinGDIExtrash">trunk/Source/WebCore/platform/graphics/win/GDIExtras.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinceFontCacheWinCEcpp">trunk/Source/WebCore/platform/graphics/wince/FontCacheWinCE.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinceFontCustomPlatformDatacpp">trunk/Source/WebCore/platform/graphics/wince/FontCustomPlatformData.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinceFontCustomPlatformDatah">trunk/Source/WebCore/platform/graphics/wince/FontCustomPlatformData.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinceFontPlatformDatacpp">trunk/Source/WebCore/platform/graphics/wince/FontPlatformData.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinceFontPlatformDatah">trunk/Source/WebCore/platform/graphics/wince/FontPlatformData.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinceFontWinCEcpp">trunk/Source/WebCore/platform/graphics/wince/FontWinCE.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinceGlyphPageTreeNodeWinCEcpp">trunk/Source/WebCore/platform/graphics/wince/GlyphPageTreeNodeWinCE.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinceGradientWinCEcpp">trunk/Source/WebCore/platform/graphics/wince/GradientWinCE.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinceGraphicsContextWinCEcpp">trunk/Source/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinceImageBufferDataWinceh">trunk/Source/WebCore/platform/graphics/wince/ImageBufferDataWince.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinceImageBufferWinCEcpp">trunk/Source/WebCore/platform/graphics/wince/ImageBufferWinCE.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinceImageWinCEcpp">trunk/Source/WebCore/platform/graphics/wince/ImageWinCE.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinceMediaPlayerPrivateWinCEh">trunk/Source/WebCore/platform/graphics/wince/MediaPlayerPrivateWinCE.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinceMediaPlayerProxycpp">trunk/Source/WebCore/platform/graphics/wince/MediaPlayerProxy.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinceMediaPlayerProxyh">trunk/Source/WebCore/platform/graphics/wince/MediaPlayerProxy.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswincePathWinCEcpp">trunk/Source/WebCore/platform/graphics/wince/PathWinCE.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswincePlatformPathWinCEcpp">trunk/Source/WebCore/platform/graphics/wince/PlatformPathWinCE.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswincePlatformPathWinCEh">trunk/Source/WebCore/platform/graphics/wince/PlatformPathWinCE.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinceSharedBitmapcpp">trunk/Source/WebCore/platform/graphics/wince/SharedBitmap.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinceSharedBitmaph">trunk/Source/WebCore/platform/graphics/wince/SharedBitmap.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinceSimpleFontDataWinCEcpp">trunk/Source/WebCore/platform/graphics/wince/SimpleFontDataWinCE.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinceWinCEGraphicsExtrash">trunk/Source/WebCore/platform/graphics/wince/WinCEGraphicsExtras.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeWinCEcpp">trunk/Source/WebCore/rendering/RenderThemeWinCE.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeWinCEh">trunk/Source/WebCore/rendering/RenderThemeWinCE.h</a></li>
<li><a href="#trunkSourceWebCorestoragewinceDatabaseThreadWinCEcpp">trunk/Source/WebCore/storage/wince/DatabaseThreadWinCE.cpp</a></li>
<li><a href="#trunkSourceWebCorestoragewinceDatabaseThreadWinCEh">trunk/Source/WebCore/storage/wince/DatabaseThreadWinCE.h</a></li>
<li><a href="#trunkSourceWebCorestoragewinceStorageThreadWinCEcpp">trunk/Source/WebCore/storage/wince/StorageThreadWinCE.cpp</a></li>
<li><a href="#trunkSourceWebCorestoragewinceStorageThreadWinCEh">trunk/Source/WebCore/storage/wince/StorageThreadWinCE.h</a></li>
<li><a href="#trunkSourceWebKitPlatformWinCEcmake">trunk/Source/WebKit/PlatformWinCE.cmake</a></li>
<li><a href="#trunkSourceWebKitwinceWebCoreSupportChromeClientWinCEcpp">trunk/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.cpp</a></li>
<li><a href="#trunkSourceWebKitwinceWebCoreSupportChromeClientWinCEh">trunk/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.h</a></li>
<li><a href="#trunkSourceWebKitwinceWebCoreSupportContextMenuClientWinCEcpp">trunk/Source/WebKit/wince/WebCoreSupport/ContextMenuClientWinCE.cpp</a></li>
<li><a href="#trunkSourceWebKitwinceWebCoreSupportContextMenuClientWinCEh">trunk/Source/WebKit/wince/WebCoreSupport/ContextMenuClientWinCE.h</a></li>
<li><a href="#trunkSourceWebKitwinceWebCoreSupportDragClientWinCEcpp">trunk/Source/WebKit/wince/WebCoreSupport/DragClientWinCE.cpp</a></li>
<li><a href="#trunkSourceWebKitwinceWebCoreSupportDragClientWinCEh">trunk/Source/WebKit/wince/WebCoreSupport/DragClientWinCE.h</a></li>
<li><a href="#trunkSourceWebKitwinceWebCoreSupportEditorClientWinCEcpp">trunk/Source/WebKit/wince/WebCoreSupport/EditorClientWinCE.cpp</a></li>
<li><a href="#trunkSourceWebKitwinceWebCoreSupportEditorClientWinCEh">trunk/Source/WebKit/wince/WebCoreSupport/EditorClientWinCE.h</a></li>
<li><a href="#trunkSourceWebKitwinceWebCoreSupportFrameLoaderClientWinCEcpp">trunk/Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp</a></li>
<li><a href="#trunkSourceWebKitwinceWebCoreSupportFrameLoaderClientWinCEh">trunk/Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.h</a></li>
<li><a href="#trunkSourceWebKitwinceWebCoreSupportFrameNetworkingContextWinCEcpp">trunk/Source/WebKit/wince/WebCoreSupport/FrameNetworkingContextWinCE.cpp</a></li>
<li><a href="#trunkSourceWebKitwinceWebCoreSupportFrameNetworkingContextWinCEh">trunk/Source/WebKit/wince/WebCoreSupport/FrameNetworkingContextWinCE.h</a></li>
<li><a href="#trunkSourceWebKitwinceWebCoreSupportInspectorClientWinCEcpp">trunk/Source/WebKit/wince/WebCoreSupport/InspectorClientWinCE.cpp</a></li>
<li><a href="#trunkSourceWebKitwinceWebCoreSupportInspectorClientWinCEh">trunk/Source/WebKit/wince/WebCoreSupport/InspectorClientWinCE.h</a></li>
<li><a href="#trunkSourceWebKitwinceWebCoreSupportPlatformStrategiesWinCEcpp">trunk/Source/WebKit/wince/WebCoreSupport/PlatformStrategiesWinCE.cpp</a></li>
<li><a href="#trunkSourceWebKitwinceWebCoreSupportPlatformStrategiesWinCEh">trunk/Source/WebKit/wince/WebCoreSupport/PlatformStrategiesWinCE.h</a></li>
<li><a href="#trunkSourceWebKitwinceWebViewcpp">trunk/Source/WebKit/wince/WebView.cpp</a></li>
<li><a href="#trunkSourceWebKitwinceWebViewh">trunk/Source/WebKit/wince/WebView.h</a></li>
<li><a href="#trunkSourcecmakeOptionsWinCEcmake">trunk/Source/cmake/OptionsWinCE.cmake</a></li>
<li><a href="#trunkToolsWinCELauncherCMakeListstxt">trunk/Tools/WinCELauncher/CMakeLists.txt</a></li>
<li><a href="#trunkToolsWinCELaunchermaincpp">trunk/Tools/WinCELauncher/main.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/ChangeLog 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-09-25 Csaba Osztrogonác <ossy@webkit.org>
+
+ Remove WinCE port from trunk
+ https://bugs.webkit.org/show_bug.cgi?id=136951
+
+ Reviewed by Alex Christensen.
+
+ * Source/cmake/OptionsWinCE.cmake: Removed.
+ * Source/cmake/WebKitPackaging.cmake:
+
</ins><span class="cx"> 2014-09-17 Renato Nagy <rnagy@inf.u-szeged.hu>
</span><span class="cx">
</span><span class="cx"> [EFL][GTK] Remove WebKit1 related codes
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2014-09-25 Csaba Osztrogonác <ossy@webkit.org>
+
+ Remove WinCE port from trunk
+ https://bugs.webkit.org/show_bug.cgi?id=136951
+
+ Reviewed by Alex Christensen.
+
+ * assembler/ARMAssembler.h:
+ (JSC::ARMAssembler::cacheFlush):
+ * assembler/ARMv7Assembler.h:
+ (JSC::ARMv7Assembler::cacheFlush):
+ * config.h:
+ * heap/MachineStackMarker.cpp:
+ (JSC::MachineThreads::gatherFromCurrentThread):
+ (JSC::MachineThreads::gatherFromOtherThread):
+ (JSC::swapIfBackwards): Deleted.
+ * jit/ExecutableAllocator.h:
+ * jsc.cpp:
+ (main):
+ * runtime/DateConstructor.cpp:
+ * runtime/Options.cpp:
+ (JSC::overrideOptionWithHeuristic):
+ * runtime/VM.cpp:
+ (JSC::VM::VM):
+ * testRegExp.cpp:
+ (main):
+ * tools/CodeProfiling.cpp:
+ (JSC::CodeProfiling::notifyAllocator):
+
</ins><span class="cx"> 2014-09-24 Brian J. Burg <burg@cs.washington.edu>
</span><span class="cx">
</span><span class="cx"> Web Inspector: subtract elapsed time while debugger is paused from profile nodes
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerARMAssemblerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/ARMAssembler.h (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/ARMAssembler.h 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/JavaScriptCore/assembler/ARMAssembler.h 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1119,8 +1119,6 @@
</span><span class="cx"> linuxPageFlush(current, current + page);
</span><span class="cx">
</span><span class="cx"> linuxPageFlush(current, end);
</span><del>-#elif OS(WINCE)
- CacheRangeFlush(code, size, CACHE_SYNC_ALL);
</del><span class="cx"> #else
</span><span class="cx"> #error "The cacheFlush support is missing on this platform."
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerARMv7Assemblerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/ARMv7Assembler.h (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/ARMv7Assembler.h 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/JavaScriptCore/assembler/ARMv7Assembler.h 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -2410,8 +2410,6 @@
</span><span class="cx"> linuxPageFlush(current, current + page);
</span><span class="cx">
</span><span class="cx"> linuxPageFlush(current, end);
</span><del>-#elif OS(WINCE)
- CacheRangeFlush(code, size, CACHE_SYNC_ALL);
</del><span class="cx"> #else
</span><span class="cx"> #error "The cacheFlush support is missing on this platform."
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreconfigh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/config.h (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/config.h 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/JavaScriptCore/config.h 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -39,12 +39,12 @@
</span><span class="cx"> #define WINVER 0x0502
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !COMPILER(MSVC7_OR_LOWER) && !OS(WINCE)
</del><ins>+#if !COMPILER(MSVC7_OR_LOWER)
</ins><span class="cx"> // We need to define this before the first #include of stdlib.h or it won't contain rand_s.
</span><span class="cx"> #ifndef _CRT_RAND_S
</span><span class="cx"> #define _CRT_RAND_S
</span><span class="cx"> #endif
</span><del>-#endif // !COMPILER(MSVC7_OR_LOWER) && !OS(WINCE)
</del><ins>+#endif // !COMPILER(MSVC7_OR_LOWER
</ins><span class="cx">
</span><span class="cx"> #endif // OS(WINDOWS)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapMachineStackMarkercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/MachineStackMarker.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/MachineStackMarker.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/JavaScriptCore/heap/MachineStackMarker.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -69,18 +69,6 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><del>-static inline void swapIfBackwards(void*& begin, void*& end)
-{
-#if OS(WINCE)
- if (begin <= end)
- return;
- std::swap(begin, end);
-#else
-UNUSED_PARAM(begin);
-UNUSED_PARAM(end);
-#endif
-}
-
</del><span class="cx"> #if OS(DARWIN)
</span><span class="cx"> typedef mach_port_t PlatformThread;
</span><span class="cx"> #elif OS(WINDOWS)
</span><span class="lines">@@ -248,12 +236,10 @@
</span><span class="cx">
</span><span class="cx"> void* registersBegin = &registers;
</span><span class="cx"> void* registersEnd = reinterpret_cast<void*>(roundUpToMultipleOf<sizeof(void*)>(reinterpret_cast<uintptr_t>(&registers + 1)));
</span><del>- swapIfBackwards(registersBegin, registersEnd);
</del><span class="cx"> conservativeRoots.add(registersBegin, registersEnd, jitStubRoutines, codeBlocks);
</span><span class="cx">
</span><span class="cx"> void* stackBegin = stackCurrent;
</span><span class="cx"> void* stackEnd = wtfThreadData().stack().origin();
</span><del>- swapIfBackwards(stackBegin, stackEnd);
</del><span class="cx"> conservativeRoots.add(stackBegin, stackEnd, jitStubRoutines, codeBlocks);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -453,7 +439,6 @@
</span><span class="cx">
</span><span class="cx"> void* stackPointer = otherThreadStackPointer(regs);
</span><span class="cx"> void* stackBase = thread->stackBase;
</span><del>- swapIfBackwards(stackPointer, stackBase);
</del><span class="cx"> stackPointer = reinterpret_cast<void*>(WTF::roundUpToMultipleOf<sizeof(void*)>(reinterpret_cast<uintptr_t>(stackPointer)));
</span><span class="cx"> conservativeRoots.add(stackPointer, stackBase, jitStubRoutines, codeBlocks);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitExecutableAllocatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/ExecutableAllocator.h (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/ExecutableAllocator.h 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/JavaScriptCore/jit/ExecutableAllocator.h 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -55,12 +55,6 @@
</span><span class="cx"> #include <unistd.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if OS(WINCE)
-// From pkfuncs.h (private header file from the Platform Builder)
-#define CACHE_SYNC_ALL 0x07F
-extern "C" __declspec(dllimport) void CacheRangeFlush(LPVOID pAddr, DWORD dwLength, DWORD dwFlags);
-#endif
-
</del><span class="cx"> #define JIT_ALLOCATOR_LARGE_ALLOC_SIZE (pageSize() * 4)
</span><span class="cx">
</span><span class="cx"> #if ENABLE(ASSEMBLER_WX_EXCLUSIVE)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejsccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jsc.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jsc.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/JavaScriptCore/jsc.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> #include <signal.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if COMPILER(MSVC) && !OS(WINCE)
</del><ins>+#if COMPILER(MSVC)
</ins><span class="cx"> #include <crtdbg.h>
</span><span class="cx"> #include <mmsystem.h>
</span><span class="cx"> #include <windows.h>
</span><span class="lines">@@ -1109,7 +1109,7 @@
</span><span class="cx"> // be in a separate main function because the jscmain function requires object
</span><span class="cx"> // unwinding.
</span><span class="cx">
</span><del>-#if COMPILER(MSVC) && !defined(_DEBUG) && !OS(WINCE)
</del><ins>+#if COMPILER(MSVC) && !defined(_DEBUG)
</ins><span class="cx"> #define TRY __try {
</span><span class="cx"> #define EXCEPT(x) } __except (EXCEPTION_EXECUTE_HANDLER) { x; }
</span><span class="cx"> #else
</span><span class="lines">@@ -1141,7 +1141,6 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if OS(WINDOWS)
</span><del>-#if !OS(WINCE)
</del><span class="cx"> // Cygwin calls ::SetErrorMode(SEM_FAILCRITICALERRORS), which we will inherit. This is bad for
</span><span class="cx"> // testing/debugging, as it causes the post-mortem debugger not to be invoked. We reset the
</span><span class="cx"> // error mode here to work around Cygwin's behavior. See <http://webkit.org/b/55222>.
</span><span class="lines">@@ -1155,7 +1154,6 @@
</span><span class="cx"> _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);
</span><span class="cx"> _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_FILE);
</span><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> timeBeginPeriod(1);
</span><span class="cx"> #endif
</span><span class="lines">@@ -1170,7 +1168,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> JSC::initializeThreading();
</span><span class="cx">
</span><del>-#if !OS(WINCE)
</del><span class="cx"> if (char* timeoutString = getenv("JSC_timeout")) {
</span><span class="cx"> if (sscanf(timeoutString, "%lf", &s_desiredTimeout) != 1) {
</span><span class="cx"> dataLog(
</span><span class="lines">@@ -1179,7 +1176,6 @@
</span><span class="cx"> } else
</span><span class="cx"> createThread(timeoutThreadMain, 0, "jsc Timeout Thread");
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> Options::crashIfCantAllocateJITMemory() = true;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeDateConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/DateConstructor.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/DateConstructor.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/JavaScriptCore/runtime/DateConstructor.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -40,10 +40,6 @@
</span><span class="cx"> #include "JSReplayInputs.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if OS(WINCE)
-extern "C" time_t time(time_t* timer); // Provided by libce.
-#endif
-
</del><span class="cx"> #if HAVE(SYS_TIME_H)
</span><span class="cx"> #include <sys/time.h>
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeOptionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Options.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Options.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/JavaScriptCore/runtime/Options.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -105,7 +105,6 @@
</span><span class="cx"> template<typename T>
</span><span class="cx"> bool overrideOptionWithHeuristic(T& variable, const char* name)
</span><span class="cx"> {
</span><del>-#if !OS(WINCE)
</del><span class="cx"> const char* stringValue = getenv(name);
</span><span class="cx"> if (!stringValue)
</span><span class="cx"> return false;
</span><span class="lines">@@ -114,7 +113,6 @@
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> fprintf(stderr, "WARNING: failed to parse %s=%s\n", name, stringValue);
</span><del>-#endif
</del><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/VM.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/VM.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/JavaScriptCore/runtime/VM.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -266,11 +266,9 @@
</span><span class="cx"> m_perBytecodeProfiler = adoptPtr(new Profiler::Database(*this));
</span><span class="cx">
</span><span class="cx"> StringPrintStream pathOut;
</span><del>-#if !OS(WINCE)
</del><span class="cx"> const char* profilerPath = getenv("JSC_PROFILER_PATH");
</span><span class="cx"> if (profilerPath)
</span><span class="cx"> pathOut.print(profilerPath, "/");
</span><del>-#endif
</del><span class="cx"> pathOut.print("JSCProfile-", getCurrentProcessID(), "-", m_perBytecodeProfiler->databaseID(), ".json");
</span><span class="cx"> m_perBytecodeProfiler->registerToSaveAtExit(pathOut.toCString().data());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestRegExpcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/testRegExp.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/testRegExp.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/JavaScriptCore/testRegExp.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> #include <sys/time.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if COMPILER(MSVC) && !OS(WINCE)
</del><ins>+#if COMPILER(MSVC)
</ins><span class="cx"> #include <crtdbg.h>
</span><span class="cx"> #include <mmsystem.h>
</span><span class="cx"> #include <windows.h>
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> // be in a separate main function because the realMain function requires object
</span><span class="cx"> // unwinding.
</span><span class="cx">
</span><del>-#if COMPILER(MSVC) && !defined(_DEBUG) && !OS(WINCE)
</del><ins>+#if COMPILER(MSVC) && !defined(_DEBUG)
</ins><span class="cx"> #define TRY __try {
</span><span class="cx"> #define EXCEPT(x) } __except (EXCEPTION_EXECUTE_HANDLER) { x; }
</span><span class="cx"> #else
</span><span class="lines">@@ -163,12 +163,10 @@
</span><span class="cx"> int main(int argc, char** argv)
</span><span class="cx"> {
</span><span class="cx"> #if OS(WINDOWS)
</span><del>-#if !OS(WINCE)
</del><span class="cx"> // Cygwin calls ::SetErrorMode(SEM_FAILCRITICALERRORS), which we will inherit. This is bad for
</span><span class="cx"> // testing/debugging, as it causes the post-mortem debugger not to be invoked. We reset the
</span><span class="cx"> // error mode here to work around Cygwin's behavior. See <http://webkit.org/b/55222>.
</span><span class="cx"> ::SetErrorMode(0);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if defined(_DEBUG)
</span><span class="cx"> _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretoolsCodeProfilingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tools/CodeProfiling.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tools/CodeProfiling.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/JavaScriptCore/tools/CodeProfiling.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -92,7 +92,6 @@
</span><span class="cx">
</span><span class="cx"> void CodeProfiling::notifyAllocator(WTF::MetaAllocator* allocator)
</span><span class="cx"> {
</span><del>-#if !OS(WINCE)
</del><span class="cx"> // Check for JSC_CODE_PROFILING.
</span><span class="cx"> const char* codeProfilingMode = getenv("JSC_CODE_PROFILING");
</span><span class="cx"> if (!codeProfilingMode)
</span><span class="lines">@@ -119,7 +118,6 @@
</span><span class="cx"> ASSERT(!s_tracker);
</span><span class="cx"> s_tracker = new WTF::MetaAllocatorTracker();
</span><span class="cx"> allocator->trackAllocations(s_tracker);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void* CodeProfiling::getOwnerUIDForPC(void* address)
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WTF/ChangeLog 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,3 +1,52 @@
</span><ins>+2014-09-25 Csaba Osztrogonác <ossy@webkit.org>
+
+ Remove WinCE port from trunk
+ https://bugs.webkit.org/show_bug.cgi?id=136951
+
+ Reviewed by Alex Christensen.
+
+ * config.h:
+ * wtf/Assertions.cpp:
+ * wtf/Assertions.h:
+ * wtf/Atomics.h:
+ (WTF::weakCompareAndSwap):
+ * wtf/CurrentTime.cpp:
+ (WTF::lowResUTCTime):
+ * wtf/DataLog.cpp:
+ * wtf/DateMath.cpp:
+ (WTF::getLocalTime):
+ (WTF::calculateDSTOffset):
+ * wtf/FastMalloc.cpp:
+ * wtf/FeatureDefines.h:
+ * wtf/OSAllocator.h:
+ (WTF::OSAllocator::decommitAndRelease):
+ * wtf/Platform.h:
+ * wtf/PlatformWin.cmake:
+ * wtf/RAMSize.cpp:
+ (WTF::computeRAMSize):
+ * wtf/RandomNumberSeed.h:
+ (WTF::initializeRandomNumberGenerator):
+ * wtf/StackBounds.cpp:
+ (WTF::StackBounds::initialize):
+ * wtf/StackBounds.h:
+ (WTF::StackBounds::isGrowingDownward):
+ * wtf/StdLibExtras.h:
+ (wtf_bsearch): Deleted.
+ * wtf/StringExtras.h:
+ (strnicmp): Deleted.
+ (stricmp): Deleted.
+ (strdup): Deleted.
+ * wtf/ThreadSpecific.h:
+ * wtf/ThreadingWin.cpp:
+ (WTF::createThreadInternal):
+ * wtf/WindowsExtras.h:
+ (WTF::getRegistryValue):
+ (WTF::getWindowPointer):
+ (WTF::setWindowPointer):
+ * wtf/dtoa/utils.h:
+ * wtf/text/WTFString.cpp:
+ (WTF::String::format):
+
</ins><span class="cx"> 2014-09-24 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><span class="cx"> Do the bmalloc.
</span></span></pre></div>
<a id="trunkSourceWTFconfigh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/config.h (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/config.h 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WTF/config.h 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !COMPILER(MSVC7_OR_LOWER) && !OS(WINCE)
</del><ins>+#if !COMPILER(MSVC7_OR_LOWER)
</ins><span class="cx"> // We need to define this before the first #include of stdlib.h or it won't contain rand_s.
</span><span class="cx"> #ifndef _CRT_RAND_S
</span><span class="cx"> #define _CRT_RAND_S
</span></span></pre></div>
<a id="trunkSourceWTFwtfAssertionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Assertions.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Assertions.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WTF/wtf/Assertions.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif // USE(CF)
</span><span class="cx">
</span><del>-#if COMPILER(MSVC) && !OS(WINCE)
</del><ins>+#if COMPILER(MSVC)
</ins><span class="cx"> #include <crtdbg.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -127,20 +127,7 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> if (_vsnprintf(buffer, size, format, args) != -1) {
</span><del>-#if OS(WINCE)
- // WinCE only supports wide chars
- wchar_t* wideBuffer = (wchar_t*)malloc(size * sizeof(wchar_t));
- if (wideBuffer == NULL)
- break;
- for (unsigned int i = 0; i < size; ++i) {
- if (!(wideBuffer[i] = buffer[i]))
- break;
- }
- OutputDebugStringW(wideBuffer);
- free(wideBuffer);
-#else
</del><span class="cx"> OutputDebugStringA(buffer);
</span><del>-#endif
</del><span class="cx"> free(buffer);
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -201,7 +188,7 @@
</span><span class="cx">
</span><span class="cx"> static void printCallSite(const char* file, int line, const char* function)
</span><span class="cx"> {
</span><del>-#if OS(WINDOWS) && !OS(WINCE) && defined(_DEBUG)
</del><ins>+#if OS(WINDOWS) && defined(_DEBUG)
</ins><span class="cx"> _CrtDbgReport(_CRT_WARN, file, line, NULL, "%s\n", function);
</span><span class="cx"> #else
</span><span class="cx"> // By using this format, which matches the format used by MSVC for compiler errors, developers
</span><span class="lines">@@ -240,7 +227,7 @@
</span><span class="cx"> {
</span><span class="cx"> #if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))
</span><span class="cx"> *size = backtrace(stack, *size);
</span><del>-#elif OS(WINDOWS) && !OS(WINCE)
</del><ins>+#elif OS(WINDOWS)
</ins><span class="cx"> // The CaptureStackBackTrace function is available in XP, but it is not defined
</span><span class="cx"> // in the Windows Server 2003 R2 Platform SDK. So, we'll grab the function
</span><span class="cx"> // through GetProcAddress.
</span></span></pre></div>
<a id="trunkSourceWTFwtfAssertionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Assertions.h (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Assertions.h 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WTF/wtf/Assertions.h 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -199,14 +199,6 @@
</span><span class="cx"> Expressions inside them are evaluated in debug builds only.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#if OS(WINCE)
-/* FIXME: We include this here only to avoid a conflict with the ASSERT macro. */
-#include <windows.h>
-#undef min
-#undef max
-#undef ERROR
-#endif
-
</del><span class="cx"> #if OS(WINDOWS)
</span><span class="cx"> /* FIXME: Change to use something other than ASSERT to avoid this conflict with the underlying platform */
</span><span class="cx"> #undef ASSERT
</span></span></pre></div>
<a id="trunkSourceWTFwtfAtomicsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Atomics.h (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Atomics.h 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WTF/wtf/Atomics.h 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -74,11 +74,7 @@
</span><span class="cx"> #if OS(WINDOWS)
</span><span class="cx"> inline bool weakCompareAndSwap(volatile unsigned* location, unsigned expected, unsigned newValue)
</span><span class="cx"> {
</span><del>-#if OS(WINCE)
- return InterlockedCompareExchange(reinterpret_cast<LONG*>(const_cast<unsigned*>(location)), static_cast<LONG>(newValue), static_cast<LONG>(expected)) == static_cast<LONG>(expected);
-#else
</del><span class="cx"> return InterlockedCompareExchange(reinterpret_cast<LONG volatile*>(location), static_cast<LONG>(newValue), static_cast<LONG>(expected)) == static_cast<LONG>(expected);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline bool weakCompareAndSwap(void*volatile* location, void* expected, void* newValue)
</span></span></pre></div>
<a id="trunkSourceWTFwtfCurrentTimecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/CurrentTime.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/CurrentTime.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WTF/wtf/CurrentTime.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -72,11 +72,7 @@
</span><span class="cx"> {
</span><span class="cx"> FILETIME fileTime;
</span><span class="cx">
</span><del>-#if OS(WINCE)
- GetCurrentFT(&fileTime);
-#else
</del><span class="cx"> GetSystemTimeAsFileTime(&fileTime);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> // As per Windows documentation for FILETIME, copy the resulting FILETIME structure to a
</span><span class="cx"> // ULARGE_INTEGER structure using memcpy (using memcpy instead of direct assignment can
</span></span></pre></div>
<a id="trunkSourceWTFwtfDataLogcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/DataLog.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/DataLog.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WTF/wtf/DataLog.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -35,12 +35,6 @@
</span><span class="cx"> #include <unistd.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if OS(WINCE)
-#ifndef _IONBF
-#define _IONBF 0x0004
-#endif
-#endif
-
</del><span class="cx"> #define DATA_LOG_TO_FILE 0
</span><span class="cx">
</span><span class="cx"> // Set to 1 to use the temp directory from confstr instead of hardcoded directory.
</span></span></pre></div>
<a id="trunkSourceWTFwtfDateMathcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/DateMath.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/DateMath.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WTF/wtf/DateMath.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -121,7 +121,6 @@
</span><span class="cx"> {0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335}
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#if !OS(WINCE)
</del><span class="cx"> static inline void getLocalTime(const time_t* localTime, struct tm* localTM)
</span><span class="cx"> {
</span><span class="cx"> #if COMPILER(MINGW)
</span><span class="lines">@@ -132,7 +131,6 @@
</span><span class="cx"> localtime_r(localTime, localTM);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> bool isLeapYear(int year)
</span><span class="cx"> {
</span><span class="lines">@@ -424,11 +422,7 @@
</span><span class="cx"> */
</span><span class="cx"> static double calculateDSTOffset(time_t localTime, double utcOffset)
</span><span class="cx"> {
</span><del>-#if OS(WINCE)
- UNUSED_PARAM(localTime);
- UNUSED_PARAM(utcOffset);
- return 0;
-#elif OS(WINDOWS)
</del><ins>+#if OS(WINDOWS)
</ins><span class="cx"> FILETIME utcFileTime;
</span><span class="cx"> UnixTimeToFileTime(localTime, &utcFileTime);
</span><span class="cx"> SYSTEMTIME utcSystemTime, localSystemTime;
</span></span></pre></div>
<a id="trunkSourceWTFwtfFastMalloccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/FastMalloc.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/FastMalloc.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WTF/wtf/FastMalloc.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -122,11 +122,6 @@
</span><span class="cx">
</span><span class="cx"> #if OS(WINDOWS)
</span><span class="cx">
</span><del>-// TLS_OUT_OF_INDEXES is not defined on WinCE.
-#ifndef TLS_OUT_OF_INDEXES
-#define TLS_OUT_OF_INDEXES 0xffffffff
-#endif
-
</del><span class="cx"> static DWORD isForibiddenTlsIndex = TLS_OUT_OF_INDEXES;
</span><span class="cx"> static const LPVOID kTlsAllowValue = reinterpret_cast<LPVOID>(0); // Must be zero.
</span><span class="cx"> static const LPVOID kTlsForbiddenValue = reinterpret_cast<LPVOID>(1);
</span></span></pre></div>
<a id="trunkSourceWTFwtfFeatureDefinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/FeatureDefines.h (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/FeatureDefines.h 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WTF/wtf/FeatureDefines.h 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -239,7 +239,7 @@
</span><span class="cx"> #endif /* PLATFORM(MAC) */
</span><span class="cx">
</span><span class="cx"> /* --------- Apple Windows port --------- */
</span><del>-#if PLATFORM(WIN) && !OS(WINCE) && !PLATFORM(WIN_CAIRO)
</del><ins>+#if PLATFORM(WIN) && !PLATFORM(WIN_CAIRO)
</ins><span class="cx">
</span><span class="cx"> #if !defined(ENABLE_FULLSCREEN_API)
</span><span class="cx"> #define ENABLE_FULLSCREEN_API 1
</span><span class="lines">@@ -253,27 +253,8 @@
</span><span class="cx"> #define ENABLE_WEBGL 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#endif /* PLATFORM(WIN) && !OS(WINCE) && !PLATFORM(WIN_CAIRO) */
</del><ins>+#endif /* PLATFORM(WIN) && !PLATFORM(WIN_CAIRO) */
</ins><span class="cx">
</span><del>-/* --------- WinCE port --------- */
-/* WinCE port is a specialization of PLATFORM(WIN). */
-/* PLATFORM(WIN) is always enabled when building for the WinCE port. */
-#if PLATFORM(WIN) && OS(WINCE)
-
-#if !defined(ENABLE_DRAG_SUPPORT)
-#define ENABLE_DRAG_SUPPORT 0
-#endif
-
-#if !defined(ENABLE_FTPDIR)
-#define ENABLE_FTPDIR 0
-#endif
-
-#if !defined(ENABLE_INSPECTOR)
-#define ENABLE_INSPECTOR 0
-#endif
-
-#endif /* PLATFORM(WIN) && OS(WINCE) */
-
</del><span class="cx"> /* --------- Windows CAIRO port --------- */
</span><span class="cx"> /* PLATFORM(WIN_CAIRO) is a specialization of PLATFORM(WIN). */
</span><span class="cx"> /* PLATFORM(WIN) is always enabled when PLATFORM(WIN_CAIRO) is enabled. */
</span></span></pre></div>
<a id="trunkSourceWTFwtfOSAllocatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/OSAllocator.h (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/OSAllocator.h 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WTF/wtf/OSAllocator.h 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -63,7 +63,6 @@
</span><span class="cx"> // committing/decommitting the entire region additional parameters allow a subregion to be
</span><span class="cx"> // specified.
</span><span class="cx"> WTF_EXPORT_PRIVATE static void* reserveAndCommit(size_t reserveSize, size_t commitSize, Usage = UnknownUsage, bool writable = true, bool executable = false);
</span><del>- static void decommitAndRelease(void* releaseBase, size_t releaseSize, void* decommitBase, size_t decommitSize);
</del><span class="cx">
</span><span class="cx"> // Reallocate an existing, committed allocation.
</span><span class="cx"> // The prior allocation must be fully comitted, and the new size will also be fully committed.
</span><span class="lines">@@ -79,25 +78,11 @@
</span><span class="cx"> return base;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void OSAllocator::decommitAndRelease(void* releaseBase, size_t releaseSize, void* decommitBase, size_t decommitSize)
</del><ins>+inline void OSAllocator::decommitAndRelease(void* releaseBase, size_t releaseSize)
</ins><span class="cx"> {
</span><del>- ASSERT(decommitBase >= releaseBase && (static_cast<char*>(decommitBase) + decommitSize) <= (static_cast<char*>(releaseBase) + releaseSize));
-#if OS(WINCE)
- // On most platforms we can actually skip this final decommit; releasing the VM will
- // implicitly decommit any physical memory in the region. This is not true on WINCE.
- decommit(decommitBase, decommitSize);
-#else
- UNUSED_PARAM(decommitBase);
- UNUSED_PARAM(decommitSize);
-#endif
</del><span class="cx"> releaseDecommitted(releaseBase, releaseSize);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void OSAllocator::decommitAndRelease(void* base, size_t size)
-{
- decommitAndRelease(base, size, base, size);
-}
-
</del><span class="cx"> template<typename T>
</span><span class="cx"> inline T* OSAllocator::reallocateCommitted(T* oldBase, size_t oldSize, size_t newSize, Usage usage, bool writable, bool executable)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWTFwtfPageAllocationAlignedcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/PageAllocationAligned.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/PageAllocationAligned.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WTF/wtf/PageAllocationAligned.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> vm_deallocate(current_task(), reinterpret_cast<vm_address_t>(tmp.base()), tmp.size());
</span><span class="cx"> #else
</span><span class="cx"> ASSERT(tmp.m_reservation.contains(tmp.base(), tmp.size()));
</span><del>- OSAllocator::decommitAndRelease(tmp.m_reservation.base(), tmp.m_reservation.size(), tmp.base(), tmp.size());
</del><ins>+ OSAllocator::decommitAndRelease(tmp.m_reservation.base(), tmp.m_reservation.size());
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Platform.h (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Platform.h 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WTF/wtf/Platform.h 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -394,11 +394,6 @@
</span><span class="cx"> #define WTF_OS_SOLARIS 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-/* OS(WINCE) - Windows CE; note that for this platform OS(WINDOWS) is also defined */
-#if defined(_WIN32_WCE)
-#define WTF_OS_WINCE 1
-#endif
-
</del><span class="cx"> /* OS(WINDOWS) - Any version of Windows */
</span><span class="cx"> #if defined(WIN32) || defined(_WIN32)
</span><span class="cx"> #define WTF_OS_WINDOWS 1
</span><span class="lines">@@ -600,7 +595,7 @@
</span><span class="cx">
</span><span class="cx"> #endif /* OS(DARWIN) */
</span><span class="cx">
</span><del>-#if OS(WINDOWS) && !OS(WINCE)
</del><ins>+#if OS(WINDOWS)
</ins><span class="cx">
</span><span class="cx"> #define HAVE_SYS_TIMEB_H 1
</span><span class="cx"> #define HAVE_ALIGNED_MALLOC 1
</span><span class="lines">@@ -655,8 +650,7 @@
</span><span class="cx"> /* The JIT is enabled by default on all x86, x86-64, ARM & MIPS platforms except ARMv7k and Windows. */
</span><span class="cx"> #if !defined(ENABLE_JIT) \
</span><span class="cx"> && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)) \
</span><del>- && !CPU(APPLE_ARMV7K) \
- && !OS(WINCE)
</del><ins>+ && !CPU(APPLE_ARMV7K)
</ins><span class="cx"> #define ENABLE_JIT 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -943,7 +937,7 @@
</span><span class="cx"> #define WTF_USE_UNIX_DOMAIN_SOCKETS 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !defined(WTF_USE_IMLANG_FONT_LINK2) && !OS(WINCE)
</del><ins>+#if !defined(WTF_USE_IMLANG_FONT_LINK2)
</ins><span class="cx"> #define WTF_USE_IMLANG_FONT_LINK2 1
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/PlatformWin.cmake (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/PlatformWin.cmake 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WTF/wtf/PlatformWin.cmake 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -5,15 +5,9 @@
</span><span class="cx"> win/RunLoopWin.cpp
</span><span class="cx"> )
</span><span class="cx">
</span><del>-if (WINCE)
- list(APPEND WTF_LIBRARIES
- mmtimer
- )
-else ()
- list(APPEND WTF_LIBRARIES
- winmm
- )
-endif ()
</del><ins>+list(APPEND WTF_LIBRARIES
+ winmm
+)
</ins><span class="cx">
</span><span class="cx"> list(APPEND WTF_HEADERS
</span><span class="cx"> "${DERIVED_SOURCES_WTF_DIR}/WTFHeaderDetection.h"
</span></span></pre></div>
<a id="trunkSourceWTFwtfRAMSizecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/RAMSize.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/RAMSize.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WTF/wtf/RAMSize.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -61,13 +61,6 @@
</span><span class="cx"> if (pages == -1 || pageSize == -1)
</span><span class="cx"> return ramSizeGuess;
</span><span class="cx"> return pages * pageSize;
</span><del>-#elif OS(WINCE)
- MEMORYSTATUS status;
- status.dwLength = sizeof(status);
- GlobalMemoryStatus(&status);
- if (status.dwTotalPhys <= 0)
- return ramSizeGuess;
- return status.dwTotalPhys;
</del><span class="cx"> #elif OS(WINDOWS)
</span><span class="cx"> MEMORYSTATUSEX status;
</span><span class="cx"> status.dwLength = sizeof(status);
</span></span></pre></div>
<a id="trunkSourceWTFwtfRandomNumberSeedh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/RandomNumberSeed.h (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/RandomNumberSeed.h 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WTF/wtf/RandomNumberSeed.h 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -45,9 +45,6 @@
</span><span class="cx"> {
</span><span class="cx"> #if OS(DARWIN)
</span><span class="cx"> // On Darwin we use arc4random which initialises itself.
</span><del>-#elif OS(WINCE)
- // initialize rand()
- srand(GetTickCount());
</del><span class="cx"> #elif COMPILER(MSVC) && defined(_CRT_RAND_S)
</span><span class="cx"> // On Windows we use rand_s which initialises itself
</span><span class="cx"> #elif OS(UNIX)
</span></span></pre></div>
<a id="trunkSourceWTFwtfStackBoundscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/StackBounds.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/StackBounds.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WTF/wtf/StackBounds.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -124,16 +124,6 @@
</span><span class="cx"> // stackOrigin.AllocationBase points to the reserved stack memory base address.
</span><span class="cx">
</span><span class="cx"> m_origin = static_cast<char*>(stackOrigin.BaseAddress) + stackOrigin.RegionSize;
</span><del>-#if OS(WINCE)
- SYSTEM_INFO systemInfo;
- GetSystemInfo(&systemInfo);
- DWORD pageSize = systemInfo.dwPageSize;
-
- MEMORY_BASIC_INFORMATION stackMemory;
- VirtualQuery(m_origin, &stackMemory, sizeof(stackMemory));
-
- m_bound = static_cast<char*>(m_origin) - stackMemory.RegionSize + pageSize;
-#else
</del><span class="cx"> // The stack on Windows consists out of three parts (uncommitted memory, a guard page and present
</span><span class="cx"> // committed memory). The 3 regions have different BaseAddresses but all have the same AllocationBase
</span><span class="cx"> // since they are all from the same VirtualAlloc. The 3 regions are laid out in memory (from high to
</span><span class="lines">@@ -173,7 +163,6 @@
</span><span class="cx"> ASSERT(endOfStack == computedEnd);
</span><span class="cx"> #endif // NDEBUG
</span><span class="cx"> m_bound = static_cast<char*>(endOfStack) + guardPage.RegionSize;
</span><del>-#endif // OS(WINCE)
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #else
</span></span></pre></div>
<a id="trunkSourceWTFwtfStackBoundsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/StackBounds.h (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/StackBounds.h 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WTF/wtf/StackBounds.h 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -98,11 +98,7 @@
</span><span class="cx"> bool isGrowingDownward() const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_origin && m_bound);
</span><del>-#if OS(WINCE)
- return m_origin > m_bound;
-#else
</del><span class="cx"> return true;
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWTFwtfStdLibExtrash"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/StdLibExtras.h (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/StdLibExtras.h 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WTF/wtf/StdLibExtras.h 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -297,31 +297,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WTF
</span><span class="cx">
</span><del>-#if OS(WINCE)
-// Windows CE CRT has does not implement bsearch().
-inline void* wtf_bsearch(const void* key, const void* base, size_t count, size_t size, int (*compare)(const void *, const void *))
-{
- const char* first = static_cast<const char*>(base);
-
- while (count) {
- size_t pos = (count - 1) >> 1;
- const char* item = first + pos * size;
- int compareResult = compare(item, key);
- if (!compareResult)
- return const_cast<char*>(item);
- if (compareResult < 0) {
- count -= (pos + 1);
- first += (pos + 1) * size;
- } else
- count = pos;
- }
-
- return 0;
-}
-
-#define bsearch(key, base, count, size, compare) wtf_bsearch(key, base, count, size, compare)
-#endif
-
</del><span class="cx"> // This version of placement new omits a 0 check.
</span><span class="cx"> enum NotNullTag { NotNull };
</span><span class="cx"> inline void* operator new(size_t, NotNullTag, void* location)
</span></span></pre></div>
<a id="trunkSourceWTFwtfStringExtrash"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/StringExtras.h (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/StringExtras.h 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WTF/wtf/StringExtras.h 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -69,25 +69,6 @@
</span><span class="cx"> // vsnprintf does not null terminate the buffer. WebKit can rely on the null termination.
</span><span class="cx"> #define vsnprintf(buffer, count, format, args) wtf_vsnprintf(buffer, count, format, args)
</span><span class="cx">
</span><del>-#if OS(WINCE)
-
-inline int strnicmp(const char* string1, const char* string2, size_t count)
-{
- return _strnicmp(string1, string2, count);
-}
-
-inline int stricmp(const char* string1, const char* string2)
-{
- return _stricmp(string1, string2);
-}
-
-inline char* strdup(const char* strSource)
-{
- return _strdup(strSource);
-}
-
-#endif
-
</del><span class="cx"> inline int strncasecmp(const char* s1, const char* s2, size_t len)
</span><span class="cx"> {
</span><span class="cx"> return _strnicmp(s1, s2, len);
</span></span></pre></div>
<a id="trunkSourceWTFwtfThreadSpecifich"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/ThreadSpecific.h (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/ThreadSpecific.h 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WTF/wtf/ThreadSpecific.h 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -158,11 +158,6 @@
</span><span class="cx">
</span><span class="cx"> #elif OS(WINDOWS)
</span><span class="cx">
</span><del>-// TLS_OUT_OF_INDEXES is not defined on WinCE.
-#ifndef TLS_OUT_OF_INDEXES
-#define TLS_OUT_OF_INDEXES 0xffffffff
-#endif
-
</del><span class="cx"> // The maximum number of TLS keys that can be created. For simplification, we assume that:
</span><span class="cx"> // 1) Once the instance of ThreadSpecific<> is created, it will not be destructed until the program dies.
</span><span class="cx"> // 2) We do not need to hold many instances of ThreadSpecific<> data. This fixed number should be far enough.
</span></span></pre></div>
<a id="trunkSourceWTFwtfThreadingWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/ThreadingWin.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/ThreadingWin.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WTF/wtf/ThreadingWin.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -94,6 +94,7 @@
</span><span class="cx">
</span><span class="cx"> #include "MainThread.h"
</span><span class="cx"> #include "ThreadFunctionInvocation.h"
</span><ins>+#include <process.h>
</ins><span class="cx"> #include <windows.h>
</span><span class="cx"> #include <wtf/CurrentTime.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="lines">@@ -107,10 +108,6 @@
</span><span class="cx"> #include "ThreadSpecific.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !OS(WINCE)
-#include <process.h>
-#endif
-
</del><span class="cx"> #if HAVE(ERRNO_H)
</span><span class="cx"> #include <errno.h>
</span><span class="cx"> #endif
</span><span class="lines">@@ -218,17 +215,9 @@
</span><span class="cx"> unsigned threadIdentifier = 0;
</span><span class="cx"> ThreadIdentifier threadID = 0;
</span><span class="cx"> OwnPtr<ThreadFunctionInvocation> invocation = adoptPtr(new ThreadFunctionInvocation(entryPoint, data));
</span><del>-#if OS(WINCE)
- // This is safe on WINCE, since CRT is in the core and innately multithreaded.
- // On desktop Windows, need to use _beginthreadex (not available on WinCE) if using any CRT functions
- HANDLE threadHandle = CreateThread(0, 0, (LPTHREAD_START_ROUTINE)wtfThreadEntryPoint, invocation.get(), 0, (LPDWORD)&threadIdentifier);
-#else
</del><span class="cx"> HANDLE threadHandle = reinterpret_cast<HANDLE>(_beginthreadex(0, 0, wtfThreadEntryPoint, invocation.get(), 0, &threadIdentifier));
</span><del>-#endif
</del><span class="cx"> if (!threadHandle) {
</span><del>-#if OS(WINCE)
- LOG_ERROR("Failed to create thread at entry point %p with data %p: %ld", entryPoint, data, ::GetLastError());
-#elif !HAVE(ERRNO_H)
</del><ins>+#if !HAVE(ERRNO_H)
</ins><span class="cx"> LOG_ERROR("Failed to create thread at entry point %p with data %p.", entryPoint, data);
</span><span class="cx"> #else
</span><span class="cx"> LOG_ERROR("Failed to create thread at entry point %p with data %p: %ld", entryPoint, data, errno);
</span></span></pre></div>
<a id="trunkSourceWTFwtfWindowsExtrash"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/WindowsExtras.h (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/WindowsExtras.h 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WTF/wtf/WindowsExtras.h 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -39,34 +39,17 @@
</span><span class="cx">
</span><span class="cx"> inline HRESULT getRegistryValue(HKEY hkey, LPCWSTR pszSubKey, LPCWSTR pszValue, LPDWORD pdwType, LPVOID pvData, LPDWORD pcbData)
</span><span class="cx"> {
</span><del>-#if OS(WINCE)
- HKEY key;
- if (::RegOpenKeyExW(hkey, pszSubKey, 0, 0, &key) != ERROR_SUCCESS)
- return ERROR_INVALID_NAME;
- HRESULT result = ::RegQueryValueExW(key, pszValue, 0, pdwType, static_cast<LPBYTE>(pvData), pcbData);
- ::RegCloseKey(key);
- return result;
-#else
</del><span class="cx"> return ::SHGetValueW(hkey, pszSubKey, pszValue, pdwType, pvData, pcbData);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void* getWindowPointer(HWND hWnd, int index)
</span><span class="cx"> {
</span><del>-#if OS(WINCE)
- return reinterpret_cast<void*>(::GetWindowLong(hWnd, index));
-#else
</del><span class="cx"> return reinterpret_cast<void*>(::GetWindowLongPtr(hWnd, index));
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void* setWindowPointer(HWND hWnd, int index, void* value)
</span><span class="cx"> {
</span><del>-#if OS(WINCE)
- return reinterpret_cast<void*>(::SetWindowLong(hWnd, index, reinterpret_cast<LONG>(value)));
-#else
</del><span class="cx"> return reinterpret_cast<void*>(::SetWindowLongPtr(hWnd, index, reinterpret_cast<LONG_PTR>(value)));
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WTF
</span></span></pre></div>
<a id="trunkSourceWTFwtfdtoautilsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/dtoa/utils.h (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/dtoa/utils.h 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WTF/wtf/dtoa/utils.h 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> defined(__ARMEL__) || \
</span><span class="cx"> defined(_MIPS_ARCH_MIPS32R2)
</span><span class="cx"> #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
</span><del>-#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA)
</del><ins>+#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA)
</ins><span class="cx"> #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
</span><span class="cx"> #elif defined(_M_IX86) || defined(__i386__)
</span><span class="cx"> #if defined(_WIN32)
</span><span class="lines">@@ -58,8 +58,6 @@
</span><span class="cx"> #else
</span><span class="cx"> #undef DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS
</span><span class="cx"> #endif // _WIN32
</span><del>-#elif defined(WINCE) || defined(_WIN32_WCE)
-#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
</del><span class="cx"> #else
</span><span class="cx"> #error Target architecture was not detected as supported by Double-Conversion.
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWTFwtftextWTFStringcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/WTFString.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/WTFString.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WTF/wtf/text/WTFString.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -452,34 +452,11 @@
</span><span class="cx">
</span><span class="cx"> String String::format(const char *format, ...)
</span><span class="cx"> {
</span><del>-#if OS(WINCE)
</del><span class="cx"> va_list args;
</span><span class="cx"> va_start(args, format);
</span><span class="cx">
</span><span class="cx"> Vector<char, 256> buffer;
</span><span class="cx">
</span><del>- int bufferSize = 256;
- buffer.resize(bufferSize);
- for (;;) {
- int written = vsnprintf(buffer.data(), bufferSize, format, args);
- va_end(args);
-
- if (written == 0)
- return String("");
- if (written > 0)
- return StringImpl::create(reinterpret_cast<const LChar*>(buffer.data()), written);
-
- bufferSize <<= 1;
- buffer.resize(bufferSize);
- va_start(args, format);
- }
-
-#else
- va_list args;
- va_start(args, format);
-
- Vector<char, 256> buffer;
-
</del><span class="cx"> // Do the format once to get the length.
</span><span class="cx"> #if COMPILER(MSVC)
</span><span class="cx"> int result = _vscprintf(format, args);
</span><span class="lines">@@ -509,7 +486,6 @@
</span><span class="cx"> va_end(args);
</span><span class="cx">
</span><span class="cx"> return StringImpl::create(reinterpret_cast<const LChar*>(buffer.data()), len);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String String::number(int number)
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/ChangeLog 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,3 +1,149 @@
</span><ins>+2014-09-25 Csaba Osztrogonác <ossy@webkit.org>
+
+ Remove WinCE port from trunk
+ https://bugs.webkit.org/show_bug.cgi?id=136951
+
+ Reviewed by Alex Christensen.
+
+ * Modules/encryptedmedia/CDMPrivateMediaPlayer.cpp:
+ * PlatformWinCE.cmake: Removed.
+ * accessibility/AXObjectCache.cpp:
+ * editing/FrameSelection.cpp:
+ (WebCore::FrameSelection::modifyMovingRight):
+ * loader/icon/wince/IconDatabaseWinCE.cpp: Removed.
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::sendContextMenuEventForKey):
+ * page/Settings.cpp:
+ * page/win/EventHandlerWin.cpp:
+ (WebCore::EventHandler::createDraggingDataTransfer):
+ * platform/ContextMenu.h:
+ * platform/DragImage.cpp:
+ * platform/FileSystem.h:
+ * platform/graphics/BitmapImage.cpp:
+ (WebCore::BitmapImage::mayFillWithSolidColor):
+ * platform/graphics/FontGlyphs.cpp:
+ (WebCore::FontGlyphs::glyphDataAndPageForCharacter):
+ * platform/graphics/FontPlatformData.h:
+ * platform/graphics/ImageBufferData.h:
+ * platform/graphics/MediaPlayer.cpp:
+ * platform/graphics/SimpleFontData.h:
+ * platform/graphics/opentype/OpenTypeUtilities.cpp:
+ (WebCore::renameAndActivateFont):
+ * platform/graphics/opentype/OpenTypeUtilities.h:
+ * platform/graphics/win/DIBPixelData.cpp:
+ (WebCore::DIBPixelData::setRGBABitmapAlpha):
+ * platform/graphics/win/GDIExtras.cpp: Removed.
+ * platform/graphics/win/GDIExtras.h:
+ (WebCore::hasAlphaBlendSupport):
+ (WebCore::alphaBlendIfSupported):
+ * platform/graphics/win/IconWin.cpp:
+ (WebCore::Icon::createIconForFiles):
+ (WebCore::Icon::paint):
+ * platform/graphics/win/SimpleFontDataWin.cpp:
+ (WebCore::SimpleFontData::initGDIFont):
+ (WebCore::SimpleFontData::platformDestroy):
+ (WebCore::SimpleFontData::boundsForGDIGlyph):
+ (WebCore::SimpleFontData::widthForGDIGlyph):
+ (WebCore::SimpleFontData::scriptFontProperties):
+ * platform/graphics/wince/FontCacheWinCE.cpp: Removed.
+ * platform/graphics/wince/FontCustomPlatformData.cpp: Removed.
+ * platform/graphics/wince/FontCustomPlatformData.h: Removed.
+ * platform/graphics/wince/FontPlatformData.cpp: Removed.
+ * platform/graphics/wince/FontPlatformData.h: Removed.
+ * platform/graphics/wince/FontWinCE.cpp: Removed.
+ * platform/graphics/wince/GlyphPageTreeNodeWinCE.cpp: Removed.
+ * platform/graphics/wince/GradientWinCE.cpp: Removed.
+ * platform/graphics/wince/GraphicsContextWinCE.cpp: Removed.
+ * platform/graphics/wince/ImageBufferDataWince.h: Removed.
+ * platform/graphics/wince/ImageBufferWinCE.cpp: Removed.
+ * platform/graphics/wince/ImageWinCE.cpp: Removed.
+ * platform/graphics/wince/MediaPlayerPrivateWinCE.h: Removed.
+ * platform/graphics/wince/MediaPlayerProxy.cpp: Removed.
+ * platform/graphics/wince/MediaPlayerProxy.h: Removed.
+ * platform/graphics/wince/PathWinCE.cpp: Removed.
+ * platform/graphics/wince/PlatformPathWinCE.cpp: Removed.
+ * platform/graphics/wince/PlatformPathWinCE.h: Removed.
+ * platform/graphics/wince/SharedBitmap.cpp: Removed.
+ * platform/graphics/wince/SharedBitmap.h: Removed.
+ * platform/graphics/wince/SimpleFontDataWinCE.cpp: Removed.
+ * platform/graphics/wince/WinCEGraphicsExtras.h: Removed.
+ * platform/image-decoders/jpeg/JPEGImageDecoder.h:
+ * platform/network/win/NetworkStateNotifierWin.cpp:
+ (WebCore::NetworkStateNotifier::NetworkStateNotifier):
+ * platform/win/COMPtr.h:
+ * platform/win/ClipboardUtilitiesWin.cpp:
+ * platform/win/ContextMenuItemWin.cpp:
+ * platform/win/ContextMenuWin.cpp:
+ (WebCore::ContextMenu::getContextMenuItems):
+ (WebCore::ContextMenu::createPlatformContextMenuFromItems):
+ * platform/win/DragImageWin.cpp:
+ (WebCore::dragLabelFont):
+ * platform/win/FileSystemWin.cpp:
+ (WebCore::pathByAppendingComponent):
+ (WebCore::pathGetFileName):
+ (WebCore::storageDirectory):
+ * platform/win/LoggingWin.cpp:
+ (WebCore::logLevelString):
+ * platform/win/PasteboardWin.cpp:
+ (WebCore::PasteboardOwnerWndProc):
+ (WebCore::Pasteboard::createForCopyAndPaste):
+ (WebCore::pathRemoveBadFSCharacters):
+ (WebCore::filesystemPathFromUrlOrTitle):
+ (WebCore::createGlobalHDropContent):
+ * platform/win/PlatformMouseEventWin.cpp:
+ (WebCore::messageToEventType):
+ (WebCore::PlatformMouseEvent::PlatformMouseEvent):
+ * platform/win/PlatformScreenWin.cpp:
+ (WebCore::deviceInfoForWidget):
+ (WebCore::screenIsMonochrome):
+ * platform/win/PopupMenuWin.cpp:
+ (WebCore::PopupMenuWin::show):
+ (WebCore::PopupMenuWin::paint):
+ (WebCore::PopupMenuWin::registerClass):
+ (WebCore::PopupMenuWin::wndProc):
+ * platform/win/ScrollbarThemeWin.cpp:
+ (WebCore::ScrollbarThemeWin::paintButton):
+ * platform/win/SharedBufferWin.cpp:
+ * platform/win/SharedTimerWin.cpp:
+ (WebCore::TimerWindowWndProc):
+ (WebCore::initializeOffScreenTimerWindow):
+ (WebCore::queueTimerProc):
+ (WebCore::setSharedTimerFireInterval):
+ (WebCore::stopSharedTimer):
+ * platform/win/SoftLinking.h:
+ * platform/win/SystemInfo.cpp:
+ (WebCore::windowsVersion):
+ (WebCore::processorArchitecture):
+ (WebCore::architectureTokenForUAString):
+ * platform/win/WCDataObject.cpp:
+ (WebCore::WCDataObject::CopyMedium):
+ * plugins/PluginDatabase.cpp:
+ * plugins/PluginView.cpp:
+ (WebCore::PluginView::stop):
+ * plugins/PluginViewNone.cpp:
+ * plugins/win/PluginDatabaseWin.cpp:
+ (WebCore::addWindowsMediaPlayerPluginDirectory):
+ (WebCore::addMacromediaPluginDirectories):
+ * plugins/win/PluginPackageWin.cpp:
+ (WebCore::PluginPackage::load):
+ * plugins/win/PluginViewWin.cpp:
+ (WebCore::setUpOffscreenPaintingHooks):
+ (WebCore::registerPluginView):
+ (WebCore::PluginView::wndProc):
+ (WebCore::PluginView::updatePluginWidget):
+ (WebCore::PluginView::paintIntoTransformedContext):
+ (WebCore::PluginView::paint):
+ (WebCore::PluginView::handleMouseEvent):
+ (WebCore::PluginView::setParent):
+ (WebCore::PluginView::setNPWindowRect):
+ (WebCore::PluginView::platformStart):
+ * rendering/RenderThemeWinCE.cpp: Removed.
+ * rendering/RenderThemeWinCE.h: Removed.
+ * storage/wince/DatabaseThreadWinCE.cpp: Removed.
+ * storage/wince/DatabaseThreadWinCE.h: Removed.
+ * storage/wince/StorageThreadWinCE.cpp: Removed.
+ * storage/wince/StorageThreadWinCE.h: Removed.
+
</ins><span class="cx"> 2014-09-25 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Fix GTK+ build after r173944.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaCDMPrivateMediaPlayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/CDMPrivateMediaPlayer.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/CDMPrivateMediaPlayer.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/Modules/encryptedmedia/CDMPrivateMediaPlayer.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "MediaPlayer.h"
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) || OS(WINCE)
</del><ins>+#if PLATFORM(IOS)
</ins><span class="cx"> #include "SoftLinking.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformWinCEcmake"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/PlatformWinCE.cmake (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformWinCE.cmake 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/PlatformWinCE.cmake 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,64 +0,0 @@
</span><del>-list(APPEND WebCore_INCLUDE_DIRECTORIES
- "${WEBCORE_DIR}/platform/wince"
- "${WEBCORE_DIR}/platform/graphics/wince"
- "${WEBCORE_DIR}/platform/network/win"
- "${3RDPARTY_DIR}/libjpeg"
- "${3RDPARTY_DIR}/libpng"
- "${3RDPARTY_DIR}/libxml2/include"
- "${3RDPARTY_DIR}/libxslt/include"
- "${3RDPARTY_DIR}/sqlite"
- "${3RDPARTY_DIR}/zlib"
-)
-
-list(APPEND WebCore_SOURCES
- page/win/FrameGdiWin.cpp
-
- platform/ScrollAnimatorNone.cpp
-
- platform/graphics/win/DIBPixelData.cpp
- platform/graphics/win/GDIExtras.cpp
- platform/graphics/win/IconWin.cpp
- platform/graphics/win/ImageWin.cpp
- platform/graphics/win/IntPointWin.cpp
- platform/graphics/win/IntRectWin.cpp
- platform/graphics/win/IntSizeWin.cpp
-
- platform/graphics/wince/FontCacheWince.cpp
- platform/graphics/wince/FontCustomPlatformData.cpp
- platform/graphics/wince/FontPlatformData.cpp
- platform/graphics/wince/FontWince.cpp
- platform/graphics/wince/GlyphPageTreeNodeWince.cpp
- platform/graphics/wince/GradientWince.cpp
- platform/graphics/wince/GraphicsContextWince.cpp
- platform/graphics/wince/ImageBufferWince.cpp
- platform/graphics/wince/ImageWinCE.cpp
- platform/graphics/wince/PathWince.cpp
- platform/graphics/wince/PlatformPathWince.cpp
- platform/graphics/wince/SharedBitmap.cpp
- platform/graphics/wince/SimpleFontDataWince.cpp
-
- platform/network/NetworkStorageSessionStub.cpp
-
- platform/network/win/CookieJarWin.cpp
- platform/network/win/CredentialStorageWin.cpp
- platform/network/win/ProxyServerWin.cpp
- platform/network/win/ResourceHandleWin.cpp
- platform/network/win/SocketStreamHandleWin.cpp
-
- platform/text/LocaleNone.cpp
-
- platform/text/win/TextCodecWin.cpp
-
- rendering/RenderThemeWince.cpp
-)
-
-list(APPEND WebCore_LIBRARIES
- crypt32
- iphlpapi
- libjpeg
- libpng
- libxml2
- libxslt
- sqlite
- wininet
-)
</del></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAXObjectCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AXObjectCache.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AXObjectCache.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/accessibility/AXObjectCache.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -566,7 +566,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-#if !PLATFORM(WIN) || OS(WINCE)
</del><ins>+#if !PLATFORM(WIN)
</ins><span class="cx"> AXID AXObjectCache::platformGenerateAXID() const
</span><span class="cx"> {
</span><span class="cx"> static AXID lastUsedID = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingFrameSelectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/FrameSelection.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/FrameSelection.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/editing/FrameSelection.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -770,8 +770,6 @@
</span><span class="cx"> pos = VisiblePosition(m_selection.extent(), m_selection.affinity()).right(true);
</span><span class="cx"> break;
</span><span class="cx"> case WordGranularity: {
</span><del>- // Visual word movement relies on isWordTextBreak which is not implemented in WinCE and QT.
- // https://bugs.webkit.org/show_bug.cgi?id=81136.
</del><span class="cx"> bool skipsSpaceWhenMovingRight = m_frame && m_frame->editor().behavior().shouldSkipSpaceWhenMovingRight();
</span><span class="cx"> pos = rightWordPosition(VisiblePosition(m_selection.extent(), m_selection.affinity()), skipsSpaceWhenMovingRight);
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebCoreloadericonwinceIconDatabaseWinCEcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/loader/icon/wince/IconDatabaseWinCE.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/icon/wince/IconDatabaseWinCE.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/loader/icon/wince/IconDatabaseWinCE.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,88 +0,0 @@
</span><del>-/*
- * Copyright (C) 2007-2009 Torch Mobile Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#include "config.h"
-#include "IconDatabase.h"
-
-#include "DocumentLoader.h"
-#include "FileSystem.h"
-#include "IconDatabaseClient.h"
-#include "IconRecord.h"
-#include "Image.h"
-#include <wtf/AutodrainedPool.h>
-#include <wtf/text/CString.h>
-
-namespace WebCore {
-
-static IconDatabase* sharedIconDatabase = 0;
-
-// Function to obtain the global icon database.
-IconDatabase& iconDatabase()
-{
- if (!sharedIconDatabase)
- sharedIconDatabase = new IconDatabase;
- return *sharedIconDatabase;
-}
-
-IconDatabase::IconDatabase() {}
-IconDatabase::~IconDatabase() {}
-
-void IconDatabase::setClient(IconDatabaseClient*) {}
-
-bool IconDatabase::open(const String& path) { return false; }
-void IconDatabase::close() {}
-
-void IconDatabase::removeAllIcons() {}
-
-Image* IconDatabase::iconForPageURL(const String&, const IntSize&) { return 0; }
-void IconDatabase::readIconForPageURLFromDisk(const String&) {}
-String IconDatabase::iconURLForPageURL(const String&) { return String(); }
-Image* IconDatabase::defaultIcon(const IntSize&) { return 0;}
-
-void IconDatabase::retainIconForPageURL(const String&) {}
-void IconDatabase::releaseIconForPageURL(const String&) {}
-
-void IconDatabase::setIconDataForIconURL(PassRefPtr<SharedBuffer> data, const String&) {}
-void IconDatabase::setIconURLForPageURL(const String& iconURL, const String& pageURL) {}
-
-IconLoadDecision IconDatabase::loadDecisionForIconURL(const String&, DocumentLoader*) { return IconLoadNo; }
-bool IconDatabase::iconDataKnownForIconURL(const String&) { return false; }
-
-void IconDatabase::setEnabled(bool enabled) {}
-bool IconDatabase::isEnabled() const { return false; }
-
-void IconDatabase::setPrivateBrowsingEnabled(bool flag) {}
-bool IconDatabase::isPrivateBrowsingEnabled() const { return false; }
-
-void IconDatabase::delayDatabaseCleanup() {}
-void IconDatabase::allowDatabaseCleanup() {}
-void IconDatabase::checkIntegrityBeforeOpening() {}
-
-// Support for WebCoreStatistics in WebKit
-size_t IconDatabase::pageURLMappingCount() { return 0; }
-size_t IconDatabase::retainedPageURLCount() {return 0; }
-size_t IconDatabase::iconRecordCount() { return 0; }
-size_t IconDatabase::iconRecordCountWithData() { return 0; }
-
-bool IconDatabase::isOpen() const { return false; }
-String IconDatabase::databasePath() const { return String(); }
-String IconDatabase::defaultDatabaseFilename() { return String(); }
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -2815,7 +2815,7 @@
</span><span class="cx">
</span><span class="cx"> static const int kContextMenuMargin = 1;
</span><span class="cx">
</span><del>-#if OS(WINDOWS) && !OS(WINCE)
</del><ins>+#if OS(WINDOWS)
</ins><span class="cx"> int rightAligned = ::GetSystemMetrics(SM_MENUDROPALIGNMENT);
</span><span class="cx"> #else
</span><span class="cx"> int rightAligned = 0;
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/page/Settings.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx">
</span><span class="cx"> // NOTEs
</span><span class="cx"> // 1) EditingMacBehavior comprises Tiger, Leopard, SnowLeopard and iOS builds, as well as QtWebKit when built on Mac;
</span><del>-// 2) EditingWindowsBehavior comprises Win32 and WinCE builds, as well as QtWebKit and Chromium when built on Windows;
</del><ins>+// 2) EditingWindowsBehavior comprises Win32 build;
</ins><span class="cx"> // 3) EditingUnixBehavior comprises all unix-based systems, but Darwin/MacOS (and then abusing the terminology);
</span><span class="cx"> // 99) MacEditingBehavior is used as a fallback.
</span><span class="cx"> static EditingBehaviorType editingBehaviorTypeForPlatform()
</span></span></pre></div>
<a id="trunkSourceWebCorepagewinEventHandlerWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/win/EventHandlerWin.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/win/EventHandlerWin.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/page/win/EventHandlerWin.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -94,11 +94,7 @@
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><span class="cx"> PassRefPtr<DataTransfer> EventHandler::createDraggingDataTransfer() const
</span><span class="cx"> {
</span><del>-#if OS(WINCE)
- return 0;
-#else
</del><span class="cx"> return DataTransfer::createForDragAndDrop();
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformContextMenuh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ContextMenu.h (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ContextMenu.h 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/ContextMenu.h 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -92,10 +92,7 @@
</span><span class="cx"> RetainPtr<NSMutableArray> m_platformDescription;
</span><span class="cx"> #else
</span><span class="cx"> PlatformMenuDescription m_platformDescription;
</span><del>-#if OS(WINCE)
- unsigned m_itemCount;
</del><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #endif // USE(CROSS_PLATFORM_CONTEXT_MENUS)
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformDragImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/DragImage.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/DragImage.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/DragImage.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx"> return createDragImageFromSnapshot(snapshotNode(frame, node), &node);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(COCOA) && (!PLATFORM(WIN) || OS(WINCE))
</del><ins>+#if !PLATFORM(COCOA) && !PLATFORM(WIN)
</ins><span class="cx"> DragImageRef createDragImageForLink(URL&, const String&, FontRenderingMode)
</span><span class="cx"> {
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformFileSystemh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/FileSystem.h (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/FileSystem.h 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/FileSystem.h 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx"> uint64_t getVolumeFreeSizeForPath(const char*);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(WIN) && !OS(WINCE)
</del><ins>+#if PLATFORM(WIN)
</ins><span class="cx"> String localUserSpecificStorageDirectory();
</span><span class="cx"> String roamingUserSpecificStorageDirectory();
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsBitmapImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/BitmapImage.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/BitmapImage.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/graphics/BitmapImage.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -676,11 +676,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_checkedForSolidColor && frameCount() > 0) {
</span><span class="cx"> checkForSolidColor();
</span><del>- // WINCE PORT: checkForSolidColor() doesn't set m_checkedForSolidColor until
- // it gets enough information to make final decision.
-#if !OS(WINCE)
</del><span class="cx"> ASSERT(m_checkedForSolidColor);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> return m_isSolidColor && !m_currentFrame;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontGlyphscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontGlyphs.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontGlyphs.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/graphics/FontGlyphs.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -394,20 +394,10 @@
</span><span class="cx"> GlyphData data = fallbackPage && fallbackPage->fontDataForCharacter(c) ? fallbackPage->glyphDataForCharacter(c) : characterFontData->missingGlyphData();
</span><span class="cx"> // Cache it so we don't have to do system fallback again next time.
</span><span class="cx"> if (variant == NormalVariant) {
</span><del>-#if OS(WINCE)
- // missingGlyphData returns a null character, which is not suitable for GDI to display.
- // Also, sometimes we cannot map a font for the character on WINCE, but GDI can still
- // display the character, probably because the font package is not installed correctly.
- // So we just always set the glyph to be same as the character, and let GDI solve it.
- page->setGlyphDataForCharacter(c, c, characterFontData.get());
- characterFontData->setMaxGlyphPageTreeLevel(std::max(characterFontData->maxGlyphPageTreeLevel(), node->level()));
- return std::make_pair(page->glyphDataForCharacter(c), page);
-#else
</del><span class="cx"> page->setGlyphDataForCharacter(c, data.glyph, data.fontData);
</span><span class="cx"> data.fontData->setMaxGlyphPageTreeLevel(std::max(data.fontData->maxGlyphPageTreeLevel(), node->level()));
</span><span class="cx"> if (!Font::isCJKIdeographOrSymbol(c) && data.fontData->platformData().orientation() != Horizontal && !data.fontData->isTextOrientationFallback())
</span><span class="cx"> return glyphDataAndPageForNonCJKCharacterWithGlyphOrientation(c, description.nonCJKGlyphOrientation(), data, fallbackPage, pageNumber);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> return std::make_pair(data, page);
</span><span class="cx"> }
</span><span class="lines">@@ -416,15 +406,8 @@
</span><span class="cx"> // FIXME: It would be nicer to use the missing glyph from the last resort font instead.
</span><span class="cx"> GlyphData data = primarySimpleFontData(description)->missingGlyphData();
</span><span class="cx"> if (variant == NormalVariant) {
</span><del>-#if OS(WINCE)
- // See comment about WINCE GDI handling near setGlyphDataForCharacter above.
- page->setGlyphDataForCharacter(c, c, data.fontData);
- data.fontData->setMaxGlyphPageTreeLevel(std::max(data.fontData->maxGlyphPageTreeLevel(), node->level()));
- return std::make_pair(page->glyphDataForCharacter(c), page);
-#else
</del><span class="cx"> page->setGlyphDataForCharacter(c, data.glyph, data.fontData);
</span><span class="cx"> data.fontData->setMaxGlyphPageTreeLevel(std::max(data.fontData->maxGlyphPageTreeLevel(), node->level()));
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> return std::make_pair(data, page);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontPlatformDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontPlatformData.h (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontPlatformData.h 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/graphics/FontPlatformData.h 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -23,9 +23,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> // FIXME: This is temporary until all ports switch to using this file.
</span><del>-#if USE(WINGDI)
-#include "wince/FontPlatformData.h"
-#elif PLATFORM(EFL) || PLATFORM(GTK)
</del><ins>+#if PLATFORM(EFL) || PLATFORM(GTK)
</ins><span class="cx"> #include "freetype/FontPlatformData.h"
</span><span class="cx"> #else
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsImageBufferDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ImageBufferData.h (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ImageBufferData.h 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/graphics/ImageBufferData.h 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -27,6 +27,4 @@
</span><span class="cx"> #include "ImageBufferDataCG.h"
</span><span class="cx"> #elif USE(CAIRO)
</span><span class="cx"> #include "ImageBufferDataCairo.h"
</span><del>-#elif USE(WINGDI)
-#include "ImageBufferDataWince.h"
</del><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -66,9 +66,6 @@
</span><span class="cx"> #include "MediaPlayerPrivateMediaSourceAVFObjC.h"
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><del>-#elif OS(WINCE)
-#include "MediaPlayerPrivateWinCE.h"
-#define PlatformMediaEngineClassName MediaPlayerPrivate
</del><span class="cx"> #elif PLATFORM(WIN) && !USE(GSTREAMER)
</span><span class="cx"> #if USE(AVFOUNDATION)
</span><span class="cx"> #include "MediaPlayerPrivateAVFoundationCF.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsSimpleFontDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/SimpleFontData.h (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/SimpleFontData.h 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/graphics/SimpleFontData.h 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if (PLATFORM(WIN) && !OS(WINCE))
</del><ins>+#if PLATFORM(WIN)
</ins><span class="cx"> #include <usp10.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -230,10 +230,8 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN)
</span><span class="cx"> bool isSystemFont() const { return m_isSystemFont; }
</span><del>-#if !OS(WINCE) // disable unused members to save space
</del><span class="cx"> SCRIPT_FONTPROPERTIES* scriptFontProperties() const;
</span><span class="cx"> SCRIPT_CACHE* scriptCache() const { return &m_scriptCache; }
</span><del>-#endif
</del><span class="cx"> static void setShouldApplyMacAscentHack(bool);
</span><span class="cx"> static bool shouldApplyMacAscentHack();
</span><span class="cx"> static float ascentConsideringMacAscentHack(const WCHAR*, float ascent, float descent);
</span><span class="lines">@@ -254,7 +252,7 @@
</span><span class="cx"> PassRefPtr<SimpleFontData> createScaledFontData(const FontDescription&, float scaleFactor) const;
</span><span class="cx"> PassRefPtr<SimpleFontData> platformCreateScaledFontData(const FontDescription&, float scaleFactor) const;
</span><span class="cx">
</span><del>-#if (PLATFORM(WIN) && !OS(WINCE))
</del><ins>+#if PLATFORM(WIN)
</ins><span class="cx"> void initGDIFont();
</span><span class="cx"> void platformCommonDestroy();
</span><span class="cx"> FloatRect boundsForGDIGlyph(Glyph glyph) const;
</span><span class="lines">@@ -336,11 +334,9 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN)
</span><span class="cx"> bool m_isSystemFont;
</span><del>-#if !OS(WINCE) // disable unused members to save space
</del><span class="cx"> mutable SCRIPT_CACHE m_scriptCache;
</span><span class="cx"> mutable SCRIPT_FONTPROPERTIES* m_scriptFontProperties;
</span><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> bool m_shouldNotBeUsedForArabic;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsopentypeOpenTypeUtilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/opentype/OpenTypeUtilities.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/opentype/OpenTypeUtilities.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/graphics/opentype/OpenTypeUtilities.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -408,7 +408,6 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !OS(WINCE)
</del><span class="cx"> // Rename the font and install the new font data into the system
</span><span class="cx"> HANDLE renameAndActivateFont(const SharedBuffer& fontData, const String& fontName)
</span><span class="cx"> {
</span><span class="lines">@@ -426,6 +425,5 @@
</span><span class="cx">
</span><span class="cx"> return fontHandle;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsopentypeOpenTypeUtilitiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/opentype/OpenTypeUtilities.h (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/opentype/OpenTypeUtilities.h 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/graphics/opentype/OpenTypeUtilities.h 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -37,10 +37,6 @@
</span><span class="cx"> struct EOTPrefix;
</span><span class="cx"> class SharedBuffer;
</span><span class="cx">
</span><del>-#if OS(WINCE)
-typedef unsigned __int8 UInt8;
-#endif
-
</del><span class="cx"> struct EOTHeader {
</span><span class="cx"> EOTHeader();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinDIBPixelDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/DIBPixelData.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/DIBPixelData.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/graphics/win/DIBPixelData.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -91,12 +91,10 @@
</span><span class="cx"> ASSERT(pixelData.bitsPerPixel() == 32);
</span><span class="cx">
</span><span class="cx"> IntRect drawRect(dstRect);
</span><del>-#if !OS(WINCE)
</del><span class="cx"> XFORM trans;
</span><span class="cx"> GetWorldTransform(hdc, &trans);
</span><span class="cx"> IntSize transformedPosition(trans.eDx, trans.eDy);
</span><span class="cx"> drawRect.move(transformedPosition);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> int pixelDataWidth = pixelData.size().width();
</span><span class="cx"> int pixelDataHeight = pixelData.size().height();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinGDIExtrascpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/graphics/win/GDIExtras.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/GDIExtras.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/graphics/win/GDIExtras.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,43 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
- *
- * 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 AND ITS CONTRIBUTORS "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 OR ITS 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.
- */
-
-#include "config.h"
-#include "GDIExtras.h"
-
-#include "SoftLinking.h"
-
-namespace WebCore {
-
-#if OS(WINCE)
-SOFT_LINK_LIBRARY(coredll)
-SOFT_LINK_OPTIONAL(coredll, AlphaBlend, BOOL, APIENTRY, (HDC hdcDest, int nXOriginDest, int nYOriginDest, int nWidthDest, int nHeightDest, HDC hdcSrc,
- int nXOriginSrc, int nYOriginSrc, int nWidthSrc, int nHeightSrc, BLENDFUNCTION blendFunction))
-
-AlphaBlendPointerType AlphaBlendPointer()
-{
- return AlphaBlendPtr();
-}
-#endif
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinGDIExtrash"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/graphics/win/GDIExtras.h (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/GDIExtras.h 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/graphics/win/GDIExtras.h 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,65 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
- *
- * 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 AND ITS CONTRIBUTORS "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 OR ITS 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.
- */
-
-#ifndef GDIExtras_h
-#define GDIExtras_h
-
-#include <windows.h>
-
-namespace WebCore {
-
-typedef BOOL (APIENTRY *AlphaBlendPointerType) (HDC hdcDest, int nXOriginDest, int nYOriginDest, int nWidthDest, int nHeightDest, HDC hdcSrc,
- int nXOriginSrc, int nYOriginSrc, int nWidthSrc, int nHeightSrc, BLENDFUNCTION blendFunction);
-
-#if OS(WINCE)
-AlphaBlendPointerType AlphaBlendPointer();
-#endif
-
-inline bool hasAlphaBlendSupport()
-{
-#if OS(WINCE)
- return AlphaBlendPointer();
-#else
- return true;
-#endif
-}
-
-inline bool alphaBlendIfSupported(HDC hdcDest, int nXOriginDest, int nYOriginDest, int nWidthDest, int nHeightDest, HDC hdcSrc,
- int nXOriginSrc, int nYOriginSrc, int nWidthSrc, int nHeightSrc, BLENDFUNCTION blendFunction)
-{
-#if OS(WINCE)
- AlphaBlendPointerType alphaBlendPointer = AlphaBlendPointer();
- if (!alphaBlendPointer)
- return false;
-
- alphaBlendPointer(hdcDest, nXOriginDest, nYOriginDest, nWidthDest, nHeightDest, hdcSrc, nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc, blendFunction);
-#else
- AlphaBlend(hdcDest, nXOriginDest, nYOriginDest, nWidthDest, nHeightDest, hdcSrc, nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc, blendFunction);
-#endif
- return true;
-}
-
-} // namespace WebCore
-
-#endif // GDIExtras_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinIconWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/IconWin.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/IconWin.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/graphics/win/IconWin.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -27,11 +27,6 @@
</span><span class="cx"> #include <windows.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#if OS(WINCE)
-// SHGFI_SHELLICONSIZE is not available on WINCE
-#define SHGFI_SHELLICONSIZE 0
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> static const int shell32MultipleFileIconIndex = 54;
</span><span class="lines">@@ -64,9 +59,6 @@
</span><span class="cx"> return adoptRef(new Icon(sfi.hIcon));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if OS(WINCE)
- return 0;
-#else
</del><span class="cx"> WCHAR buffer[MAX_PATH];
</span><span class="cx"> UINT length = ::GetSystemDirectoryW(buffer, WTF_ARRAY_LENGTH(buffer));
</span><span class="cx"> if (!length)
</span><span class="lines">@@ -79,7 +71,6 @@
</span><span class="cx"> if (!::ExtractIconExW(buffer, shell32MultipleFileIconIndex, 0, &hIcon, 1))
</span><span class="cx"> return 0;
</span><span class="cx"> return adoptRef(new Icon(hIcon));
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Icon::paint(GraphicsContext* context, const IntRect& r)
</span><span class="lines">@@ -87,12 +78,8 @@
</span><span class="cx"> if (context->paintingDisabled())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>-#if OS(WINCE)
- context->drawIcon(m_hIcon, r, DI_NORMAL);
-#else
</del><span class="cx"> LocalWindowsContext windowContext(context, r);
</span><span class="cx"> DrawIconEx(windowContext.hdc(), r.x(), r.y(), m_hIcon, r.width(), r.height(), 0, 0, DI_NORMAL);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinSimpleFontDataWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/SimpleFontDataWin.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/SimpleFontDataWin.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/graphics/win/SimpleFontDataWin.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -96,13 +96,11 @@
</span><span class="cx"> m_avgCharWidth = textMetrics.tmAveCharWidth;
</span><span class="cx"> m_maxCharWidth = textMetrics.tmMaxCharWidth;
</span><span class="cx"> float xHeight = ascent * 0.56f; // Best guess for xHeight if no x glyph is present.
</span><del>-#if !OS(WINCE)
</del><span class="cx"> GLYPHMETRICS gm;
</span><span class="cx"> static const MAT2 identity = { 0, 1, 0, 0, 0, 0, 0, 1 };
</span><span class="cx"> DWORD len = GetGlyphOutline(hdc, 'x', GGO_METRICS, &gm, 0, 0, &identity);
</span><span class="cx"> if (len != GDI_ERROR && gm.gmptGlyphOrigin.y > 0)
</span><span class="cx"> xHeight = gm.gmptGlyphOrigin.y;
</span><del>-#endif
</del><span class="cx"> m_fontMetrics.setXHeight(xHeight);
</span><span class="cx"> m_fontMetrics.setUnitsPerEm(metrics.otmEMSquare);
</span><span class="cx">
</span><span class="lines">@@ -121,10 +119,8 @@
</span><span class="cx">
</span><span class="cx"> void SimpleFontData::platformDestroy()
</span><span class="cx"> {
</span><del>-#if !OS(WINCE)
</del><span class="cx"> ScriptFreeCache(&m_scriptCache);
</span><span class="cx"> delete m_scriptFontProperties;
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<SimpleFontData> SimpleFontData::platformCreateScaledFontData(const FontDescription& fontDescription, float scaleFactor) const
</span><span class="lines">@@ -200,9 +196,6 @@
</span><span class="cx">
</span><span class="cx"> FloatRect SimpleFontData::boundsForGDIGlyph(Glyph glyph) const
</span><span class="cx"> {
</span><del>-#if OS(WINCE)
- return FloatRect();
-#else
</del><span class="cx"> HWndDC hdc(0);
</span><span class="cx"> SetGraphicsMode(hdc, GM_ADVANCED);
</span><span class="cx"> HGDIOBJ oldFont = SelectObject(hdc, m_platformData.hfont());
</span><span class="lines">@@ -215,35 +208,24 @@
</span><span class="cx">
</span><span class="cx"> return FloatRect(gdiMetrics.gmptGlyphOrigin.x, -gdiMetrics.gmptGlyphOrigin.y,
</span><span class="cx"> gdiMetrics.gmBlackBoxX + m_syntheticBoldOffset, gdiMetrics.gmBlackBoxY);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> float SimpleFontData::widthForGDIGlyph(Glyph glyph) const
</span><span class="cx"> {
</span><span class="cx"> HWndDC hdc(0);
</span><del>-#if !OS(WINCE)
</del><span class="cx"> SetGraphicsMode(hdc, GM_ADVANCED);
</span><del>-#endif
</del><span class="cx"> HGDIOBJ oldFont = SelectObject(hdc, m_platformData.hfont());
</span><span class="cx">
</span><del>-#if OS(WINCE)
- WCHAR c = glyph;
- SIZE fontSize;
- GetTextExtentPoint32W(hdc, &c, 1, &fontSize);
- float result = fontSize.cx * m_platformData.size() / 72.f;
-#else
</del><span class="cx"> GLYPHMETRICS gdiMetrics;
</span><span class="cx"> static const MAT2 identity = { 0, 1, 0, 0, 0, 0, 0, 1 };
</span><span class="cx"> GetGlyphOutline(hdc, glyph, GGO_METRICS | GGO_GLYPH_INDEX, &gdiMetrics, 0, 0, &identity);
</span><span class="cx"> float result = gdiMetrics.gmCellIncX + m_syntheticBoldOffset;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> SelectObject(hdc, oldFont);
</span><span class="cx">
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !OS(WINCE)
</del><span class="cx"> SCRIPT_FONTPROPERTIES* SimpleFontData::scriptFontProperties() const
</span><span class="cx"> {
</span><span class="cx"> if (!m_scriptFontProperties) {
</span><span class="lines">@@ -261,6 +243,5 @@
</span><span class="cx"> }
</span><span class="cx"> return m_scriptFontProperties;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinceFontCacheWinCEcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/graphics/wince/FontCacheWinCE.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/wince/FontCacheWinCE.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/graphics/wince/FontCacheWinCE.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,305 +0,0 @@
</span><del>-/*
-* Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
-* Copyright (C) 2007-2009 Torch Mobile, Inc.
-*
-* 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.
-* 3. Neither the name of Apple Inc. ("Apple") nor the names of
-* its contributors may be used to endorse or promote products derived
-* from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "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 OR ITS 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.
-*/
-
-#include "config.h"
-#include "FontCache.h"
-
-#include "Font.h"
-#include "FontData.h"
-#include "SimpleFontData.h"
-#include <wtf/OwnPtr.h>
-#include <windows.h>
-#include <mlang.h>
-
-namespace WebCore {
-
-extern HDC g_screenDC;
-
-static IMultiLanguage *multiLanguage = 0;
-static IMLangFontLinkType* langFontLink = 0;
-
-IMultiLanguage* FontCache::getMultiLanguageInterface()
-{
- if (!multiLanguage)
- CoCreateInstance(CLSID_CMultiLanguage, 0, CLSCTX_INPROC_SERVER, IID_IMultiLanguage, (void**)&multiLanguage);
-
- return multiLanguage;
-}
-
-IMLangFontLinkType* FontCache::getFontLinkInterface()
-{
- if (!langFontLink) {
- if (IMultiLanguage* mli = getMultiLanguageInterface())
- mli->QueryInterface(&langFontLink);
- }
-
- return langFontLink;
-}
-
-static bool currentFontContainsCharacter(IMLangFontLinkType* langFontLink, HDC hdc, HFONT hfont, UChar character, const wchar_t* faceName)
-{
-#if USE(IMLANG_FONT_LINK2)
- UINT unicodeRanges;
- if (S_OK != langFontLink->GetFontUnicodeRanges(hdc, &unicodeRanges, 0))
- return false;
-
- static Vector<UNICODERANGE, 64> glyphsetBuffer;
- glyphsetBuffer.resize(unicodeRanges);
-
- if (S_OK != langFontLink->GetFontUnicodeRanges(hdc, &unicodeRanges, glyphsetBuffer.data()))
- return false;
-
- // FIXME: Change this to a binary search. (Yong Li: That's easy. But, is it guaranteed that the ranges are sorted?)
- for (Vector<UNICODERANGE, 64>::const_iterator i = glyphsetBuffer.begin(); i != glyphsetBuffer.end(); ++i) {
- if (i->wcTo >= character)
- return i->wcFrom <= character;
- }
-#else
- DWORD fontCodePages = 0, charCodePages = 0;
- HRESULT result = langFontLink->GetFontCodePages(hdc, hfont, &fontCodePages);
- if (result != S_OK)
- return false;
- result = langFontLink->GetCharCodePages(character, &charCodePages);
- if (result != S_OK)
- return false;
-
- fontCodePages |= FontPlatformData::getKnownFontCodePages(faceName);
- if (fontCodePages & charCodePages)
- return true;
-#endif
-
- return false;
-}
-
-static HFONT createMLangFont(IMLangFontLinkType* langFontLink, HDC hdc, const FontPlatformData& refFont, DWORD codePageMask, UChar character = 0)
-{
- HFONT mlangFont;
-
-#if USE(IMLANG_FONT_LINK2)
- HRESULT result = langFontLink->MapFont(hdc, codePageMask, character, &mlangFont);
-#else
- HRESULT result = langFontLink->MapFont(hdc, codePageMask, refFont.hfont(), &mlangFont);
-#endif
-
- if (SUCCEEDED(result))
- return mlangFont;
- return 0;
-}
-
-static const Vector<DWORD, 4>& getCJKCodePageMasks()
-{
- // The default order in which we look for a font for a CJK character. If the user's default code page is
- // one of these, we will use it first.
- static const UINT CJKCodePages[] = {
- 932, /* Japanese */
- 936, /* Simplified Chinese */
- 950, /* Traditional Chinese */
- 949 /* Korean */
- };
-
- static Vector<DWORD, 4> codePageMasks;
- static bool initialized;
- if (!initialized) {
- initialized = true;
- IMLangFontLinkType* langFontLink = fontCache().getFontLinkInterface();
- if (!langFontLink)
- return codePageMasks;
-
- UINT defaultCodePage;
- DWORD defaultCodePageMask = 0;
- if (GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_RETURN_NUMBER | LOCALE_IDEFAULTANSICODEPAGE, reinterpret_cast<LPWSTR>(&defaultCodePage), sizeof(defaultCodePage)))
- langFontLink->CodePageToCodePages(defaultCodePage, &defaultCodePageMask);
-
- if (defaultCodePage == CJKCodePages[0] || defaultCodePage == CJKCodePages[1] || defaultCodePage == CJKCodePages[2] || defaultCodePage == CJKCodePages[3])
- codePageMasks.append(defaultCodePageMask);
- for (unsigned i = 0; i < 4; ++i) {
- if (defaultCodePage != CJKCodePages[i]) {
- DWORD codePageMask;
- langFontLink->CodePageToCodePages(CJKCodePages[i], &codePageMask);
- codePageMasks.append(codePageMask);
- }
- }
- }
- return codePageMasks;
-}
-
-
-struct TraitsInFamilyProcData {
- TraitsInFamilyProcData(const AtomicString& familyName)
- : m_familyName(familyName)
- {
- }
-
- const AtomicString& m_familyName;
- HashSet<unsigned> m_traitsMasks;
-};
-
-static int CALLBACK traitsInFamilyEnumProc(CONST LOGFONT* logFont, CONST TEXTMETRIC* metrics, DWORD fontType, LPARAM lParam)
-{
- TraitsInFamilyProcData* procData = reinterpret_cast<TraitsInFamilyProcData*>(lParam);
-
- unsigned traitsMask = 0;
- traitsMask |= logFont->lfItalic ? FontStyleItalicMask : FontStyleNormalMask;
- traitsMask |= FontVariantNormalMask;
- LONG weight = FontPlatformData::adjustedGDIFontWeight(logFont->lfWeight, procData->m_familyName);
- traitsMask |= weight == FW_THIN ? FontWeight100Mask :
- weight == FW_EXTRALIGHT ? FontWeight200Mask :
- weight == FW_LIGHT ? FontWeight300Mask :
- weight == FW_NORMAL ? FontWeight400Mask :
- weight == FW_MEDIUM ? FontWeight500Mask :
- weight == FW_SEMIBOLD ? FontWeight600Mask :
- weight == FW_BOLD ? FontWeight700Mask :
- weight == FW_EXTRABOLD ? FontWeight800Mask :
- FontWeight900Mask;
- procData->m_traitsMasks.add(traitsMask);
- return 1;
-}
-
-void FontCache::platformInit()
-{
-}
-
-void FontCache::comInitialize()
-{
-}
-
-void FontCache::comUninitialize()
-{
- if (langFontLink) {
- langFontLink->Release();
- langFontLink = 0;
- }
- if (multiLanguage) {
- multiLanguage->Release();
- multiLanguage = 0;
- }
-}
-
-PassRefPtr<SimpleFontData> FontCache::systemFallbackForCharacters(const FontDescription& description, const SimpleFontData* originalFontData, bool, const UChar* characters, int length)
-{
- String familyName;
- WCHAR name[LF_FACESIZE];
-
- UChar character = characters[0];
- const FontPlatformData& origFont = originalFontData->platformData();
-
- if (IMLangFontLinkType* langFontLink = getFontLinkInterface()) {
- HGDIOBJ oldFont = GetCurrentObject(g_screenDC, OBJ_FONT);
- HFONT hfont = 0;
- DWORD codePages = 0;
- UINT codePage = 0;
- // Try MLang font linking first.
- langFontLink->GetCharCodePages(character, &codePages);
- if (codePages && u_getIntPropertyValue(character, UCHAR_UNIFIED_IDEOGRAPH)) {
- // The CJK character may belong to multiple code pages. We want to
- // do font linking against a single one of them, preferring the default
- // code page for the user's locale.
- const Vector<DWORD, 4>& CJKCodePageMasks = getCJKCodePageMasks();
- unsigned numCodePages = CJKCodePageMasks.size();
- for (unsigned i = 0; i < numCodePages; ++i) {
- hfont = createMLangFont(langFontLink, g_screenDC, origFont, CJKCodePageMasks[i]);
- if (!hfont)
- continue;
-
- SelectObject(g_screenDC, hfont);
- GetTextFace(g_screenDC, LF_FACESIZE, name);
-
- if (hfont && !(codePages & CJKCodePageMasks[i])) {
- // We asked about a code page that is not one of the code pages
- // returned by MLang, so the font might not contain the character.
- if (!currentFontContainsCharacter(langFontLink, g_screenDC, hfont, character, name))
- {
- SelectObject(g_screenDC, oldFont);
- langFontLink->ReleaseFont(hfont);
- hfont = 0;
- continue;
- }
- }
- break;
- }
- } else {
- hfont = createMLangFont(langFontLink, g_screenDC, origFont, codePages, character);
- SelectObject(g_screenDC, hfont);
- GetTextFace(g_screenDC, LF_FACESIZE, name);
- }
- SelectObject(g_screenDC, oldFont);
-
- if (hfont) {
- familyName = name;
- langFontLink->ReleaseFont(hfont);
- } else
- FontPlatformData::mapKnownFont(codePages, familyName);
- }
-
- if (familyName.isEmpty())
- familyName = FontPlatformData::defaultFontFamily();
-
- if (!familyName.isEmpty()) {
- // FIXME: temporary workaround for Thai font problem
- FontDescription fontDescription(description);
- if (ublock_getCode(c) == UBLOCK_THAI && fontDescription.weight() > FontWeightNormal)
- fontDescription.setWeight(FontWeightNormal);
-
- FontPlatformData* result = getCachedFontPlatformData(fontDescription, familyName);
- if (result && result->hash() != origFont.hash()) {
- if (RefPtr<SimpleFontData> fontData = getCachedFontData(result, DoNotRetain))
- return fontData.release();
- }
- }
-
- return 0;
-}
-
-PassRefPtr<SimpleFontData> FontCache::getLastResortFallbackFont(const FontDescription& fontDesc, ShouldRetain shouldRetain)
-{
- // FIXME: Would be even better to somehow get the user's default font here. For now we'll pick
- // the default that the user would get without changing any prefs.
- return getCachedFontData(fontDesc, FontPlatformData::defaultFontFamily(), false, shouldRetain);
-}
-
-PassOwnPtr<FontPlatformData> FontCache::createFontPlatformData(const FontDescription& fontDescription, const AtomicString& family)
-{
- return adoptPtr(new FontPlatformData(fontDescription, family));
-}
-
-void FontCache::getTraitsInFamily(const AtomicString& familyName, Vector<unsigned>& traitsMasks)
-{
- LOGFONT logFont;
- logFont.lfCharSet = DEFAULT_CHARSET;
- unsigned familyLength = std::min(familyName.length(), static_cast<unsigned>(LF_FACESIZE - 1));
- memcpy(logFont.lfFaceName, familyName.characters(), familyLength * sizeof(UChar));
- logFont.lfFaceName[familyLength] = 0;
- logFont.lfPitchAndFamily = 0;
-
- TraitsInFamilyProcData procData(familyName);
- EnumFontFamiliesEx(g_screenDC, &logFont, traitsInFamilyEnumProc, reinterpret_cast<LPARAM>(&procData), 0);
- copyToVector(procData.m_traitsMasks, traitsMasks);
-}
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinceFontCustomPlatformDatacpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/graphics/wince/FontCustomPlatformData.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/wince/FontCustomPlatformData.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/graphics/wince/FontCustomPlatformData.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,92 +0,0 @@
</span><del>-/*
- * Copyright (C) 2007, 2008, 2009 Apple Inc. All rights reserved.
- * Copyright (C) 2009 Torch Mobile Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#include "config.h"
-#include "FontCustomPlatformData.h"
-
-#include "CachedFont.h"
-#include "FontPlatformData.h"
-#include "OpenTypeUtilities.h"
-#include "SharedBuffer.h"
-#include <wtf/RandomNumber.h>
-#include <wtf/text/Base64.h>
-
-namespace WebCore {
-
-static CustomFontCache* g_customFontCache = 0;
-
-void setCustomFontCache(CustomFontCache* cache)
-{
- g_customFontCache = cache;
-}
-
-FontCustomPlatformData::~FontCustomPlatformData()
-{
- if (g_customFontCache && !m_name.isEmpty())
- g_customFontCache->unregisterFont(m_name);
-}
-
-FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, bool italic, FontOrientation, FontWidthVariant, FontRenderingMode renderingMode)
-{
- FontDescription fontDesc;
- fontDesc.setComputedSize(size);
- fontDesc.setSpecifiedSize(size);
- fontDesc.setItalic(italic);
- fontDesc.setWeight(bold ? FontWeightBold : FontWeightNormal);
- return FontPlatformData(fontDesc, m_name, false);
-}
-
-// Creates a unique and unpredictable font name, in order to avoid collisions and to
-// not allow access from CSS.
-static String createUniqueFontName()
-{
- GUID fontUuid;
-
- unsigned int* ptr = reinterpret_cast<unsigned int*>(&fontUuid);
- for (int i = 0; i < sizeof(GUID) / sizeof(int) ; ++i)
- *(ptr + i) = static_cast<unsigned int>(randomNumber() * (std::numeric_limits<unsigned>::max() + 1.0));
-
- String fontName = base64Encode(reinterpret_cast<char*>(&fontUuid), sizeof(fontUuid));
- ASSERT(fontName.length() < LF_FACESIZE);
- return fontName.replace('/', '_');
-}
-
-std::unique_ptr<FontCustomPlatformData> createFontCustomPlatformData(SharedBuffer& buffer)
-{
- String fontName = createUniqueFontName();
-
- Vector<char> rewrittenFontData;
- if (!renameFont(buffer, fontName, rewrittenFontData))
- return nullptr;
-
- RefPtr<SharedBuffer> localBuffer = SharedBuffer::adoptVector(rewrittenFontData);
- if (!g_customFontCache || !g_customFontCache->registerFont(fontName, localBuffer.get()))
- return nullptr;
-
- return std::make_unique<FontCustomPlatformData>(fontName);
-}
-
-bool FontCustomPlatformData::supportsFormat(const String& format)
-{
- return equalIgnoringCase(format, "truetype") || equalIgnoringCase(format, "opentype");
-}
-
-}
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinceFontCustomPlatformDatah"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/graphics/wince/FontCustomPlatformData.h (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/wince/FontCustomPlatformData.h 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/graphics/wince/FontCustomPlatformData.h 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,63 +0,0 @@
</span><del>-/*
- * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef FontCustomPlatformData_h
-#define FontCustomPlatformData_h
-
-#include "FontDescription.h"
-#include "FontRenderingMode.h"
-#include "FontWidthVariant.h"
-#include <wtf/Noncopyable.h>
-#include <wtf/text/WTFString.h>
-
-namespace WebCore {
-
- class FontPlatformData;
- class CachedFont;
- class SharedBuffer;
-
- class CustomFontCache {
- public:
- virtual bool registerFont(const String& fontName, const SharedBuffer*) = 0;
- virtual void unregisterFont(const String& fontName) = 0;
- };
-
- struct FontCustomPlatformData {
- WTF_MAKE_NONCOPYABLE(FontCustomPlatformData);
- public:
- FontCustomPlatformData(const String& name)
- : m_name(name)
- {
- }
-
- ~FontCustomPlatformData();
-
- FontPlatformData fontPlatformData(int size, bool bold, bool italic, FontOrientation = Horizontal, FontWidthVariant = RegularWidth, FontRenderingMode = NormalRenderingMode);
-
- static bool supportsFormat(const String&);
-
- String m_name;
- };
-
- std::unique_ptr<FontCustomPlatformData> createFontCustomPlatformData(SharedBuffer&);
- void setCustomFontCache(CustomFontCache*);
-}
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinceFontPlatformDatacpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/graphics/wince/FontPlatformData.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/wince/FontPlatformData.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/graphics/wince/FontPlatformData.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,519 +0,0 @@
</span><del>-/*
- * Copyright (C) 2007-2009 Torch Mobile Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#include "config.h"
-#include "FontPlatformData.h"
-
-#include "Font.h"
-#include "FontCache.h"
-#include "FontData.h"
-#include "SimpleFontData.h"
-#include <wtf/StdLibExtras.h>
-#include <wtf/text/StringHash.h>
-#include <wtf/text/WTFString.h>
-#include <wtf/win/GDIObject.h>
-
-#include <windows.h>
-#include <mlang.h>
-
-namespace WebCore {
-
-extern HDC g_screenDC;
-
-static wchar_t songTiStr[] = { 0x5b8b, 0x4f53, 0 };
-static wchar_t heiTiStr[] = { 0x9ed1, 0x4f53, 0 };
-
-class FontFamilyCodePageInfo {
-public:
- FontFamilyCodePageInfo()
- : m_codePage(0), m_codePages(0)
- {
- }
- FontFamilyCodePageInfo(const wchar_t* family, UINT codePage)
- : m_family(family), m_codePage(codePage), m_codePages(0)
- {
- }
- DWORD codePages() const
- {
- if (!m_codePages) {
- if (IMLangFontLinkType* langFontLink = fontCache().getFontLinkInterface())
- langFontLink->CodePageToCodePages(m_codePage, &m_codePages);
- }
- return m_codePages;
- }
-
- String m_family;
- UINT m_codePage;
-private:
- mutable DWORD m_codePages;
-};
-
-class FontFamilyChecker {
-public:
- FontFamilyChecker(const wchar_t* family)
- : m_exists(false)
- {
- EnumFontFamilies(g_screenDC, family, enumFontFamProc, (LPARAM)this);
- }
- bool isSupported() const { return m_exists; }
-private:
- bool m_exists;
- static int CALLBACK enumFontFamProc(const LOGFONT FAR* lpelf, const TEXTMETRIC FAR* lpntm, DWORD FontType, LPARAM lParam);
-};
-
-class ValidFontFamilyFinder {
-public:
- ValidFontFamilyFinder()
- {
- EnumFontFamilies(g_screenDC, 0, enumFontFamProc, (LPARAM)this);
- }
- const String& family() const { return m_family; }
-private:
- String m_family;
- static int CALLBACK enumFontFamProc(const LOGFONT FAR* lpelf, const TEXTMETRIC FAR* lpntm, DWORD FontType, LPARAM lParam);
-};
-
-class FixedSizeFontData: public RefCounted<FixedSizeFontData> {
-public:
- LOGFONT m_font;
- GDIObject<HFONT> m_hfont;
- TEXTMETRIC m_metrics;
- DWORD m_codePages;
- unsigned m_weight;
- bool m_italic;
-
- static PassRefPtr<FixedSizeFontData> create(const AtomicString& family, unsigned weight, bool italic);
-private:
- FixedSizeFontData()
- : m_codePages(0)
- , m_weight(0)
- , m_italic(false)
- {
- memset(&m_font, 0, sizeof(m_font));
- memset(&m_metrics, 0, sizeof(m_metrics));
- }
-};
-
-struct FixedSizeFontDataKey {
- FixedSizeFontDataKey(const AtomicString& family = AtomicString(), unsigned weight = 0, bool italic = false)
- : m_family(family)
- , m_weight(weight)
- , m_italic(italic)
- {
- }
-
- FixedSizeFontDataKey(WTF::HashTableDeletedValueType) : m_weight(-2) { }
- bool isHashTableDeletedValue() const { return m_weight == -2; }
-
- bool operator==(const FixedSizeFontDataKey& other) const
- {
- return equalIgnoringCase(m_family, other.m_family)
- && m_weight == other.m_weight
- && m_italic == other.m_italic;
- }
-
- AtomicString m_family;
- unsigned m_weight;
- bool m_italic;
-};
-
-struct FixedSizeFontDataKeyHash {
- static unsigned hash(const FixedSizeFontDataKey& font)
- {
- unsigned hashCodes[] = {
- CaseFoldingHash::hash(font.m_family),
- font.m_weight,
- // static_cast<unsigned>(font.m_italic);
- };
- return StringHasher::hashMemory<sizeof(hashCodes)>(hashCodes);
- }
-
- static bool equal(const FixedSizeFontDataKey& a, const FixedSizeFontDataKey& b)
- {
- return a == b;
- }
-
- static const bool safeToCompareToEmptyOrDeleted = true;
-};
-
-struct FixedSizeFontDataKeyTraits : WTF::GenericHashTraits<FixedSizeFontDataKey> {
- static const bool emptyValueIsZero = true;
- static const FixedSizeFontDataKey& emptyValue()
- {
- DEPRECATED_DEFINE_STATIC_LOCAL(FixedSizeFontDataKey, key, (nullAtom));
- return key;
- }
- static void constructDeletedValue(FixedSizeFontDataKey& slot)
- {
- new (&slot) FixedSizeFontDataKey(WTF::HashTableDeletedValue);
- }
- static bool isDeletedValue(const FixedSizeFontDataKey& value)
- {
- return value.isHashTableDeletedValue();
- }
-};
-
-int CALLBACK FontFamilyChecker::enumFontFamProc(const LOGFONT FAR* lpelf, const TEXTMETRIC FAR* lpntm, DWORD FontType, LPARAM lParam)
-{
- ((FontFamilyChecker*)lParam)->m_exists = true;
- return 0;
-}
-
-int CALLBACK ValidFontFamilyFinder::enumFontFamProc(const LOGFONT FAR* lpelf, const TEXTMETRIC FAR* lpntm, DWORD FontType, LPARAM lParam)
-{
- if (lpelf->lfCharSet != SYMBOL_CHARSET) {
- ((ValidFontFamilyFinder*)lParam)->m_family = String(lpelf->lfFaceName);
- return 0;
- }
- return 1;
-}
-
-typedef Vector<FontFamilyCodePageInfo> KnownFonts;
-static KnownFonts& knownFonts()
-{
- static KnownFonts fonts;
- static bool firstTime = true;
- if (firstTime) {
- firstTime = false;
- if (FontPlatformData::isSongTiSupported())
- fonts.append(FontFamilyCodePageInfo(songTiStr, 936));
- }
- return fonts;
-}
-
-static String getDefaultFontFamily()
-{
- if (FontFamilyChecker(L"Tahoma").isSupported())
- return String(L"Tahoma");
-
- bool good = false;
- String family;
- HKEY key;
- if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, L"SYSTEM\\GDI\\SysFnt", 0, 0, &key) == ERROR_SUCCESS) {
- DWORD maxlen, type;
- if (RegQueryValueEx(key, L"Nm", 0, &type, 0, &maxlen) == ERROR_SUCCESS && type == REG_SZ) {
- ++maxlen;
- if (wchar_t* buffer = new wchar_t[maxlen]) {
- if (RegQueryValueEx(key, L"Nm", 0, &type, (LPBYTE)buffer, &maxlen) == ERROR_SUCCESS) {
- family = String(buffer, maxlen);
- good = true;
- }
- delete[] buffer;
- }
- }
- RegCloseKey(key);
- }
- if (good)
- return family;
-
- return ValidFontFamilyFinder().family();
-}
-
-typedef HashMap<FixedSizeFontDataKey, RefPtr<FixedSizeFontData>, FixedSizeFontDataKeyHash, FixedSizeFontDataKeyTraits> FixedSizeFontCache;
-FixedSizeFontCache g_fixedSizeFontCache;
-
-PassRefPtr<FixedSizeFontData> FixedSizeFontData::create(const AtomicString& family, unsigned weight, bool italic)
-{
- FixedSizeFontData* fontData = new FixedSizeFontData();
-
- fontData->m_weight = weight;
- fontData->m_italic = italic;
-
- LOGFONT& winFont = fontData->m_font;
- // The size here looks unusual. The negative number is intentional.
- winFont.lfHeight = -72;
- winFont.lfWidth = 0;
- winFont.lfEscapement = 0;
- winFont.lfOrientation = 0;
- winFont.lfUnderline = false;
- winFont.lfStrikeOut = false;
- winFont.lfCharSet = DEFAULT_CHARSET;
- winFont.lfOutPrecision = OUT_DEFAULT_PRECIS;
- winFont.lfQuality = CLEARTYPE_QUALITY; //DEFAULT_QUALITY;
- winFont.lfClipPrecision = CLIP_DEFAULT_PRECIS;
- winFont.lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE;
- winFont.lfItalic = italic;
- winFont.lfWeight = FontPlatformData::adjustedGDIFontWeight(weight, family);
-
- int len = std::min(family.length(), (unsigned int)LF_FACESIZE - 1);
- wmemcpy(winFont.lfFaceName, family.characters(), len);
- winFont.lfFaceName[len] = L'\0';
-
- fontData->m_hfont = adoptGDIObject(::CreateFontIndirect(&winFont));
-
- HGDIOBJ oldFont = SelectObject(g_screenDC, fontData->m_hfont.get());
-
- GetTextMetrics(g_screenDC, &fontData->m_metrics);
-
- if (IMLangFontLinkType* langFontLink = fontCache().getFontLinkInterface()) {
- langFontLink->GetFontCodePages(g_screenDC, fontData->m_hfont.get(), &fontData->m_codePages);
- fontData->m_codePages |= FontPlatformData::getKnownFontCodePages(winFont.lfFaceName);
- }
-
- SelectObject(g_screenDC, oldFont);
-
- return adoptRef(fontData);
-}
-
-static PassRefPtr<FixedSizeFontData> createFixedSizeFontData(const AtomicString& family, unsigned weight, bool italic)
-{
- FixedSizeFontDataKey key(family, weight, italic);
- FixedSizeFontCache::AddResult result = g_fixedSizeFontCache.add(key, RefPtr<FixedSizeFontData>());
- if (result.isNewEntry)
- result.iterator->value = FixedSizeFontData::create(family, weight, italic);
-
- return result.iterator->value;
-}
-
-static LONG toGDIFontWeight(FontWeight fontWeight)
-{
- static LONG gdiFontWeights[] = {
- FW_THIN, // FontWeight100
- FW_EXTRALIGHT, // FontWeight200
- FW_LIGHT, // FontWeight300
- FW_NORMAL, // FontWeight400
- FW_MEDIUM, // FontWeight500
- FW_SEMIBOLD, // FontWeight600
- FW_BOLD, // FontWeight700
- FW_EXTRABOLD, // FontWeight800
- FW_HEAVY // FontWeight900
- };
- return gdiFontWeights[fontWeight];
-}
-
-class FontPlatformPrivateData {
-public:
- int m_reference;
- RefPtr<FixedSizeFontData> m_rootFontData;
- AtomicString m_family;
- FontDescription m_fontDescription;
- GDIObject<HFONT> m_hfontScaled;
- int m_size;
- long m_fontScaledWidth;
- long m_fontScaledHeight;
- bool m_disabled;
- FontPlatformPrivateData(int size, unsigned weight)
- : m_reference(1)
- , m_family(FontPlatformData::defaultFontFamily())
- , m_size(size)
- , m_fontScaledWidth(0)
- , m_fontScaledHeight(0)
- , m_disabled(false)
- {
- m_rootFontData = createFixedSizeFontData(m_family, weight, false);
- }
- FontPlatformPrivateData(const FontDescription& fontDescription, const AtomicString& family)
- : m_reference(1)
- , m_size(fontDescription.computedPixelSize())
- , m_fontDescription(fontDescription)
- , m_family(family)
- , m_fontScaledWidth(0)
- , m_fontScaledHeight(0)
- , m_disabled(!fontDescription.specifiedSize())
- {
- m_rootFontData = FixedSizeFontData::create(family, toGDIFontWeight(fontDescription.weight()), fontDescription.italic());
- }
-};
-
-FontPlatformData::FontPlatformData(const FontDescription& fontDescription, const AtomicString& desiredFamily, bool useDefaultFontIfNotPresent)
-{
- String family(desiredFamily);
- if (!equalIgnoringCase(family, defaultFontFamily()) && !FontFamilyChecker(family.charactersWithNullTermination().data()).isSupported()) {
- if (equalIgnoringCase(family, String(heiTiStr)) && isSongTiSupported())
- family = String(songTiStr);
- else if (useDefaultFontIfNotPresent)
- family = defaultFontFamily();
- }
-
- m_private = new FontPlatformPrivateData(fontDescription, family);
-}
-
-FontPlatformData::FontPlatformData(float size, bool bold, bool oblique)
-{
- if (!size)
- m_private = 0;
- else
- m_private = new FontPlatformPrivateData((int)(size + 0.5), bold ? FW_BOLD : FW_NORMAL);
-}
-
-FontPlatformData::~FontPlatformData()
-{
- if (isValid() && !--m_private->m_reference) {
- if (m_private->m_rootFontData->refCount() == 2) {
- FixedSizeFontDataKey key(m_private->m_family, m_private->m_rootFontData->m_weight, m_private->m_rootFontData->m_italic);
- g_fixedSizeFontCache.remove(key);
- }
- delete m_private;
- }
-}
-
-FontPlatformData& FontPlatformData::operator=(const FontPlatformData& o)
-{
- if (isValid() && !--m_private->m_reference)
- delete m_private;
-
- if (m_private = o.m_private)
- ++m_private->m_reference;
-
- return *this;
-}
-
-HFONT FontPlatformData::hfont() const
-{
- if (!isValid())
- return 0;
-
- if (m_private->m_disabled)
- return 0;
-
- if (!m_private->m_rootFontData->m_hfont)
- m_private->m_rootFontData->m_hfont = adoptGDIObject(::CreateFontIndirect(&m_private->m_rootFontData->m_font));
-
- return m_private->m_rootFontData->m_hfont.get();
-}
-
-HFONT FontPlatformData::getScaledFontHandle(int height, int width) const
-{
- if (!isValid() || m_private->m_disabled)
- return 0;
-
- if (!m_private->m_hfontScaled || m_private->m_fontScaledHeight != height || m_private->m_fontScaledWidth != width) {
- m_private->m_fontScaledHeight = height;
- m_private->m_fontScaledWidth = width;
- LOGFONT font = m_private->m_rootFontData->m_font;
- font.lfHeight = -height;
- font.lfWidth = width;
- m_private->m_hfontScaled = adoptGDIObject(::CreateFontIndirect(&font));
- }
-
- return m_private->m_hfontScaled.get();
-}
-
-bool FontPlatformData::discardFontHandle()
-{
- if (!isValid())
- return false;
-
- if (m_private->m_rootFontData->m_hfont) {
- m_private->m_rootFontData->m_hfont = nullptr;
- return true;
- }
-
- if (m_private->m_hfontScaled) {
- m_private->m_hfontScaled = nullptr;
- return true;
- }
- return false;
-}
-
-const TEXTMETRIC& FontPlatformData::metrics() const
-{
- return m_private->m_rootFontData->m_metrics;
-}
-
-bool FontPlatformData::isSystemFont() const
-{
- return false;
-}
-
-int FontPlatformData::size() const
-{
- return m_private->m_size;
-}
-
-const FontDescription& FontPlatformData::fontDescription() const
-{
- return m_private->m_fontDescription;
-}
-
-const AtomicString& FontPlatformData::family() const
-{
- return m_private->m_family;
-}
-
-const LOGFONT& FontPlatformData::logFont() const
-{
- return m_private->m_rootFontData->m_font;
-}
-
-bool FontPlatformData::isDisabled() const
-{
- return !isValid() || m_private->m_disabled;
-}
-
-DWORD FontPlatformData::codePages() const
-{
- return m_private->m_rootFontData->m_codePages;
-}
-
-bool FontPlatformData::isSongTiSupported()
-{
- static bool exists = FontFamilyChecker(songTiStr).isSupported();
- return exists;
-}
-
-bool FontPlatformData::mapKnownFont(DWORD codePages, String& family)
-{
- KnownFonts& fonts = knownFonts();
- for (KnownFonts::iterator i = fonts.begin(); i != fonts.end(); ++i) {
- if (i->codePages() & codePages) {
- family = i->m_family;
- return true;
- }
- }
- return false;
-}
-
-DWORD FontPlatformData::getKnownFontCodePages(const wchar_t* family)
-{
- KnownFonts& fonts = knownFonts();
- for (KnownFonts::iterator i = fonts.begin(); i != fonts.end(); ++i) {
- if (equalIgnoringCase(i->m_family, String(family)))
- return i->codePages();
- }
- return 0;
-}
-
-const String& FontPlatformData::defaultFontFamily()
-{
- static String family(getDefaultFontFamily());
- return family;
-}
-
-LONG FontPlatformData::adjustedGDIFontWeight(LONG gdiFontWeight, const String& family)
-{
- static AtomicString lucidaStr("Lucida Grande");
- if (equalIgnoringCase(family, lucidaStr)) {
- if (gdiFontWeight == FW_NORMAL)
- return FW_MEDIUM;
- if (gdiFontWeight == FW_BOLD)
- return FW_SEMIBOLD;
- }
- return gdiFontWeight;
-}
-
-#ifndef NDEBUG
-String FontPlatformData::description() const
-{
- return String();
-}
-#endif
-
-}
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinceFontPlatformDatah"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/graphics/wince/FontPlatformData.h (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/wince/FontPlatformData.h 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/graphics/wince/FontPlatformData.h 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,93 +0,0 @@
</span><del>-/*
- * This file is part of the internal font implementation. It should not be included by anyone other than
- * FontMac.cpp, FontWin.cpp and Font.cpp.
- *
- * Copyright (C) 2006, 2007 Apple Inc.
- * Copyright (C) 2007-2008 Torch Mobile, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef FontPlatformData_h
-#define FontPlatformData_h
-
-#include "FontDescription.h"
-#include "FontOrientation.h"
-#include <wtf/Forward.h>
-#include <wtf/Noncopyable.h>
-#include <wtf/text/StringImpl.h>
-
-typedef struct tagTEXTMETRICW TEXTMETRIC;
-typedef struct tagLOGFONTW LOGFONT;
-
-namespace WebCore {
-
- class FontPlatformPrivateData;
-
- class FontPlatformData {
-
- public:
-
- FontPlatformData(): m_private(0) {}
- FontPlatformData(float size, bool bold, bool oblique);
-
- // Used for deleted values in the font cache's hash tables.
- FontPlatformData(WTF::HashTableDeletedValueType) : m_private((FontPlatformPrivateData*)1) {}
- bool isHashTableDeletedValue() const { return (unsigned)m_private == 1; }
-
- FontPlatformData(const FontDescription& fontDescription, const AtomicString& family, bool useDefaultFontIfNotPresent = true);
-
- ~FontPlatformData();
-
- FontPlatformData(const FontPlatformData& o) : m_private(0) { operator=(o); }
- FontPlatformData& operator=(const FontPlatformData& o);
-
- int isValid() const { return reinterpret_cast<unsigned>(m_private) & ~1; }
- HFONT hfont() const;
- const TEXTMETRIC& metrics() const;
- bool isSystemFont() const;
- int size() const;
- unsigned hash() const { return (unsigned)m_private; }
- const FontDescription& fontDescription() const;
- const AtomicString& family() const;
- bool operator==(const FontPlatformData& other) const { return m_private == other.m_private; }
- HFONT getScaledFontHandle(int height, int width) const;
- const LOGFONT& logFont() const;
- bool isDisabled() const;
- bool discardFontHandle();
- DWORD codePages() const;
-
- static bool isSongTiSupported();
- static bool mapKnownFont(DWORD codePages, String& family);
- static DWORD getKnownFontCodePages(const wchar_t* family);
- static const String& defaultFontFamily();
- static LONG adjustedGDIFontWeight(LONG gdiFontWeight, const String& family);
-
- FontOrientation orientation() const { return Horizontal; } // FIXME: Implement.
- void setOrientation(FontOrientation) { } // FIXME: Implement.
-
-#ifndef NDEBUG
- String description() const;
-#endif
-
- private:
- FontPlatformPrivateData* m_private;
- };
-
-}
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinceFontWinCEcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/graphics/wince/FontWinCE.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/wince/FontWinCE.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/graphics/wince/FontWinCE.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,350 +0,0 @@
</span><del>-/*
- * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
- * Copyright (C) 2007-2009 Torch Mobile, Inc.
- * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
- * Copyright (C) 2008 Holger Hans Peter Freyther
- *
- * 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 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 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.
- */
-
-#include "config.h"
-#include "Font.h"
-
-#include "AffineTransform.h"
-#include "FloatRect.h"
-#include "FontCache.h"
-#include "FontData.h"
-#include "FontGlyphs.h"
-#include "GlyphBuffer.h"
-#include "GraphicsContext.h"
-#include "IntRect.h"
-#include "NotImplemented.h"
-#include "TextRun.h"
-#include "WidthIterator.h"
-#include <wtf/MathExtras.h>
-#include <wtf/OwnPtr.h>
-
-#include <windows.h>
-
-using namespace WTF::Unicode;
-
-namespace WebCore {
-
-HDC g_screenDC = GetDC(0);
-
-class ScreenDcReleaser {
-public:
- ~ScreenDcReleaser()
- {
- ReleaseDC(0, g_screenDC);
- }
-};
-
-ScreenDcReleaser releaseScreenDc;
-
-void Font::drawGlyphs(GraphicsContext* graphicsContext, const SimpleFontData* fontData, const GlyphBuffer& glyphBuffer,
- int from, int numGlyphs, const FloatPoint& point) const
-{
- graphicsContext->drawText(fontData, glyphBuffer, from, numGlyphs, point);
-}
-
-class TextRunComponent {
-public:
- TextRunComponent() : m_textRun(0, 0) {}
- TextRunComponent(const UChar *start, int length, const TextRun& parentTextRun, const Font &font, int offset);
- TextRunComponent(int spaces, const Font &font, int offset);
- ~TextRunComponent() { m_textRun; }
-
- bool isSpace() const { return m_spaces; }
- int textLength() const { return m_spaces ? m_spaces : m_textRun.length(); }
-
- TextRun m_textRun;
- float m_width;
- int m_offset;
- int m_spaces;
-};
-
-TextRunComponent::TextRunComponent(const UChar *start, int length, const TextRun& parentTextRun, const Font &font, int o)
- : m_textRun(start, length, 0, 0
- , parentTextRun.allowsTrailingExpansion() ? TextRun::AllowTrailingExpansion : TextRun::ForbidTrailingExpansion
- , parentTextRun.direction()
- , parentTextRun.directionalOverride())
- , m_offset(o)
- , m_spaces(0)
-{
- m_textRun.setTabSize(parentTextRun.allowTabs(), parentTextRun.tabSize());
-
- WidthIterator it(&font, m_textRun);
- it.advance(m_textRun.length(), 0);
- m_width = it.m_runWidthSoFar;
-}
-
-TextRunComponent::TextRunComponent(int s, const Font &font, int o)
- : m_textRun(0, 0)
- , m_offset(o)
- , m_spaces(s)
-{
- m_width = s * font.primaryFont()->widthForGlyph(' ');
-}
-
-typedef Vector<TextRunComponent, 128> TextRunComponents;
-
-static int generateComponents(TextRunComponents* components, const Font &font, const TextRun &run)
-{
- int letterSpacing = font.letterSpacing();
- int wordSpacing = font.wordSpacing();
- int padding = run.expansion();
- int numSpaces = 0;
- if (padding) {
- for (int i = 0; i < run.length(); i++)
- if (Font::treatAsSpace(run[i]))
- ++numSpaces;
- }
-
- int offset = 0;
- if (letterSpacing) {
- // need to draw every letter on it's own
- int start = 0;
- if (Font::treatAsSpace(run[0])) {
- int add = 0;
- if (numSpaces) {
- add = padding/numSpaces;
- padding -= add;
- --numSpaces;
- }
- components->append(TextRunComponent(1, font, offset));
- offset += add + letterSpacing + components->last().m_width;
- start = 1;
- }
- for (int i = 1; i < run.length(); ++i) {
- UChar ch = run[i];
- if (U16_IS_LEAD(ch) && U16_IS_TRAIL(run[i-1]))
- ch = U16_GET_SUPPLEMENTARY(ch, run[i-1]);
- if (U16_IS_TRAIL(ch) || U_GET_GC_MASK(ch) & U_GC_MN_MASK)
- continue;
- if (Font::treatAsSpace(run[i])) {
- int add = 0;
- if (i - start > 0) {
- components->append(TextRunComponent(run.characters16() + start, i - start,
- run, font, offset));
- offset += components->last().m_width + letterSpacing;
- }
- if (numSpaces) {
- add = padding/numSpaces;
- padding -= add;
- --numSpaces;
- }
- components->append(TextRunComponent(1, font, offset));
- offset += wordSpacing + add + components->last().m_width + letterSpacing;
- start = i + 1;
- continue;
- }
- if (i - start > 0) {
- components->append(TextRunComponent(run.characters16() + start, i - start,
- run,
- font, offset));
- offset += components->last().m_width + letterSpacing;
- }
- start = i;
- }
- if (run.length() - start > 0) {
- components->append(TextRunComponent(run.characters16() + start, run.length() - start,
- run,
- font, offset));
- offset += components->last().m_width;
- }
- offset += letterSpacing;
- } else {
- int start = 0;
- for (int i = 0; i < run.length(); ++i) {
- if (Font::treatAsSpace(run[i])) {
- if (i - start > 0) {
- components->append(TextRunComponent(run.characters16() + start, i - start,
- run,
- font, offset));
- offset += components->last().m_width;
- }
- int add = 0;
- if (numSpaces) {
- add = padding/numSpaces;
- padding -= add;
- --numSpaces;
- }
- components->append(TextRunComponent(1, font, offset));
- offset += add + components->last().m_width;
- if (i)
- offset += wordSpacing;
- start = i + 1;
- }
- }
- if (run.length() - start > 0) {
- components->append(TextRunComponent(run.characters16() + start, run.length() - start,
- run,
- font, offset));
- offset += components->last().m_width;
- }
- }
- return offset;
-}
-
-float Font::drawComplexText(GraphicsContext* context, const TextRun& run, const FloatPoint& point, int from, int to) const
-{
- if (to < 0)
- to = run.length();
- if (from < 0)
- from = 0;
-
- TextRunComponents components;
- int w = generateComponents(&components, *this, run);
-
- float widthOfDrawnText = 0;
- int curPos = 0;
- for (int i = 0; i < (int)components.size(); ++i) {
- const TextRunComponent& comp = components.at(i);
- int len = comp.textLength();
- int curEnd = curPos + len;
- if (curPos < to && from < curEnd && !comp.isSpace()) {
- FloatPoint pt = point;
- if (run.rtl())
- pt.setX(point.x() + w - comp.m_offset - comp.m_width);
- else
- pt.setX(point.x() + comp.m_offset);
- widthOfDrawnText += drawSimpleText(context, comp.m_textRun, pt, from - curPos, std::min(to, curEnd) - curPos);
- }
- curPos += len;
- if (from < curPos)
- from = curPos;
- }
- return widthOfDrawnText;
-}
-
-void Font::drawEmphasisMarksForComplexText(GraphicsContext* /* context */, const TextRun& /* run */, const AtomicString& /* mark */, const FloatPoint& /* point */, int /* from */, int /* to */) const
-{
- notImplemented();
-}
-
-float Font::floatWidthForComplexText(const TextRun& run, HashSet<const SimpleFontData*>* fallbackFonts, GlyphOverflow* glyphOverflow) const
-{
- TextRunComponents components;
- int w = generateComponents(&components, *this, run);
- return w;
-}
-
-int Font::offsetForPositionForComplexText(const TextRun& run, float xFloat, bool includePartialGlyphs) const
-{
- // FIXME: This truncation is not a problem for HTML, but only affects SVG, which passes floating-point numbers
- // to Font::offsetForPosition(). Bug http://webkit.org/b/40673 tracks fixing this problem.
- int position = static_cast<int>(xFloat);
-
- TextRunComponents components;
- int w = generateComponents(&components, *this, run);
-
- if (position >= w)
- return run.length();
-
- int offset = 0;
- if (run.rtl()) {
- for (size_t i = 0; i < components.size(); ++i) {
- const TextRunComponent& comp = components.at(i);
- int xe = w - comp.m_offset;
- int xs = xe - comp.m_width;
- if (position >= xs)
- return offset + (comp.isSpace()
- ? static_cast<int>((position - xe) * comp.m_spaces / std::max(1.f, comp.m_width) + 0.5)
- : offsetForPositionForSimpleText(comp.m_textRun, position - xs, includePartialGlyphs));
-
- offset += comp.textLength();
- }
- } else {
- for (size_t i = 0; i < components.size(); ++i) {
- const TextRunComponent& comp = components.at(i);
- int xs = comp.m_offset;
- int xe = xs + comp.m_width;
- if (position <= xe) {
- if (position - xs >= xe)
- return offset + comp.textLength();
- return offset + (comp.isSpace()
- ? static_cast<int>((position - xs) * comp.m_spaces / std::max(1.f, comp.m_width) + 0.5)
- : offsetForPositionForSimpleText(comp.m_textRun, position - xs, includePartialGlyphs));
- }
- offset += comp.textLength();
- }
- }
- return run.length();
-}
-
-
-static float cursorToX(const Font* font, const TextRunComponents& components, int width, bool rtl, int cursor)
-{
- int start = 0;
- for (size_t i = 0; i < components.size(); ++i) {
- const TextRunComponent& comp = components.at(i);
- if (start + comp.textLength() <= cursor) {
- start += comp.textLength();
- continue;
- }
- int xs = comp.m_offset;
- if (rtl)
- xs = width - xs - comp.m_width;
-
- int pos = cursor - start;
- if (comp.isSpace()) {
- if (rtl)
- pos = comp.textLength() - pos;
- return xs + pos * comp.m_width / comp.m_spaces;
- }
- WidthIterator it(font, comp.m_textRun);
- GlyphBuffer glyphBuffer;
- it.advance(pos, &glyphBuffer);
- return xs + it.m_runWidthSoFar;
- }
- return width;
-}
-
-FloatRect Font::selectionRectForComplexText(const TextRun& run, const FloatPoint& pt,
- int h, int from, int to) const
-{
- TextRunComponents components;
- int w = generateComponents(&components, *this, run);
-
- if (!from && to == run.length())
- return FloatRect(pt.x(), pt.y(), w, h);
-
- float x1 = cursorToX(this, components, w, run.rtl(), from);
- float x2 = cursorToX(this, components, w, run.rtl(), to);
- if (x2 < x1)
- std::swap(x1, x2);
-
- return FloatRect(pt.x() + x1, pt.y(), x2 - x1, h);
-}
-
-bool Font::canReturnFallbackFontsForComplexText()
-{
- return false;
-}
-
-bool Font::canExpandAroundIdeographsInComplexText()
-{
- return false;
-}
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinceGlyphPageTreeNodeWinCEcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/graphics/wince/GlyphPageTreeNodeWinCE.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/wince/GlyphPageTreeNodeWinCE.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/graphics/wince/GlyphPageTreeNodeWinCE.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,74 +0,0 @@
</span><del>-/*
- * Copyright (C) 2007-2009 Torch Mobile Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#include "config.h"
-#include "GlyphPageTreeNode.h"
-
-#include "Font.h"
-#include "FontCache.h"
-#include "FontData.h"
-#include "SimpleFontData.h"
-
-namespace WebCore {
-
-DWORD getKnownFontCodePages(const wchar_t* family);
-
-typedef unsigned (*funcGetCharCodePages)(unsigned short c, unsigned& lastPos);
-funcGetCharCodePages getCharCodePages = 0;
-
-bool GlyphPage::fill(unsigned offset, unsigned length, UChar* buffer, unsigned bufferLength, const SimpleFontData* fontData)
-{
- if (length != bufferLength)
- return false;
-
- if (fontData->platformData().hfont()) {
- DWORD fontCodePages = fontData->platformData().codePages();
- if (fontCodePages) {
- if (getCharCodePages) {
- unsigned lastPos = 0;
- for (unsigned i = 0; i < bufferLength; ++i) {
- DWORD actualCodePages = getCharCodePages(buffer[i], lastPos);
- if (!actualCodePages || (actualCodePages & fontCodePages))
- setGlyphDataForIndex(offset + i, buffer[i], fontData);
- else
- setGlyphDataForIndex(offset + i, 0, 0);
- }
- return true;
- } else if (IMLangFontLinkType* langFontLink = fontCache().getFontLinkInterface()) {
- for (unsigned i = 0; i < bufferLength; ++i) {
- DWORD actualCodePages;
- langFontLink->GetCharCodePages(buffer[i], &actualCodePages);
- if (!actualCodePages || (actualCodePages & fontCodePages))
- setGlyphDataForIndex(offset + i, buffer[i], fontData);
- else
- setGlyphDataForIndex(offset + i, 0, 0);
- }
- return true;
- }
- }
- }
-
- for (unsigned i = 0; i < length; ++i)
- setGlyphDataForIndex(offset + i, buffer[i], fontData);
-
- return true;
-}
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinceGradientWinCEcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/graphics/wince/GradientWinCE.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/wince/GradientWinCE.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/graphics/wince/GradientWinCE.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,52 +0,0 @@
</span><del>-/*
- * Copyright (C) 2009 Torch Mobile, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-
-#include "config.h"
-#include "Gradient.h"
-
-#include "GraphicsContext.h"
-
-namespace WebCore {
-
-void Gradient::platformDestroy()
-{
-}
-
-static inline bool compareStops(const Gradient::ColorStop& a, const Gradient::ColorStop& b)
-{
- return a.stop < b.stop;
-}
-
-const Vector<Gradient::ColorStop, 2>& Gradient::getStops() const
-{
- if (!m_stopsSorted) {
- if (m_stops.size())
- std::stable_sort(m_stops.begin(), m_stops.end(), compareStops);
- m_stopsSorted = true;
- }
- return m_stops;
-}
-
-void Gradient::fill(GraphicsContext* c, const FloatRect& r)
-{
- c->fillRect(r, this);
-}
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinceGraphicsContextWinCEcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,1853 +0,0 @@
</span><del>-/*
- * Copyright (C) 2007-2009 Torch Mobile Inc.
- * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#include "config.h"
-#include "GraphicsContext.h"
-
-#include "AffineTransform.h"
-#include "FloatRoundedRect.h"
-#include "Font.h"
-#include "GDIExtras.h"
-#include "GlyphBuffer.h"
-#include "Gradient.h"
-#include "NotImplemented.h"
-#include "Path.h"
-#include "PlatformPathWinCE.h"
-#include "SharedBitmap.h"
-#include "SimpleFontData.h"
-#include <windows.h>
-#include <wtf/OwnPtr.h>
-#include <wtf/unicode/CharacterNames.h>
-
-namespace WebCore {
-
-typedef void (*FuncGradientFillRectLinear)(HDC hdc, const IntRect& r, const IntPoint& p0, const IntPoint& p1, const Vector<Gradient::ColorStop>& stops);
-typedef void (*FuncGradientFillRectRadial)(HDC hdc, const IntRect& r, const IntPoint& p0, const IntPoint& p1, float r0, float r1, const Vector<Gradient::ColorStop>& stops);
-FuncGradientFillRectLinear g_linearGradientFiller = 0;
-FuncGradientFillRectRadial g_radialGradientFiller = 0;
-
-static inline bool isZero(double d)
-{
- return d > 0 ? d <= 1.E-10 : d >= -1.E-10;
-}
-
-// stableRound rounds -0.5 to 0, where lround rounds -0.5 to -1.
-static inline int stableRound(double d)
-{
- if (d > 0)
- return static_cast<int>(d + 0.5);
-
- int i = static_cast<int>(d);
- return i - d > 0.5 ? i - 1 : i;
-}
-
-// Unlike enclosingIntRect(), this function does strict rounding.
-static inline IntRect roundRect(const FloatRect& r)
-{
- return IntRect(stableRound(r.x()), stableRound(r.y()), stableRound(r.maxX()) - stableRound(r.x()), stableRound(r.maxY()) - stableRound(r.y()));
-}
-
-// Rotation transformation
-class RotationTransform {
-public:
- RotationTransform()
- : m_cosA(1.)
- , m_sinA(0.)
- , m_preShiftX(0)
- , m_preShiftY(0)
- , m_postShiftX(0)
- , m_postShiftY(0)
- {
- }
- RotationTransform operator-() const
- {
- RotationTransform rtn;
- rtn.m_cosA = m_cosA;
- rtn.m_sinA = -m_sinA;
- rtn.m_preShiftX = m_postShiftX;
- rtn.m_preShiftY = m_postShiftY;
- rtn.m_postShiftX = m_preShiftX;
- rtn.m_postShiftY = m_preShiftY;
- return rtn;
- }
- void map(double x1, double y1, double* x2, double* y2) const
- {
- x1 += m_preShiftX;
- y1 += m_preShiftY;
- *x2 = x1 * m_cosA + y1 * m_sinA + m_postShiftX;
- *y2 = y1 * m_cosA - x1 * m_sinA + m_postShiftY;
- }
- void map(int x1, int y1, int* x2, int* y2) const
- {
- x1 += m_preShiftX;
- y1 += m_preShiftY;
- *x2 = stableRound(x1 * m_cosA + y1 * m_sinA) + m_postShiftX;
- *y2 = stableRound(y1 * m_cosA - x1 * m_sinA) + m_postShiftY;
- }
-
- double m_cosA;
- double m_sinA;
- int m_preShiftX;
- int m_preShiftY;
- int m_postShiftX;
- int m_postShiftY;
-};
-
-template<class T> static inline IntPoint mapPoint(const IntPoint& p, const T& t)
-{
- int x, y;
- t.map(p.x(), p.y(), &x, &y);
- return IntPoint(x, y);
-}
-
-template<class T> static inline FloatPoint mapPoint(const FloatPoint& p, const T& t)
-{
- double x, y;
- t.map(p.x(), p.y(), &x, &y);
- return FloatPoint(static_cast<float>(x), static_cast<float>(y));
-}
-
-template<class Transform, class Rect, class Value> static inline Rect mapRect(const Rect& rect, const Transform& transform)
-{
- Value x[4], y[4];
- Value l, t, r, b;
- r = rect.maxX() - 1;
- b = rect.maxY() - 1;
- transform.map(rect.x(), rect.y(), x, y);
- transform.map(rect.x(), b, x + 1, y + 1);
- transform.map(r, b, x + 2, y + 2);
- transform.map(r, rect.y(), x + 3, y + 3);
- l = r = x[3];
- t = b = y[3];
- for (int i = 0; i < 3; ++i) {
- if (x[i] < l)
- l = x[i];
- else if (x[i] > r)
- r = x[i];
-
- if (y[i] < t)
- t = y[i];
- else if (y[i] > b)
- b = y[i];
- }
-
- return IntRect(l, t, r - l + 1, b - t + 1);
-}
-
-template<class T> static inline IntRect mapRect(const IntRect& rect, const T& transform)
-{
- return mapRect<T, IntRect, int>(rect, transform);
-}
-
-template<class T> static inline FloatRect mapRect(const FloatRect& rect, const T& transform)
-{
- return mapRect<T, FloatRect, double>(rect, transform);
-}
-
-class GraphicsContextPlatformPrivateData {
-public:
- GraphicsContextPlatformPrivateData()
- : m_transform()
- , m_opacity(1.0)
- {
- }
-
- AffineTransform m_transform;
- float m_opacity;
-};
-
-enum AlphaPaintType {
- AlphaPaintNone,
- AlphaPaintImage,
- AlphaPaintOther,
-};
-
-class GraphicsContextPlatformPrivate : public GraphicsContextPlatformPrivateData {
-public:
- GraphicsContextPlatformPrivate(HDC dc)
- : m_dc(dc)
- {
- }
- ~GraphicsContextPlatformPrivate()
- {
- while (!m_backupData.isEmpty())
- restore();
- }
-
- void translate(float x, float y)
- {
- m_transform.translate(x, y);
- }
-
- void scale(const FloatSize& size)
- {
- m_transform.scaleNonUniform(size.width(), size.height());
- }
-
- void rotate(float radians)
- {
- m_transform.rotate(rad2deg(radians));
- }
-
- void concatCTM(const AffineTransform& transform)
- {
- m_transform *= transform;
- }
-
- void setCTM(const AffineTransform& transform)
- {
- m_transform = transform;
- }
-
- IntRect mapRect(const IntRect& rect) const
- {
- return m_transform.mapRect(rect);
- }
-
- FloatRect mapRect(const FloatRect& rect) const
- {
- return m_transform.mapRect(rect);
- }
-
- IntPoint mapPoint(const IntPoint& point) const
- {
- return m_transform.mapPoint(point);
- }
-
- FloatPoint mapPoint(const FloatPoint& point) const
- {
- return m_transform.mapPoint(point);
- }
-
- FloatSize mapSize(const FloatSize& size) const
- {
- double w, h;
- m_transform.map(size.width(), size.height(), w, h);
- return FloatSize(static_cast<float>(w), static_cast<float>(h));
- }
-
- void save()
- {
- if (m_dc)
- SaveDC(m_dc);
-
- m_backupData.append(*static_cast<GraphicsContextPlatformPrivateData*>(this));
- }
-
- void restore()
- {
- if (m_backupData.isEmpty())
- return;
-
- if (m_dc)
- RestoreDC(m_dc, -1);
-
- GraphicsContextPlatformPrivateData::operator=(m_backupData.last());
- m_backupData.removeLast();
- }
-
- bool hasAlpha() const { return m_bitmap && m_bitmap->hasAlpha(); }
-
- PassRefPtr<SharedBitmap> getTransparentLayerBitmap(IntRect& origRect, AlphaPaintType alphaPaint, RECT& bmpRect, bool checkClipBox, bool force) const
- {
- if (m_opacity <= 0)
- return 0;
-
- if (force || m_opacity < 1.) {
- if (checkClipBox) {
- RECT clipBox;
- int clipType = GetClipBox(m_dc, &clipBox);
- if (clipType == SIMPLEREGION || clipType == COMPLEXREGION)
- origRect.intersect(clipBox);
- if (origRect.isEmpty())
- return 0;
- }
-
- RefPtr<SharedBitmap> bmp = SharedBitmap::create(origRect.size(), alphaPaint == AlphaPaintNone ? BitmapInfo::BitCount16 : BitmapInfo::BitCount32, false);
- SetRect(&bmpRect, 0, 0, origRect.width(), origRect.height());
- if (bmp) {
- switch (alphaPaint) {
- case AlphaPaintNone:
- case AlphaPaintImage:
- {
- SharedBitmap::DCHolder dc(bmp.get());
- if (dc.get()) {
- BitBlt(dc.get(), 0, 0, origRect.width(), origRect.height(), m_dc, origRect.x(), origRect.y(), SRCCOPY);
- if (bmp->is32bit() && (!m_bitmap || m_bitmap->is16bit())) {
- // Set alpha channel
- unsigned* pixels = (unsigned*)bmp->bytes();
- const unsigned* const pixelsEnd = pixels + bmp->bitmapInfo().numPixels();
- while (pixels < pixelsEnd) {
- *pixels |= 0xFF000000;
- ++pixels;
- }
- }
- return bmp;
- }
- }
- break;
- //case AlphaPaintOther:
- default:
- memset(bmp->bytes(), 0xFF, bmp->bitmapInfo().numPixels() * 4);
- return bmp;
- break;
- }
- }
- }
-
- bmpRect = origRect;
- return 0;
- }
-
- void paintBackTransparentLayerBitmap(HDC hdc, SharedBitmap* bmp, const IntRect& origRect, AlphaPaintType alphaPaint, const RECT& bmpRect)
- {
- if (hdc == m_dc)
- return;
-
- if (alphaPaint == AlphaPaintOther && hasAlphaBlendSupport()) {
- ASSERT(bmp && bmp->bytes() && bmp->is32bit());
- unsigned* pixels = (unsigned*)bmp->bytes();
- const unsigned* const pixelsEnd = pixels + bmp->bitmapInfo().numPixels();
- while (pixels < pixelsEnd) {
- *pixels ^= 0xFF000000;
- ++pixels;
- }
- }
- if ((m_opacity < 1. || alphaPaint == AlphaPaintOther) && hasAlphaBlendSupport()) {
- const BLENDFUNCTION blend = { AC_SRC_OVER, 0
- , m_opacity >= 1. ? 255 : (BYTE)(m_opacity * 255)
- , alphaPaint == AlphaPaintNone ? 0 : AC_SRC_ALPHA };
- bool success = alphaBlendIfSupported(m_dc, origRect.x(), origRect.y(), origRect.width(), origRect.height(), hdc, 0, 0, bmpRect.right, bmpRect.bottom, blend);
- ASSERT_UNUSED(success, success);
- } else
- StretchBlt(m_dc, origRect.x(), origRect.y(), origRect.width(), origRect.height(), hdc, 0, 0, bmpRect.right, bmpRect.bottom, SRCCOPY);
- }
-
- HDC m_dc;
- RefPtr<SharedBitmap> m_bitmap;
- Vector<GraphicsContextPlatformPrivateData> m_backupData;
-};
-
-static GDIObject<HPEN> createPen(const Color& col, double fWidth, StrokeStyle style)
-{
- int width = stableRound(fWidth);
- if (width < 1)
- width = 1;
-
- int penStyle = PS_NULL;
- switch (style) {
- case SolidStroke:
- case DoubleStroke:
- case WavyStroke: // FIXME: https://bugs.webkit.org/show_bug.cgi?id=94114 - Needs platform support.
- penStyle = PS_SOLID;
- break;
- case DottedStroke: // not supported on Windows CE
- case DashedStroke:
- penStyle = PS_DASH;
- width = 1;
- break;
- default:
- break;
- }
-
- return adoptGDIObject(::CreatePen(penStyle, width, RGB(col.red(), col.green(), col.blue())));
-}
-
-static inline GDIObject<HBRUSH> createBrush(const Color& col)
-{
- return adoptGDIObject(::CreateSolidBrush(RGB(col.red(), col.green(), col.blue())));
-}
-
-template <typename PixelType, bool Is16bit> static void _rotateBitmap(SharedBitmap* destBmp, const SharedBitmap* sourceBmp, const RotationTransform& transform)
-{
- int destW = destBmp->width();
- int destH = destBmp->height();
- int sourceW = sourceBmp->width();
- int sourceH = sourceBmp->height();
- PixelType* dest = (PixelType*)destBmp->bytes();
- const PixelType* source = (const PixelType*)sourceBmp->bytes();
- int padding;
- int paddedSourceW;
- if (Is16bit) {
- padding = destW & 1;
- paddedSourceW = sourceW + (sourceW & 1);
- } else {
- padding = 0;
- paddedSourceW = sourceW;
- }
- if (isZero(transform.m_sinA)) {
- int cosA = transform.m_cosA > 0 ? 1 : -1;
- for (int y = 0; y < destH; ++y) {
- for (int x = 0; x < destW; ++x) {
- int x1 = x + transform.m_preShiftX;
- int y1 = y + transform.m_preShiftY;
- int srcX = x1 * cosA + transform.m_postShiftX;
- int srcY = y1 * cosA - transform.m_postShiftY;
- if (srcX >= 0 && srcX <= sourceW && srcY >= 0 && srcY <= sourceH)
- *dest++ = source[srcY * paddedSourceW + srcX] | 0xFF000000;
- else
- *dest++ |= 0xFF;
- }
- dest += padding;
- }
- } else if (isZero(transform.m_cosA)) {
- int sinA = transform.m_sinA > 0 ? 1 : -1;
- for (int y = 0; y < destH; ++y) {
- for (int x = 0; x < destW; ++x) {
- int x1 = x + transform.m_preShiftX;
- int y1 = y + transform.m_preShiftY;
- int srcX = y1 * sinA + transform.m_postShiftX;
- int srcY = -x1 * sinA + transform.m_postShiftY;
- if (srcX >= 0 && srcX <= sourceW && srcY >= 0 && srcY <= sourceH)
- *dest++ = source[srcY * paddedSourceW + srcX];
- }
- dest += padding;
- }
- } else {
- for (int y = 0; y < destH; ++y) {
- for (int x = 0; x < destW; ++x) {
- // FIXME: for best quality, we should get weighted sum of four neighbours,
- // but that will be too expensive
- int srcX, srcY;
- transform.map(x, y, &srcX, &srcY);
- if (srcX >= 0 && srcX <= sourceW && srcY >= 0 && srcY <= sourceH)
- *dest++ = source[srcY * paddedSourceW + srcX];
- }
- dest += padding;
- }
- }
-}
-
-static void rotateBitmap(SharedBitmap* destBmp, const SharedBitmap* sourceBmp, const RotationTransform& transform)
-{
- ASSERT(destBmp->is16bit() == sourceBmp->is16bit());
- if (destBmp->is16bit())
- _rotateBitmap<unsigned short, true>(destBmp, sourceBmp, transform);
- else
- _rotateBitmap<unsigned, false>(destBmp, sourceBmp, transform);
-}
-
-class TransparentLayerDC {
- WTF_MAKE_NONCOPYABLE(TransparentLayerDC);
-public:
- TransparentLayerDC(GraphicsContextPlatformPrivate* data, IntRect& origRect, const IntRect* rectBeforeTransform = 0, int alpha = 255, bool paintImage = false);
- ~TransparentLayerDC();
-
- HDC hdc() const { return m_memDc; }
- const RECT& rect() const { return m_bmpRect; }
- IntSize toShift() const { return IntSize(m_bmpRect.left - m_origRect.x(), m_bmpRect.top - m_origRect.y()); }
- void fillAlphaChannel();
-
-private:
- GraphicsContextPlatformPrivate* m_data;
- IntRect m_origRect;
- IntRect m_rotatedOrigRect;
- HDC m_memDc;
- RefPtr<SharedBitmap> m_bitmap;
- RefPtr<SharedBitmap> m_rotatedBitmap;
- RECT m_bmpRect;
- unsigned m_key;
- RotationTransform m_rotation;
- float m_oldOpacity;
- AlphaPaintType m_alphaPaintType;
-};
-
-TransparentLayerDC::TransparentLayerDC(GraphicsContextPlatformPrivate* data, IntRect& origRect, const IntRect* rectBeforeTransform, int alpha, bool paintImage)
-: m_data(data)
-, m_origRect(origRect)
-, m_oldOpacity(data->m_opacity)
-// m_key1 and m_key2 are not initalized here. They are used only in the case that
-// SharedBitmap::getDC() is called, I.E., when m_bitmap is not null.
-{
- m_data->m_opacity *= alpha / 255.;
- bool mustCreateLayer;
- if (!m_data->hasAlpha()) {
- mustCreateLayer = false;
- m_alphaPaintType = AlphaPaintNone;
- } else {
- mustCreateLayer = true;
- m_alphaPaintType = paintImage ? AlphaPaintImage : AlphaPaintOther;
- }
- if (rectBeforeTransform && !isZero(m_data->m_transform.b())) {
- m_rotatedOrigRect = origRect;
- m_rotatedBitmap = m_data->getTransparentLayerBitmap(m_rotatedOrigRect, m_alphaPaintType, m_bmpRect, false, true);
- if (m_rotatedBitmap) {
- double a = m_data->m_transform.a();
- double b = m_data->m_transform.b();
- double c = _hypot(a, b);
- m_rotation.m_cosA = a / c;
- m_rotation.m_sinA = b / c;
-
- int centerX = origRect.x() + origRect.width() / 2;
- int centerY = origRect.y() + origRect.height() / 2;
- m_rotation.m_preShiftX = -centerX;
- m_rotation.m_preShiftY = -centerY;
- m_rotation.m_postShiftX = centerX;
- m_rotation.m_postShiftY = centerY;
-
- m_origRect = mapRect(m_rotatedOrigRect, m_rotation);
-
- m_rotation.m_preShiftX += m_rotatedOrigRect.x();
- m_rotation.m_preShiftY += m_rotatedOrigRect.y();
- m_rotation.m_postShiftX -= m_origRect.x();
- m_rotation.m_postShiftY -= m_origRect.y();
-
- FloatPoint topLeft = m_data->m_transform.mapPoint(FloatPoint(rectBeforeTransform->location()));
- FloatPoint topRight(rectBeforeTransform->maxX() - 1, rectBeforeTransform->y());
- topRight = m_data->m_transform.mapPoint(topRight);
- FloatPoint bottomLeft(rectBeforeTransform->x(), rectBeforeTransform->maxY() - 1);
- bottomLeft = m_data->m_transform.mapPoint(bottomLeft);
- FloatSize sideTop = topRight - topLeft;
- FloatSize sideLeft = bottomLeft - topLeft;
- float width = _hypot(sideTop.width() + 1, sideTop.height() + 1);
- float height = _hypot(sideLeft.width() + 1, sideLeft.height() + 1);
-
- origRect.inflateX(stableRound((width - origRect.width()) * 0.5));
- origRect.inflateY(stableRound((height - origRect.height()) * 0.5));
-
- m_bitmap = SharedBitmap::create(m_origRect.size(), m_rotatedBitmap->is16bit() ? BitmapInfo::BitCount16 : BitmapInfo::BitCount32, true);
- if (m_bitmap)
- rotateBitmap(m_bitmap.get(), m_rotatedBitmap.get(), -m_rotation);
- else
- m_rotatedBitmap = 0;
- }
- } else
- m_bitmap = m_data->getTransparentLayerBitmap(m_origRect, m_alphaPaintType, m_bmpRect, true, mustCreateLayer);
- if (m_bitmap)
- m_memDc = m_bitmap->getDC(&m_key);
- else
- m_memDc = m_data->m_dc;
-}
-
-TransparentLayerDC::~TransparentLayerDC()
-{
- if (m_rotatedBitmap) {
- m_bitmap->releaseDC(m_memDc, m_key);
- m_key = 0;
- rotateBitmap(m_rotatedBitmap.get(), m_bitmap.get(), m_rotation);
- m_memDc = m_rotatedBitmap->getDC(&m_key);
- m_data->paintBackTransparentLayerBitmap(m_memDc, m_rotatedBitmap.get(), m_rotatedOrigRect, m_alphaPaintType, m_bmpRect);
- m_rotatedBitmap->releaseDC(m_memDc, m_key);
- } else if (m_bitmap) {
- m_data->paintBackTransparentLayerBitmap(m_memDc, m_bitmap.get(), m_origRect, m_alphaPaintType, m_bmpRect);
- m_bitmap->releaseDC(m_memDc, m_key);
- }
- m_data->m_opacity = m_oldOpacity;
-}
-
-void TransparentLayerDC::fillAlphaChannel()
-{
- if (!m_bitmap || !m_bitmap->is32bit())
- return;
-
- unsigned* pixels = (unsigned*)m_bitmap->bytes();
- const unsigned* const pixelsEnd = pixels + m_bitmap->bitmapInfo().numPixels();
- while (pixels < pixelsEnd) {
- *pixels |= 0xFF000000;
- ++pixels;
- }
-}
-
-class ScopeDCProvider {
- WTF_MAKE_NONCOPYABLE(ScopeDCProvider);
-public:
- explicit ScopeDCProvider(GraphicsContextPlatformPrivate* data)
- : m_data(data)
- {
- if (m_data->m_bitmap)
- m_data->m_dc = m_data->m_bitmap->getDC(&m_key);
- }
- ~ScopeDCProvider()
- {
- if (m_data->m_bitmap) {
- m_data->m_bitmap->releaseDC(m_data->m_dc, m_key);
- m_data->m_dc = 0;
- }
- }
-private:
- GraphicsContextPlatformPrivate* m_data;
- unsigned m_key;
-};
-
-
-void GraphicsContext::platformInit(PlatformGraphicsContext* dc, bool)
-{
- m_data = new GraphicsContextPlatformPrivate(dc);
-}
-
-void GraphicsContext::platformDestroy()
-{
- delete m_data;
-}
-
-void GraphicsContext::setBitmap(PassRefPtr<SharedBitmap> bmp)
-{
- ASSERT(!m_data->m_dc);
- m_data->m_bitmap = bmp;
-}
-
-HDC GraphicsContext::getWindowsContext(const IntRect& dstRect, bool supportAlphaBlend, bool mayCreateBitmap)
-{
- // FIXME: Add support for AlphaBlend.
- ASSERT(!supportAlphaBlend);
- return m_data->m_dc;
-}
-
-void GraphicsContext::releaseWindowsContext(HDC hdc, const IntRect& dstRect, bool supportAlphaBlend, bool mayCreateBitmap)
-{
-}
-
-void GraphicsContext::savePlatformState()
-{
- m_data->save();
-}
-
-void GraphicsContext::restorePlatformState()
-{
- m_data->restore();
-}
-
-void GraphicsContext::drawRect(const FloatRect& rect, float)
-{
- if (!m_data->m_opacity || paintingDisabled() || rect.isEmpty())
- return;
-
- ScopeDCProvider dcProvider(m_data);
- if (!m_data->m_dc)
- return;
-
- IntRect trRect = m_data->mapRect(rect);
- TransparentLayerDC transparentDC(m_data, trRect, &rect);
- HDC dc = transparentDC.hdc();
- if (!dc)
- return;
- trRect.move(transparentDC.toShift());
-
- GDIObject<HBRUSH> brush;
- HGDIOBJ oldBrush;
- if (fillColor().alpha()) {
- brush = createBrush(fillColor());
- oldBrush = SelectObject(dc, brush.get());
- } else
- oldBrush = SelectObject(dc, GetStockObject(NULL_BRUSH));
-
- GDIObject<HPEN> pen;
- HGDIOBJ oldPen;
- if (strokeStyle() != NoStroke) {
- pen = createPen(strokeColor(), strokeThickness(), strokeStyle());
- oldPen = SelectObject(dc, pen.get());
- } else
- oldPen = SelectObject(dc, GetStockObject(NULL_PEN));
-
- if (brush || pen) {
- if (trRect.width() <= 0)
- trRect.setWidth(1);
- if (trRect.height() <= 0)
- trRect.setHeight(1);
-
- Rectangle(dc, trRect.x(), trRect.y(), trRect.maxX(), trRect.maxY());
- }
-
- SelectObject(dc, oldPen);
- SelectObject(dc, oldBrush);
-}
-
-void GraphicsContext::drawLine(const FloatPoint& point1, const FloatPoint& point2)
-{
- if (!m_data->m_opacity || paintingDisabled() || strokeStyle() == NoStroke || !strokeColor().alpha())
- return;
-
- ScopeDCProvider dcProvider(m_data);
- if (!m_data->m_dc)
- return;
-
- IntPoint trPoint1 = m_data->mapPoint(point1);
- IntPoint trPoint2 = m_data->mapPoint(point2);
-
- IntRect lineRect(trPoint1, trPoint2 - trPoint1);
- lineRect.setHeight(lineRect.height() + strokeThickness());
- TransparentLayerDC transparentDC(m_data, lineRect, 0, strokeColor().alpha());
- HDC dc = transparentDC.hdc();
- if (!dc)
- return;
- trPoint1 += transparentDC.toShift();
- trPoint2 += transparentDC.toShift();
-
- auto pen = createPen(strokeColor(), strokeThickness(), strokeStyle());
- HGDIOBJ oldPen = SelectObject(dc, pen.get());
-
- MoveToEx(dc, trPoint1.x(), trPoint1.y(), 0);
- LineTo(dc, trPoint2.x(), trPoint2.y());
-
- SelectObject(dc, oldPen);
-}
-
-void GraphicsContext::drawEllipse(const IntRect& rect)
-{
- if (!m_data->m_opacity || paintingDisabled() || (!fillColor().alpha() && strokeStyle() == NoStroke))
- return;
-
- ScopeDCProvider dcProvider(m_data);
- if (!m_data->m_dc)
- return;
-
- IntRect trRect = m_data->mapRect(rect);
- TransparentLayerDC transparentDC(m_data, trRect, &rect);
- HDC dc = transparentDC.hdc();
- if (!dc)
- return;
- trRect.move(transparentDC.toShift());
-
- GDIObject<HBRUSH> brush;
- HGDIOBJ oldBrush;
- if (fillColor().alpha()) {
- brush = createBrush(fillColor());
- oldBrush = SelectObject(dc, brush.get());
- } else
- oldBrush = SelectObject(dc, GetStockObject(NULL_BRUSH));
-
- GDIObject<HPEN> pen;
- HGDIOBJ oldPen = 0;
- if (strokeStyle() != NoStroke) {
- pen = createPen(strokeColor(), strokeThickness(), strokeStyle());
- oldPen = SelectObject(dc, pen.get());
- } else
- oldPen = SelectObject(dc, GetStockObject(NULL_PEN));
-
- if (brush || pen)
- Ellipse(dc, trRect.x(), trRect.y(), trRect.maxX(), trRect.maxY());
-
- SelectObject(dc, oldPen);
- SelectObject(dc, oldBrush);
-}
-
-static inline bool equalAngle(double a, double b)
-{
- return fabs(a - b) < 1E-5;
-}
-
-void getEllipsePointByAngle(double angle, double a, double b, float& x, float& y)
-{
- while (angle < 0)
- angle += 2 * piDouble;
- while (angle >= 2 * piDouble)
- angle -= 2 * piDouble;
-
- if (equalAngle(angle, 0) || equalAngle(angle, 2 * piDouble)) {
- x = a;
- y = 0;
- } else if (equalAngle(angle, piDouble)) {
- x = -a;
- y = 0;
- } else if (equalAngle(angle, .5 * piDouble)) {
- x = 0;
- y = b;
- } else if (equalAngle(angle, 1.5 * piDouble)) {
- x = 0;
- y = -b;
- } else {
- double k = tan(angle);
- double sqA = a * a;
- double sqB = b * b;
- double tmp = 1. / (1. / sqA + (k * k) / sqB);
- tmp = tmp <= 0 ? 0 : sqrt(tmp);
- if (angle > .5 * piDouble && angle < 1.5 * piDouble)
- tmp = -tmp;
- x = tmp;
-
- k = tan(.5 * piDouble - angle);
- tmp = 1. / ((k * k) / sqA + 1 / sqB);
- tmp = tmp <= 0 ? 0 : sqrt(tmp);
- if (angle > piDouble)
- tmp = -tmp;
- y = tmp;
- }
-}
-
-void GraphicsContext::drawConvexPolygon(size_t npoints, const FloatPoint* points, bool shouldAntialias)
-{
- if (!m_data->m_opacity || paintingDisabled() || npoints <= 1 || !points)
- return;
-
- ScopeDCProvider dcProvider(m_data);
- if (!m_data->m_dc)
- return;
-
- Vector<POINT, 20> winPoints(npoints);
- FloatPoint trPoint = m_data->mapPoint(points[0]);
- winPoints[0].x = stableRound(trPoint.x());
- winPoints[0].y = stableRound(trPoint.y());
- RECT rect = { winPoints[0].x, winPoints[0].y, winPoints[0].x, winPoints[0].y };
- for (size_t i = 1; i < npoints; ++i) {
- trPoint = m_data->mapPoint(points[i]);
- winPoints[i].x = stableRound(trPoint.x());
- winPoints[i].y = stableRound(trPoint.y());
- if (rect.left > winPoints[i].x)
- rect.left = winPoints[i].x;
- else if (rect.right < winPoints[i].x)
- rect.right = winPoints[i].x;
- if (rect.top > winPoints[i].y)
- rect.top = winPoints[i].y;
- else if (rect.bottom < winPoints[i].y)
- rect.bottom = winPoints[i].y;
- }
- rect.bottom += 1;
- rect.right += 1;
-
- IntRect intRect(rect);
- TransparentLayerDC transparentDC(m_data, intRect);
- HDC dc = transparentDC.hdc();
- if (!dc)
- return;
-
- for (size_t i = 0; i < npoints; ++i) {
- winPoints[i].x += transparentDC.toShift().width();
- winPoints[i].y += transparentDC.toShift().height();
- }
-
- GDIObject<HBRUSH> brush;
- HGDIOBJ oldBrush;
- if (fillColor().alpha()) {
- brush = createBrush(fillColor());
- oldBrush = SelectObject(dc, brush.get());
- } else
- oldBrush = SelectObject(dc, GetStockObject(NULL_BRUSH));
-
- GDIObject<HPEN> pen;
- HGDIOBJ oldPen;
- if (strokeStyle() != NoStroke) {
- pen = createPen(strokeColor(), strokeThickness(), strokeStyle());
- oldPen = SelectObject(dc, pen.get());
- } else
- oldPen = SelectObject(dc, GetStockObject(NULL_PEN));
-
- if (brush || pen)
- Polygon(dc, winPoints.data(), npoints);
-
- SelectObject(dc, oldPen);
- SelectObject(dc, oldBrush);
-}
-
-void GraphicsContext::clipConvexPolygon(size_t numPoints, const FloatPoint* points, bool antialiased)
-{
- if (paintingDisabled())
- return;
-
- if (numPoints <= 1)
- return;
-
- // FIXME: IMPLEMENT!!
-}
-
-void GraphicsContext::fillRect(const FloatRect& rect, const Color& color, ColorSpace colorSpace)
-{
- if (paintingDisabled() || !m_data->m_opacity)
- return;
-
- int alpha = color.alpha();
- if (!alpha)
- return;
-
- ScopeDCProvider dcProvider(m_data);
- if (!m_data->m_dc)
- return;
-
- IntRect intRect = enclosingIntRect(rect);
- TransparentLayerDC transparentDC(m_data, m_data->mapRect(intRect), &intRect, alpha);
-
- if (!transparentDC.hdc())
- return;
-
- auto hbrush = adoptGDIObject(::CreateSolidBrush(RGB(color.red(), color.green(), color.blue())));
- FillRect(transparentDC.hdc(), &transparentDC.rect(), hbrush.get());
-}
-
-void GraphicsContext::clip(const FloatRect& rect)
-{
- if (paintingDisabled())
- return;
-
- if (!m_data->m_dc)
- return;
-
- IntRect trRect = enclosingIntRect(m_data->mapRect(rect));
-
- auto clipRgn = adoptGDIObject(::CreateRectRgn(0, 0, 0, 0));
- if (GetClipRgn(m_data->m_dc, clipRgn.get()) > 0)
- IntersectClipRect(m_data->m_dc, trRect.x(), trRect.y(), trRect.maxX(), trRect.maxY());
- else {
- clipRgn = adoptGDIObject(::CreateRectRgn(trRect.x(), trRect.y(), trRect.maxX(), trRect.maxY()));
- SelectClipRgn(m_data->m_dc, clipRgn.get());
- }
-}
-
-void GraphicsContext::clipOut(const FloatRect& rect)
-{
- if (paintingDisabled())
- return;
-
- if (!m_data->m_dc)
- return;
-
- IntRect trRect = m_data->mapRect(rect);
-
- ExcludeClipRect(m_data->m_dc, trRect.x(), trRect.y(), trRect.maxX(), trRect.maxY());
-}
-
-void GraphicsContext::drawFocusRing(const Path& path, int width, int offset, const Color& color)
-{
- // FIXME: implement
-}
-
-void GraphicsContext::drawFocusRing(const Vector<IntRect>& rects, int width, int offset, const Color& color)
-{
- if (!m_data->m_opacity || paintingDisabled())
- return;
-
- ScopeDCProvider dcProvider(m_data);
- if (!m_data->m_dc)
- return;
-
- int radius = (width - 1) / 2;
- offset += radius;
-
- unsigned rectCount = rects.size();
- IntRect finalFocusRect;
- for (unsigned i = 0; i < rectCount; i++) {
- IntRect focusRect = rects[i];
- focusRect.inflate(offset);
- finalFocusRect.unite(focusRect);
- }
-
- IntRect intRect = finalFocusRect;
- IntRect trRect = m_data->mapRect(finalFocusRect);
- TransparentLayerDC transparentDC(m_data, trRect, &intRect);
- HDC dc = transparentDC.hdc();
- if (!dc)
- return;
- trRect.move(transparentDC.toShift());
-
- RECT rect = trRect;
- DrawFocusRect(dc, &rect);
-}
-
-FloatRect GraphicsContext::computeLineBoundsForText(const FloatPoint& origin, float width, bool printing)
-{
- return FloatRect(origin, FloatSize(width, strokeThickness()));
-}
-
-void GraphicsContext::drawLineForText(const FloatPoint& origin, float width, bool printing, bool doubleUnderlines)
-{
- if (paintingDisabled())
- return;
-
- StrokeStyle oldStyle = strokeStyle();
- setStrokeStyle(SolidStroke);
- drawLine(roundedIntPoint(origin), roundedIntPoint(origin + FloatSize(width, 0)));
- if (doubleUnderlines)
- drawLine(roundedIntPoint(origin + FloatSize(0, strokeThickness() * 2)), roundedIntPoint(origin + FloatSize(width, strokeThickness() * 2)));
- setStrokeStyle(oldStyle);
-}
-
-void GraphicsContext::drawLinesForText(const FloatPoint& point, const DashArray& widths, bool printing, bool doubleUnderlines)
-{
- for (size_t i = 0; i < widths.size(); i += 2)
- drawLineForText(FloatPoint(point.x() + widths[i], point.y()), widths[i+1] - widths[i], printing, doubleUnderlines);
-}
-
-void GraphicsContext::updateDocumentMarkerResources()
-{
- notImplemented();
-}
-
-void GraphicsContext::drawLineForDocumentMarker(const FloatPoint&, float width, DocumentMarkerLineStyle style)
-{
- notImplemented();
-}
-
-void GraphicsContext::setPlatformFillColor(const Color& col, ColorSpace colorSpace)
-{
- notImplemented();
-}
-
-void GraphicsContext::setPlatformStrokeColor(const Color& col, ColorSpace colorSpace)
-{
- notImplemented();
-}
-
-void GraphicsContext::setPlatformStrokeThickness(float strokeThickness)
-{
- notImplemented();
-}
-
-void GraphicsContext::setURLForRect(const URL& link, const IntRect& destRect)
-{
- notImplemented();
-}
-
-void GraphicsContext::clearRect(const FloatRect& rect)
-{
- if (paintingDisabled())
- return;
-
- if (m_data->hasAlpha()) {
- IntRect trRect = enclosingIntRect(m_data->mapRect(rect));
- m_data->m_bitmap->clearPixels(trRect);
- return;
- }
-
- fillRect(rect, Color(Color::white), ColorSpaceDeviceRGB);
-}
-
-void GraphicsContext::strokeRect(const FloatRect& rect, float width)
-{
- if (!m_data->m_opacity || paintingDisabled() || strokeStyle() == NoStroke)
- return;
-
- ScopeDCProvider dcProvider(m_data);
- if (!m_data->m_dc)
- return;
-
- IntRect intRect = enclosingIntRect(rect);
- IntRect trRect = m_data->mapRect(intRect);
- TransparentLayerDC transparentDC(m_data, trRect, &intRect);
- HDC dc = transparentDC.hdc();
- if (!dc)
- return;
- trRect.move(transparentDC.toShift());
-
- auto pen = createPen(strokeColor(), strokeThickness(), strokeStyle());
- HGDIOBJ oldPen = SelectObject(dc, pen.get());
-
- int right = trRect.maxX() - 1;
- int bottom = trRect.maxY() - 1;
- const POINT intPoints[5] =
- {
- { trRect.x(), trRect.y() },
- { right, trRect.y() },
- { right, bottom },
- { trRect.x(), bottom },
- { trRect.x(), trRect.y() }
- };
-
- Polyline(dc, intPoints, 5);
-
- SelectObject(dc, oldPen);
-}
-
-void GraphicsContext::beginPlatformTransparencyLayer(float opacity)
-{
- m_data->save();
- m_data->m_opacity *= opacity;
-}
-
-void GraphicsContext::endPlatformTransparencyLayer()
-{
- m_data->restore();
-}
-
-bool GraphicsContext::supportsTransparencyLayers()
-{
- return true;
-}
-
-void GraphicsContext::concatCTM(const AffineTransform& transform)
-{
- m_data->concatCTM(transform);
-}
-
-void GraphicsContext::setCTM(const AffineTransform& transform)
-{
- m_data->setCTM(transform);
-}
-
-AffineTransform& GraphicsContext::affineTransform()
-{
- return m_data->m_transform;
-}
-
-const AffineTransform& GraphicsContext::affineTransform() const
-{
- return m_data->m_transform;
-}
-
-void GraphicsContext::resetAffineTransform()
-{
- m_data->m_transform.makeIdentity();
-}
-
-void GraphicsContext::translate(float x, float y)
-{
- m_data->translate(x, y);
-}
-
-void GraphicsContext::rotate(float radians)
-{
- m_data->rotate(radians);
-}
-
-void GraphicsContext::scale(const FloatSize& size)
-{
- m_data->scale(size);
-}
-
-void GraphicsContext::setLineCap(LineCap lineCap)
-{
- notImplemented();
-}
-
-void GraphicsContext::setLineJoin(LineJoin lineJoin)
-{
- notImplemented();
-}
-
-void GraphicsContext::setMiterLimit(float miter)
-{
- notImplemented();
-}
-
-void GraphicsContext::setAlpha(float alpha)
-{
- m_data->m_opacity = alpha;
-}
-
-void GraphicsContext::setPlatformCompositeOperation(CompositeOperator op, BlendMode blendMode)
-{
- notImplemented();
-}
-
-void GraphicsContext::clip(const Path& path, WindRule)
-{
- notImplemented();
-}
-
-void GraphicsContext::canvasClip(const Path& path, WindRule fillRule)
-{
- clip(path, fillRule);
-}
-
-void GraphicsContext::clipOut(const Path&)
-{
- notImplemented();
-}
-
-static inline IntPoint rectCenterPoint(const RECT& rect)
-{
- return IntPoint(rect.left + (rect.right - rect.left) / 2, rect.top + (rect.bottom - rect.top) / 2);
-}
-
-void GraphicsContext::fillRoundedRect(const FloatRoundedRect& rect, const Color& c, ColorSpace colorSpace)
-{
- ScopeDCProvider dcProvider(m_data);
- if (!m_data->m_dc)
- return;
-
- FloatSize shadowOffset;
- float shadowBlur = 0;
- Color shadowColor;
- ColorSpace shadowColorSpace;
-
- getShadow(shadowOffset, shadowBlur, shadowColor, shadowColorSpace);
-
- const FloatRect& fillRect = rect.rect();
- IntRect dstRect = fillRect;
-
- dstRect.move(stableRound(shadowOffset.width()), stableRound(shadowOffset.height()));
- dstRect.inflate(stableRound(shadowBlur));
- dstRect = m_data->mapRect(dstRect);
-
- FloatSize newTopLeft(m_data->mapSize(rect.radii().topLeft()));
- FloatSize newTopRight(m_data->mapSize(rect.radii().topRight()));
- FloatSize newBottomLeft(m_data->mapSize(rect.radii().bottomLeft()));
- FloatSize newBottomRight(m_data->mapSize(rect.radii().bottomRight()));
-
- TransparentLayerDC transparentDc(m_data, dstRect, &fillRect);
- HDC dc = transparentDc.hdc();
- if (!dc)
- return;
-
- dstRect.move(transparentDc.toShift());
-
- RECT rectWin = dstRect;
-
- auto brush = createBrush(shadowColor);
- HGDIOBJ oldBrush = SelectObject(dc, brush.get());
-
- SelectObject(dc, GetStockObject(NULL_PEN));
-
- IntPoint centerPoint = rectCenterPoint(rectWin);
- // Draw top left half
- RECT clipRect(rectWin);
- clipRect.right = centerPoint.x();
- clipRect.bottom = centerPoint.y();
-
- auto clipRgn = adoptGDIObject(::CreateRectRgn(0, 0, 0, 0));
- bool needsNewClip = (GetClipRgn(dc, clipRgn.get()) <= 0);
-
- drawRoundCorner(needsNewClip, clipRect, rectWin, dc, stableRound(newTopLeft.width() * 2), stableRound(newTopLeft.height() * 2));
-
- // Draw top right
- clipRect = rectWin;
- clipRect.left = centerPoint.x();
- clipRect.bottom = centerPoint.y();
-
- drawRoundCorner(needsNewClip, clipRect, rectWin, dc, stableRound(newTopRight.width() * 2), stableRound(newTopRight.height() * 2));
-
- // Draw bottom left
- clipRect = rectWin;
- clipRect.right = centerPoint.x();
- clipRect.top = centerPoint.y();
-
- drawRoundCorner(needsNewClip, clipRect, rectWin, dc, stableRound(newBottomLeft.width() * 2), stableRound(newBottomLeft.height() * 2));
-
- // Draw bottom right
- clipRect = rectWin;
- clipRect.left = centerPoint.x();
- clipRect.top = centerPoint.y();
-
- drawRoundCorner(needsNewClip, clipRect, rectWin, dc, stableRound(newBottomRight.width() * 2), stableRound(newBottomRight.height() * 2));
-
- SelectObject(dc, oldBrush);
-}
-
-void GraphicsContext::drawRoundCorner(bool needsNewClip, RECT clipRect, RECT rectWin, HDC dc, int width, int height)
-{
- if (!dc)
- return;
-
- auto clipRgn = adoptGDIObject(::CreateRectRgn(0, 0, 0, 0));
- if (needsNewClip) {
- clipRgn = adoptGDIObject(::CreateRectRgn(clipRect.left, clipRect.top, clipRect.right, clipRect.bottom));
- SelectClipRgn(dc, clipRgn.get());
- } else
- IntersectClipRect(dc, clipRect.left, clipRect.top, clipRect.right, clipRect.bottom);
-
- ::RoundRect(dc, rectWin.left , rectWin.top , rectWin.right , rectWin.bottom , width, height);
-
- SelectClipRgn(dc, needsNewClip ? 0 : clipRgn.get());
-}
-
-
-FloatRect GraphicsContext::roundToDevicePixels(const FloatRect& frect, RoundingMode)
-{
- notImplemented();
- return frect;
-}
-
-Color gradientAverageColor(const Gradient* gradient)
-{
- const Vector<Gradient::ColorStop>& stops = gradient->getStops();
- if (stops.isEmpty())
- return Color();
-
- const Gradient::ColorStop& stop = stops.first();
- if (stops.size() == 1)
- return Color(stop.red, stop.green, stop.blue, stop.alpha);
-
- const Gradient::ColorStop& lastStop = stops.last();
- return Color((stop.red + lastStop.red) * 0.5f
- , (stop.green + lastStop.green) * 0.5f
- , (stop.blue + lastStop.blue) * 0.5f
- , (stop.alpha + lastStop.alpha) * 0.5f);
-}
-
-void GraphicsContext::fillPath(const Path& path)
-{
- if (path.isNull())
- return;
-
- Color c = m_state.fillGradient
- ? gradientAverageColor(m_state.fillGradient.get())
- : fillColor();
-
- if (!c.alpha() || !m_data->m_opacity)
- return;
-
- ScopeDCProvider dcProvider(m_data);
- if (!m_data->m_dc)
- return;
-
- auto brush = createBrush(c);
-
- if (m_data->m_opacity < 1.0f || m_data->hasAlpha()) {
- IntRect trRect = enclosingIntRect(m_data->mapRect(path.boundingRect()));
- trRect.inflate(1);
- TransparentLayerDC transparentDC(m_data, trRect);
- HDC dc = transparentDC.hdc();
- if (!dc)
- return;
-
- AffineTransform tr = m_data->m_transform;
- tr.translate(transparentDC.toShift().width(), transparentDC.toShift().height());
-
- SelectObject(dc, GetStockObject(NULL_PEN));
- HGDIOBJ oldBrush = SelectObject(dc, brush.get());
- path.platformPath()->fillPath(dc, &tr);
- SelectObject(dc, oldBrush);
- } else {
- SelectObject(m_data->m_dc, GetStockObject(NULL_PEN));
- HGDIOBJ oldBrush = SelectObject(m_data->m_dc, brush.get());
- path.platformPath()->fillPath(m_data->m_dc, &m_data->m_transform);
- SelectObject(m_data->m_dc, oldBrush);
- }
-}
-
-
-void GraphicsContext::strokePath(const Path& path)
-{
- if (path.isNull() || !m_data->m_opacity)
- return;
-
- ScopeDCProvider dcProvider(m_data);
- if (!m_data->m_dc)
- return;
-
- auto pen = createPen(strokeColor(), strokeThickness(), strokeStyle());
-
- if (m_data->m_opacity < 1.0f || m_data->hasAlpha()) {
- IntRect trRect = enclosingIntRect(m_data->mapRect(path.boundingRect()));
- trRect.inflate(1);
- TransparentLayerDC transparentDC(m_data, trRect);
- HDC dc = transparentDC.hdc();
- if (!dc)
- return;
-
- AffineTransform tr = m_data->m_transform;
- tr.translate(transparentDC.toShift().width(), transparentDC.toShift().height());
-
- SelectObject(dc, GetStockObject(NULL_BRUSH));
- HGDIOBJ oldPen = SelectObject(dc, pen.get());
- path.platformPath()->strokePath(dc, &tr);
- SelectObject(dc, oldPen);
- } else {
- SelectObject(m_data->m_dc, GetStockObject(NULL_BRUSH));
- HGDIOBJ oldPen = SelectObject(m_data->m_dc, pen.get());
- path.platformPath()->strokePath(m_data->m_dc, &m_data->m_transform);
- SelectObject(m_data->m_dc, oldPen);
- }
-}
-
-void GraphicsContext::fillRect(const FloatRect& r, const Gradient* gradient)
-{
- if (!m_data->m_opacity)
- return;
-
- const Vector<Gradient::ColorStop>& stops = gradient->getStops();
- if (stops.isEmpty())
- return;
-
- size_t numStops = stops.size();
- if (numStops == 1) {
- const Gradient::ColorStop& stop = stops.first();
- Color color(stop.red, stop.green, stop.blue, stop.alpha);
- fillRect(r, color, ColorSpaceDeviceRGB);
- return;
- }
-
- ScopeDCProvider dcProvider(m_data);
- if (!m_data->m_dc)
- return;
-
- IntRect intRect = enclosingIntRect(r);
- IntRect rect = m_data->mapRect(intRect);
- TransparentLayerDC transparentDC(m_data, rect, &intRect, 255, true);
- HDC dc = transparentDC.hdc();
- if (!dc)
- return;
-
- rect.move(transparentDC.toShift());
- FloatPoint fp0 = m_data->mapPoint(gradient->p0());
- FloatPoint fp1 = m_data->mapPoint(gradient->p1());
- IntPoint p0(stableRound(fp0.x()), stableRound(fp0.y()));
- IntPoint p1(stableRound(fp1.x()), stableRound(fp1.y()));
- p0 += transparentDC.toShift();
- p1 += transparentDC.toShift();
-
- if (gradient->isRadial()) {
- if (g_radialGradientFiller) {
- // FIXME: don't support 2D scaling at this time
- double scale = (m_data->m_transform.a() + m_data->m_transform.d()) * 0.5;
- float r0 = gradient->startRadius() * scale;
- float r1 = gradient->endRadius() * scale;
- g_radialGradientFiller(dc, rect, p0, p1, r0, r1, gradient->getStops());
- return;
- }
- } else if (g_linearGradientFiller) {
- g_linearGradientFiller(dc, rect, p0, p1, gradient->getStops());
- return;
- }
-
- // Simple 1D linear solution that assumes p0 is on the top or left side, and p1 is on the right or bottom side
- size_t numRects = (numStops - 1);
- Vector<TRIVERTEX, 20> tv;
- tv.resize(numRects * 2);
- Vector<GRADIENT_RECT, 10> mesh;
- mesh.resize(numRects);
- int x = rect.x();
- int y = rect.y();
- int width = rect.width();
- int height = rect.height();
- FloatSize d = gradient->p1() - gradient->p0();
- bool vertical = fabs(d.height()) > fabs(d.width());
- for (size_t i = 0; i < numStops; ++i) {
- const Gradient::ColorStop& stop = stops[i];
- int iTv = i ? 2 * i - 1 : 0;
- tv[iTv].Red = stop.red * 0xFFFF;
- tv[iTv].Green = stop.green * 0xFFFF;
- tv[iTv].Blue = stop.blue * 0xFFFF;
- tv[iTv].Alpha = stop.alpha * 0xFFFF;
- if (i) {
- tv[iTv].x = vertical ? x + width: x + width * stop.stop;
- tv[iTv].y = vertical ? y + height * stop.stop : y + height;
- mesh[i - 1].UpperLeft = iTv - 1;
- mesh[i - 1].LowerRight = iTv;
- } else {
- tv[iTv].x = x;
- tv[iTv].y = y;
- }
-
- if (i && i < numRects) {
- tv[iTv + 1] = tv[iTv];
- if (vertical)
- tv[iTv + 1].x = x;
- else
- tv[iTv + 1].y = y;
- }
- }
-
- GradientFill(dc, tv.data(), tv.size(), mesh.data(), mesh.size(), vertical ? GRADIENT_FILL_RECT_V : GRADIENT_FILL_RECT_H);
-}
-
-AffineTransform GraphicsContext::getCTM(IncludeDeviceScale) const
-{
- if (paintingDisabled())
- return AffineTransform();
-
- return m_data->m_transform;
-}
-
-void GraphicsContext::fillRect(const FloatRect& rect)
-{
- savePlatformState();
-
- if (m_state.fillGradient)
- fillRect(rect, m_state.fillGradient.get());
- else
- fillRect(rect, fillColor(), ColorSpaceDeviceRGB);
-
- restorePlatformState();
-}
-
-void GraphicsContext::setPlatformShadow(const FloatSize&, float, const Color&, ColorSpace)
-{
- notImplemented();
-}
-
-void GraphicsContext::clearPlatformShadow()
-{
- notImplemented();
-}
-
-InterpolationQuality GraphicsContext::imageInterpolationQuality() const
-{
- notImplemented();
- return InterpolationDefault;
-}
-
-void GraphicsContext::setImageInterpolationQuality(InterpolationQuality)
-{
- notImplemented();
-}
-
-static inline bool isCharVisible(UChar c)
-{
- return c && c != zeroWidthSpace;
-}
-
-void GraphicsContext::drawText(const Font& font, const TextRun& run, const FloatPoint& point, int from, int to)
-{
- if (paintingDisabled() || !fillColor().alpha() || !m_data->m_opacity)
- return;
-
- bool mustSupportAlpha = m_data->hasAlpha();
-
- if (!mustSupportAlpha && fillColor().alpha() == 0xFF && m_data->m_opacity >= 1.0) {
- font.drawText(this, run, point, from, to);
- return;
- }
-
- float oldOpacity = m_data->m_opacity;
- m_data->m_opacity *= fillColor().alpha() / 255.0;
-
- FloatRect textRect = font.selectionRectForText(run, point, font.fontMetrics().height(), from, to);
- textRect.setY(textRect.y() - font.fontMetrics().ascent());
- IntRect trRect = enclosingIntRect(m_data->mapRect(textRect));
- RECT bmpRect;
- AlphaPaintType alphaPaintType = mustSupportAlpha ? AlphaPaintOther : AlphaPaintNone;
- if (RefPtr<SharedBitmap> bmp = m_data->getTransparentLayerBitmap(trRect, alphaPaintType, bmpRect, true, mustSupportAlpha)) {
- {
- GraphicsContext gc(0);
- gc.setBitmap(bmp);
- gc.scale(FloatSize(m_data->m_transform.a(), m_data->m_transform.d()));
- font.drawText(&gc, run, IntPoint(0, font.fontMetrics().ascent()), from, to);
- }
- unsigned key1;
- HDC memDC = bmp->getDC(&key1);
- if (memDC) {
- m_data->paintBackTransparentLayerBitmap(memDC, bmp.get(), trRect, alphaPaintType, bmpRect);
- bmp->releaseDC(memDC, key1);
- }
- }
-
- m_data->m_opacity = oldOpacity;
-}
-
-void GraphicsContext::drawText(const SimpleFontData* fontData, const GlyphBuffer& glyphBuffer,
- int from, int numGlyphs, const FloatPoint& point)
-{
- if (!m_data->m_opacity)
- return;
-
- for (;;) {
- if (!numGlyphs)
- return;
- if (isCharVisible(*glyphBuffer.glyphs(from)))
- break;
- ++from;
- --numGlyphs;
- }
-
- double scaleX = m_data->m_transform.a();
- double scaleY = m_data->m_transform.d();
-
- int height = fontData->platformData().size() * scaleY;
- int width = fontData->avgCharWidth() * scaleX;
-
- if (!height || !width)
- return;
-
- ScopeDCProvider dcProvider(m_data);
- if (!m_data->m_dc)
- return;
-
- HFONT hFont = height > 1
- ? fontData->platformData().getScaledFontHandle(height, scaleX == scaleY ? 0 : width)
- : 0;
-
- FloatPoint startPoint(point.x(), point.y() - fontData->fontMetrics().ascent());
- FloatPoint trPoint = m_data->mapPoint(startPoint);
- int y = stableRound(trPoint.y());
-
- Color color = fillColor();
- if (!color.alpha())
- return;
-
- COLORREF fontColor = RGB(color.red(), color.green(), color.blue());
-
- if (!hFont) {
- double offset = trPoint.x();
- const GlyphBufferAdvance* advance = glyphBuffer.advances(from);
- if (scaleX == 1.)
- for (int i = 1; i < numGlyphs; ++i)
- offset += (*advance++).width();
- else
- for (int i = 1; i < numGlyphs; ++i)
- offset += (*advance++).width() * scaleX;
-
- offset += width;
-
- auto hPen = adoptGDIObject(::CreatePen(PS_DASH, 1, fontColor));
- HGDIOBJ oldPen = SelectObject(m_data->m_dc, hPen.get());
-
- MoveToEx(m_data->m_dc, stableRound(trPoint.x()), y, 0);
- LineTo(m_data->m_dc, stableRound(offset), y);
-
- SelectObject(m_data->m_dc, oldPen);
- return;
- }
-
- FloatSize shadowOffset;
- float shadowBlur = 0;
- Color shadowColor;
- ColorSpace shadowColorSpace;
- bool hasShadow = textDrawingMode() == TextModeFill
- && getShadow(shadowOffset, shadowBlur, shadowColor, shadowColorSpace)
- && shadowColor.alpha();
- COLORREF shadowRGBColor;
- FloatPoint trShadowPoint;
- if (hasShadow) {
- shadowRGBColor = RGB(shadowColor.red(), shadowColor.green(), shadowColor.blue());
- trShadowPoint = m_data->mapPoint(startPoint + shadowOffset);
- }
-
- HGDIOBJ hOldFont = SelectObject(m_data->m_dc, hFont);
- COLORREF oldTextColor = GetTextColor(m_data->m_dc);
- int oldTextAlign = GetTextAlign(m_data->m_dc);
- SetTextAlign(m_data->m_dc, 0);
-
- int oldBkMode = GetBkMode(m_data->m_dc);
- SetBkMode(m_data->m_dc, TRANSPARENT);
-
- if (numGlyphs > 1) {
- double offset = trPoint.x();
- Vector<int, 256> glyphSpace(numGlyphs);
- Vector<UChar, 256> text(numGlyphs);
- int* curSpace = glyphSpace.data();
- UChar* curChar = text.data();
- const UChar* srcChar = glyphBuffer.glyphs(from);
- const UChar* const srcCharEnd = srcChar + numGlyphs;
- *curChar++ = *srcChar++;
- int firstOffset = stableRound(offset);
- int lastOffset = firstOffset;
- const GlyphBufferAdvance* advance = glyphBuffer.advances(from);
- // FIXME: ExtTextOut() can flip over each word for RTL languages, even when TA_RTLREADING is off.
- // (this can be GDI bug or font driver bug?)
- // We are not clear how it processes characters and handles specified spaces. On the other side,
- // our glyph buffer is already in the correct order for rendering. So, the solution is that we
- // call ExtTextOut() for each single character when the text contains any RTL character.
- // This solution is not perfect as it is slower than calling ExtTextOut() one time for all characters.
- // Drawing characters one by one may be too slow.
- bool drawOneByOne = false;
- if (scaleX == 1.) {
- for (; srcChar < srcCharEnd; ++srcChar) {
- offset += (*advance++).width();
- int offsetInt = stableRound(offset);
- if (isCharVisible(*srcChar)) {
- if (!drawOneByOne && u_charDirection(*srcChar) == U_RIGHT_TO_LEFT)
- drawOneByOne = true;
- *curChar++ = *srcChar;
- *curSpace++ = offsetInt - lastOffset;
- lastOffset = offsetInt;
- }
- }
- } else {
- for (; srcChar < srcCharEnd; ++srcChar) {
- offset += (*advance++).width() * scaleX;
- int offsetInt = stableRound(offset);
- if (isCharVisible(*srcChar)) {
- if (!drawOneByOne && u_charDirection(*srcChar) == U_RIGHT_TO_LEFT)
- drawOneByOne = true;
- *curChar++ = *srcChar;
- *curSpace++ = offsetInt - lastOffset;
- lastOffset = offsetInt;
- }
- }
- }
- numGlyphs = curChar - text.data();
- if (hasShadow) {
- SetTextColor(m_data->m_dc, shadowRGBColor);
- if (drawOneByOne) {
- int xShadow = firstOffset + stableRound(trShadowPoint.x() - trPoint.x());
- int yShadow = stableRound(trShadowPoint.y());
- for (int i = 0; i < numGlyphs; ++i) {
- ExtTextOut(m_data->m_dc, xShadow, yShadow, 0, NULL, text.data() + i, 1, 0);
- xShadow += glyphSpace[i];
- }
- } else
- ExtTextOut(m_data->m_dc, firstOffset + stableRound(trShadowPoint.x() - trPoint.x()), stableRound(trShadowPoint.y()), 0, NULL, text.data(), numGlyphs, glyphSpace.data());
- }
- SetTextColor(m_data->m_dc, fontColor);
- if (drawOneByOne) {
- int x = firstOffset;
- for (int i = 0; i < numGlyphs; ++i) {
- ExtTextOut(m_data->m_dc, x, y, 0, NULL, text.data() + i, 1, 0);
- x += glyphSpace[i];
- }
- } else
- ExtTextOut(m_data->m_dc, firstOffset, y, 0, NULL, text.data(), numGlyphs, glyphSpace.data());
- } else {
- UChar c = *glyphBuffer.glyphs(from);
- if (hasShadow) {
- SetTextColor(m_data->m_dc, shadowRGBColor);
- ExtTextOut(m_data->m_dc, stableRound(trShadowPoint.x()), stableRound(trShadowPoint.y()), 0, NULL, &c, 1, 0);
- }
- SetTextColor(m_data->m_dc, fontColor);
- ExtTextOut(m_data->m_dc, stableRound(trPoint.x()), y, 0, NULL, &c, 1, 0);
- }
-
- SetTextAlign(m_data->m_dc, oldTextAlign);
- SetTextColor(m_data->m_dc, oldTextColor);
- SetBkMode(m_data->m_dc, oldBkMode);
- SelectObject(m_data->m_dc, hOldFont);
-}
-
-void GraphicsContext::drawFrameControl(const IntRect& rect, unsigned type, unsigned state)
-{
- if (!m_data->m_opacity)
- return;
-
- const int boxWidthBest = 8;
- const int boxHeightBest = 8;
-
- ScopeDCProvider dcProvider(m_data);
- if (!m_data->m_dc)
- return;
-
- IntRect trRect = m_data->mapRect(rect);
- TransparentLayerDC transparentDC(m_data, trRect, &rect, 255, true);
- HDC dc = transparentDC.hdc();
- if (!dc)
- return;
- trRect.move(transparentDC.toShift());
-
- RECT rectWin = trRect;
-
- if ((rectWin.right - rectWin.left) < boxWidthBest) {
- RefPtr<SharedBitmap> bmp = SharedBitmap::create(IntSize(boxWidthBest, boxHeightBest), BitmapInfo::BitCount16, true);
- SharedBitmap::DCHolder memDC(bmp.get());
- if (memDC.get()) {
- RECT tempRect = {0, 0, boxWidthBest, boxHeightBest};
- DrawFrameControl(memDC.get(), &tempRect, type, state);
-
- ::StretchBlt(dc, rectWin.left, rectWin.top, rectWin.right - rectWin.left, rectWin.bottom - rectWin.top, memDC.get(), 0, 0, boxWidthBest, boxHeightBest, SRCCOPY);
- return;
- }
- }
-
- DrawFrameControl(dc, &rectWin, type, state);
-}
-
-void GraphicsContext::drawFocusRect(const IntRect& rect)
-{
- if (!m_data->m_opacity)
- return;
-
- ScopeDCProvider dcProvider(m_data);
- if (!m_data->m_dc)
- return;
-
- IntRect trRect = m_data->mapRect(rect);
- TransparentLayerDC transparentDC(m_data, trRect, &rect);
- HDC dc = transparentDC.hdc();
- if (!dc)
- return;
- trRect.move(transparentDC.toShift());
-
- RECT rectWin = trRect;
- DrawFocusRect(dc, &rectWin);
-}
-
-void GraphicsContext::paintTextField(const IntRect& rect, unsigned state)
-{
- if (!m_data->m_opacity)
- return;
-
- ScopeDCProvider dcProvider(m_data);
- if (!m_data->m_dc)
- return;
-
- IntRect trRect = m_data->mapRect(rect);
- TransparentLayerDC transparentDC(m_data, trRect, &rect);
- HDC dc = transparentDC.hdc();
- if (!dc)
- return;
- trRect.move(transparentDC.toShift());
-
- RECT rectWin = trRect;
- DrawEdge(dc, &rectWin, EDGE_ETCHED, BF_RECT | BF_ADJUST);
- FillRect(dc, &rectWin, reinterpret_cast<HBRUSH>(((state & DFCS_INACTIVE) ? COLOR_BTNFACE : COLOR_WINDOW) + 1));
-}
-
-void GraphicsContext::drawBitmap(SharedBitmap* bmp, const IntRect& dstRectIn, const IntRect& srcRect, ColorSpace styleColorSpace, CompositeOperator compositeOp, BlendMode blendMode)
-{
- if (!m_data->m_opacity)
- return;
-
- ScopeDCProvider dcProvider(m_data);
- if (!m_data->m_dc)
- return;
-
- IntRect dstRect = m_data->mapRect(dstRectIn);
- TransparentLayerDC transparentDC(m_data, dstRect, &dstRectIn, 255, true);
- HDC dc = transparentDC.hdc();
- if (!dc)
- return;
- dstRect.move(transparentDC.toShift());
-
- bmp->draw(dc, dstRect, srcRect, compositeOp, blendMode);
-
- if (bmp->is16bit())
- transparentDC.fillAlphaChannel();
-}
-
-void GraphicsContext::drawBitmapPattern(SharedBitmap* bmp, const FloatRect& tileRectIn, const AffineTransform& patternTransform,
- const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator op, const FloatRect& destRectIn, const IntSize& origSourceSize)
-{
- if (!m_data->m_opacity)
- return;
-
- ScopeDCProvider dcProvider(m_data);
- if (!m_data->m_dc)
- return;
-
- IntRect intDstRect = enclosingIntRect(destRectIn);
- IntRect trRect = m_data->mapRect(intDstRect);
- TransparentLayerDC transparentDC(m_data, trRect, &intDstRect, 255, true);
- HDC dc = transparentDC.hdc();
- if (!dc)
- return;
- trRect.move(transparentDC.toShift());
- FloatRect movedDstRect = m_data->m_transform.inverse().mapRect(FloatRect(trRect));
- FloatSize moved(movedDstRect.location() - destRectIn.location());
- AffineTransform transform = m_data->m_transform;
- transform.translate(moved.width(), moved.height());
-
- bmp->drawPattern(dc, transform, tileRectIn, patternTransform, phase, styleColorSpace, op, destRectIn, origSourceSize);
-
- if (!bmp->hasAlpha())
- transparentDC.fillAlphaChannel();
-}
-
-void GraphicsContext::drawIcon(HICON icon, const IntRect& dstRectIn, UINT flags)
-{
- if (!m_data->m_opacity)
- return;
-
- ScopeDCProvider dcProvider(m_data);
- if (!m_data->m_dc)
- return;
-
- IntRect dstRect = m_data->mapRect(dstRectIn);
- TransparentLayerDC transparentDC(m_data, dstRect, &dstRectIn, 255, true);
- HDC dc = transparentDC.hdc();
- if (!dc)
- return;
- dstRect.move(transparentDC.toShift());
-
- DrawIconEx(dc, dstRect.x(), dstRect.y(), icon, dstRect.width(), dstRect.height(), 0, NULL, flags);
-}
-
-void GraphicsContext::setPlatformShouldAntialias(bool)
-{
- notImplemented();
-}
-
-void GraphicsContext::setLineDash(const DashArray&, float)
-{
- notImplemented();
-}
-
-void GraphicsContext::clipPath(const Path&, WindRule)
-{
- notImplemented();
-}
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinceImageBufferDataWinceh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/graphics/wince/ImageBufferDataWince.h (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/wince/ImageBufferDataWince.h 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/graphics/wince/ImageBufferDataWince.h 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,32 +0,0 @@
</span><del>-/*
- * Copyright (C) 2009 Torch Mobile, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "SharedBitmap.h"
-
-namespace WebCore {
-
-class IntSize;
-
-class ImageBufferData {
-public:
- ImageBufferData(const IntSize&);
- RefPtr<SharedBitmap> m_bitmap;
-};
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinceImageBufferWinCEcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/graphics/wince/ImageBufferWinCE.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/wince/ImageBufferWinCE.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/graphics/wince/ImageBufferWinCE.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,247 +0,0 @@
</span><del>-/*
- * Copyright (C) 2009 Torch Mobile, Inc. All rights reserved.
- * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "config.h"
-#include "ImageBuffer.h"
-
-#include "GraphicsContext.h"
-#include "Image.h"
-#include "ImageData.h"
-#include "NotImplemented.h"
-#include "SharedBitmap.h"
-
-namespace WebCore {
-
-class BufferedImage: public Image {
-
-public:
- BufferedImage(const ImageBufferData* data)
- : m_data(data)
- {
- }
-
- virtual bool currentFrameKnownToBeOpaque() { return !m_data->m_bitmap->hasAlpha() ; }
- virtual IntSize size() const { return IntSize(m_data->m_bitmap->width(), m_data->m_bitmap->height()); }
- virtual void destroyDecodedData(bool destroyAll = true) {}
- virtual unsigned decodedSize() const { return 0; }
- virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode, ImageOrientationDescription);
- virtual void drawPattern(GraphicsContext*, const FloatRect& srcRect, const AffineTransform& patternTransform,
- const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& destRect);
-
- const ImageBufferData* m_data;
-};
-
-void BufferedImage::draw(GraphicsContext* ctxt, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator compositeOp, BlendMode blendMode, ImageOrientationDescription)
-{
- IntRect intDstRect = enclosingIntRect(dstRect);
- IntRect intSrcRect(srcRect);
- m_data->m_bitmap->draw(ctxt, intDstRect, intSrcRect, styleColorSpace, compositeOp, blendMode);
-}
-
-void BufferedImage::drawPattern(GraphicsContext* ctxt, const FloatRect& tileRectIn, const AffineTransform& patternTransform,
- const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator op, const FloatRect& destRect, BlendMode)
-{
- m_data->m_bitmap->drawPattern(ctxt, tileRectIn, patternTransform, phase, styleColorSpace, op, destRect, size());
-}
-
-ImageBufferData::ImageBufferData(const IntSize& size)
- : m_bitmap(SharedBitmap::create(size, BitmapInfo::BitCount32, false))
-{
- // http://www.w3.org/TR/2009/WD-html5-20090212/the-canvas-element.html#canvaspixelarray
- // "When the canvas is initialized it must be set to fully transparent black."
- m_bitmap->resetPixels(true);
- m_bitmap->setHasAlpha(true);
-}
-
-ImageBuffer::ImageBuffer(const IntSize& size, float resolutionScale, ColorSpace colorSpace, RenderingMode, bool& success)
- : m_data(size)
- , m_size(size)
- , m_logicalSize(size)
-{
- // FIXME: Respect resoutionScale to support high-DPI canvas.
- UNUSED_PARAM(resolutionScale);
- // FIXME: colorSpace is not used
- UNUSED_PARAM(colorSpace);
-
- m_context = adoptPtr(new GraphicsContext(0));
- m_context->setBitmap(m_data.m_bitmap);
- success = true;
-}
-
-ImageBuffer::~ImageBuffer()
-{
-}
-
-GraphicsContext* ImageBuffer::context() const
-{
- return m_context.get();
-}
-
-PassRefPtr<Image> ImageBuffer::copyImage(BackingStoreCopy copyBehavior, ScaleBehavior) const
-{
- ASSERT(copyBehavior == CopyBackingStore);
- return adoptRef(new BufferedImage(&m_data));
-}
-
-BackingStoreCopy ImageBuffer::fastCopyImageMode()
-{
- return CopyBackingStore;
-}
-
-void ImageBuffer::clip(GraphicsContext*, const FloatRect&) const
-{
- notImplemented();
-}
-
-void ImageBuffer::draw(GraphicsContext* context, ColorSpace styleColorSpace, const FloatRect& destRect, const FloatRect& srcRect,
- CompositeOperator op, BlendMode blendMode, bool useLowQualityScale)
-{
- RefPtr<Image> imageCopy = copyImage(CopyBackingStore);
- context->drawImage(imageCopy.get(), styleColorSpace, destRect, srcRect, op, blendMode, ImageOrientationDescription(), useLowQualityScale);
-}
-
-void ImageBuffer::drawPattern(GraphicsContext* context, const FloatRect& srcRect, const AffineTransform& patternTransform,
- const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator op, const FloatRect& destRect)
-{
- RefPtr<Image> imageCopy = copyImage(CopyBackingStore);
- imageCopy->drawPattern(context, srcRect, patternTransform, phase, styleColorSpace, op, destRect);
-}
-
-template <bool premultiplied>
-static PassRefPtr<Uint8ClampedArray> getImageData(const IntRect& rect, const SharedBitmap* bitmap)
-{
- RefPtr<Uint8ClampedArray> imageData = Uint8ClampedArray::createUninitialized(rect.width() * rect.height() * 4);
-
- const unsigned char* src = static_cast<const unsigned char*>(bitmap->bytes());
- if (!src)
- return imageData.release();
-
- IntRect sourceRect(0, 0, bitmap->width(), bitmap->height());
- sourceRect.intersect(rect);
- if (sourceRect.isEmpty())
- return imageData.release();
-
- unsigned char* dst = imageData->data();
- imageData->zeroFill();
- src += (sourceRect.y() * bitmap->width() + sourceRect.x()) * 4;
- dst += ((sourceRect.y() - rect.y()) * rect.width() + sourceRect.x() - rect.x()) * 4;
- int bytesToCopy = sourceRect.width() * 4;
- int srcSkip = (bitmap->width() - sourceRect.width()) * 4;
- int dstSkip = (rect.width() - sourceRect.width()) * 4;
- const unsigned char* dstEnd = dst + sourceRect.height() * rect.width() * 4;
- while (dst < dstEnd) {
- const unsigned char* dstRowEnd = dst + bytesToCopy;
- while (dst < dstRowEnd) {
- // Convert ARGB little endian to RGBA big endian
- int blue = *src++;
- int green = *src++;
- int red = *src++;
- int alpha = *src++;
- if (premultiplied) {
- *dst++ = static_cast<unsigned char>((red * alpha + 254) / 255);
- *dst++ = static_cast<unsigned char>((green * alpha + 254) / 255);
- *dst++ = static_cast<unsigned char>((blue * alpha + 254) / 255);
- *dst++ = static_cast<unsigned char>(alpha);
- } else {
- *dst++ = static_cast<unsigned char>(red);
- *dst++ = static_cast<unsigned char>(green);
- *dst++ = static_cast<unsigned char>(blue);
- *dst++ = static_cast<unsigned char>(alpha);
- ++src;
- }
- }
- src += srcSkip;
- dst += dstSkip;
- }
-
- return imageData.release();
-}
-
-PassRefPtr<Uint8ClampedArray> ImageBuffer::getUnmultipliedImageData(const IntRect& rect, CoordinateSystem) const
-{
- return getImageData<false>(rect, m_data.m_bitmap.get());
-}
-
-PassRefPtr<Uint8ClampedArray> ImageBuffer::getPremultipliedImageData(const IntRect& rect, CoordinateSystem) const
-{
- return getImageData<true>(rect, m_data.m_bitmap.get());
-}
-
-void ImageBuffer::putByteArray(Multiply multiplied, Uint8ClampedArray* source, const IntSize& sourceSize, const IntRect& sourceRect, const IntPoint& destPoint, CoordinateSystem)
-{
- SharedBitmap* bitmap = m_data.m_bitmap.get();
- unsigned char* dst = (unsigned char*)bitmap->bytes();
- if (!dst)
- return;
-
- IntRect destRect(destPoint, sourceRect.size());
- destRect.intersect(IntRect(0, 0, bitmap->width(), bitmap->height()));
-
- if (destRect.isEmpty())
- return;
-
- const unsigned char* src = source->data();
- dst += (destRect.y() * bitmap->width() + destRect.x()) * 4;
- src += (sourceRect.y() * sourceSize.width() + sourceRect.x()) * 4;
- int bytesToCopy = destRect.width() * 4;
- int dstSkip = (bitmap->width() - destRect.width()) * 4;
- int srcSkip = (sourceSize.width() - destRect.width()) * 4;
- const unsigned char* dstEnd = dst + destRect.height() * bitmap->width() * 4;
- while (dst < dstEnd) {
- const unsigned char* dstRowEnd = dst + bytesToCopy;
- while (dst < dstRowEnd) {
- // Convert RGBA big endian to ARGB little endian
- int red = *src++;
- int green = *src++;
- int blue = *src++;
- int alpha = *src++;
- if (multiplied == Premultiplied) {
- *dst++ = static_cast<unsigned char>(blue * 255 / alpha);
- *dst++ = static_cast<unsigned char>(green * 255 / alpha);
- *dst++ = static_cast<unsigned char>(red * 255 / alpha);
- *dst++ = static_cast<unsigned char>(alpha);
- } else {
- *dst++ = static_cast<unsigned char>(blue);
- *dst++ = static_cast<unsigned char>(green);
- *dst++ = static_cast<unsigned char>(red);
- *dst++ = static_cast<unsigned char>(alpha);
- }
- }
- src += srcSkip;
- dst += dstSkip;
- }
-}
-
-void ImageBuffer::platformTransformColorSpace(const Vector<int>& lookUpTable)
-{
- UNUSED_PARAM(lookUpTable);
- notImplemented();
-}
-
-String ImageBuffer::toDataURL(const String& mimeType, const double*, CoordinateSystem) const
-{
- if (!m_data.m_bitmap->bytes())
- return "data:,";
-
- notImplemented();
- return String();
-}
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinceImageWinCEcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/graphics/wince/ImageWinCE.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/wince/ImageWinCE.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/graphics/wince/ImageWinCE.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,199 +0,0 @@
</span><del>-/*
- * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
- * Copyright (C) 2007-2009 Torch Mobile Inc.
- * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
- *
- * 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 AND ITS CONTRIBUTORS "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 OR ITS 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.
- */
-
-#include "config.h"
-#include "Image.h"
-
-#include "BitmapImage.h"
-#include "GraphicsContext.h"
-#include "ImageDecoder.h"
-#include "NotImplemented.h"
-#include "SharedBuffer.h"
-#include "TransformationMatrix.h"
-#include "WinceGraphicsExtras.h"
-#include <wtf/text/WTFString.h>
-#include <wtf/win/GDIObject.h>
-
-namespace WebCore {
-
-PassNativeImagePtr ImageFrame::asNewNativeImage() const
-{
- return SharedBitmap::create(m_backingStore, m_size, hasAlpha());
-}
-
-bool FrameData::clear(bool clearMetaData)
-{
- if (clearMetaData)
- m_haveMetadata = false;
-
- if (m_frame) {
- m_frame = 0;
- return true;
- }
-
- return false;
-}
-
-bool BitmapImage::getHBITMAPOfSize(HBITMAP bmp, const IntSize* size)
-{
- if (!bmp)
- return false;
-
- BITMAP bmpInfo;
- GetObject(bmp, sizeof(BITMAP), &bmpInfo);
-
- ASSERT(bmpInfo.bmBitsPixel == 32);
- int bufferSize = bmpInfo.bmWidthBytes * bmpInfo.bmHeight;
-
- auto hdc = adoptGDIObject(::CreateCompatibleDC(0));
- HGDIOBJ hOldBmp = SelectObject(hdc.get(), bmp);
-
- {
- GraphicsContext gc(hdc.get());
-
- IntSize imageSize = BitmapImage::size();
- if (size)
- drawFrameMatchingSourceSize(&gc, FloatRect(0, 0, bmpInfo.bmWidth, bmpInfo.bmHeight), *size, ColorSpaceDeviceRGB, CompositeCopy);
- else
- draw(&gc, FloatRect(0, 0, bmpInfo.bmWidth, bmpInfo.bmHeight), FloatRect(0, 0, imageSize.width(), imageSize.height()), ColorSpaceDeviceRGB, CompositeCopy, BlendModeNormal, ImageOrientationDescription());
- }
-
- SelectObject(hdc.get(), hOldBmp);
-
- return true;
-}
-
-void BitmapImage::drawFrameMatchingSourceSize(GraphicsContext* ctxt, const FloatRect& dstRect, const IntSize& srcSize, ColorSpace styleColorSpace, CompositeOperator compositeOp)
-{
- int frames = frameCount();
- for (int i = 0; i < frames; ++i) {
- RefPtr<SharedBitmap> bmp = frameAtIndex(i);
- if (!bmp || bmp->height() != static_cast<unsigned>(srcSize.height()) || bmp->width() != static_cast<unsigned>(srcSize.width()))
- continue;
-
- size_t currentFrame = m_currentFrame;
- m_currentFrame = i;
- draw(ctxt, dstRect, FloatRect(0, 0, srcSize.width(), srcSize.height()), styleColorSpace, compositeOp, BlendModeNormal, ImageOrientationDescription());
- m_currentFrame = currentFrame;
- return;
- }
-
- // No image of the correct size was found, fallback to drawing the current frame
- IntSize imageSize = BitmapImage::size();
- draw(ctxt, dstRect, FloatRect(0, 0, imageSize.width(), imageSize.height()), styleColorSpace, compositeOp, BlendModeNormal, ImageOrientationDescription());
-}
-
-void BitmapImage::draw(GraphicsContext* ctxt, const FloatRect& dstRect, const FloatRect& srcRectIn, ColorSpace styleColorSpace, CompositeOperator compositeOp, BlendMode blendMode, ImageOrientationDescription)
-{
- if (!m_source.initialized())
- return;
-
- if (mayFillWithSolidColor())
- fillWithSolidColor(ctxt, dstRect, solidColor(), styleColorSpace, compositeOp);
- else {
- IntRect intSrcRect(srcRectIn);
- RefPtr<SharedBitmap> bmp = frameAtIndex(m_currentFrame);
- if (bmp) {
- if (bmp->width() != m_source.size().width()) {
- double scaleFactor = static_cast<double>(bmp->width()) / m_source.size().width();
-
- intSrcRect.setX(stableRound(srcRectIn.x() * scaleFactor));
- intSrcRect.setWidth(stableRound(srcRectIn.width() * scaleFactor));
- intSrcRect.setY(stableRound(srcRectIn.y() * scaleFactor));
- intSrcRect.setHeight(stableRound(srcRectIn.height() * scaleFactor));
- }
- bmp->draw(ctxt, enclosingIntRect(dstRect), intSrcRect, styleColorSpace, compositeOp, blendMode);
- }
- }
-
- startAnimation();
-}
-
-void Image::drawPattern(GraphicsContext* ctxt, const FloatRect& tileRect, const AffineTransform& patternTransform,
- const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator op, const FloatRect& destRect, BlendMode blendMode)
-{
- notImplemented();
-}
-
-void BitmapImage::drawPattern(GraphicsContext* ctxt, const FloatRect& tileRectIn, const AffineTransform& patternTransform,
- const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator op, const FloatRect& destRect)
-{
- RefPtr<SharedBitmap> bmp = nativeImageForCurrentFrame();
- if (!bmp)
- return;
-
- bmp->drawPattern(ctxt, tileRectIn, patternTransform, phase, styleColorSpace, op, destRect, m_source.size());
-}
-
-void BitmapImage::determineMinimumSubsamplingLevel() const
-{
- m_minimumSubsamplingLevel = 0;
-}
-
-void BitmapImage::checkForSolidColor()
-{
- if (m_checkedForSolidColor)
- return;
-
- if (frameCount() != 1) {
- m_isSolidColor = false;
- m_checkedForSolidColor = true;
- return;
- }
-
- RefPtr<SharedBitmap> bmp = frameAtIndex(0);
- if (!bmp || !bmp->validHeight()) {
- m_isSolidColor = false;
- return;
- }
-
- if (bmp->width() != 1 || bmp->validHeight() != 1) {
- m_isSolidColor = false;
- m_checkedForSolidColor = true;
- return;
- }
-
- m_isSolidColor = true;
-
- if (bmp->is16bit()) {
- unsigned short c = ((unsigned short *)bmp->bytes())[0];
- int r = (c >> 7) & 0xF8;
- int g = (c >> 2) & 0xF8;
- int b = (c << 3) & 0xF8;
- if (bmp->usesTransparentColor() && bmp->transparentColor() == RGB(r, g, b))
- m_solidColor = Color(r, g, b, 0);
- else
- m_solidColor = Color(r, g, b);
- } else {
- unsigned c = ((unsigned *)bmp->bytes())[0];
- m_solidColor = Color(c);
- }
-
- if (bmp->validHeight() == bmp->height())
- m_checkedForSolidColor = true;
-}
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinceMediaPlayerPrivateWinCEh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/graphics/wince/MediaPlayerPrivateWinCE.h (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/wince/MediaPlayerPrivateWinCE.h 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/graphics/wince/MediaPlayerPrivateWinCE.h 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,120 +0,0 @@
</span><del>-/*
- * Copyright (C) 2007, 2008, 2009 Apple Inc. All rights reserved.
- * Copyright (C) 2009 Torch Mobile 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 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 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.
- */
-
-#ifndef MediaPlayerPrivateWinCE_h
-#define MediaPlayerPrivateWinCE_h
-
-#if ENABLE(VIDEO)
-
-#include <wtf/Forward.h>
-#include "MediaPlayerPrivate.h"
-#include "Timer.h"
-#include <wtf/OwnPtr.h>
-
-namespace WebCore {
-
- class GraphicsContext;
- class IntSize;
- class IntRect;
-
- class MediaPlayerPrivate : public MediaPlayerPrivateInterface {
- public:
- static void registerMediaEngine(MediaEngineRegistrar);
-
- ~MediaPlayerPrivate();
-
- IntSize naturalSize() const;
- bool hasVideo() const;
-
- void load(const String& url);
- void cancelLoad();
-
- void play();
- void pause();
-
- bool paused() const;
- bool seeking() const;
-
- float duration() const;
- float currentTime() const;
- void seek(float time);
-
- void setRate(float);
- void setVolume(float);
-
- MediaPlayer::NetworkState networkState() const { return m_networkState; }
- MediaPlayer::ReadyState readyState() const { return m_readyState; }
-
- std::unique_ptr<PlatformTimeRanges> buffered() const;
- float maxTimeSeekable() const;
- // FIXME: bytesLoaded() should be replaced with didLoadingProgress() (by somebody who can find the implementation of this class).
- unsigned bytesLoaded() const;
- unsigned totalBytes() const;
-
- void setVisible(bool);
- void setSize(const IntSize&);
-
- void loadStateChanged();
- void didEnd();
-
- void paint(GraphicsContext*, const IntRect&);
-
- private:
- MediaPlayerPrivate(MediaPlayer*);
-
- void updateStates();
- void doSeek();
- void cancelSeek();
- void seekTimerFired(Timer<MediaPlayerPrivate>*);
- float maxTimeLoaded() const;
- void sawUnsupportedTracks();
-
- // engine support
- static PassOwnPtr<MediaPlayerPrivateInterface> create(MediaPlayer*);
- static void getSupportedTypes(HashSet<String>& types);
- static MediaPlayer::SupportsType supportsType(const MediaEngineSupportParameters&);
- static bool isAvailable();
-
- virtual String engineDescription() const { return "WinCE"; }
-
- MediaPlayer* m_player;
- float m_seekTo;
- float m_endTime;
- Timer<MediaPlayerPrivate> m_seekTimer;
- MediaPlayer::NetworkState m_networkState;
- MediaPlayer::ReadyState m_readyState;
- unsigned m_enabledTrackCount;
- unsigned m_totalTrackCount;
- bool m_hasUnsupportedTracks;
- bool m_startedPlaying;
- bool m_isStreaming;
- };
-
-}
-
-#endif // ENABLE(VIDEO)
-
-#endif // MediaPlayerPrivateWinCE_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinceMediaPlayerProxycpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/graphics/wince/MediaPlayerProxy.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/wince/MediaPlayerProxy.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/graphics/wince/MediaPlayerProxy.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,145 +0,0 @@
</span><del>-/*
- * Copyright (C) 2009 Torch Mobile, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#if ENABLE(VIDEO)
-
-#include "config.h"
-#include "MediaPlayerProxy.h"
-
-#include "BridgeJSC.h"
-#include "DocumentLoader.h"
-#include "HTMLPlugInElement.h"
-#include "HTMLVideoElement.h"
-#include "JSDOMBinding.h"
-#include "JSPluginElementFunctions.h"
-#include "MediaPlayer.h"
-#include "Node.h"
-#include "PluginView.h"
-#include "RenderPartObject.h"
-#include "RenderWidget.h"
-#include "Widget.h"
-#include "c_class.h"
-#include "c_instance.h"
-#include "c_runtime.h"
-#include "npruntime_impl.h"
-#include <runtime/Identifier.h>
-#include <wtf/text/WTFString.h>
-
-using namespace JSC;
-
-namespace WebCore {
-
-using namespace Bindings;
-using namespace HTMLNames;
-
-WebMediaPlayerProxy::WebMediaPlayerProxy(MediaPlayer* player)
- : m_mediaPlayer(player)
- , m_init(false)
- , m_hasSentResponseToPlugin(false)
-{
- if (!m_init)
- initEngine();
-}
-
-WebMediaPlayerProxy::~WebMediaPlayerProxy()
-{
- m_instance.release();
-}
-
-ScriptInstance WebMediaPlayerProxy::pluginInstance()
-{
- if (!m_instance) {
- RenderObject* r = element()->renderer();
- if (!r || !r->isWidget())
- return 0;
-
- Frame* frame = element()->document().frame();
-
- RenderWidget* renderWidget = static_cast<RenderWidget*>(element()->renderer());
- if (renderWidget && renderWidget->widget())
- m_instance = frame->script().createScriptInstanceForWidget(renderWidget->widget());
- }
-
- return m_instance;
-}
-
-void WebMediaPlayerProxy::load(const String& url)
-{
- if (!m_init)
- initEngine();
- if (m_init)
- invokeMethod("play");
-}
-
-void WebMediaPlayerProxy::initEngine()
-{
- HTMLMediaElement* element = toHTMLMediaElement(m_mediaPlayer->mediaPlayerClient());
- String url = element->initialURL();
-
- if (url.isEmpty())
- return;
-
- Frame* frame = element->document().frame();
- Vector<String> paramNames;
- Vector<String> paramValues;
- String serviceType;
-
- // add all attributes set on the embed object
- if (element->hasAttributes()) {
- for (unsigned i = 0; i < element->attributeCount(); ++i) {
- Attribute* it = element->attributeItem(i);
- paramNames.append(it->name().localName().string());
- paramValues.append(it->value().string());
- }
- }
- serviceType = "application/x-mplayer2";
- frame->loader()->subframeLoader()->requestObject(static_cast<RenderPartObject*>(element->renderer()), url, nullAtom, serviceType, paramNames, paramValues);
- m_init = true;
-
-}
-
-HTMLMediaElement* WebMediaPlayerProxy::element()
-{
- return toHTMLMediaElement(m_mediaPlayer->mediaPlayerClient());
-
-}
-
-void WebMediaPlayerProxy::invokeMethod(const String& methodName)
-{
- Frame* frame = element()->document().frame();
- RootObject* root = frame->script().bindingRootObject();
- if (!root)
- return;
- ExecState *exec = root->globalObject()->globalExec();
- Instance* instance = pluginInstance().get();
- if (!instance)
- return;
-
- instance->begin();
- Class *aClass = instance->getClass();
- Identifier iden(exec, methodName);
- MethodList methodList = aClass->methodsNamed(iden, instance);
- ArgList args;
- instance->invokeMethod(exec, methodList , args);
- instance->end();
-}
-
-}
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinceMediaPlayerProxyh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/graphics/wince/MediaPlayerProxy.h (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/wince/MediaPlayerProxy.h 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/graphics/wince/MediaPlayerProxy.h 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,69 +0,0 @@
</span><del>-/*
- * Copyright (C) 2009 Torch Mobile, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-
-#ifndef MediaPlayerProxy_h
-#define MediaPlayerProxy_h
-
-#if ENABLE(VIDEO)
-
-#include <wtf/Forward.h>
-
-namespace WebCore {
-
- class IntRect;
- class IntSize;
- class MediaPlayer;
- class PluginView;
- class HTMLMediaElement;
-
- enum MediaPlayerProxyNotificationType {
- MediaPlayerNotificationPlayPauseButtonPressed,
- Idle,
- Loading,
- Loaded,
- FormatError,
- NetworkError,
- DecodeError
- };
-
- class WebMediaPlayerProxy {
- public:
- WebMediaPlayerProxy(MediaPlayer* player);
- ~WebMediaPlayerProxy();
-
- MediaPlayer* mediaPlayer() {return m_mediaPlayer;}
- void initEngine();
- void load(const String& url);
- HTMLMediaElement* element();
- void invokeMethod(const String& methodName);
- RefPtr<JSC::Bindings::Instance> pluginInstance();
-
- private:
- MediaPlayer* m_mediaPlayer;
- bool m_init;
- WebCore::PluginView* m_pluginView;
- bool m_hasSentResponseToPlugin;
- ScriptInstance m_instance;
- };
-
-}
-#endif // ENABLE(VIDEO)
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswincePathWinCEcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/graphics/wince/PathWinCE.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/wince/PathWinCE.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/graphics/wince/PathWinCE.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,168 +0,0 @@
</span><del>-/*
- * Copyright (C) 2007-2009 Torch Mobile, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "config.h"
-#include "Path.h"
-
-#include "AffineTransform.h"
-#include "FloatRect.h"
-#include "NotImplemented.h"
-#include "PlatformPathWinCE.h"
-#include <wtf/OwnPtr.h>
-#include <wtf/text/WTFString.h>
-
-namespace WebCore {
-
-Path::Path()
- : m_path(new PlatformPath())
-{
-}
-
-Path::Path(const Path& other)
- : m_path(new PlatformPath(*other.m_path))
-{
-}
-
-Path::~Path()
-{
- delete m_path;
-}
-
-Path& Path::operator=(const Path& other)
-{
- if (&other != this) {
- delete m_path;
- m_path = new PlatformPath(*other.m_path);
- }
- return *this;
-}
-
-bool Path::contains(const FloatPoint& point, WindRule rule) const
-{
- return m_path->contains(point, rule);
-}
-
-void Path::translate(const FloatSize& size)
-{
- m_path->translate(size);
-}
-
-FloatRect Path::boundingRect() const
-{
- return m_path->boundingRect();
-}
-
-void Path::moveTo(const FloatPoint& point)
-{
- m_path->moveTo(point);
-}
-
-void Path::addLineTo(const FloatPoint& point)
-{
- m_path->addLineTo(point);
-}
-
-void Path::addQuadCurveTo(const FloatPoint& cp, const FloatPoint& p)
-{
- m_path->addQuadCurveTo(cp, p);
-}
-
-void Path::addBezierCurveTo(const FloatPoint& cp1, const FloatPoint& cp2, const FloatPoint& p)
-{
- m_path->addBezierCurveTo(cp1, cp2, p);
-}
-
-void Path::addArcTo(const FloatPoint& p1, const FloatPoint& p2, float radius)
-{
- m_path->addArcTo(p1, p2, radius);
-}
-
-void Path::closeSubpath()
-{
- m_path->closeSubpath();
-}
-
-void Path::addArc(const FloatPoint& p, float r, float sar, float ear, bool anticlockwise)
-{
- m_path->addEllipse(p, r, r, sar, ear, anticlockwise);
-}
-
-void Path::addRect(const FloatRect& r)
-{
- m_path->addRect(r);
-}
-
-void Path::addEllipse(const FloatRect& r)
-{
- m_path->addEllipse(r);
-}
-
-void Path::addPath(const Path&, const AffineTransform&)
-{
- notImplemented();
-}
-
-void Path::clear()
-{
- m_path->clear();
-}
-
-bool Path::isEmpty() const
-{
- return m_path->isEmpty();
-}
-
-void Path::apply(void* info, PathApplierFunction function) const
-{
- m_path->apply(info, function);
-}
-
-void Path::transform(const AffineTransform& t)
-{
- m_path->transform(t);
-}
-
-FloatRect Path::strokeBoundingRect(StrokeStyleApplier*) const
-{
- notImplemented();
- return FloatRect();
-}
-
-bool Path::strokeContains(StrokeStyleApplier*, const FloatPoint&) const
-{
- notImplemented();
- return false;
-}
-
-bool Path::hasCurrentPoint() const
-{
- // Not sure if this is correct. At the meantime, we do what other ports
- // do.
- // See https://bugs.webkit.org/show_bug.cgi?id=27266,
- // https://bugs.webkit.org/show_bug.cgi?id=27187, and
- // http://trac.webkit.org/changeset/45873
- return !isEmpty();
-}
-
-FloatPoint Path::currentPoint() const
-{
- return m_path->lastPoint();
-}
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswincePlatformPathWinCEcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/graphics/wince/PlatformPathWinCE.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/wince/PlatformPathWinCE.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/graphics/wince/PlatformPathWinCE.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,772 +0,0 @@
</span><del>-/*
- * Copyright (C) 2007-2009 Torch Mobile, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "config.h"
-#include "PlatformPathWinCE.h"
-
-#include "AffineTransform.h"
-#include "FloatRect.h"
-#include "GraphicsContext.h"
-#include "Path.h"
-#include "WinCEGraphicsExtras.h"
-#include <wtf/MathExtras.h>
-#include <wtf/OwnPtr.h>
-#include <wtf/text/WTFString.h>
-
-#include <windows.h>
-
-namespace WebCore {
-
-// Implemented in GraphicsContextWinCE.cpp
-void getEllipsePointByAngle(double angle, double a, double b, float& x, float& y);
-
-static void quadCurve(int segments, Vector<PathPoint>& pts, const PathPoint* control)
-{
- const float step = 1.0 / segments;
- register float tA = 0.0;
- register float tB = 1.0;
-
- float c1x = control[0].x();
- float c1y = control[0].y();
- float c2x = control[1].x();
- float c2y = control[1].y();
- float c3x = control[2].x();
- float c3y = control[2].y();
-
- const int offset = pts.size();
- pts.resize(offset + segments);
- PathPoint pp;
- pp.m_x = c1x;
- pp.m_y = c1y;
-
- for (int i = 1; i < segments; ++i) {
- tA += step;
- tB -= step;
-
- const float a = tB * tB;
- const float b = 2.0 * tA * tB;
- const float c = tA * tA;
-
- pp.m_x = c1x * a + c2x * b + c3x * c;
- pp.m_y = c1y * a + c2y * b + c3y * c;
-
- pts[offset + i - 1] = pp;
- }
-
- pp.m_x = c3x;
- pp.m_y = c3y;
- pts[offset + segments - 1] = pp;
-}
-
-static inline void bezier(int segments, Vector<PathPoint>& pts, const PathPoint* control)
-{
- const float step = 1.0 / segments;
- register float tA = 0.0;
- register float tB = 1.0;
-
- float c1x = control[0].x();
- float c1y = control[0].y();
- float c2x = control[1].x();
- float c2y = control[1].y();
- float c3x = control[2].x();
- float c3y = control[2].y();
- float c4x = control[3].x();
- float c4y = control[3].y();
-
- const int offset = pts.size();
- pts.resize(offset + segments);
- PathPoint pp;
- pp.m_x = c1x;
- pp.m_y = c1y;
-
- for (int i = 1; i < segments; ++i) {
- tA += step;
- tB -= step;
- const float tAsq = tA * tA;
- const float tBsq = tB * tB;
-
- const float a = tBsq * tB;
- const float b = 3.0 * tA * tBsq;
- const float c = 3.0 * tB * tAsq;
- const float d = tAsq * tA;
-
- pp.m_x = c1x * a + c2x * b + c3x * c + c4x * d;
- pp.m_y = c1y * a + c2y * b + c3y * c + c4y * d;
-
- pts[offset + i - 1] = pp;
- }
-
- pp.m_x = c4x;
- pp.m_y = c4y;
- pts[offset + segments - 1] = pp;
-}
-
-static bool containsPoint(const FloatRect& r, const FloatPoint& p)
-{
- return p.x() >= r.x() && p.y() >= r.y() && p.x() < r.maxX() && p.y() < r.maxY();
-}
-
-static void normalizeAngle(float& angle)
-{
- angle = fmod(angle, 2 * piFloat);
- if (angle < 0)
- angle += 2 * piFloat;
- if (angle < 0.00001f)
- angle = 0;
-}
-
-static void transformArcPoint(float& x, float& y, const FloatPoint& c)
-{
- x += c.x();
- y += c.y();
-}
-
-static void inflateRectToContainPoint(FloatRect& r, float x, float y)
-{
- if (r.isEmpty()) {
- r.setX(x);
- r.setY(y);
- r.setSize(FloatSize(1, 1));
- return;
- }
- if (x < r.x()) {
- r.setWidth(r.maxX() - x);
- r.setX(x);
- } else {
- float w = x - r.x() + 1;
- if (w > r.width())
- r.setWidth(w);
- }
- if (y < r.y()) {
- r.setHeight(r.maxY() - y);
- r.setY(y);
- } else {
- float h = y - r.y() + 1;
- if (h > r.height())
- r.setHeight(h);
- }
-}
-
-// return 0-based value: 0 - first Quadrant ( 0 - 90 degree)
-static inline int quadrant(const PathPoint& point, const PathPoint& origin)
-{
- return point.m_x < origin.m_x ?
- (point.m_y < origin.m_y ? 2 : 1)
- : (point.m_y < origin.m_y ? 3 : 0);
-}
-
-static inline bool isQuadrantOnLeft(int q) { return q == 1 || q == 2; }
-static inline bool isQuadrantOnRight(int q) { return q == 0 || q == 3; }
-static inline bool isQuadrantOnTop(int q) { return q == 2 || q == 3; }
-static inline bool isQuadrantOnBottom(int q) { return q == 0 || q == 1; }
-
-static inline int nextQuadrant(int q) { return q == 3 ? 0 : q + 1; }
-static inline int quadrantDiff(int q1, int q2)
-{
- int d = q1 - q2;
- while (d < 0)
- d += 4;
- return d;
-}
-
-struct PathVector {
- float m_x;
- float m_y;
-
- PathVector() : m_x(0), m_y(0) {}
- PathVector(float x, float y) : m_x(x), m_y(y) {}
- double angle() const { return atan2(m_y, m_x); }
- operator double () const { return angle(); }
- double length() const { return _hypot(m_x, m_y); }
-};
-
-PathVector operator-(const PathPoint& p1, const PathPoint& p2)
-{
- return PathVector(p1.m_x - p2.m_x, p1.m_y - p2.m_y);
-}
-
-static void addArcPoint(PathPolygon& poly, const PathPoint& center, const PathPoint& radius, double angle)
-{
- PathPoint p;
- getEllipsePointByAngle(angle, radius.m_x, radius.m_y, p.m_x, p.m_y);
- transformArcPoint(p.m_x, p.m_y, center);
- if (poly.isEmpty() || poly.last() != p)
- poly.append(p);
-}
-
-static void addArcPoints(PathPolygon& poly, const PlatformPathElement::ArcTo& data)
-{
- const PathPoint& startPoint = poly.last();
- double curAngle = startPoint - data.m_center;
- double endAngle = data.m_end - data.m_center;
- double angleStep = 2. / std::max(data.m_radius.m_x, data.m_radius.m_y);
- if (data.m_clockwise) {
- if (endAngle <= curAngle || startPoint == data.m_end)
- endAngle += 2 * piDouble;
- } else {
- angleStep = -angleStep;
- if (endAngle >= curAngle || startPoint == data.m_end)
- endAngle -= 2 * piDouble;
- }
-
- for (curAngle += angleStep; data.m_clockwise ? curAngle < endAngle : curAngle > endAngle; curAngle += angleStep)
- addArcPoint(poly, data.m_center, data.m_radius, curAngle);
-
- if (poly.isEmpty() || poly.last() != data.m_end)
- poly.append(data.m_end);
-}
-
-static void drawPolygons(HDC dc, const Vector<PathPolygon>& polygons, bool fill, const AffineTransform* transformation)
-{
- for (Vector<PathPolygon>::const_iterator i = polygons.begin(); i != polygons.end(); ++i) {
- int npoints = i->size();
- if (!npoints)
- continue;
-
- POINT* winPoints = 0;
- if (fill) {
- if (npoints > 2)
- winPoints = new POINT[npoints + 1];
- } else
- winPoints = new POINT[npoints];
-
- if (winPoints) {
- if (transformation) {
- for (int i2 = 0; i2 < npoints; ++i2) {
- FloatPoint trPoint = transformation->mapPoint(i->at(i2));
- winPoints[i2].x = stableRound(trPoint.x());
- winPoints[i2].y = stableRound(trPoint.y());
- }
- } else {
- for (int i2 = 0; i2 < npoints; ++i2) {
- winPoints[i2].x = stableRound(i->at(i2).x());
- winPoints[i2].y = stableRound(i->at(i2).y());
- }
- }
-
- if (fill && winPoints[npoints - 1] != winPoints[0]) {
- winPoints[npoints].x = winPoints[0].x;
- winPoints[npoints].y = winPoints[0].y;
- ++npoints;
- }
-
- if (fill)
- ::Polygon(dc, winPoints, npoints);
- else
- ::Polyline(dc, winPoints, npoints);
- delete[] winPoints;
- }
- }
-}
-
-
-int PlatformPathElement::numControlPoints() const
-{
- switch (m_type) {
- case PathMoveTo:
- case PathLineTo:
- return 1;
- case PathQuadCurveTo:
- case PathArcTo:
- return 2;
- case PathBezierCurveTo:
- return 3;
- default:
- ASSERT(m_type == PathCloseSubpath);
- return 0;
- }
-}
-
-int PlatformPathElement::numPoints() const
-{
- switch (m_type) {
- case PathMoveTo:
- case PathLineTo:
- case PathArcTo:
- return 1;
- case PathQuadCurveTo:
- return 2;
- case PathBezierCurveTo:
- return 3;
- default:
- ASSERT(m_type == PathCloseSubpath);
- return 0;
- }
-}
-
-void PathPolygon::move(const FloatSize& offset)
-{
- for (Vector<PathPoint>::iterator i = begin(); i < end(); ++i)
- i->move(offset);
-}
-
-void PathPolygon::transform(const AffineTransform& t)
-{
- for (Vector<PathPoint>::iterator i = begin(); i < end(); ++i)
- *i = t.mapPoint(*i);
-}
-
-bool PathPolygon::contains(const FloatPoint& point) const
-{
- if (size() < 3)
- return false;
-
- // Test intersections between the polygon and the vertical line: x = point.x()
-
- int intersected = 0;
- const PathPoint* point1 = &last();
- Vector<PathPoint>::const_iterator last = end();
- // wasNegative: -1 means unknown, 0 means false, 1 means true.
- int wasNegative = -1;
- for (Vector<PathPoint>::const_iterator i = begin(); i != last; ++i) {
- const PathPoint& point2 = *i;
- if (point1->x() != point.x()) {
- if (point2.x() == point.x()) {
- // We are getting on the vertical line
- wasNegative = point1->x() < point.x() ? 1 : 0;
- } else if (point2.x() < point.x() != point1->x() < point.x()) {
- float y = (point2.y() - point1->y()) / (point2.x() - point1->x()) * (point.x() - point1->x()) + point1->y();
- if (y >= point.y())
- ++intersected;
- }
- } else {
- // We were on the vertical line
-
- // handle special case
- if (point1->y() == point.y())
- return true;
-
- if (point1->y() > point.y()) {
- if (point2.x() == point.x()) {
- // see if the point is on this segment
- if (point2.y() <= point.y())
- return true;
-
- // We are still on the line
- } else {
- // We are leaving the line now.
- // We have to get back to see which side we come from. If we come from
- // the same side we are leaving, no intersection should be counted
- if (wasNegative < 0) {
- Vector<PathPoint>::const_iterator jLast = i;
- Vector<PathPoint>::const_iterator j = i;
- do {
- if (j == begin())
- j = last;
- else
- --j;
- if (j->x() != point.x()) {
- if (j->x() > point.x())
- wasNegative = 0;
- else
- wasNegative = 1;
- break;
- }
- } while (j != jLast);
-
- if (wasNegative < 0)
- return false;
- }
- if (wasNegative ? point2.x() > point.x() : point2.x() < point.x())
- ++intersected;
- }
- } else if (point2.x() == point.x() && point2.y() >= point.y())
- return true;
- }
- point1 = &point2;
- }
-
- return intersected & 1;
-}
-
-void PlatformPathElement::move(const FloatSize& offset)
-{
- int n = numControlPoints();
- for (int i = 0; i < n; ++i)
- m_data.m_points[i].move(offset);
-}
-
-void PlatformPathElement::transform(const AffineTransform& t)
-{
- int n = numControlPoints();
- for (int i = 0; i < n; ++i) {
- FloatPoint p = t.mapPoint(m_data.m_points[i]);
- m_data.m_points[i].set(p.x(), p.y());
- }
-}
-
-void PlatformPathElement::inflateRectToContainMe(FloatRect& r, const FloatPoint& lastPoint) const
-{
- if (m_type == PathArcTo) {
- const ArcTo& data = m_data.m_arcToData;
- PathPoint startPoint;
- startPoint = lastPoint;
- PathPoint endPoint = data.m_end;
- if (!data.m_clockwise)
- std::swap(startPoint, endPoint);
-
- int q0 = quadrant(startPoint, data.m_center);
- int q1 = quadrant(endPoint, data.m_center);
- bool containsExtremes[4] = { false }; // bottom, left, top, right
- static const PathPoint extremeVectors[4] = { { 0, 1 }, { -1, 0 }, { 0, -1 }, { 1, 0 } };
- if (q0 == q1) {
- if (startPoint.m_x == endPoint.m_x || isQuadrantOnBottom(q0) != startPoint.m_x > endPoint.m_x) {
- for (int i = 0; i < 4; ++i)
- containsExtremes[i] = true;
- }
- } else {
- int extreme = q0;
- int diff = quadrantDiff(q1, q0);
- for (int i = 0; i < diff; ++i) {
- containsExtremes[extreme] = true;
- extreme = nextQuadrant(extreme);
- }
- }
-
- inflateRectToContainPoint(r, startPoint.m_x, startPoint.m_y);
- inflateRectToContainPoint(r, endPoint.m_x, endPoint.m_y);
- for (int i = 0; i < 4; ++i) {
- if (containsExtremes[i])
- inflateRectToContainPoint(r, data.m_center.m_x + data.m_radius.m_x * extremeVectors[i].m_x, data.m_center.m_y + data.m_radius.m_y * extremeVectors[i].m_y);
- }
- } else {
- int n = numPoints();
- for (int i = 0; i < n; ++i)
- inflateRectToContainPoint(r, m_data.m_points[i].m_x, m_data.m_points[i].m_y);
- }
-}
-
-PathElementType PlatformPathElement::type() const
-{
- switch (m_type) {
- case PathMoveTo:
- return PathElementMoveToPoint;
- case PathLineTo:
- return PathElementAddLineToPoint;
- case PathArcTo:
- // FIXME: there's no arcTo type for PathElement
- return PathElementAddLineToPoint;
- // return PathElementAddQuadCurveToPoint;
- case PathQuadCurveTo:
- return PathElementAddQuadCurveToPoint;
- case PathBezierCurveTo:
- return PathElementAddCurveToPoint;
- default:
- ASSERT(m_type == PathCloseSubpath);
- return PathElementCloseSubpath;
- }
-}
-
-PlatformPath::PlatformPath()
- : m_penLifted(true)
-{
- m_currentPoint.clear();
-}
-
-void PlatformPath::ensureSubpath()
-{
- if (m_penLifted) {
- m_penLifted = false;
- m_subpaths.append(PathPolygon());
- m_subpaths.last().append(m_currentPoint);
- } else
- ASSERT(!m_subpaths.isEmpty());
-}
-
-void PlatformPath::addToSubpath(const PlatformPathElement& e)
-{
- if (e.platformType() == PlatformPathElement::PathMoveTo) {
- m_penLifted = true;
- m_currentPoint = e.pointAt(0);
- } else if (e.platformType() == PlatformPathElement::PathCloseSubpath) {
- m_penLifted = true;
- if (!m_subpaths.isEmpty()) {
- if (m_currentPoint != m_subpaths.last()[0]) {
- // According to W3C, we have to draw a line from current point to the initial point
- m_subpaths.last().append(m_subpaths.last()[0]);
- m_currentPoint = m_subpaths.last()[0];
- }
- } else
- m_currentPoint.clear();
- } else {
- ensureSubpath();
- switch (e.platformType()) {
- case PlatformPathElement::PathLineTo:
- m_subpaths.last().append(e.pointAt(0));
- break;
- case PlatformPathElement::PathArcTo:
- addArcPoints(m_subpaths.last(), e.arcTo());
- break;
- case PlatformPathElement::PathQuadCurveTo:
- {
- PathPoint control[] = {
- m_currentPoint,
- e.pointAt(0),
- e.pointAt(1),
- };
- // FIXME: magic number?
- quadCurve(50, m_subpaths.last(), control);
- }
- break;
- case PlatformPathElement::PathBezierCurveTo:
- {
- PathPoint control[] = {
- m_currentPoint,
- e.pointAt(0),
- e.pointAt(1),
- e.pointAt(2),
- };
- // FIXME: magic number?
- bezier(100, m_subpaths.last(), control);
- }
- break;
- default:
- ASSERT_NOT_REACHED();
- break;
- }
- m_currentPoint = m_subpaths.last().last();
- }
-}
-
-void PlatformPath::append(const PlatformPathElement& e)
-{
- e.inflateRectToContainMe(m_boundingRect, lastPoint());
- addToSubpath(e);
- m_elements.append(e);
-}
-
-void PlatformPath::append(const PlatformPath& p)
-{
- const PlatformPathElements& e = p.elements();
- for (PlatformPathElements::const_iterator it(e.begin()); it != e.end(); ++it) {
- addToSubpath(*it);
- it->inflateRectToContainMe(m_boundingRect, lastPoint());
- m_elements.append(*it);
- }
-}
-
-void PlatformPath::clear()
-{
- m_elements.clear();
- m_boundingRect = FloatRect();
- m_subpaths.clear();
- m_currentPoint.clear();
- m_penLifted = true;
-}
-
-void PlatformPath::strokePath(HDC dc, const AffineTransform* transformation) const
-{
- drawPolygons(dc, m_subpaths, false, transformation);
-}
-
-void PlatformPath::fillPath(HDC dc, const AffineTransform* transformation) const
-{
- HGDIOBJ oldPen = SelectObject(dc, GetStockObject(NULL_PEN));
- drawPolygons(dc, m_subpaths, true, transformation);
- SelectObject(dc, oldPen);
-}
-
-void PlatformPath::translate(const FloatSize& size)
-{
- for (PlatformPathElements::iterator it(m_elements.begin()); it != m_elements.end(); ++it)
- it->move(size);
-
- m_boundingRect.move(size);
- for (Vector<PathPolygon>::iterator it = m_subpaths.begin(); it != m_subpaths.end(); ++it)
- it->move(size);
-}
-
-void PlatformPath::transform(const AffineTransform& t)
-{
- for (PlatformPathElements::iterator it(m_elements.begin()); it != m_elements.end(); ++it)
- it->transform(t);
-
- m_boundingRect = t.mapRect(m_boundingRect);
- for (Vector<PathPolygon>::iterator it = m_subpaths.begin(); it != m_subpaths.end(); ++it)
- it->transform(t);
-}
-
-bool PlatformPath::contains(const FloatPoint& point, WindRule rule) const
-{
- // optimization: check the bounding rect first
- if (!containsPoint(m_boundingRect, point))
- return false;
-
- for (Vector<PathPolygon>::const_iterator i = m_subpaths.begin(); i != m_subpaths.end(); ++i) {
- if (i->contains(point))
- return true;
- }
-
- return false;
-}
-
-void PlatformPath::moveTo(const FloatPoint& point)
-{
- PlatformPathElement::MoveTo data = { { point.x(), point.y() } };
- PlatformPathElement pe(data);
- append(pe);
-}
-
-void PlatformPath::addLineTo(const FloatPoint& point)
-{
- PlatformPathElement::LineTo data = { { point.x(), point.y() } };
- PlatformPathElement pe(data);
- append(pe);
-}
-
-void PlatformPath::addQuadCurveTo(const FloatPoint& cp, const FloatPoint& p)
-{
- PlatformPathElement::QuadCurveTo data = { { cp.x(), cp.y() }, { p.x(), p.y() } };
- PlatformPathElement pe(data);
- append(pe);
-}
-
-void PlatformPath::addBezierCurveTo(const FloatPoint& cp1, const FloatPoint& cp2, const FloatPoint& p)
-{
- PlatformPathElement::BezierCurveTo data = { { cp1.x(), cp1.y() }, { cp2.x(), cp2.y() }, { p.x(), p.y() } };
- PlatformPathElement pe(data);
- append(pe);
-}
-
-void PlatformPath::addArcTo(const FloatPoint& fp1, const FloatPoint& fp2, float radius)
-{
- const PathPoint& p0 = m_currentPoint;
- PathPoint p1;
- p1 = fp1;
- PathPoint p2;
- p2 = fp2;
- if (!radius || p0 == p1 || p1 == p2) {
- addLineTo(p1);
- return;
- }
-
- PathVector v01 = p0 - p1;
- PathVector v21 = p2 - p1;
-
- // sin(A - B) = sin(A) * cos(B) - sin(B) * cos(A)
- double cross = v01.m_x * v21.m_y - v01.m_y * v21.m_x;
-
- if (fabs(cross) < 1E-10) {
- // on one line
- addLineTo(p1);
- return;
- }
-
- double d01 = v01.length();
- double d21 = v21.length();
- double angle = (piDouble - fabs(asin(cross / (d01 * d21)))) * 0.5;
- double span = radius * tan(angle);
- double rate = span / d01;
- PathPoint startPoint;
- startPoint.m_x = p1.m_x + v01.m_x * rate;
- startPoint.m_y = p1.m_y + v01.m_y * rate;
-
- addLineTo(startPoint);
-
- PathPoint endPoint;
- rate = span / d21;
- endPoint.m_x = p1.m_x + v21.m_x * rate;
- endPoint.m_y = p1.m_y + v21.m_y * rate;
-
- PathPoint midPoint;
- midPoint.m_x = (startPoint.m_x + endPoint.m_x) * 0.5;
- midPoint.m_y = (startPoint.m_y + endPoint.m_y) * 0.5;
-
- PathVector vm1 = midPoint - p1;
- double dm1 = vm1.length();
- double d = _hypot(radius, span);
-
- PathPoint centerPoint;
- rate = d / dm1;
- centerPoint.m_x = p1.m_x + vm1.m_x * rate;
- centerPoint.m_y = p1.m_y + vm1.m_y * rate;
-
- PlatformPathElement::ArcTo data = {
- endPoint,
- centerPoint,
- { radius, radius },
- cross < 0
- };
- PlatformPathElement pe(data);
- append(pe);
-}
-
-void PlatformPath::closeSubpath()
-{
- PlatformPathElement pe;
- append(pe);
-}
-
-// add a circular arc centred at p with radius r from start angle sar (radians) to end angle ear
-void PlatformPath::addEllipse(const FloatPoint& p, float a, float b, float sar, float ear, bool anticlockwise)
-{
- float startX, startY, endX, endY;
-
- normalizeAngle(sar);
- normalizeAngle(ear);
-
- getEllipsePointByAngle(sar, a, b, startX, startY);
- getEllipsePointByAngle(ear, a, b, endX, endY);
-
- transformArcPoint(startX, startY, p);
- transformArcPoint(endX, endY, p);
-
- FloatPoint start(startX, startY);
- moveTo(start);
-
- PlatformPathElement::ArcTo data = { { endX, endY }, { p.x(), p.y() }, { a, b }, !anticlockwise };
- PlatformPathElement pe(data);
- append(pe);
-}
-
-
-void PlatformPath::addRect(const FloatRect& r)
-{
- moveTo(r.location());
-
- float right = r.maxX() - 1;
- float bottom = r.maxY() - 1;
- addLineTo(FloatPoint(right, r.y()));
- addLineTo(FloatPoint(right, bottom));
- addLineTo(FloatPoint(r.x(), bottom));
- addLineTo(r.location());
-}
-
-void PlatformPath::addEllipse(const FloatRect& r)
-{
- FloatSize radius(r.width() * 0.5, r.height() * 0.5);
- addEllipse(r.location() + radius, radius.width(), radius.height(), 0, 0, true);
-}
-
-void PlatformPath::apply(void* info, PathApplierFunction function) const
-{
- PathElement pelement;
- FloatPoint points[3];
- pelement.points = points;
-
- for (PlatformPathElements::const_iterator it(m_elements.begin()); it != m_elements.end(); ++it) {
- pelement.type = it->type();
- int n = it->numPoints();
- for (int i = 0; i < n; ++i)
- points[i] = it->pointAt(i);
- function(info, &pelement);
- }
-}
-
-} // namespace Webcore
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswincePlatformPathWinCEh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/graphics/wince/PlatformPathWinCE.h (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/wince/PlatformPathWinCE.h 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/graphics/wince/PlatformPathWinCE.h 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,183 +0,0 @@
</span><del>-/*
- * Copyright (C) 2007-2009 Torch Mobile, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef PlatformPathWinCE_h
-#define PlatformPathWinCE_h
-
-#include "FloatPoint.h"
-#include "FloatRect.h"
-#include "Path.h"
-#include <windows.h>
-#include <wtf/Vector.h>
-
-namespace WebCore {
-
- class GraphicsContext;
-
- struct PathPoint {
- float m_x;
- float m_y;
- const float& x() const { return m_x; }
- const float& y() const { return m_y; }
- void set(float x, float y)
- {
- m_x = x;
- m_y = y;
- };
- operator FloatPoint() const { return FloatPoint(m_x, m_y); }
- void move(const FloatSize& offset)
- {
- m_x += offset.width();
- m_y += offset.height();
- }
- PathPoint& operator=(const FloatPoint& p)
- {
- m_x = p.x();
- m_y = p.y();
- return *this;
- }
- void clear() { m_x = m_y = 0; }
- };
-
- struct PathPolygon: public Vector<PathPoint> {
- void move(const FloatSize& offset);
- void transform(const AffineTransform& t);
- bool contains(const FloatPoint& point) const;
- };
-
- class PlatformPathElement {
- public:
- enum PlaformPathElementType {
- PathMoveTo,
- PathLineTo,
- PathArcTo,
- PathQuadCurveTo,
- PathBezierCurveTo,
- PathCloseSubpath,
- };
-
- struct MoveTo {
- PathPoint m_end;
- };
-
- struct LineTo {
- PathPoint m_end;
- };
-
- struct ArcTo {
- PathPoint m_end;
- PathPoint m_center;
- PathPoint m_radius;
- bool m_clockwise;
- };
-
- struct QuadCurveTo {
- PathPoint m_point0;
- PathPoint m_point1;
- };
-
- struct BezierCurveTo {
- PathPoint m_point0;
- PathPoint m_point1;
- PathPoint m_point2;
- };
-
- PlatformPathElement(): m_type(PathCloseSubpath) { m_data.m_points[0].set(0, 0); }
- PlatformPathElement(const MoveTo& data): m_type(PathMoveTo) { m_data.m_moveToData = data; }
- PlatformPathElement(const LineTo& data): m_type(PathLineTo) { m_data.m_lineToData = data; }
- PlatformPathElement(const ArcTo& data): m_type(PathArcTo) { m_data.m_arcToData = data; }
- PlatformPathElement(const QuadCurveTo& data): m_type(PathQuadCurveTo) { m_data.m_quadCurveToData = data; }
- PlatformPathElement(const BezierCurveTo& data): m_type(PathBezierCurveTo) { m_data.m_bezierCurveToData = data; }
-
- const MoveTo& moveTo() const { return m_data.m_moveToData; }
- const LineTo& lineTo() const { return m_data.m_lineToData; }
- const ArcTo& arcTo() const { return m_data.m_arcToData; }
- const QuadCurveTo& quadCurveTo() const { return m_data.m_quadCurveToData; }
- const BezierCurveTo& bezierCurveTo() const { return m_data.m_bezierCurveToData; }
- const PathPoint& lastPoint() const
- {
- int n = numPoints();
- return n > 1 ? m_data.m_points[n - 1] : m_data.m_points[0];
- }
- const PathPoint& pointAt(int index) const { return m_data.m_points[index]; }
- int numPoints() const;
- int numControlPoints() const;
- void move(const FloatSize& offset);
- void transform(const AffineTransform& t);
- PathElementType type() const;
- PlaformPathElementType platformType() const { return m_type; }
- void inflateRectToContainMe(FloatRect& r, const FloatPoint& lastPoint) const;
-
- private:
- PlaformPathElementType m_type;
- union {
- MoveTo m_moveToData;
- LineTo m_lineToData;
- ArcTo m_arcToData;
- QuadCurveTo m_quadCurveToData;
- BezierCurveTo m_bezierCurveToData;
- PathPoint m_points[4];
- } m_data;
- };
-
- typedef Vector<PlatformPathElement> PlatformPathElements;
-
- class PlatformPath {
- public:
- PlatformPath();
- const PlatformPathElements& elements() const { return m_elements; }
- void append(const PlatformPathElement& e);
- void append(const PlatformPath& p);
- void clear();
- bool isEmpty() const { return m_elements.isEmpty(); }
-
- void strokePath(HDC, const AffineTransform* tr) const;
- void fillPath(HDC, const AffineTransform* tr) const;
- FloatPoint lastPoint() const { return m_elements.isEmpty() ? FloatPoint(0, 0) : m_elements.last().lastPoint(); }
-
- const FloatRect& boundingRect() const { return m_boundingRect; }
- bool contains(const FloatPoint& point, WindRule rule) const;
- void translate(const FloatSize& size);
- void transform(const AffineTransform& t);
-
- void moveTo(const FloatPoint&);
- void addLineTo(const FloatPoint&);
- void addQuadCurveTo(const FloatPoint& controlPoint, const FloatPoint& point);
- void addBezierCurveTo(const FloatPoint& controlPoint1, const FloatPoint& controlPoint2, const FloatPoint&);
- void addArcTo(const FloatPoint&, const FloatPoint&, float radius);
- void closeSubpath();
- void addEllipse(const FloatPoint& p, float a, float b, float sar, float ear, bool anticlockwise);
- void addRect(const FloatRect& r);
- void addEllipse(const FloatRect& r);
- void apply(void* info, PathApplierFunction function) const;
-
- private:
- void ensureSubpath();
- void addToSubpath(const PlatformPathElement& e);
-
- PlatformPathElements m_elements;
- FloatRect m_boundingRect;
- Vector<PathPolygon> m_subpaths;
- PathPoint m_currentPoint;
- bool m_penLifted;
- };
-
-}
-
-#endif // PlatformPathWinCE_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinceSharedBitmapcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/graphics/wince/SharedBitmap.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/wince/SharedBitmap.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/graphics/wince/SharedBitmap.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,613 +0,0 @@
</span><del>-/*
- * Copyright (C) 2007-2009 Torch Mobile, Inc. All rights reserved.
- * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "config.h"
-#include "SharedBitmap.h"
-
-#include "GDIExtras.h"
-#include "GraphicsContext.h"
-#include "GraphicsTypes.h"
-#include "TransformationMatrix.h"
-#include "WinCEGraphicsExtras.h"
-#include <wtf/HashSet.h>
-#include <wtf/OwnPtr.h>
-#include <wtf/RefCountedLeakCounter.h>
-#include <wtf/StdLibExtras.h>
-
-#include <windows.h>
-
-namespace WebCore {
-
-#ifndef NDEBUG
-static WTF::RefCountedLeakCounter sharedBitmapLeakCounter("SharedBitmap");
-#endif
-
-
-PassRefPtr<SharedBitmap> SharedBitmap::create(const IntSize& size, BitmapInfo::BitCount bitCount, bool initPixels)
-{
- RefPtr<SharedBitmap> resultantBitmap = adoptRef(new SharedBitmap(size, bitCount, initPixels));
- if (resultantBitmap && !resultantBitmap->bytes())
- return 0;
- return resultantBitmap.release();
-}
-
-PassRefPtr<SharedBitmap> SharedBitmap::create(const Vector<unsigned>& data, const IntSize& size, bool hasAlpha)
-{
- RefPtr<SharedBitmap> result = create(size, BitmapInfo::BitCount32, false);
- if (!result)
- return 0;
- memcpy(result->bytes(), data.data(), data.size() * sizeof(unsigned));
- result->setHasAlpha(hasAlpha);
- return result.release();
-}
-
-SharedBitmap::SharedBitmap(const IntSize& size, BitmapInfo::BitCount bitCount, bool initPixels)
- : m_bmpInfo(BitmapInfo::createBottomUp(size, bitCount))
- , m_locked(false)
- , m_usesTransparentColor(false)
- , m_transparentColor(RGB(0, 0, 0))
- , m_pixels(0)
- , m_hasAlpha(false)
- , m_validHeight(abs(size.height()))
-{
-#ifndef NDEBUG
- sharedBitmapLeakCounter.increment();
-#endif
-
- unsigned bufferSize = m_bmpInfo.numPixels();
- if (bitCount == BitmapInfo::BitCount16)
- bufferSize /= 2;
-
- m_pixelData = std::make_unique<unsigned[]>(bufferSize);
- m_pixels = m_pixelData.get();
-
- if (initPixels)
- resetPixels();
-}
-
-SharedBitmap::~SharedBitmap()
-{
-#ifndef NDEBUG
- sharedBitmapLeakCounter.decrement();
-#endif
-}
-
-void SharedBitmap::resetPixels(bool black)
-{
- if (!m_pixels)
- return;
-
- unsigned bufferSize = m_bmpInfo.numPixels();
- if (black) {
- unsigned bufferSizeInBytes = bufferSize * (is16bit() ? 2 : 4);
- memset(m_pixels, 0, bufferSizeInBytes);
- return;
- }
-
- if (is16bit()) {
- // Fill it with white color
- wmemset(static_cast<wchar_t*>(m_pixels), 0xFFFF, bufferSize);
- return;
- }
-
- // Make it white but transparent
- unsigned* pixel = static_cast<unsigned*>(m_pixels);
- const unsigned* bufferEnd = pixel + bufferSize;
- while (pixel < bufferEnd)
- *pixel++ = 0x00FFFFFF;
-}
-
-static inline unsigned short convert32To16(unsigned pixel)
-{
- unsigned short r = static_cast<unsigned short>((pixel & 0x00F80000) >> 8);
- unsigned short g = static_cast<unsigned short>((pixel & 0x0000FC00) >> 5);
- unsigned short b = static_cast<unsigned short>((pixel & 0x000000F8) >> 3);
- return r | g | b;
-}
-
-bool SharedBitmap::to16bit()
-{
- if (m_locked)
- return false;
- if (is16bit())
- return true;
-
- BitmapInfo newBmpInfo = BitmapInfo::create(m_bmpInfo.size(), BitmapInfo::BitCount16);
-
- int width = newBmpInfo.width();
- int paddedWidth = newBmpInfo.paddedWidth();
- int bufferSize = paddedWidth * newBmpInfo.height();
- auto newPixelData = std::make_unique<unsigned[]>(bufferSize / 2);
- void* newPixels = newPixelData.get();
-
- if (!newPixels)
- return false;
-
- unsigned short* p16 = static_cast<unsigned short*>(newPixels);
- const unsigned* p32 = static_cast<const unsigned*>(m_pixels);
-
- bool skips = paddedWidth != width;
-
- const unsigned short* p16end = p16 + bufferSize;
- while (p16 < p16end) {
- for (unsigned short* p16lineEnd = p16 + width; p16 < p16lineEnd; )
- *p16++ = convert32To16(*p32++);
-
- if (skips)
- *p16++ = 0;
- }
-
- if (m_hbitmap)
- m_hbitmap = nullptr;
- else
- m_pixelData = newPixelData.release();
-
- m_pixels = newPixels;
- m_bmpInfo = newBmpInfo;
-
- setHasAlpha(false);
- return true;
-}
-
-bool SharedBitmap::freeMemory()
-{
- if (m_locked)
- return false;
-
- if (m_hbitmap) {
- m_hbitmap = nullptr;
- m_pixels = 0;
- return true;
- }
-
- if (m_pixels) {
- m_pixelData = nullptr;
- m_pixels = 0;
- return true;
- }
-
- return false;
-}
-
-GDIObject<HBITMAP> SharedBitmap::createHandle(void** pixels, BitmapInfo* bmpInfo, int height, bool use16bit) const
-{
- if (!m_pixels)
- return nullptr;
-
- if (height == -1)
- height = this->height();
- *bmpInfo = BitmapInfo::createBottomUp(IntSize(width(), height), (use16bit || is16bit()) ? BitmapInfo::BitCount16 : BitmapInfo::BitCount32);
-
- auto hbmp = adoptGDIObject(::CreateDIBSection(0, bmpInfo, DIB_RGB_COLORS, pixels, 0, 0));
-
- if (!hbmp)
- return nullptr;
-
- auto bmpDC = adoptGDIObject(::CreateCompatibleDC(0));
- HGDIOBJ hOldBmp = SelectObject(bmpDC.get(), hbmp.get());
-
- StretchDIBits(bmpDC.get(), 0, 0, width(), height, 0, 0, width(), height, m_pixels, &m_bmpInfo, DIB_RGB_COLORS, SRCCOPY);
-
- SelectObject(bmpDC.get(), hOldBmp);
-
- return hbmp;
-}
-
-bool SharedBitmap::ensureHandle()
-{
- if (m_hbitmap)
- return true;
-
- if (!m_pixels)
- return false;
-
- if (m_locked)
- return false;
-
- BitmapInfo bmpInfo;
- void* pixels;
- m_hbitmap = createHandle(&pixels, &bmpInfo, -1, !hasAlpha());
-
- if (!m_hbitmap)
- return false;
-
- m_pixelData = nullptr;
- m_pixels = pixels;
- m_bmpInfo = bmpInfo;
-
- return true;
-}
-
-void SharedBitmap::draw(GraphicsContext* ctxt, const IntRect& dstRect, const IntRect& srcRect, ColorSpace styleColorSpace, CompositeOperator compositeOp, BlendMode blendMode)
-{
- if (!m_pixels)
- return;
- ctxt->drawBitmap(this, dstRect, srcRect, styleColorSpace, compositeOp, blendMode);
-}
-
-void SharedBitmap::draw(HDC hdc, const IntRect& dstRect, const IntRect& srcRect, CompositeOperator compositeOp, BlendMode blendMode)
-{
- if (!m_pixels)
- return;
-
- if (dstRect.isEmpty() || srcRect.isEmpty())
- return;
-
- HBITMAP hbitmap = 0;
- GDIObject<HBITMAP> hTempBitmap;
- bool usingHandle = compositeOp == CompositeSourceOver && (hasAlpha() && hasAlphaBlendSupport() || usesTransparentColor());
-
- if (usingHandle) {
- if (ensureHandle())
- hbitmap = m_hbitmap.get();
- else {
- void* pixels;
- BitmapInfo bmpInfo;
- hTempBitmap = createHandle(&pixels, &bmpInfo, -1, usesTransparentColor());
- hbitmap = hTempBitmap.get();
- }
- }
- if (!hbitmap) {
- // FIXME: handle other composite operation types?
- DWORD rop = compositeOp == CompositeCopy ? SRCCOPY
- : compositeOp == CompositeXOR ? PATINVERT
- : compositeOp == CompositeClear ? WHITENESS
- : SRCCOPY;
-
- StretchDIBits(hdc, dstRect.x(), dstRect.y(), dstRect.width(), dstRect.height(),
- srcRect.x(), srcRect.y(), srcRect.width(), srcRect.height(), m_pixels, &m_bmpInfo, DIB_RGB_COLORS, rop);
- return;
- }
-
- auto hmemdc = adoptGDIObject(::CreateCompatibleDC(hdc));
- HGDIOBJ hOldBmp = SelectObject(hmemdc.get(), hbitmap);
-
- if (!usesTransparentColor() && hasAlphaBlendSupport()) {
- static const BLENDFUNCTION blend = { AC_SRC_OVER, 0, 255, AC_SRC_ALPHA };
- bool success = alphaBlendIfSupported(hdc, dstRect.x(), dstRect.y(), dstRect.width(), dstRect.height(), hmemdc.get(),
- srcRect.x(), srcRect.y(), srcRect.width(), srcRect.height(), blend);
- ASSERT_UNUSED(success, success);
- } else {
- TransparentBlt(hdc, dstRect.x(), dstRect.y(), dstRect.width(), dstRect.height(), hmemdc.get(),
- srcRect.x(), srcRect.y(), srcRect.width(), srcRect.height(), transparentColor());
- }
-
- SelectObject(hmemdc.get(), hOldBmp);
-}
-
-GDIObject<HBITMAP> SharedBitmap::clipBitmap(const IntRect& rect, bool useAlpha, BitmapInfo& bmpInfo, void*& pixels)
-{
- if (!bytes())
- return nullptr;
-
- int oldWidth = width();
- int oldHeight = height();
- int copyWidth = std::min<int>(rect.width(), oldWidth - rect.x());
- int copyHeight = std::min<int>(rect.height(), oldHeight - rect.y());
- if (!copyWidth || !copyHeight)
- return nullptr;
-
- bmpInfo = BitmapInfo::createBottomUp(IntSize(copyWidth, copyHeight), (useAlpha && is32bit()) ? BitmapInfo::BitCount32 : BitmapInfo::BitCount16);
- auto newBmp = adoptGDIObject(::CreateDIBSection(0, &bmpInfo, DIB_RGB_COLORS, &pixels, 0, 0));
-
- if (!newBmp)
- return nullptr;
-
- auto dcNew = adoptGDIObject(::CreateCompatibleDC(0));
- HGDIOBJ tmpNew = SelectObject(dcNew.get(), newBmp.get());
-
- StretchDIBits(dcNew.get(), 0, 0, copyWidth, copyHeight, rect.x(), rect.y(), copyWidth, copyHeight,
- bytes(), &bitmapInfo(), DIB_RGB_COLORS, SRCCOPY);
-
- SelectObject(dcNew.get(), tmpNew);
- return newBmp;
-}
-
-PassRefPtr<SharedBitmap> SharedBitmap::clipBitmap(const IntRect& rect, bool useAlpha)
-{
- int oldWidth = width();
- int oldHeight = height();
- int copyWidth = std::min<int>(rect.width(), oldWidth - rect.x());
- int copyHeight = std::min<int>(rect.height(), oldHeight - rect.y());
- if (!copyWidth || !copyHeight)
- return 0;
-
- RefPtr<SharedBitmap> newBmp = create(IntSize(copyWidth, copyHeight), useAlpha && is32bit() ? BitmapInfo::BitCount32 : BitmapInfo::BitCount16, false);
-
- if (!newBmp || !newBmp->bytes())
- return 0;
-
- DCHolder dcNew(newBmp.get());
-
- StretchDIBits(dcNew.get(), 0, 0, copyWidth, copyHeight, rect.x(), rect.y(), copyWidth, copyHeight,
- bytes(), &bitmapInfo(), DIB_RGB_COLORS, SRCCOPY);
-
- return newBmp;
-}
-
-static void drawPatternSimple(HDC hdc, const RECT& destRect, HBITMAP hbmp, const POINT& phase)
-{
- auto hBrush = adoptGDIObject(::CreatePatternBrush(hbmp));
- if (!hBrush)
- return;
-
- POINT oldOrg;
- SetBrushOrgEx(hdc, destRect.left - phase.x, destRect.top - phase.y, &oldOrg);
- FillRect(hdc, &destRect, hBrush.get());
- SetBrushOrgEx(hdc, oldOrg.x, oldOrg.y, 0);
-}
-
-static void drawPatternSimple(HDC hdc, const RECT& destRect, const SharedBitmap* bmp, const SIZE& bmpSize, const POINT& phase)
-{
- int dstY = destRect.top;
- for (int sourceY = phase.y; dstY < destRect.bottom; ) {
- int sourceH = std::min<int>(bmpSize.cy - sourceY, destRect.bottom - dstY);
- int dstX = destRect.left;
- for (int sourceX = phase.x; dstX < destRect.right; ) {
- int sourceW = std::min<int>(bmpSize.cx - sourceX, destRect.right - dstX);
-
- StretchDIBits(hdc, dstX, dstY, sourceW, sourceH, sourceX, sourceY, sourceW, sourceH,
- bmp->bytes(), &bmp->bitmapInfo(), DIB_RGB_COLORS, SRCCOPY);
-
- dstX += sourceW;
- sourceX = 0;
- }
-
- dstY += sourceH;
- sourceY = 0;
- }
-}
-
-static LONG normalizePhase(LONG phase, int limit)
-{
- if (!phase || limit < 2)
- return 0;
-
- if (limit == 2)
- return phase & 1;
-
- if (phase < 0) {
- phase = -phase;
- if (phase > limit)
- phase = static_cast<LONG>(static_cast<unsigned>(phase) % static_cast<unsigned>(limit));
- if (phase)
- phase = limit - phase;
- return phase;
- }
-
- if (phase < limit)
- return phase;
-
- return static_cast<LONG>(static_cast<unsigned>(phase) % static_cast<unsigned>(limit));
-}
-
-void SharedBitmap::drawPattern(GraphicsContext* ctxt, const FloatRect& tileRectIn, const AffineTransform& patternTransform,
- const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator op, const FloatRect& destRect, const IntSize& origSourceSize)
-{
- if (!m_pixels)
- return;
- ctxt->drawBitmapPattern(this, tileRectIn, patternTransform, phase, styleColorSpace, op, destRect, origSourceSize);
-}
-
-void SharedBitmap::drawPattern(HDC hdc, const AffineTransform& transform, const FloatRect& tileRectIn, const AffineTransform& patternTransform,
- const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator op, const FloatRect& destRect, const IntSize& origSourceSize)
-{
- if (!m_pixels)
- return;
-
- if (tileRectIn.width() <= 0 || tileRectIn.height() <= 0)
- return;
-
- bool useAlpha = op == CompositeSourceOver && hasAlpha() && is32bit();
-
- int bmpWidth = width();
- int bmpHeight = height();
-
- FloatRect tileRect(tileRectIn);
- if (bmpWidth != origSourceSize.width()) {
- double rate = static_cast<double>(bmpWidth) / origSourceSize.width();
- double temp = tileRect.width() * rate;
- tileRect.setX(tileRect.x() * rate);
- tileRect.setWidth(temp);
- temp = tileRect.height() * rate;
- tileRect.setY(tileRect.y() * rate);
- tileRect.setHeight(temp);
- }
-
- GDIObject<HBITMAP> clippedBmp;
-
- if (tileRect.x() || tileRect.y() || tileRect.width() != bmpWidth || tileRect.height() != bmpHeight) {
- BitmapInfo patternBmpInfo;
- void* patternPixels;
- clippedBmp = clipBitmap(IntRect(tileRect), useAlpha, patternBmpInfo, patternPixels);
- if (!clippedBmp)
- return;
-
- bmpWidth = tileRect.width();
- bmpHeight = tileRect.height();
- }
-
- AffineTransform tf = patternTransform * transform;
-
- FloatRect trRect = tf.mapRect(destRect);
-
- RECT clipBox;
- int clipType = GetClipBox(hdc, &clipBox);
- if (clipType == SIMPLEREGION)
- trRect.intersect(FloatRect(clipBox.left, clipBox.top, clipBox.right - clipBox.left, clipBox.bottom - clipBox.top));
- else if (clipType == COMPLEXREGION) {
- auto clipRgn = adoptGDIObject(::CreateRectRgn(0, 0, 0, 0));
- if (GetClipRgn(hdc, clipRgn.get()) > 0) {
- DWORD regionDataSize = GetRegionData(clipRgn.get(), sizeof(RGNDATA), 0);
- if (regionDataSize) {
- Vector<RGNDATA> regionData(regionDataSize);
- GetRegionData(clipRgn.get(), regionDataSize, regionData.data());
- RECT* rect = reinterpret_cast<RECT*>(regionData[0].Buffer);
- for (DWORD i = 0; i < regionData[0].rdh.nCount; ++i, ++rect)
- trRect.intersect(FloatRect(rect->left, rect->top, rect->right - rect->left, rect->bottom - rect->top));
- }
- }
- }
-
- if (trRect.width() <= 0 || trRect.height() <= 0)
- return;
-
- trRect.inflate(1);
- IntRect visibleDstRect = enclosingIntRect(tf.inverse().mapRect(trRect));
- visibleDstRect.intersect(IntRect(destRect));
-
- if (visibleDstRect.width() <= 0 || visibleDstRect.height() <= 0)
- return;
-
- trRect = tf.mapRect(visibleDstRect);
- RECT dstRectWin = {
- stableRound(trRect.x()),
- stableRound(trRect.y()),
- stableRound(trRect.maxX()),
- stableRound(trRect.maxY()),
- };
- if (dstRectWin.right <= dstRectWin.left || dstRectWin.bottom <= dstRectWin.top)
- return;
-
- SIZE bmpSize = { bmpWidth, bmpHeight };
-
- // Relative to destination, in bitmap pixels
- POINT phaseWin = { stableRound(visibleDstRect.x() - phase.x()), stableRound(visibleDstRect.y() - phase.y()) };
- phaseWin.x = normalizePhase(phaseWin.x, bmpSize.cx);
- phaseWin.y = normalizePhase(phaseWin.y, bmpSize.cy);
-
- RECT srcRectWin = {
- 0,
- 0,
- stableRound(visibleDstRect.maxX()) - stableRound(visibleDstRect.x()),
- stableRound(visibleDstRect.maxY()) - stableRound(visibleDstRect.y())
- };
- if (srcRectWin.right <= 0 || srcRectWin.bottom <= 0)
- return;
-
- BitmapInfo bmpInfo = BitmapInfo::createBottomUp(IntSize(srcRectWin.right, srcRectWin.bottom), useAlpha ? BitmapInfo::BitCount32 : BitmapInfo::BitCount16);
- void* pixels;
- auto hbmpTemp = adoptGDIObject(::CreateDIBSection(0, &bmpInfo, DIB_RGB_COLORS, &pixels, 0, 0));
-
- if (!hbmpTemp)
- return;
-
- auto hmemdc = adoptGDIObject(::CreateCompatibleDC(hdc));
- HGDIOBJ oldBmp = SelectObject(hmemdc.get(), hbmpTemp.get());
- if (clippedBmp)
- drawPatternSimple(hmemdc.get(), srcRectWin, clippedBmp.get(), phaseWin);
- else if ((op != CompositeSourceOver || canUseDIBits()) && srcRectWin.right <= bmpSize.cx * 2 && srcRectWin.bottom <= bmpSize.cy * 2)
- drawPatternSimple(hmemdc.get(), srcRectWin, this, bmpSize, phaseWin);
- else if (ensureHandle())
- drawPatternSimple(hmemdc.get(), srcRectWin, getHandle(), phaseWin);
- else {
- void* pixels;
- BitmapInfo bmpInfo;
- auto hbmp = createHandle(&pixels, &bmpInfo, -1, false);
- if (hbmp)
- drawPatternSimple(hmemdc.get(), srcRectWin, hbmp.get(), phaseWin);
- else {
- SelectObject(hmemdc.get(), oldBmp);
- return;
- }
- }
-
- if (useAlpha && hasAlphaBlendSupport()) {
- static const BLENDFUNCTION blend = { AC_SRC_OVER, 0, 255, AC_SRC_ALPHA };
- bool success = alphaBlendIfSupported(hdc, dstRectWin.left, dstRectWin.top, dstRectWin.right - dstRectWin.left, dstRectWin.bottom - dstRectWin.top,
- hmemdc.get(), 0, 0, srcRectWin.right, srcRectWin.bottom, blend);
- ASSERT_UNUSED(success, success);
- } else if (useAlpha && !hasAlphaBlendSupport() || op == CompositeSourceOver && usesTransparentColor()) {
- TransparentBlt(hdc, dstRectWin.left, dstRectWin.top, dstRectWin.right - dstRectWin.left,
- dstRectWin.bottom - dstRectWin.top, hmemdc.get(), 0, 0, srcRectWin.right, srcRectWin.bottom, transparentColor());
- } else {
- DWORD bmpOp = op == CompositeCopy ? SRCCOPY
- : op == CompositeSourceOver ? SRCCOPY
- : op == CompositeXOR ? PATINVERT
- : op == CompositeClear ? WHITENESS
- : SRCCOPY; // FIXEME: other types?
-
- StretchDIBits(hdc, dstRectWin.left, dstRectWin.top, dstRectWin.right - dstRectWin.left,
- dstRectWin.bottom - dstRectWin.top, 0, 0, srcRectWin.right, srcRectWin.bottom,
- pixels, &bmpInfo, DIB_RGB_COLORS, bmpOp);
- }
- SelectObject(hmemdc.get(), oldBmp);
-}
-
-SharedBitmap::DCProvider* SharedBitmap::s_dcProvider = new SharedBitmap::DCProvider;
-
-HDC SharedBitmap::DCProvider::getDC(SharedBitmap* bmp, unsigned* key)
-{
- if (!bmp || !bmp->ensureHandle())
- return 0;
-
- HDC hdc = CreateCompatibleDC(0);
- if (!hdc)
- return 0;
-
- *key = reinterpret_cast<unsigned>(SelectObject(hdc, bmp->getHandle()));
- RECT rect = { 0, 0, bmp->width(), bmp->height() };
- auto clipRgn = adoptGDIObject(::CreateRectRgnIndirect(&rect));
- SelectClipRgn(hdc, clipRgn.get());
-
- return hdc;
-}
-
-void SharedBitmap::DCProvider::releaseDC(SharedBitmap*, HDC hdc, unsigned key1)
-{
- if (!hdc)
- return;
-
- SelectObject(hdc, reinterpret_cast<HGDIOBJ>(key1));
- DeleteDC(hdc);
-}
-
-void SharedBitmap::clearPixels(const IntRect& rect)
-{
- if (!m_pixels)
- return;
-
- IntRect bmpRect(0, 0, width(), height());
- bmpRect.intersect(rect);
- if (is16bit()) {
- unsigned w = m_bmpInfo.paddedWidth();
- unsigned short* dst = static_cast<unsigned short*>(m_pixels);
- dst += bmpRect.y() * w + bmpRect.x();
- int wordsToSet = bmpRect.width();
- const unsigned short* dstEnd = dst + bmpRect.height() * w;
- while (dst < dstEnd) {
- wmemset(reinterpret_cast<wchar_t*>(dst), 0, wordsToSet);
- dst += w;
- }
- return;
- }
-
- unsigned w = width();
- unsigned* dst = static_cast<unsigned*>(m_pixels);
- dst += bmpRect.y() * w + bmpRect.x();
- int wordsToSet = bmpRect.width() * 2;
- const unsigned* dstEnd = dst + bmpRect.height() * w;
- while (dst < dstEnd) {
- wmemset(reinterpret_cast<wchar_t*>(dst), 0, wordsToSet);
- dst += w;
- }
-}
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinceSharedBitmaph"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/graphics/wince/SharedBitmap.h (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/wince/SharedBitmap.h 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/graphics/wince/SharedBitmap.h 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,145 +0,0 @@
</span><del>-/*
- * Copyright (C) 2007-2009 Torch Mobile, Inc. All rights reserved.
- * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef SharedBitmap_h
-#define SharedBitmap_h
-
-#include "AffineTransform.h"
-#include "BitmapInfo.h"
-#include "ColorSpace.h"
-#include "GraphicsTypes.h"
-#include <memory>
-#include <wtf/PassOwnPtr.h>
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefCounted.h>
-#include <wtf/Vector.h>
-#include <wtf/win/GDIObject.h>
-
-namespace WebCore {
-
-class FloatPoint;
-class FloatRect;
-class GraphicsContext;
-class IntRect;
-class IntSize;
-class TransformationMatrix;
-
-class SharedBitmap: public RefCounted<SharedBitmap> {
-public:
- ~SharedBitmap();
- static PassRefPtr<SharedBitmap> create(const IntSize&, BitmapInfo::BitCount = BitmapInfo::BitCount32, bool initPixels = true);
- static PassRefPtr<SharedBitmap> create(const Vector<unsigned>&, const IntSize&, bool hasAlpha = true);
-
- const BitmapInfo& bitmapInfo() const { return m_bmpInfo; }
- void* bytes() { return m_pixels; }
- const void* bytes() const { return m_pixels; }
- unsigned width() const { return m_bmpInfo.width(); }
- unsigned height() const { return m_bmpInfo.height(); }
- unsigned validHeight() const { return m_validHeight; }
- void setValidHeight(unsigned validHeight) { m_validHeight = validHeight; }
- void resetPixels(bool black = false);
- void clearPixels(const IntRect& r);
- bool locked() const { return m_locked; }
- void lock() { m_locked = true; }
- void unlock() { m_locked = false; }
- bool freeMemory();
- bool is16bit() const { return m_bmpInfo.is16bit(); }
- bool is32bit() const { return m_bmpInfo.is32bit(); }
- bool to16bit();
- bool hasAlpha() const { return m_hasAlpha; }
- void setHasAlpha(bool alpha) { m_hasAlpha = alpha; }
- bool ensureHandle();
- HBITMAP getHandle() { return m_hbitmap.get(); }
- GDIObject<HBITMAP> createHandle(void** pixels, BitmapInfo* bmpInfo, int h = -1, bool use16bit = true) const;
- bool usesTransparentColor() const { return m_usesTransparentColor; }
- COLORREF transparentColor() const { return m_transparentColor; }
- void setTransparentColor(COLORREF c)
- {
- m_usesTransparentColor = true;
- m_transparentColor = c;
- }
- bool canUseDIBits() const { return !hasAlpha() && !usesTransparentColor(); }
-
- GDIObject<HBITMAP> clipBitmap(const IntRect&, bool useAlpha, BitmapInfo&, void*& pixels);
-
- PassRefPtr<SharedBitmap> clipBitmap(const IntRect& rect, bool useAlpha);
-
- void draw(GraphicsContext* ctxt, const IntRect& dstRect, const IntRect& srcRect, ColorSpace styleColorSpace, CompositeOperator compositeOp, BlendMode blendMode);
- void drawPattern(GraphicsContext* ctxt, const FloatRect& tileRectIn, const AffineTransform& patternTransform,
- const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator op, const FloatRect& destRect, const IntSize& origSourceSize);
- void draw(HDC, const IntRect& dstRect, const IntRect& srcRect, CompositeOperator compositeOp, BlendMode blendMode);
- void drawPattern(HDC, const AffineTransform&, const FloatRect& tileRectIn, const AffineTransform& patternTransform,
- const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator op, const FloatRect& destRect, const IntSize& origSourceSize);
-
- class DCProvider {
- public:
- virtual HDC getDC(SharedBitmap*, unsigned*);
- virtual void releaseDC(SharedBitmap*, HDC, unsigned);
- };
-
- static DCProvider* s_dcProvider;
-
- HDC getDC(unsigned* key1) { return s_dcProvider->getDC(this, key1); }
- void releaseDC(HDC hdc, unsigned key1) { s_dcProvider->releaseDC(this, hdc, key1); }
-
- class DCHolder {
- public:
- DCHolder(SharedBitmap* bmp = 0) { setInternal(bmp); }
- ~DCHolder() { clearInternal(); }
- void set(SharedBitmap* bmp = 0)
- {
- clearInternal();
- setInternal(bmp);
- }
- HDC get() const { return m_hdc; }
- private:
- DCHolder& operator=(const DCHolder&);
- DCHolder(const DCHolder&);
- void clearInternal()
- {
- if (m_hdc)
- m_bitmap->releaseDC(m_hdc, m_key);
- }
- void setInternal(SharedBitmap* bmp)
- {
- m_bitmap = bmp;
- m_hdc = bmp ? bmp->getDC(&m_key) : 0;
- }
- SharedBitmap* m_bitmap;
- HDC m_hdc;
- unsigned m_key;
- };
-
-private:
- SharedBitmap(const IntSize&, BitmapInfo::BitCount, bool initPixels);
- BitmapInfo m_bmpInfo;
- GDIObject<HBITMAP> m_hbitmap;
- void* m_pixels;
- std::unique_ptr<unsigned[]> m_pixelData;
- COLORREF m_transparentColor;
- int m_validHeight;
- bool m_locked;
- bool m_usesTransparentColor;
- bool m_hasAlpha;
-};
-
-} // namespace WebCore
-
-#endif // SharedBitmap_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinceSimpleFontDataWinCEcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/graphics/wince/SimpleFontDataWinCE.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/wince/SimpleFontDataWinCE.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/graphics/wince/SimpleFontDataWinCE.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,159 +0,0 @@
</span><del>-/*
- * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
- * Copyright (C) 2007-2009 Torch Mobile, Inc.
- *
- * 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.
- * 3. Neither the name of Apple Inc. ("Apple") nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "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 OR ITS 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.
- */
-
-#include "config.h"
-#include "SimpleFontData.h"
-
-#include "FloatRect.h"
-#include "Font.h"
-#include "FontCache.h"
-#include "FontDescription.h"
-#include <mlang.h>
-#include <wtf/MathExtras.h>
-
-namespace WebCore {
-
-extern HDC g_screenDC;
-
-void SimpleFontData::platformInit()
-{
- if (!m_platformData.isValid())
- return;
-
- const TEXTMETRIC& tm = m_platformData.metrics();
- m_isSystemFont = m_platformData.isSystemFont();
-
- float ascent = (tm.tmAscent * m_platformData.size() + 36) / 72.0f;
- float descent = (tm.tmDescent * m_platformData.size() + 36) / 72.0f;
- float lineGap = (tm.tmExternalLeading * m_platformData.size() + 36) / 72.0f;
- m_fontMetrics.setAscent(ascent);
- m_fontMetrics.setDescent(descent);
- m_fontMetrics.setLineGap(lineGap);
- m_fontMetrics.setLineSpacing(lroundf(ascent) + lroundf(descent) + lroundf(lineGap));
- m_fontMetrics.setXHeight(ascent * 0.56f);
-}
-
-void SimpleFontData::platformDestroy()
-{
-}
-
-PassRefPtr<SimpleFontData> SimpleFontData::platformCreateScaledFontData(const FontDescription& fontDescription, float scaleFactor) const
-{
- FontDescription fontDesc(fontDescription);
- fontDesc.setComputedSize(lroundf(scaleFactor * fontDesc.computedSize()));
- fontDesc.setSpecifiedSize(lroundf(scaleFactor * fontDesc.specifiedSize()));
- fontDesc.setKeywordSize(lroundf(scaleFactor * fontDesc.keywordSize()));
- FontPlatformData* result = fontCache().getCachedFontPlatformData(fontDesc, m_platformData.family());
- if (!result)
- return 0;
- return SimpleFontData::create(*result);
-}
-
-DWORD getKnownFontCodePages(const wchar_t* family);
-
-bool SimpleFontData::containsCharacters(const UChar* characters, int length) const
-{
- if (m_platformData.isDisabled())
- return true;
-
- // FIXME: Microsoft documentation seems to imply that characters can be output using a given font and DC
- // merely by testing code page intersection. This seems suspect though. Can't a font only partially
- // cover a given code page?
-
- // FIXME: in the case that we failed to get the interface, still use the font.
- IMLangFontLinkType* langFontLink = fontCache().getFontLinkInterface();
- if (!langFontLink)
- return true;
-
- DWORD fontCodePages = m_platformData.codePages();
- if (!fontCodePages)
- return false;
-
- DWORD acpCodePages = 0;
- langFontLink->CodePageToCodePages(CP_ACP, &acpCodePages);
-
- DWORD actualCodePages;
- long numCharactersProcessed;
- while (length) {
- langFontLink->GetStrCodePages(characters, length, acpCodePages, &actualCodePages, &numCharactersProcessed);
- if (actualCodePages && !(actualCodePages & fontCodePages))
- return false;
-
- length -= numCharactersProcessed;
- characters += numCharactersProcessed;
- }
-
- return true;
-}
-
-void SimpleFontData::determinePitch()
-{
- if (!m_platformData.isValid())
- return;
-
- const TEXTMETRIC& tm = m_platformData.metrics();
-
- // Yes, this looks backwards, but the fixed pitch bit is actually set if the font
- // is *not* fixed pitch. Unbelievable but true.
- m_treatAsFixedPitch = !(tm.tmPitchAndFamily & TMPF_FIXED_PITCH);
-}
-
-FloatRect SimpleFontData::platformBoundsForGlyph(Glyph) const
-{
- return FloatRect();
-}
-
-float SimpleFontData::platformWidthForGlyph(Glyph glyph) const
-{
- if (m_platformData.isDisabled())
- return 0;
-
- HGDIOBJ hOldFont = SelectObject(g_screenDC, m_platformData.hfont());
-
- SIZE fontSize;
- wchar_t c = glyph;
- GetTextExtentPoint32(g_screenDC, &c, 1, &fontSize);
-
- SelectObject(g_screenDC, hOldFont);
-
- return (float)fontSize.cx * (float)m_platformData.size() / 72.f;
-}
-
-
-void SimpleFontData::platformCharWidthInit()
-{
- if (!m_platformData.isValid())
- return;
-
- const TEXTMETRIC& tm = m_platformData.metrics();
- m_avgCharWidth = (tm.tmAveCharWidth * m_platformData.size() + 36) / 72;
- m_maxCharWidth = (tm.tmMaxCharWidth * m_platformData.size() + 36) / 72;
-}
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinceWinCEGraphicsExtrash"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/graphics/wince/WinCEGraphicsExtras.h (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/wince/WinCEGraphicsExtras.h 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/graphics/wince/WinCEGraphicsExtras.h 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,39 +0,0 @@
</span><del>-/*
- * Copyright (C) 2007-2009 Torch Mobile, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef WinCEGraphicsExtras_h
-#define WinCEGraphicsExtras_h
-
-// This file is used to contain small utilities used by WINCE graphics code.
-
-namespace WebCore {
- // Always round to same direction. 0.5 is rounded to 1,
- // and -0.5 (0.5 - 1) is rounded to 0 (1 - 1), so that it
- // is consistent when transformation shifts.
- static inline int stableRound(double d)
- {
- if (d > 0)
- return static_cast<int>(d + 0.5);
-
- int i = static_cast<int>(d);
- return i - d > 0.5 ? i - 1 : i;
- }
-}
-
-#endif WinCEGraphicsExtras_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformimagedecodersjpegJPEGImageDecoderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -31,15 +31,6 @@
</span><span class="cx"> #include <stdio.h> // Needed by jpeglib.h for FILE.
</span><span class="cx"> #include <wtf/OwnPtr.h>
</span><span class="cx">
</span><del>-#if OS(WINCE)
-// Remove warning: 'FAR' macro redefinition
-#undef FAR
-
-// jmorecfg.h in libjpeg checks for XMD_H with the comment: "X11/xmd.h correctly defines INT32"
-// fix INT32 redefinition error by pretending we are X11/xmd.h
-#define XMD_H
-#endif
-
</del><span class="cx"> extern "C" {
</span><span class="cx"> #include "jpeglib.h"
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkwinNetworkStateNotifierWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/win/NetworkStateNotifierWin.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/win/NetworkStateNotifierWin.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/network/win/NetworkStateNotifierWin.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -107,14 +107,11 @@
</span><span class="cx">
</span><span class="cx"> memset(&m_overlapped, 0, sizeof(m_overlapped));
</span><span class="cx">
</span><del>-// FIXME: Check m_overlapped on WinCE.
-#if !OS(WINCE)
</del><span class="cx"> m_overlapped.hEvent = ::CreateEvent(0, false, false, 0);
</span><span class="cx">
</span><span class="cx"> ::RegisterWaitForSingleObject(&m_waitHandle, m_overlapped.hEvent, addrChangeCallback, this, INFINITE, 0);
</span><span class="cx">
</span><span class="cx"> registerForAddressChange();
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinCOMPtrh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/COMPtr.h (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/COMPtr.h 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/win/COMPtr.h 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -34,10 +34,6 @@
</span><span class="cx"> #include <wtf/Assertions.h>
</span><span class="cx"> #include <wtf/HashTraits.h>
</span><span class="cx">
</span><del>-#if !OS(WINCE)
-#include <guiddef.h>
-#endif
-
</del><span class="cx"> typedef long HRESULT;
</span><span class="cx">
</span><span class="cx"> // FIXME: Should we put this into the WebCore namespace and use "using" on it
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinClipboardUtilitiesWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -31,14 +31,12 @@
</span><span class="cx"> #include "TextEncoding.h"
</span><span class="cx"> #include "markup.h"
</span><span class="cx"> #include <shlobj.h>
</span><ins>+#include <shlwapi.h>
</ins><span class="cx"> #include <wininet.h> // for INTERNET_MAX_URL_LENGTH
</span><span class="cx"> #include <wtf/StringExtras.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span><del>-#if !OS(WINCE)
-#include <shlwapi.h>
-#endif
</del><span class="cx">
</span><span class="cx"> #if USE(CF)
</span><span class="cx"> #include <CoreFoundation/CoreFoundation.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinContextMenuItemWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/ContextMenuItemWin.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/ContextMenuItemWin.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/win/ContextMenuItemWin.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -28,18 +28,6 @@
</span><span class="cx">
</span><span class="cx"> #include "ContextMenu.h"
</span><span class="cx">
</span><del>-#if OS(WINCE)
-#ifndef MFS_DISABLED
-#define MFS_DISABLED MF_GRAYED
-#endif
-#ifndef MIIM_FTYPE
-#define MIIM_FTYPE MIIM_TYPE
-#endif
-#ifndef MIIM_STRING
-#define MIIM_STRING 0
-#endif
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> ContextMenuItem::ContextMenuItem(const MENUITEMINFO& info)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinContextMenuWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/ContextMenuWin.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/ContextMenuWin.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/win/ContextMenuWin.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -52,9 +52,6 @@
</span><span class="cx">
</span><span class="cx"> void ContextMenu::getContextMenuItems(HMENU menu, Vector<ContextMenuItem>& items)
</span><span class="cx"> {
</span><del>-#if OS(WINCE)
- notImplemented();
-#else
</del><span class="cx"> int count = ::GetMenuItemCount(menu);
</span><span class="cx"> if (count <= 0)
</span><span class="cx"> return;
</span><span class="lines">@@ -80,7 +77,6 @@
</span><span class="cx"> if (::GetMenuItemInfo(menu, i, TRUE, &info))
</span><span class="cx"> items.append(ContextMenuItem(info));
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HMENU ContextMenu::createPlatformContextMenuFromItems(const Vector<ContextMenuItem>& items)
</span><span class="lines">@@ -92,31 +88,6 @@
</span><span class="cx">
</span><span class="cx"> MENUITEMINFO menuItem = item.platformContextMenuItem();
</span><span class="cx">
</span><del>-#if OS(WINCE)
- UINT flags = MF_BYPOSITION;
- UINT newItem = 0;
- LPCWSTR title = 0;
-
- if (item.type() == SeparatorType)
- flags |= MF_SEPARATOR;
- else {
- flags |= MF_STRING;
- flags |= item.checked() ? MF_CHECKED : MF_UNCHECKED;
- flags |= item.enabled() ? MF_ENABLED : MF_GRAYED;
-
- title = menuItem.dwTypeData;
- menuItem.dwTypeData = 0;
-
- if (menuItem.hSubMenu) {
- flags |= MF_POPUP;
- newItem = reinterpret_cast<UINT>(menuItem.hSubMenu);
- menuItem.hSubMenu = 0;
- } else
- newItem = menuItem.wID;
- }
-
- ::InsertMenuW(menu, i, flags, newItem, title);
-#else
</del><span class="cx"> // ContextMenuItem::platformContextMenuItem doesn't set the title of the MENUITEMINFO to make the
</span><span class="cx"> // lifetime handling easier for callers.
</span><span class="cx"> Vector<UChar> wideCharTitle; // Retain buffer for long enough to make the InsertMenuItem call
</span><span class="lines">@@ -130,7 +101,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ::InsertMenuItem(menu, i, TRUE, &menuItem);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return menu;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinDragImageWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/DragImageWin.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/DragImageWin.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/win/DragImageWin.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -105,7 +105,6 @@
</span><span class="cx"> static Font dragLabelFont(int size, bool bold, FontRenderingMode renderingMode)
</span><span class="cx"> {
</span><span class="cx"> Font result;
</span><del>-#if !OS(WINCE)
</del><span class="cx"> NONCLIENTMETRICS metrics;
</span><span class="cx"> metrics.cbSize = sizeof(metrics);
</span><span class="cx"> SystemParametersInfo(SPI_GETNONCLIENTMETRICS, metrics.cbSize, &metrics, 0);
</span><span class="lines">@@ -118,7 +117,6 @@
</span><span class="cx"> description.setRenderingMode(renderingMode);
</span><span class="cx"> result = Font(description, 0, 0);
</span><span class="cx"> result.update(0);
</span><del>-#endif
</del><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinFileSystemWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/FileSystemWin.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/FileSystemWin.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/win/FileSystemWin.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -156,19 +156,6 @@
</span><span class="cx">
</span><span class="cx"> String pathByAppendingComponent(const String& path, const String& component)
</span><span class="cx"> {
</span><del>-#if OS(WINCE)
- StringBuilder builder;
-
- builder.append(path);
-
- UChar lastPathCharacter = path[path.length() - 1];
- if (lastPathCharacter != L'\\' && lastPathCharacter != L'/' && component[0] != L'\\' && component[0] != L'/')
- builder.append(PlatformFilePathSeparator);
-
- builder.append(component);
-
- return builder.toString();
-#else
</del><span class="cx"> Vector<UChar> buffer(MAX_PATH);
</span><span class="cx">
</span><span class="cx"> if (path.length() + 1 > buffer.size())
</span><span class="lines">@@ -183,7 +170,6 @@
</span><span class="cx"> buffer.shrink(wcslen(buffer.data()));
</span><span class="cx">
</span><span class="cx"> return String::adopt(buffer);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if !USE(CF)
</span><span class="lines">@@ -226,24 +212,7 @@
</span><span class="cx">
</span><span class="cx"> String pathGetFileName(const String& path)
</span><span class="cx"> {
</span><del>-#if OS(WINCE)
- size_t positionSlash = path.reverseFind('/');
- size_t positionBackslash = path.reverseFind('\\');
-
- size_t position;
- if (positionSlash == notFound)
- position = positionBackslash;
- else if (positionBackslash == notFound)
- position = positionSlash;
- else
- position = std::max(positionSlash, positionBackslash);
-
- if (position == notFound)
- return path;
- return path.substring(position + 1);
-#else
</del><span class="cx"> return String(::PathFindFileName(String(path).charactersWithNullTermination().data()));
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String directoryName(const String& path)
</span><span class="lines">@@ -278,9 +247,6 @@
</span><span class="cx">
</span><span class="cx"> static String storageDirectory(DWORD pathIdentifier)
</span><span class="cx"> {
</span><del>-#if OS(WINCE)
- return String();
-#else
</del><span class="cx"> Vector<UChar> buffer(MAX_PATH);
</span><span class="cx"> if (FAILED(SHGetFolderPathW(0, pathIdentifier | CSIDL_FLAG_CREATE, 0, 0, buffer.data())))
</span><span class="cx"> return String();
</span><span class="lines">@@ -293,7 +259,6 @@
</span><span class="cx"> return String();
</span><span class="cx">
</span><span class="cx"> return directory;
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static String cachedStorageDirectory(DWORD pathIdentifier)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinLoggingWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/LoggingWin.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/LoggingWin.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/win/LoggingWin.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -38,9 +38,6 @@
</span><span class="cx">
</span><span class="cx"> String logLevelString()
</span><span class="cx"> {
</span><del>-#if OS(WINCE)
- return emptyString();
-#else
</del><span class="cx"> DWORD length = GetEnvironmentVariableA(loggingEnvironmentVariable, 0, 0);
</span><span class="cx"> if (!length)
</span><span class="cx"> return emptyString();
</span><span class="lines">@@ -51,7 +48,6 @@
</span><span class="cx"> return emptyString();
</span><span class="cx">
</span><span class="cx"> return String(buffer.get());
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinPasteboardWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/PasteboardWin.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/PasteboardWin.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/win/PasteboardWin.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -79,12 +79,10 @@
</span><span class="cx"> break;
</span><span class="cx"> case WM_DESTROY:
</span><span class="cx"> break;
</span><del>-#if !OS(WINCE)
</del><span class="cx"> case WM_DRAWCLIPBOARD:
</span><span class="cx"> break;
</span><span class="cx"> case WM_CHANGECBCHAIN:
</span><span class="cx"> break;
</span><del>-#endif
</del><span class="cx"> default:
</span><span class="cx"> lresult = DefWindowProc(hWnd, message, wParam, lParam);
</span><span class="cx"> break;
</span><span class="lines">@@ -96,10 +94,8 @@
</span><span class="cx"> {
</span><span class="cx"> OwnPtr<Pasteboard> pasteboard = adoptPtr(new Pasteboard);
</span><span class="cx"> COMPtr<IDataObject> clipboardData;
</span><del>-#if !OS(WINCE)
</del><span class="cx"> if (!SUCCEEDED(OleGetClipboard(&clipboardData)))
</span><span class="cx"> clipboardData = 0;
</span><del>-#endif
</del><span class="cx"> pasteboard->setExternalDataObject(clipboardData.get());
</span><span class="cx"> return pasteboard.release();
</span><span class="cx"> }
</span><span class="lines">@@ -525,7 +521,6 @@
</span><span class="cx"> writePlainTextToDataObject(text, smartReplaceOption);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !OS(WINCE)
</del><span class="cx"> static inline void pathRemoveBadFSCharacters(PWSTR psz, size_t length)
</span><span class="cx"> {
</span><span class="cx"> size_t writeTo = 0;
</span><span class="lines">@@ -539,14 +534,9 @@
</span><span class="cx"> }
</span><span class="cx"> psz[writeTo] = 0;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> static String filesystemPathFromUrlOrTitle(const String& url, const String& title, const UChar* extension, bool isLink)
</span><span class="cx"> {
</span><del>-#if OS(WINCE)
- notImplemented();
- return String();
-#else
</del><span class="cx"> static const size_t fsPathMaxLengthExcludingNullTerminator = MAX_PATH - 1;
</span><span class="cx"> bool usedURL = false;
</span><span class="cx"> WCHAR fsPathBuffer[MAX_PATH];
</span><span class="lines">@@ -589,7 +579,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return makeString(static_cast<const UChar*>(fsPathBuffer), extension);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // writeFileToDataObject takes ownership of fileDescriptor and fileContent
</span><span class="lines">@@ -966,10 +955,6 @@
</span><span class="cx"> else
</span><span class="cx"> return 0;
</span><span class="cx"> } else {
</span><del>-#if OS(WINCE)
- notImplemented();
- return 0;
-#else
</del><span class="cx"> WCHAR tempPath[MAX_PATH];
</span><span class="cx"> WCHAR extension[MAX_PATH];
</span><span class="cx"> if (!::GetTempPath(WTF_ARRAY_LENGTH(tempPath), tempPath))
</span><span class="lines">@@ -1001,7 +986,6 @@
</span><span class="cx"> CloseHandle(tempFileHandle);
</span><span class="cx"> if (!tempWriteSucceeded)
</span><span class="cx"> return 0;
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SIZE_T dropFilesSize = sizeof(DROPFILES) + (sizeof(WCHAR) * (wcslen(filePath) + 2));
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinPlatformMouseEventWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/PlatformMouseEventWin.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/PlatformMouseEventWin.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/win/PlatformMouseEventWin.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -66,9 +66,7 @@
</span><span class="cx"> case WM_MBUTTONUP:
</span><span class="cx"> return PlatformEvent::MouseReleased;
</span><span class="cx">
</span><del>-#if !OS(WINCE)
</del><span class="cx"> case WM_MOUSELEAVE:
</span><del>-#endif
</del><span class="cx"> case WM_MOUSEMOVE:
</span><span class="cx"> return PlatformEvent::MouseMoved;
</span><span class="cx">
</span><span class="lines">@@ -104,9 +102,7 @@
</span><span class="cx"> m_button = MiddleButton;
</span><span class="cx"> break;
</span><span class="cx"> case WM_MOUSEMOVE:
</span><del>-#if !OS(WINCE)
</del><span class="cx"> case WM_MOUSELEAVE:
</span><del>-#endif
</del><span class="cx"> if (wParam & MK_LBUTTON)
</span><span class="cx"> m_button = LeftButton;
</span><span class="cx"> else if (wParam & MK_MBUTTON)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinPlatformScreenWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/PlatformScreenWin.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/PlatformScreenWin.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/win/PlatformScreenWin.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -55,13 +55,8 @@
</span><span class="cx"> DEVMODE deviceInfo;
</span><span class="cx"> deviceInfo.dmSize = sizeof(DEVMODE);
</span><span class="cx"> deviceInfo.dmDriverExtra = 0;
</span><del>-#if OS(WINCE)
- if (!EnumDisplaySettings(0, ENUM_CURRENT_SETTINGS, &deviceInfo))
- deviceInfo.dmBitsPerPel = 16;
-#else
</del><span class="cx"> MONITORINFOEX monitorInfo = monitorInfoForWidget(widget);
</span><span class="cx"> EnumDisplaySettings(monitorInfo.szDevice, ENUM_CURRENT_SETTINGS, &deviceInfo);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> return deviceInfo;
</span><span class="cx"> }
</span><span class="lines">@@ -85,13 +80,8 @@
</span><span class="cx">
</span><span class="cx"> bool screenIsMonochrome(Widget* widget)
</span><span class="cx"> {
</span><del>-#if OS(WINCE)
- // EnumDisplaySettings doesn't set dmColor in DEVMODE.
- return false;
-#else
</del><span class="cx"> DEVMODE deviceInfo = deviceInfoForWidget(widget);
</span><span class="cx"> return deviceInfo.dmColor == DMCOLOR_MONOCHROME;
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FloatRect screenRect(Widget* widget)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinPopupMenuWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/PopupMenuWin.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/PopupMenuWin.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/win/PopupMenuWin.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -49,10 +49,6 @@
</span><span class="cx">
</span><span class="cx"> #include <windows.h>
</span><span class="cx"> #include <windowsx.h>
</span><del>-#if OS(WINCE)
-#include <ResDefCE.h>
-#define MAKEPOINTS(l) (*((POINTS FAR *)&(l)))
-#endif
</del><span class="cx">
</span><span class="cx"> #define HIGH_BIT_MASK_SHORT 0x8000
</span><span class="cx">
</span><span class="lines">@@ -164,7 +160,6 @@
</span><span class="cx"> setFocusedIndex(index);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !OS(WINCE)
</del><span class="cx"> ::SystemParametersInfo(SPI_GETCOMBOBOXANIMATION, 0, &shouldAnimate, 0);
</span><span class="cx">
</span><span class="cx"> if (shouldAnimate) {
</span><span class="lines">@@ -173,10 +168,8 @@
</span><span class="cx"> if (!::IsRectEmpty(&viewRect))
</span><span class="cx"> ::AnimateWindow(m_popup, defaultAnimationDuration, AW_BLEND);
</span><span class="cx"> } else
</span><del>-#endif
</del><ins>+ ::ShowWindow(m_popup, SW_SHOWNOACTIVATE);
</ins><span class="cx">
</span><del>- ::ShowWindow(m_popup, SW_SHOWNOACTIVATE);
-
</del><span class="cx"> m_showPopup = true;
</span><span class="cx">
</span><span class="cx"> // Protect the popup menu in case its owner is destroyed while we're running the message pump.
</span><span class="lines">@@ -199,7 +192,6 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> // Steal mouse messages.
</span><del>-#if !OS(WINCE)
</del><span class="cx"> case WM_NCMOUSEMOVE:
</span><span class="cx"> case WM_NCLBUTTONDOWN:
</span><span class="cx"> case WM_NCLBUTTONUP:
</span><span class="lines">@@ -210,7 +202,6 @@
</span><span class="cx"> case WM_NCMBUTTONDOWN:
</span><span class="cx"> case WM_NCMBUTTONUP:
</span><span class="cx"> case WM_NCMBUTTONDBLCLK:
</span><del>-#endif
</del><span class="cx"> case WM_MOUSEWHEEL:
</span><span class="cx"> msg.hwnd = m_popup;
</span><span class="cx"> break;
</span><span class="lines">@@ -601,11 +592,7 @@
</span><span class="cx"> m_bmp.clear();
</span><span class="cx"> }
</span><span class="cx"> if (!m_bmp) {
</span><del>-#if OS(WINCE)
- BitmapInfo bitmapInfo = BitmapInfo::createBottomUp(clientRect().size(), BitmapInfo::BitCount16);
-#else
</del><span class="cx"> BitmapInfo bitmapInfo = BitmapInfo::createBottomUp(clientRect().size());
</span><del>-#endif
</del><span class="cx"> void* pixels = 0;
</span><span class="cx"> m_bmp = adoptGDIObject(::CreateDIBSection(m_DC.get(), &bitmapInfo, DIB_RGB_COLORS, &pixels, 0, 0));
</span><span class="cx"> if (!m_bmp)
</span><span class="lines">@@ -767,14 +754,10 @@
</span><span class="cx"> if (haveRegisteredWindowClass)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>-#if OS(WINCE)
- WNDCLASS wcex;
-#else
</del><span class="cx"> WNDCLASSEX wcex;
</span><span class="cx"> wcex.cbSize = sizeof(WNDCLASSEX);
</span><span class="cx"> wcex.hIconSm = 0;
</span><span class="cx"> wcex.style = CS_DROPSHADOW;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> wcex.lpfnWndProc = PopupMenuWndProc;
</span><span class="cx"> wcex.cbClsExtra = 0;
</span><span class="lines">@@ -788,11 +771,7 @@
</span><span class="cx">
</span><span class="cx"> haveRegisteredWindowClass = true;
</span><span class="cx">
</span><del>-#if OS(WINCE)
- RegisterClass(&wcex);
-#else
</del><span class="cx"> RegisterClassEx(&wcex);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -819,10 +798,8 @@
</span><span class="cx"> LRESULT lResult = 0;
</span><span class="cx">
</span><span class="cx"> switch (message) {
</span><del>-#if !OS(WINCE)
</del><span class="cx"> case WM_MOUSEACTIVATE:
</span><span class="cx"> return MA_NOACTIVATE;
</span><del>-#endif
</del><span class="cx"> case WM_SIZE: {
</span><span class="cx"> if (!scrollbar())
</span><span class="cx"> break;
</span><span class="lines">@@ -966,9 +943,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> BOOL shouldHotTrack = FALSE;
</span><del>-#if !OS(WINCE)
</del><span class="cx"> ::SystemParametersInfo(SPI_GETHOTTRACKING, 0, &shouldHotTrack, 0);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> RECT bounds;
</span><span class="cx"> GetClientRect(popupHandle(), &bounds);
</span><span class="lines">@@ -1070,11 +1045,9 @@
</span><span class="cx"> lResult = 0;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>-#if !OS(WINCE)
</del><span class="cx"> case WM_PRINTCLIENT:
</span><span class="cx"> paint(clientRect(), (HDC)wParam);
</span><span class="cx"> break;
</span><del>-#endif
</del><span class="cx"> default:
</span><span class="cx"> lResult = DefWindowProc(hWnd, message, wParam, lParam);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinScrollbarThemeWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/ScrollbarThemeWin.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/ScrollbarThemeWin.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/win/ScrollbarThemeWin.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -294,9 +294,7 @@
</span><span class="cx"> if (scrollbar->pressedPart() == scrollbar->hoveredPart()) {
</span><span class="cx"> xpState += TS_ACTIVE;
</span><span class="cx"> classicState |= DFCS_PUSHED;
</span><del>-#if !OS(WINCE)
</del><span class="cx"> classicState |= DFCS_FLAT;
</span><del>-#endif
</del><span class="cx"> } else
</span><span class="cx"> xpState += TS_HOVER;
</span><span class="cx"> } else {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinSharedBufferWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/SharedBufferWin.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/SharedBufferWin.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/win/SharedBufferWin.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -31,11 +31,6 @@
</span><span class="cx"> #include "SharedBuffer.h"
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><del>-// INVALID_FILE_SIZE is not defined on WinCE.
-#ifndef INVALID_FILE_SIZE
-#define INVALID_FILE_SIZE 0xffffffff
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> PassRefPtr<SharedBuffer> SharedBuffer::createWithContentsOfFile(const String& filePath)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinSharedTimerWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/SharedTimerWin.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/SharedTimerWin.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/win/SharedTimerWin.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -63,7 +63,6 @@
</span><span class="cx"> static HWND timerWindowHandle = 0;
</span><span class="cx"> const LPCWSTR kTimerWindowClassName = L"TimerWindowClass";
</span><span class="cx">
</span><del>-#if !OS(WINCE)
</del><span class="cx"> static UINT timerFiredMessage = 0;
</span><span class="cx"> static HANDLE timerQueue;
</span><span class="cx"> static bool highResTimerActive;
</span><span class="lines">@@ -73,7 +72,6 @@
</span><span class="cx"> const int timerResolution = 1; // To improve timer resolution, we call timeBeginPeriod/timeEndPeriod with this value to increase timer resolution to 1ms.
</span><span class="cx"> const int highResolutionThresholdMsec = 16; // Only activate high-res timer for sub-16ms timers (Windows can fire timers at 16ms intervals without changing the system resolution).
</span><span class="cx"> const int stopHighResTimerInMsec = 300; // Stop high-res timer after 0.3 seconds to lessen power consumption (we don't use a smaller time since oscillating between high and low resolution breaks timer accuracy on XP).
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> enum {
</span><span class="cx"> sharedTimerID = 1000,
</span><span class="lines">@@ -98,7 +96,6 @@
</span><span class="cx"> KillTimer(timerWindowHandle, sharedTimerID);
</span><span class="cx"> sharedTimerFiredFunction();
</span><span class="cx"> }
</span><del>-#if !OS(WINCE)
</del><span class="cx"> else if (wParam == endHighResTimerID) {
</span><span class="cx"> KillTimer(timerWindowHandle, endHighResTimerID);
</span><span class="cx"> highResTimerActive = false;
</span><span class="lines">@@ -109,7 +106,6 @@
</span><span class="cx"> processingCustomTimerMessage = true;
</span><span class="cx"> sharedTimerFiredFunction();
</span><span class="cx"> processingCustomTimerMessage = false;
</span><del>-#endif
</del><span class="cx"> } else
</span><span class="cx"> return DefWindowProc(hWnd, message, wParam, lParam);
</span><span class="cx">
</span><span class="lines">@@ -121,30 +117,19 @@
</span><span class="cx"> if (timerWindowHandle)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>-#if OS(WINCE)
- WNDCLASS wcex;
- memset(&wcex, 0, sizeof(WNDCLASS));
-#else
</del><span class="cx"> WNDCLASSEX wcex;
</span><span class="cx"> memset(&wcex, 0, sizeof(WNDCLASSEX));
</span><span class="cx"> wcex.cbSize = sizeof(WNDCLASSEX);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> wcex.lpfnWndProc = TimerWindowWndProc;
</span><span class="cx"> wcex.hInstance = WebCore::instanceHandle();
</span><span class="cx"> wcex.lpszClassName = kTimerWindowClassName;
</span><del>-#if OS(WINCE)
- RegisterClass(&wcex);
-#else
</del><span class="cx"> RegisterClassEx(&wcex);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> timerWindowHandle = CreateWindow(kTimerWindowClassName, 0, 0,
</span><span class="cx"> CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, HWND_MESSAGE, 0, WebCore::instanceHandle(), 0);
</span><span class="cx">
</span><del>-#if !OS(WINCE)
</del><span class="cx"> timerFiredMessage = RegisterWindowMessage(L"com.apple.WebKit.TimerFired");
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void setSharedTimerFiredFunction(void (*f)())
</span><span class="lines">@@ -152,13 +137,11 @@
</span><span class="cx"> sharedTimerFiredFunction = f;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !OS(WINCE)
</del><span class="cx"> static void NTAPI queueTimerProc(PVOID, BOOLEAN)
</span><span class="cx"> {
</span><span class="cx"> if (InterlockedIncrement(&pendingTimers) == 1)
</span><span class="cx"> PostMessage(timerWindowHandle, timerFiredMessage, 0, 0);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void setSharedTimerFireInterval(double interval)
</span><span class="cx"> {
</span><span class="lines">@@ -174,7 +157,6 @@
</span><span class="cx"> initializeOffScreenTimerWindow();
</span><span class="cx"> bool timerSet = false;
</span><span class="cx">
</span><del>-#if !OS(WINCE)
</del><span class="cx"> if (Settings::shouldUseHighResolutionTimers()) {
</span><span class="cx"> if (interval < highResolutionThresholdMsec) {
</span><span class="cx"> if (!highResTimerActive) {
</span><span class="lines">@@ -206,7 +188,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-#endif // !OS(WINCE)
</del><span class="cx">
</span><span class="cx"> if (timerSet) {
</span><span class="cx"> if (timerID) {
</span><span class="lines">@@ -221,12 +202,10 @@
</span><span class="cx">
</span><span class="cx"> void stopSharedTimer()
</span><span class="cx"> {
</span><del>-#if !OS(WINCE)
</del><span class="cx"> if (timerQueue && timer) {
</span><span class="cx"> DeleteTimerQueueTimer(timerQueue, timer, 0);
</span><span class="cx"> timer = 0;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> if (timerID) {
</span><span class="cx"> KillTimer(timerWindowHandle, timerID);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinSoftLinkingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/SoftLinking.h (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/SoftLinking.h 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/win/SoftLinking.h 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -39,12 +39,7 @@
</span><span class="cx"> return library; \
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if OS(WINCE)
-#define SOFT_LINK_GETPROCADDRESS GetProcAddressA
-#else
</del><span class="cx"> #define SOFT_LINK_GETPROCADDRESS GetProcAddress
</span><del>-#endif
-
</del><span class="cx"> #define SOFT_LINK_LIBRARY(lib) SOFT_LINK_LIBRARY_HELPER(lib, L".dll")
</span><span class="cx"> #define SOFT_LINK_DEBUG_LIBRARY(lib) SOFT_LINK_LIBRARY_HELPER(lib, L"_debug.dll")
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinSystemInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/SystemInfo.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/SystemInfo.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/win/SystemInfo.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -39,23 +39,13 @@
</span><span class="cx">
</span><span class="cx"> if (!initialized) {
</span><span class="cx"> initialized = true;
</span><del>-#if OS(WINCE)
- OSVERSIONINFO versionInfo;
-#else
</del><span class="cx"> OSVERSIONINFOEX versionInfo;
</span><del>-#endif
</del><span class="cx"> ZeroMemory(&versionInfo, sizeof(versionInfo));
</span><span class="cx"> versionInfo.dwOSVersionInfoSize = sizeof(versionInfo);
</span><span class="cx"> GetVersionEx(reinterpret_cast<OSVERSIONINFO*>(&versionInfo));
</span><span class="cx"> majorVersion = versionInfo.dwMajorVersion;
</span><span class="cx"> minorVersion = versionInfo.dwMinorVersion;
</span><span class="cx">
</span><del>-#if OS(WINCE)
- if (majorVersion >= 1 && majorVersion <= 7)
- version = static_cast<WindowsVersion>(WindowsCE1 + (majorVersion - 1));
- else
- version = (majorVersion < 1) ? WindowsCE1 : WindowsCE7;
-#else
</del><span class="cx"> if (versionInfo.dwPlatformId == VER_PLATFORM_WIN32s)
</span><span class="cx"> version = Windows3_1;
</span><span class="cx"> else if (versionInfo.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) {
</span><span class="lines">@@ -77,7 +67,6 @@
</span><span class="cx"> } else
</span><span class="cx"> version = (majorVersion == 4) ? WindowsNT4 : WindowsNT3;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (major)
</span><span class="lines">@@ -114,7 +103,6 @@
</span><span class="cx"> return familyName + String::number(major) + '.' + String::number(minor);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !OS(WINCE)
</del><span class="cx"> static bool isWOW64()
</span><span class="cx"> {
</span><span class="cx"> static bool initialized = false;
</span><span class="lines">@@ -158,18 +146,15 @@
</span><span class="cx">
</span><span class="cx"> return architecture;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> static String architectureTokenForUAString()
</span><span class="cx"> {
</span><del>-#if !OS(WINCE)
</del><span class="cx"> if (isWOW64())
</span><span class="cx"> return "; WOW64";
</span><span class="cx"> if (processorArchitecture() == PROCESSOR_ARCHITECTURE_AMD64)
</span><span class="cx"> return "; Win64; x64";
</span><span class="cx"> if (processorArchitecture() == PROCESSOR_ARCHITECTURE_IA64)
</span><span class="cx"> return "; Win64; IA64";
</span><del>-#endif
</del><span class="cx"> return String();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinWCDataObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/WCDataObject.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/WCDataObject.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/platform/win/WCDataObject.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -279,7 +279,6 @@
</span><span class="cx"> {
</span><span class="cx"> switch(pMedSrc->tymed)
</span><span class="cx"> {
</span><del>-#if !OS(WINCE)
</del><span class="cx"> case TYMED_HGLOBAL:
</span><span class="cx"> pMedDest->hGlobal = (HGLOBAL)OleDuplicateData(pMedSrc->hGlobal,pFmtSrc->cfFormat, 0);
</span><span class="cx"> break;
</span><span class="lines">@@ -295,7 +294,6 @@
</span><span class="cx"> case TYMED_FILE:
</span><span class="cx"> pMedSrc->lpszFileName = (LPOLESTR)OleDuplicateData(pMedSrc->lpszFileName,pFmtSrc->cfFormat, 0);
</span><span class="cx"> break;
</span><del>-#endif
</del><span class="cx"> case TYMED_ISTREAM:
</span><span class="cx"> pMedDest->pstm = pMedSrc->pstm;
</span><span class="cx"> pMedSrc->pstm->AddRef();
</span></span></pre></div>
<a id="trunkSourceWebCorepluginsPluginDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/plugins/PluginDatabase.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/plugins/PluginDatabase.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/plugins/PluginDatabase.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -375,7 +375,7 @@
</span><span class="cx"> return m_disabledPluginFiles.add(fileName).isNewEntry;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if (!OS(WINCE)) && (!OS(WINDOWS) || !ENABLE(NETSCAPE_PLUGIN_API))
</del><ins>+#if (!OS(WINDOWS) || !ENABLE(NETSCAPE_PLUGIN_API))
</ins><span class="cx"> // For Safari/Win the following three methods are implemented
</span><span class="cx"> // in PluginDatabaseWin.cpp, but if we can use WebCore constructs
</span><span class="cx"> // for the logic we should perhaps move it here under XP_WIN?
</span></span></pre></div>
<a id="trunkSourceWebCorepluginsPluginViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/plugins/PluginView.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/plugins/PluginView.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/plugins/PluginView.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -340,17 +340,10 @@
</span><span class="cx"> #if defined(XP_WIN) && !PLATFORM(GTK)
</span><span class="cx"> // Unsubclass the window
</span><span class="cx"> if (m_isWindowed) {
</span><del>-#if OS(WINCE)
- WNDPROC currentWndProc = (WNDPROC)GetWindowLong(platformPluginWidget(), GWL_WNDPROC);
-
- if (currentWndProc == PluginViewWndProc)
- SetWindowLong(platformPluginWidget(), GWL_WNDPROC, (LONG)m_pluginWndProc);
-#else
</del><span class="cx"> WNDPROC currentWndProc = (WNDPROC)GetWindowLongPtr(platformPluginWidget(), GWLP_WNDPROC);
</span><span class="cx">
</span><span class="cx"> if (currentWndProc == PluginViewWndProc)
</span><span class="cx"> SetWindowLongPtr(platformPluginWidget(), GWLP_WNDPROC, (LONG_PTR)m_pluginWndProc);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> #endif // !defined(XP_WIN) || PLATFORM(GTK)
</span><span class="cx"> #endif // ENABLE(NETSCAPE_PLUGIN_API)
</span></span></pre></div>
<a id="trunkSourceWebCorepluginsPluginViewNonecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/plugins/PluginViewNone.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/plugins/PluginViewNone.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/plugins/PluginViewNone.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> // ports using PluginView, but until then, if new functions like this are
</span><span class="cx"> // added, please make sure they have the proper platform #ifs so that changes
</span><span class="cx"> // do not break ports who compile both this file and PluginView.cpp.
</span><del>-#if PLATFORM(COCOA) || PLATFORM(EFL) || PLATFORM(GTK) || OS(WINCE)
</del><ins>+#if PLATFORM(COCOA) || PLATFORM(EFL) || PLATFORM(GTK)
</ins><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> void PluginView::keepAlive(NPP)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorepluginswinPluginDatabaseWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/plugins/win/PluginDatabaseWin.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/plugins/win/PluginDatabaseWin.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/plugins/win/PluginDatabaseWin.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -33,38 +33,6 @@
</span><span class="cx"> #include "PluginPackage.h"
</span><span class="cx"> #include <wtf/WindowsExtras.h>
</span><span class="cx">
</span><del>-#if OS(WINCE)
-// WINCE doesn't support Registry Key Access Rights. The parameter should always be 0
-#ifndef KEY_ENUMERATE_SUB_KEYS
-#define KEY_ENUMERATE_SUB_KEYS 0
-#endif
-
-BOOL PathRemoveFileSpec(LPWSTR moduleFileNameStr)
-{
- if (!*moduleFileNameStr)
- return FALSE;
-
- LPWSTR lastPos = 0;
- LPWSTR curPos = moduleFileNameStr;
- do {
- if (*curPos == L'/' || *curPos == L'\\')
- lastPos = curPos;
- } while (*++curPos);
-
- if (lastPos == curPos - 1)
- return FALSE;
-
- if (lastPos)
- *lastPos = 0;
- else {
- moduleFileNameStr[0] = L'\\';
- moduleFileNameStr[1] = 0;
- }
-
- return TRUE;
-}
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> static inline void addPluginPathsFromRegistry(HKEY rootKey, HashSet<String>& paths)
</span><span class="lines">@@ -238,14 +206,12 @@
</span><span class="cx">
</span><span class="cx"> static inline void addWindowsMediaPlayerPluginDirectory(Vector<String>& directories)
</span><span class="cx"> {
</span><del>-#if !OS(WINCE)
</del><span class="cx"> // The new WMP Firefox plugin is installed in \PFiles\Plugins if it can't find any Firefox installs
</span><span class="cx"> WCHAR pluginDirectoryStr[_MAX_PATH + 1];
</span><span class="cx"> DWORD pluginDirectorySize = ::ExpandEnvironmentStringsW(TEXT("%SYSTEMDRIVE%\\PFiles\\Plugins"), pluginDirectoryStr, WTF_ARRAY_LENGTH(pluginDirectoryStr));
</span><span class="cx">
</span><span class="cx"> if (pluginDirectorySize > 0 && pluginDirectorySize <= WTF_ARRAY_LENGTH(pluginDirectoryStr))
</span><span class="cx"> directories.append(String(pluginDirectoryStr, pluginDirectorySize - 1));
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> DWORD type;
</span><span class="cx"> WCHAR installationDirectoryStr[_MAX_PATH];
</span><span class="lines">@@ -377,7 +343,6 @@
</span><span class="cx">
</span><span class="cx"> static inline void addMacromediaPluginDirectories(Vector<String>& directories)
</span><span class="cx"> {
</span><del>-#if !OS(WINCE)
</del><span class="cx"> WCHAR systemDirectoryStr[MAX_PATH];
</span><span class="cx">
</span><span class="cx"> if (!GetSystemDirectory(systemDirectoryStr, WTF_ARRAY_LENGTH(systemDirectoryStr)))
</span><span class="lines">@@ -390,7 +355,6 @@
</span><span class="cx">
</span><span class="cx"> PathCombine(macromediaDirectoryStr, systemDirectoryStr, TEXT("macromed\\Shockwave 10"));
</span><span class="cx"> directories.append(macromediaDirectoryStr);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Vector<String> PluginDatabase::defaultPluginDirectories()
</span></span></pre></div>
<a id="trunkSourceWebCorepluginswinPluginPackageWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/plugins/win/PluginPackageWin.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/plugins/win/PluginPackageWin.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/plugins/win/PluginPackageWin.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -237,9 +237,6 @@
</span><span class="cx"> m_loadCount++;
</span><span class="cx"> return true;
</span><span class="cx"> } else {
</span><del>-#if OS(WINCE)
- m_module = ::LoadLibraryW(m_path.charactersWithNullTermination().data());
-#else
</del><span class="cx"> WCHAR currentPath[MAX_PATH];
</span><span class="cx">
</span><span class="cx"> if (!::GetCurrentDirectoryW(MAX_PATH, currentPath))
</span><span class="lines">@@ -258,7 +255,6 @@
</span><span class="cx"> ::FreeLibrary(m_module);
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!m_module)
</span><span class="lines">@@ -270,15 +266,9 @@
</span><span class="cx"> NP_InitializeFuncPtr NP_Initialize = 0;
</span><span class="cx"> NPError npErr;
</span><span class="cx">
</span><del>-#if OS(WINCE)
- NP_Initialize = (NP_InitializeFuncPtr)GetProcAddress(m_module, L"NP_Initialize");
- NP_GetEntryPoints = (NP_GetEntryPointsFuncPtr)GetProcAddress(m_module, L"NP_GetEntryPoints");
- m_NPP_Shutdown = (NPP_ShutdownProcPtr)GetProcAddress(m_module, L"NP_Shutdown");
-#else
</del><span class="cx"> NP_Initialize = (NP_InitializeFuncPtr)GetProcAddress(m_module, "NP_Initialize");
</span><span class="cx"> NP_GetEntryPoints = (NP_GetEntryPointsFuncPtr)GetProcAddress(m_module, "NP_GetEntryPoints");
</span><span class="cx"> m_NPP_Shutdown = (NPP_ShutdownProcPtr)GetProcAddress(m_module, "NP_Shutdown");
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> if (!NP_Initialize || !NP_GetEntryPoints || !m_NPP_Shutdown)
</span><span class="cx"> goto abort;
</span></span></pre></div>
<a id="trunkSourceWebCorepluginswinPluginViewWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/plugins/win/PluginViewWin.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/plugins/win/PluginViewWin.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/plugins/win/PluginViewWin.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -73,13 +73,6 @@
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx"> #include <wtf/win/GDIObject.h>
</span><span class="cx">
</span><del>-#if OS(WINCE)
-#undef LOG_NPERROR
-#define LOG_NPERROR(x)
-#undef LOG_PLUGIN_NET_ERROR
-#define LOG_PLUGIN_NET_ERROR()
-#endif
-
</del><span class="cx"> #if USE(CAIRO)
</span><span class="cx"> #include "PlatformContextCairo.h"
</span><span class="cx"> #include <cairo-win32.h>
</span><span class="lines">@@ -118,7 +111,6 @@
</span><span class="cx"> const LPCWSTR kWebPluginViewdowClassName = L"WebPluginView";
</span><span class="cx"> const LPCWSTR kWebPluginViewProperty = L"WebPluginViewProperty";
</span><span class="cx">
</span><del>-#if !OS(WINCE)
</del><span class="cx"> // The code used to hook BeginPaint/EndPaint originally came from
</span><span class="cx"> // <http://www.fengyuan.com/article/wmprint.html>.
</span><span class="cx"> // Copyright (C) 2000 by Feng Yuan (www.fengyuan.com).
</span><span class="lines">@@ -270,7 +262,6 @@
</span><span class="cx"> hook("user32.dll", "EndPaint", endPaintSysCall, endPaint, reinterpret_cast<const void *>(reinterpret_cast<ptrdiff_t>(hookedEndPaint)));
</span><span class="cx">
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> static bool registerPluginView()
</span><span class="cx"> {
</span><span class="lines">@@ -286,18 +277,10 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(WebCore::instanceHandle());
</span><span class="cx">
</span><del>-#if OS(WINCE)
- WNDCLASS wcex = { 0 };
-#else
</del><span class="cx"> WNDCLASSEX wcex;
</span><span class="cx"> wcex.cbSize = sizeof(WNDCLASSEX);
</span><span class="cx"> wcex.hIconSm = 0;
</span><del>-#endif
-
</del><span class="cx"> wcex.style = CS_DBLCLKS;
</span><del>-#if OS(WINCE)
- wcex.style |= CS_PARENTDC;
-#endif
</del><span class="cx"> wcex.lpfnWndProc = DefWindowProc;
</span><span class="cx"> wcex.cbClsExtra = 0;
</span><span class="cx"> wcex.cbWndExtra = 0;
</span><span class="lines">@@ -308,11 +291,7 @@
</span><span class="cx"> wcex.lpszMenuName = 0;
</span><span class="cx"> wcex.lpszClassName = kWebPluginViewdowClassName;
</span><span class="cx">
</span><del>-#if OS(WINCE)
- return !!RegisterClass(&wcex);
-#else
</del><span class="cx"> return !!RegisterClassEx(&wcex);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LRESULT CALLBACK PluginView::PluginViewWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
</span><span class="lines">@@ -394,7 +373,6 @@
</span><span class="cx"> m_popPopupsStateTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !OS(WINCE)
</del><span class="cx"> if (message == WM_PRINTCLIENT) {
</span><span class="cx"> // Most (all?) windowed plugins don't respond to WM_PRINTCLIENT, so we
</span><span class="cx"> // change the message to WM_PAINT and rely on our hooked versions of
</span><span class="lines">@@ -402,7 +380,6 @@
</span><span class="cx"> message = WM_PAINT;
</span><span class="cx"> m_wmPrintHDC = reinterpret_cast<HDC>(wParam);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> // Call the plug-in's window proc.
</span><span class="cx"> LRESULT result = ::CallWindowProc(m_pluginWndProc, hWnd, message, wParam, lParam);
</span><span class="lines">@@ -425,11 +402,7 @@
</span><span class="cx"> IntRect oldWindowRect = m_windowRect;
</span><span class="cx"> IntRect oldClipRect = m_clipRect;
</span><span class="cx">
</span><del>-#if OS(WINCE)
- m_windowRect = frameView->contentsToWindow(frameRect());
-#else
</del><span class="cx"> m_windowRect = IntRect(frameView->contentsToWindow(frameRect().location()), frameRect().size());
</span><del>-#endif
</del><span class="cx"> m_clipRect = windowClipRect();
</span><span class="cx"> m_clipRect.move(-m_windowRect.x(), -m_windowRect.y());
</span><span class="cx">
</span><span class="lines">@@ -529,9 +502,7 @@
</span><span class="cx"> void PluginView::paintIntoTransformedContext(HDC hdc)
</span><span class="cx"> {
</span><span class="cx"> if (m_isWindowed) {
</span><del>-#if !OS(WINCE)
</del><span class="cx"> SendMessage(platformPluginWidget(), WM_PRINTCLIENT, reinterpret_cast<WPARAM>(hdc), PRF_CLIENT | PRF_CHILDREN | PRF_OWNED);
</span><del>-#endif
</del><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -641,7 +612,7 @@
</span><span class="cx"> // of the window and the plugin expects that the passed in DC has window coordinates.
</span><span class="cx"> // In the GTK and Qt ports we always draw in an offscreen buffer and therefore need
</span><span class="cx"> // to preserve the translation set in getWindowsContext.
</span><del>-#if !PLATFORM(GTK) && !OS(WINCE)
</del><ins>+#if !PLATFORM(GTK)
</ins><span class="cx"> if (!context->isInTransparencyLayer()) {
</span><span class="cx"> XFORM transform;
</span><span class="cx"> GetWorldTransform(windowsContext.hdc(), &transform);
</span><span class="lines">@@ -679,9 +650,7 @@
</span><span class="cx"> event->setDefaultHandled();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !OS(WINCE)
</del><span class="cx"> extern bool ignoreNextSetCursor;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void PluginView::handleMouseEvent(MouseEvent* event)
</span><span class="cx"> {
</span><span class="lines">@@ -749,7 +718,7 @@
</span><span class="cx"> if (dispatchNPEvent(npEvent))
</span><span class="cx"> event->setDefaultHandled();
</span><span class="cx">
</span><del>-#if !PLATFORM(GTK) && !OS(WINCE)
</del><ins>+#if !PLATFORM(GTK)
</ins><span class="cx"> // Currently, Widget::setCursor is always called after this function in EventHandler.cpp
</span><span class="cx"> // and since we don't want that we set ignoreNextSetCursor to true here to prevent that.
</span><span class="cx"> ignoreNextSetCursor = true;
</span><span class="lines">@@ -762,15 +731,6 @@
</span><span class="cx"> {
</span><span class="cx"> Widget::setParent(parent);
</span><span class="cx">
</span><del>-#if OS(WINCE)
- if (parent) {
- init();
- if (parent->isVisible())
- show();
- else
- hide();
- }
-#else
</del><span class="cx"> if (parent)
</span><span class="cx"> init();
</span><span class="cx"> else {
</span><span class="lines">@@ -784,7 +744,6 @@
</span><span class="cx"> if (platformPluginWidget() == focusedWindow || ::IsChild(platformPluginWidget(), focusedWindow))
</span><span class="cx"> ::SetFocus(0);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PluginView::setParentVisible(bool visible)
</span><span class="lines">@@ -807,18 +766,7 @@
</span><span class="cx"> if (!m_isStarted)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>-#if OS(WINCE)
- IntRect r = toFrameView(parent())->contentsToWindow(rect);
- m_npWindow.x = r.x();
- m_npWindow.y = r.y();
-
- m_npWindow.width = r.width();
- m_npWindow.height = r.height();
-
- m_npWindow.clipRect.right = r.width();
- m_npWindow.clipRect.bottom = r.height();
-#else
- // In the GTK and Qt ports we draw in an offscreen buffer and don't want to use the window
</del><ins>+ // In the GTK port we draw in an offscreen buffer and don't want to use the window
</ins><span class="cx"> // coordinates.
</span><span class="cx"> # if PLATFORM(GTK)
</span><span class="cx"> IntPoint p = rect.location();
</span><span class="lines">@@ -833,7 +781,6 @@
</span><span class="cx">
</span><span class="cx"> m_npWindow.clipRect.right = rect.width();
</span><span class="cx"> m_npWindow.clipRect.bottom = rect.height();
</span><del>-#endif
</del><span class="cx"> m_npWindow.clipRect.left = 0;
</span><span class="cx"> m_npWindow.clipRect.top = 0;
</span><span class="cx">
</span><span class="lines">@@ -850,17 +797,9 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(platformPluginWidget());
</span><span class="cx">
</span><del>-#if OS(WINCE)
- if (!m_pluginWndProc) {
- WNDPROC currentWndProc = (WNDPROC)GetWindowLong(platformPluginWidget(), GWL_WNDPROC);
- if (currentWndProc != PluginViewWndProc)
- m_pluginWndProc = (WNDPROC)SetWindowLong(platformPluginWidget(), GWL_WNDPROC, (LONG)PluginViewWndProc);
- }
-#else
</del><span class="cx"> WNDPROC currentWndProc = (WNDPROC)GetWindowLongPtr(platformPluginWidget(), GWLP_WNDPROC);
</span><span class="cx"> if (currentWndProc != PluginViewWndProc)
</span><span class="cx"> m_pluginWndProc = (WNDPROC)SetWindowLongPtr(platformPluginWidget(), GWLP_WNDPROC, (LONG_PTR)PluginViewWndProc);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -988,9 +927,7 @@
</span><span class="cx">
</span><span class="cx"> if (m_isWindowed) {
</span><span class="cx"> registerPluginView();
</span><del>-#if !OS(WINCE)
</del><span class="cx"> setUpOffscreenPaintingHooks(hookedBeginPaint, hookedEndPaint);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> DWORD flags = WS_CHILD;
</span><span class="cx"> if (isSelfVisible())
</span><span class="lines">@@ -1010,8 +947,6 @@
</span><span class="cx"> // the Shockwave Director plug-in.
</span><span class="cx"> #if OS(WINDOWS) && CPU(X86_64)
</span><span class="cx"> ::SetWindowLongPtrA(platformPluginWidget(), GWLP_WNDPROC, (LONG_PTR)DefWindowProcA);
</span><del>-#elif OS(WINCE)
- ::SetWindowLong(platformPluginWidget(), GWL_WNDPROC, (LONG)DefWindowProc);
</del><span class="cx"> #else
</span><span class="cx"> ::SetWindowLongPtrA(platformPluginWidget(), GWL_WNDPROC, (LONG)DefWindowProcA);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeWinCEcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/rendering/RenderThemeWinCE.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeWinCE.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/rendering/RenderThemeWinCE.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,692 +0,0 @@
</span><del>-/*
- * This file is part of the WebKit project.
- *
- * Copyright (C) 2006, 2007 Apple Inc.
- * Copyright (C) 2007-2009 Torch Mobile, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#include "config.h"
-#include "RenderThemeWinCE.h"
-
-#include "CSSStyleSheet.h"
-#include "CSSValueKeywords.h"
-#include "Document.h"
-#include "FontMetrics.h"
-#include "GraphicsContext.h"
-#if ENABLE(VIDEO)
-#include "HTMLMediaElement.h"
-#endif
-#include "NotImplemented.h"
-#include "PaintInfo.h"
-
-#include <windows.h>
-
-/*
- * The following constants are used to determine how a widget is drawn using
- * Windows' Theme API. For more information on theme parts and states see
- * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/shellcc/platform/commctls/userex/topics/partsandstates.asp
- */
-#define THEME_COLOR 204
-#define THEME_FONT 210
-
-// Generic state constants
-#define TS_NORMAL 1
-#define TS_HOVER 2
-#define TS_ACTIVE 3
-#define TS_DISABLED 4
-#define TS_FOCUSED 5
-
-// Button constants
-#define BP_BUTTON 1
-#define BP_RADIO 2
-#define BP_CHECKBOX 3
-
-// Textfield constants
-#define TFP_TEXTFIELD 1
-#define TFS_READONLY 6
-
-typedef HANDLE (WINAPI*openThemeDataPtr)(HWND hwnd, LPCWSTR pszClassList);
-typedef HRESULT (WINAPI*closeThemeDataPtr)(HANDLE hTheme);
-typedef HRESULT (WINAPI*drawThemeBackgroundPtr)(HANDLE hTheme, HDC hdc, int iPartId,
- int iStateId, const RECT *pRect,
- const RECT* pClipRect);
-typedef HRESULT (WINAPI*drawThemeEdgePtr)(HANDLE hTheme, HDC hdc, int iPartId,
- int iStateId, const RECT *pRect,
- unsigned uEdge, unsigned uFlags,
- const RECT* pClipRect);
-typedef HRESULT (WINAPI*getThemeContentRectPtr)(HANDLE hTheme, HDC hdc, int iPartId,
- int iStateId, const RECT* pRect,
- RECT* pContentRect);
-typedef HRESULT (WINAPI*getThemePartSizePtr)(HANDLE hTheme, HDC hdc, int iPartId,
- int iStateId, RECT* prc, int ts,
- SIZE* psz);
-typedef HRESULT (WINAPI*getThemeSysFontPtr)(HANDLE hTheme, int iFontId, OUT LOGFONT* pFont);
-typedef HRESULT (WINAPI*getThemeColorPtr)(HANDLE hTheme, HDC hdc, int iPartId,
- int iStateId, int iPropId, OUT COLORREF* pFont);
-
-namespace WebCore {
-
-static const int dropDownButtonWidth = 17;
-static const int trackWidth = 4;
-
-PassRefPtr<RenderTheme> RenderThemeWinCE::create()
-{
- return adoptRef(new RenderThemeWinCE);
-}
-
-PassRefPtr<RenderTheme> RenderTheme::themeForPage(Page* page)
-{
- static RenderTheme* winceTheme = RenderThemeWinCE::create().leakRef();
- return winceTheme;
-}
-
-RenderThemeWinCE::RenderThemeWinCE()
-{
-}
-
-RenderThemeWinCE::~RenderThemeWinCE()
-{
-}
-
-Color RenderThemeWinCE::platformActiveSelectionBackgroundColor() const
-{
- COLORREF color = GetSysColor(COLOR_HIGHLIGHT);
- return Color(GetRValue(color), GetGValue(color), GetBValue(color), 255);
-}
-
-Color RenderThemeWinCE::platformInactiveSelectionBackgroundColor() const
-{
- COLORREF color = GetSysColor(COLOR_GRAYTEXT);
- return Color(GetRValue(color), GetGValue(color), GetBValue(color), 255);
-}
-
-Color RenderThemeWinCE::platformActiveSelectionForegroundColor() const
-{
- COLORREF color = GetSysColor(COLOR_HIGHLIGHTTEXT);
- return Color(GetRValue(color), GetGValue(color), GetBValue(color), 255);
-}
-
-Color RenderThemeWinCE::platformInactiveSelectionForegroundColor() const
-{
- return Color::white;
-}
-
-bool RenderThemeWinCE::supportsFocus(ControlPart appearance) const
-{
- switch (appearance) {
- case PushButtonPart:
- case ButtonPart:
- case TextFieldPart:
- case TextAreaPart:
- return true;
- default:
- return false;
- }
-
- return false;
-}
-
-bool RenderThemeWinCE::supportsFocusRing(const RenderStyle *style) const
-{
- return supportsFocus(style->appearance());
-}
-
-unsigned RenderThemeWinCE::determineClassicState(RenderObject* o)
-{
- unsigned result = 0;
- if (!isEnabled(o) || isReadOnlyControl(o))
- result = DFCS_INACTIVE;
- else if (isPressed(o)) // Active supersedes hover
- result = DFCS_PUSHED;
-
- if (isChecked(o))
- result |= DFCS_CHECKED;
- return result;
-}
-
-ThemeData RenderThemeWinCE::getThemeData(RenderObject* o)
-{
- ThemeData result;
- switch (o->style().appearance()) {
- case PushButtonPart:
- case ButtonPart:
- result.m_part = BP_BUTTON;
- result.m_classicState = DFCS_BUTTONPUSH;
- break;
- case CheckboxPart:
- result.m_part = BP_CHECKBOX;
- result.m_classicState = DFCS_BUTTONCHECK;
- break;
- case RadioPart:
- result.m_part = BP_RADIO;
- result.m_classicState = DFCS_BUTTONRADIO;
- break;
- case ListboxPart:
- case MenulistPart:
- case TextFieldPart:
- case TextAreaPart:
- result.m_part = TFP_TEXTFIELD;
- break;
- }
-
- result.m_classicState |= determineClassicState(o);
-
- return result;
-}
-
-bool RenderThemeWinCE::paintButton(RenderObject* o, const PaintInfo& i, const IntRect& r)
-{
- // Get the correct theme data for a button
- ThemeData themeData = getThemeData(o);
-
- // Now paint the button.
- i.context->drawFrameControl(r, DFC_BUTTON, themeData.m_classicState);
- if (isFocused(o)) {
- if (themeData.m_part == BP_BUTTON) {
- IntRect focusRect(r);
- focusRect.inflate(-2);
- i.context->drawFocusRect(focusRect);
- } else
- i.context->drawFocusRect(r);
- }
-
- return false;
-}
-
-void RenderThemeWinCE::setCheckboxSize(RenderStyle* style) const
-{
- // If the width and height are both specified, then we have nothing to do.
- if (!style->width().isIntrinsicOrAuto() && !style->height().isAuto())
- return;
-
- // FIXME: A hard-coded size of 13 is used. This is wrong but necessary for now. It matches Firefox.
- // At different DPI settings on Windows, querying the theme gives you a larger size that accounts for
- // the higher DPI. Until our entire engine honors a DPI setting other than 96, we can't rely on the theme's
- // metrics.
- if (style->width().isIntrinsicOrAuto())
- style->setWidth(Length(13, Fixed));
- if (style->height().isAuto())
- style->setHeight(Length(13, Fixed));
-}
-
-bool RenderThemeWinCE::paintTextField(RenderObject* o, const PaintInfo& i, const IntRect& r)
-{
- // Get the correct theme data for a textfield
- ThemeData themeData = getThemeData(o);
-
- // Now paint the text field.
- i.context->paintTextField(r, themeData.m_classicState);
-
- return false;
-}
-
-void RenderThemeWinCE::adjustMenuListStyle(StyleResolver* styleResolver, RenderStyle* style, Element* e) const
-{
- style->resetBorder();
- adjustMenuListButtonStyle(styleResolver, style, e);
-}
-
-bool RenderThemeWinCE::paintMenuList(RenderObject* renderer, const PaintInfo& paintInfo, const IntRect& rect)
-{
- paintTextField(renderer, paintInfo, rect);
- paintMenuListButtonDecorations(renderer, paintInfo, rect);
- return true;
-}
-
-bool RenderThemeWinCE::paintMenuListButtonDecorations(RenderObject* renderer, const PaintInfo& paintInfo, const IntRect& rect)
-{
- IntRect buttonRect(rect.maxX() - dropDownButtonWidth - 1, rect.y(), dropDownButtonWidth, rect.height());
- buttonRect.inflateY(-1);
- paintInfo.context->drawFrameControl(buttonRect, DFC_SCROLL, DFCS_SCROLLCOMBOBOX | determineClassicState(renderer));
- return true;
-}
-
-void RenderThemeWinCE::systemFont(CSSValueID, FontDescription& fontDescription) const
-{
- notImplemented();
-}
-
-void RenderThemeWinCE::themeChanged()
-{
-}
-
-String RenderThemeWinCE::extraDefaultStyleSheet()
-{
- notImplemented();
- return String();
-}
-
-String RenderThemeWinCE::extraQuirksStyleSheet()
-{
- notImplemented();
- return String();
-}
-
-bool RenderThemeWinCE::supportsHover(const RenderStyle*) const
-{
- return false;
-}
-
-// Map a CSSValue* system color to an index understood by GetSysColor
-static int cssValueIdToSysColorIndex(CSSValueID cssValueId)
-{
- switch (cssValueId) {
- case CSSValueActiveborder: return COLOR_ACTIVEBORDER;
- case CSSValueActivecaption: return COLOR_ACTIVECAPTION;
- case CSSValueAppworkspace: return COLOR_APPWORKSPACE;
- case CSSValueBackground: return COLOR_BACKGROUND;
- case CSSValueButtonface: return COLOR_BTNFACE;
- case CSSValueButtonhighlight: return COLOR_BTNHIGHLIGHT;
- case CSSValueButtonshadow: return COLOR_BTNSHADOW;
- case CSSValueButtontext: return COLOR_BTNTEXT;
- case CSSValueCaptiontext: return COLOR_CAPTIONTEXT;
- case CSSValueGraytext: return COLOR_GRAYTEXT;
- case CSSValueHighlight: return COLOR_HIGHLIGHT;
- case CSSValueHighlighttext: return COLOR_HIGHLIGHTTEXT;
- case CSSValueInactiveborder: return COLOR_INACTIVEBORDER;
- case CSSValueInactivecaption: return COLOR_INACTIVECAPTION;
- case CSSValueInactivecaptiontext: return COLOR_INACTIVECAPTIONTEXT;
- case CSSValueInfobackground: return COLOR_INFOBK;
- case CSSValueInfotext: return COLOR_INFOTEXT;
- case CSSValueMenu: return COLOR_MENU;
- case CSSValueMenutext: return COLOR_MENUTEXT;
- case CSSValueScrollbar: return COLOR_SCROLLBAR;
- case CSSValueThreeddarkshadow: return COLOR_3DDKSHADOW;
- case CSSValueThreedface: return COLOR_3DFACE;
- case CSSValueThreedhighlight: return COLOR_3DHIGHLIGHT;
- case CSSValueThreedlightshadow: return COLOR_3DLIGHT;
- case CSSValueThreedshadow: return COLOR_3DSHADOW;
- case CSSValueWindow: return COLOR_WINDOW;
- case CSSValueWindowframe: return COLOR_WINDOWFRAME;
- case CSSValueWindowtext: return COLOR_WINDOWTEXT;
- default: return -1; // Unsupported CSSValue
- }
-}
-
-Color RenderThemeWinCE::systemColor(CSSValueID cssValueId) const
-{
- int sysColorIndex = cssValueIdToSysColorIndex(cssValueId);
- if (sysColorIndex == -1)
- return RenderTheme::systemColor(cssValueId);
-
- COLORREF color = GetSysColor(sysColorIndex);
- return Color(GetRValue(color), GetGValue(color), GetBValue(color));
-}
-
-const int sliderThumbWidth = 7;
-const int sliderThumbHeight = 15;
-
-void RenderThemeWinCE::adjustSliderThumbSize(RenderStyle* style, Element*) const
-{
- if (style->appearance() == SliderThumbVerticalPart) {
- style->setWidth(Length(sliderThumbHeight, Fixed));
- style->setHeight(Length(sliderThumbWidth, Fixed));
- } else if (style->appearance() == SliderThumbHorizontalPart) {
- style->setWidth(Length(sliderThumbWidth, Fixed));
- style->setHeight(Length(sliderThumbHeight, Fixed));
- }
-}
-
-#if 0
-void RenderThemeWinCE::adjustButtonInnerStyle(RenderStyle* style) const
-{
- // This inner padding matches Firefox.
- style->setPaddingTop(Length(1, Fixed));
- style->setPaddingRight(Length(3, Fixed));
- style->setPaddingBottom(Length(1, Fixed));
- style->setPaddingLeft(Length(3, Fixed));
-}
-
-void RenderThemeWinCE::adjustSearchFieldStyle(StyleResolver* styleResolver, RenderStyle* style, Element* e) const
-{
- // Override padding size to match AppKit text positioning.
- const int padding = 1;
- style->setPaddingLeft(Length(padding, Fixed));
- style->setPaddingRight(Length(padding, Fixed));
- style->setPaddingTop(Length(padding, Fixed));
- style->setPaddingBottom(Length(padding, Fixed));
-}
-#endif
-
-bool RenderThemeWinCE::paintSearchField(RenderObject* o, const PaintInfo& i, const IntRect& r)
-{
- return paintTextField(o, i, r);
-}
-
-bool RenderThemeWinCE::paintSearchFieldCancelButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
-{
- Color buttonColor = (o->node() && o->node()->isElementNode() && toElement(o->node())->active()) ? Color(138, 138, 138) : Color(186, 186, 186);
-
- IntSize cancelSize(10, 10);
- IntSize cancelRadius(cancelSize.width() / 2, cancelSize.height() / 2);
- int x = r.x() + (r.width() - cancelSize.width()) / 2;
- int y = r.y() + (r.height() - cancelSize.height()) / 2 + 1;
- IntRect cancelBounds(IntPoint(x, y), cancelSize);
- paintInfo.context->save();
- paintInfo.context->clipRoundedRect(RoundedRect(cancelBounds, cancelRadius, cancelRadius, cancelRadius, cancelRadius));
- paintInfo.context->fillRect(cancelBounds, buttonColor, ColorSpaceDeviceRGB);
-
- // Draw the 'x'
- IntSize xSize(3, 3);
- IntRect xBounds(cancelBounds.location() + IntSize(3, 3), xSize);
- paintInfo.context->setStrokeColor(Color::white, ColorSpaceDeviceRGB);
- paintInfo.context->drawLine(xBounds.location(), xBounds.location() + xBounds.size());
- paintInfo.context->drawLine(IntPoint(xBounds.maxX(), xBounds.y()), IntPoint(xBounds.x(), xBounds.maxY()));
-
- paintInfo.context->restore();
- return false;
-}
-
-void RenderThemeWinCE::adjustSearchFieldCancelButtonStyle(StyleResolver*, RenderStyle* style, Element*) const
-{
- IntSize cancelSize(13, 11);
- style->setWidth(Length(cancelSize.width(), Fixed));
- style->setHeight(Length(cancelSize.height(), Fixed));
-}
-
-void RenderThemeWinCE::adjustSearchFieldDecorationPartStyle(StyleResolver*, RenderStyle* style, Element*) const
-{
- IntSize emptySize(1, 11);
- style->setWidth(Length(emptySize.width(), Fixed));
- style->setHeight(Length(emptySize.height(), Fixed));
-}
-
-void RenderThemeWinCE::adjustSearchFieldResultsDecorationPartStyle(StyleResolver*, RenderStyle* style, Element*) const
-{
- IntSize magnifierSize(15, 11);
- style->setWidth(Length(magnifierSize.width(), Fixed));
- style->setHeight(Length(magnifierSize.height(), Fixed));
-}
-
-bool RenderThemeWinCE::paintSearchFieldResultsDecorationPart(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
-{
- notImplemented();
- return false;
-}
-
-void RenderThemeWinCE::adjustSearchFieldResultsButtonStyle(StyleResolver*, RenderStyle* style, Element*) const
-{
- IntSize magnifierSize(15, 11);
- style->setWidth(Length(magnifierSize.width(), Fixed));
- style->setHeight(Length(magnifierSize.height(), Fixed));
-}
-
-bool RenderThemeWinCE::paintSearchFieldResultsButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
-{
- paintSearchFieldResultsDecorationPart(o, paintInfo, r);
- return false;
-}
-
-void RenderThemeWinCE::adjustMenuListButtonStyle(StyleResolver*, RenderStyle* style, Element*) const
-{
- // These are the paddings needed to place the text correctly in the <select> box
- const int dropDownBoxPaddingTop = 2;
- const int dropDownBoxPaddingRight = style->direction() == LTR ? 4 + dropDownButtonWidth : 4;
- const int dropDownBoxPaddingBottom = 2;
- const int dropDownBoxPaddingLeft = style->direction() == LTR ? 4 : 4 + dropDownButtonWidth;
- // The <select> box must be at least 12px high for the button to render nicely on Windows
- const int dropDownBoxMinHeight = 12;
-
- // Position the text correctly within the select box and make the box wide enough to fit the dropdown button
- style->setPaddingTop(Length(dropDownBoxPaddingTop, Fixed));
- style->setPaddingRight(Length(dropDownBoxPaddingRight, Fixed));
- style->setPaddingBottom(Length(dropDownBoxPaddingBottom, Fixed));
- style->setPaddingLeft(Length(dropDownBoxPaddingLeft, Fixed));
-
- // Height is locked to auto
- style->setHeight(Length(Auto));
-
- // Calculate our min-height
- int minHeight = style->fontMetrics().height();
- minHeight = std::max(minHeight, dropDownBoxMinHeight);
-
- style->setMinHeight(Length(minHeight, Fixed));
-
- // White-space is locked to pre
- style->setWhiteSpace(PRE);
-
- DWORD colorMenu = GetSysColor(COLOR_MENU);
- DWORD colorMenuText = GetSysColor(COLOR_MENUTEXT);
- Color bgColor(GetRValue(colorMenu), GetGValue(colorMenu), GetBValue(colorMenu), 255);
- Color textColor(GetRValue(colorMenuText), GetGValue(colorMenuText), GetBValue(colorMenuText), 255);
- if (bgColor == textColor)
- textColor.setRGB((~bgColor.rgb()) | 0xFF000000);
- style->clearBackgroundLayers();
- style->accessBackgroundLayers()->setClip(ContentFillBox);
- style->setBackgroundColor(bgColor);
- style->setColor(textColor);
-}
-
-#if ENABLE(VIDEO)
-// Attempt to retrieve a HTMLMediaElement from a Node. Returns 0 if one cannot be found.
-static HTMLMediaElement* mediaElementParent(Node* node)
-{
- if (!node)
- return 0;
- Node* mediaNode = node->shadowHost();
- if (!mediaNode)
- mediaNode = node;
- if (!mediaNode || !mediaNode->isElementNode() || !toElement(mediaNode)->isMediaElement())
- return 0;
-
- return toHTMLMediaElement(mediaNode);
-}
-#endif
-
-bool RenderThemeWinCE::paintSliderTrack(RenderObject* o, const PaintInfo& i, const IntRect& r)
-{
- bool rc = RenderTheme::paintSliderTrack(o, i, r);
- IntPoint left = IntPoint(r.x() + 2, (r.y() + r.maxY()) / 2);
- i.context->save();
- i.context->setStrokeColor(Color::gray, ColorSpaceDeviceRGB);
- i.context->setFillColor(Color::gray, ColorSpaceDeviceRGB);
- i.context->fillRect(r);
-#if ENABLE(VIDEO)
- HTMLMediaElement* mediaElement = mediaElementParent(o->node());
- if (mediaElement) {
- i.context->setStrokeColor(Color(0, 0xff, 0));
- IntPoint right = IntPoint(left.x() + mediaElement->percentLoaded() * (r.maxX() - r.x() - 4), (r.y() + r.maxY()) / 2);
- i.context->drawLine(left, right);
- left = right;
- }
-#endif
- i.context->setStrokeColor(Color::black, ColorSpaceDeviceRGB);
- i.context->drawLine(left, IntPoint(r.maxX() - 2, left.y()));
- i.context->restore();
- return false;
-}
-
-bool RenderThemeWinCE::paintSliderThumb(RenderObject* o, const PaintInfo& i, const IntRect& r)
-{
- bool rc = RenderTheme::paintSliderThumb(o, i, r);
- i.context->save();
- i.context->setStrokeColor(Color::black, ColorSpaceDeviceRGB);
- i.context->setFillColor(Color::black, ColorSpaceDeviceRGB);
- i.context->fillRect(r);
-#if ENABLE(VIDEO)
- HTMLMediaElement* mediaElement = mediaElementParent(o->node());
- if (mediaElement) {
- float pt = mediaElement->currentTime() / mediaElement->duration();
- FloatRect intRect = r;
- intRect.setX(intRect.x() + intRect.width() * pt - 2);
- intRect.setWidth(5);
- i.context->fillRect(intRect);
- }
-#endif
- i.context->restore();
- return false;
-}
-
-void RenderThemeWinCE::adjustSearchFieldStyle(StyleResolver*, RenderStyle* style, Element*) const
-{
- const int padding = 1;
- style->setPaddingLeft(Length(padding, Fixed));
- style->setPaddingRight(Length(padding, Fixed));
- style->setPaddingTop(Length(padding, Fixed));
- style->setPaddingBottom(Length(padding, Fixed));
-}
-
-#if ENABLE(VIDEO)
-
-bool RenderThemeWinCE::paintMediaFullscreenButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
-{
- bool rc = paintButton(o, paintInfo, r);
- FloatRect imRect = r;
- imRect.inflate(-2);
- paintInfo.context->save();
- paintInfo.context->setStrokeColor(Color::black);
- paintInfo.context->setFillColor(Color::gray);
- paintInfo.context->fillRect(imRect);
- paintInfo.context->restore();
- return rc;
-}
-
-bool RenderThemeWinCE::paintMediaMuteButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
-{
- bool rc = paintButton(o, paintInfo, r);
- HTMLMediaElement* mediaElement = mediaElementParent(o->node());
- bool muted = !mediaElement || mediaElement->muted();
- FloatRect imRect = r;
- imRect.inflate(-2);
- paintInfo.context->save();
- paintInfo.context->setStrokeColor(Color::black);
- paintInfo.context->setFillColor(Color::black);
- FloatPoint pts[6] = {
- FloatPoint(imRect.x() + 1, imRect.y() + imRect.height() / 3.0),
- FloatPoint(imRect.x() + 1 + imRect.width() / 2.0, imRect.y() + imRect.height() / 3.0),
- FloatPoint(imRect.maxX() - 1, imRect.y()),
- FloatPoint(imRect.maxX() - 1, imRect.maxY()),
- FloatPoint(imRect.x() + 1 + imRect.width() / 2.0, imRect.y() + 2.0 * imRect.height() / 3.0),
- FloatPoint(imRect.x() + 1, imRect.y() + 2.0 * imRect.height() / 3.0)
- };
- paintInfo.context->drawConvexPolygon(6, pts);
- if (muted)
- paintInfo.context->drawLine(IntPoint(imRect.maxX(), imRect.y()), IntPoint(imRect.x(), imRect.maxY()));
- paintInfo.context->restore();
- return rc;
-}
-
-bool RenderThemeWinCE::paintMediaPlayButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
-{
- bool rc = paintButton(o, paintInfo, r);
- FloatRect imRect = r;
- imRect.inflate(-3);
- paintInfo.context->save();
- paintInfo.context->setStrokeColor(Color::black);
- paintInfo.context->setFillColor(Color::black);
- HTMLMediaElement* mediaElement = mediaElementParent(o->node());
- bool paused = !mediaElement || mediaElement->paused();
- if (paused) {
- float width = imRect.width();
- imRect.setWidth(width / 3.0);
- paintInfo.context->fillRect(imRect);
- imRect.move(2.0 * width / 3.0, 0);
- paintInfo.context->fillRect(imRect);
- } else {
- FloatPoint pts[3] = { FloatPoint(imRect.x(), imRect.y()), FloatPoint(imRect.maxX(), (imRect.y() + imRect.maxY()) / 2.0), FloatPoint(imRect.x(), imRect.maxY()) };
- paintInfo.context->drawConvexPolygon(3, pts);
- }
- paintInfo.context->restore();
- return rc;
-}
-
-bool RenderThemeWinCE::paintMediaSeekBackButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
-{
- bool rc = paintButton(o, paintInfo, r);
- FloatRect imRect = r;
- imRect.inflate(-3);
- FloatPoint pts[3] = { FloatPoint((imRect.x() + imRect.maxX()) / 2.0, imRect.y()), FloatPoint(imRect.x(), (imRect.y() + imRect.maxY()) / 2.0), FloatPoint((imRect.x() + imRect.maxX()) / 2.0, imRect.maxY()) };
- FloatPoint pts2[3] = { FloatPoint(imRect.maxX(), imRect.y()), FloatPoint((imRect.x() + imRect.maxX()) / 2.0, (imRect.y() + imRect.maxY()) / 2.0), FloatPoint(imRect.maxX(), imRect.maxY()) };
- paintInfo.context->save();
- paintInfo.context->setStrokeColor(Color::black);
- paintInfo.context->setFillColor(Color::black);
- paintInfo.context->drawConvexPolygon(3, pts);
- paintInfo.context->drawConvexPolygon(3, pts2);
- paintInfo.context->restore();
- return rc;
-}
-
-bool RenderThemeWinCE::paintMediaSeekForwardButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
-{
- bool rc = paintButton(o, paintInfo, r);
- FloatRect imRect = r;
- imRect.inflate(-3);
- FloatPoint pts[3] = { FloatPoint(imRect.x(), imRect.y()), FloatPoint((imRect.x() + imRect.maxX()) / 2.0, (imRect.y() + imRect.maxY()) / 2.0), FloatPoint(imRect.x(), imRect.maxY()) };
- FloatPoint pts2[3] = { FloatPoint((imRect.x() + imRect.maxX()) / 2.0, imRect.y()), FloatPoint(imRect.maxX(), (imRect.y() + imRect.maxY()) / 2.0), FloatPoint((imRect.x() + imRect.maxX()) / 2.0, imRect.maxY()) };
- paintInfo.context->save();
- paintInfo.context->setStrokeColor(Color::black);
- paintInfo.context->setFillColor(Color::black);
- paintInfo.context->drawConvexPolygon(3, pts);
- paintInfo.context->drawConvexPolygon(3, pts2);
- paintInfo.context->restore();
- return rc;
-}
-
-bool RenderThemeWinCE::paintMediaSliderTrack(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
-{
- return paintSliderTrack(o, paintInfo, r);
-}
-
-bool RenderThemeWinCE::paintMediaSliderThumb(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
-{
- return paintSliderThumb(o, paintInfo, r);
-}
-#endif
-
-void RenderThemeWinCE::adjustInnerSpinButtonStyle(StyleResolver*, RenderStyle* style, Element*) const
-{
- int width = ::GetSystemMetrics(SM_CXVSCROLL);
- if (width <= 0)
- width = 17; // Vista's default.
- style->setWidth(Length(width, Fixed));
- style->setMinWidth(Length(width, Fixed));
-}
-
-bool RenderThemeWinCE::paintInnerSpinButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
-{
- // We split the specified rectangle into two vertically. We can't draw a
- // spin button of which height is less than 2px.
- if (r.height() < 2)
- return false;
- IntRect upRect(r);
- upRect.setHeight(r.height() / 2);
- IntRect downRect(r);
- downRect.setY(upRect.maxY());
- downRect.setHeight(r.height() - upRect.height());
-
- unsigned stateUp = DFCS_SCROLLUP;
- unsigned stateDown = DFCS_SCROLLDOWN;
-
- if (!isEnabled(o) || isReadOnlyControl(o)) {
- stateUp |= DFCS_INACTIVE;
- stateDown |= DFCS_INACTIVE;
- } else if (isPressed(o)) {
- if (isSpinUpButtonPartPressed(o))
- stateUp |= DFCS_PUSHED;
- else
- stateDown |= DFCS_PUSHED;
- }
-
- paintInfo.context->drawFrameControl(upRect, DFC_SCROLL, stateUp);
- paintInfo.context->drawFrameControl(downRect, DFC_SCROLL, stateDown);
-
- return false;
-}
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeWinCEh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/rendering/RenderThemeWinCE.h (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeWinCE.h 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/rendering/RenderThemeWinCE.h 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,145 +0,0 @@
</span><del>-/*
- * This file is part of the WebKit project.
- *
- * Copyright (C) 2006, 2008 Apple Inc.
- * Copyright (C) 2009 Torch Mobile, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef RenderThemeWinCE_h
-#define RenderThemeWinCE_h
-
-#include "RenderTheme.h"
-
-typedef void* HANDLE;
-typedef struct HINSTANCE__* HINSTANCE;
-typedef HINSTANCE HMODULE;
-
-namespace WebCore {
-
- struct ThemeData {
- ThemeData() :m_part(0), m_state(0), m_classicState(0) {}
- ThemeData(int part, int state)
- : m_part(part)
- , m_state(state)
- , m_classicState(0)
- { }
-
- unsigned m_part;
- unsigned m_state;
- unsigned m_classicState;
- };
-
- class RenderThemeWinCE : public RenderTheme {
- public:
- static PassRefPtr<RenderTheme> create();
- ~RenderThemeWinCE();
-
- virtual String extraDefaultStyleSheet();
- virtual String extraQuirksStyleSheet();
-
- // A method asking if the theme's controls actually care about redrawing when hovered.
- virtual bool supportsHover(const RenderStyle*) const;
-
- virtual Color platformActiveSelectionBackgroundColor() const;
- virtual Color platformInactiveSelectionBackgroundColor() const;
- virtual Color platformActiveSelectionForegroundColor() const;
- virtual Color platformInactiveSelectionForegroundColor() const;
-
- // System fonts.
- virtual void systemFont(CSSValueID, FontDescription&) const;
- virtual Color systemColor(CSSValueID) const;
-
- virtual bool paintCheckbox(RenderObject* o, const PaintInfo& i, const IntRect& r)
- { return paintButton(o, i, r); }
- virtual void setCheckboxSize(RenderStyle*) const;
-
- virtual bool paintRadio(RenderObject* o, const PaintInfo& i, const IntRect& r)
- { return paintButton(o, i, r); }
- virtual void setRadioSize(RenderStyle* style) const
- { return setCheckboxSize(style); }
-
- virtual bool paintButton(RenderObject*, const PaintInfo&, const IntRect&);
-
- virtual bool paintTextField(RenderObject*, const PaintInfo&, const IntRect&);
-
- virtual bool paintTextArea(RenderObject* o, const PaintInfo& i, const IntRect& r)
- { return paintTextField(o, i, r); }
-
- virtual void adjustMenuListStyle(StyleResolver*, RenderStyle*, Element*) const;
- virtual bool paintMenuList(RenderObject*, const PaintInfo&, const IntRect&);
- virtual void adjustMenuListButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
-
- virtual bool paintMenuListButtonDecorations(RenderObject*, const PaintInfo&, const IntRect&);
-
- virtual bool paintSliderTrack(RenderObject* o, const PaintInfo& i, const IntRect& r);
- virtual bool paintSliderThumb(RenderObject* o, const PaintInfo& i, const IntRect& r);
- virtual void adjustSliderThumbSize(RenderStyle*, Element*) const;
-
- virtual bool popupOptionSupportsTextIndent() const { return true; }
-
- virtual void adjustSearchFieldStyle(StyleResolver*, RenderStyle*, Element*) const;
- virtual bool paintSearchField(RenderObject*, const PaintInfo&, const IntRect&);
-
- virtual void adjustSearchFieldCancelButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
- virtual bool paintSearchFieldCancelButton(RenderObject*, const PaintInfo&, const IntRect&);
-
- virtual void adjustSearchFieldDecorationPartStyle(StyleResolver*, RenderStyle*, Element*) const;
- virtual bool paintSearchFieldDecorationPart(RenderObject*, const PaintInfo&, const IntRect&) { return false; }
-
- virtual void adjustSearchFieldResultsDecorationPartStyle(StyleResolver*, RenderStyle*, Element*) const;
- virtual bool paintSearchFieldResultsDecorationPart(RenderObject*, const PaintInfo&, const IntRect&);
-
- virtual void adjustSearchFieldResultsButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
- virtual bool paintSearchFieldResultsButton(RenderObject*, const PaintInfo&, const IntRect&);
-
- virtual void themeChanged();
-
- virtual void adjustButtonStyle(StyleResolver*, RenderStyle* style, Element*) const { }
- virtual void adjustTextFieldStyle(StyleResolver*, RenderStyle* style, Element*) const { }
- virtual void adjustTextAreaStyle(StyleResolver*, RenderStyle* style, Element*) const { }
-
- virtual void adjustInnerSpinButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
- virtual bool paintInnerSpinButton(RenderObject*, const PaintInfo&, const IntRect&);
-
- static void setWebKitIsBeingUnloaded();
-
- virtual bool supportsFocusRing(const RenderStyle*) const;
-
- #if ENABLE(VIDEO)
- virtual bool paintMediaFullscreenButton(RenderObject*, const PaintInfo&, const IntRect&);
- virtual bool paintMediaPlayButton(RenderObject*, const PaintInfo&, const IntRect&);
- virtual bool paintMediaMuteButton(RenderObject*, const PaintInfo&, const IntRect&);
- virtual bool paintMediaSeekBackButton(RenderObject*, const PaintInfo&, const IntRect&);
- virtual bool paintMediaSeekForwardButton(RenderObject*, const PaintInfo&, const IntRect&);
- virtual bool paintMediaSliderTrack(RenderObject*, const PaintInfo&, const IntRect&);
- virtual bool paintMediaSliderThumb(RenderObject*, const PaintInfo&, const IntRect&);
- #endif
-
- private:
- RenderThemeWinCE();
-
- unsigned determineClassicState(RenderObject*);
- bool supportsFocus(ControlPart) const;
-
- ThemeData getThemeData(RenderObject*);
- };
-
-};
-
-#endif // RenderThemeWinCE_h
</del></span></pre></div>
<a id="trunkSourceWebCorestoragewinceDatabaseThreadWinCEcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/storage/wince/DatabaseThreadWinCE.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/wince/DatabaseThreadWinCE.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/storage/wince/DatabaseThreadWinCE.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,95 +0,0 @@
</span><del>-/*
- * Copyright (C) 2009 Torch Mobile, 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 library is distributed in the hope that i will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "config.h"
-#include "DatabaseThread.h"
-
-#include "Database.h"
-#include "DatabaseTask.h"
-
-namespace WebCore {
-
-DatabaseThread::DatabaseThread()
-: m_timer(this, &DatabaseThread::timerFired)
-{
-}
-
-DatabaseThread::~DatabaseThread()
-{
-}
-
-void DatabaseThread::requestTermination()
-{
- m_queue.clear();
-}
-
-bool DatabaseThread::terminationRequested() const
-{
- return m_queue.isEmpty();
-}
-
-void DatabaseThread::timerFired(Timer<DatabaseThread>*)
-{
- if (!m_queue.isEmpty()) {
- RefPtr<DatabaseTask> task = m_queue.first();
- task->performTask();
- m_queue.removeFirst();
- if (!m_queue.isEmpty())
- m_timer.startOneShot(0);
- }
-}
-
-void DatabaseThread::scheduleTask(PassRefPtr<DatabaseTask> task)
-{
- m_queue.append(task);
- if (!m_timer.isActive())
- m_timer.startOneShot(0);
-}
-
-void DatabaseThread::scheduleImmediateTask(PassRefPtr<DatabaseTask> task)
-{
- task->performTask();
-}
-
-void DatabaseThread::unscheduleDatabaseTasks(Database* database)
-{
- Deque<RefPtr<DatabaseTask> > reservedTasks;
- for (Deque<RefPtr<DatabaseTask> >::const_iterator i = m_queue.begin(); i != m_queue.end(); ++i) {
- if ((*i)->database() != database)
- reservedTasks.append(*i);
- }
-
- m_queue.swap(reservedTasks);
-}
-
-void DatabaseThread::recordDatabaseOpen(Database* database)
-{
- notImplemented();
-}
-
-void DatabaseThread::recordDatabaseClosed(Database* database)
-{
- notImplemented();
-}
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCorestoragewinceDatabaseThreadWinCEh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/storage/wince/DatabaseThreadWinCE.h (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/wince/DatabaseThreadWinCE.h 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/storage/wince/DatabaseThreadWinCE.h 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,65 +0,0 @@
</span><del>-/*
- * Copyright (C) 2009 Torch Mobile, 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 library is distributed in the hope that i will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef DatabaseThreadWinCE_h
-#define DatabaseThreadWinCE_h
-
-#include <wtf/Deque.h>
-#include <wtf/RefCounted.h>
-
-namespace WebCore {
-
- class Database;
- class DatabaseTask;
-
- class DatabaseThread: public WTF::RefCounted<DatabaseThread> {
-
- public:
- static PassRefPtr<DatabaseThread> create() { return adoptRef(new DatabaseThread); }
- ~DatabaseThread();
-
- bool start() { return true; }
- void requestTermination();
- bool terminationRequested() const;
-
- void scheduleTask(PassRefPtr<DatabaseTask>);
- void scheduleImmediateTask(PassRefPtr<DatabaseTask>);
- void unscheduleDatabaseTasks(Database*);
- void recordDatabaseOpen(Database*);
- void recordDatabaseClosed(Database*);
-#ifndef NDEBUG
- ThreadIdentifier getThreadID() const { return currentThread(); }
-#endif
-
- private:
- DatabaseThread();
-
- void timerFired(Timer<DatabaseThread>*);
-
- Deque<RefPtr<DatabaseTask> > m_queue;
- Timer<DatabaseThread> m_timer;
- };
-
-} // namespace WebCore
-
-#endif // DatabaseThreadWinCE_h
</del></span></pre></div>
<a id="trunkSourceWebCorestoragewinceStorageThreadWinCEcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/storage/wince/StorageThreadWinCE.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/wince/StorageThreadWinCE.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/storage/wince/StorageThreadWinCE.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,83 +0,0 @@
</span><del>-/*
- * Copyright (C) 2009 Torch Mobile, 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 library is distributed in the hope that i will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "config.h"
-#include "StorageThread.h"
-
-#include "StorageTask.h"
-#include "StorageAreaSync.h"
-
-namespace WebCore {
-
-StorageThread::StorageThread()
-: m_timer(this, &StorageThread::timerFired)
-{
-}
-
-StorageThread::~StorageThread()
-{
-}
-
-bool StorageThread::start()
-{
- return true;
-}
-
-void StorageThread::timerFired(Timer<StorageThread>*)
-{
- if (!m_queue.isEmpty()) {
- RefPtr<StorageTask> task = m_queue.first();
- task->performTask();
- m_queue.removeFirst();
- if (!m_queue.isEmpty())
- m_timer.startOneShot(0);
- }
-}
-
-void StorageThread::scheduleImport(PassRefPtr<StorageAreaSync> area)
-{
- m_queue.append(StorageTask::createImport(area));
- if (!m_timer.isActive())
- m_timer.startOneShot(0);
-}
-
-void StorageThread::scheduleSync(PassRefPtr<StorageAreaSync> area)
-{
- m_queue.append(StorageTask::createSync(area));
- if (!m_timer.isActive())
- m_timer.startOneShot(0);
-}
-
-void StorageThread::terminate()
-{
- m_queue.clear();
- m_timer.stop();
-}
-
-void StorageThread::performTerminate()
-{
- m_queue.clear();
- m_timer.stop();
-}
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCorestoragewinceStorageThreadWinCEh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/storage/wince/StorageThreadWinCE.h (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/wince/StorageThreadWinCE.h 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebCore/storage/wince/StorageThreadWinCE.h 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,58 +0,0 @@
</span><del>-/*
- * Copyright (C) 2009 Torch Mobile, 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 library is distributed in the hope that i will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-
-#ifndef StorageThreadWinCE_h
-#define StorageThreadWinCE_h
-
-#include <wtf/Deque.h>
-#include <wtf/PassRefPtr.h>
-
-namespace WebCore {
-
- class StorageAreaSync;
- class StorageTask;
-
- class StorageThread : public RefCounted<StorageThread> {
- public:
- static PassRefPtr<StorageThread> create() { return adoptRef(new StorageThread); }
-
- ~StorageThread();
- bool start();
- void scheduleImport(PassRefPtr<StorageAreaSync>);
- void scheduleSync(PassRefPtr<StorageAreaSync>);
- void terminate();
- void performTerminate();
-
- private:
- StorageThread();
-
- void timerFired(Timer<StorageThread>*);
-
- Deque<RefPtr<StorageTask> > m_queue;
- Timer<StorageThread> m_timer;
- };
-
-} // namespace WebCore
-
-#endif // StorageThreadWinCE_h
</del></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebKit/ChangeLog 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-09-25 Csaba Osztrogonác <ossy@webkit.org>
+
+ Remove WinCE port from trunk
+ https://bugs.webkit.org/show_bug.cgi?id=136951
+
+ Reviewed by Alex Christensen.
+
+ * PlatformWinCE.cmake: Removed.
+ * wince/WebCoreSupport/ChromeClientWinCE.cpp: Removed.
+ * wince/WebCoreSupport/ChromeClientWinCE.h: Removed.
+ * wince/WebCoreSupport/ContextMenuClientWinCE.cpp: Removed.
+ * wince/WebCoreSupport/ContextMenuClientWinCE.h: Removed.
+ * wince/WebCoreSupport/DragClientWinCE.cpp: Removed.
+ * wince/WebCoreSupport/DragClientWinCE.h: Removed.
+ * wince/WebCoreSupport/EditorClientWinCE.cpp: Removed.
+ * wince/WebCoreSupport/EditorClientWinCE.h: Removed.
+ * wince/WebCoreSupport/FrameLoaderClientWinCE.cpp: Removed.
+ * wince/WebCoreSupport/FrameLoaderClientWinCE.h: Removed.
+ * wince/WebCoreSupport/FrameNetworkingContextWinCE.cpp: Removed.
+ * wince/WebCoreSupport/FrameNetworkingContextWinCE.h: Removed.
+ * wince/WebCoreSupport/InspectorClientWinCE.cpp: Removed.
+ * wince/WebCoreSupport/InspectorClientWinCE.h: Removed.
+ * wince/WebCoreSupport/PlatformStrategiesWinCE.cpp: Removed.
+ * wince/WebCoreSupport/PlatformStrategiesWinCE.h: Removed.
+ * wince/WebView.cpp: Removed.
+ * wince/WebView.h: Removed.
+
</ins><span class="cx"> 2014-09-23 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] 64-bit Build fix after r173882.
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformWinCEcmake"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/PlatformWinCE.cmake (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/PlatformWinCE.cmake 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebKit/PlatformWinCE.cmake 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,27 +0,0 @@
</span><del>-list(APPEND WebKit_INCLUDE_DIRECTORIES
- "${WEBCORE_DIR}/accessibility/win"
- "${WEBCORE_DIR}/page/win"
- "${WEBCORE_DIR}/platform/graphics/wince"
- "${WEBCORE_DIR}/platform/graphics/win"
- "${WEBCORE_DIR}/platform/network/win"
- "${WEBCORE_DIR}/platform/win"
-
- wince
- wince/WebCoreSupport
-)
-
-list(APPEND WebKit_SOURCES
- wince/WebView.cpp
- wince/WebView.h
-
- wince/WebCoreSupport/ChromeClientWinCE.cpp
- wince/WebCoreSupport/ContextMenuClientWinCE.cpp
- wince/WebCoreSupport/DragClientWinCE.cpp
- wince/WebCoreSupport/EditorClientWinCE.cpp
- wince/WebCoreSupport/FrameLoaderClientWinCE.cpp
- wince/WebCoreSupport/FrameNetworkingContextWinCE.cpp
- wince/WebCoreSupport/InspectorClientWinCE.cpp
- wince/WebCoreSupport/PlatformStrategiesWinCE.cpp
-)
-
-set(WebKit_LIBRARY_TYPE STATIC)
</del></span></pre></div>
<a id="trunkSourceWebKitcfChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/cf/ChangeLog (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/cf/ChangeLog 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebKit/cf/ChangeLog 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-09-25 Csaba Osztrogonác <ossy@webkit.org>
+
+ Remove WinCE port from trunk
+ https://bugs.webkit.org/show_bug.cgi?id=136951
+
+ Reviewed by Alex Christensen.
+
+ * WebCoreSupport/WebInspectorClientCF.cpp:
+
</ins><span class="cx"> 2014-02-17 Sergio Correia <sergio.correia@openbossa.org>
</span><span class="cx">
</span><span class="cx"> Replace uses of PassOwnPtr/OwnPtr with std::unique_ptr in WebCore/inspector
</span></span></pre></div>
<a id="trunkSourceWebKitcfWebCoreSupportWebInspectorClientCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx">
</span><span class="cx"> #include <wtf/Platform.h>
</span><span class="cx">
</span><del>-#if PLATFORM(WIN) && !OS(WINCE)
</del><ins>+#if PLATFORM(WIN)
</ins><span class="cx"> #ifndef WTF_USE_CG
</span><span class="cx"> #define WTF_USE_CG 1
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitwinceChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/wince/ChangeLog (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/wince/ChangeLog 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebKit/wince/ChangeLog 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,2283 +0,0 @@
</span><del>-2014-03-12 Sergio Villar Senin <svillar@igalia.com>
-
- Rename DEFINE_STATIC_LOCAL to DEPRECATED_DEFINE_STATIC_LOCAL
- https://bugs.webkit.org/show_bug.cgi?id=129612
-
- Reviewed by Darin Adler.
-
- For new code use static NeverDestroyed<T> instead.
-
- * WebCoreSupport/FrameLoaderClientWinCE.cpp:
- (WebKit::FrameLoaderClientWinCE::userAgent):
- * WebCoreSupport/PlatformStrategiesWinCE.cpp:
- (PlatformStrategiesWinCE::initialize):
-
-2014-03-06 Joseph Pecoraro <pecoraro@apple.com>
-
- Web Inspector: Expose the console object in JSContexts to interact with Web Inspector
- https://bugs.webkit.org/show_bug.cgi?id=127944
-
- Reviewed by Geoffrey Garen.
-
- * WebCoreSupport/ChromeClientWinCE.h:
- Update namespaces.
-
-2014-02-24 Renata Hodovan <rhodovan.u-szeged@partner.samsung.com>
-
- Get rid of the unused 'immediate' parameters from repaint related functions
- https://bugs.webkit.org/show_bug.cgi?id=129111
-
- Reviewed by Simon Fraser.
-
- Removing the 'immediate' parameters from repaint related functions - accoring
- to the FIXME in RenderView::repaintViewRectangle() - since they have no effect.
-
- * WebCoreSupport/ChromeClientWinCE.cpp:
- (WebKit::ChromeClientWinCE::invalidateRootView):
- (WebKit::ChromeClientWinCE::invalidateContentsAndRootView):
- (WebKit::ChromeClientWinCE::invalidateContentsForSlowScroll):
- (WebKit::ChromeClientWinCE::scroll):
- * WebCoreSupport/ChromeClientWinCE.h:
-
-2014-02-08 Darin Adler <darin@apple.com>
-
- Change TextIterator to use StringView, preparing to wean it from deprecatedCharacters
- https://bugs.webkit.org/show_bug.cgi?id=128233
-
- Reviewed by Anders Carlsson.
-
- * WebCoreSupport/EditorClientWinCE.cpp:
- (WebKit::EditorClientWinCE::checkSpellingOfString): Use StringView.
- (WebKit::EditorClientWinCE::checkGrammarOfString): Ditto.
- * WebCoreSupport/EditorClientWinCE.h: Ditto.
-
-2014-02-06 Joseph Pecoraro <pecoraro@apple.com>
-
- Web Inspector: Add Console support to JSContext Inspection
- https://bugs.webkit.org/show_bug.cgi?id=127941
-
- Reviewed by Geoffrey Garen.
-
- * WebCoreSupport/ChromeClientWinCE.h:
-
-2014-01-30 Andrei Bucur <abucur@adobe.com>
-
- Remove the ACCELERATED_COMPOSITING flag
- https://bugs.webkit.org/show_bug.cgi?id=127833
-
- Reviewed by Antti Koivisto.
-
- Remove the USE(ACCELERATED_COMPOSITING) conditionals from the code base and make AC
- mandatory.
-
- Another patch will be required to remove the flag support from the WinCE build system.
-
- * WebCoreSupport/ChromeClientWinCE.cpp:
- (WebKit::ChromeClientWinCE::scheduleCompositingLayerFlush):
- * WebCoreSupport/ChromeClientWinCE.h:
-
-2014-01-25 Anders Carlsson <andersca@apple.com>
-
- Remove an unused FrameLoaderClient function
- https://bugs.webkit.org/show_bug.cgi?id=127628
-
- Reviewed by Andreas Kling.
-
- * WebCoreSupport/FrameLoaderClientWinCE.cpp:
- * WebCoreSupport/FrameLoaderClientWinCE.h:
-
-2014-01-17 Anders Carlsson <andersca@apple.com>
-
- Remove another unused FrameLoaderClient callback
- https://bugs.webkit.org/show_bug.cgi?id=127192
-
- Reviewed by Dan Bernstein.
-
- * WebCoreSupport/FrameLoaderClientWinCE.cpp:
- * WebCoreSupport/FrameLoaderClientWinCE.h:
-
-2014-01-17 Anders Carlsson <andersca@apple.com>
-
- Remove didPerformFirstNavigation from all FrameLoaderClient subclasses
- https://bugs.webkit.org/show_bug.cgi?id=127190
-
- Reviewed by Dan Bernstein.
-
- * WebCoreSupport/FrameLoaderClientWinCE.cpp:
- * WebCoreSupport/FrameLoaderClientWinCE.h:
-
-2014-01-16 Peter Molnar <pmolnar.u-szeged@partner.samsung.com>
-
- Remove workaround for compilers not supporting explicit override control
- https://bugs.webkit.org/show_bug.cgi?id=127111
-
- Reviewed by Anders Carlsson.
-
- Now all compilers support explicit override control, this workaround can be removed.
-
- * WebCoreSupport/ChromeClientWinCE.h:
- * WebCoreSupport/ContextMenuClientWinCE.h:
- * WebCoreSupport/DragClientWinCE.h:
- * WebCoreSupport/EditorClientWinCE.h:
- * WebCoreSupport/FrameLoaderClientWinCE.h:
- * WebCoreSupport/FrameNetworkingContextWinCE.h:
- * WebCoreSupport/InspectorClientWinCE.h:
- * WebCoreSupport/PlatformStrategiesWinCE.h:
-
-2013-12-03 Joseph Pecoraro <pecoraro@apple.com>
-
- Web Inspector: Push Remote Inspector debugging connection management into JavaScriptCore
- https://bugs.webkit.org/show_bug.cgi?id=124613
-
- Reviewed by Timothy Hatcher.
-
- * WebCoreSupport/InspectorClientWinCE.h:
-
-2013-11-04 Zhuang Zhigang <zhuangzg@cn.fujitsu.com>
-
- Change structure of frame tree in WINCE port.
- https://bugs.webkit.org/show_bug.cgi?id=121079
-
- Reviewed by Darin Adler.
-
- * WebCoreSupport/FrameLoaderClientWinCE.cpp:
- (WebKit::FrameLoaderClientWinCE::createFrame):
- * WebView.cpp:
- (WebView::createFrame):
- * WebView.h:
-
-2013-11-03 Patrick Gansterer <paroga@webkit.org>
-
- [WINCE] Replace OwnPtr with GDIObject
- https://bugs.webkit.org/show_bug.cgi?id=123670
-
- Reviewed by Anders Carlsson.
-
- * WebView.cpp:
- (WebView::paint):
- (WebView::handlePaint):
- * WebView.h:
-
-2013-11-02 Patrick Gansterer <paroga@webkit.org>
-
- Add OVERRIDE keyword to WebCoreSupport classes
- https://bugs.webkit.org/show_bug.cgi?id=123672
-
- Reviewed by Darin Adler.
-
- Also align the function parameters with the base classes
- and remove useless functions.
-
- * WebCoreSupport/ChromeClientWinCE.cpp:
- * WebCoreSupport/ChromeClientWinCE.h:
- * WebCoreSupport/ContextMenuClientWinCE.cpp:
- * WebCoreSupport/ContextMenuClientWinCE.h:
- * WebCoreSupport/DragClientWinCE.cpp:
- (WebKit::DragClientWinCE::willPerformDragDestinationAction):
- (WebKit::DragClientWinCE::willPerformDragSourceAction):
- (WebKit::DragClientWinCE::actionMaskForDrag):
- (WebKit::DragClientWinCE::startDrag):
- * WebCoreSupport/DragClientWinCE.h:
- * WebCoreSupport/EditorClientWinCE.h:
- * WebCoreSupport/FrameLoaderClientWinCE.cpp:
- (WebKit::FrameLoaderClientWinCE::dispatchDecidePolicyForResponse):
- (WebKit::FrameLoaderClientWinCE::dispatchDecidePolicyForNewWindowAction):
- (WebKit::FrameLoaderClientWinCE::dispatchDecidePolicyForNavigationAction):
- (WebKit::FrameLoaderClientWinCE::dispatchWillSubmitForm):
- * WebCoreSupport/FrameLoaderClientWinCE.h:
- * WebCoreSupport/FrameNetworkingContextWinCE.h:
- * WebCoreSupport/InspectorClientWinCE.cpp:
- * WebCoreSupport/InspectorClientWinCE.h:
- * WebCoreSupport/PlatformStrategiesWinCE.h:
-
-2013-11-02 Patrick Gansterer <paroga@webkit.org>
-
- Various small WinCE build fixes
-
- * WebCoreSupport/FrameLoaderClientWinCE.cpp:
- (WebKit::FrameLoaderClientWinCE::transitionToCommittedForNewPage):
- * WebView.cpp:
-
-2013-10-03 Sam Weinig <sam@webkit.org>
-
- Remove shouldRubberBandInDirection from the WKBundlePageUIClient
- https://bugs.webkit.org/show_bug.cgi?id=122309
-
- Reviewed by Andreas Kling.
-
- * WebCoreSupport/ChromeClientWinCE.h:
-
-2013-10-01 Sam Weinig <sam@webkit.org>
-
- CTTE: DOMWrapperWorlds should be passed around by reference
- https://bugs.webkit.org/show_bug.cgi?id=122206
-
- Reviewed by Andreas Kling.
-
- * WebCoreSupport/FrameLoaderClientWinCE.cpp:
- (WebKit::FrameLoaderClientWinCE::dispatchDidClearWindowObjectInWorld):
- * WebCoreSupport/FrameLoaderClientWinCE.h:
-
-2013-09-30 Patrick Gansterer <paroga@webkit.org>
-
- Unreviewed WinCE build fix after r153927.
-
- * WebView.cpp:
- (WebView::WebView):
-
-2013-09-30 Patrick Gansterer <paroga@webkit.org>
-
- Unreviewed WinCE build fix after r155289.
-
- * WebCoreSupport/FrameLoaderClientWinCE.cpp:
- (WebKit::FrameLoaderClientWinCE::dispatchDecidePolicyForResponse):
- (WebKit::FrameLoaderClientWinCE::dispatchDecidePolicyForNewWindowAction):
- (WebKit::FrameLoaderClientWinCE::dispatchDecidePolicyForNavigationAction):
- (WebKit::FrameLoaderClientWinCE::dispatchWillSubmitForm):
-
-2013-09-30 Patrick Gansterer <paroga@webkit.org>
-
- Unreviewed WinCE build fix after r154178.
-
- * WebView.cpp:
- (WebView::wndProc):
-
-2013-09-26 Darin Adler <darin@apple.com>
-
- rename KURL to URL
- https://bugs.webkit.org/show_bug.cgi?id=16214
-
- Reviewed by Andreas Kling.
-
- * many files: Renamed, using script.
-
-2013-09-16 Enrica Casucci <enrica@apple.com>
-
- Remove unused function didSetSelectionTypesForPasteboard from EditorClient.
- https://bugs.webkit.org/show_bug.cgi?id=121464
-
- Reviewed by Darin Adler.
-
- * WebCoreSupport/EditorClientWinCE.cpp:
- * WebCoreSupport/EditorClientWinCE.h:
-
-2013-08-24 Darin Adler <darin@apple.com>
-
- Frame::tree should return a reference instead of a pointer
- https://bugs.webkit.org/show_bug.cgi?id=120259
-
- Reviewed by Andreas Kling.
-
- * WebView.cpp:
- (WebView::createFrame):
- Use tree(). instead of tree()->.
-
-2013-08-19 Pratik Solanki <psolanki@apple.com>
-
- <https://webkit.org/b/119918> Frame::selection() should return a reference
-
- Reviewed by Darin Adler.
-
- m_selection is never NULL so return a reference from Frame::selection(). Also removed some
- unnecessary null checks and assert diff ts exposed as a result.
-
- * WebCoreSupport/EditorClientWinCE.cpp:
- (WebKit::EditorClientWinCE::handleEditingKeyboardEvent):
-
-2013-08-15 Anders Carlsson <andersca@apple.com>
-
- <https://webkit.org/b/119859> Frame::loader() should return a reference
-
- Reviewed by Andreas Kling.
-
- * WebCoreSupport/FrameLoaderClientWinCE.cpp:
- (WebKit::FrameLoaderClientWinCE::dispatchDecidePolicyForResponse):
- (WebKit::FrameLoaderClientWinCE::dispatchDecidePolicyForNewWindowAction):
- (WebKit::FrameLoaderClientWinCE::dispatchDecidePolicyForNavigationAction):
- (WebKit::FrameLoaderClientWinCE::dispatchWillSubmitForm):
- * WebCoreSupport/FrameNetworkingContextWinCE.cpp:
- (WebKit::FrameNetworkingContextWinCE::referrer):
- * WebView.cpp:
- (WebView::createFrame):
- (WebView::load):
- (WebView::reload):
- (WebView::stop):
-
-2013-07-25 Andreas Kling <akling@apple.com>
-
- ChromeClient::focusedNodeChanged() should be focusedElementChanged().
- <http://webkit.org/b/119110>
-
- Reviewed by Anders Carlsson.
-
- * WebCoreSupport/ChromeClientWinCE.cpp:
- (WebKit::ChromeClientWinCE::focusedElementChanged):
- * WebCoreSupport/ChromeClientWinCE.h:
-
-2013-06-26 Patrick Gansterer <paroga@webkit.org>
-
- Unreviewed WinCE build fix after r152065.
-
- * WebCoreSupport/ChromeClientWinCE.cpp:
- (WebKit::ChromeClientWinCE::AXStartFrameLoad):
- (WebKit::ChromeClientWinCE::AXFinishFrameLoad):
- * WebCoreSupport/ChromeClientWinCE.h:
-
-2013-05-19 Anders Carlsson <andersca@apple.com>
-
- Remove ChromeClient::webView()
- https://bugs.webkit.org/show_bug.cgi?id=116054
-
- Reviewed by Darin Adler.
-
- This blatantly horrible layer violation was only used to know if a ChromeClient is an empty
- client or not. We already have a (slightly less horrible) way to do that.
-
- * WebCoreSupport/ChromeClientWinCE.h:
- (ChromeClientWinCE):
-
-2013-05-13 Anders Carlsson <andersca@apple.com>
-
- Frame::editor() should return a reference
- https://bugs.webkit.org/show_bug.cgi?id=116037
-
- Reviewed by Darin Adler.
-
- * WebCoreSupport/EditorClientWinCE.cpp:
- (WebKit::EditorClientWinCE::handleEditingKeyboardEvent):
-
-2013-04-29 Patrick Gansterer <paroga@webkit.org>
-
- Unreviewed build fix.
-
- * WebCoreSupport/FrameLoaderClientWinCE.cpp: Added missing header.
- * WebView.h: Ditto.
-
-2013-04-25 Joseph Pecoraro <pecoraro@apple.com>
-
- Web Inspector: ConsoleMessage should include line and column number where possible
- https://bugs.webkit.org/show_bug.cgi?id=114929
-
- Reviewed by Timothy Hatcher.
-
- * WebCoreSupport/ChromeClientWinCE.cpp:
- (WebKit::ChromeClientWinCE::addMessageToConsole):
- * WebCoreSupport/ChromeClientWinCE.h:
-
-2013-04-18 Patrick Gansterer <paroga@webkit.org>
-
- Unreviewed WinCE build fix after r148545.
-
- * WebCoreSupport/EditorClientWinCE.cpp:
- * WebView.cpp:
-
-2013-04-15 Patrick Gansterer <paroga@webkit.org>
-
- Unreviewed WinCE build fix after r148373.
-
- * WebCoreSupport/EditorClientWinCE.cpp:
-
-2013-04-06 Patrick Gansterer <paroga@webkit.org>
-
- Unreviewed WinCE build fix after r145849.
-
- * WebCoreSupport/EditorClientWinCE.cpp:
-
-2013-03-15 Nate Chapin <japhet@chromium.org>
-
- Hide MainResourceLoader from the outside world
- https://bugs.webkit.org/show_bug.cgi?id=109971
-
- Reviewed by Adam Barth.
-
- * WebCoreSupport/FrameLoaderClientWinCE.cpp:
- (WebKit::FrameLoaderClientWinCE::convertMainResourceLoadToDownload):
- * WebCoreSupport/FrameLoaderClientWinCE.h:
- (FrameLoaderClientWinCE):
-
-2013-03-15 Abhishek Arya <inferno@chromium.org>
-
- Replace static_casts with to* helper functions.
- https://bugs.webkit.org/show_bug.cgi?id=112401
-
- Reviewed by Stephen Chenney.
-
- to* helper functions are preferred over static_cast calls since they
- help to catch bad casts easily on the testing infrastructure.
-
- * WebCoreSupport/FrameLoaderClientWinCE.cpp:
- (WebKit::FrameLoaderClientWinCE::redirectDataToPlugin):
-
-2013-03-14 Manuel Rego Casasnovas <rego@igalia.com>
-
- Add selectTrailingWhitespaceEnabled setting to WebCore::Page
- https://bugs.webkit.org/show_bug.cgi?id=109404
-
- Reviewed by Tony Chang.
-
- Use new settings for smartInsertDeleteEnabled and
- selectTrailingWhitespaceEnabled.
-
- * WebCoreSupport/EditorClientWinCE.cpp:
- (WebKit::EditorClientWinCE::smartInsertDeleteEnabled):
- (WebKit::EditorClientWinCE::isSelectTrailingWhitespaceEnabled):
-
-2013-02-11 Ryosuke Niwa <rniwa@webkit.org>
-
- Disable delete button controller on non-Mac ports and delete EditorClient::shouldShowDeleteInterface
- https://bugs.webkit.org/show_bug.cgi?id=109534
-
- Reviewed by Anders Carlsson.
-
- * WebCoreSupport/EditorClientWinCE.cpp:
- (WebKit):
- * WebCoreSupport/EditorClientWinCE.h:
- (EditorClientWinCE):
-
-2013-02-03 KwangYong Choi <ky0.choi@samsung.com>
-
- Fix build warning after r141473
- https://bugs.webkit.org/show_bug.cgi?id=108782
-
- Reviewed by Kentaro Hara.
-
- Fix -Wunused-parameter build warning.
-
- * WebCoreSupport/EditorClientWinCE.cpp:
- (WebKit::EditorClientWinCE::getClientPasteboardDataForRange):
-
-2013-01-31 Enrica Casucci <enrica@apple.com>
-
- WebKit2: provide new bundle APIs to allow bundle clients to be notified of pasteboard access.
- https://bugs.webkit.org/show_bug.cgi?id=108396.
- <rdar://problem/12920461>
-
- Reviewed by Alexey Proskuryakov.
-
- Adds stub implementation for WebKit of the new EditorClient methods.
-
- * WebCoreSupport/EditorClientWinCE.cpp:
- (WebKit::EditorClientWinCE::willWriteSelectionToPasteboard):
- (WebKit::EditorClientWinCE::getClientPasteboardDataForRange):
- * WebCoreSupport/EditorClientWinCE.h:
-
-2013-01-24 Patrick Gansterer <paroga@webkit.org>
-
- Unreviewed WinCE build fix after r139078.
-
- * WebCoreSupport/ChromeClientWinCE.h:
- (ChromeClientWinCE):
-
-2013-01-22 Anders Carlsson <andersca@apple.com>
-
- Use a platforom strategy for local storage
- https://bugs.webkit.org/show_bug.cgi?id=107600
-
- Reviewed by Andreas Kling.
-
- Update for new storage strategy.
-
- * WebCoreSupport/PlatformStrategiesWinCE.cpp:
- (PlatformStrategiesWinCE::createStorageStrategy):
- * WebCoreSupport/PlatformStrategiesWinCE.h:
- (PlatformStrategiesWinCE):
-
-2013-01-18 Seokju Kwon <seokju.kwon@gmail.com>
-
- Add explicit keyword to constructors in platform-specific InspectorClient
- https://bugs.webkit.org/show_bug.cgi?id=107255
-
- Reviewed by Kentaro Hara.
-
- Add explicit keyword to constructors that take one argument
- in platform-specific implementation of InspectorClient.
- And fix some coding style.
-
- * WebCoreSupport/InspectorClientWinCE.h:
- (InspectorClientWinCE):
-
-2013-01-08 Mark Lam <mark.lam@apple.com>
-
- Removed the need for the ProposedDatabase mechanism.
- https://bugs.webkit.org/show_bug.cgi?id=106292.
-
- Reviewed by Sam Weinig.
-
- * WebCoreSupport/ChromeClientWinCE.cpp:
- (WebKit::ChromeClientWinCE::exceededDatabaseQuota):
- * WebCoreSupport/ChromeClientWinCE.h:
- (ChromeClientWinCE):
-
-2012-12-23 Alexey Proskuryakov <ap@apple.com>
-
- <rdar://problem/12808377> Network process should respect cookie accept policy
- https://bugs.webkit.org/show_bug.cgi?id=105684
-
- Reviewed by Sam Weinig.
-
- * WebCoreSupport/PlatformStrategiesWinCE.cpp:
- * WebCoreSupport/PlatformStrategiesWinCE.h:
- CookiesStrategy no longer has notifyCookiesChanged(). This port didn't use it anyway.
-
-2012-12-22 Alexey Proskuryakov <ap@apple.com>
-
- Add a separate class for networking related storage
- https://bugs.webkit.org/show_bug.cgi?id=105676
-
- Reviewed by Sam Weinig.
-
- * WebCoreSupport/PlatformStrategiesWinCE.cpp:
- (PlatformStrategiesWinCE::cookiesForDOM):
- (PlatformStrategiesWinCE::setCookiesFromDOM):
- (PlatformStrategiesWinCE::cookiesEnabled):
- (PlatformStrategiesWinCE::cookieRequestHeaderFieldValue):
- (PlatformStrategiesWinCE::getRawCookies):
- (PlatformStrategiesWinCE::deleteCookie):
- * WebCoreSupport/PlatformStrategiesWinCE.h:
- Cookie functions now take a NetworkStorageSession, not a NetworkingContext.
-
-2012-12-18 Alexey Proskuryakov <ap@apple.com>
-
- Remove unnecessary functions from CookiesStrategy
- https://bugs.webkit.org/show_bug.cgi?id=105369
-
- Reviewed by Brady Eidson.
-
- * WebCoreSupport/PlatformStrategiesWinCE.cpp:
- * WebCoreSupport/PlatformStrategiesWinCE.h:
-
-2012-12-15 Anders Carlsson <andersca@apple.com>
-
- Rename FrameLoaderClient::download to convertMainResourceLoadToDownload
- https://bugs.webkit.org/show_bug.cgi?id=105122
-
- Reviewed by Andreas Kling.
-
- Update for WebCore changes.
-
- * WebCoreSupport/FrameLoaderClientWinCE.cpp:
- (WebKit::FrameLoaderClientWinCE::convertMainResourceLoadToDownload):
- * WebCoreSupport/FrameLoaderClientWinCE.h:
- (FrameLoaderClientWinCE):
-
-2012-12-15 Mark Lam <mark.lam@apple.com>
-
- Re-landing patch for "Introducing the DatabaseStrategy and database servers".
- https://bugs.webkit.org/show_bug.cgi?id=104934.
-
- Not reviewed.
-
- Merged from r137767. Previously reviewed by Sam Weinig.
-
- * WebCoreSupport/PlatformStrategiesWinCE.cpp:
- (PlatformStrategiesWinCE::createDatabaseStrategy):
- * WebCoreSupport/PlatformStrategiesWinCE.h:
- (PlatformStrategiesWinCE):
-
-2012-12-14 Sheriff Bot <webkit.review.bot@gmail.com>
-
- Unreviewed, rolling out r137767.
- http://trac.webkit.org/changeset/137767
- https://bugs.webkit.org/show_bug.cgi?id=105062
-
- Broke Mac builds. (Requested by mlam on #webkit).
-
- * WebCoreSupport/PlatformStrategiesWinCE.cpp:
- * WebCoreSupport/PlatformStrategiesWinCE.h:
- (PlatformStrategiesWinCE):
-
-2012-12-14 Mark Lam <mark.lam@apple.com>
-
- Introducing the DatabaseStrategy and database servers.
- https://bugs.webkit.org/show_bug.cgi?id=104934.
-
- Reviewed by Sam Weinig.
-
- The database server is currently a placeholder that does nothing.
-
- * WebCoreSupport/PlatformStrategiesWinCE.cpp:
- (PlatformStrategiesWinCE::createDatabaseStrategy):
- * WebCoreSupport/PlatformStrategiesWinCE.h:
- (PlatformStrategiesWinCE):
-
-2012-12-11 Mike West <mkwst@chromium.org>
-
- Web Inspector: ConsoleTypes should not expose MessageType - it should be private to inspector.
- https://bugs.webkit.org/show_bug.cgi?id=66371
-
- Reviewed by Pavel Feldman.
-
- Drops WebCore::MessageType from the addMessageToConsole method.
-
- * WebCoreSupport/ChromeClientWinCE.cpp:
- (WebKit::ChromeClientWinCE::addMessageToConsole):
- * WebCoreSupport/ChromeClientWinCE.h:
- (ChromeClientWinCE):
-
-2012-11-29 Alexey Proskuryakov <ap@apple.com>
-
- [WK2] Forward cookie jar calls to NetworkProcess
- https://bugs.webkit.org/show_bug.cgi?id=103457
-
- Reviewed by Darin Adler.
-
- * WebCoreSupport/PlatformStrategiesWinCE.cpp:
- (PlatformStrategiesWinCE::cookiesForDOM):
- (PlatformStrategiesWinCE::setCookiesFromDOM):
- (PlatformStrategiesWinCE::cookiesEnabled):
- (PlatformStrategiesWinCE::cookieRequestHeaderFieldValue):
- (PlatformStrategiesWinCE::getRawCookies):
- (PlatformStrategiesWinCE::deleteCookie):
- (PlatformStrategiesWinCE::getHostnamesWithCookies):
- (PlatformStrategiesWinCE::deleteCookiesForHostname):
- (PlatformStrategiesWinCE::deleteAllCookies):
-
-2012-11-27 James Simonsen <simonjam@chromium.org>
-
- Consolidate FrameLoader::load() into one function taking a FrameLoadRequest
- https://bugs.webkit.org/show_bug.cgi?id=102151
-
- Reviewed by Adam Barth.
-
- * WebView.cpp:
- (WebView::load):
-
-2012-11-27 Sheriff Bot <webkit.review.bot@gmail.com>
-
- Unreviewed, rolling out r135786.
- http://trac.webkit.org/changeset/135786
- https://bugs.webkit.org/show_bug.cgi?id=103379
-
- It made 3 plugin tests timeout on several platforms (Requested
- by Ossy on #webkit).
-
- * WebView.cpp:
- (WebView::load):
-
-2012-11-26 James Simonsen <simonjam@chromium.org>
-
- Consolidate FrameLoader::load() into one function taking a FrameLoadRequest
- https://bugs.webkit.org/show_bug.cgi?id=102151
-
- Reviewed by Adam Barth.
-
- * WebView.cpp:
- (WebView::load):
-
-2012-11-20 Sheriff Bot <webkit.review.bot@gmail.com>
-
- Unreviewed, rolling out r135295.
- http://trac.webkit.org/changeset/135295
- https://bugs.webkit.org/show_bug.cgi?id=102834
-
- This patch causes assertion to some layout tests on chromium
- (Requested by jianli on #webkit).
-
- * WebView.cpp:
- (WebView::load):
-
-2012-11-20 James Simonsen <simonjam@chromium.org>
-
- Consolidate FrameLoader::load() into one function taking a FrameLoadRequest
- https://bugs.webkit.org/show_bug.cgi?id=102151
-
- Reviewed by Adam Barth.
-
- * WebView.cpp:
- (WebView::load):
-
-2012-10-24 Brady Eidson <beidson@apple.com>
-
- Add a strategy for loader customization.
- https://bugs.webkit.org/show_bug.cgi?id=100278
-
- Reviewed by Alexey Proskuryakov.
-
- * WebCoreSupport/PlatformStrategiesWinCE.cpp:
- (PlatformStrategiesWinCE::createLoaderStrategy):
- * WebCoreSupport/PlatformStrategiesWinCE.h:
- (PlatformStrategiesWinCE):
-
-2012-10-23 Alexey Proskuryakov <ap@apple.com>
-
- Add a strategy for shared workers
- https://bugs.webkit.org/show_bug.cgi?id=100165
-
- Reviewed by Brady Eidson.
-
- * WebCoreSupport/PlatformStrategiesWinCE.cpp:
- (PlatformStrategiesWinCE::createPasteboardStrategy):
- (PlatformStrategiesWinCE::createSharedWorkerStrategy):
- (PlatformStrategiesWinCE::createVisitedLinkStrategy):
- * WebCoreSupport/PlatformStrategiesWinCE.h:
-
-2012-10-10 Jon Lee <jonlee@apple.com>
-
- [WK2] Activate plugins when user clicks on snapshot
- https://bugs.webkit.org/show_bug.cgi?id=98328
- <rdar://problem/12426681>
-
- Reviewed by Brady Eidson.
-
- * WebCoreSupport/FrameLoaderClientWinCE.h:
- (WebKit::FrameLoaderClientWinCE::recreatePlugin): Stub implementation of recreatePlugin().
-
-2012-10-07 Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
-
- Rename first/second to key/value in HashMap iterators
- https://bugs.webkit.org/show_bug.cgi?id=82784
-
- Reviewed by Eric Seidel.
-
- * WebCoreSupport/PlatformStrategiesWinCE.cpp:
- (PlatformStrategiesWinCE::getPluginInfo):
-
-2012-10-04 Simon Fraser <simon.fraser@apple.com>
-
- Standardize on "flush" terminology for compositing layer flushing/syncing
- https://bugs.webkit.org/show_bug.cgi?id=98321
-
- Reviewed by Simon Fraser.
-
- Rename compositing-related methods that refer to "syncing" to instead
- refer to "flushing".
-
- * WebCoreSupport/ChromeClientWinCE.cpp:
- (WebKit::ChromeClientWinCE::scheduleCompositingLayerFlush):
- * WebCoreSupport/ChromeClientWinCE.h:
- (ChromeClientWinCE):
-
-2012-09-28 Mikhail Pozdnyakov <mikhail.pozdnyakov@intel.com>
-
- Code inside FrameLoaderClient::canShowMIMEType() implementations can be shared among different WK ports
- https://bugs.webkit.org/show_bug.cgi?id=97547
-
- Reviewed by Adam Barth.
-
- Newly added WebCore::MIMETypeRegistry::canShowMIMEType() function is used
- inside WebKit::FrameLoaderClientWinCE::canShowMIMEType().
-
- * WebCoreSupport/FrameLoaderClientWinCE.cpp:
- (WebKit::FrameLoaderClientWinCE::canShowMIMEType):
-
-2012-09-25 Beth Dakin <bdakin@apple.com>
-
- https://bugs.webkit.org/show_bug.cgi?id=95397
- Need to merge didFirstVisuallyNonEmptyLayout and
- didNewFirstVisuallyNonEmptyLayout
- -and corresponding-
- <rdar://problem/10791680>
-
- Reviewed by Sam Weinig.
-
- Remove dispatchDidFirstLayout,
- dispatchDidFirstVisuallyNonEmptyLayout, and
- dispatchDidNewFirstVisuallyNonEmptyLayout. Their functionality
- is now replaced by dispatchDidLayout(LayoutMilestones)
- * WebCoreSupport/FrameLoaderClientWinCE.cpp:
- (WebKit::FrameLoaderClientWinCE::dispatchDidLayout):
- * WebCoreSupport/FrameLoaderClientWinCE.h:
- (FrameLoaderClientWinCE):
-
-2012-08-28 Sheriff Bot <webkit.review.bot@gmail.com>
-
- Unreviewed, rolling out r126914.
- http://trac.webkit.org/changeset/126914
- https://bugs.webkit.org/show_bug.cgi?id=95239
-
- it breaks everything and fixes nothing (Requested by pizlo on
- #webkit).
-
- * WebCoreSupport/PlatformStrategiesWinCE.cpp:
- (PlatformStrategiesWinCE::getPluginInfo):
-
-2012-08-28 Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
-
- Rename first/second to key/value in HashMap iterators
- https://bugs.webkit.org/show_bug.cgi?id=82784
-
- Reviewed by Eric Seidel.
-
- * WebCoreSupport/PlatformStrategiesWinCE.cpp:
- (PlatformStrategiesWinCE::getPluginInfo):
-
-2012-08-27 Sheriff Bot <webkit.review.bot@gmail.com>
-
- Unreviewed, rolling out r126836.
- http://trac.webkit.org/changeset/126836
- https://bugs.webkit.org/show_bug.cgi?id=95163
-
- Broke all Apple ports, EFL, and Qt. (Requested by tkent on
- #webkit).
-
- * WebCoreSupport/PlatformStrategiesWinCE.cpp:
- (PlatformStrategiesWinCE::getPluginInfo):
-
-2012-08-27 Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
-
- Rename first/second to key/value in HashMap iterators
- https://bugs.webkit.org/show_bug.cgi?id=82784
-
- Reviewed by Eric Seidel.
-
- * WebCoreSupport/PlatformStrategiesWinCE.cpp:
- (PlatformStrategiesWinCE::getPluginInfo):
-
-2012-08-13 Tom Sepez <tsepez@chromium.org>
-
- [chromium] release FrameLoaderClientImpl::m_pluginWidget refptr upon Plugin Document detach.
- https://bugs.webkit.org/show_bug.cgi?id=93283
-
- Reviewed by Eric Seidel.
-
- Change the client redirectDataToPlugin method(s) to expect the possibility of
- a NULL argument, keeping existing behaviour otherwise.
-
- * WebCoreSupport/FrameLoaderClientWinCE.cpp:
- (WebKit::FrameLoaderClientWinCE::redirectDataToPlugin):
-
-2012-07-23 Pierre Rossi <pierre.rossi@gmail.com>
-
- Unify numTouchEventHandlersChanged and needTouchEvents in the chrome client
- https://bugs.webkit.org/show_bug.cgi?id=91006
-
- Reviewed by Ryosuke Niwa.
-
- Remove numTouchEventHandlersChanged stub.
-
- * WebCoreSupport/ChromeClientWinCE.h:
-
-2012-07-17 Vivek Galatage <vivekgalatage@gmail.com>
-
- Web Inspector: refactor InspectorController::connectFrontend() to accept InspectorFrontendChannel.
- https://bugs.webkit.org/show_bug.cgi?id=91196
-
- Reviewed by Pavel Feldman.
-
- Refactoring InspectorClients. InspectorClient::openInspectorFrontend
- now returning the InspectorFrontendChannel.
-
- * WebCoreSupport/InspectorClientWinCE.cpp:
- (WebKit::InspectorClientWinCE::openInspectorFrontend):
- * WebCoreSupport/InspectorClientWinCE.h:
- (InspectorClientWinCE):
-
-2012-05-31 Hajime Morrita <morrita@chromium.org>
-
- REGRESSION(r117572): editing/spelling/spellcheck-async-remove-frame.html crashes on Mac
- https://bugs.webkit.org/show_bug.cgi?id=86859
-
- Reviewed by Ryosuke Niwa.
-
- * WebCoreSupport/EditorClientWinCE.h:
- (WebKit::EditorClientWinCE::requestCheckingOfString):
-
-2012-05-30 Patrick Gansterer <paroga@webkit.org>
-
- Unreviewed WinCE build fix after r115926.
-
- * WebView.cpp:
-
-2012-05-30 Patrick Gansterer <paroga@webkit.org>
-
- Unreviewed WinCE build fix after r117470.
-
- * WebCoreSupport/EditorClientWinCE.h:
- (EditorClientWinCE):
-
-2012-05-18 MORITA Hajime <morrita@google.com>
-
- Another unreviewed attempt to fix build breakage on r117572.
-
- * WebCoreSupport/EditorClientWinCE.h:
- (WebKit::EditorClientWinCE::frameWillDetachPage):
-
-2012-05-18 MORITA Hajime <morrita@google.com>
-
- https://bugs.webkit.org/show_bug.cgi?id=85515
- Stale frame in WebCore::SpellChecker::didCheckSucceeded
-
- Reviewed by Ryosuke Niwa.
-
- * WebCoreSupport/EditorClientWinCE.h:
- (WebKit::EditorClientWinCE::frameWillDetachPage):
-
-2012-05-17 Hironori Bono <hbono@chromium.org>
-
- [Refactoring] Move platform-specific code in Editor::respondToChangedSelection to the WebKit layer
- https://bugs.webkit.org/show_bug.cgi?id=86591
-
- Reviewed by Ryosuke Niwa.
-
- This change adds a TextCheckerClient::shouldEraseMarkersAfterChangeSelection
- function to remove platform-specific code from Editor::respondToChangedSelection
- function.
-
- No new tests, no change in behavior.
-
- * WebCoreSupport/EditorClientWinCE.cpp:
- (WebKit::EditorClientWinCE::shouldEraseMarkersAfterChangeSelection):
- (WebKit):
- * WebCoreSupport/EditorClientWinCE.h:
- (EditorClientWinCE):
-
-2012-05-04 Nate Chapin <japhet@chromium.org>
-
- Don't require FrameLoaderClient to manufacture a commitData() call for empty documents.
- https://bugs.webkit.org/show_bug.cgi?id=85533
-
- Reviewed by Alexey Proskuryakov.
-
- * WebCoreSupport/FrameLoaderClientWinCE.cpp:
- (WebKit::FrameLoaderClientWinCE::finishedLoading):
-
-2012-04-18 Jon Honeycutt <jhoneycutt@apple.com>
-
- FrameLoaderClient::dispatchWillSendSubmitEvent() should be given more
- information about the form being submitted
- https://bugs.webkit.org/show_bug.cgi?id=84297
-
- Reviewed by Andy Estes.
-
- * WebCoreSupport/FrameLoaderClientWinCE.h:
- (WebKit::FrameLoaderClientWinCE::dispatchWillSendSubmitEvent):
- Updated method declaration.
-
-2012-03-30 Patrick Gansterer <paroga@webkit.org>
-
- [WinCE] Correct <wtf/*.h> include paths.
- https://bugs.webkit.org/show_bug.cgi?id=82713
-
- Reviewed by Eric Seidel.
-
- Modify the #include declarations for several WinCE-related files
- so that the wtf types are included using the full path.
-
- * WebView.cpp:
- * WebView.h:
-
-2012-03-28 Nate Chapin <japhet@chromium.org>
-
- Remove dispatchDidLoadMainResource callback, since no
- port implements it.
- https://bugs.webkit.org/show_bug.cgi?id=82539
-
- Reviewed by Alexey Proskuryakov.
-
- * WebCoreSupport/FrameLoaderClientWinCE.cpp:
- (WebKit):
- * WebCoreSupport/FrameLoaderClientWinCE.h:
- (FrameLoaderClientWinCE):
-
-2012-03-19 Adam Barth <abarth@webkit.org>
-
- Remove support for "magic" iframe
- https://bugs.webkit.org/show_bug.cgi?id=81590
-
- Reviewed by Eric Seidel.
-
- Remove FrameLoaderClient methods that no longer exist.
-
- * WebCoreSupport/FrameLoaderClientWinCE.cpp:
- (WebKit):
- * WebCoreSupport/FrameLoaderClientWinCE.h:
- (FrameLoaderClientWinCE):
-
-2012-03-13 Jon Lee <jonlee@apple.com>
-
- Separate NOTIFICATIONS and LEGACY_NOTIFICATIONS
- https://bugs.webkit.org/show_bug.cgi?id=80922
- <rdar://problem/11035082>
-
- Reviewed by Jian Li.
-
- You can include either NOTIFICATIONS or LEGACY_NOTIFICATIONS and have a complete API.
- LEGACY_NOTIFICATIONS should cover all of the previous functionality, and NOTIFICATIONS will cover the
- new API. Therefore, APIs that are common between the two will have:
- #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
-
- This patch initially sets both to be exactly the same. As other bugs with patches begin to migrate to
- the new API, the defines will begin to split. This allows ports to decide which set of APIs to include.
-
- Update everything to be #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
- * WebCoreSupport/ChromeClientWinCE.h:
- (ChromeClientWinCE):
-
-2012-03-13 Adam Barth <abarth@webkit.org> && Benjamin Poulain <bpoulain@apple.com>
-
- Always enable ENABLE(CLIENT_BASED_GEOLOCATION)
- https://bugs.webkit.org/show_bug.cgi?id=78853
-
- Reviewed by Adam Barth.
-
- * WebCoreSupport/ChromeClientWinCE.cpp:
- * WebCoreSupport/ChromeClientWinCE.h:
- (ChromeClientWinCE):
-
-2012-03-09 Jon Lee <jonlee@apple.com>
-
- Rename NotificationPresenter to NotificationClient
- https://bugs.webkit.org/show_bug.cgi?id=80488
- <rdar://problem/10965558>
-
- Reviewed by Kentaro Hara.
-
- Refactor to use renamed WebCore::NotificationClient.
- * WebCoreSupport/ChromeClientWinCE.h:
- (ChromeClientWinCE):
-
-2012-02-26 Hajime Morrita <morrita@chromium.org>
-
- Move ChromeClient::showContextMenu() to ContextMenuClient
- https://bugs.webkit.org/show_bug.cgi?id=79427
-
- Reviewed by Adam Barth.
-
- * WebCoreSupport/ChromeClientWinCE.h:
- (ChromeClientWinCE):
-
-2012-02-24 Shinya Kawanaka <shinyak@chromium.org>
-
- SpellCheckRequest needs to know the context where the spellcheck happened.
- https://bugs.webkit.org/show_bug.cgi?id=79320
-
- Reviewed by Hajime Morita.
-
- * WebCoreSupport/EditorClientWinCE.h:
- (WebKit::EditorClientWinCE::requestCheckingOfString):
-
-2012-02-23 Patrick Gansterer <paroga@webkit.org>
-
- Unreviewed WinCE build fix after r108462.
-
- * WebCoreSupport/EditorClientWinCE.h:
- (EditorClientWinCE):
-
-2012-02-21 Ryosuke Niwa <rniwa@webkit.org>
-
- Remove the remaining uses of CSSStyleDeclaration in Editor
- https://bugs.webkit.org/show_bug.cgi?id=78939
-
- Reviewed by Enrica Casucci.
-
- * WebCoreSupport/EditorClientWinCE.cpp:
- (WebKit::EditorClientWinCE::shouldApplyStyle):
-
-2012-02-22 Ryosuke Niwa <rniwa@webkit.org>
-
- Remove the remaining uses of CSSStyleDeclaration in Editor
- https://bugs.webkit.org/show_bug.cgi?id=78939
-
- Reviewed by Enrica Casucci.
-
- * WebCoreSupport/EditorClientWinCE.cpp:
- (WebKit::EditorClientWinCE::shouldApplyStyle):
-
-2012-02-20 Benjamin Poulain <benjamin@webkit.org>
-
- Get rid of the LocalizationStrategy
- https://bugs.webkit.org/show_bug.cgi?id=78324
-
- Reviewed by Sam Weinig.
-
- Remove a useless #include of LocalizationStrategy.h.
-
- * WebCoreSupport/PlatformStrategiesWinCE.h:
-
-2012-02-15 Patrick Gansterer <paroga@webkit.org>
-
- Unreviewed WinCE build fix after r107606.
-
- * WebCoreSupport/PlatformStrategiesWinCE.cpp:
- (PlatformStrategiesWinCE::createPasteboardStrategy):
- * WebCoreSupport/PlatformStrategiesWinCE.h:
- (PlatformStrategiesWinCE):
-
-2012-02-15 Sadrul Habib Chowdhury <sadrul@chromium.org>
-
- Notify ChromeClient when touch-event handlers are installed/removed.
- https://bugs.webkit.org/show_bug.cgi?id=77440
-
- Reviewed by Darin Fisher and Ryosuke Niwa.
-
- * WebCoreSupport/ChromeClientWinCE.h:
- (WebKit::ChromeClientWinCE::numTouchEventHandlersChanged):
-
-2011-12-19 Sam Weinig <sam@webkit.org>
-
- More PlatformEvent cleanup
- https://bugs.webkit.org/show_bug.cgi?id=74831
-
- Reviewed by Dan Bernstein.
-
- * WebView.cpp:
- (WebView::handleMouseEvent):
- Update to use new names, access style.
-
-2011-12-16 Ryosuke Niwa <rniwa@webkit.org>
-
- Rename registerCommandFor(Undo|Redo) to register(Undo|Redo)Step
- https://bugs.webkit.org/show_bug.cgi?id=74748
-
- Reviewed by Eric Seidel.
-
- * WebCoreSupport/EditorClientWinCE.cpp:
- (WebKit::EditorClientWinCE::registerUndoStep):
- (WebKit::EditorClientWinCE::registerRedoStep):
- * WebCoreSupport/EditorClientWinCE.h:
-
-2011-12-16 Sam Weinig <sam@webkit.org>
-
- Give PlatformEvents a base class
- https://bugs.webkit.org/show_bug.cgi?id=74685
-
- Reviewed by Anders Carlsson.
-
- Add a base class for PlatformMouseEvent, PlatformKeyboardEvent, PlatformWheelEvent
- and PlatformGestureEvent and move Type enumeration and modifiers down to it.
-
- * WebCoreSupport/EditorClientWinCE.cpp:
- (WebKit::EditorClientWinCE::handleEditingKeyboardEvent):
- * WebView.cpp:
- (WebView::handleKeyDown):
- (WebView::handleKeyPress):
- (WebView::handleKeyUp):
-
-2011-12-16 Ryosuke Niwa <rniwa@webkit.org>
-
- Only EditCommandComposition should implement unapply and reapply
- https://bugs.webkit.org/show_bug.cgi?id=74490
-
- Reviewed by Eric Seidel.
-
- * WebCoreSupport/EditorClientWinCE.cpp:
- (WebKit::EditorClientWinCE::registerCommandForUndo):
- (WebKit::EditorClientWinCE::registerCommandForRedo):
- * WebCoreSupport/EditorClientWinCE.h:
-
-2011-12-14 Jing Zhao <jingzhao@chromium.org>
-
- Opening two popup menus by dispatchEvent() makes problems.
- https://bugs.webkit.org/show_bug.cgi?id=73304
-
- Reviewed by Ryosuke Niwa.
-
- * WebCoreSupport/ChromeClientWinCE.cpp:
- (WebKit::ChromeClientWinCE::hasOpenedPopup): Not implemented.
- * WebCoreSupport/ChromeClientWinCE.h: Overrides hasOpenedPopup().
-
-2011-11-30 Alexey Proskuryakov <ap@apple.com>
-
- Remove an unneeded argument from FrameLoaderClient::download
- https://bugs.webkit.org/show_bug.cgi?id=73486
-
- Reviewed by Andreas Kling.
-
- * WebCoreSupport/FrameLoaderClientWinCE.cpp:
- (WebKit::FrameLoaderClientWinCE::download):
- * WebCoreSupport/FrameLoaderClientWinCE.h:
- Updated for the change.
-
-2011-11-26 Sheriff Bot <webkit.review.bot@gmail.com>
-
- Unreviewed, rolling out r101193.
- http://trac.webkit.org/changeset/101193
- https://bugs.webkit.org/show_bug.cgi?id=73158
-
- Breaks Windows and Qt minimal. (Requested by pfeldman on
- #webkit).
-
- * WebCoreSupport/InspectorClientWinCE.cpp:
- * WebCoreSupport/InspectorClientWinCE.h:
-
-2011-11-22 Pavel Feldman <pfeldman@google.com>
-
- Web Inspector: remove Inspector::bringToFront from the protocol.
- https://bugs.webkit.org/show_bug.cgi?id=72937
-
- Reviewed by Yury Semikhatsky.
-
- * WebCoreSupport/InspectorClientWinCE.cpp:
- (WebKit::InspectorClientWinCE::bringFrontendToFront):
- * WebCoreSupport/InspectorClientWinCE.h:
-
-2011-11-21 Andreas Kling <kling@webkit.org>
-
- Unreviewed WinCE build fix after r100874.
-
- * WebCoreSupport/EditorClientWinCE.h:
- * WebCoreSupport/EditorClientWinCE.cpp:
- (WebKit::EditorClientWinCE::respondToChangedSelection):
-
- Add WebCore::Frame* parameter to respondToChangedSelection().
-
-2011-11-15 Anders Carlsson <andersca@apple.com>
-
- HostWindow screenToWindow/windowToScreen should be screenToRootView/rootViewToScreen
- https://bugs.webkit.org/show_bug.cgi?id=72397
-
- Reviewed by Dan Bernstein.
-
- * WebCoreSupport/ChromeClientWinCE.cpp:
- (WebKit::ChromeClientWinCE::rootViewToScreen):
- (WebKit::ChromeClientWinCE::screenToRootView):
- * WebCoreSupport/ChromeClientWinCE.h:
-
-2011-11-14 Anders Carlsson <andersca@apple.com>
-
- HostWindow invalidation functions should use root view coordinates
- https://bugs.webkit.org/show_bug.cgi?id=72338
-
- Reviewed by Dan Bernstein.
-
- * WebCoreSupport/ChromeClientWinCE.cpp:
- (WebKit::ChromeClientWinCE::invalidateRootView):
- (WebKit::ChromeClientWinCE::invalidateContentsAndRootView):
- (WebKit::ChromeClientWinCE::invalidateContentsForSlowScroll):
- (WebKit::ChromeClientWinCE::scroll):
- * WebCoreSupport/ChromeClientWinCE.h:
-
-2011-11-04 Patrick Gansterer <paroga@webkit.org>
-
- [WINCE] Use default LocalizationStrategy
- https://bugs.webkit.org/show_bug.cgi?id=71495
-
- Reviewed by Adam Roben.
-
- Use LocalizationStrategy from WebCore instead of using a copy of the strings in WebKit.
-
- * WebCoreSupport/PlatformStrategiesWinCE.cpp:
- * WebCoreSupport/PlatformStrategiesWinCE.h:
-
-2011-11-02 Tom Sepez <tsepez@chromium.org>
-
- XSSAuditor is silent
- https://bugs.webkit.org/show_bug.cgi?id=70973
-
- Reviewed by Adam Barth.
-
- * WebCoreSupport/FrameLoaderClientWinCE.cpp:
- (WebKit::FrameLoaderClientWinCE::didDetectXSS):
- * WebCoreSupport/FrameLoaderClientWinCE.h:
-
-2011-11-02 Jon Lee <jonlee@apple.com>
-
- <input=file multiple> default text uses singular instead of plural
- https://bugs.webkit.org/show_bug.cgi?id=71319
- <rdar://problem/10379021>
-
- Reviewed by Darin Adler.
-
- * WebCoreSupport/PlatformStrategiesWinCE.cpp:
- (PlatformStrategiesWinCE::fileButtonNoFilesSelectedLabel):
- * WebCoreSupport/PlatformStrategiesWinCE.h:
-
-2011-10-28 Jochen Eisinger <jochen@chromium.org>
-
- Rename a number of methods mentioning JavaScript to just Script instead
- https://bugs.webkit.org/show_bug.cgi?id=71105
-
- Reviewed by Adam Barth.
-
- * WebView.cpp:
- (WebView::WebView):
-
-2011-10-07 Patrick Gansterer <paroga@webkit.org>
-
- Unreviewed build fix after r95604.
-
- * WebCoreSupport/PlatformStrategiesWinCE.cpp:
- (PlatformStrategiesWinCE::isLinkVisited):
- (PlatformStrategiesWinCE::addVisitedLink):
-
-2011-09-24 Adam Barth <abarth@webkit.org>
-
- Always enable ENABLE(OFFLINE_WEB_APPLICATIONS)
- https://bugs.webkit.org/show_bug.cgi?id=68767
-
- Reviewed by Eric Seidel.
-
- * WebCoreSupport/ChromeClientWinCE.cpp:
- (WebKit::ChromeClientWinCE::reachedApplicationCacheOriginQuota):
- * WebCoreSupport/ChromeClientWinCE.h:
-
-2011-09-21 Andras Becsi <andras.becsi@nokia.com>
-
- [Qt] Remove Qt specific code from css/SelectorChecker.cpp
- https://bugs.webkit.org/show_bug.cgi?id=67702
-
- Reviewed by Csaba Osztrogonác.
-
- * WebCoreSupport/PlatformStrategiesWinCE.cpp:
- (PlatformStrategiesWinCE::addVisitedLink):
- * WebCoreSupport/PlatformStrategiesWinCE.h:
-
-2011-09-17 Mihai Parparita <mihaip@chromium.org>
-
- FrameLoaderClient BackForwardList-related methods are unsued
- https://bugs.webkit.org/show_bug.cgi?id=68293
-
- Reviewed by Darin Adler.
-
- Remove FrameLoaderClient methods that were added by r51629, since only
- the old (since-deleted) Android port needed them.
-
- * WebCoreSupport/FrameLoaderClientWinCE.cpp:
- * WebCoreSupport/FrameLoaderClientWinCE.h:
-
-2011-09-15 Adam Barth <abarth@webkit.org>
-
- Rename ENABLE(DATABASE) to ENABLE(SQL_DATABASE)
- https://bugs.webkit.org/show_bug.cgi?id=68205
-
- Reviewed by Eric Seidel.
-
- * WebCoreSupport/ChromeClientWinCE.cpp:
- * WebCoreSupport/ChromeClientWinCE.h:
-
-2011-08-30 Ryosuke Niwa <rniwa@webkit.org>
-
- WinCE build fix attempt after r94080.
-
- * WebCoreSupport/ChromeClientWinCE.cpp:
- (WebKit::ChromeClientWinCE::scrollRectIntoView):
-
-2011-08-30 Kaustubh Atrawalkar <kaustubh@motorola.com>
-
- The unused ScrollView* argument can and should be removed from
- scrollRectIntoView.
- https://bugs.webkit.org/show_bug.cgi?id=67117
-
- Reviewed by Darin Adler.
-
- * WebCoreSupport/ChromeClientWinCE.h:
-
-2011-08-17 Adam Roben <aroben@apple.com>
-
- Make WebCore keep track of the current device scale factor
-
- Fixes <http://webkit.org/b/66413> WebCore requires every WebKit port to keep track of the
- device scale factor
-
- Reviewed by Darin Adler.
-
- * WebCoreSupport/ChromeClientWinCE.cpp:
- * WebCoreSupport/ChromeClientWinCE.h:
- Removed deviceScaleFactor.
-
-2011-08-15 Dmitry Titov <dimich@chromium.org>
-
- FrameLoaderClient::transferLoadingResourceFromPage does not have enough parameters
- https://bugs.webkit.org/show_bug.cgi?id=66165
-
- Reviewed by Darin Fisher.
-
- * WebCoreSupport/FrameLoaderClientWinCE.cpp:
- (WebKit::FrameLoaderClientWinCE::transferLoadingResourceFromPage):
- * WebCoreSupport/FrameLoaderClientWinCE.h:
-
-2011-08-10 Adam Roben <aroben@apple.com>
-
- Clear up scale factor terminology
-
- WebKit by and large deals with two scale factors: one intrinsic to the device on which the
- software is running, and one that is per-Page and can be controlled via API calls. This
- patch names the former "deviceScaleFactor" and the latter "pageScaleFactor", and makes the
- code use those names. It should introduce no behavior changes.
-
- Fixes <http://webkit.org/b/55787> WebKit uses multiple conflicting names to refer to the
- device scale factor
-
- Reviewed by Simon Fraser.
-
- * WebCoreSupport/ChromeClientWinCE.cpp:
- * WebCoreSupport/ChromeClientWinCE.h:
-
-2011-08-03 Pavel Feldman <pfeldman@chromium.org>
-
- Web Inspector: remove Node parameter from the InspectorClient::highlight
- https://bugs.webkit.org/show_bug.cgi?id=65549
-
- Reviewed by Yury Semikhatsky.
-
- * WebCoreSupport/InspectorClientWinCE.cpp:
- (WebKit::InspectorClientWinCE::highlight):
- * WebCoreSupport/InspectorClientWinCE.h:
-
-2011-07-26 Sadrul Habib Chowdhury <sadrul@chromium.org>
-
- Add support for download='filename' attribute in anchors.
- https://bugs.webkit.org/show_bug.cgi?id=64580
-
- Reviewed by Adam Barth.
-
- * WebCoreSupport/FrameLoaderClientWinCE.cpp:
- (WebKit::FrameLoaderClientWinCE::startDownload):
- * WebCoreSupport/FrameLoaderClientWinCE.h:
-
-2011-07-15 Dan Bernstein <mitz@apple.com>
-
- REGRESSION: Mouse cursor doesn’t hide when full screen video HUD hides
- https://bugs.webkit.org/show_bug.cgi?id=64615
-
- Reviewed by Anders Carlsson.
-
- * WebCoreSupport/ChromeClientWinCE.cpp:
- (WebKit::ChromeClientWinCE::setCursorHiddenUntilMouseMoves): Added this stub.
- * WebCoreSupport/ChromeClientWinCE.h:
-
-2011-07-12 Joseph Pecoraro <joepeck@webkit.org>
-
- ApplicationCache update should not immediately fail when reaching per-origin quota
- https://bugs.webkit.org/show_bug.cgi?id=64177
-
- Reviewed by Alexey Proskuryakov.
-
- * WebCoreSupport/ChromeClientWinCE.cpp:
- (WebKit::ChromeClientWinCE::reachedApplicationCacheOriginQuota):
- * WebCoreSupport/ChromeClientWinCE.h:
-
-2011-06-30 Kentaro Hara <haraken@google.com>
-
- Reviewed by Kent Tamura.
-
- Change the label of an HTML5 file chooser button to "Choose Files"
- https://bugs.webkit.org/show_bug.cgi?id=49245
-
- We should notify capability of multiple files to users.
-
- Test: fast/forms/input-file-label.html
-
- * WebCoreSupport/PlatformStrategiesWinCE.cpp:
- (PlatformStrategiesWinCE::fileButtonChooseFileLabel): Updated the description for "Choose File".
- (PlatformStrategiesWinCE::fileButtonChooseMultipleFilesLabel): Returns a "Choose Files" label.
- * WebCoreSupport/PlatformStrategiesWinCE.h:
-
-2011-06-20 Ryosuke Niwa <rniwa@webkit.org>
-
- WinCE build fix after r89293.
-
- * WebCoreSupport/EditorClientWinCE.cpp:
- (WebKit::EditorClientWinCE::handleEditingKeyboardEvent):
-
-2011-06-18 Dimitri Glazkov <dglazkov@chromium.org>
-
- Reviewed by Darin Adler.
-
- Separate concerns of loading file icons and choosing files.
- https://bugs.webkit.org/show_bug.cgi?id=62931
-
- * WebCoreSupport/ChromeClientWinCE.cpp:
- (WebKit::ChromeClientWinCE::loadIconForFiles): Renamed.
- * WebCoreSupport/ChromeClientWinCE.h:
-
-2011-06-12 Adam Barth <abarth@webkit.org>
-
- Reviewed by Alexey Proskuryakov.
-
- Rename FrameLoaderClient::interruptForPolicyChangeError to use the past tense
- https://bugs.webkit.org/show_bug.cgi?id=62516
-
- * WebCoreSupport/FrameLoaderClientWinCE.cpp:
- (WebKit::FrameLoaderClientWinCE::interruptedForPolicyChangeError):
- * WebCoreSupport/FrameLoaderClientWinCE.h:
-
-2011-05-13 Jon Lee <jonlee@apple.com>
-
- Reviewed by Simon Fraser.
-
- Can't horizontally scroll iframes and overflow because wheel events are always accepted
- https://bugs.webkit.org/show_bug.cgi?id=60779
-
- * WebCoreSupport/ChromeClientWinCE.h:
- (WebKit::ChromeClientWinCE::shouldRubberBandInDirection): Default impl of new ChromeClient method
- (WebKit::ChromeClientWinCE::numWheelEventHandlersChanged): Default impl of new ChromeClient method
-
-2011-05-05 Ryosuke Niwa <rniwa@webkit.org>
-
- Reviewed by Eric Seidel.
-
- Rename SelectionController to FrameSelection
- https://bugs.webkit.org/show_bug.cgi?id=60234
-
- * WebCoreSupport/EditorClientWinCE.cpp:
- (WebKit::EditorClientWinCE::handleEditingKeyboardEvent):
-
-2011-05-04 Cris Neckar <cdn@chromium.org>
-
- Reviewed by Adam Barth.
-
- Expose WebView directly through ChromeClient.
- https://bugs.webkit.org/show_bug.cgi?id=49902
-
- * WebCoreSupport/ChromeClientWinCE.h:
- (WebKit::ChromeClientWinCE::webView):
-
-2011-05-04 Tao Bai <michaelbai@chromium.org>
-
- Reviewed by David Kilzer.
-
- Populate touch-icon url to FrameLoaderClient
- https://bugs.webkit.org/show_bug.cgi?id=59143
-
- Respect the interface change in FrameLoaderClient.
-
- * WebCoreSupport/FrameLoaderClientWinCE.cpp:
- (WebKit::FrameLoaderClientWinCE::dispatchDidChangeIcons):
- * WebCoreSupport/FrameLoaderClientWinCE.h:
-
-2011-05-01 Patrick Gansterer <paroga@webkit.org>
-
- [WIN] Unreviewed buildfix after r85434.
-
- * WebView.cpp:
- (WebView::paint):
-
-2011-04-21 Ryosuke Niwa <rniwa@webkit.org>
-
- WinCE build fix after r84574.
-
- * WebCoreSupport/EditorClientWinCE.cpp:
- (WebKit::EditorClientWinCE::canCopyCut):
- (WebKit::EditorClientWinCE::canPaste):
- * WebCoreSupport/EditorClientWinCE.h:
-
-2011-04-19 Vsevolod Vlasov <vsevik@chromium.org>
-
- Reviewed by Pavel Feldman.
-
- Web Inspector: Rename lengthReceived to encodedDataLength/dataLength
- https://bugs.webkit.org/show_bug.cgi?id=58883
-
- * WebCoreSupport/FrameLoaderClientWinCE.h:
-
-2011-04-04 MORITA Hajime <morrita@google.com>
-
- Reviewed by Ryosuke Niwa.
-
- [Refactoring] SpellCheckingResult should be replaced with TextCheckingResult
- https://bugs.webkit.org/show_bug.cgi?id=56085
-
- * WebCoreSupport/EditorClientWinCE.h:
- (WebKit::EditorClientWinCE::requestCheckingOfString):
-
-2011-04-04 Alexey Proskuryakov <ap@apple.com>
-
- Reviewed by Dan Bernstein.
-
- REGRESSION (WebKit2): Caps-Lock indicator sometimes doesn't appear in WebKit2
- https://bugs.webkit.org/show_bug.cgi?id=51230
- <rdar://problem/8780989>
-
- * WebView.cpp: (WebView::handleKeyDown): Moved Caps Lock handling from WebKits to WebCore,
- because WebKit shouldn't be smart.
-
-2011-03-31 Patrick Gansterer <paroga@webkit.org>
-
- Unreviewed WinCE build fix for r82580.
-
- * WebCoreSupport/FrameLoaderClientWinCE.h: StringWithDirection is in WebCore
- and not in WTF namespace.
-
-2011-03-31 Evan Martin <evan@chromium.org>
-
- Reviewed by Eric Seidel.
-
- <title> should support dir attribute
- https://bugs.webkit.org/show_bug.cgi?id=50961
-
- Update to new FrameLoaderClient interface.
-
- * WebCoreSupport/FrameLoaderClientWinCE.cpp:
- (WebKit::FrameLoaderClientWinCE::dispatchDidReceiveTitle):
- (WebKit::FrameLoaderClientWinCE::setTitle):
- * WebCoreSupport/FrameLoaderClientWinCE.h:
-
-2011-03-27 Patrick Gansterer <paroga@webkit.org>
-
- Reviewed by Andreas Kling.
-
- [WINCE] Use a appropriate user agent string
- https://bugs.webkit.org/show_bug.cgi?id=57175
-
- * WebCoreSupport/FrameLoaderClientWinCE.cpp:
- (WebKit::FrameLoaderClientWinCE::userAgent):
-
-2011-03-26 Patrick Gansterer <paroga@webkit.org>
-
- Unreviewed WinCE build fix.
-
- * CMakeListsWinCE.txt: Added missing include directory.
-
-2011-03-25 Andy Estes <aestes@apple.com>
-
- Reviewed by Adele Peterson.
-
- REGRESSION (r70748): latest nightly builds kills AC_QuickTime.js
- https://bugs.webkit.org/show_bug.cgi?id=49016
-
- Update objectContentType() implementation to handle the
- shouldPreferPlugInsForImages flag.
-
- * WebCoreSupport/FrameLoaderClientWinCE.cpp:
- (WebKit::FrameLoaderClientWinCE::objectContentType):
- * WebCoreSupport/FrameLoaderClientWinCE.h:
-
-2011-03-24 Sheriff Bot <webkit.review.bot@gmail.com>
-
- Unreviewed, rolling out r81916 and r81917.
- http://trac.webkit.org/changeset/81916
- http://trac.webkit.org/changeset/81917
- https://bugs.webkit.org/show_bug.cgi?id=57071
-
- broke a test on platforms that do not have QuickTime installed
- (Requested by estes on #webkit).
-
- * WebCoreSupport/FrameLoaderClientWinCE.cpp:
- (WebKit::FrameLoaderClientWinCE::objectContentType):
- * WebCoreSupport/FrameLoaderClientWinCE.h:
-
-2011-03-24 Andy Estes <aestes@apple.com>
-
- Reviewed by Darin Adler.
-
- REGRESSION (r70748): latest nightly builds kills AC_QuickTime.js
- https://bugs.webkit.org/show_bug.cgi?id=49016
-
- Update objectContentType() implementation to handle the
- shouldPreferPlugInsForImages flag.
-
- * WebCoreSupport/FrameLoaderClientWinCE.cpp:
- (WebKit::FrameLoaderClientWinCE::objectContentType):
- * WebCoreSupport/FrameLoaderClientWinCE.h:
-
-2011-03-07 Sam Weinig <sam@webkit.org>
-
- Reviewed by Anders Carlsson.
-
- Replace WebKit2's decidePolicyForMIMEType with decidePolicyForResponse
- https://bugs.webkit.org/show_bug.cgi?id=55827
-
- Renamed FrameLoaderClient::dispatchDecidePolicyForMIMEType to dispatchDecidePolicyForResponse
- and pass the entire response, instead of just the MIMEType.
-
- * WebCoreSupport/FrameLoaderClientWinCE.cpp:
- (WebKit::FrameLoaderClientWinCE::dispatchDecidePolicyForResponse):
- * WebCoreSupport/FrameLoaderClientWinCE.h:
-
-2011-03-03 Alexey Proskuryakov <ap@apple.com>
-
- Removing an include of WebCoreKeyboardUIMode.h that Ive just added. It's already included
- via ChromeClient.h
-
- * WebCoreSupport/ChromeClientWinCE.h:
-
-2011-03-02 Alexey Proskuryakov <ap@apple.com>
-
- Reviewed by Darin Adler.
-
- REGRESSION (WebKit2): Tab keys no longer observe Full Keyboard Access
- https://bugs.webkit.org/show_bug.cgi?id=55633
- <rdar://problem/8963023>
-
- * WebCoreSupport/ChromeClientWinCE.cpp: (WebKit::ChromeClientWinCE::keyboardUIMode):
- * WebCoreSupport/ChromeClientWinCE.h:
- Implement keyboardUIMode() instead of tabsToLinks(). No change in functionality, since
- this platform doesn't observe or have full keyboard access state.
-
-2011-03-02 Brian Weinstein <bweinstein@apple.com>
-
- WinCE build fix.
-
- * WebCoreSupport/PlatformStrategiesWinCE.h: Add a needed include.
-
-2011-03-02 Brian Weinstein <bweinstein@apple.com>
-
- WinCE build fix. Have PlatformStrategiesWinCE inherit from CookiesStrategy,
- and implement the needed methods.
-
- * WebCoreSupport/PlatformStrategiesWinCE.cpp:
- (PlatformStrategiesWinCE::createCookiesStrategy):
- (PlatformStrategiesWinCE::notifyCookiesChanged):
- * WebCoreSupport/PlatformStrategiesWinCE.h:
-
-2011-02-28 Chang Shu <cshu@webkit.org>
-
- Reviewed by Ryosuke Niwa.
-
- Remove the support of Frame::isContentEditable and its dependencies.
- https://bugs.webkit.org/show_bug.cgi?id=54292
-
- Remove the WebKit side implementation.
-
- * WebCoreSupport/EditorClientWinCE.cpp:
- * WebCoreSupport/EditorClientWinCE.h:
-
-2011-02-19 Charlie Reis <creis@chromium.org>
-
- Reviewed by Mihai Parparita.
-
- Ensure loading has stopped in HistoryController::goToItem
- https://bugs.webkit.org/show_bug.cgi?id=54517
-
- Add a FrameLoaderClient callback for whether to stop loading before goToItem.
-
- Test: http/tests/navigation/forward-to-fragment-fires-onload.html
-
- * WebCoreSupport/FrameLoaderClientWinCE.cpp:
- (WebKit::FrameLoaderClientWinCE::shouldStopLoadingForHistoryItem): Added.
- * WebCoreSupport/FrameLoaderClientWinCE.h:
-
-2011-02-10 Luiz Agostini <luiz.agostini@openbossa.org>
-
- Reviewed by Adam Roben.
-
- HTML5 <details> and <summary>: localized text
- https://bugs.webkit.org/show_bug.cgi?id=54260
-
- The method defaultDetailsSummaryText was added to LocalizationStrategy class. It is used to
- provide the default label to be used by a <details> tag that has no <summary> child.
-
- * WebCoreSupport/PlatformStrategiesWinCE.cpp:
- (PlatformStrategiesWinCE::defaultDetailsSummaryText):
- * WebCoreSupport/PlatformStrategiesWinCE.h:
-
-2011-01-26 MORITA Hajime <morrita@google.com>
-
- Reviewed by Ryosuke Niwa.
-
- Refactoring: Extract TextCheckerClient from EditorClient
- https://bugs.webkit.org/show_bug.cgi?id=53213
-
- * WebCoreSupport/EditorClientWinCE.h:
- (WebKit::EditorClientWinCE::textChecker):
-
-2011-02-07 Ryosuke Niwa <rniwa@webkit.org>
-
- Reviewed by Adam Barth.
-
- Add EditorClient callbacks to override isDOMPasteAllowed and javaScriptCanAccessClipboard
- https://bugs.webkit.org/show_bug.cgi?id=52417
-
- Added two callback functions, canCopyCut and canPaste to EditorClient. They are currently
- not implemented.
-
- * WebCoreSupport/EditorClientWinCE.cpp:
- (WebKit::EditorClientWinCE::canCopyCut): Added.
- (WebKit::EditorClientWinCE::canPaste): Added.
- * WebCoreSupport/EditorClientWinCE.h:
-
-2011-02-10 Nate Chapin <japhet@chromium.org>
-
- Reviewed by Adam Barth.
-
- Update calls to DocumentWriter.
- https://bugs.webkit.org/show_bug.cgi?id=50489
-
- * WebCoreSupport/FrameLoaderClientWinCE.cpp:
- (WebKit::FrameLoaderClientWinCE::finishedLoading):
-
-2011-02-08 Adam Barth <abarth@webkit.org>
-
- Reviewed by Eric Seidel.
-
- Remove orphan code from old parser
- https://bugs.webkit.org/show_bug.cgi?id=53984
-
- * WebCoreSupport/ChromeClientWinCE.cpp:
- * WebCoreSupport/ChromeClientWinCE.h:
-
-2011-02-07 Enrica Casucci <enrica@apple.com>
-
- Reviewed Adam Roben and Darin Adler.
-
- WebKit2: drag and drop support on Windows.
- https://bugs.webkit.org/show_bug.cgi?id=52775
-
- Removed createDragImageForLink from DragClient.
-
- * WebCoreSupport/DragClientWinCE.cpp:
- * WebCoreSupport/DragClientWinCE.h:
-
-2011-02-06 Patrick Gansterer <paroga@webkit.org>
-
- Reviewed by Martin Robinson.
-
- [WINCE] FrameLoaderClient calls loadURLInChildFrame on the child's frame loader
- https://bugs.webkit.org/show_bug.cgi?id=53896
-
- * WebView.cpp:
- (WebView::createFrame): Use coreFrame instead of childFrame.
-
-2011-02-03 Adam Langley <agl@chromium.org>
-
- Reviewed by Adam Barth.
-
- Plumb mixed script URL to FrameLoaderClient
- https://bugs.webkit.org/show_bug.cgi?id=52384
-
- Regressions covered by http/tests/security/mixedContent/*
-
- * WebCoreSupport/FrameLoaderClientWinCE.cpp:
- (WebKit::FrameLoaderClientWinCE::didRunInsecureContent):
- * WebCoreSupport/FrameLoaderClientWinCE.h:
-
-2011-02-02 Patrick Gansterer <paroga@webkit.org>
-
- Unreviewed WinCE build fix for r77398.
-
- * WebView.cpp:
- (WebView::paint):
-
-2011-01-28 Dan Bernstein <mitz@apple.com>
-
- Reviewed by Sam Weinig.
-
- <select> can't display right-to-left (rtl) languages
- https://bugs.webkit.org/show_bug.cgi?id=19785
-
- * WebCoreSupport/ChromeClientWinCE.cpp:
- (WebKit::ChromeClientWinCE::selectItemAlignmentFollowsMenuWritingDirection): Added.
- * WebCoreSupport/ChromeClientWinCE.h:
-
-2011-01-25 Patrick Gansterer <paroga@webkit.org>
-
- Reviewed by Adam Roben.
-
- [WINCE] Ensure layouted frame when painting
- https://bugs.webkit.org/show_bug.cgi?id=53108
-
- * WebView.cpp:
- (WebView::paint):
-
-2011-01-04 Patrick Gansterer <paroga@webkit.org>
-
- Unreviewed WinCE build fix.
-
- * WebCoreSupport/ChromeClientWinCE.cpp:
- (WebKit::ChromeClientWinCE::exceededDatabaseQuota): Added missing semicolon.
- (WebKit::ChromeClientWinCE::reachedApplicationCacheOriginQuota):
- * WebCoreSupport/ChromeClientWinCE.h:
-
-2010-12-29 Patrick Gansterer <paroga@webkit.org>
-
- Unreviewed build fix for WinCE after r73802.
-
- * WebCoreSupport/ContextMenuClientWinCE.cpp:
- (WebKit::ContextMenuClientWinCE::customizeMenu):
- * WebCoreSupport/ContextMenuClientWinCE.h:
-
-2010-12-22 Sam Weinig <sam@webkit.org>
-
- Reviewed by Darin Adler.
-
- WebKit2 needs to mirror the frame tree in the UIProcess
- https://bugs.webkit.org/show_bug.cgi?id=51546
-
- - Add client functions to notify that a frame has been added or
- removed from the page cache.
-
- * WebCoreSupport/FrameLoaderClientWinCE.cpp:
- (WebKit::FrameLoaderClientWinCE::didSaveToPageCache):
- (WebKit::FrameLoaderClientWinCE::didRestoreFromPageCache):
- * WebCoreSupport/FrameLoaderClientWinCE.h:
-
-2010-12-22 Ryosuke Niwa <rniwa@webkit.org>
-
- Reviewed by Eric Seidel.
-
- Editor.h doesn't need to include SelectionController.h
- https://bugs.webkit.org/show_bug.cgi?id=51441
-
- Renamed SelectionController::EDirection to SelectionDirection.
-
- * WebCoreSupport/EditorClientWinCE.cpp:
- (WebKit::EditorClientWinCE::handleEditingKeyboardEvent):
-
-2010-10-28 MORITA Hajime <morrita@google.com>
-
- Reviewed by Ojan Vafai.
-
- spellcheck does not check pasted text
- https://bugs.webkit.org/show_bug.cgi?id=40092
-
- Added a stub implememntation.
-
- * WebCoreSupport/EditorClientWinCE.h:
- (WebKit::EditorClient::requestCheckingOfString):
-
-2010-12-07 Martin Robinson <mrobinson@igalia.com>
-
- Unreviewed, rolling out r73392.
- http://trac.webkit.org/changeset/73392
- https://bugs.webkit.org/show_bug.cgi?id=50489
-
- This commit caused crashes on the GTK+ bots
-
- * WebCoreSupport/FrameLoaderClientWinCE.cpp:
- (WebKit::FrameLoaderClientWinCE::finishedLoading):
-
-2010-12-06 Nate Chapin <japhet@chromium.org>
-
- Reviewed by Adam Barth.
-
- Update calls to DocumentWriter.
- https://bugs.webkit.org/show_bug.cgi?id=50489
-
- * WebCoreSupport/FrameLoaderClientWinCE.cpp:
- (WebKit::FrameLoaderClientWinCE::finishedLoading):
-
-2010-12-06 Patrick Gansterer <paroga@webkit.org>
-
- Reviewed by Andreas Kling.
-
- [WINCE] Add build system
- https://bugs.webkit.org/show_bug.cgi?id=50522
-
- * CMakeListsWinCE.txt: Added.
-
-2010-12-01 Jia Pu <jpu@apple.com>
-
- Reviewed by Darin Adler.
-
- Support multiple correction candidates panel for misspelled word on Mac OS X.
- https://bugs.webkit.org/show_bug.cgi?id=50137
- <rdar://problem/8568059>
-
- Adopted new function signature defined in base class.
-
- * WebCoreSupport/EditorClientWinCE.cpp:
- (WebKit::EditorClientWinCE::getGuessesForWord):
- * WebCoreSupport/EditorClientWinCE.h:
-
-2010-11-30 Patrick Gansterer <paroga@webkit.org>
-
- Reviewed by Adam Roben.
-
- [WINCE] Add WebView
- https://bugs.webkit.org/show_bug.cgi?id=50216
-
- * WebView.cpp: Added.
- * WebView.h: Added.
-
-2010-11-13 Patrick Gansterer <paroga@webkit.org>
-
- Unreviewed, build fix after r71541.
-
- * WebCoreSupport/ChromeClientWinCE.h:
-
-2010-11-08 Alexey Proskuryakov <ap@apple.com>
-
- Reviewed by Darin Adler.
-
- https://bugs.webkit.org/show_bug.cgi?id=48685
- Notify UI process about focused frame
-
- Added an empty implementation of the new ChromeClient method.
-
- * WebCoreSupport/ChromeClientWinCE.cpp:
- (WebKit::ChromeClientWinCE::focusedFrameChanged):
- * WebCoreSupport/ChromeClientWinCE.h:
-
-2010-11-02 Patrick Gansterer <paroga@webkit.org>
-
- Unreviewed, build fix after r71041.
-
- * WebCoreSupport/ChromeClientWinCE.h:
- (WebKit::ChromeClientWinCE::showContextMenu):
-
-2010-10-30 Patrick Gansterer <paroga@webkit.org>
-
- Unreviewed, build fix after r70574.
-
- * WebCoreSupport/FrameLoaderClientWinCE.cpp:
- (WebKit::FrameLoaderClientWinCE::transferLoadingResourceFromPage):
-
-2010-10-29 Alexey Proskuryakov <ap@apple.com>
-
- Reviewed by Darin Adler.
-
- https://bugs.webkit.org/show_bug.cgi?id=48576
- Let WebKit2 client know when a frame is a frameset
-
- Added a blank implementation of the new FrameLoaderClient method.
-
- * WebCoreSupport/FrameLoaderClientWinCE.h:
- * WebCoreSupport/FrameLoaderClientWinCE.cpp:
- (WebKit::FrameLoaderClientWinCE::dispatchDidBecomeFrameset):
-
-2010-10-26 Jenn Braithwaite <jennb@chromium.org>
-
- Reviewed by Dmitry Titov.
-
- Resource tracking failure when trying to move a frame between documents
- https://bugs.webkit.org/show_bug.cgi?id=44713
-
- * WebCoreSupport/FrameLoaderClientWinCE.cpp:
- (WebKit::FrameLoaderClientWinCE::transferLoadingResourceFromPage):
- Empty method.
- * WebCoreSupport/FrameLoaderClientWinCE.h:
-
-2010-10-25 Patrick Gansterer <paroga@webkit.org>
-
- Reviewed by David Kilzer.
-
- Replace _countof with WTF_ARRAY_LENGTH
- https://bugs.webkit.org/show_bug.cgi?id=48229
-
- * WebCoreSupport/EditorClientWinCE.cpp:
- (WebKit::EditorClientWinCE::interpretKeyEvent):
-
-2010-10-22 Sam Weinig <sam@webkit.org>
-
- Reviewed by Anders Carlsson.
-
- WebKit2 needs to pass the current event modifier flags when requesting a new window
- https://bugs.webkit.org/show_bug.cgi?id=48140
-
- * WebCoreSupport/ChromeClientWinCE.cpp:
- (WebKit::ChromeClientWinCE::createWindow):
- * WebCoreSupport/ChromeClientWinCE.h:
- * WebCoreSupport/FrameLoaderClientWinCE.cpp:
- (WebKit::FrameLoaderClientWinCE::dispatchCreatePage):
- * WebCoreSupport/FrameLoaderClientWinCE.h:
- Add NavigationAction parameter.
-
-2010-10-22 Patrick Gansterer <paroga@webkit.org>
-
- Reviewed by Adam Roben.
-
- [WINCE] Implement EditorClient::handleKeyboardEvent
- https://bugs.webkit.org/show_bug.cgi?id=48118
-
- Copy the implementation from the EFL port.
-
- * WebCoreSupport/EditorClientWinCE.cpp:
- (WebKit::EditorClientWinCE::interpretKeyEvent):
- (WebKit::EditorClientWinCE::handleEditingKeyboardEvent):
- (WebKit::EditorClientWinCE::handleKeyboardEvent):
- * WebCoreSupport/EditorClientWinCE.h:
-
-2010-10-15 Nikolas Zimmermann <nzimmermann@rim.com>
-
- Reviewed by Dirk Schulze.
-
- Replace some String::format() usages by StringConcatenate in WebKit
- https://bugs.webkit.org/show_bug.cgi?id=47714
-
- * WebCoreSupport/PlatformStrategiesWinCE.cpp:
- (PlatformStrategiesWinCE::imageTitle):
- (PlatformStrategiesWinCE::multipleFileUploadText):
-
-2010-09-28 Jenn Braithwaite <jennb@chromium.org>
-
- Reviewed by Dmitry Titov.
-
- Added oldPage param to FrameLoaderClient::didTransferChildFrameToNewDocument.
- https://bugs.webkit.org/show_bug.cgi?id=46663
-
- * WebCoreSupport/FrameLoaderClientWinCE.cpp:
- (WebKit::FrameLoaderClientWinCE::didTransferChildFrameToNewDocument):
- * WebCoreSupport/FrameLoaderClientWinCE.h:
-
-2010-09-23 Patrick Gansterer <paroga@webkit.org>
-
- Reviewed by Adam Roben.
-
- Add PlatformStrategiesWinCE
- https://bugs.webkit.org/show_bug.cgi?id=46371
-
- * WebCoreSupport/PlatformStrategiesWinCE.cpp: Copied from WebKit/win/WebCoreSupport/WebPlatformStrategies.cpp.
- * WebCoreSupport/PlatformStrategiesWinCE.h: Copied from WebKit/win/WebCoreSupport/WebPlatformStrategies.h.
-
-2010-09-23 Patrick Gansterer <paroga@webkit.org>
-
- Reviewed by Adam Roben.
-
- Add ChromeClientWinCE
- https://bugs.webkit.org/show_bug.cgi?id=46294
-
- * WebCoreSupport/ChromeClientWinCE.cpp: Added.
- * WebCoreSupport/ChromeClientWinCE.h: Added.
-
-2010-09-23 Patrick Gansterer <paroga@webkit.org>
-
- Unreviewed.
-
- Build fix for FrameLoaderClientWinCE.
-
- * WebCoreSupport/FrameLoaderClientWinCE.cpp:
- (WebKit::FrameLoaderClientWinCE::canShowMIMETypeAsHTML): Add missing method.
- * WebCoreSupport/FrameLoaderClientWinCE.h:
-
-2010-09-21 Patrick Gansterer <paroga@webkit.org>
-
- Reviewed by Adam Roben.
-
- Add "WinCE" to classname for all WebCoreSupport classes to match filename.
- https://bugs.webkit.org/show_bug.cgi?id=46175
-
- * WebCoreSupport/ContextMenuClientWinCE.cpp: Rename ContextMenuClient to ContextMenuClientWinCE.
- * WebCoreSupport/ContextMenuClientWinCE.h: Ditto.
- * WebCoreSupport/DragClientWinCE.cpp: Rename DragClient to DragClientWinCE.
- * WebCoreSupport/DragClientWinCE.h: Ditto.
- * WebCoreSupport/EditorClientWinCE.cpp: Rename EditorClient to EditorClientWinCE.
- * WebCoreSupport/EditorClientWinCE.h: Ditto.
- * WebCoreSupport/InspectorClientWinCE.cpp: Rename InspectorClient to InspectorClientWinCE.
- * WebCoreSupport/InspectorClientWinCE.h: Ditto.
-
-2010-09-20 Patrick Gansterer <paroga@paroga.com>
-
- Reviewed by Adam Roben.
-
- Add FrameLoaderClientWinCE
- https://bugs.webkit.org/show_bug.cgi?id=45682
-
- * WebCoreSupport/FrameLoaderClientWinCE.cpp: Added.
- * WebCoreSupport/FrameLoaderClientWinCE.h: Added.
-
-2010-09-16 Patrick Gansterer <paroga@paroga.com>
-
- Reviewed by Adam Roben.
-
- [WINCE] Add missing FrameNetworkingContextWinCE::blockedError
- https://bugs.webkit.org/show_bug.cgi?id=45680
-
- * WebCoreSupport/FrameNetworkingContextWinCE.cpp:
- (WebKit::FrameNetworkingContextWinCE::blockedError):
- * WebCoreSupport/FrameNetworkingContextWinCE.h:
-
-2010-09-13 Patrick Gansterer <paroga@paroga.com>
-
- Reviewed by Kenneth Rohde Christiansen.
-
- Add FrameNetworkingContextWinCE
- https://bugs.webkit.org/show_bug.cgi?id=45474
-
- * WebCoreSupport/FrameNetworkingContextWinCE.cpp: Added.
- (WebKit::FrameNetworkingContextWinCE::FrameNetworkingContextWinCE):
- (WebKit::FrameNetworkingContextWinCE::userAgent):
- (WebKit::FrameNetworkingContextWinCE::referrer):
- * WebCoreSupport/FrameNetworkingContextWinCE.h: Added.
- (WebKit::FrameNetworkingContextWinCE::create):
-
-2010-08-31 Patrick Gansterer <paroga@paroga.com>
-
- Reviewed by Kenneth Rohde Christiansen.
-
- Add EditorClientWinCE
- https://bugs.webkit.org/show_bug.cgi?id=44822
-
- * WebCoreSupport/EditorClientWinCE.cpp: Added.
- (WebKit::EditorClient::EditorClient):
- (WebKit::EditorClient::~EditorClient):
- (WebKit::EditorClient::setInputMethodState):
- (WebKit::EditorClient::shouldDeleteRange):
- (WebKit::EditorClient::shouldShowDeleteInterface):
- (WebKit::EditorClient::isContinuousSpellCheckingEnabled):
- (WebKit::EditorClient::isGrammarCheckingEnabled):
- (WebKit::EditorClient::spellCheckerDocumentTag):
- (WebKit::EditorClient::shouldBeginEditing):
- (WebKit::EditorClient::shouldEndEditing):
- (WebKit::EditorClient::shouldInsertText):
- (WebKit::EditorClient::shouldChangeSelectedRange):
- (WebKit::EditorClient::shouldApplyStyle):
- (WebKit::EditorClient::shouldMoveRangeAfterDelete):
- (WebKit::EditorClient::didBeginEditing):
- (WebKit::EditorClient::respondToChangedContents):
- (WebKit::EditorClient::respondToChangedSelection):
- (WebKit::EditorClient::didEndEditing):
- (WebKit::EditorClient::didWriteSelectionToPasteboard):
- (WebKit::EditorClient::didSetSelectionTypesForPasteboard):
- (WebKit::EditorClient::isEditable):
- (WebKit::EditorClient::registerCommandForUndo):
- (WebKit::EditorClient::registerCommandForRedo):
- (WebKit::EditorClient::clearUndoRedoOperations):
- (WebKit::EditorClient::canUndo):
- (WebKit::EditorClient::canRedo):
- (WebKit::EditorClient::undo):
- (WebKit::EditorClient::redo):
- (WebKit::EditorClient::shouldInsertNode):
- (WebKit::EditorClient::pageDestroyed):
- (WebKit::EditorClient::smartInsertDeleteEnabled):
- (WebKit::EditorClient::isSelectTrailingWhitespaceEnabled):
- (WebKit::EditorClient::toggleContinuousSpellChecking):
- (WebKit::EditorClient::toggleGrammarChecking):
- (WebKit::EditorClient::handleKeyboardEvent):
- (WebKit::EditorClient::handleInputMethodKeydown):
- (WebKit::EditorClient::textFieldDidBeginEditing):
- (WebKit::EditorClient::textFieldDidEndEditing):
- (WebKit::EditorClient::textDidChangeInTextField):
- (WebKit::EditorClient::doTextFieldCommandFromEvent):
- (WebKit::EditorClient::textWillBeDeletedInTextField):
- (WebKit::EditorClient::textDidChangeInTextArea):
- (WebKit::EditorClient::ignoreWordInSpellDocument):
- (WebKit::EditorClient::learnWord):
- (WebKit::EditorClient::checkSpellingOfString):
- (WebKit::EditorClient::getAutoCorrectSuggestionForMisspelledWord):
- (WebKit::EditorClient::checkGrammarOfString):
- (WebKit::EditorClient::updateSpellingUIWithGrammarString):
- (WebKit::EditorClient::updateSpellingUIWithMisspelledWord):
- (WebKit::EditorClient::showSpellingUI):
- (WebKit::EditorClient::spellingUIIsShowing):
- (WebKit::EditorClient::getGuessesForWord):
- (WebKit::EditorClient::willSetInputMethodState):
- * WebCoreSupport/EditorClientWinCE.h: Added.
-
-2010-08-31 Patrick Gansterer <paroga@paroga.com>
-
- Reviewed by Kenneth Rohde Christiansen.
-
- Add DragClientWinCE
- https://bugs.webkit.org/show_bug.cgi?id=44821
-
- * WebCoreSupport/DragClientWinCE.cpp: Added.
- (WebKit::DragClient::willPerformDragDestinationAction):
- (WebKit::DragClient::willPerformDragSourceAction):
- (WebKit::DragClient::actionMaskForDrag):
- (WebKit::DragClient::dragSourceActionMaskForPoint):
- (WebKit::DragClient::startDrag):
- (WebKit::DragClient::createDragImageForLink):
- (WebKit::DragClient::dragControllerDestroyed):
- * WebCoreSupport/DragClientWinCE.h: Added.
-
-2010-08-31 Patrick Gansterer <paroga@paroga.com>
-
- Reviewed by Kenneth Rohde Christiansen.
-
- Add ContextMenuClientWinCE
- https://bugs.webkit.org/show_bug.cgi?id=44820
-
- * WebCoreSupport/ContextMenuClientWinCE.cpp: Added.
- (WebKit::ContextMenuClient::ContextMenuClient):
- (WebKit::ContextMenuClient::contextMenuDestroyed):
- (WebKit::ContextMenuClient::getCustomMenuFromDefaultItems):
- (WebKit::ContextMenuClient::contextMenuItemSelected):
- (WebKit::ContextMenuClient::downloadURL):
- (WebKit::ContextMenuClient::copyImageToClipboard):
- (WebKit::ContextMenuClient::searchWithGoogle):
- (WebKit::ContextMenuClient::lookUpInDictionary):
- (WebKit::ContextMenuClient::speak):
- (WebKit::ContextMenuClient::stopSpeaking):
- (WebKit::ContextMenuClient::isSpeaking):
- * WebCoreSupport/ContextMenuClientWinCE.h: Added.
-
-2010-08-28 Patrick Gansterer <paroga@paroga.com>
-
- Reviewed by Adam Roben.
-
- Add InspectorClientWinCE
- https://bugs.webkit.org/show_bug.cgi?id=44819
-
- * WebCoreSupport/InspectorClientWinCE.cpp: Added.
- (WebKit::InspectorClient::InspectorClient):
- (WebKit::InspectorClient::~InspectorClient):
- (WebKit::InspectorClient::inspectorDestroyed):
- (WebKit::InspectorClient::openInspectorFrontend):
- (WebKit::InspectorClient::releaseFrontendPage):
- (WebKit::InspectorClient::highlight):
- (WebKit::InspectorClient::hideHighlight):
- (WebKit::InspectorClient::populateSetting):
- (WebKit::InspectorClient::storeSetting):
- (WebKit::InspectorClient::sendMessageToFrontend):
- * WebCoreSupport/InspectorClientWinCE.h: Added.
</del></span></pre></div>
<a id="trunkSourceWebKitwinceWebCoreSupportChromeClientWinCEcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,393 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
- *
- * 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 AND ITS CONTRIBUTORS "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 OR ITS 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.
- */
-
-#include "config.h"
-#include "ChromeClientWinCE.h"
-
-#include "FileChooser.h"
-#include "FileIconLoader.h"
-#include "Icon.h"
-#include "NotImplemented.h"
-#include "NavigationAction.h"
-#include "PopupMenuWin.h"
-#include "SearchPopupMenuWin.h"
-#include "WebView.h"
-#include <wtf/text/CString.h>
-
-using namespace WebCore;
-
-namespace WebKit {
-
-ChromeClientWinCE::ChromeClientWinCE(WebView* webView)
- : m_webView(webView)
-{
- ASSERT(m_webView);
-}
-
-void ChromeClientWinCE::chromeDestroyed()
-{
- delete this;
-}
-
-FloatRect ChromeClientWinCE::windowRect()
-{
- if (!m_webView)
- return FloatRect();
-
- RECT rect;
- m_webView->frameRect(&rect);
- return rect;
-}
-
-void ChromeClientWinCE::setWindowRect(const FloatRect&)
-{
- notImplemented();
-}
-
-FloatRect ChromeClientWinCE::pageRect()
-{
- return windowRect();
-}
-
-void ChromeClientWinCE::focus()
-{
- notImplemented();
-}
-
-void ChromeClientWinCE::unfocus()
-{
- notImplemented();
-}
-
-Page* ChromeClientWinCE::createWindow(Frame*, const FrameLoadRequest&, const WindowFeatures&, const NavigationAction&)
-{
- notImplemented();
- return 0;
-}
-
-void ChromeClientWinCE::show()
-{
- notImplemented();
-}
-
-bool ChromeClientWinCE::canRunModal()
-{
- notImplemented();
- return false;
-}
-
-void ChromeClientWinCE::runModal()
-{
- notImplemented();
-}
-
-void ChromeClientWinCE::setToolbarsVisible(bool)
-{
- notImplemented();
-}
-
-bool ChromeClientWinCE::toolbarsVisible()
-{
- return false;
-}
-
-void ChromeClientWinCE::setStatusbarVisible(bool)
-{
- notImplemented();
-}
-
-bool ChromeClientWinCE::statusbarVisible()
-{
- notImplemented();
- return false;
-}
-
-void ChromeClientWinCE::setScrollbarsVisible(bool)
-{
- notImplemented();
-}
-
-bool ChromeClientWinCE::scrollbarsVisible()
-{
- notImplemented();
- return false;
-}
-
-void ChromeClientWinCE::setMenubarVisible(bool)
-{
- notImplemented();
-}
-
-bool ChromeClientWinCE::menubarVisible()
-{
- notImplemented();
- return false;
-}
-
-void ChromeClientWinCE::setResizable(bool)
-{
- notImplemented();
-}
-
-void ChromeClientWinCE::closeWindowSoon()
-{
- PostMessageW(m_webView->windowHandle(), WM_CLOSE, 0, 0);
-}
-
-bool ChromeClientWinCE::canTakeFocus(FocusDirection)
-{
- return true;
-}
-
-void ChromeClientWinCE::takeFocus(FocusDirection)
-{
- unfocus();
-}
-
-void ChromeClientWinCE::focusedElementChanged(Element*)
-{
- notImplemented();
-}
-
-void ChromeClientWinCE::focusedFrameChanged(Frame*)
-{
-}
-
-bool ChromeClientWinCE::canRunBeforeUnloadConfirmPanel()
-{
- return true;
-}
-
-bool ChromeClientWinCE::runBeforeUnloadConfirmPanel(const String& message, Frame* frame)
-{
- return runJavaScriptConfirm(frame, message);
-}
-
-void ChromeClientWinCE::addMessageToConsole(MessageSource, MessageLevel, const String&, unsigned, unsigned, const String&)
-{
- notImplemented();
-}
-
-void ChromeClientWinCE::runJavaScriptAlert(Frame*, const String& message)
-{
- m_webView->runJavaScriptAlert(message);
-}
-
-bool ChromeClientWinCE::runJavaScriptConfirm(Frame*, const String& message)
-{
- return m_webView->runJavaScriptConfirm(message);
-}
-
-bool ChromeClientWinCE::runJavaScriptPrompt(Frame*, const String& message, const String& defaultValue, String& result)
-{
- return m_webView->runJavaScriptPrompt(message, defaultValue, result);
-}
-
-void ChromeClientWinCE::setStatusbarText(const String&)
-{
- notImplemented();
-}
-
-bool ChromeClientWinCE::shouldInterruptJavaScript()
-{
- notImplemented();
- return false;
-}
-
-KeyboardUIMode ChromeClientWinCE::keyboardUIMode()
-{
- return KeyboardAccessTabsToLinks;
-}
-
-IntRect ChromeClientWinCE::windowResizerRect() const
-{
- notImplemented();
- return IntRect();
-}
-
-void ChromeClientWinCE::invalidateRootView(const IntRect&)
-{
- notImplemented();
-}
-
-void ChromeClientWinCE::invalidateContentsAndRootView(const IntRect& updateRect)
-{
- RECT rect = updateRect;
- InvalidateRect(m_webView->windowHandle(), &rect, FALSE);
-}
-
-void ChromeClientWinCE::invalidateContentsForSlowScroll(const IntRect& updateRect)
-{
- invalidateContentsAndRootView(updateRect);
-}
-
-void ChromeClientWinCE::scroll(const IntSize&, const IntRect& rectToScroll, const IntRect&)
-{
- invalidateContentsAndRootView(rectToScroll);
-}
-
-IntRect ChromeClientWinCE::rootViewToScreen(const IntRect& rect) const
-{
- notImplemented();
- return rect;
-}
-
-IntPoint ChromeClientWinCE::screenToRootView(const IntPoint& point) const
-{
- notImplemented();
- return point;
-}
-
-PlatformPageClient ChromeClientWinCE::platformPageClient() const
-{
- notImplemented();
- return 0;
-}
-
-void ChromeClientWinCE::contentsSizeChanged(Frame*, const IntSize&) const
-{
- notImplemented();
-}
-
-void ChromeClientWinCE::scrollbarsModeDidChange() const
-{
- notImplemented();
-}
-
-void ChromeClientWinCE::mouseDidMoveOverElement(const HitTestResult&, unsigned)
-{
- notImplemented();
-}
-
-void ChromeClientWinCE::setToolTip(const String&, TextDirection)
-{
- notImplemented();
-}
-
-void ChromeClientWinCE::print(Frame*)
-{
- notImplemented();
-}
-
-#if ENABLE(SQL_DATABASE)
-void ChromeClientWinCE::exceededDatabaseQuota(Frame*, const String&, DatabaseDetails)
-{
- notImplemented();
-}
-#endif
-
-void ChromeClientWinCE::reachedMaxAppCacheSize(int64_t)
-{
- notImplemented();
-}
-
-void ChromeClientWinCE::reachedApplicationCacheOriginQuota(SecurityOrigin*, int64_t)
-{
- notImplemented();
-}
-
-#if ENABLE(TOUCH_EVENTS)
-void ChromeClientWinCE::needTouchEvents(bool)
-{
- notImplemented();
-}
-#endif
-
-void ChromeClientWinCE::attachRootGraphicsLayer(Frame*, GraphicsLayer*)
-{
- notImplemented();
-}
-
-void ChromeClientWinCE::setNeedsOneShotDrawingSynchronization()
-{
- notImplemented();
-}
-
-void ChromeClientWinCE::scheduleCompositingLayerFlush()
-{
- notImplemented();
-}
-
-void ChromeClientWinCE::runOpenPanel(Frame*, PassRefPtr<FileChooser> prpFileChooser)
-{
- notImplemented();
-}
-
-void ChromeClientWinCE::loadIconForFiles(const Vector<String>& filenames, FileIconLoader* loader)
-{
- loader->notifyFinished(Icon::createIconForFiles(filenames));
-}
-
-void ChromeClientWinCE::setCursor(const Cursor&)
-{
- notImplemented();
-}
-
-void ChromeClientWinCE::setCursorHiddenUntilMouseMoves(bool)
-{
- notImplemented();
-}
-
-void ChromeClientWinCE::setLastSetCursorToCurrentCursor()
-{
- notImplemented();
-}
-
-void ChromeClientWinCE::AXStartFrameLoad()
-{
- notImplemented();
-}
-
-void ChromeClientWinCE::AXFinishFrameLoad()
-{
- notImplemented();
-}
-
-bool ChromeClientWinCE::selectItemWritingDirectionIsNatural()
-{
- return false;
-}
-
-bool ChromeClientWinCE::selectItemAlignmentFollowsMenuWritingDirection()
-{
- return false;
-}
-
-bool ChromeClientWinCE::hasOpenedPopup() const
-{
- notImplemented();
- return false;
-}
-
-PassRefPtr<PopupMenu> ChromeClientWinCE::createPopupMenu(PopupMenuClient* client) const
-{
- return adoptRef(new PopupMenuWin(client));
-}
-
-PassRefPtr<SearchPopupMenu> ChromeClientWinCE::createSearchPopupMenu(PopupMenuClient* client) const
-{
- return adoptRef(new SearchPopupMenuWin(client));
-}
-
-} // namespace WebKit
</del></span></pre></div>
<a id="trunkSourceWebKitwinceWebCoreSupportChromeClientWinCEh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.h (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.h 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.h 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,167 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
- *
- * 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 AND ITS CONTRIBUTORS "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 OR ITS 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.
- */
-
-#ifndef ChromeClientWinCE_h
-#define ChromeClientWinCE_h
-
-#include "ChromeClient.h"
-
-class WebView;
-
-namespace WebKit {
-
-class ChromeClientWinCE : public WebCore::ChromeClient {
-public:
- ChromeClientWinCE(WebView* webView);
-
- virtual void chromeDestroyed() override;
-
- virtual void setWindowRect(const WebCore::FloatRect&) override;
- virtual WebCore::FloatRect windowRect() override;
-
- virtual WebCore::FloatRect pageRect() override;
-
- virtual void focus() override;
- virtual void unfocus() override;
-
- virtual bool canTakeFocus(WebCore::FocusDirection) override;
- virtual void takeFocus(WebCore::FocusDirection) override;
-
- virtual void focusedElementChanged(WebCore::Element*) override;
- virtual void focusedFrameChanged(WebCore::Frame*) override;
-
- // The Frame pointer provides the ChromeClient with context about which
- // Frame wants to create the new Page. Also, the newly created window
- // should not be shown to the user until the ChromeClient of the newly
- // created Page has its show method called.
- virtual WebCore::Page* createWindow(WebCore::Frame*, const WebCore::FrameLoadRequest&, const WebCore::WindowFeatures&, const WebCore::NavigationAction&) override;
- virtual void show() override;
-
- virtual bool canRunModal() override;
- virtual void runModal() override;
-
- virtual void setToolbarsVisible(bool) override;
- virtual bool toolbarsVisible() override;
-
- virtual void setStatusbarVisible(bool) override;
- virtual bool statusbarVisible() override;
-
- virtual void setScrollbarsVisible(bool) override;
- virtual bool scrollbarsVisible() override;
-
- virtual void setMenubarVisible(bool) override;
- virtual bool menubarVisible() override;
-
- virtual void setResizable(bool) override;
-
- virtual void addMessageToConsole(JSC::MessageSource, JSC::MessageLevel, const WTF::String& message, unsigned lineNumber, unsigned columnNumber, const WTF::String& sourceID) override;
-
- virtual bool canRunBeforeUnloadConfirmPanel() override;
- virtual bool runBeforeUnloadConfirmPanel(const WTF::String& message, WebCore::Frame*) override;
-
- virtual void closeWindowSoon() override;
-
- virtual void runJavaScriptAlert(WebCore::Frame*, const WTF::String&) override;
- virtual bool runJavaScriptConfirm(WebCore::Frame*, const WTF::String&) override;
- virtual bool runJavaScriptPrompt(WebCore::Frame*, const WTF::String& message, const WTF::String& defaultValue, WTF::String& result) override;
- virtual void setStatusbarText(const WTF::String&) override;
- virtual bool shouldInterruptJavaScript() override;
- virtual WebCore::KeyboardUIMode keyboardUIMode() override;
-
- virtual WebCore::IntRect windowResizerRect() const override;
-
- // Methods used by HostWindow.
- virtual void invalidateRootView(const WebCore::IntRect&) override;
- virtual void invalidateContentsAndRootView(const WebCore::IntRect&) override;
- virtual void invalidateContentsForSlowScroll(const WebCore::IntRect&) override;
- virtual void scroll(const WebCore::IntSize&, const WebCore::IntRect&, const WebCore::IntRect&) override;
- virtual WebCore::IntPoint screenToRootView(const WebCore::IntPoint&) const override;
- virtual WebCore::IntRect rootViewToScreen(const WebCore::IntRect&) const override;
- virtual PlatformPageClient platformPageClient() const override;
- virtual void contentsSizeChanged(WebCore::Frame*, const WebCore::IntSize&) const override;
- virtual void scrollbarsModeDidChange() const override;
- virtual void setCursor(const WebCore::Cursor&) override;
- virtual void setCursorHiddenUntilMouseMoves(bool) override;
- // End methods used by HostWindow.
-
- virtual void mouseDidMoveOverElement(const WebCore::HitTestResult&, unsigned modifierFlags) override;
-
- virtual void setToolTip(const WTF::String&, WebCore::TextDirection) override;
-
- virtual void print(WebCore::Frame*) override;
-
-#if ENABLE(SQL_DATABASE)
- virtual void exceededDatabaseQuota(WebCore::Frame*, const WTF::String& databaseName, WebCore::DatabaseDetails) override;
-#endif
-
- // Callback invoked when the application cache fails to save a cache object
- // because storing it would grow the database file past its defined maximum
- // size or past the amount of free space on the device.
- // The chrome client would need to take some action such as evicting some
- // old caches.
- virtual void reachedMaxAppCacheSize(int64_t spaceNeeded) override;
-
- // Callback invoked when the application cache origin quota is reached. This
- // means that the resources attempting to be cached via the manifest are
- // more than allowed on this origin. This callback allows the chrome client
- // to take action, such as prompting the user to ask to increase the quota
- // for this origin.
- virtual void reachedApplicationCacheOriginQuota(WebCore::SecurityOrigin*, int64_t totalSpaceNeeded) override;
-
- virtual void runOpenPanel(WebCore::Frame*, PassRefPtr<WebCore::FileChooser>) override;
- // Asynchronous request to load an icon for specified filenames.
- virtual void loadIconForFiles(const Vector<WTF::String>&, WebCore::FileIconLoader*) override;
-
- // Pass 0 as the GraphicsLayer to detatch the root layer.
- virtual void attachRootGraphicsLayer(WebCore::Frame*, WebCore::GraphicsLayer*) override;
- // Sets a flag to specify that the next time content is drawn to the window,
- // the changes appear on the screen in synchrony with updates to GraphicsLayers.
- virtual void setNeedsOneShotDrawingSynchronization() override;
- // Sets a flag to specify that the view needs to be updated, so we need
- // to do an eager layout before the drawing.
- virtual void scheduleCompositingLayerFlush() override;
-
- virtual void setLastSetCursorToCurrentCursor() override;
- virtual void AXStartFrameLoad() override;
- virtual void AXFinishFrameLoad() override;
-
-#if ENABLE(TOUCH_EVENTS)
- virtual void needTouchEvents(bool) override;
-#endif
-
- virtual bool selectItemWritingDirectionIsNatural() override;
- virtual bool selectItemAlignmentFollowsMenuWritingDirection() override;
- virtual bool hasOpenedPopup() const override;
- virtual PassRefPtr<WebCore::PopupMenu> createPopupMenu(WebCore::PopupMenuClient*) const override;
- virtual PassRefPtr<WebCore::SearchPopupMenu> createSearchPopupMenu(WebCore::PopupMenuClient*) const override;
-
- virtual void numWheelEventHandlersChanged(unsigned) override { }
-
-private:
- WebView* m_webView;
-};
-
-} // namespace WebKit
-
-#endif // ChromeClientWinCE_h
</del></span></pre></div>
<a id="trunkSourceWebKitwinceWebCoreSupportContextMenuClientWinCEcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/wince/WebCoreSupport/ContextMenuClientWinCE.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/wince/WebCoreSupport/ContextMenuClientWinCE.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebKit/wince/WebCoreSupport/ContextMenuClientWinCE.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,86 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
- *
- * 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 AND ITS CONTRIBUTORS "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 OR ITS 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.
- */
-
-#include "config.h"
-#include "ContextMenuClientWinCE.h"
-
-#include "ContextMenu.h"
-#include "NotImplemented.h"
-
-using namespace WebCore;
-
-namespace WebKit {
-
-ContextMenuClientWinCE::ContextMenuClientWinCE(WebView *webView)
- : m_webView(webView)
-{
-}
-
-void ContextMenuClientWinCE::contextMenuDestroyed()
-{
- delete this;
-}
-
-PassOwnPtr<ContextMenu> ContextMenuClientWinCE::customizeMenu(PassOwnPtr<ContextMenu> menu)
-{
- return menu;
-}
-
-void ContextMenuClientWinCE::contextMenuItemSelected(ContextMenuItem*, const ContextMenu*)
-{
- notImplemented();
-}
-
-void ContextMenuClientWinCE::downloadURL(const URL& url)
-{
- notImplemented();
-}
-
-void ContextMenuClientWinCE::searchWithGoogle(const Frame*)
-{
- notImplemented();
-}
-
-void ContextMenuClientWinCE::lookUpInDictionary(Frame*)
-{
- notImplemented();
-}
-
-void ContextMenuClientWinCE::speak(const String&)
-{
- notImplemented();
-}
-
-void ContextMenuClientWinCE::stopSpeaking()
-{
- notImplemented();
-}
-
-bool ContextMenuClientWinCE::isSpeaking()
-{
- notImplemented();
- return false;
-}
-
-} // namespace WebKit
</del></span></pre></div>
<a id="trunkSourceWebKitwinceWebCoreSupportContextMenuClientWinCEh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/wince/WebCoreSupport/ContextMenuClientWinCE.h (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/wince/WebCoreSupport/ContextMenuClientWinCE.h 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebKit/wince/WebCoreSupport/ContextMenuClientWinCE.h 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,56 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
- *
- * 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 AND ITS CONTRIBUTORS "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 OR ITS 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.
- */
-
-#ifndef ContextMenuClientWinCE_h
-#define ContextMenuClientWinCE_h
-
-#include "ContextMenuClient.h"
-
-class WebView;
-
-namespace WebKit {
-
-class ContextMenuClientWinCE : public WebCore::ContextMenuClient {
-public:
- ContextMenuClientWinCE(WebView*);
-
- virtual void contextMenuDestroyed() override;
-
- virtual PassOwnPtr<WebCore::ContextMenu> customizeMenu(PassOwnPtr<WebCore::ContextMenu>) override;
- virtual void contextMenuItemSelected(WebCore::ContextMenuItem*, const WebCore::ContextMenu*) override;
-
- virtual void downloadURL(const WebCore::URL&) override;
- virtual void searchWithGoogle(const WebCore::Frame*) override;
- virtual void lookUpInDictionary(WebCore::Frame*) override;
- virtual void speak(const WTF::String&) override;
- virtual void stopSpeaking() override;
- virtual bool isSpeaking() override;
-
-private:
- WebView* m_webView;
-};
-
-} // namespace WebKit
-
-#endif // ContextMenuClientWinCE_h
</del></span></pre></div>
<a id="trunkSourceWebKitwinceWebCoreSupportDragClientWinCEcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/wince/WebCoreSupport/DragClientWinCE.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/wince/WebCoreSupport/DragClientWinCE.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebKit/wince/WebCoreSupport/DragClientWinCE.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,66 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
- *
- * 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 AND ITS CONTRIBUTORS "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 OR ITS 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.
- */
-
-#include "config.h"
-#include "DragClientWinCE.h"
-
-#include "NotImplemented.h"
-
-using namespace WebCore;
-
-namespace WebKit {
-
-void DragClientWinCE::willPerformDragDestinationAction(DragDestinationAction, DragData&)
-{
- notImplemented();
-}
-
-void DragClientWinCE::willPerformDragSourceAction(DragSourceAction, const IntPoint&, Clipboard&)
-{
- notImplemented();
-}
-
-DragDestinationAction DragClientWinCE::actionMaskForDrag(DragData&)
-{
- notImplemented();
- return DragDestinationActionAny;
-}
-
-DragSourceAction DragClientWinCE::dragSourceActionMaskForPoint(const IntPoint&)
-{
- notImplemented();
- return DragSourceActionAny;
-}
-
-void DragClientWinCE::startDrag(DragImageRef, const IntPoint&, const IntPoint&, Clipboard&, Frame&, bool)
-{
- notImplemented();
-}
-
-void DragClientWinCE::dragControllerDestroyed()
-{
- delete this;
-}
-
-} // namespace WebKit
</del></span></pre></div>
<a id="trunkSourceWebKitwinceWebCoreSupportDragClientWinCEh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/wince/WebCoreSupport/DragClientWinCE.h (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/wince/WebCoreSupport/DragClientWinCE.h 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebKit/wince/WebCoreSupport/DragClientWinCE.h 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,47 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
- *
- * 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 AND ITS CONTRIBUTORS "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 OR ITS 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.
- */
-
-#ifndef DragClientWinCE_h
-#define DragClientWinCE_h
-
-#include "DragClient.h"
-
-namespace WebKit {
-
-class DragClientWinCE : public WebCore::DragClient {
-public:
- virtual void willPerformDragDestinationAction(WebCore::DragDestinationAction, WebCore::DragData&) override;
- virtual void willPerformDragSourceAction(WebCore::DragSourceAction, const WebCore::IntPoint&, WebCore::Clipboard&) override;
- virtual WebCore::DragDestinationAction actionMaskForDrag(WebCore::DragData&) override;
-
- virtual WebCore::DragSourceAction dragSourceActionMaskForPoint(const WebCore::IntPoint&) override;
-
- virtual void startDrag(WebCore::DragImageRef, const WebCore::IntPoint&, const WebCore::IntPoint&, WebCore::Clipboard&, WebCore::Frame&, bool = false) override;
-
- virtual void dragControllerDestroyed() override;
-};
-
-} // namespace WebKit
-
-#endif // DragClientWinCE_h
</del></span></pre></div>
<a id="trunkSourceWebKitwinceWebCoreSupportEditorClientWinCEcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/wince/WebCoreSupport/EditorClientWinCE.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/wince/WebCoreSupport/EditorClientWinCE.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebKit/wince/WebCoreSupport/EditorClientWinCE.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,517 +0,0 @@
</span><del>-/*
- * Copyright (C) 2007 Alp Toker <alp@atoker.com>
- * Copyright (C) 2008 Nuanti Ltd.
- * Copyright (C) 2008 INdT - Instituto Nokia de Tecnologia
- * Copyright (C) 2009-2010 ProFUSION embedded systems
- * Copyright (C) 2009-2010 Samsung Electronics
- * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "config.h"
-#include "EditorClientWinCE.h"
-
-#include "Document.h"
-#include "Editor.h"
-#include "Frame.h"
-#include "KeyboardEvent.h"
-#include "NotImplemented.h"
-#include "Page.h"
-#include "PlatformKeyboardEvent.h"
-#include "Settings.h"
-#include "UndoStep.h"
-#include "WebView.h"
-
-using namespace WebCore;
-
-namespace WebKit {
-
-EditorClientWinCE::EditorClientWinCE(WebView* webView)
- : m_webView(webView)
-{
-}
-
-EditorClientWinCE::~EditorClientWinCE()
-{
-}
-
-void EditorClientWinCE::setInputMethodState(bool active)
-{
- notImplemented();
-}
-
-bool EditorClientWinCE::shouldDeleteRange(Range*)
-{
- notImplemented();
- return true;
-}
-
-bool EditorClientWinCE::isContinuousSpellCheckingEnabled()
-{
- notImplemented();
- return false;
-}
-
-bool EditorClientWinCE::isGrammarCheckingEnabled()
-{
- notImplemented();
- return false;
-}
-
-int EditorClientWinCE::spellCheckerDocumentTag()
-{
- notImplemented();
- return 0;
-}
-
-bool EditorClientWinCE::shouldBeginEditing(WebCore::Range*)
-{
- notImplemented();
- return true;
-}
-
-bool EditorClientWinCE::shouldEndEditing(WebCore::Range*)
-{
- notImplemented();
- return true;
-}
-
-bool EditorClientWinCE::shouldInsertText(const String&, Range*, EditorInsertAction)
-{
- notImplemented();
- return true;
-}
-
-bool EditorClientWinCE::shouldChangeSelectedRange(Range*, Range*, EAffinity, bool)
-{
- notImplemented();
- return true;
-}
-
-bool EditorClientWinCE::shouldApplyStyle(WebCore::StylePropertySet*, WebCore::Range*)
-{
- notImplemented();
- return true;
-}
-
-bool EditorClientWinCE::shouldMoveRangeAfterDelete(WebCore::Range*, WebCore::Range*)
-{
- notImplemented();
- return true;
-}
-
-void EditorClientWinCE::didBeginEditing()
-{
- notImplemented();
-}
-
-void EditorClientWinCE::respondToChangedContents()
-{
- notImplemented();
-}
-
-void EditorClientWinCE::respondToChangedSelection(WebCore::Frame*)
-{
- notImplemented();
-}
-
-void EditorClientWinCE::didEndEditing()
-{
- notImplemented();
-}
-
-void EditorClientWinCE::didWriteSelectionToPasteboard()
-{
- notImplemented();
-}
-
-void EditorClientWinCE::willWriteSelectionToPasteboard(WebCore::Range*)
-{
- notImplemented();
-}
-
-void EditorClientWinCE::getClientPasteboardDataForRange(WebCore::Range*, Vector<String>&, Vector<RefPtr<WebCore::SharedBuffer> >&)
-{
- notImplemented();
-}
-
-void EditorClientWinCE::registerUndoStep(WTF::PassRefPtr<WebCore::UndoStep>)
-{
- notImplemented();
-}
-
-void EditorClientWinCE::registerRedoStep(WTF::PassRefPtr<WebCore::UndoStep>)
-{
- notImplemented();
-}
-
-void EditorClientWinCE::clearUndoRedoOperations()
-{
- notImplemented();
-}
-
-bool EditorClientWinCE::canCopyCut(WebCore::Frame*, bool defaultValue) const
-{
- return defaultValue;
-}
-
-bool EditorClientWinCE::canPaste(WebCore::Frame*, bool defaultValue) const
-{
- return defaultValue;
-}
-
-bool EditorClientWinCE::canUndo() const
-{
- notImplemented();
- return false;
-}
-
-bool EditorClientWinCE::canRedo() const
-{
- notImplemented();
- return false;
-}
-
-void EditorClientWinCE::undo()
-{
- notImplemented();
-}
-
-void EditorClientWinCE::redo()
-{
- notImplemented();
-}
-
-bool EditorClientWinCE::shouldInsertNode(Node*, Range*, EditorInsertAction)
-{
- notImplemented();
- return true;
-}
-
-void EditorClientWinCE::pageDestroyed()
-{
- delete this;
-}
-
-bool EditorClientWinCE::smartInsertDeleteEnabled()
-{
- Page* page = m_webView->page();
- if (!page)
- return false;
- return page->settings().smartInsertDeleteEnabled();
-}
-
-bool EditorClientWinCE::isSelectTrailingWhitespaceEnabled()
-{
- Page* page = m_webView->page();
- if (!page)
- return false;
- return page->settings().selectTrailingWhitespaceEnabled();
-}
-
-void EditorClientWinCE::toggleContinuousSpellChecking()
-{
- notImplemented();
-}
-
-void EditorClientWinCE::toggleGrammarChecking()
-{
- notImplemented();
-}
-
-static const unsigned CtrlKey = 1 << 0;
-static const unsigned AltKey = 1 << 1;
-static const unsigned ShiftKey = 1 << 2;
-
-struct KeyDownEntry {
- unsigned virtualKey;
- unsigned modifiers;
- const char* name;
-};
-
-struct KeyPressEntry {
- unsigned charCode;
- unsigned modifiers;
- const char* name;
-};
-
-static const KeyDownEntry keyDownEntries[] = {
- { VK_LEFT, 0, "MoveLeft" },
- { VK_LEFT, ShiftKey, "MoveLeftAndModifySelection" },
- { VK_LEFT, CtrlKey, "MoveWordLeft" },
- { VK_LEFT, CtrlKey | ShiftKey, "MoveWordLeftAndModifySelection" },
- { VK_RIGHT, 0, "MoveRight" },
- { VK_RIGHT, ShiftKey, "MoveRightAndModifySelection" },
- { VK_RIGHT, CtrlKey, "MoveWordRight" },
- { VK_RIGHT, CtrlKey | ShiftKey, "MoveWordRightAndModifySelection" },
- { VK_UP, 0, "MoveUp" },
- { VK_UP, ShiftKey, "MoveUpAndModifySelection" },
- { VK_PRIOR, ShiftKey, "MovePageUpAndModifySelection" },
- { VK_DOWN, 0, "MoveDown" },
- { VK_DOWN, ShiftKey, "MoveDownAndModifySelection" },
- { VK_NEXT, ShiftKey, "MovePageDownAndModifySelection" },
- { VK_PRIOR, 0, "MovePageUp" },
- { VK_NEXT, 0, "MovePageDown" },
- { VK_HOME, 0, "MoveToBeginningOfLine" },
- { VK_HOME, ShiftKey, "MoveToBeginningOfLineAndModifySelection" },
- { VK_HOME, CtrlKey, "MoveToBeginningOfDocument" },
- { VK_HOME, CtrlKey | ShiftKey, "MoveToBeginningOfDocumentAndModifySelection" },
-
- { VK_END, 0, "MoveToEndOfLine" },
- { VK_END, ShiftKey, "MoveToEndOfLineAndModifySelection" },
- { VK_END, CtrlKey, "MoveToEndOfDocument" },
- { VK_END, CtrlKey | ShiftKey, "MoveToEndOfDocumentAndModifySelection" },
-
- { VK_BACK, 0, "DeleteBackward" },
- { VK_BACK, ShiftKey, "DeleteBackward" },
- { VK_DELETE, 0, "DeleteForward" },
- { VK_BACK, CtrlKey, "DeleteWordBackward" },
- { VK_DELETE, CtrlKey, "DeleteWordForward" },
-
- { 'B', CtrlKey, "ToggleBold" },
- { 'I', CtrlKey, "ToggleItalic" },
-
- { VK_ESCAPE, 0, "Cancel" },
- { VK_TAB, 0, "InsertTab" },
- { VK_TAB, ShiftKey, "InsertBacktab" },
- { VK_RETURN, 0, "InsertNewline" },
- { VK_RETURN, CtrlKey, "InsertNewline" },
- { VK_RETURN, AltKey, "InsertNewline" },
- { VK_RETURN, AltKey | ShiftKey, "InsertNewline" },
-
- // It's not quite clear whether clipboard shortcuts and Undo/Redo should be handled
- // in the application or in WebKit. We chose WebKit for now.
- { 'C', CtrlKey, "Copy" },
- { 'V', CtrlKey, "Paste" },
- { 'X', CtrlKey, "Cut" },
- { 'A', CtrlKey, "SelectAll" },
- { VK_INSERT, CtrlKey, "Copy" },
- { VK_DELETE, ShiftKey, "Cut" },
- { VK_INSERT, ShiftKey, "Paste" },
- { 'Z', CtrlKey, "Undo" },
- { 'Z', CtrlKey | ShiftKey, "Redo" }
-};
-
-static const KeyPressEntry keyPressEntries[] = {
- { '\t', 0, "InsertTab" },
- { '\t', ShiftKey, "InsertBacktab" },
- { '\r', 0, "InsertNewline" },
- { '\r', CtrlKey, "InsertNewline" },
- { '\r', AltKey, "InsertNewline" },
- { '\r', AltKey | ShiftKey, "InsertNewline" }
-};
-
-const char* EditorClientWinCE::interpretKeyEvent(const KeyboardEvent* event)
-{
- ASSERT(event->type() == eventNames().keydownEvent || event->type() == eventNames().keypressEvent);
-
- static HashMap<int, const char*>* keyDownCommandsMap = 0;
- static HashMap<int, const char*>* keyPressCommandsMap = 0;
-
- if (!keyDownCommandsMap) {
- keyDownCommandsMap = new HashMap<int, const char*>;
- keyPressCommandsMap = new HashMap<int, const char*>;
-
- for (size_t i = 0; i < WTF_ARRAY_LENGTH(keyDownEntries); ++i)
- keyDownCommandsMap->set(keyDownEntries[i].modifiers << 16 | keyDownEntries[i].virtualKey, keyDownEntries[i].name);
-
- for (size_t i = 0; i < WTF_ARRAY_LENGTH(keyPressEntries); ++i)
- keyPressCommandsMap->set(keyPressEntries[i].modifiers << 16 | keyPressEntries[i].charCode, keyPressEntries[i].name);
- }
-
- unsigned modifiers = 0;
- if (event->shiftKey())
- modifiers |= ShiftKey;
- if (event->altKey())
- modifiers |= AltKey;
- if (event->ctrlKey())
- modifiers |= CtrlKey;
-
- if (event->type() == eventNames().keydownEvent) {
- int mapKey = modifiers << 16 | event->keyCode();
- return mapKey ? keyDownCommandsMap->get(mapKey) : 0;
- }
-
- int mapKey = modifiers << 16 | event->charCode();
- return mapKey ? keyPressCommandsMap->get(mapKey) : 0;
-}
-
-bool EditorClientWinCE::handleEditingKeyboardEvent(KeyboardEvent* event)
-{
- Node* node = event->target()->toNode();
- ASSERT(node);
- Frame* frame = node->document().frame();
- ASSERT(frame);
-
- const PlatformKeyboardEvent* keyEvent = event->keyEvent();
- if (!keyEvent)
- return false;
-
- bool caretBrowsing = frame->settings().caretBrowsingEnabled();
- if (caretBrowsing) {
- switch (keyEvent->windowsVirtualKeyCode()) {
- case VK_LEFT:
- frame->selection().modify(keyEvent->shiftKey() ? FrameSelection::AlterationExtend : FrameSelection::AlterationMove,
- DirectionLeft,
- keyEvent->ctrlKey() ? WordGranularity : CharacterGranularity,
- UserTriggered);
- return true;
- case VK_RIGHT:
- frame->selection().modify(keyEvent->shiftKey() ? FrameSelection::AlterationExtend : FrameSelection::AlterationMove,
- DirectionRight,
- keyEvent->ctrlKey() ? WordGranularity : CharacterGranularity,
- UserTriggered);
- return true;
- case VK_UP:
- frame->selection().modify(keyEvent->shiftKey() ? FrameSelection::AlterationExtend : FrameSelection::AlterationMove,
- DirectionBackward,
- keyEvent->ctrlKey() ? ParagraphGranularity : LineGranularity,
- UserTriggered);
- return true;
- case VK_DOWN:
- frame->selection().modify(keyEvent->shiftKey() ? FrameSelection::AlterationExtend : FrameSelection::AlterationMove,
- DirectionForward,
- keyEvent->ctrlKey() ? ParagraphGranularity : LineGranularity,
- UserTriggered);
- return true;
- }
- }
-
- Editor::Command command = frame->editor().command(interpretKeyEvent(event));
-
- if (keyEvent->type() == PlatformEvent::RawKeyDown) {
- // WebKit doesn't have enough information about mode to decide how commands that just insert text if executed via Editor should be treated,
- // so we leave it upon WebCore to either handle them immediately (e.g. Tab that changes focus) or let a keypress event be generated
- // (e.g. Tab that inserts a Tab character, or Enter).
- return !command.isTextInsertion() && command.execute(event);
- }
-
- if (command.execute(event))
- return true;
-
- // Don't insert null or control characters as they can result in unexpected behaviour
- if (event->charCode() < ' ')
- return false;
-
- // Don't insert anything if a modifier is pressed
- if (keyEvent->ctrlKey() || keyEvent->altKey())
- return false;
-
- return frame->editor().insertText(event->keyEvent()->text(), event);
-}
-
-void EditorClientWinCE::handleKeyboardEvent(KeyboardEvent* event)
-{
- if (handleEditingKeyboardEvent(event))
- event->setDefaultHandled();
-}
-
-void EditorClientWinCE::handleInputMethodKeydown(KeyboardEvent* event)
-{
- notImplemented();
-}
-
-void EditorClientWinCE::textFieldDidBeginEditing(Element*)
-{
-}
-
-void EditorClientWinCE::textFieldDidEndEditing(Element*)
-{
-}
-
-void EditorClientWinCE::textDidChangeInTextField(Element*)
-{
-}
-
-bool EditorClientWinCE::doTextFieldCommandFromEvent(Element*, KeyboardEvent*)
-{
- return false;
-}
-
-void EditorClientWinCE::textWillBeDeletedInTextField(Element*)
-{
- notImplemented();
-}
-
-void EditorClientWinCE::textDidChangeInTextArea(Element*)
-{
- notImplemented();
-}
-
-bool EditorClientWinCE::shouldEraseMarkersAfterChangeSelection(TextCheckingType) const
-{
- return true;
-}
-
-void EditorClientWinCE::ignoreWordInSpellDocument(const String& text)
-{
- notImplemented();
-}
-
-void EditorClientWinCE::learnWord(const String& text)
-{
- notImplemented();
-}
-
-void EditorClientWinCE::checkSpellingOfString(StringView, int* misspellingLocation, int* misspellingLength)
-{
- notImplemented();
-}
-
-String EditorClientWinCE::getAutoCorrectSuggestionForMisspelledWord(const String& inputWord)
-{
- // This method can be implemented using customized algorithms for the particular browser.
- // Currently, it computes an empty string.
- return String();
-}
-
-void EditorClientWinCE::checkGrammarOfString(StringVIew, Vector<GrammarDetail>&, int*, int*)
-{
- notImplemented();
-}
-
-void EditorClientWinCE::updateSpellingUIWithGrammarString(const String&, const GrammarDetail&)
-{
- notImplemented();
-}
-
-void EditorClientWinCE::updateSpellingUIWithMisspelledWord(const String&)
-{
- notImplemented();
-}
-
-void EditorClientWinCE::showSpellingUI(bool)
-{
- notImplemented();
-}
-
-bool EditorClientWinCE::spellingUIIsShowing()
-{
- notImplemented();
- return false;
-}
-
-void EditorClientWinCE::getGuessesForWord(const String& word, const String& context, WTF::Vector<String>& guesses)
-{
- notImplemented();
-}
-
-void EditorClientWinCE::willSetInputMethodState()
-{
- notImplemented();
-}
-
-} // namespace WebKit
</del></span></pre></div>
<a id="trunkSourceWebKitwinceWebCoreSupportEditorClientWinCEh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/wince/WebCoreSupport/EditorClientWinCE.h (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/wince/WebCoreSupport/EditorClientWinCE.h 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebKit/wince/WebCoreSupport/EditorClientWinCE.h 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,115 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
- *
- * 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 AND ITS CONTRIBUTORS "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 OR ITS 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.
- */
-
-#ifndef EditorClientWinCE_h
-#define EditorClientWinCE_h
-
-#include "EditorClient.h"
-#include "TextCheckerClient.h"
-
-class WebView;
-
-namespace WebKit {
-
-class EditorClientWinCE : public WebCore::EditorClient, public WebCore::TextCheckerClient {
-public:
- EditorClientWinCE(WebView*);
- ~EditorClientWinCE();
-
- virtual void pageDestroyed() override;
-
- virtual bool shouldDeleteRange(WebCore::Range*) override;
- virtual bool smartInsertDeleteEnabled() override;
- virtual bool isSelectTrailingWhitespaceEnabled() override;
- virtual bool isContinuousSpellCheckingEnabled() override;
- virtual void toggleContinuousSpellChecking() override;
- virtual bool isGrammarCheckingEnabled() override;
- virtual void toggleGrammarChecking() override;
- virtual int spellCheckerDocumentTag() override;
-
- virtual bool shouldBeginEditing(WebCore::Range*) override;
- virtual bool shouldEndEditing(WebCore::Range*) override;
- virtual bool shouldInsertNode(WebCore::Node*, WebCore::Range*, WebCore::EditorInsertAction) override;
- virtual bool shouldInsertText(const WTF::String&, WebCore::Range*, WebCore::EditorInsertAction) override;
- virtual bool shouldChangeSelectedRange(WebCore::Range*, WebCore::Range*, WebCore::EAffinity, bool) override;
-
- virtual bool shouldApplyStyle(WebCore::StylePropertySet*, WebCore::Range*) override;
- virtual bool shouldMoveRangeAfterDelete(WebCore::Range*, WebCore::Range*) override;
-
- virtual void didBeginEditing() override;
- virtual void respondToChangedContents() override;
- virtual void respondToChangedSelection(WebCore::Frame*) override;
- virtual void didEndEditing() override;
- virtual void willWriteSelectionToPasteboard(WebCore::Range*) override;
- virtual void didWriteSelectionToPasteboard() override;
- virtual void getClientPasteboardDataForRange(WebCore::Range*, Vector<String>& pasteboardTypes, Vector<RefPtr<WebCore::SharedBuffer> >& pasteboardData) override;
-
- virtual void registerUndoStep(WTF::PassRefPtr<WebCore::UndoStep>) override;
- virtual void registerRedoStep(WTF::PassRefPtr<WebCore::UndoStep>) override;
- virtual void clearUndoRedoOperations() override;
-
- virtual bool canCopyCut(WebCore::Frame*, bool defaultValue) const override;
- virtual bool canPaste(WebCore::Frame*, bool defaultValue) const override;
- virtual bool canUndo() const override;
- virtual bool canRedo() const override;
-
- virtual void undo() override;
- virtual void redo() override;
-
- virtual void handleKeyboardEvent(WebCore::KeyboardEvent*) override;
- virtual void handleInputMethodKeydown(WebCore::KeyboardEvent*) override;
-
- virtual void textFieldDidBeginEditing(WebCore::Element*) override;
- virtual void textFieldDidEndEditing(WebCore::Element*) override;
- virtual void textDidChangeInTextField(WebCore::Element*) override;
- virtual bool doTextFieldCommandFromEvent(WebCore::Element*, WebCore::KeyboardEvent*) override;
- virtual void textWillBeDeletedInTextField(WebCore::Element*) override;
- virtual void textDidChangeInTextArea(WebCore::Element*) override;
-
- virtual bool shouldEraseMarkersAfterChangeSelection(WebCore::TextCheckingType) const override;
- virtual void ignoreWordInSpellDocument(const WTF::String&) override;
- virtual void learnWord(const WTF::String&) override;
- virtual void checkSpellingOfString(StringView, int*, int*) override;
- virtual WTF::String getAutoCorrectSuggestionForMisspelledWord(const WTF::String&) override;
- virtual void checkGrammarOfString(StringView, WTF::Vector<WebCore::GrammarDetail>&, int*, int*) override;
- virtual void updateSpellingUIWithGrammarString(const WTF::String&, const WebCore::GrammarDetail&) override;
- virtual void updateSpellingUIWithMisspelledWord(const WTF::String&) override;
- virtual void showSpellingUI(bool) override;
- virtual bool spellingUIIsShowing() override;
- virtual void getGuessesForWord(const WTF::String& word, const WTF::String& context, WTF::Vector<WTF::String>& guesses) override;
- virtual void willSetInputMethodState() override;
- virtual void setInputMethodState(bool) override;
- virtual void requestCheckingOfString(WTF::PassRefPtr<WebCore::TextCheckingRequest>) override { }
- virtual WebCore::TextCheckerClient* textChecker() override { return this; }
-
-private:
- const char* interpretKeyEvent(const WebCore::KeyboardEvent*);
- bool handleEditingKeyboardEvent(WebCore::KeyboardEvent*);
-
- WebView* m_webView;
-};
-
-} // namespace WebKit
-
-#endif // EditorClientWinCE_h
</del></span></pre></div>
<a id="trunkSourceWebKitwinceWebCoreSupportFrameLoaderClientWinCEcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,623 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
- * Copyright (C) 2011 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 AND ITS CONTRIBUTORS "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 OR ITS 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.
- */
-
-#include "config.h"
-#include "FrameLoaderClientWinCE.h"
-
-#include "DocumentLoader.h"
-#include "FrameLoader.h"
-#include "FrameNetworkingContextWinCE.h"
-#include "FrameView.h"
-#include "HTMLFormElement.h"
-#include "MIMETypeRegistry.h"
-#include "MainFrame.h"
-#include "NotImplemented.h"
-#include "Page.h"
-#include "PluginDatabase.h"
-#include "PolicyChecker.h"
-#include "RenderWidget.h"
-#include "SystemInfo.h"
-#include "WebKitVersion.h"
-#include "WebView.h"
-#include <wtf/text/StringConcatenate.h>
-
-using namespace WebCore;
-
-namespace WebKit {
-
-FrameLoaderClientWinCE::FrameLoaderClientWinCE(WebView* view)
- : m_webView(view)
- , m_pluginView(0)
-{
- ASSERT(m_webView);
-}
-
-FrameLoaderClientWinCE::~FrameLoaderClientWinCE()
-{
-}
-
-String FrameLoaderClientWinCE::userAgent(const URL&)
-{
- DEPRECATED_DEFINE_STATIC_LOCAL(String, userAgentString, ());
-
- if (userAgentString.isNull()) {
- String webKitVersion = String::format("%d.%d", WEBKIT_MAJOR_VERSION, WEBKIT_MINOR_VERSION);
- userAgentString = makeString("Mozilla/5.0 (", windowsVersionForUAString(), ") AppleWebKit/", webKitVersion, " (KHTML, like Gecko) Mobile Safari/", webKitVersion);
- }
-
- return userAgentString;
-}
-
-PassRefPtr<DocumentLoader> FrameLoaderClientWinCE::createDocumentLoader(const WebCore::ResourceRequest& request, const SubstituteData& substituteData)
-{
- return DocumentLoader::create(request, substituteData);
-}
-
-void FrameLoaderClientWinCE::committedLoad(DocumentLoader* loader, const char* data, int length)
-{
- if (m_pluginView) {
- if (!m_hasSentResponseToPlugin) {
- m_pluginView->didReceiveResponse(loader->response());
- m_hasSentResponseToPlugin = true;
- }
- m_pluginView->didReceiveData(data, length);
- } else
- loader->commitData(data, length);
-}
-
-bool FrameLoaderClientWinCE::shouldUseCredentialStorage(DocumentLoader*, unsigned long)
-{
- notImplemented();
- return false;
-}
-
-void FrameLoaderClientWinCE::dispatchDidReceiveAuthenticationChallenge(DocumentLoader*, unsigned long, const AuthenticationChallenge&)
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::dispatchDidCancelAuthenticationChallenge(DocumentLoader*, unsigned long, const AuthenticationChallenge&)
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::dispatchWillSendRequest(DocumentLoader*, unsigned long, WebCore::ResourceRequest&, const WebCore::ResourceResponse&)
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::assignIdentifierToInitialRequest(unsigned long, DocumentLoader*, const WebCore::ResourceRequest&)
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::postProgressStartedNotification()
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::postProgressEstimateChangedNotification()
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::postProgressFinishedNotification()
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::frameLoaderDestroyed()
-{
- m_webView = 0;
- m_frame = 0;
- delete this;
-}
-
-void FrameLoaderClientWinCE::dispatchDidReceiveResponse(DocumentLoader*, unsigned long, const ResourceResponse& response)
-{
- m_response = response;
-}
-
-void FrameLoaderClientWinCE::dispatchDecidePolicyForResponse(const WebCore::ResourceResponse& response, const WebCore::ResourceRequest&, FramePolicyFunction policyFunction)
-{
- if (canShowMIMEType(response.mimeType()))
- policyFunction(PolicyUse);
- else
- policyFunction(PolicyDownload);
-}
-
-void FrameLoaderClientWinCE::dispatchDecidePolicyForNewWindowAction(const NavigationAction&, const WebCore::ResourceRequest&, PassRefPtr<FormState>, const String&, FramePolicyFunction policyFunction)
-{
- policyFunction(PolicyUse);
-}
-
-void FrameLoaderClientWinCE::dispatchDecidePolicyForNavigationAction(const NavigationAction&, const WebCore::ResourceRequest&, PassRefPtr<FormState>, FramePolicyFunction policyFunction)
-{
- policyFunction(PolicyUse);
-}
-
-void FrameLoaderClientWinCE::dispatchWillSubmitForm(PassRefPtr<FormState>, FramePolicyFunction policyFunction)
-{
- policyFunction(PolicyUse);
-}
-
-PassRefPtr<Widget> FrameLoaderClientWinCE::createPlugin(const IntSize&, HTMLPlugInElement*, const URL&, const Vector<String>&, const Vector<String>&, const String&, bool)
-{
- return 0;
-}
-
-PassRefPtr<Frame> FrameLoaderClientWinCE::createFrame(const URL& url, const String& name, HTMLFrameOwnerElement* ownerElement,
- const String& referrer, bool allowsScrolling, int marginWidth, int marginHeight)
-{
- return m_webView->createFrame(url, name, ownerElement, referrer, allowsScrolling, marginWidth, marginHeight, m_frame);
-}
-
-void FrameLoaderClientWinCE::redirectDataToPlugin(Widget* pluginWidget)
-{
- m_pluginView = toPluginView(pluginWidget);
- if (pluginWidget)
- m_hasSentResponseToPlugin = false;
-}
-
-PassRefPtr<Widget> FrameLoaderClientWinCE::createJavaAppletWidget(const IntSize&, HTMLAppletElement*, const URL&, const Vector<String>&, const Vector<String>&)
-{
- notImplemented();
- return 0;
-}
-
-ObjectContentType FrameLoaderClientWinCE::objectContentType(const URL& url, const String& mimeType, bool shouldPreferPlugInsForImages)
-{
- return FrameLoader::defaultObjectContentType(url, mimeType, shouldPreferPlugInsForImages);
-}
-
-String FrameLoaderClientWinCE::overrideMediaType() const
-{
- notImplemented();
- return String();
-}
-
-void FrameLoaderClientWinCE::dispatchDidClearWindowObjectInWorld(DOMWrapperWorld&)
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::registerForIconNotification(bool)
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::setMainFrameDocumentReady(bool)
-{
- notImplemented();
-}
-
-bool FrameLoaderClientWinCE::hasWebView() const
-{
- return true;
-}
-
-void FrameLoaderClientWinCE::dispatchDidFinishLoad()
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::frameLoadCompleted()
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::saveViewStateToItem(HistoryItem*)
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::restoreViewState()
-{
- notImplemented();
-}
-
-bool FrameLoaderClientWinCE::shouldGoToHistoryItem(HistoryItem* item) const
-{
- return item;
-}
-
-void FrameLoaderClientWinCE::didDisplayInsecureContent()
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::didRunInsecureContent(SecurityOrigin*, const URL&)
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::didDetectXSS(const URL&, bool)
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::makeRepresentation(DocumentLoader*)
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::forceLayout()
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::forceLayoutForNonHTML()
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::setCopiesOnScroll()
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::detachedFromParent2()
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::detachedFromParent3()
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::dispatchDidHandleOnloadEvents()
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::dispatchDidReceiveServerRedirectForProvisionalLoad()
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::dispatchDidCancelClientRedirect()
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::dispatchWillPerformClientRedirect(const URL&, double, double)
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::dispatchDidChangeLocationWithinPage()
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::dispatchDidPushStateWithinPage()
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::dispatchDidReplaceStateWithinPage()
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::dispatchDidPopStateWithinPage()
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::dispatchWillClose()
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::dispatchDidReceiveIcon()
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::dispatchDidStartProvisionalLoad()
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::dispatchDidReceiveTitle(const StringWithDirection&)
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::dispatchDidChangeIcons(WebCore::IconType)
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::dispatchDidCommitLoad()
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::dispatchDidFinishDocumentLoad()
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::dispatchDidLayout(LayoutMilestones)
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::dispatchShow()
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::cancelPolicyCheck()
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::revertToProvisionalState(DocumentLoader*)
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::willChangeTitle(DocumentLoader*)
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::didChangeTitle(DocumentLoader* documentLoader)
-{
- setTitle(documentLoader->title(), documentLoader->url());
-}
-
-bool FrameLoaderClientWinCE::canHandleRequest(const WebCore::ResourceRequest&) const
-{
- notImplemented();
- return true;
-}
-
-bool FrameLoaderClientWinCE::canShowMIMEType(const String& type) const
-{
- return (MIMETypeRegistry::canShowMIMEType(type)
- || PluginDatabase::installedPlugins()->isMIMETypeRegistered(type));
-}
-
-bool FrameLoaderClientWinCE::canShowMIMETypeAsHTML(const String&) const
-{
- notImplemented();
- return false;
-}
-
-bool FrameLoaderClientWinCE::representationExistsForURLScheme(const String&) const
-{
- notImplemented();
- return false;
-}
-
-String FrameLoaderClientWinCE::generatedMIMETypeForURLScheme(const String&) const
-{
- notImplemented();
- return String();
-}
-
-void FrameLoaderClientWinCE::finishedLoading(DocumentLoader*)
-{
- if (!m_pluginView)
- return;
-
- m_pluginView->didFinishLoading();
- m_pluginView = 0;
- m_hasSentResponseToPlugin = false;
-}
-
-void FrameLoaderClientWinCE::provisionalLoadStarted()
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::didFinishLoad()
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::prepareForDataSourceReplacement()
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::setTitle(const StringWithDirection&, const URL&)
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::dispatchDidReceiveContentLength(DocumentLoader*, unsigned long, int)
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::dispatchDidFinishLoading(DocumentLoader*, unsigned long)
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::dispatchDidFailLoading(DocumentLoader*, unsigned long, const ResourceError&)
-{
- notImplemented();
-}
-
-bool FrameLoaderClientWinCE::dispatchDidLoadResourceFromMemoryCache(DocumentLoader*, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&, int)
-{
- notImplemented();
- return false;
-}
-
-void FrameLoaderClientWinCE::dispatchDidFailProvisionalLoad(const ResourceError& error)
-{
- dispatchDidFailLoad(error);
-}
-
-void FrameLoaderClientWinCE::dispatchDidFailLoad(const ResourceError&)
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::convertMainResourceLoadToDownload(WebCore::DocumentLoader*, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&)
-{
- notImplemented();
-}
-
-ResourceError FrameLoaderClientWinCE::cancelledError(const WebCore::ResourceRequest&)
-{
- return ResourceError();
-}
-
-ResourceError FrameLoaderClientWinCE::blockedError(const WebCore::ResourceRequest&)
-{
- return ResourceError();
-}
-
-ResourceError FrameLoaderClientWinCE::cannotShowURLError(const WebCore::ResourceRequest&)
-{
- return ResourceError();
-}
-
-ResourceError FrameLoaderClientWinCE::interruptedForPolicyChangeError(const WebCore::ResourceRequest&)
-{
- return ResourceError();
-}
-
-ResourceError FrameLoaderClientWinCE::cannotShowMIMETypeError(const WebCore::ResourceResponse&)
-{
- return ResourceError();
-}
-
-ResourceError FrameLoaderClientWinCE::fileDoesNotExistError(const WebCore::ResourceResponse&)
-{
- return ResourceError();
-}
-
-ResourceError FrameLoaderClientWinCE::pluginWillHandleLoadError(const WebCore::ResourceResponse&)
-{
- return ResourceError();
-}
-
-bool FrameLoaderClientWinCE::shouldFallBack(const ResourceError& error)
-{
- return !(error.isCancellation());
-}
-
-bool FrameLoaderClientWinCE::canCachePage() const
-{
- return true;
-}
-
-Frame* FrameLoaderClientWinCE::dispatchCreatePage(const NavigationAction&)
-{
- notImplemented();
- return 0;
-}
-
-void FrameLoaderClientWinCE::dispatchUnableToImplementPolicy(const ResourceError&)
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::setMainDocumentError(DocumentLoader*, const ResourceError& error)
-{
- if (!m_pluginView)
- return;
-
- m_pluginView->didFail(error);
- m_pluginView = 0;
- m_hasSentResponseToPlugin = false;
-}
-
-void FrameLoaderClientWinCE::startDownload(const WebCore::ResourceRequest&, const String& /* suggestedName */)
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::updateGlobalHistory()
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::updateGlobalHistoryRedirectLinks()
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::savePlatformDataToCachedFrame(CachedFrame*)
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::transitionToCommittedFromCachedFrame(CachedFrame*)
-{
- notImplemented();
-}
-
-void FrameLoaderClientWinCE::transitionToCommittedForNewPage()
-{
- Page* page = m_frame->page();
- ASSERT(page);
-
- bool isMainFrame = m_frame == page->mainFrame();
-
- m_frame->setView(0);
-
- RefPtr<FrameView> frameView;
- if (isMainFrame) {
- RECT rect;
- m_webView->frameRect(&rect);
- frameView = FrameView::create(*m_frame, IntRect(rect).size());
- } else
- frameView = FrameView::create(*m_frame);
-
- m_frame->setView(frameView);
-
- if (m_frame->ownerRenderer())
- m_frame->ownerRenderer()->setWidget(frameView);
-}
-
-void FrameLoaderClientWinCE::didSaveToPageCache()
-{
-}
-
-void FrameLoaderClientWinCE::didRestoreFromPageCache()
-{
-}
-
-void FrameLoaderClientWinCE::dispatchDidBecomeFrameset(bool)
-{
-}
-
-PassRefPtr<WebCore::FrameNetworkingContext> FrameLoaderClientWinCE::createNetworkingContext()
-{
- return FrameNetworkingContextWinCE::create(m_frame, userAgent(URL()));
-}
-
-} // namespace WebKit
</del></span></pre></div>
<a id="trunkSourceWebKitwinceWebCoreSupportFrameLoaderClientWinCEh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.h (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.h 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.h 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,196 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
- * Copyright (C) 2011 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 AND ITS CONTRIBUTORS "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 OR ITS 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.
- */
-
-#ifndef FrameLoaderClientWinCE_h
-#define FrameLoaderClientWinCE_h
-
-#include "FrameLoaderClient.h"
-#include "PluginView.h"
-#include "ResourceResponse.h"
-
-class WebView;
-
-namespace WebKit {
-
-class FrameLoaderClientWinCE : public WebCore::FrameLoaderClient {
-public:
- FrameLoaderClientWinCE(WebView*);
- virtual ~FrameLoaderClientWinCE();
- virtual void frameLoaderDestroyed() override;
-
- WebView* webView() const { return m_webView; }
-
- virtual bool hasWebView() const override;
-
- virtual void makeRepresentation(WebCore::DocumentLoader*) override;
- virtual void forceLayout() override;
- virtual void forceLayoutForNonHTML() override;
-
- virtual void setCopiesOnScroll() override;
-
- virtual void detachedFromParent2() override;
- virtual void detachedFromParent3() override;
-
- virtual void assignIdentifierToInitialRequest(unsigned long identifier, WebCore::DocumentLoader*, const WebCore::ResourceRequest&) override;
-
- virtual void dispatchWillSendRequest(WebCore::DocumentLoader*, unsigned long identifier, WebCore::ResourceRequest&, const WebCore::ResourceResponse& redirectResponse) override;
- virtual bool shouldUseCredentialStorage(WebCore::DocumentLoader*, unsigned long identifier) override;
- virtual void dispatchDidReceiveAuthenticationChallenge(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::AuthenticationChallenge&) override;
- virtual void dispatchDidCancelAuthenticationChallenge(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::AuthenticationChallenge&) override;
- virtual void dispatchDidReceiveResponse(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ResourceResponse&) override;
- virtual void dispatchDidReceiveContentLength(WebCore::DocumentLoader*, unsigned long identifier, int dataLength) override;
- virtual void dispatchDidFinishLoading(WebCore::DocumentLoader*, unsigned long identifier) override;
- virtual void dispatchDidFailLoading(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ResourceError&) override;
- virtual bool dispatchDidLoadResourceFromMemoryCache(WebCore::DocumentLoader*, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&, int length) override;
-
- virtual void dispatchDidHandleOnloadEvents() override;
- virtual void dispatchDidReceiveServerRedirectForProvisionalLoad() override;
- virtual void dispatchDidCancelClientRedirect() override;
- virtual void dispatchWillPerformClientRedirect(const WebCore::URL&, double, double) override;
- virtual void dispatchDidChangeLocationWithinPage() override;
- virtual void dispatchDidPushStateWithinPage() override;
- virtual void dispatchDidReplaceStateWithinPage() override;
- virtual void dispatchDidPopStateWithinPage() override;
- virtual void dispatchWillClose() override;
- virtual void dispatchDidReceiveIcon() override;
- virtual void dispatchDidStartProvisionalLoad() override;
- virtual void dispatchDidReceiveTitle(const WebCore::StringWithDirection&) override;
- virtual void dispatchDidChangeIcons(WebCore::IconType) override;
- virtual void dispatchDidCommitLoad() override;
- virtual void dispatchDidFailProvisionalLoad(const WebCore::ResourceError&) override;
- virtual void dispatchDidFailLoad(const WebCore::ResourceError&) override;
- virtual void dispatchDidFinishDocumentLoad() override;
- virtual void dispatchDidFinishLoad() override;
- virtual void dispatchDidLayout(WebCore::LayoutMilestones) override;
-
- virtual WebCore::Frame* dispatchCreatePage(const WebCore::NavigationAction&) override;
- virtual void dispatchShow() override;
-
- virtual void dispatchDecidePolicyForResponse(const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, WebCore::FramePolicyFunction) override;
- virtual void dispatchDecidePolicyForNewWindowAction(const WebCore::NavigationAction&, const WebCore::ResourceRequest&, WTF::PassRefPtr<WebCore::FormState>, const WTF::String& frameName, WebCore::FramePolicyFunction) override;
- virtual void dispatchDecidePolicyForNavigationAction(const WebCore::NavigationAction&, const WebCore::ResourceRequest&, WTF::PassRefPtr<WebCore::FormState>, WebCore::FramePolicyFunction) override;
- virtual void cancelPolicyCheck() override;
-
- virtual void dispatchUnableToImplementPolicy(const WebCore::ResourceError&) override;
-
- virtual void dispatchWillSendSubmitEvent(WTF::PassRefPtr<WebCore::FormState>) override { }
- virtual void dispatchWillSubmitForm(WTF::PassRefPtr<WebCore::FormState>, WebCore::FramePolicyFunction) override;
-
- virtual void revertToProvisionalState(WebCore::DocumentLoader*) override;
- virtual void setMainDocumentError(WebCore::DocumentLoader*, const WebCore::ResourceError&) override;
-
- virtual void postProgressStartedNotification() override;
- virtual void postProgressEstimateChangedNotification() override;
- virtual void postProgressFinishedNotification() override;
-
- virtual PassRefPtr<WebCore::Frame> createFrame(const WebCore::URL&, const WTF::String& name, WebCore::HTMLFrameOwnerElement*, const WTF::String& referrer, bool allowsScrolling, int marginWidth, int marginHeight) override;
- virtual PassRefPtr<WebCore::Widget> createPlugin(const WebCore::IntSize&, WebCore::HTMLPlugInElement*, const WebCore::URL&, const WTF::Vector<WTF::String>&, const WTF::Vector<WTF::String>&, const WTF::String&, bool) override;
- virtual void recreatePlugin(WebCore::Widget*) override { }
- virtual void redirectDataToPlugin(WebCore::Widget* pluginWidget) override;
- virtual PassRefPtr<WebCore::Widget> createJavaAppletWidget(const WebCore::IntSize&, WebCore::HTMLAppletElement*, const WebCore::URL& baseURL, const WTF::Vector<WTF::String>& paramNames, const WTF::Vector<WTF::String>& paramValues) override;
- virtual WTF::String overrideMediaType() const override;
- virtual void dispatchDidClearWindowObjectInWorld(WebCore::DOMWrapperWorld&) override;
-
- virtual void registerForIconNotification(bool) override;
-
- virtual WebCore::ObjectContentType objectContentType(const WebCore::URL&, const WTF::String& mimeType, bool shouldPreferPlugInsForImages) override;
-
- virtual void setMainFrameDocumentReady(bool) override;
-
- virtual void startDownload(const WebCore::ResourceRequest&, const String& suggestedName = String()) override;
-
- virtual void willChangeTitle(WebCore::DocumentLoader*) override;
- virtual void didChangeTitle(WebCore::DocumentLoader*) override;
-
- virtual void committedLoad(WebCore::DocumentLoader*, const char*, int) override;
- virtual void finishedLoading(WebCore::DocumentLoader*) override;
-
- virtual void updateGlobalHistory() override;
- virtual void updateGlobalHistoryRedirectLinks() override;
- virtual bool shouldGoToHistoryItem(WebCore::HistoryItem*) const override;
-
- virtual void didDisplayInsecureContent() override;
- virtual void didRunInsecureContent(WebCore::SecurityOrigin*, const WebCore::URL&) override;
- virtual void didDetectXSS(const WebCore::URL&, bool didBlockEntirePage) override;
-
- virtual WebCore::ResourceError cancelledError(const WebCore::ResourceRequest&) override;
- virtual WebCore::ResourceError blockedError(const WebCore::ResourceRequest&) override;
- virtual WebCore::ResourceError cannotShowURLError(const WebCore::ResourceRequest&) override;
- virtual WebCore::ResourceError interruptedForPolicyChangeError(const WebCore::ResourceRequest&) override;
-
- virtual WebCore::ResourceError cannotShowMIMETypeError(const WebCore::ResourceResponse&) override;
- virtual WebCore::ResourceError fileDoesNotExistError(const WebCore::ResourceResponse&) override;
- virtual WebCore::ResourceError pluginWillHandleLoadError(const WebCore::ResourceResponse&) override;
-
- virtual bool shouldFallBack(const WebCore::ResourceError&) override;
-
- virtual bool canHandleRequest(const WebCore::ResourceRequest&) const override;
- virtual bool canShowMIMEType(const WTF::String&) const override;
- virtual bool canShowMIMETypeAsHTML(const WTF::String&) const override;
- virtual bool representationExistsForURLScheme(const WTF::String&) const override;
- virtual WTF::String generatedMIMETypeForURLScheme(const WTF::String&) const override;
-
- virtual void frameLoadCompleted() override;
- virtual void saveViewStateToItem(WebCore::HistoryItem*) override;
- virtual void restoreViewState() override;
- virtual void provisionalLoadStarted() override;
- virtual void didFinishLoad() override;
- virtual void prepareForDataSourceReplacement() override;
-
- virtual WTF::PassRefPtr<WebCore::DocumentLoader> createDocumentLoader(const WebCore::ResourceRequest&, const WebCore::SubstituteData&) override;
- virtual void setTitle(const WebCore::StringWithDirection&, const WebCore::URL&) override;
-
- virtual WTF::String userAgent(const WebCore::URL&) override;
-
- virtual void savePlatformDataToCachedFrame(WebCore::CachedFrame*) override;
- virtual void transitionToCommittedFromCachedFrame(WebCore::CachedFrame*) override;
- virtual void transitionToCommittedForNewPage() override;
-
- virtual void didSaveToPageCache() override;
- virtual void didRestoreFromPageCache() override;
-
- virtual void dispatchDidBecomeFrameset(bool) override;
-
- virtual bool canCachePage() const override;
- virtual void convertMainResourceLoadToDownload(WebCore::DocumentLoader*, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&) override;
-
- virtual PassRefPtr<WebCore::FrameNetworkingContext> createNetworkingContext() override;
-
- void setFrame(WebCore::Frame *frame) { m_frame = frame; }
- WebCore::Frame *frame() { return m_frame; }
-
-private:
- WebView* m_webView;
- WebCore::Frame* m_frame;
- WebCore::ResourceResponse m_response;
-
- // Plugin view to redirect data to
- WebCore::PluginView* m_pluginView;
- bool m_hasSentResponseToPlugin;
-};
-
-} // namespace WebKit
-
-#endif // FrameLoaderClientWinCE_h
</del></span></pre></div>
<a id="trunkSourceWebKitwinceWebCoreSupportFrameNetworkingContextWinCEcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/wince/WebCoreSupport/FrameNetworkingContextWinCE.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/wince/WebCoreSupport/FrameNetworkingContextWinCE.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebKit/wince/WebCoreSupport/FrameNetworkingContextWinCE.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,57 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
- *
- * 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 AND ITS CONTRIBUTORS "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 OR ITS 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.
- */
-
-#include "config.h"
-#include "FrameNetworkingContextWinCE.h"
-
-#include "NotImplemented.h"
-#include "ResourceError.h"
-
-using namespace WebCore;
-
-namespace WebKit {
-
-FrameNetworkingContextWinCE::FrameNetworkingContextWinCE(Frame* frame, const String& userAgent)
- : FrameNetworkingContext(frame)
- , m_userAgent(userAgent)
-{
-}
-
-String FrameNetworkingContextWinCE::userAgent() const
-{
- return m_userAgent;
-}
-
-String FrameNetworkingContextWinCE::referrer() const
-{
- return frame()->loader().referrer();
-}
-
-WebCore::ResourceError FrameNetworkingContextWinCE::blockedError(const WebCore::ResourceRequest&) const
-{
- notImplemented();
- return WebCore::ResourceError();
-}
-
-} // namespace WebKit
</del></span></pre></div>
<a id="trunkSourceWebKitwinceWebCoreSupportFrameNetworkingContextWinCEh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/wince/WebCoreSupport/FrameNetworkingContextWinCE.h (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/wince/WebCoreSupport/FrameNetworkingContextWinCE.h 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebKit/wince/WebCoreSupport/FrameNetworkingContextWinCE.h 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,51 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
- *
- * 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 AND ITS CONTRIBUTORS "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 OR ITS 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.
- */
-
-#ifndef FrameNetworkingContextWinCE_h
-#define FrameNetworkingContextWinCE_h
-
-#include "FrameNetworkingContext.h"
-
-namespace WebKit {
-
-class FrameNetworkingContextWinCE : public WebCore::FrameNetworkingContext {
-public:
- static PassRefPtr<FrameNetworkingContextWinCE> create(WebCore::Frame* frame, const WTF::String& userAgent)
- {
- return adoptRef(new FrameNetworkingContextWinCE(frame, userAgent));
- }
-
- virtual WTF::String userAgent() const override;
- virtual WTF::String referrer() const override;
- virtual WebCore::ResourceError blockedError(const WebCore::ResourceRequest&) const override;
-
-private:
- FrameNetworkingContextWinCE(WebCore::Frame* frame, const WTF::String& userAgent);
-
- WTF::String m_userAgent;
-};
-
-} // namespace WebKit
-
-#endif // FrameNetworkingContextWinCE_h
</del></span></pre></div>
<a id="trunkSourceWebKitwinceWebCoreSupportInspectorClientWinCEcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/wince/WebCoreSupport/InspectorClientWinCE.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/wince/WebCoreSupport/InspectorClientWinCE.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebKit/wince/WebCoreSupport/InspectorClientWinCE.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,80 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
- *
- * 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 AND ITS CONTRIBUTORS "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 OR ITS 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.
- */
-
-#include "config.h"
-#include "InspectorClientWinCE.h"
-
-#include "NotImplemented.h"
-
-using namespace WebCore;
-
-namespace WebKit {
-
-InspectorClientWinCE::InspectorClientWinCE(WebView* webView)
- : m_inspectedWebView(webView)
-{
-}
-
-InspectorClientWinCE::~InspectorClientWinCE()
-{
-}
-
-void InspectorClientWinCE::inspectorDestroyed()
-{
- delete this;
-}
-
-InspectorFrontendChannel* InspectorClientWinCE::openInspectorFrontend(InspectorController* controller)
-{
- notImplemented();
- return 0;
-}
-
-void InspectorClientWinCE::closeInspectorFrontend()
-{
- notImplemented();
-}
-
-void InspectorClientWinCE::bringFrontendToFront()
-{
- notImplemented();
-}
-
-void InspectorClientWinCE::highlight()
-{
- notImplemented();
-}
-
-void InspectorClientWinCE::hideHighlight()
-{
- notImplemented();
-}
-
-bool InspectorClientWinCE::sendMessageToFrontend(const String& message)
-{
- notImplemented();
- return false;
-}
-
-} // namespace WebKit
</del></span></pre></div>
<a id="trunkSourceWebKitwinceWebCoreSupportInspectorClientWinCEh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/wince/WebCoreSupport/InspectorClientWinCE.h (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/wince/WebCoreSupport/InspectorClientWinCE.h 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebKit/wince/WebCoreSupport/InspectorClientWinCE.h 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,57 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
- *
- * 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 AND ITS CONTRIBUTORS "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 OR ITS 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.
- */
-
-#ifndef InspectorClientWinCE_h
-#define InspectorClientWinCE_h
-
-#include "InspectorClient.h"
-#include "InspectorForwarding.h"
-
-class WebView;
-
-namespace WebKit {
-
-class InspectorClientWinCE : public WebCore::InspectorClient, public WebCore::InspectorFrontendChannel {
-public:
- explicit InspectorClientWinCE(WebView*);
- ~InspectorClientWinCE();
-
- virtual void inspectorDestroyed() override;
-
- virtual WebCore::InspectorFrontendChannel* openInspectorFrontend(WebCore::InspectorController*) override;
- virtual void closeInspectorFrontend() override;
- virtual void bringFrontendToFront() override;
-
- virtual void highlight() override;
- virtual void hideHighlight() override;
-
- virtual bool sendMessageToFrontend(const WTF::String&) override;
-
-private:
- WebView* m_inspectedWebView;
-};
-
-} // namespace WebKit
-
-#endif // InspectorClientWinCE_h
</del></span></pre></div>
<a id="trunkSourceWebKitwinceWebCoreSupportPlatformStrategiesWinCEcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/wince/WebCoreSupport/PlatformStrategiesWinCE.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/wince/WebCoreSupport/PlatformStrategiesWinCE.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebKit/wince/WebCoreSupport/PlatformStrategiesWinCE.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,163 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
- *
- * 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 AND ITS CONTRIBUTORS "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 OR ITS 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.
- */
-
-#include "config.h"
-#include "PlatformStrategiesWinCE.h"
-
-#include "IntSize.h"
-#include "Page.h"
-#include "PageGroup.h"
-#include "PlatformCookieJar.h"
-#include "PluginDatabase.h"
-
-using namespace WebCore;
-
-void PlatformStrategiesWinCE::initialize()
-{
- DEPRECATED_DEFINE_STATIC_LOCAL(PlatformStrategiesWinCE, platformStrategies, ());
-}
-
-PlatformStrategiesWinCE::PlatformStrategiesWinCE()
-{
- setPlatformStrategies(this);
-}
-
-CookiesStrategy* PlatformStrategiesWinCE::createCookiesStrategy()
-{
- return this;
-}
-
-DatabaseStrategy* PlatformStrategiesWinCE::createDatabaseStrategy()
-{
- return this;
-}
-
-LoaderStrategy* PlatformStrategiesWinCE::createLoaderStrategy()
-{
- return this;
-}
-
-PasteboardStrategy* PlatformStrategiesWinCE::createPasteboardStrategy()
-{
- return 0;
-}
-
-PluginStrategy* PlatformStrategiesWinCE::createPluginStrategy()
-{
- return this;
-}
-
-SharedWorkerStrategy* PlatformStrategiesWinCE::createSharedWorkerStrategy()
-{
- return this;
-}
-
-StorageStrategy* PlatformStrategiesWinCE::createStorageStrategy()
-{
- return this;
-}
-
-VisitedLinkStrategy* PlatformStrategiesWinCE::createVisitedLinkStrategy()
-{
- return this;
-}
-
-String PlatformStrategiesWinCE::cookiesForDOM(const NetworkStorageSession& session, const URL& firstParty, const URL& url)
-{
- return WebCore::cookiesForDOM(session, firstParty, url);
-}
-
-void PlatformStrategiesWinCE::setCookiesFromDOM(const NetworkStorageSession& session, const URL& firstParty, const URL& url, const String& cookieString)
-{
- WebCore::setCookiesFromDOM(session, firstParty, url, cookieString);
-}
-
-bool PlatformStrategiesWinCE::cookiesEnabled(const NetworkStorageSession& session, const URL& firstParty, const URL& url)
-{
- return WebCore::cookiesEnabled(session, firstParty, url);
-}
-
-String PlatformStrategiesWinCE::cookieRequestHeaderFieldValue(const NetworkStorageSession& session, const URL& firstParty, const URL& url)
-{
- return WebCore::cookieRequestHeaderFieldValue(session, firstParty, url);
-}
-
-bool PlatformStrategiesWinCE::getRawCookies(const NetworkStorageSession& session, const URL& firstParty, const URL& url, Vector<Cookie>& rawCookies)
-{
- return WebCore::getRawCookies(session, firstParty, url, rawCookies);
-}
-
-void PlatformStrategiesWinCE::deleteCookie(const NetworkStorageSession& session, const URL& url, const String& cookieName)
-{
- WebCore::deleteCookie(session, url, cookieName);
-}
-
-void PlatformStrategiesWinCE::refreshPlugins()
-{
- PluginDatabase::installedPlugins()->refresh();
-}
-
-void PlatformStrategiesWinCE::getPluginInfo(const Page*, Vector<PluginInfo>& outPlugins)
-{
- const Vector<PluginPackage*>& plugins = PluginDatabase::installedPlugins()->plugins();
-
- outPlugins.resize(plugins.size());
-
- for (size_t i = 0; i < plugins.size(); ++i) {
- PluginPackage* package = plugins[i];
-
- PluginInfo info;
- info.name = package->name();
- info.file = package->fileName();
- info.desc = package->description();
-
- const MIMEToDescriptionsMap& mimeToDescriptions = package->mimeToDescriptions();
-
- info.mimes.reserveCapacity(mimeToDescriptions.size());
-
- MIMEToDescriptionsMap::const_iterator end = mimeToDescriptions.end();
- for (MIMEToDescriptionsMap::const_iterator it = mimeToDescriptions.begin(); it != end; ++it) {
- MimeClassInfo mime;
-
- mime.type = it->key;
- mime.desc = it->value;
- mime.extensions = package->mimeToExtensions().get(mime.type);
-
- info.mimes.append(mime);
- }
-
- outPlugins[i] = info;
- }
-}
-
-bool PlatformStrategiesWinCE::isLinkVisited(Page* page, LinkHash hash, const URL&, const AtomicString&)
-{
- return page->group().isLinkVisited(hash);
-}
-
-void PlatformStrategiesWinCE::addVisitedLink(Page* page, LinkHash hash)
-{
- page->group().addVisitedLinkHash(hash);
-}
</del></span></pre></div>
<a id="trunkSourceWebKitwinceWebCoreSupportPlatformStrategiesWinCEh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/wince/WebCoreSupport/PlatformStrategiesWinCE.h (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/wince/WebCoreSupport/PlatformStrategiesWinCE.h 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebKit/wince/WebCoreSupport/PlatformStrategiesWinCE.h 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,74 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
- *
- * 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 AND ITS CONTRIBUTORS "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 OR ITS 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.
- */
-
-#ifndef PlatformStrategiesWinCE_h
-#define PlatformStrategiesWinCE_h
-
-#include "CookiesStrategy.h"
-#include "DatabaseStrategy.h"
-#include "LoaderStrategy.h"
-#include "PlatformStrategies.h"
-#include "PluginStrategy.h"
-#include "SharedWorkerStrategy.h"
-#include "StorageStrategy.h"
-#include "VisitedLinkStrategy.h"
-
-class PlatformStrategiesWinCE : public WebCore::PlatformStrategies, private WebCore::CookiesStrategy, private WebCore::DatabaseStrategy, private WebCore::LoaderStrategy, private WebCore::PluginStrategy, private WebCore::SharedWorkerStrategy, private WebCore::StorageStrategy, private WebCore::VisitedLinkStrategy {
-public:
- static void initialize();
-
-private:
- PlatformStrategiesWinCE();
-
- // WebCore::PlatformStrategies
- virtual WebCore::CookiesStrategy* createCookiesStrategy() override;
- virtual WebCore::DatabaseStrategy* createDatabaseStrategy() override;
- virtual WebCore::LoaderStrategy* createLoaderStrategy() override;
- virtual WebCore::PasteboardStrategy* createPasteboardStrategy() override;
- virtual WebCore::PluginStrategy* createPluginStrategy() override;
- virtual WebCore::SharedWorkerStrategy* createSharedWorkerStrategy() override;
- virtual WebCore::StorageStrategy* createStorageStrategy() override;
- virtual WebCore::VisitedLinkStrategy* createVisitedLinkStrategy() override;
-
- // WebCore::CookiesStrategy
- virtual String cookiesForDOM(const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::URL&) override;
- virtual void setCookiesFromDOM(const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::URL&, const String&) override;
- virtual bool cookiesEnabled(const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::URL&) override;
- virtual String cookieRequestHeaderFieldValue(const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::URL&) override;
- virtual bool getRawCookies(const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::URL&, Vector<WebCore::Cookie>&) override;
- virtual void deleteCookie(const WebCore::NetworkStorageSession&, const WebCore::URL&, const String&) override;
-
- // WebCore::DatabaseStrategy
- // - Using default implementation.
-
- // WebCore::PluginStrategy
- virtual void refreshPlugins() override;
- virtual void getPluginInfo(const WebCore::Page*, Vector<WebCore::PluginInfo>&) override;
-
- // WebCore::VisitedLinkStrategy
- virtual bool isLinkVisited(WebCore::Page*, WebCore::LinkHash, const WebCore::URL&, const WTF::AtomicString&) override;
- virtual void addVisitedLink(WebCore::Page*, WebCore::LinkHash) override;
-};
-
-#endif // PlatformStrategiesWinCE_h
</del></span></pre></div>
<a id="trunkSourceWebKitwinceWebViewcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/wince/WebView.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/wince/WebView.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebKit/wince/WebView.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,460 +0,0 @@
</span><del>-/*
- * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple, Inc. All rights reserved.
- * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
- *
- * 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 AND ITS CONTRIBUTORS "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 OR ITS 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.
- */
-
-#include "config.h"
-#include "WebView.h"
-
-#include "ChromeClientWinCE.h"
-#include "ContextMenuClientWinCE.h"
-#include "DragClientWinCE.h"
-#include "EditorClientWinCE.h"
-#include "EventHandler.h"
-#include "FocusController.h"
-#include "Frame.h"
-#include "FrameLoadRequest.h"
-#include "FrameLoader.h"
-#include "FrameLoaderClientWinCE.h"
-#include "FrameView.h"
-#include "GraphicsContext.h"
-#include "HTMLFormElement.h"
-#include "InitializeThreading.h"
-#include "InspectorClientWinCE.h"
-#include "IntSize.h"
-#include "MainFrame.h"
-#include "NotImplemented.h"
-#include "Page.h"
-#include "PlatformKeyboardEvent.h"
-#include "PlatformMouseEvent.h"
-#include "PlatformStrategiesWinCE.h"
-#include "PlatformWheelEvent.h"
-#include "ResourceRequest.h"
-#include "Settings.h"
-#include "SharedBuffer.h"
-#include "WebCoreInstanceHandle.h"
-#include <wtf/MainThread.h>
-
-using namespace WebCore;
-
-const LPCWSTR kWebViewWindowClassName = L"WebViewWindowClass";
-
-
-LRESULT CALLBACK WebView::webViewWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
-{
- if (WebView* webView = reinterpret_cast<WebView*>(GetWindowLong(hWnd, 0)))
- return webView->wndProc(hWnd, message, wParam, lParam);
-
- return DefWindowProc(hWnd, message, wParam, lParam);
-}
-
-PassRefPtr<SharedBuffer> loadResourceIntoBuffer(const char* name)
-{
- notImplemented();
- return 0;
-}
-
-
-WebView::WebView(HWND hwnd, unsigned features)
- : m_frame(0)
- , m_page(0)
- , m_parentWindowHandle(hwnd)
- , m_enableDoubleBuffer(features & EnableDoubleBuffering)
-{
- RECT rcClient;
- GetClientRect(hwnd, &rcClient);
-
- m_windowHandle = CreateWindow(kWebViewWindowClassName, 0, WS_CHILD,
- CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, hwnd, 0, WebCore::instanceHandle(), 0);
-
- SetWindowLong(m_windowHandle, 0, reinterpret_cast<LONG>(this));
-
- MoveWindow(m_windowHandle, 0, 0, rcClient.right, rcClient.bottom, TRUE);
- ShowWindow(m_windowHandle, SW_SHOW);
-
- Page::PageClients pageClients;
- pageClients.chromeClient = new WebKit::ChromeClientWinCE(this);
- pageClients.contextMenuClient = new WebKit::ContextMenuClientWinCE(this);
- pageClients.editorClient = new WebKit::EditorClientWinCE(this);
- pageClients.dragClient = new WebKit::DragClientWinCE();
- pageClients.inspectorClient = new WebKit::InspectorClientWinCE(this);
- m_page = new Page(pageClients);
-
- Settings& settings = m_page->settings();
- settings.setDefaultFixedFontSize(14);
- settings.setDefaultFontSize(14);
- settings.setMinimumFontSize(8);
- settings.setMinimumLogicalFontSize(8);
- settings.setScriptEnabled(true);
- settings.setLoadsImagesAutomatically(true);
-
- WebKit::FrameLoaderClientWinCE* loaderClient = new WebKit::FrameLoaderClientWinCE(this);
- RefPtr<Frame> frame = Frame::create(m_page, 0, loaderClient);
- m_frame = frame.get();
- loaderClient->setFrame(m_frame);
-
- m_page->mainFrame().init();
-
- if (view()) {
- RECT windowRect;
- frameRect(&windowRect);
- view()->resize(IntRect(windowRect).size());
- }
-}
-
-WebView::~WebView()
-{
- delete m_page;
- DestroyWindow(m_windowHandle);
-}
-
-void WebView::initialize(HINSTANCE instanceHandle)
-{
- JSC::initializeThreading();
- WTF::initializeMainThread();
- PlatformStrategiesWinCE::initialize();
-
- WebCore::setInstanceHandle(instanceHandle);
-
- WNDCLASS wc;
- wc.style = CS_DBLCLKS;
- wc.lpfnWndProc = WebView::webViewWndProc;
- wc.cbClsExtra = 0;
- wc.cbWndExtra = sizeof(void *);
- wc.hInstance = instanceHandle;
- wc.hIcon = 0;
- wc.hCursor = LoadCursor(0, IDC_ARROW);
- wc.hbrBackground = 0;
- wc.lpszMenuName = 0;
- wc.lpszClassName = kWebViewWindowClassName;
-
- RegisterClass(&wc);
-}
-
-void WebView::cleanup()
-{
- UnregisterClass(kWebViewWindowClassName, WebCore::instanceHandle());
-}
-
-PassRefPtr<Frame> WebView::createFrame(const URL& url, const String& name, HTMLFrameOwnerElement* ownerElement, const String& referrer,
- bool /*allowsScrolling*/, int /*marginWidth*/, int /*marginHeight*/, Frame* parentFrame)
-{
- WebKit::FrameLoaderClientWinCE *loaderClient = new WebKit::FrameLoaderClientWinCE(this);
- RefPtr<Frame> childFrame = Frame::create(m_page, ownerElement, loaderClient);
- loaderClient->setFrame(childFrame.get());
-
- parentFrame->tree().appendChild(childFrame);
- childFrame->tree().setName(name);
- childFrame->init();
-
- // The creation of the frame may have run arbitrary JavaScript that removed it from the page already.
- if (!childFrame->page())
- return 0;
-
- parentFrame->loader().loadURLIntoChildFrame(url, referrer, childFrame.get());
-
- // The frame's onload handler may have removed it from the document.
- if (!childFrame->tree().parent())
- return 0;
-
- return childFrame.release();
-}
-
-void WebView::runJavaScriptAlert(const String& message)
-{
- notImplemented();
-}
-
-bool WebView::runJavaScriptConfirm(const String& message)
-{
- notImplemented();
- return false;
-}
-
-bool WebView::runJavaScriptPrompt(const String& message, const String& defaultValue, String& result)
-{
- notImplemented();
- return false;
-}
-
-void WebView::frameRect(RECT* rect) const
-{
- GetWindowRect(m_windowHandle, rect);
-}
-
-FrameView* WebView::view() const
-{
- return m_frame ? m_frame->view() : 0;
-}
-
-void WebView::load(LPCWSTR url)
-{
- load(String(url));
-}
-
-void WebView::load(const String &url)
-{
- load(WebCore::ResourceRequest(url));
-}
-
-void WebView::load(const WebCore::ResourceRequest &request)
-{
- frame()->loader().load(FrameLoadRequest(frame(), request));
-}
-
-void WebView::reload()
-{
- frame()->loader().reload();
-}
-
-void WebView::stop()
-{
- frame()->loader().stopAllLoaders();
-}
-
-void WebView::paint(HDC hDC, const IntRect& clipRect)
-{
- FrameView* frameView = view();
- if (!frameView)
- return;
-
- auto clipRgn = adoptGDIObject(::CreateRectRgn(clipRect.x(), clipRect.y(), clipRect.maxX(), clipRect.maxY()));
- SelectClipRgn(hDC, clipRgn.get());
-
- frameView->updateLayoutAndStyleIfNeededRecursive();
-
- GraphicsContext gc(hDC);
- frameView->paint(&gc, clipRect);
-}
-
-bool WebView::handlePaint(HWND hWnd)
-{
- RECT updateRect;
- if (!GetUpdateRect(hWnd, &updateRect, false))
- return false;
-
- PAINTSTRUCT ps;
- HDC hDC = BeginPaint(m_windowHandle, &ps);
-
- IntRect clipRect(updateRect);
-
- if (m_enableDoubleBuffer) {
- if (!m_doubleBufferDC) {
- RECT rcClient;
- GetClientRect(m_windowHandle, &rcClient);
-
- m_doubleBufferDC = adoptGDIObject(::CreateCompatibleDC(hDC));
- m_doubleBufferBitmap = adoptGDIObject(::CreateCompatibleBitmap(hDC, rcClient.right, rcClient.bottom));
- SelectObject(m_doubleBufferDC.get(), m_doubleBufferBitmap.get());
- }
-
- paint(m_doubleBufferDC.get(), clipRect);
-
- BitBlt(hDC, clipRect.x(), clipRect.y(), clipRect.width(), clipRect.height(), m_doubleBufferDC.get(), clipRect.x(), clipRect.y(), SRCCOPY);
- } else
- paint(hDC, clipRect);
-
- EndPaint(m_windowHandle, &ps);
- return true;
-}
-
-bool WebView::handleMouseEvent(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
-{
- static LONG globalClickCount;
- static IntPoint globalPrevPoint;
- static MouseButton globalPrevButton;
- static LONG globalPrevMouseDownTime;
-
- // Create our event.
- // On WM_MOUSELEAVE we need to create a mouseout event, so we force the position
- // of the event to be at (MINSHORT, MINSHORT).
- PlatformMouseEvent mouseEvent(hWnd, message, wParam, lParam);
-
- bool insideThreshold = abs(globalPrevPoint.x() - mouseEvent.position().x()) < ::GetSystemMetrics(SM_CXDOUBLECLK)
- && abs(globalPrevPoint.y() - mouseEvent.position().y()) < ::GetSystemMetrics(SM_CYDOUBLECLK);
- LONG messageTime = 0;
-
- bool handled = false;
- if (message == WM_LBUTTONDOWN || message == WM_MBUTTONDOWN || message == WM_RBUTTONDOWN) {
- // FIXME: I'm not sure if this is the "right" way to do this
- // but without this call, we never become focused since we don't allow
- // the default handling of mouse events.
- SetFocus(m_windowHandle);
-
- PlatformMouseEvent moveEvent(hWnd, WM_MOUSEMOVE, 0, lParam, false);
- moveEvent.setClickCount(0);
- m_page->mainFrame().eventHandler().handleMouseMoveEvent(moveEvent);
-
- // Always start capturing events when the mouse goes down in our HWND.
- SetCapture(m_windowHandle);
-
- if (insideThreshold && mouseEvent.button() == globalPrevButton)
- globalClickCount++;
- else
- // Reset the click count.
- globalClickCount = 1;
- globalPrevMouseDownTime = messageTime;
- globalPrevButton = mouseEvent.button();
- globalPrevPoint = mouseEvent.position();
-
- mouseEvent.setClickCount(globalClickCount);
- handled = m_page->mainFrame().eventHandler().handleMousePressEvent(mouseEvent);
- } else if (message == WM_LBUTTONDBLCLK || message == WM_MBUTTONDBLCLK || message == WM_RBUTTONDBLCLK) {
- globalClickCount++;
- mouseEvent.setClickCount(globalClickCount);
- handled = m_page->mainFrame().eventHandler().handleMousePressEvent(mouseEvent);
- } else if (message == WM_LBUTTONUP || message == WM_MBUTTONUP || message == WM_RBUTTONUP) {
- // Record the global position and the button of the up.
- globalPrevButton = mouseEvent.button();
- globalPrevPoint = mouseEvent.position();
- mouseEvent.setClickCount(globalClickCount);
- m_page->mainFrame().eventHandler().handleMouseReleaseEvent(mouseEvent);
- ReleaseCapture();
- } else if (message == WM_MOUSEMOVE) {
- if (!insideThreshold)
- globalClickCount = 0;
- mouseEvent.setClickCount(globalClickCount);
- handled = m_page->mainFrame().eventHandler().mouseMoved(mouseEvent);
- }
-
- return handled;
-}
-
-bool WebView::handleMouseWheel(HWND hWnd, WPARAM wParam, LPARAM lParam, bool isHorizontal)
-{
- PlatformWheelEvent wheelEvent(hWnd, wParam, lParam, isHorizontal);
- return frame()->eventHandler().handleWheelEvent(wheelEvent);
-}
-
-bool WebView::handleKeyDown(WPARAM virtualKeyCode, LPARAM keyData, bool systemKeyDown)
-{
- Frame& frame = m_page->focusController().focusedOrMainFrame();
-
- PlatformKeyboardEvent keyEvent(m_windowHandle, virtualKeyCode, keyData, PlatformEvent::RawKeyDown, systemKeyDown);
- bool handled = frame.eventHandler().keyEvent(keyEvent);
-
- // These events cannot be canceled, and we have no default handling for them.
- // FIXME: match IE list more closely, see <http://msdn2.microsoft.com/en-us/library/ms536938.aspx>.
- if (systemKeyDown && virtualKeyCode != VK_RETURN)
- return false;
-
- if (handled) {
- MSG msg;
- if (!systemKeyDown)
- ::PeekMessage(&msg, m_windowHandle, WM_CHAR, WM_CHAR, PM_REMOVE);
- return true;
- }
-
- return handled;
-}
-
-bool WebView::handleKeyPress(WPARAM charCode, LPARAM keyData, bool systemKeyDown)
-{
- Frame& frame = m_page->focusController().focusedOrMainFrame();
-
- PlatformKeyboardEvent keyEvent(m_windowHandle, charCode, keyData, PlatformEvent::Char, systemKeyDown);
- // IE does not dispatch keypress event for WM_SYSCHAR.
- if (systemKeyDown)
- return frame.eventHandler().handleAccessKey(keyEvent);
- if (frame.eventHandler().keyEvent(keyEvent))
- return true;
-
- return false;
-}
-
-bool WebView::handleKeyUp(WPARAM virtualKeyCode, LPARAM keyData, bool systemKeyDown)
-{
- PlatformKeyboardEvent keyEvent(m_windowHandle, virtualKeyCode, keyData, PlatformEvent::KeyUp, systemKeyDown);
-
- Frame& frame = m_page->focusController().focusedOrMainFrame();
- return frame.eventHandler().keyEvent(keyEvent);
-}
-
-LRESULT WebView::wndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
-{
- bool handled = false;
-
- if (view()) {
- switch (message) {
- case WM_PAINT:
- handled = handlePaint(hWnd);
- break;
-
- case WM_MOUSEMOVE:
- case WM_LBUTTONDOWN:
- case WM_MBUTTONDOWN:
- case WM_RBUTTONDOWN:
- case WM_LBUTTONDBLCLK:
- case WM_MBUTTONDBLCLK:
- case WM_RBUTTONDBLCLK:
- case WM_LBUTTONUP:
- case WM_MBUTTONUP:
- case WM_RBUTTONUP:
- if (view()->didFirstLayout())
- handled = handleMouseEvent(hWnd, message, wParam, lParam);
- break;
-
- case WM_MOUSEWHEEL:
- if (view()->didFirstLayout())
- handled = handleMouseWheel(hWnd, wParam, lParam, wParam & MK_SHIFT);
- break;
-
- case WM_SYSKEYDOWN:
- handled = handleKeyDown(wParam, lParam, true);
- break;
-
- case WM_KEYDOWN:
- handled = handleKeyDown(wParam, lParam, false);
- break;
-
- case WM_SYSKEYUP:
- handled = handleKeyUp(wParam, lParam, true);
- break;
-
- case WM_KEYUP:
- handled = handleKeyUp(wParam, lParam, false);
- break;
-
- case WM_SYSCHAR:
- handled = handleKeyPress(wParam, lParam, true);
- break;
-
- case WM_CHAR:
- handled = handleKeyPress(wParam, lParam, false);
- break;
-
- case WM_CLOSE:
- PostMessage(m_parentWindowHandle, WM_CLOSE, wParam, lParam);
- handled = true;
- break;
-
- default:
- break;
- }
- }
-
- if (handled)
- return 0;
-
- return DefWindowProc(hWnd, message, wParam, lParam);
-}
</del></span></pre></div>
<a id="trunkSourceWebKitwinceWebViewh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/wince/WebView.h (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/wince/WebView.h 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/WebKit/wince/WebView.h 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,102 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
- *
- * 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 AND ITS CONTRIBUTORS "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 OR ITS 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.
- */
-
-#ifndef WebView_h
-#define WebView_h
-
-#include "IntRect.h"
-#include <windows.h>
-#include <wtf/PassRefPtr.h>
-#include <wtf/win/GDIObject.h>
-
-namespace WTF {
-class String;
-}
-
-namespace WebCore {
-class Frame;
-class Page;
-class FrameView;
-class HTMLFrameOwnerElement;
-class URL;
-class ResourceRequest;
-}
-
-class WebView {
-public:
- enum Features {
- NoFeature = 0,
- EnableDoubleBuffering = 1 << 0
- };
-
- WebView(HWND hwnd, unsigned features = EnableDoubleBuffering);
- ~WebView();
-
- static void initialize(HINSTANCE instanceHandle);
- static void cleanup();
-
- HWND windowHandle() const { return m_windowHandle; }
- WebCore::Frame* frame() const { return m_frame; }
- WebCore::Page* page() const { return m_page; }
- WebCore::FrameView* view() const;
-
- void load(LPCWSTR url);
- void load(const WTF::String &url);
- void load(const WebCore::ResourceRequest &request);
- void reload();
- void stop();
-
- void frameRect(RECT* rect) const;
-
- PassRefPtr<WebCore::Frame> createFrame(const WebCore::URL&, const WTF::String& name, WebCore::HTMLFrameOwnerElement*,
- const WTF::String& referrer, bool allowScrolling, int marginWidth, int marginHeight, WebCore::Frame* parentFrame);
-
- // JavaScript Dialog
- void runJavaScriptAlert(const WTF::String& message);
- bool runJavaScriptConfirm(const WTF::String& message);
- bool runJavaScriptPrompt(const WTF::String& message, const WTF::String& defaultValue, WTF::String& result);
-
-private:
- static LRESULT CALLBACK webViewWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
- LRESULT wndProc(HWND, UINT, WPARAM, LPARAM);
-
- bool handlePaint(HWND hWnd);
- bool handleMouseEvent(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
- bool handleMouseWheel(HWND hWnd, WPARAM wParam, LPARAM lParam, bool isHorizontal);
- bool handleKeyDown(WPARAM virtualKeyCode, LPARAM keyData, bool systemKeyDown);
- bool handleKeyPress(WPARAM charCode, LPARAM keyData, bool systemKeyDown);
- bool handleKeyUp(WPARAM virtualKeyCode, LPARAM keyData, bool systemKeyDown);
-
- void paint(HDC hDC, const WebCore::IntRect& clipRect);
-
- WebCore::Frame* m_frame;
- WebCore::Page* m_page;
- HWND m_parentWindowHandle;
- HWND m_windowHandle;
- bool m_enableDoubleBuffer;
- GDIObject<HDC> m_doubleBufferDC;
- GDIObject<HBITMAP> m_doubleBufferBitmap;
-};
-
-#endif // WebView_h
</del></span></pre></div>
<a id="trunkSourcecmakeOptionsWinCEcmake"></a>
<div class="delfile"><h4>Deleted: trunk/Source/cmake/OptionsWinCE.cmake (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsWinCE.cmake 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/cmake/OptionsWinCE.cmake 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,30 +0,0 @@
</span><del>-include(OptionsWindows)
-
-set(PORT_FALLBACK Win)
-
-add_definitions(-D_CE_CRT_ALLOW_WIN_MINMAX)
-add_definitions(-DWTF_USE_EXPORT_MACROS=0)
-add_definitions(-DWTF_USE_WINGDI=1)
-add_definitions(-DWTF_USE_WININET=1)
-add_definitions(-DWINCEBASIC)
-add_definitions(-DJS_NO_EXPORT)
-add_definitions(-DHAVE_ACCESSIBILITY=0)
-add_definitions(-DJSCCOLLECTOR_VIRTUALMEM_RESERVATION=0x200000)
-
-if (NOT 3RDPARTY_DIR)
- if (EXISTS $ENV{WEBKITTHIRDPARTYDIR})
- set(3RDPARTY_DIR $ENV{WEBKITTHIRDPARTYDIR})
- else ()
- message(FATAL_ERROR "You must provide a third party directory for WinCE port.")
- endif ()
-endif ()
-
-include_directories(${3RDPARTY_DIR}/ce-compat)
-add_subdirectory(${3RDPARTY_DIR} "${CMAKE_CURRENT_BINARY_DIR}/3rdparty")
-
-WEBKIT_OPTION_BEGIN()
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT OFF)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTPDIR OFF)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INSPECTOR OFF)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_SYSTEM_MALLOC ON)
-WEBKIT_OPTION_END()
</del></span></pre></div>
<a id="trunkSourcecmakeWebKitPackagingcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitPackaging.cmake (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitPackaging.cmake 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Source/cmake/WebKitPackaging.cmake 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -119,7 +119,6 @@
</span><span class="cx"> "/qt/" "/Qt/" "qt\\\\." "Qt\\\\."
</span><span class="cx"> "/qt4/" "/Qt4/" "qt4\\\\." "Qt4\\\\."
</span><span class="cx"> "/win/" "/Win/" "win\\\\." "Win\\\\."
</span><del>- "/wince/" "/Wince/" "wince\\\\." "Wince\\\\."
</del><span class="cx"> "/wxcode/" "/Wxcode/" "wxcode\\\\." "Wxcode\\\\."
</span><span class="cx"> "/WebKitLibraries/"
</span><span class="cx"> "/English\\\\.lproj/"
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigwkbuildpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild.py (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild.py 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild.py 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -51,7 +51,6 @@
</span><span class="cx"> ("opengl", []),
</span><span class="cx"> ("opentype", []),
</span><span class="cx"> ("openvg", []),
</span><del>- ("wince", []),
</del><span class="cx"> ("wx", []),
</span><span class="cx">
</span><span class="cx"> # Directories that should trigger builds on only some bots.
</span><span class="lines">@@ -84,7 +83,6 @@
</span><span class="cx"> (r"/LICENSE[^/]+$", []),
</span><span class="cx"> (r"ARM(?:v7)?\.(?:cpp|h)$", []),
</span><span class="cx"> (r"MIPS\.(?:cpp|h)$", []),
</span><del>- (r"WinCE\.(?:cpp|h|mm)$", []),
</del><span class="cx"> (r"\.(?:bkl|mk)$", []),
</span><span class="cx">
</span><span class="cx"> # Patterns that should trigger builds on only some bots.
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigwkbuild_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -49,7 +49,6 @@
</span><span class="cx"> (["Source/WebCore/platform/graphics/gpu/foo"], ["mac-leopard", "mac-lion", "mac-mountainlion", "mac-snowleopard"]),
</span><span class="cx"> (["Source/WebCore/platform/wx/wxcode/win/foo"], []),
</span><span class="cx"> (["Source/WebCore/rendering/RenderThemeMac.mm", "Source/WebCore/rendering/RenderThemeMac.h"], ["mac-leopard", "mac-lion", "mac-mountainlion", "mac-snowleopard"]),
</span><del>- (["Source/WebCore/rendering/RenderThemeWinCE.h"], []),
</del><span class="cx"> (["Tools/BuildSlaveSupport/build.webkit.org-config/public_html/LeaksViewer/LeaksViewer.js"], []),
</span><span class="cx"> ]
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/CMakeLists.txt (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/CMakeLists.txt 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Tools/CMakeLists.txt 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -16,8 +16,6 @@
</span><span class="cx"> if (ENABLE_X11_TARGET)
</span><span class="cx"> add_subdirectory(DumpRenderTree/TestNetscapePlugIn)
</span><span class="cx"> endif ()
</span><del>-elseif ("${PORT}" STREQUAL "WinCE")
- add_subdirectory(WinCELauncher)
</del><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> if (ENABLE_WEBKIT2 AND ENABLE_API_TESTS)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Tools/ChangeLog 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,3 +1,39 @@
</span><ins>+2014-09-25 Csaba Osztrogonác <ossy@webkit.org>
+
+ Remove WinCE port from trunk
+ https://bugs.webkit.org/show_bug.cgi?id=136951
+
+ Reviewed by Alex Christensen.
+
+ * BuildSlaveSupport/build.webkit.org-config/wkbuild.py:
+ (_should_file_trigger_build):
+ * BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py:
+ (ShouldBuildTest):
+ * CMakeLists.txt:
+ * DumpRenderTree/win/DRTDataObject.cpp:
+ (DRTDataObject::CopyMedium):
+ * Scripts/build-webkit:
+ * Scripts/webkit-build-directory:
+ * Scripts/webkitdirs.pm:
+ (argumentsForConfiguration):
+ (builtDylibPathForName):
+ (isAppleWinWebKit):
+ (launcherPath):
+ (launcherName):
+ (shouldRemoveCMakeCache):
+ (cmakeBasedPortArguments):
+ (cmakeBasedPortName):
+ (isCMakeBuild):
+ (isWinCE): Deleted.
+ (determineIsWinCE): Deleted.
+ * Scripts/webkitperl/FeatureList.pm:
+ * Scripts/webkitpy/port/port_testcase.py:
+ (test_apache_config_file_name_for_platform):
+ * TestWebKitAPI/config.h:
+ * WinCELauncher/CMakeLists.txt: Removed.
+ * WinCELauncher/main.cpp: Removed.
+ * gtk/manifest.txt:
+
</ins><span class="cx"> 2014-09-23 David Farler <dfarler@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] run-webkit-tests should support minor versions under devices and create a testing device under the right runtime
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreewinDRTDataObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/win/DRTDataObject.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/win/DRTDataObject.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Tools/DumpRenderTree/win/DRTDataObject.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -269,7 +269,6 @@
</span><span class="cx"> void DRTDataObject::CopyMedium(STGMEDIUM* pMedDest, STGMEDIUM* pMedSrc, FORMATETC* pFmtSrc)
</span><span class="cx"> {
</span><span class="cx"> switch (pMedSrc->tymed) {
</span><del>-#if !OS(WINCE)
</del><span class="cx"> case TYMED_HGLOBAL:
</span><span class="cx"> pMedDest->hGlobal = static_cast<HGLOBAL>(OleDuplicateData(pMedSrc->hGlobal, pFmtSrc->cfFormat, 0));
</span><span class="cx"> break;
</span><span class="lines">@@ -285,7 +284,6 @@
</span><span class="cx"> case TYMED_FILE:
</span><span class="cx"> pMedSrc->lpszFileName = static_cast<LPOLESTR>(OleDuplicateData(pMedSrc->lpszFileName, pFmtSrc->cfFormat, 0));
</span><span class="cx"> break;
</span><del>-#endif
</del><span class="cx"> case TYMED_ISTREAM:
</span><span class="cx"> pMedDest->pstm = pMedSrc->pstm;
</span><span class="cx"> pMedSrc->pstm->AddRef();
</span></span></pre></div>
<a id="trunkToolsScriptsbuildwebkit"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/build-webkit (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/build-webkit 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Tools/Scripts/build-webkit 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -96,7 +96,6 @@
</span><span class="cx"> --efl Build the EFL port
</span><span class="cx"> --gtk Build the GTK+ port
</span><span class="cx"> --wincairo Build using Cairo (rather than CoreGraphics) on Windows
</span><del>- --wince Build the WinCE port
</del><span class="cx">
</span><span class="cx"> --inspector-frontend Copy Web Inspector user interface resources to the build directory
</span><span class="cx">
</span><span class="lines">@@ -230,11 +229,9 @@
</span><span class="cx"> if (isCMakeBuild()) {
</span><span class="cx">
</span><span class="cx"> # By default we build using all of the available CPUs.
</span><del>- if (!isWinCE()) {
- $makeArgs .= ($makeArgs ? " " : "") . "-j" . numberOfCPUs() if $makeArgs !~ /-j\s*\d+/;
- my $maxCPULoad = maxCPULoad() if $makeArgs !~ /-l\s*\d+\.?\d*/;
- $makeArgs .= " -l" . maxCPULoad() if defined $maxCPULoad;
- }
</del><ins>+ $makeArgs .= ($makeArgs ? " " : "") . "-j" . numberOfCPUs() if $makeArgs !~ /-j\s*\d+/;
+ my $maxCPULoad = maxCPULoad() if $makeArgs !~ /-l\s*\d+\.?\d*/;
+ $makeArgs .= " -l" . maxCPULoad() if defined $maxCPULoad;
</ins><span class="cx">
</span><span class="cx"> # We remove CMakeCache to avoid the bots to reuse cached flags when
</span><span class="cx"> # we enable new features. This forces a reconfiguration.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitbuilddirectory"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkit-build-directory (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkit-build-directory 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Tools/Scripts/webkit-build-directory 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -50,7 +50,6 @@
</span><span class="cx"> --efl Find the build directory for the EFL port
</span><span class="cx"> --gtk Find the build directory for the GTK+ port
</span><span class="cx"> --wincairo Find the build directory for using Cairo (rather than CoreGraphics) on Windows
</span><del>- --wince Find the build directory for the WinCE port
</del><span class="cx">
</span><span class="cx"> Either --configuration or --top-level is required.
</span><span class="cx"> EOF
</span></span></pre></div>
<a id="trunkToolsScriptswebkitdirspm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitdirs.pm (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitdirs.pm 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Tools/Scripts/webkitdirs.pm 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -106,7 +106,6 @@
</span><span class="cx"> my $osXVersion;
</span><span class="cx"> my $generateDsym;
</span><span class="cx"> my $isGtk;
</span><del>-my $isWinCE;
</del><span class="cx"> my $isWinCairo;
</span><span class="cx"> my $isWin64;
</span><span class="cx"> my $isEfl;
</span><span class="lines">@@ -397,7 +396,6 @@
</span><span class="cx"> push(@args, '--gtk') if isGtk();
</span><span class="cx"> push(@args, '--efl') if isEfl();
</span><span class="cx"> push(@args, '--wincairo') if isWinCairo();
</span><del>- push(@args, '--wince') if isWinCE();
</del><span class="cx"> push(@args, '--inspector-frontend') if isInspectorFrontend();
</span><span class="cx"> return @args;
</span><span class="cx"> }
</span><span class="lines">@@ -811,9 +809,6 @@
</span><span class="cx"> if (isEfl()) {
</span><span class="cx"> return "$configurationProductDir/lib/libewebkit2.so";
</span><span class="cx"> }
</span><del>- if (isWinCE()) {
- return "$configurationProductDir/$libraryName";
- }
</del><span class="cx"> if (isIOSWebKit()) {
</span><span class="cx"> return "$configurationProductDir/$libraryName.framework/$libraryName";
</span><span class="cx"> }
</span><span class="lines">@@ -962,18 +957,6 @@
</span><span class="cx"> return $isGtk;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-sub isWinCE()
-{
- determineIsWinCE();
- return $isWinCE;
-}
-
-sub determineIsWinCE()
-{
- return if defined($isWinCE);
- $isWinCE = checkForArgumentAndRemoveFromARGV("--wince");
-}
-
</del><span class="cx"> # Determine if this is debian, ubuntu, linspire, or something similar.
</span><span class="cx"> sub isDebianBased()
</span><span class="cx"> {
</span><span class="lines">@@ -1110,7 +1093,7 @@
</span><span class="cx">
</span><span class="cx"> sub isAppleWinWebKit()
</span><span class="cx"> {
</span><del>- return (isCygwin() || isWindows()) && !isWinCairo() && !isGtk() && !isWinCE();
</del><ins>+ return (isCygwin() || isWindows()) && !isWinCairo() && !isGtk();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub iOSSimulatorDevicesPath
</span><span class="lines">@@ -1343,7 +1326,7 @@
</span><span class="cx"> sub launcherPath()
</span><span class="cx"> {
</span><span class="cx"> my $relativeScriptsPath = relativeScriptsDir();
</span><del>- if (isGtk() || isEfl() || isWinCE()) {
</del><ins>+ if (isGtk() || isEfl()) {
</ins><span class="cx"> return "$relativeScriptsPath/run-launcher";
</span><span class="cx"> } elsif (isAppleWebKit()) {
</span><span class="cx"> return "$relativeScriptsPath/run-safari";
</span><span class="lines">@@ -1358,8 +1341,6 @@
</span><span class="cx"> return "Safari";
</span><span class="cx"> } elsif (isAppleWinWebKit()) {
</span><span class="cx"> return "WinLauncher";
</span><del>- } elsif (isWinCE()) {
- return "WinCELauncher";
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1700,9 +1681,6 @@
</span><span class="cx"> sub shouldRemoveCMakeCache(@)
</span><span class="cx"> {
</span><span class="cx"> my ($cacheFilePath, @buildArgs) = @_;
</span><del>- if (isWinCE()) {
- return 0;
- }
</del><span class="cx">
</span><span class="cx"> if (!isGtk()) {
</span><span class="cx"> return 1;
</span><span class="lines">@@ -1894,21 +1872,19 @@
</span><span class="cx">
</span><span class="cx"> sub cmakeBasedPortArguments()
</span><span class="cx"> {
</span><del>- return ('-G "Visual Studio 8 2005 STANDARDSDK_500 (ARMV4I)"') if isWinCE();
</del><span class="cx"> return ();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub cmakeBasedPortName()
</span><span class="cx"> {
</span><span class="cx"> return "Efl" if isEfl();
</span><del>- return "WinCE" if isWinCE();
</del><span class="cx"> return "GTK" if isGtk();
</span><span class="cx"> return "";
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub isCMakeBuild()
</span><span class="cx"> {
</span><del>- return isEfl() || isWinCE() || isGtk();
</del><ins>+ return isEfl() || isGtk();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub promptUser
</span></span></pre></div>
<a id="trunkToolsScriptswebkitperlFeatureListpm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitperl/FeatureList.pm (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitperl/FeatureList.pm 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Tools/Scripts/webkitperl/FeatureList.pm 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -231,7 +231,7 @@
</span><span class="cx"> define => "ENABLE_FONT_LOAD_EVENTS", default => 0, value => \$fontLoadEventsSupport },
</span><span class="cx">
</span><span class="cx"> { option => "ftpdir", desc => "Toggle FTP Directory support",
</span><del>- define => "ENABLE_FTPDIR", default => !isWinCE(), value => \$ftpDirSupport },
</del><ins>+ define => "ENABLE_FTPDIR", default => 1, value => \$ftpDirSupport },
</ins><span class="cx">
</span><span class="cx"> { option => "fullscreen-api", desc => "Toggle Fullscreen API support",
</span><span class="cx"> define => "ENABLE_FULLSCREEN_API", default => (isAppleMacWebKit() || isEfl() || isGtk()), value => \$fullscreenAPISupport },
</span><span class="lines">@@ -276,7 +276,7 @@
</span><span class="cx"> define => "ENABLE_INPUT_TYPE_WEEK", default => 0, value => \$inputTypeWeekSupport },
</span><span class="cx">
</span><span class="cx"> { option => "inspector", desc => "Toggle Inspector support",
</span><del>- define => "ENABLE_INSPECTOR", default => !isWinCE(), value => \$inspectorSupport },
</del><ins>+ define => "ENABLE_INSPECTOR", default => 1, value => \$inspectorSupport },
</ins><span class="cx">
</span><span class="cx"> { option => "legacy-notifications", desc => "Toggle Legacy Notifications support",
</span><span class="cx"> define => "ENABLE_LEGACY_NOTIFICATIONS", default => 0, value => \$legacyNotificationsSupport },
</span><span class="lines">@@ -378,7 +378,7 @@
</span><span class="cx"> define => "ENABLE_SVG_FONTS", default => 1, value => \$svgFontsSupport },
</span><span class="cx">
</span><span class="cx"> { option => "system-malloc", desc => "Toggle system allocator instead of TCmalloc",
</span><del>- define => "USE_SYSTEM_MALLOC", default => isWinCE(), value => \$systemMallocSupport },
</del><ins>+ define => "USE_SYSTEM_MALLOC", default => 0, value => \$systemMallocSupport },
</ins><span class="cx">
</span><span class="cx"> { option => "template-element", desc => "Toggle HTMLTemplateElement support",
</span><span class="cx"> define => "ENABLE_TEMPLATE_ELEMENT", default => 1, value => \$templateElementSupport },
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportport_testcasepy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/port_testcase.py (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/port_testcase.py 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Tools/Scripts/webkitpy/port/port_testcase.py 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -570,7 +570,7 @@
</span><span class="cx"> self._assert_config_file_for_platform(port, 'linux2', 'debian-httpd-2.2.conf')
</span><span class="cx">
</span><span class="cx"> self._assert_config_file_for_platform(port, 'mac', 'apache2.2-httpd.conf')
</span><del>- self._assert_config_file_for_platform(port, 'win32', 'apache2.2-httpd.conf') # win32 isn't a supported sys.platform. AppleWin/WinCairo/WinCE ports all use cygwin.
</del><ins>+ self._assert_config_file_for_platform(port, 'win32', 'apache2.2-httpd.conf') # win32 isn't a supported sys.platform. AppleWin/WinCairo ports all use cygwin.
</ins><span class="cx"> self._assert_config_file_for_platform(port, 'barf', 'apache2.2-httpd.conf')
</span><span class="cx">
</span><span class="cx"> def test_path_to_apache_config_file(self):
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIconfigh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/config.h (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/config.h 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Tools/TestWebKitAPI/config.h 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> #ifndef _WINSOCKAPI_
</span><span class="cx"> #define _WINSOCKAPI_ // Prevent inclusion of winsock.h in windows.h
</span><span class="cx"> #endif
</span><del>-#elif !OS(WINCE)
</del><ins>+#else
</ins><span class="cx"> #define WTF_USE_CG 1
</span><span class="cx"> #undef WTF_USE_CAIRO
</span><span class="cx"> #undef WTF_USE_CURL
</span></span></pre></div>
<a id="trunkToolsWinCELauncherCMakeListstxt"></a>
<div class="delfile"><h4>Deleted: trunk/Tools/WinCELauncher/CMakeLists.txt (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WinCELauncher/CMakeLists.txt 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Tools/WinCELauncher/CMakeLists.txt 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,28 +0,0 @@
</span><del>-set(WinCELauncher_INCLUDE_DIRECTORIES
- "${WEBKIT_DIR}/wince"
- "${WEBCORE_DIR}"
- "${WEBCORE_DIR}/platform"
- "${WEBCORE_DIR}/platform/graphics"
- "${WEBCORE_DIR}/platform/network"
- "${WEBCORE_DIR}/platform/text"
- "${JAVASCRIPTCORE_DIR}"
- "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
- "${WTF_DIR}"
- "${DERIVED_SOURCES_DIR}"
- "${CMAKE_BINARY_DIR}"
-)
-
-set(WinCELauncher_SOURCES
- ${TOOLS_DIR}/WinCELauncher/main.cpp
-)
-
-set(WinCELauncher_LIBRARIES
- WebKit
-)
-
-include_directories(${WinCELauncher_INCLUDE_DIRECTORIES})
-add_executable(WinCELauncher WIN32 ${WinCELauncher_SOURCES})
-add_dependencies(WinCELauncher WebKit)
-target_link_libraries(WinCELauncher ${WinCELauncher_LIBRARIES})
-set_target_properties(WinCELauncher PROPERTIES FOLDER "Tools")
-set_target_properties(WinCELauncher PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
</del></span></pre></div>
<a id="trunkToolsWinCELaunchermaincpp"></a>
<div class="delfile"><h4>Deleted: trunk/Tools/WinCELauncher/main.cpp (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WinCELauncher/main.cpp 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Tools/WinCELauncher/main.cpp 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -1,133 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
- *
- * 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 AND ITS CONTRIBUTORS "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 OR ITS 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.
- */
-
-#include "config.h"
-#include "WebView.h"
-#include <windows.h>
-#include <wtf/PassOwnPtr.h>
-
-static const LPCWSTR kMainWindowTitle = L"WebKit for WinCE";
-static const LPCWSTR kMainWindowClassName = L"MainWindowClass";
-
-
-static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
-{
- switch (message) {
- case WM_DESTROY:
- PostQuitMessage(0);
- break;
-
- default:
- return DefWindowProc(hWnd, message, wParam, lParam);
- }
-
- return 0;
-}
-
-int APIENTRY _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow)
-{
- UNREFERENCED_PARAMETER(hPrevInstance);
-
- CoInitializeEx(0, COINIT_MULTITHREADED);
- WebView::initialize(hInstance);
-
- LPCWSTR homeUrl = lpCmdLine;
- bool enableDoubleBuffer = true;
- bool fullscreen = false;
-
- if (homeUrl[0] == '-') {
- for (; *homeUrl && *homeUrl != ' '; ++homeUrl) {
- switch (*homeUrl) {
- case 'd':
- enableDoubleBuffer = false;
- break;
- case 'f':
- fullscreen = true;
- break;
- default:
- break;
- }
- }
- if (*homeUrl)
- ++homeUrl;
- }
-
- DWORD styles = WS_VISIBLE;
-
- if (!fullscreen) {
- styles |= WS_CAPTION
- | WS_MAXIMIZEBOX
- | WS_MINIMIZEBOX
- | WS_OVERLAPPED
- | WS_SYSMENU
- | WS_THICKFRAME;
- }
-
- WNDCLASSW wc;
- wc.style = CS_HREDRAW | CS_VREDRAW;
- wc.lpfnWndProc = WndProc;
- wc.cbClsExtra = 0;
- wc.cbWndExtra = 0;
- wc.hInstance = hInstance;
- wc.hIcon = 0;
- wc.hCursor = 0;
- wc.hbrBackground = static_cast<HBRUSH>(GetStockObject(WHITE_BRUSH));
- wc.lpszMenuName = 0;
- wc.lpszClassName = kMainWindowClassName;
- RegisterClass(&wc);
-
- HWND hMainWindow = CreateWindowW(kMainWindowClassName, kMainWindowTitle, styles,
- CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, 0, 0, hInstance, 0);
-
- if (fullscreen) {
- SetWindowPos(hMainWindow, HWND_TOPMOST, 0, 0, GetSystemMetrics(SM_CXSCREEN),
- GetSystemMetrics(SM_CYSCREEN), SWP_SHOWWINDOW);
- }
-
- ShowWindow(hMainWindow, nCmdShow);
- UpdateWindow(hMainWindow);
-
- WTF::OwnPtr<WebView> webView = WTF::adoptPtr(new WebView(hMainWindow, enableDoubleBuffer ? WebView::EnableDoubleBuffering : WebView::NoFeature));
- webView->load(homeUrl);
-
- // Main message loop:
- MSG msg;
- BOOL bRet;
- while (bRet = GetMessage(&msg, 0, 0, 0)) {
- if (bRet == -1) {
- // FIXME: Handle the error and possibly exit.
- } else {
- TranslateMessage(&msg);
- DispatchMessage(&msg);
- }
- }
-
- webView.clear();
- DestroyWindow(hMainWindow);
-
- WebView::cleanup();
- CoUninitialize();
-
- return msg.wParam;
-}
</del></span></pre></div>
<a id="trunkToolsgtkmanifesttxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/gtk/manifest.txt (173948 => 173949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/manifest.txt 2014-09-25 09:44:05 UTC (rev 173948)
+++ trunk/Tools/gtk/manifest.txt 2014-09-25 10:14:57 UTC (rev 173949)
</span><span class="lines">@@ -4,7 +4,6 @@
</span><span class="cx"> exclude Makefile
</span><span class="cx"> exclude PlatformEfl.cmake
</span><span class="cx"> exclude PlatformWin.cmake
</span><del>-exclude PlatformWinCE.cmake
</del><span class="cx"> exclude tags$
</span><span class="cx"> exclude ~$
</span><span class="cx"> exclude \.#$
</span><span class="lines">@@ -42,7 +41,7 @@
</span><span class="cx"> exclude \.xcodeproj$
</span><span class="cx">
</span><span class="cx"> # Exclude directories from other ports
</span><del>-exclude .*\/(mac|ios|cf|cg|cocoa|Cocoa|objc|avfoundation|ca|curl|efl|win|wince)\/.*$
</del><ins>+exclude .*\/(mac|ios|cf|cg|cocoa|Cocoa|objc|avfoundation|ca|curl|efl|win)\/.*$
</ins><span class="cx">
</span><span class="cx"> directory Source
</span><span class="cx"> exclude Source/JavaScriptCore/tests
</span><span class="lines">@@ -54,7 +53,6 @@
</span><span class="cx"> exclude Source/cmake/EFLHelpers.cmake$
</span><span class="cx"> exclude Source/cmake/OptionsWinCairo.cmake$
</span><span class="cx"> exclude Source/cmake/OptionsWindows.cmake$
</span><del>-exclude Source/cmake/OptionsWinCE.cmake$
</del><span class="cx"> exclude Source/cmake/OptionsAppleWin.cmake$
</span><span class="cx"> exclude Source/cmake/OptionsEfl.cmake$
</span><span class="cx"> exclude Source/cmake/eflsymbols.filter$
</span></span></pre>
</div>
</div>
</body>
</html>