https://bugs.webkit.org/show_bug.cgi?id=106279
Reviewed by Sam Weinig.
* Platform/CoreIPC/BinarySemaphore.cpp:
* Platform/CoreIPC/Connection.cpp:
(CoreIPC::Connection::waitForSyncReply):
* Platform/CoreIPC/Connection.h:
(Client):
* Platform/Module.cpp:
(WebKit::Module::Module):
* Platform/Module.h:
(Module):
* Platform/PlatformProcessIdentifier.h:
(WebKit):
* Shared/CommandLine.h:
(CommandLine):
* Shared/FontSmoothingLevel.h:
* Shared/LayerTreeContext.h:
(LayerTreeContext):
* Shared/NativeWebKeyboardEvent.h:
(NativeWebKeyboardEvent):
* Shared/NativeWebMouseEvent.h:
(NativeWebMouseEvent):
* Shared/NativeWebWheelEvent.h:
(NativeWebWheelEvent):
* Shared/PlatformPopupMenuData.cpp:
(WebKit::PlatformPopupMenuData::PlatformPopupMenuData):
(WebKit::PlatformPopupMenuData::encode):
(WebKit::PlatformPopupMenuData::decode):
* Shared/PlatformPopupMenuData.h:
(PlatformPopupMenuData):
* Shared/Plugins/PluginModuleInfo.h:
(PluginModuleInfo):
(WebKit::PluginModuleInfo::isolatedCopy):
* Shared/ShareableBitmap.h:
(ShareableBitmap):
* Shared/WebCoreArgumentCoders.h:
* Shared/WebEvent.h:
(WebMouseEvent):
* Shared/WebEventConversion.cpp:
(WebKit::WebKit2PlatformMouseEvent::WebKit2PlatformMouseEvent):
* Shared/WebMouseEvent.cpp:
(WebKit::WebMouseEvent::WebMouseEvent):
(WebKit::WebMouseEvent::encode):
(WebKit::WebMouseEvent::decode):
* Shared/WebPageCreationParameters.cpp:
(WebKit::WebPageCreationParameters::encode):
(WebKit::WebPageCreationParameters::decode):
* Shared/WebPageCreationParameters.h:
(WebPageCreationParameters):
* Shared/WebPreferencesStore.h:
(WebKit):
* Shared/WebProcessCreationParameters.cpp:
(WebKit::WebProcessCreationParameters::WebProcessCreationParameters):
(WebKit::WebProcessCreationParameters::encode):
(WebKit::WebProcessCreationParameters::decode):
* Shared/WebProcessCreationParameters.h:
(WebProcessCreationParameters):
* Shared/WebURLRequest.h:
* Shared/WebURLResponse.h:
* Shared/cg/ShareableBitmapCG.cpp:
(WebKit::ShareableBitmap::makeCGImageCopy):
* UIProcess/API/C/WKAPICast.h:
(WebKit::toFontSmoothingLevel):
(WebKit::toAPI):
* UIProcess/API/C/WKPage.cpp:
* UIProcess/BackingStore.h:
(BackingStore):
* UIProcess/PageClient.h:
(WebKit):
(PageClient):
* UIProcess/WebContext.cpp:
(WebKit::WebContext::WebContext):
* UIProcess/WebContext.h:
(WebContext):
* UIProcess/WebFullScreenManagerProxy.h:
(WebKit):
* UIProcess/WebInspectorProxy.cpp:
(WebKit::WebInspectorProxy::WebInspectorProxy):
* UIProcess/WebInspectorProxy.h:
(WebInspectorProxy):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::performDragControllerAction):
(WebKit::WebPageProxy::didReceiveEvent):
(WebKit::WebPageProxy::creationParameters):
(WebKit):
* UIProcess/WebPageProxy.h:
(WebKit):
(WebPageProxy):
* UIProcess/WebPageProxy.messages.in:
* UIProcess/WebProcessProxy.h:
(WebProcessProxy):
* WebKit2Prefix.h:
* WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp:
(WKBundleFrameCopyWebArchiveFilteringSubframes):
* WebProcess/InjectedBundle/InjectedBundle.cpp:
(WebKit::InjectedBundle::setPrivateBrowsingEnabled):
(WebKit::InjectedBundle::switchNetworkLoaderToNewTestingSession):
* WebProcess/InjectedBundle/InjectedBundle.h:
(WebKit):
(InjectedBundle):
* WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
(WebKit::NPN_GetValue):
* WebProcess/Plugins/Netscape/NetscapePlugin.h:
(NetscapePlugin):
* WebProcess/Plugins/PluginController.h:
(PluginController):
* WebProcess/Plugins/PluginView.cpp:
* WebProcess/Plugins/PluginView.h:
(PluginView):
* WebProcess/ResourceCache/cf/WebResourceCacheManagerCFNet.cpp:
* WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::selectItemWritingDirectionIsNatural):
(WebKit::WebChromeClient::selectItemAlignmentFollowsMenuWritingDirection):
(WebKit):
* WebProcess/WebCoreSupport/WebChromeClient.h:
(WebChromeClient):
* WebProcess/WebCoreSupport/WebDragClient.cpp:
(WebKit):
* WebProcess/WebCoreSupport/WebEditorClient.cpp:
(WebKit::WebEditorClient::respondToChangedSelection):
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit):
* WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
(WebFrameLoaderClient):
* WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
* WebProcess/WebCoreSupport/WebPopupMenu.cpp:
(WebKit::WebPopupMenu::updateFromElement):
* WebProcess/WebKitMain.cpp:
* WebProcess/WebPage/DrawingArea.h:
(WebKit):
(DrawingArea):
* WebProcess/WebPage/DrawingAreaImpl.cpp:
(WebKit::DrawingAreaImpl::createGraphicsContext):
* WebProcess/WebPage/DrawingAreaImpl.h:
(DrawingAreaImpl):
* WebProcess/WebPage/LayerTreeHost.cpp:
(WebKit::LayerTreeHost::create):
* WebProcess/WebPage/LayerTreeHost.h:
(WebCore):
(WebKit):
(LayerTreeHost):
* WebProcess/WebPage/WebFrame.cpp:
(WebKit):
* WebProcess/WebPage/WebFrame.h:
(WebFrame):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::WebPage):
(WebKit::WebPage::installPageOverlay):
(WebKit::WebPage::uninstallPageOverlay):
(WebKit::WebPage::getWebArchiveOfFrame):
(WebKit):
* WebProcess/WebPage/WebPage.h:
(WebPage):
* WebProcess/WebPage/WebPage.messages.in:
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::initializeWebProcess):
(WebKit::WebProcess::ensurePrivateBrowsingSession):
(WebKit::WebProcess::destroyPrivateBrowsingSession):
* WebProcess/WebProcess.h:
(WebProcess):
* WebProcess/WebProcess.messages.in:
* config.h:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@139023
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+2013-01-07 Anders Carlsson <andersca@apple.com>
+
+ Remove PLATFORM(WIN) #ifdefs
+ https://bugs.webkit.org/show_bug.cgi?id=106279
+
+ Reviewed by Sam Weinig.
+
+ * Platform/CoreIPC/BinarySemaphore.cpp:
+ * Platform/CoreIPC/Connection.cpp:
+ (CoreIPC::Connection::waitForSyncReply):
+ * Platform/CoreIPC/Connection.h:
+ (Client):
+ * Platform/Module.cpp:
+ (WebKit::Module::Module):
+ * Platform/Module.h:
+ (Module):
+ * Platform/PlatformProcessIdentifier.h:
+ (WebKit):
+ * Shared/CommandLine.h:
+ (CommandLine):
+ * Shared/FontSmoothingLevel.h:
+ * Shared/LayerTreeContext.h:
+ (LayerTreeContext):
+ * Shared/NativeWebKeyboardEvent.h:
+ (NativeWebKeyboardEvent):
+ * Shared/NativeWebMouseEvent.h:
+ (NativeWebMouseEvent):
+ * Shared/NativeWebWheelEvent.h:
+ (NativeWebWheelEvent):
+ * Shared/PlatformPopupMenuData.cpp:
+ (WebKit::PlatformPopupMenuData::PlatformPopupMenuData):
+ (WebKit::PlatformPopupMenuData::encode):
+ (WebKit::PlatformPopupMenuData::decode):
+ * Shared/PlatformPopupMenuData.h:
+ (PlatformPopupMenuData):
+ * Shared/Plugins/PluginModuleInfo.h:
+ (PluginModuleInfo):
+ (WebKit::PluginModuleInfo::isolatedCopy):
+ * Shared/ShareableBitmap.h:
+ (ShareableBitmap):
+ * Shared/WebCoreArgumentCoders.h:
+ * Shared/WebEvent.h:
+ (WebMouseEvent):
+ * Shared/WebEventConversion.cpp:
+ (WebKit::WebKit2PlatformMouseEvent::WebKit2PlatformMouseEvent):
+ * Shared/WebMouseEvent.cpp:
+ (WebKit::WebMouseEvent::WebMouseEvent):
+ (WebKit::WebMouseEvent::encode):
+ (WebKit::WebMouseEvent::decode):
+ * Shared/WebPageCreationParameters.cpp:
+ (WebKit::WebPageCreationParameters::encode):
+ (WebKit::WebPageCreationParameters::decode):
+ * Shared/WebPageCreationParameters.h:
+ (WebPageCreationParameters):
+ * Shared/WebPreferencesStore.h:
+ (WebKit):
+ * Shared/WebProcessCreationParameters.cpp:
+ (WebKit::WebProcessCreationParameters::WebProcessCreationParameters):
+ (WebKit::WebProcessCreationParameters::encode):
+ (WebKit::WebProcessCreationParameters::decode):
+ * Shared/WebProcessCreationParameters.h:
+ (WebProcessCreationParameters):
+ * Shared/WebURLRequest.h:
+ * Shared/WebURLResponse.h:
+ * Shared/cg/ShareableBitmapCG.cpp:
+ (WebKit::ShareableBitmap::makeCGImageCopy):
+ * UIProcess/API/C/WKAPICast.h:
+ (WebKit::toFontSmoothingLevel):
+ (WebKit::toAPI):
+ * UIProcess/API/C/WKPage.cpp:
+ * UIProcess/BackingStore.h:
+ (BackingStore):
+ * UIProcess/PageClient.h:
+ (WebKit):
+ (PageClient):
+ * UIProcess/WebContext.cpp:
+ (WebKit::WebContext::WebContext):
+ * UIProcess/WebContext.h:
+ (WebContext):
+ * UIProcess/WebFullScreenManagerProxy.h:
+ (WebKit):
+ * UIProcess/WebInspectorProxy.cpp:
+ (WebKit::WebInspectorProxy::WebInspectorProxy):
+ * UIProcess/WebInspectorProxy.h:
+ (WebInspectorProxy):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::performDragControllerAction):
+ (WebKit::WebPageProxy::didReceiveEvent):
+ (WebKit::WebPageProxy::creationParameters):
+ (WebKit):
+ * UIProcess/WebPageProxy.h:
+ (WebKit):
+ (WebPageProxy):
+ * UIProcess/WebPageProxy.messages.in:
+ * UIProcess/WebProcessProxy.h:
+ (WebProcessProxy):
+ * WebKit2Prefix.h:
+ * WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp:
+ (WKBundleFrameCopyWebArchiveFilteringSubframes):
+ * WebProcess/InjectedBundle/InjectedBundle.cpp:
+ (WebKit::InjectedBundle::setPrivateBrowsingEnabled):
+ (WebKit::InjectedBundle::switchNetworkLoaderToNewTestingSession):
+ * WebProcess/InjectedBundle/InjectedBundle.h:
+ (WebKit):
+ (InjectedBundle):
+ * WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
+ (WebKit::NPN_GetValue):
+ * WebProcess/Plugins/Netscape/NetscapePlugin.h:
+ (NetscapePlugin):
+ * WebProcess/Plugins/PluginController.h:
+ (PluginController):
+ * WebProcess/Plugins/PluginView.cpp:
+ * WebProcess/Plugins/PluginView.h:
+ (PluginView):
+ * WebProcess/ResourceCache/cf/WebResourceCacheManagerCFNet.cpp:
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ (WebKit::WebChromeClient::selectItemWritingDirectionIsNatural):
+ (WebKit::WebChromeClient::selectItemAlignmentFollowsMenuWritingDirection):
+ (WebKit):
+ * WebProcess/WebCoreSupport/WebChromeClient.h:
+ (WebChromeClient):
+ * WebProcess/WebCoreSupport/WebDragClient.cpp:
+ (WebKit):
+ * WebProcess/WebCoreSupport/WebEditorClient.cpp:
+ (WebKit::WebEditorClient::respondToChangedSelection):
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit):
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
+ (WebFrameLoaderClient):
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
+ * WebProcess/WebCoreSupport/WebPopupMenu.cpp:
+ (WebKit::WebPopupMenu::updateFromElement):
+ * WebProcess/WebKitMain.cpp:
+ * WebProcess/WebPage/DrawingArea.h:
+ (WebKit):
+ (DrawingArea):
+ * WebProcess/WebPage/DrawingAreaImpl.cpp:
+ (WebKit::DrawingAreaImpl::createGraphicsContext):
+ * WebProcess/WebPage/DrawingAreaImpl.h:
+ (DrawingAreaImpl):
+ * WebProcess/WebPage/LayerTreeHost.cpp:
+ (WebKit::LayerTreeHost::create):
+ * WebProcess/WebPage/LayerTreeHost.h:
+ (WebCore):
+ (WebKit):
+ (LayerTreeHost):
+ * WebProcess/WebPage/WebFrame.cpp:
+ (WebKit):
+ * WebProcess/WebPage/WebFrame.h:
+ (WebFrame):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::WebPage):
+ (WebKit::WebPage::installPageOverlay):
+ (WebKit::WebPage::uninstallPageOverlay):
+ (WebKit::WebPage::getWebArchiveOfFrame):
+ (WebKit):
+ * WebProcess/WebPage/WebPage.h:
+ (WebPage):
+ * WebProcess/WebPage/WebPage.messages.in:
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::initializeWebProcess):
+ (WebKit::WebProcess::ensurePrivateBrowsingSession):
+ (WebKit::WebProcess::destroyPrivateBrowsingSession):
+ * WebProcess/WebProcess.h:
+ (WebProcess):
+ * WebProcess/WebProcess.messages.in:
+ * config.h:
+
2013-01-07 Alexey Proskuryakov <ap@apple.com>
[WK2] Delete more obsolete Keychain code
namespace CoreIPC {
-#if !PLATFORM(WIN)
-
BinarySemaphore::BinarySemaphore()
: m_isSet(false)
{
return true;
}
-#endif // !PLATFORM(WIN)
-
} // namespace CoreIPC
return m_waitForSyncReplySemaphore.wait(absoluteTime);
}
-#if PLATFORM(WIN)
- bool waitWhileDispatchingSentWin32Messages(double absoluteTime, const Vector<HWND>& windowsToReceiveMessages)
- {
- return Connection::dispatchSentMessagesUntil(windowsToReceiveMessages, m_waitForSyncReplySemaphore, absoluteTime);
- }
-#endif
-
// Returns true if this message will be handled on a client thread that is currently
// waiting for a reply to a synchronous message.
bool processIncomingMessage(Connection*, IncomingMessage&);
return nullptr;
// We didn't find a sync reply yet, keep waiting.
-#if PLATFORM(WIN)
- timedOut = !m_syncMessageState->waitWhileDispatchingSentWin32Messages(absoluteTime, m_client->windowsToReceiveSentMessagesWhileWaitingForSyncReply());
-#else
-
- // This allows the WebProcess to still serve clients while waiting for the message to return.
+ // This allows the WebProcess to still serve clients while waiting for the message to return.
// Notably, it can continue to process accessibility requests, which are on the main thread.
if (syncSendFlags & SpinRunLoopWhileWaitingForReply) {
#if PLATFORM(MAC)
#endif
} else
timedOut = !m_syncMessageState->wait(absoluteTime);
-#endif
}
#if HAVE(XPC)
#include <xpc/xpc.h>
#endif
-#elif PLATFORM(WIN)
-#include <string>
#elif PLATFORM(QT)
QT_BEGIN_NAMESPACE
class QSocketNotifier;
virtual void didClose(Connection*) = 0;
virtual void didReceiveInvalidMessage(Connection*, StringReference messageReceiverName, StringReference messageName) = 0;
-#if PLATFORM(WIN)
- virtual Vector<HWND> windowsToReceiveSentMessagesWhileWaitingForSyncReply() = 0;
-#endif
-
protected:
virtual ~Client() { }
};
Module::Module(const String& path)
: m_path(path)
-#if PLATFORM(WIN)
- , m_module(0)
-#endif
#if PLATFORM(MAC) && !defined(__LP64__)
, m_bundleResourceMap(-1)
#endif
CFBundleRefNum bundleResourceMap();
#endif
-#if PLATFORM(WIN)
- void installIATHook(const char* importDLLName, const char* importFunctionName, const void* hookFunction);
-#endif
-
private:
void* platformFunctionPointer(const char* functionName) const;
#if !defined(__LP64__)
CFBundleRefNum m_bundleResourceMap;
#endif
-#elif PLATFORM(WIN)
- HMODULE m_module;
#elif PLATFORM(QT)
QLibrary m_lib;
#elif PLATFORM(GTK)
#if PLATFORM(MAC)
typedef pid_t PlatformProcessIdentifier;
-#elif PLATFORM(WIN)
-typedef HANDLE PlatformProcessIdentifier;
#elif PLATFORM(QT)
typedef QProcess* PlatformProcessIdentifier;
#elif PLATFORM(GTK)
public:
#if PLATFORM(MAC)
bool parse(int argc, char** argv);
-#elif PLATFORM(WIN)
- bool parse(LPTSTR commandLineString);
#endif
String operator[](const String& key) const
{
FontSmoothingLevelLight = 1,
FontSmoothingLevelMedium = 2,
FontSmoothingLevelStrong = 3,
-#if PLATFORM(WIN)
- FontSmoothingLevelWindows = 4,
-#endif
};
} // namespace WebKit
#if PLATFORM(MAC)
uint32_t contextID;
-#elif PLATFORM(WIN)
- HWND window;
#elif PLATFORM(QT)
uint32_t coordinatedLayerID;
#elif PLATFORM(GTK)
public:
#if USE(APPKIT)
NativeWebKeyboardEvent(NSEvent *, NSView *);
-#elif PLATFORM(WIN)
- NativeWebKeyboardEvent(HWND, UINT message, WPARAM, LPARAM);
#elif PLATFORM(QT)
explicit NativeWebKeyboardEvent(QKeyEvent*);
#elif PLATFORM(GTK)
#if USE(APPKIT)
NSEvent *nativeEvent() const { return m_nativeEvent.get(); }
-#elif PLATFORM(WIN)
- const MSG* nativeEvent() const { return &m_nativeEvent; }
#elif PLATFORM(QT)
const QKeyEvent* nativeEvent() const { return &m_nativeEvent; }
#elif PLATFORM(GTK)
private:
#if USE(APPKIT)
RetainPtr<NSEvent> m_nativeEvent;
-#elif PLATFORM(WIN)
- MSG m_nativeEvent;
#elif PLATFORM(QT)
QKeyEvent m_nativeEvent;
#elif PLATFORM(GTK)
public:
#if USE(APPKIT)
NativeWebMouseEvent(NSEvent *, NSView *);
-#elif PLATFORM(WIN)
- NativeWebMouseEvent(HWND, UINT message, WPARAM, LPARAM, bool);
#elif PLATFORM(QT)
explicit NativeWebMouseEvent(QMouseEvent*, const QTransform& fromItemTransform, int eventClickCount);
#elif PLATFORM(GTK)
#if USE(APPKIT)
NSEvent* nativeEvent() const { return m_nativeEvent.get(); }
-#elif PLATFORM(WIN)
- const MSG* nativeEvent() const { return &m_nativeEvent; }
#elif PLATFORM(QT)
const QMouseEvent* nativeEvent() const { return m_nativeEvent; }
#elif PLATFORM(GTK)
private:
#if USE(APPKIT)
RetainPtr<NSEvent> m_nativeEvent;
-#elif PLATFORM(WIN)
- MSG m_nativeEvent;
#elif PLATFORM(QT)
QMouseEvent* m_nativeEvent;
#elif PLATFORM(GTK)
public:
#if USE(APPKIT)
NativeWebWheelEvent(NSEvent *, NSView *);
-#elif PLATFORM(WIN)
- NativeWebWheelEvent(HWND, UINT message, WPARAM, LPARAM);
#elif PLATFORM(QT)
explicit NativeWebWheelEvent(QWheelEvent*, const QTransform& fromItemTransform);
#elif PLATFORM(GTK)
#if USE(APPKIT)
NSEvent* nativeEvent() const { return m_nativeEvent.get(); }
-#elif PLATFORM(WIN)
- const MSG* nativeEvent() const { return &m_nativeEvent; }
#elif PLATFORM(QT)
const QWheelEvent* nativeEvent() const { return m_nativeEvent; }
#elif PLATFORM(GTK)
private:
#if USE(APPKIT)
RetainPtr<NSEvent> m_nativeEvent;
-#elif PLATFORM(WIN)
- MSG m_nativeEvent;
#elif PLATFORM(QT)
QWheelEvent* m_nativeEvent;
#elif PLATFORM(GTK)
namespace WebKit {
PlatformPopupMenuData::PlatformPopupMenuData()
-#if PLATFORM(WIN)
- : m_clientPaddingLeft(0)
- , m_clientPaddingRight(0)
- , m_clientInsetLeft(0)
- , m_clientInsetRight(0)
- , m_popupWidth(0)
- , m_itemHeight(0)
-#elif PLATFORM(QT)
+#if PLATFORM(QT)
: multipleSelections(false)
#endif
{
void PlatformPopupMenuData::encode(CoreIPC::ArgumentEncoder& encoder) const
{
-#if PLATFORM(WIN)
- encoder << m_clientPaddingLeft;
- encoder << m_clientPaddingRight;
- encoder << m_clientInsetLeft;
- encoder << m_clientInsetRight;
- encoder << m_popupWidth;
- encoder << m_itemHeight;
-
- ShareableBitmap::Handle notSelectedBackingStoreHandle;
- m_notSelectedBackingStore->createHandle(notSelectedBackingStoreHandle);
- encoder << notSelectedBackingStoreHandle;
-
- ShareableBitmap::Handle selectedBackingStoreHandle;
- m_selectedBackingStore->createHandle(selectedBackingStoreHandle);
- encoder << selectedBackingStoreHandle;
-#elif PLATFORM(MAC)
+#if PLATFORM(MAC)
encoder << fontInfo;
encoder << shouldPopOver;
#elif PLATFORM(QT)
bool PlatformPopupMenuData::decode(CoreIPC::ArgumentDecoder* decoder, PlatformPopupMenuData& data)
{
-#if PLATFORM(WIN)
- if (!decoder->decode(data.m_clientPaddingLeft))
- return false;
- if (!decoder->decode(data.m_clientPaddingRight))
- return false;
- if (!decoder->decode(data.m_clientInsetLeft))
- return false;
- if (!decoder->decode(data.m_clientInsetRight))
- return false;
- if (!decoder->decode(data.m_popupWidth))
- return false;
- if (!decoder->decode(data.m_itemHeight))
- return false;
-
- ShareableBitmap::Handle notSelectedBackingStoreHandle;
- if (!decoder->decode(notSelectedBackingStoreHandle))
- return false;
- data.m_notSelectedBackingStore = ShareableBitmap::create(notSelectedBackingStoreHandle);
-
- ShareableBitmap::Handle selectedBackingStoreHandle;
- if (!decoder->decode(selectedBackingStoreHandle))
- return false;
- data.m_selectedBackingStore = ShareableBitmap::create(selectedBackingStoreHandle);
-#elif PLATFORM(MAC)
+#if PLATFORM(MAC)
if (!decoder->decode(data.fontInfo))
return false;
if (!decoder->decode(data.shouldPopOver))
void encode(CoreIPC::ArgumentEncoder&) const;
static bool decode(CoreIPC::ArgumentDecoder*, PlatformPopupMenuData&);
-#if PLATFORM(WIN)
- int m_clientPaddingLeft;
- int m_clientPaddingRight;
- int m_clientInsetLeft;
- int m_clientInsetRight;
- int m_popupWidth;
- int m_itemHeight;
- RefPtr<ShareableBitmap> m_notSelectedBackingStore;
- RefPtr<ShareableBitmap> m_selectedBackingStore;
-#elif PLATFORM(MAC)
+#if PLATFORM(MAC)
FontInfo fontInfo;
bool shouldPopOver;
#elif PLATFORM(QT)
cpu_type_t pluginArchitecture;
String bundleIdentifier;
String versionString;
-#elif PLATFORM(WIN)
- uint64_t fileVersion;
#endif
PluginModuleInfo isolatedCopy() const
clone.pluginArchitecture = pluginArchitecture;
clone.bundleIdentifier = bundleIdentifier.isolatedCopy();
clone.versionString = versionString.isolatedCopy();
-#elif PLATFORM(WIN)
- clone.fileVersion = fileVersion;
#endif
return clone;
}
// This is only safe to use when we know that the contents of the shareable bitmap won't change.
PassRefPtr<WebCore::Image> createImage();
-#if PLATFORM(WIN)
- HDC windowsContext() const;
-#endif
#if USE(CG)
// This creates a copied CGImageRef (most likely a copy-on-write) of the shareable bitmap.
RetainPtr<CGImageRef> makeCGImageCopy();
// If the shareable bitmap is backed by fastMalloced memory, this points to the data.
void* m_data;
-
-#if PLATFORM(WIN)
- mutable OwnPtr<HDC> m_windowsContext;
- mutable OwnPtr<HBITMAP> m_windowsBitmap;
-#endif
};
} // namespace WebKit
};
template<> struct ArgumentCoder<WebCore::ResourceRequest> {
-#if PLATFORM(MAC) || PLATFORM(WIN)
+#if PLATFORM(MAC)
static const bool kShouldSerializeWebCoreData = false;
#else
static const bool kShouldSerializeWebCoreData = true;
};
template<> struct ArgumentCoder<WebCore::ResourceResponse> {
-#if PLATFORM(MAC) || PLATFORM(WIN)
+#if PLATFORM(MAC)
static const bool kShouldSerializeWebCoreData = false;
#else
static const bool kShouldSerializeWebCoreData = true;
WebMouseEvent();
WebMouseEvent(Type, Button, const WebCore::IntPoint& position, const WebCore::IntPoint& globalPosition, float deltaX, float deltaY, float deltaZ, int clickCount, Modifiers, double timestamp);
-#if PLATFORM(WIN)
- WebMouseEvent(Type, Button, const WebCore::IntPoint& position, const WebCore::IntPoint& globalPosition, float deltaX, float deltaY, float deltaZ, int clickCount, Modifiers, double timestamp, bool didActivateWebView);
-#endif
Button button() const { return static_cast<Button>(m_button); }
const WebCore::IntPoint& position() const { return m_position; }
float deltaY() const { return m_deltaY; }
float deltaZ() const { return m_deltaZ; }
int32_t clickCount() const { return m_clickCount; }
-#if PLATFORM(WIN)
- bool didActivateWebView() const { return m_didActivateWebView; }
-#endif
void encode(CoreIPC::ArgumentEncoder&) const;
static bool decode(CoreIPC::ArgumentDecoder*, WebMouseEvent&);
float m_deltaY;
float m_deltaZ;
int32_t m_clickCount;
-#if PLATFORM(WIN)
- bool m_didActivateWebView;
-#endif
};
// FIXME: Move this class to its own header file.
m_modifierFlags |= WebEvent::AltKey;
if (webEvent.metaKey())
m_modifierFlags |= WebEvent::MetaKey;
-
-#if PLATFORM(WIN)
- m_didActivateWebView = webEvent.didActivateWebView();
-#endif
}
};
, m_deltaY(0)
, m_deltaZ(0)
, m_clickCount(0)
-#if PLATFORM(WIN)
- , m_didActivateWebView(false)
-#endif
{
}
, m_deltaY(deltaY)
, m_deltaZ(deltaZ)
, m_clickCount(clickCount)
-#if PLATFORM(WIN)
- , m_didActivateWebView(false)
-#endif
{
ASSERT(isMouseEventType(type));
}
-#if PLATFORM(WIN)
-WebMouseEvent::WebMouseEvent(Type type, Button button, const IntPoint& position, const IntPoint& globalPosition, float deltaX, float deltaY, float deltaZ, int clickCount, Modifiers modifiers, double timestamp, bool didActivateWebView)
- : WebEvent(type, modifiers, timestamp)
- , m_button(button)
- , m_position(position)
- , m_globalPosition(globalPosition)
- , m_deltaX(deltaX)
- , m_deltaY(deltaY)
- , m_deltaZ(deltaZ)
- , m_clickCount(clickCount)
- , m_didActivateWebView(didActivateWebView)
-{
- ASSERT(isMouseEventType(type));
-}
-#endif
-
void WebMouseEvent::encode(CoreIPC::ArgumentEncoder& encoder) const
{
WebEvent::encode(encoder);
encoder << m_deltaY;
encoder << m_deltaZ;
encoder << m_clickCount;
-
-#if PLATFORM(WIN)
- encoder << m_didActivateWebView;
-#endif
}
bool WebMouseEvent::decode(CoreIPC::ArgumentDecoder* decoder, WebMouseEvent& result)
return false;
if (!decoder->decode(result.m_clickCount))
return false;
-#if PLATFORM(WIN)
- if (!decoder->decode(result.m_didActivateWebView))
- return false;
-#endif
return true;
}
encoder.encodeEnum(layerHostingMode);
encoder << colorSpace;
#endif
-
-#if PLATFORM(WIN)
- encoder << reinterpret_cast<uint64_t>(nativeWindow);
-#endif
}
bool WebPageCreationParameters::decode(CoreIPC::ArgumentDecoder* decoder, WebPageCreationParameters& parameters)
return false;
#endif
-#if PLATFORM(WIN)
- uint64_t nativeWindow;
- if (!decoder->decode(nativeWindow))
- return false;
- parameters.nativeWindow = reinterpret_cast<HWND>(nativeWindow);
-#endif
-
return true;
}
LayerHostingMode layerHostingMode;
ColorSpaceData colorSpace;
#endif
-
-#if PLATFORM(WIN)
- HWND nativeWindow;
-#endif
};
} // namespace WebKit
// macro(KeyUpper, KeyLower, TypeNameUpper, TypeName, DefaultValue)
-#if PLATFORM(WIN)
-#define DEFAULT_WEBKIT_AVFOUNDATION_ENABLED false
-#else
-#define DEFAULT_WEBKIT_AVFOUNDATION_ENABLED true
-#endif
-
#if PLATFORM(GTK)
#define DEFAULT_WEBKIT_TABSTOLINKS_ENABLED true
#else
macro(WebSecurityEnabled, webSecurityEnabled, Bool, bool, true) \
macro(AllowUniversalAccessFromFileURLs, allowUniversalAccessFromFileURLs, Bool, bool, false) \
macro(AllowFileAccessFromFileURLs, allowFileAccessFromFileURLs, Bool, bool, false) \
- macro(AVFoundationEnabled, isAVFoundationEnabled, Bool, bool, DEFAULT_WEBKIT_AVFOUNDATION_ENABLED) \
+ macro(AVFoundationEnabled, isAVFoundationEnabled, Bool, bool, true) \
macro(MediaPlaybackRequiresUserGesture, mediaPlaybackRequiresUserGesture, Bool, bool, false) \
macro(MediaPlaybackAllowsInline, mediaPlaybackAllowsInline, Bool, bool, true) \
macro(InspectorStartsAttached, inspectorStartsAttached, Bool, bool, true) \
#define FOR_EACH_WEBKIT_FLOAT_PREFERENCE(macro) \
\
-#if PLATFORM(WIN)
-#define DEFAULT_WEBKIT_FONT_SMOOTHING_LEVEL FontSmoothingLevelWindows
-#else
-#define DEFAULT_WEBKIT_FONT_SMOOTHING_LEVEL FontSmoothingLevelMedium
-#endif
-
#define FOR_EACH_WEBKIT_UINT32_PREFERENCE(macro) \
- macro(FontSmoothingLevel, fontSmoothingLevel, UInt32, uint32_t, DEFAULT_WEBKIT_FONT_SMOOTHING_LEVEL) \
+ macro(FontSmoothingLevel, fontSmoothingLevel, UInt32, uint32_t, FontSmoothingLevelMedium) \
macro(MinimumFontSize, minimumFontSize, UInt32, uint32_t, 0) \
macro(MinimumLogicalFontSize, minimumLogicalFontSize, UInt32, uint32_t, 9) \
macro(DefaultFontSize, defaultFontSize, UInt32, uint32_t, 16) \
macro(InspectorAttachedHeight, inspectorAttachedHeight, UInt32, uint32_t, 300) \
\
-#if PLATFORM(WIN)
-
-#define FOR_EACH_WEBKIT_FONT_FAMILY_PREFERENCE(macro) \
- macro(StandardFontFamily, standardFontFamily, String, String, "Times New Roman") \
- macro(CursiveFontFamily, cursiveFontFamily, String, String, "Comic Sans MS") \
- macro(FantasyFontFamily, fantasyFontFamily, String, String, "Comic Sans MS") \
- macro(FixedFontFamily, fixedFontFamily, String, String, "Courier New") \
- macro(SansSerifFontFamily, sansSerifFontFamily, String, String, "Arial") \
- macro(SerifFontFamily, serifFontFamily, String, String, "Times New Roman") \
- macro(PictographFontFamily, pictographFontFamily, String, String, "Times New Roman") \
- \
-
-#elif PLATFORM(MAC)
+#if PLATFORM(MAC)
#define FOR_EACH_WEBKIT_FONT_FAMILY_PREFERENCE(macro) \
macro(StandardFontFamily, standardFontFamily, String, String, "Times") \
#include "WebProcessCreationParameters.h"
#include "ArgumentCoders.h"
-#if PLATFORM(WIN) && USE(CFNETWORK)
-#include "ArgumentCodersCF.h"
-#endif
namespace WebKit {
, nsURLCacheDiskCapacity(0)
, shouldForceScreenFontSubstitution(false)
, shouldEnableKerningAndLigaturesByDefault(false)
-#elif PLATFORM(WIN)
- , shouldPaintNativeControls(false)
#endif
#if ENABLE(NETWORK_PROCESS)
, usesNetworkProcess(false)
encoder << uiProcessBundleResourcePathExtensionHandle;
encoder << shouldForceScreenFontSubstitution;
encoder << shouldEnableKerningAndLigaturesByDefault;
-#elif PLATFORM(WIN)
- encoder << shouldPaintNativeControls;
- encoder << cfURLCacheDiskCapacity;
- encoder << cfURLCacheMemoryCapacity;
- encoder << initialHTTPCookieAcceptPolicy;
-#if USE(CFNETWORK)
- CFDataRef storageSession = serializedDefaultStorageSession.get();
- encoder << static_cast<bool>(storageSession);
- if (storageSession)
- CoreIPC::encode(encoder, storageSession);
-#endif
#endif
#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
return false;
if (!decoder->decode(parameters.shouldEnableKerningAndLigaturesByDefault))
return false;
-#elif PLATFORM(WIN)
- if (!decoder->decode(parameters.shouldPaintNativeControls))
- return false;
- if (!decoder->decode(parameters.cfURLCacheDiskCapacity))
- return false;
- if (!decoder->decode(parameters.cfURLCacheMemoryCapacity))
- return false;
- if (!decoder->decode(parameters.initialHTTPCookieAcceptPolicy))
- return false;
-#if PLATFORM(MAC) || USE(CFNETWORK)
- bool hasStorageSession = false;
- if (!decoder->decode(hasStorageSession))
- return false;
- if (hasStorageSession && !CoreIPC::decode(decoder, parameters.serializedDefaultStorageSession))
- return false;
-#endif
#endif
#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
bool shouldForceScreenFontSubstitution;
bool shouldEnableKerningAndLigaturesByDefault;
-
-#elif PLATFORM(WIN)
- uint64_t cfURLCacheDiskCapacity;
- uint64_t cfURLCacheMemoryCapacity;
-
- uint32_t initialHTTPCookieAcceptPolicy;
-
- bool shouldPaintNativeControls;
-
-#if USE(CFNETWORK)
- RetainPtr<CFDataRef> serializedDefaultStorageSession;
-#endif
-#endif // PLATFORM(WIN)
+#endif // PLATFORM(MAC)
#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
HashMap<String, bool> notificationPermissions;
#if PLATFORM(MAC)
typedef NSURLRequest* PlatformRequest;
-#elif PLATFORM(WIN)
-typedef CFURLRequestRef PlatformRequest;
#else
typedef void* PlatformRequest;
#endif
#if PLATFORM(MAC)
typedef NSURLResponse* PlatformResponse;
-#elif PLATFORM(WIN)
-typedef CFURLResponseRef PlatformResponse;
#else
typedef void* PlatformResponse;
#endif
paintImage(context.platformContext(), makeCGImageCopy().get(), scaleFactor, destination, source);
}
-#if !PLATFORM(WIN)
RetainPtr<CGImageRef> ShareableBitmap::makeCGImageCopy()
{
OwnPtr<GraphicsContext> graphicsContext = createGraphicsContext();
RetainPtr<CGImageRef> image(AdoptCF, CGBitmapContextCreateImage(graphicsContext->platformContext()));
return image;
}
-#endif
RetainPtr<CGImageRef> ShareableBitmap::makeCGImage()
{
return FontSmoothingLevelMedium;
case kWKFontSmoothingLevelStrong:
return FontSmoothingLevelStrong;
-#if PLATFORM(WIN)
- case kWKFontSmoothingLevelWindows:
- return FontSmoothingLevelWindows;
-#endif
}
ASSERT_NOT_REACHED();
return kWKFontSmoothingLevelMedium;
case FontSmoothingLevelStrong:
return kWKFontSmoothingLevelStrong;
-#if PLATFORM(WIN)
- case FontSmoothingLevelWindows:
- return kWKFontSmoothingLevelWindows;
-#endif
}
ASSERT_NOT_REACHED();
toImpl(pageRef)->executeEditCommand(toImpl(command)->string());
}
-#if PLATFORM(MAC) || PLATFORM(WIN)
+#if PLATFORM(MAC)
struct ComputedPagesContext {
ComputedPagesContext(WKPageComputePagesForPrintingFunction callback, void* context)
: callback(callback)
#if PLATFORM(MAC)
#include <wtf/RetainPtr.h>
-#elif PLATFORM(WIN) || PLATFORM(WIN_CAIRO)
-#include <wtf/OwnPtr.h>
#endif
#if PLATFORM(QT)
#include <QtGui/QPixmap>
#endif
-#if USE(CAIRO) && !PLATFORM(WIN_CAIRO)
+#if USE(CAIRO)
#include <RefPtrCairo.h>
#include <WebCore/WidgetBackingStore.h>
#endif
#if PLATFORM(MAC)
typedef CGContextRef PlatformGraphicsContext;
-#elif PLATFORM(WIN)
- typedef HDC PlatformGraphicsContext;
#elif PLATFORM(QT)
typedef QPainter* PlatformGraphicsContext;
#elif USE(CAIRO)
// Contents of m_scrolledRect are offset by this amount (and wrapped around) with respect to
// their original location.
WebCore::IntSize m_scrolledRectOffset;
-#elif PLATFORM(WIN) || PLATFORM(WIN_CAIRO)
- OwnPtr<HBITMAP> m_bitmap;
#elif PLATFORM(QT)
QPixmap m_pixmap;
#elif USE(CAIRO)
class WebColorChooserProxy;
#endif
-#if PLATFORM(WIN)
-struct WindowGeometry;
-#endif
-
#if PLATFORM(MAC)
struct ColorSpaceData;
#endif
virtual void setPromisedData(const String& pasteboardName, PassRefPtr<WebCore::SharedBuffer> imageBuffer, const String& filename, const String& extension, const String& title,
const String& url, const String& visibleUrl, PassRefPtr<WebCore::SharedBuffer> archiveBuffer) = 0;
#endif
-#if PLATFORM(WIN)
- virtual void compositionSelectionChanged(bool) = 0;
-#endif
#if PLATFORM(GTK)
virtual void getEditorCommandsForKeyEvent(const NativeWebKeyboardEvent&, const AtomicString&, Vector<WTF::String>&) = 0;
#endif
#endif
virtual void setFindIndicator(PassRefPtr<FindIndicator>, bool fadeOut, bool animate) = 0;
-#if PLATFORM(WIN)
- virtual void didInstallOrUninstallPageOverlay(bool) = 0;
-#endif
#if USE(ACCELERATED_COMPOSITING)
virtual void enterAcceleratedCompositingMode(const LayerTreeContext&) = 0;
virtual void updateAcceleratedCompositingMode(const LayerTreeContext&) = 0;
#endif
-#if PLATFORM(WIN)
- virtual HWND nativeWindow() = 0;
- virtual void setGestureReachedScrollingLimit(bool) = 0;
- virtual void scheduleChildWindowGeometryUpdate(const WindowGeometry&) = 0;
-#endif
-
#if PLATFORM(MAC)
virtual void pluginFocusOrWindowFocusChanged(uint64_t pluginComplexTextInputIdentifier, bool pluginHasFocusAndWindowHasFocus) = 0;
virtual void setPluginComplexTextInputState(uint64_t pluginComplexTextInputIdentifier, PluginComplexTextInputState) = 0;
, m_cacheModel(CacheModelDocumentViewer)
, m_memorySamplerEnabled(false)
, m_memorySamplerInterval(1400.0)
-#if PLATFORM(WIN)
- , m_shouldPaintNativeControls(true)
- , m_initialHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicyAlways)
-#endif
#if USE(SOUP)
, m_initialHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain)
#endif
void startMemorySampler(const double interval);
void stopMemorySampler();
-#if PLATFORM(WIN)
- void setShouldPaintNativeControls(bool);
-#endif
-#if PLATFORM(WIN) || USE(SOUP)
+#if USE(SOUP)
void setInitialHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicy policy) { m_initialHTTPCookieAcceptPolicy = policy; }
#endif
void setEnhancedAccessibility(bool);
typedef HashMap<AtomicString, RefPtr<WebContextSupplement> > WebContextSupplementMap;
WebContextSupplementMap m_supplements;
-#if PLATFORM(WIN)
- bool m_shouldPaintNativeControls;
-#endif
-#if PLATFORM(WIN) || USE(SOUP)
+#if USE(SOUP)
HTTPCookieAcceptPolicy m_initialHTTPCookieAcceptPolicy;
#endif
#if PLATFORM(MAC)
typedef WKView PlatformWebView;
-#elif PLATFORM(WIN)
-class WebView;
-typedef WebView PlatformWebView;
#elif PLATFORM(QT)
typedef QQuickWebView PlatformWebView;
#elif PLATFORM(GTK)
#if ENABLE(INSPECTOR_SERVER)
#include "WebInspectorServer.h"
#endif
-#if PLATFORM(WIN)
-#include "WebView.h"
-#endif
using namespace WebCore;
, m_isDebuggingJavaScript(false)
, m_isProfilingJavaScript(false)
, m_isProfilingPage(false)
-#if PLATFORM(WIN)
- , m_inspectorWindow(0)
-#elif PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(GTK) || PLATFORM(EFL)
, m_inspectorView(0)
, m_inspectorWindow(0)
#endif
OBJC_CLASS WKWebInspectorWKView;
#endif
-#if PLATFORM(WIN)
-#include <WebCore/WindowMessageListener.h>
-#endif
-
#if PLATFORM(GTK)
#include "WebInspectorClientGtk.h"
#endif
class WebPageProxy;
struct WebPageCreationParameters;
-#if PLATFORM(WIN)
-class WebView;
-#endif
-
-class WebInspectorProxy : public APIObject
-#if PLATFORM(WIN)
- , public WebCore::WindowMessageListener
-#endif
-{
+class WebInspectorProxy : public APIObject {
public:
static const Type APIType = TypeInspector;
static WebPageGroup* inspectorPageGroup();
-#if PLATFORM(WIN)
- static bool registerInspectorViewWindowClass();
- static LRESULT CALLBACK InspectorViewWndProc(HWND, UINT, WPARAM, LPARAM);
- LRESULT wndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
-
- LRESULT onSizeEvent(HWND hWnd, UINT message, WPARAM, LPARAM, bool& handled);
- LRESULT onMinMaxInfoEvent(HWND hWnd, UINT message, WPARAM, LPARAM, bool& handled);
- LRESULT onSetFocusEvent(HWND hWnd, UINT message, WPARAM, LPARAM, bool& handled);
- LRESULT onCloseEvent(HWND hWnd, UINT message, WPARAM, LPARAM, bool& handled);
-
- void onWebViewWindowPosChangingEvent(WPARAM, LPARAM);
- virtual void windowReceivedMessage(HWND, UINT message, WPARAM, LPARAM);
-#endif
-
#if PLATFORM(GTK) || PLATFORM(EFL)
void createInspectorWindow();
#endif
RetainPtr<NSButton> m_dockButton;
RetainPtr<WKWebInspectorProxyObjCAdapter> m_inspectorProxyObjCAdapter;
String m_urlString;
-#elif PLATFORM(WIN)
- HWND m_inspectorWindow;
- RefPtr<WebView> m_inspectorView;
#elif PLATFORM(GTK)
WebInspectorClientGtk m_client;
GtkWidget* m_inspectorView;
{
if (!isValid())
return;
-#if PLATFORM(WIN)
- // FIXME: We should pass the drag data map only on DragEnter.
- m_process->send(Messages::WebPage::PerformDragControllerAction(action, dragData->clientPosition(), dragData->globalPosition(),
- dragData->draggingSourceOperationMask(), dragData->dragDataMap(), dragData->flags()), m_pageID);
-#elif PLATFORM(QT) || PLATFORM(GTK)
+#if PLATFORM(QT) || PLATFORM(GTK)
m_process->send(Messages::WebPage::PerformDragControllerAction(action, *dragData), m_pageID);
#else
m_process->send(Messages::WebPage::PerformDragControllerAction(action, dragData->clientPosition(), dragData->globalPosition(), dragData->draggingSourceOperationMask(), dragStorageName, dragData->flags(), sandboxExtensionHandle, sandboxExtensionsForUpload), m_pageID);
if (m_uiClient.implementsDidNotHandleKeyEvent())
m_uiClient.didNotHandleKeyEvent(this, event);
-#if PLATFORM(WIN)
- else
- ::TranslateMessage(event.nativeEvent());
-#endif
break;
}
#if ENABLE(TOUCH_EVENTS)
parameters.colorSpace = m_pageClient->colorSpace();
#endif
-#if PLATFORM(WIN)
- parameters.nativeWindow = m_pageClient->nativeWindow();
-#endif
return parameters;
}
m_process->send(Messages::WebPage::ComputePagesForPrinting(frame->frameID(), printInfo, callbackID), m_pageID, m_isPerformingDOMPrintOperation ? CoreIPC::DispatchMessageEvenWhenWaitingForSyncReply : 0);
}
-#if PLATFORM(MAC) || PLATFORM(WIN)
+#if PLATFORM(MAC)
void WebPageProxy::drawRectToImage(WebFrameProxy* frame, const PrintInfo& printInfo, const IntRect& rect, const WebCore::IntSize& imageSize, PassRefPtr<ImageCallback> prpCallback)
{
RefPtr<ImageCallback> callback = prpCallback;
struct WebPageCreationParameters;
struct WebPopupItem;
-#if PLATFORM(WIN)
-struct WindowGeometry;
-#endif
-
#if ENABLE(GESTURE_EVENTS)
class WebGestureEvent;
#endif
void intrinsicContentSizeDidChange(const WebCore::IntSize& intrinsicContentSize);
#endif
#endif
-#if PLATFORM(WIN)
- void didChangeCompositionSelection(bool);
- void confirmComposition(const String&);
- void setComposition(const String&, Vector<WebCore::CompositionUnderline>&, int);
- WebCore::IntRect firstRectForCharacterInSelectedRange(int);
- String getSelectedText();
-
- bool gestureWillBegin(const WebCore::IntPoint&);
- void gestureDidScroll(const WebCore::IntSize&);
- void gestureDidEnd();
-
- void setGestureReachedScrollingLimit(bool);
-
- HWND nativeWindow() const;
-#endif
#if PLATFORM(EFL)
void handleInputMethodKeydown(bool& handled);
void confirmComposition(const String&);
void setComposition(const String&, Vector<WebCore::CompositionUnderline>&, int);
void cancelComposition();
#endif
-#if USE(CAIRO) && !PLATFORM(WIN_CAIRO)
+#if USE(CAIRO)
PlatformWidget viewWidget();
#endif
#if USE(TILED_BACKING_STORE)
void setFindIndicator(const WebCore::FloatRect& selectionRectInWindowCoordinates, const Vector<WebCore::FloatRect>& textRectsInSelectionRectCoordinates, float contentImageScaleFactor, const ShareableBitmap::Handle& contentImageHandle, bool fadeOut, bool animate);
void didFindString(const String&, uint32_t matchCount);
void didFailToFindString(const String&);
-#if PLATFORM(WIN)
- void didInstallOrUninstallPageOverlay(bool);
-#endif
void getContentsAsString(PassRefPtr<StringCallback>);
#if ENABLE(MHTML)
void setPromisedData(const String& pasteboardName, const SharedMemory::Handle& imageHandle, uint64_t imageSize, const String& filename, const String& extension,
const String& title, const String& url, const String& visibleURL, const SharedMemory::Handle& archiveHandle, uint64_t archiveSize);
#endif
-#if PLATFORM(WIN)
- void startDragDrop(const WebCore::IntPoint& imagePoint, const WebCore::IntPoint& dragPoint, uint64_t okEffect, const HashMap<UINT, Vector<String> >& dataMap, uint64_t fileSize, const String& pathname, const SharedMemory::Handle& fileContentHandle, const WebCore::IntSize& dragImageSize, const SharedMemory::Handle& dragImageHandle, bool isLinkDrag);
-#endif
#if PLATFORM(QT) || PLATFORM(GTK)
void startDrag(const WebCore::DragData&, const ShareableBitmap::Handle& dragImage);
#endif
void beginPrinting(WebFrameProxy*, const PrintInfo&);
void endPrinting();
void computePagesForPrinting(WebFrameProxy*, const PrintInfo&, PassRefPtr<ComputedPagesCallback>);
-#if PLATFORM(MAC) || PLATFORM(WIN)
+#if PLATFORM(MAC)
void drawRectToImage(WebFrameProxy*, const PrintInfo&, const WebCore::IntRect&, const WebCore::IntSize&, PassRefPtr<ImageCallback>);
void drawPagesToPDF(WebFrameProxy*, const PrintInfo&, uint32_t first, uint32_t count, PassRefPtr<DataCallback>);
#elif PLATFORM(GTK)
// Popup Menu.
void showPopupMenu(const WebCore::IntRect& rect, uint64_t textDirection, const Vector<WebPopupItem>& items, int32_t selectedIndex, const PlatformPopupMenuData&);
void hidePopupMenu();
-#if PLATFORM(WIN)
- void setPopupMenuSelectedIndex(int32_t);
-#endif
#if ENABLE(CONTEXT_MENUS)
// Context Menu.
void updateBackingStoreDiscardableState();
-#if PLATFORM(WIN)
- void scheduleChildWindowGeometryUpdate(const WindowGeometry&);
-#endif
-
void setRenderTreeSize(uint64_t treeSize) { m_renderTreeSize = treeSize; }
#if PLUGIN_ARCHITECTURE(X11)
# Editor notifications
EditorStateChanged(WebKit::EditorState editorState)
-#if PLATFORM(WIN)
- DidChangeCompositionSelection(bool hasChanged)
-#endif
#if PLATFORM(QT)
WillSetInputMethodState()
#endif
SetFindIndicator(WebCore::FloatRect selectionRect, Vector<WebCore::FloatRect> textRects, float contentImageScaleFactor, WebKit::ShareableBitmap::Handle contentImageHandle, bool fadeOut, bool animate)
DidFindString(WTF::String string, uint32_t matchCount)
DidFailToFindString(WTF::String string)
-#if PLATFORM(WIN)
- DidInstallOrUninstallPageOverlay(bool didInstall)
-#endif
# PopupMenu messages
ShowPopupMenu(WebCore::IntRect rect, uint64_t textDirection, Vector<WebKit::WebPopupItem> items, int32_t selectedIndex, WebKit::PlatformPopupMenuData data)
HidePopupMenu()
-#if PLATFORM(WIN)
- SetPopupMenuSelectedIndex(int32_t selectedIndex)
-#endif
#if ENABLE(CONTEXT_MENUS)
# ContextMenu messages
SetDragImage(WebCore::IntPoint clientPosition, WebKit::ShareableBitmap::Handle dragImage, bool linkDrag)
SetPromisedData(WTF::String pasteboardName, WebKit::SharedMemory::Handle imageHandle, uint64_t imageSize, WTF::String filename, WTF::String extension, WTF::String title, WTF::String url, WTF::String visibleURL, WebKit::SharedMemory::Handle archiveHandle, uint64_t archiveSize)
#endif
-#if PLATFORM(WIN) && ENABLE(DRAG_SUPPORT)
- StartDragDrop(WebCore::IntPoint imagePoint, WebCore::IntPoint dragPoint, uint64_t okEffect, HashMap<UINT,Vector<String> > dataMap, uint64_t fileSize, String pathname, WebKit::SharedMemory::Handle fileContentHandle, WebCore::IntSize dragImageSize, WebKit::SharedMemory::Handle dragImage, bool linkDrag)
-#endif
#if (PLATFORM(QT) || PLATFORM(GTK)) && ENABLE(DRAG_SUPPORT)
StartDrag(WebCore::DragData dragData, WebKit::ShareableBitmap::Handle dragImage)
#endif
DictationAlternatives(uint64_t dictationContext) -> (Vector<String> alternatives)
#endif
-#if PLATFORM(WIN)
- # Windows 7 Gesture Messages
- SetGestureReachedScrollingLimit(bool limitReached)
-
- # Miscellaneous Windows messages
- ScheduleChildWindowGeometryUpdate(WebKit::WindowGeometry geometry)
-#endif
-
#if PLUGIN_ARCHITECTURE(X11)
# X11 windowed plugin messages
CreatePluginContainer() -> (uint64_t windowID)
virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&) OVERRIDE;
virtual void didClose(CoreIPC::Connection*) OVERRIDE;
virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName) OVERRIDE;
-#if PLATFORM(WIN)
- virtual Vector<HWND> windowsToReceiveSentMessagesWhileWaitingForSyncReply() OVERRIDE;
-#endif
// CoreIPC::Connection::QueueClient
virtual void didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&, bool& didHandleMessage) OVERRIDE;
#define ENABLE_SHARED_WORKER_PROCESS 1
#endif
-#elif !PLATFORM(WIN)
+#else
#define ENABLE_SHARED_WORKER_PROCESS 1
#endif
WKDataRef WKBundleFrameCopyWebArchiveFilteringSubframes(WKBundleFrameRef frameRef, WKBundleFrameFrameFilterCallback frameFilterCallback, void* context)
{
-#if PLATFORM(MAC) || PLATFORM(WIN)
+#if PLATFORM(MAC)
RetainPtr<CFDataRef> data = toImpl(frameRef)->webArchiveData(frameFilterCallback, context);
if (data)
return WKDataCreate(CFDataGetBytePtr(data.get()), CFDataGetLength(data.get()));
void InjectedBundle::setPrivateBrowsingEnabled(WebPageGroupProxy* pageGroup, bool enabled)
{
-#if (PLATFORM(MAC) || USE(CFNETWORK)) && !PLATFORM(WIN)
+#if PLATFORM(MAC) || USE(CFNETWORK)
if (enabled)
WebFrameNetworkingContext::ensurePrivateBrowsingSession();
else
void InjectedBundle::switchNetworkLoaderToNewTestingSession()
{
-#if (PLATFORM(MAC) || USE(CFNETWORK)) && !PLATFORM(WIN)
+#if PLATFORM(MAC) || USE(CFNETWORK)
// FIXME (NetworkProcess): Do this in network process, too.
InitWebCoreSystemInterface();
NetworkStorageSession::switchToNewTestingSession();
#if PLATFORM(MAC)
typedef NSBundle *PlatformBundle;
-#elif PLATFORM(WIN)
-typedef HMODULE PlatformBundle;
#elif PLATFORM(QT)
typedef QLibrary PlatformBundle;
#elif PLATFORM(GTK)
void initializeClient(WKBundleClient*);
void postMessage(const String&, APIObject*);
void postSynchronousMessage(const String&, APIObject*, RefPtr<APIObject>& returnData);
-#if PLATFORM(WIN)
- void setHostAllowsAnyHTTPSCertificate(const String&);
- void setClientCertificate(const String& host, const String& certificateSystemStoreName, const WebCertificateInfo*);
-#endif
WebConnection* webConnectionToUIProcess() const;
*(NPBool*)value = true;
break;
#endif
-#elif PLATFORM(WIN)
- case NPNVnetscapeWindow: {
- RefPtr<NetscapePlugin> plugin = NetscapePlugin::fromNPP(npp);
- *reinterpret_cast<HWND*>(value) = plugin->containingWindow();
- break;
- }
- case NPNVSupportsWindowless:
- *(NPBool*)value = true;
- break;
#elif PLUGIN_ARCHITECTURE(X11)
case NPNVxDisplay: {
if (!npp)
static unsigned buttonState();
#endif
-#elif PLATFORM(WIN)
- HWND containingWindow();
#endif
PluginQuirks quirks() const { return m_pluginModule->pluginQuirks(); }
namespace WebKit {
-#if PLATFORM(WIN)
-struct WindowGeometry;
-#endif
-
class PluginController {
public:
// Returns false if the plugin has explicitly been hidden. Returns true otherwise (even if the plugin is currently obscured from view on screen.)
// Tells the controller that we're about to dispatch an event to the plug-in.
virtual void willSendEventToPlugin() = 0;
-#if PLATFORM(WIN)
- // The window to use as the parent of the plugin's window.
- virtual HWND nativeParentWindow() = 0;
-
- // Tells the controller that the given HWND needs to be positioned and clipped to the given
- // coordinates sometime soon. The controller will decide exactly when this will happen.
- virtual void scheduleWindowedPluginGeometryUpdate(const WindowGeometry&) = 0;
-#endif
-
#if PLATFORM(MAC)
// Tells the controller that the plug-in focus or window focus did change.
virtual void pluginFocusOrWindowFocusChanged(bool) = 0;
m_webPage->send(Messages::WebPageProxy::StopResponsivenessTimer());
}
-#if PLATFORM(WIN)
-HWND PluginView::nativeParentWindow()
-{
- return m_webPage->nativeWindow();
-}
-
-void PluginView::scheduleWindowedPluginGeometryUpdate(const WindowGeometry& geometry)
-{
- m_webPage->drawingArea()->scheduleChildWindowGeometryUpdate(geometry);
-}
-#endif
-
#if PLATFORM(MAC)
void PluginView::pluginFocusOrWindowFocusChanged(bool pluginHasFocusAndWindowHasFocus)
{
virtual bool isAcceleratedCompositingEnabled();
virtual void pluginProcessCrashed();
virtual void willSendEventToPlugin();
-#if PLATFORM(WIN)
- virtual HWND nativeParentWindow();
- virtual void scheduleWindowedPluginGeometryUpdate(const WindowGeometry&);
-#endif
#if PLATFORM(MAC)
virtual void pluginFocusOrWindowFocusChanged(bool pluginHasFocusAndWindowHasFocus);
virtual void setComplexTextInputState(PluginComplexTextInputState);
#if USE(CFURLCACHE)
-#if PLATFORM(WIN)
-#include <WebKitSystemInterface/WebKitSystemInterface.h>
-#elif PLATFORM(MAC)
+#if PLATFORM(MAC)
#include "WebKitSystemInterface.h"
#endif
namespace WebKit {
-#if PLATFORM(WIN)
-// The Windows version of WKSI defines these functions as capitalized, while the Mac version defines them as lower case.
-static inline CFArrayRef WKCFURLCacheCopyAllHostNamesInPersistentStore() { return wkCFURLCacheCopyAllHostNamesInPersistentStore(); }
-static inline void WKCFURLCacheDeleteHostNamesInPersistentStore(CFArrayRef hostNames) { return wkCFURLCacheDeleteHostNamesInPersistentStore(hostNames); }
-#endif
-
RetainPtr<CFArrayRef> WebResourceCacheManager::cfURLCacheHostNames()
{
return RetainPtr<CFArrayRef>(AdoptCF, WKCFURLCacheCopyAllHostNamesInPersistentStore());
bool WebChromeClient::selectItemWritingDirectionIsNatural()
{
-#if PLATFORM(WIN) || PLATFORM(EFL)
+#if PLATFORM(EFL)
return true;
#else
return false;
bool WebChromeClient::selectItemAlignmentFollowsMenuWritingDirection()
{
-#if PLATFORM(WIN)
- return false;
-#else
return true;
-#endif
}
bool WebChromeClient::hasOpenedPopup() const
#endif
-#if PLATFORM(WIN) && USE(AVFOUNDATION)
-WebCore::GraphicsDeviceAdapter* WebChromeClient::graphicsDeviceAdapter() const
-{
- if (!m_page->drawingArea())
- return 0;
- return m_page->drawingArea()->layerTreeHost()->graphicsDeviceAdapter();
-}
-#endif
-
#if ENABLE(TOUCH_EVENTS)
void WebChromeClient::needTouchEvents(bool needTouchEvents)
{
}
#endif
-#if PLATFORM(WIN)
-void WebChromeClient::setLastSetCursorToCurrentCursor()
-{
-}
-#endif
-
#if ENABLE(FULLSCREEN_API)
bool WebChromeClient::supportsFullScreenForElement(const WebCore::Element*, bool withKeyboard)
{
}
#endif
-#if PLATFORM(WIN) && USE(AVFOUNDATION)
- virtual WebCore::GraphicsDeviceAdapter* graphicsDeviceAdapter() const OVERRIDE;
-#endif
-
#if ENABLE(TOUCH_EVENTS)
virtual void needTouchEvents(bool) OVERRIDE;
#endif
-#if PLATFORM(WIN)
- virtual void setLastSetCursorToCurrentCursor() OVERRIDE;
-#endif
-
#if ENABLE(FULLSCREEN_API)
virtual bool supportsFullScreenForElement(const WebCore::Element*, bool withKeyboard) OVERRIDE;
virtual void enterFullScreenForElement(WebCore::Element*) OVERRIDE;
return DragSourceActionAny;
}
-#if !PLATFORM(MAC) && !PLATFORM(WIN) && !PLATFORM(QT) && !PLATFORM(GTK)
+#if !PLATFORM(MAC) && !PLATFORM(QT) && !PLATFORM(GTK)
void WebDragClient::startDrag(DragImageRef, const IntPoint&, const IntPoint&, Clipboard*, Frame*, bool)
{
}
m_page->send(Messages::WebPageProxy::EditorStateChanged(state));
-#if PLATFORM(WIN)
- // FIXME: This should also go into the selection state.
- if (!frame->editor()->hasComposition() || frame->editor()->ignoreCompositionSelectionChange())
- return;
-
- unsigned start;
- unsigned end;
- m_page->send(Messages::WebPageProxy::DidChangeCompositionSelection(frame->editor()->getCompositionSelection(start, end)));
-#elif PLATFORM(GTK) || PLATFORM(QT)
+#if PLATFORM(GTK) || PLATFORM(QT)
updateGlobalSelection(frame);
#endif
}
#endif // PLATFORM(MAC)
-#if PLATFORM(WIN) && USE(CFNETWORK)
-bool WebFrameLoaderClient::shouldCacheResponse(DocumentLoader*, unsigned long identifier, const ResourceResponse&, const unsigned char* data, unsigned long long length)
-{
- WebPage* webPage = m_frame->page();
- if (!webPage)
- return true;
-
- return webPage->injectedBundleResourceLoadClient().shouldCacheResponse(webPage, m_frame, identifier);
-}
-#endif // PLATFORM(WIN) && USE(CFNETWORK)
-
#if ENABLE(WEB_INTENTS)
void WebFrameLoaderClient::dispatchIntent(PassRefPtr<IntentRequest> request)
{
virtual NSCachedURLResponse* willCacheResponse(WebCore::DocumentLoader*, unsigned long identifier, NSCachedURLResponse*) const OVERRIDE;
#endif
-#if PLATFORM(WIN) && USE(CFNETWORK)
- // FIXME: Windows should use willCacheResponse - <https://bugs.webkit.org/show_bug.cgi?id=57257>.
- virtual bool shouldCacheResponse(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ResourceResponse&, const unsigned char* data, unsigned long long length) OVERRIDE;
-#endif
#if ENABLE(WEB_INTENTS)
virtual void dispatchIntent(PassRefPtr<WebCore::IntentRequest>) OVERRIDE;
#include "WebResourceLoadScheduler.h"
#endif
-#if PLATFORM(WIN) && USE(CFNETWORK)
-#include "WebFrameNetworkingContext.h"
-#include <WebKitSystemInterface/WebKitSystemInterface.h>
-#endif
-
using namespace WebCore;
namespace WebKit {
void WebPopupMenu::updateFromElement()
{
-#if PLATFORM(WIN)
- if (!m_page || !m_popupClient)
- return;
-
- int selectedIndex = m_popupClient->selectedIndex();
- WebProcess::shared().connection()->send(Messages::WebPageProxy::SetPopupMenuSelectedIndex(selectedIndex), m_page->pageID());
-#endif
}
} // namespace WebKit
#if PLATFORM(MAC)
#include <objc/objc-auto.h>
-#elif PLATFORM(WIN)
-#include <shlwapi.h>
#endif
using namespace WebKit;
return WebKitMain(commandLine);
}
-#elif PLATFORM(WIN)
-
-static void enableDataExecutionPrevention()
-{
- // Enable Data Execution prevention at runtime rather than via /NXCOMPAT
- // http://blogs.msdn.com/michael_howard/archive/2008/01/29/new-nx-apis-added-to-windows-vista-sp1-windows-xp-sp3-and-windows-server-2008.aspx
-
- const DWORD enableDEP = 0x00000001;
-
- HMODULE hMod = ::GetModuleHandleW(L"Kernel32.dll");
- if (!hMod)
- return;
-
- typedef BOOL (WINAPI *PSETDEP)(DWORD);
-
- PSETDEP procSet = reinterpret_cast<PSETDEP>(::GetProcAddress(hMod, "SetProcessDEPPolicy"));
- if (!procSet)
- return;
-
- // Enable Data Execution Prevention, but allow ATL thunks (for compatibility with the version of ATL that ships with the Platform SDK).
- procSet(enableDEP);
-}
-
-static void enableTerminationOnHeapCorruption()
-{
- // Enable termination on heap corruption on OSes that support it (Vista and XPSP3).
- // http://msdn.microsoft.com/en-us/library/aa366705(VS.85).aspx
-
- const HEAP_INFORMATION_CLASS heapEnableTerminationOnCorruption = static_cast<HEAP_INFORMATION_CLASS>(1);
-
- HMODULE hMod = ::GetModuleHandleW(L"kernel32.dll");
- if (!hMod)
- return;
-
- typedef BOOL (WINAPI*HSI)(HANDLE, HEAP_INFORMATION_CLASS, PVOID, SIZE_T);
- HSI heapSetInformation = reinterpret_cast<HSI>(::GetProcAddress(hMod, "HeapSetInformation"));
- if (!heapSetInformation)
- return;
-
- heapSetInformation(0, heapEnableTerminationOnCorruption, 0, 0);
-}
-
-static void disableUserModeCallbackExceptionFilter()
-{
- const DWORD PROCESS_CALLBACK_FILTER_ENABLED = 0x1;
- typedef BOOL (NTAPI *getProcessUserModeExceptionPolicyPtr)(LPDWORD lpFlags);
- typedef BOOL (NTAPI *setProcessUserModeExceptionPolicyPtr)(DWORD dwFlags);
-
- HMODULE lib = LoadLibrary(TEXT("kernel32.dll"));
- ASSERT(lib);
-
- getProcessUserModeExceptionPolicyPtr getPolicyPtr = (getProcessUserModeExceptionPolicyPtr)GetProcAddress(lib, "GetProcessUserModeExceptionPolicy");
- setProcessUserModeExceptionPolicyPtr setPolicyPtr = (setProcessUserModeExceptionPolicyPtr)GetProcAddress(lib, "SetProcessUserModeExceptionPolicy");
-
- DWORD dwFlags;
- if (!getPolicyPtr || !setPolicyPtr || !getPolicyPtr(&dwFlags)) {
- FreeLibrary(lib);
- return;
- }
-
- // If this flag isn't cleared, exceptions that are thrown when running in a 64-bit version of
- // Windows are ignored, possibly leaving Safari in an inconsistent state that could cause an
- // unrelated exception to be thrown.
- // http://support.microsoft.com/kb/976038
- // http://blog.paulbetts.org/index.php/2010/07/20/the-case-of-the-disappearing-onload-exception-user-mode-callback-exceptions-in-x64/
- setPolicyPtr(dwFlags & ~PROCESS_CALLBACK_FILTER_ENABLED);
-
- FreeLibrary(lib);
-}
-
-#ifndef NDEBUG
-static void pauseProcessIfNeeded(HMODULE module)
-{
- // Show an alert when Ctrl-Alt-Shift is held down during launch to give the user time to attach a
- // debugger. This is useful for debugging problems that happen early in the web process's lifetime.
- const unsigned short highBitMaskShort = 0x8000;
- if (!getenv("WEBKIT2_PAUSE_WEB_PROCESS_ON_LAUNCH") && !((::GetKeyState(VK_CONTROL) & highBitMaskShort) && (::GetKeyState(VK_MENU) & highBitMaskShort) && (::GetKeyState(VK_SHIFT) & highBitMaskShort)))
- return;
-
- wchar_t path[MAX_PATH];
- DWORD length = ::GetModuleFileNameW(module, path, WTF_ARRAY_LENGTH(path));
- if (!length || length == WTF_ARRAY_LENGTH(path))
- return;
-
- wchar_t* startOfFilename = ::PathFindFileNameW(path);
- String filenameString(startOfFilename, length - (startOfFilename - path));
-
- String message = L"You can now attach a debugger to " + filenameString + L". You can use the same debugger for " + filenameString + L" and the UI process, if desired. Click OK when you are ready for " + filenameString + L" to continue.";
- String title = filenameString + L" has launched";
- ::MessageBoxW(0, message.charactersWithNullTermination(), title.charactersWithNullTermination(), MB_OK | MB_ICONINFORMATION);
-}
-#endif
-
-extern "C" __declspec(dllexport)
-int WebKitMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpstrCmdLine, int nCmdShow)
-{
-#ifndef NDEBUG
- pauseProcessIfNeeded(hInstance);
-#endif
-
- enableDataExecutionPrevention();
-
- enableTerminationOnHeapCorruption();
-
- disableUserModeCallbackExceptionFilter();
-
- CommandLine commandLine;
- if (!commandLine.parse(lpstrCmdLine))
- return EXIT_FAILURE;
-
- return WebKitMain(commandLine);
-}
-
#endif
struct WebPageCreationParameters;
struct WebPreferencesStore;
-#if PLATFORM(WIN)
-struct WindowGeometry;
-#endif
-
class DrawingArea {
WTF_MAKE_NONCOPYABLE(DrawingArea);
virtual void didReceiveCoordinatedLayerTreeHostMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) = 0;
#endif
-#if PLATFORM(WIN)
- virtual void scheduleChildWindowGeometryUpdate(const WindowGeometry&) = 0;
-#endif
-
virtual void dispatchAfterEnsuringUpdatedScrollPosition(const Function<void ()>&);
protected:
return wastedSpace <= wastedSpaceThreshold;
}
-#if !PLATFORM(WIN)
PassOwnPtr<GraphicsContext> DrawingAreaImpl::createGraphicsContext(ShareableBitmap* bitmap)
{
return bitmap->createGraphicsContext();
}
-#endif
void DrawingAreaImpl::display(UpdateInfo& updateInfo)
{
virtual void scheduleCompositingLayerFlush() OVERRIDE;
#endif
-#if PLATFORM(WIN)
- virtual void scheduleChildWindowGeometryUpdate(const WindowGeometry&);
-#endif
-
#if PLATFORM(MAC)
virtual void setLayerHostingMode(uint32_t) OVERRIDE;
#endif
#include "config.h"
#include "LayerTreeHost.h"
-#if USE(CA)
#if PLATFORM(MAC)
#include "LayerTreeHostCAMac.h"
-#elif PLATFORM(WIN)
-#include "LayerTreeHostCAWin.h"
-#endif
#endif
#if USE(COORDINATED_GRAPHICS)
{
#if PLATFORM(MAC)
return LayerTreeHostCAMac::create(webPage);
-#elif PLATFORM(WIN) && HAVE(WKQCA)
- return LayerTreeHostCAWin::create(webPage);
#elif USE(COORDINATED_GRAPHICS)
return CoordinatedLayerTreeHost::create(webPage);
#elif PLATFORM(GTK) && USE(TEXTURE_MAPPER_GL)
class IntSize;
class GraphicsLayer;
class GraphicsLayerFactory;
-
-#if PLATFORM(WIN) && USE(AVFOUNDATION)
-struct GraphicsDeviceAdapter;
-#endif
}
namespace WebKit {
class UpdateInfo;
class WebPage;
-#if PLATFORM(WIN)
-struct WindowGeometry;
-#endif
-
class LayerTreeHost : public RefCounted<LayerTreeHost> {
public:
static PassRefPtr<LayerTreeHost> create(WebPage*);
virtual void didReceiveCoordinatedLayerTreeHostMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) = 0;
#endif
-#if PLATFORM(WIN)
- virtual void scheduleChildWindowGeometryUpdate(const WindowGeometry&) = 0;
-#endif
-
#if PLATFORM(MAC)
virtual void setLayerHostingMode(LayerHostingMode) { }
#endif
-#if PLATFORM(WIN) && USE(AVFOUNDATION)
- virtual WebCore::GraphicsDeviceAdapter* graphicsDeviceAdapter() const { return 0; }
-#endif
-
#if USE(COORDINATED_GRAPHICS) && ENABLE(REQUEST_ANIMATION_FRAME)
virtual void scheduleAnimation() = 0;
#endif
#endif
};
-#if !PLATFORM(WIN) && !USE(COORDINATED_GRAPHICS)
+#if !USE(COORDINATED_GRAPHICS)
inline bool LayerTreeHost::supportsAcceleratedCompositing()
{
return true;
#include <WebCore/PlatformMessagePortChannel.h>
#endif
-#if PLATFORM(MAC) || PLATFORM(WIN)
+#if PLATFORM(MAC)
#include <WebCore/LegacyWebArchive.h>
#endif
m_coreFrame->editor()->setBaseWritingDirection(RightToLeftWritingDirection);
}
-#if PLATFORM(MAC) || PLATFORM(WIN)
+#if PLATFORM(MAC)
class WebFrameFilter : public FrameFilter {
public:
void setLoadListener(LoadListener* loadListener) { m_loadListener = loadListener; }
LoadListener* loadListener() const { return m_loadListener; }
-#if PLATFORM(MAC) || PLATFORM(WIN)
+#if PLATFORM(MAC)
typedef bool (*FrameFilterFunction)(WKBundleFrameRef, WKBundleFrameRef subframe, void* context);
RetainPtr<CFDataRef> webArchiveData(FrameFilterFunction, void* context);
#endif
, m_isSmartInsertDeleteEnabled(parameters.isSmartInsertDeleteEnabled)
, m_layerHostingMode(parameters.layerHostingMode)
, m_keyboardEventBeingInterpreted(0)
-#elif PLATFORM(WIN)
- , m_nativeWindow(parameters.nativeWindow)
#elif PLATFORM(GTK)
, m_accessibilityObject(0)
#endif
, m_isShowingContextMenu(false)
#endif
, m_willGoToBackForwardItemCallbackEnabled(true)
-#if PLATFORM(WIN)
- , m_gestureReachedScrollingLimit(false)
-#endif
#if ENABLE(PAGE_VISIBILITY_API)
, m_visibilityState(WebCore::PageVisibilityStateVisible)
#endif
m_pageOverlay->startFadeInAnimation();
m_drawingArea->didInstallPageOverlay();
-#if PLATFORM(WIN)
- send(Messages::WebPageProxy::DidInstallOrUninstallPageOverlay(true));
-#endif
-
m_pageOverlay->setNeedsDisplay();
}
m_pageOverlay = nullptr;
m_drawingArea->didUninstallPageOverlay();
-#if PLATFORM(WIN)
- send(Messages::WebPageProxy::DidInstallOrUninstallPageOverlay(false));
-#endif
}
static ImageOptions snapshotOptionsToImageOptions(SnapshotOptions snapshotOptions)
{
CoreIPC::DataReference dataReference;
-#if PLATFORM(MAC) || PLATFORM(WIN)
+#if PLATFORM(MAC)
RetainPtr<CFDataRef> data;
if (WebFrame* frame = WebProcess::shared().webFrame(frameID)) {
if ((data = frame->webArchiveData(0, 0)))
#if ENABLE(DRAG_SUPPORT)
-#if PLATFORM(WIN)
-void WebPage::performDragControllerAction(uint64_t action, WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, uint64_t draggingSourceOperationMask, const WebCore::DragDataMap& dataMap, uint32_t flags)
-{
- if (!m_page) {
- send(Messages::WebPageProxy::DidPerformDragControllerAction(WebCore::DragSession()));
- return;
- }
-
- DragData dragData(dataMap, clientPosition, globalPosition, static_cast<DragOperation>(draggingSourceOperationMask), static_cast<DragApplicationFlags>(flags));
- switch (action) {
- case DragControllerActionEntered:
- send(Messages::WebPageProxy::DidPerformDragControllerAction(m_page->dragController()->dragEntered(&dragData)));
- break;
-
- case DragControllerActionUpdated:
- send(Messages::WebPageProxy::DidPerformDragControllerAction(m_page->dragController()->dragUpdated(&dragData)));
- break;
-
- case DragControllerActionExited:
- m_page->dragController()->dragExited(&dragData);
- break;
-
- case DragControllerActionPerformDrag:
- m_page->dragController()->performDrag(&dragData);
- break;
-
- default:
- ASSERT_NOT_REACHED();
- }
-}
-
-#elif PLATFORM(QT) || PLATFORM(GTK)
+#if PLATFORM(QT) || PLATFORM(GTK)
void WebPage::performDragControllerAction(uint64_t action, WebCore::DragData dragData)
{
if (!m_page) {
send(Messages::WebPageProxy::ComputedPagesCallback(resultPageRects, resultTotalScaleFactorForPrinting, callbackID));
}
-#if PLATFORM(MAC) || PLATFORM(WIN)
+#if PLATFORM(MAC)
void WebPage::drawRectToImage(uint64_t frameID, const PrintInfo& printInfo, const WebCore::IntRect& rect, const WebCore::IntSize& imageSize, uint64_t callbackID)
{
WebFrame* frame = WebProcess::shared().webFrame(frameID);
void updatePluginsActiveAndFocusedState();
const WebCore::IntRect& windowFrameInScreenCoordinates() const { return m_windowFrameInScreenCoordinates; }
const WebCore::IntRect& viewFrameInWindowCoordinates() const { return m_viewFrameInWindowCoordinates; }
-#elif PLATFORM(WIN)
- HWND nativeWindow() const { return m_nativeWindow; }
#endif
bool windowIsFocused() const;
void acceptsFirstMouse(int eventNumber, const WebKit::WebMouseEvent&, bool& result);
bool performNonEditingBehaviorForSelector(const String&);
void insertDictatedText(const String& text, uint64_t replacementRangeStart, uint64_t replacementRangeEnd, const Vector<WebCore::DictationAlternative>& dictationAlternativeLocations, bool& handled, EditorState& newState);
-#elif PLATFORM(WIN)
- void confirmComposition(const String& compositionString);
- void setComposition(const WTF::String& compositionString, const WTF::Vector<WebCore::CompositionUnderline>& underlines, uint64_t cursorPosition);
- void firstRectForCharacterInSelectedRange(const uint64_t characterPosition, WebCore::IntRect& resultRect);
- void getSelectedText(WTF::String&);
-
- void gestureWillBegin(const WebCore::IntPoint&, bool& canBeginPanning);
- void gestureDidScroll(const WebCore::IntSize&);
- void gestureDidEnd();
#elif PLATFORM(EFL)
void confirmComposition(const String& compositionString);
void setComposition(const WTF::String& compositionString, const WTF::Vector<WebCore::CompositionUnderline>& underlines, uint64_t cursorPosition);
void clearSelection();
#if ENABLE(DRAG_SUPPORT)
-#if PLATFORM(WIN)
- void performDragControllerAction(uint64_t action, WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, uint64_t draggingSourceOperationMask, const WebCore::DragDataMap&, uint32_t flags);
-#elif PLATFORM(QT) || PLATFORM(GTK)
+#if PLATFORM(QT) || PLATFORM(GTK)
void performDragControllerAction(uint64_t action, WebCore::DragData);
#else
void performDragControllerAction(uint64_t action, WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, uint64_t draggingSourceOperationMask, const WTF::String& dragStorageName, uint32_t flags, const SandboxExtension::Handle&, const SandboxExtension::HandleArray&);
void beginPrinting(uint64_t frameID, const PrintInfo&);
void endPrinting();
void computePagesForPrinting(uint64_t frameID, const PrintInfo&, uint64_t callbackID);
-#if PLATFORM(MAC) || PLATFORM(WIN)
+#if PLATFORM(MAC)
void drawRectToImage(uint64_t frameID, const PrintInfo&, const WebCore::IntRect&, const WebCore::IntSize&, uint64_t callbackID);
void drawPagesToPDF(uint64_t frameID, const PrintInfo&, uint32_t first, uint32_t count, uint64_t callbackID);
#elif PLATFORM(GTK)
WebCore::KeyboardEvent* m_keyboardEventBeingInterpreted;
-#elif PLATFORM(WIN)
- // Our view's window (in the UI process).
- HWND m_nativeWindow;
-
- RefPtr<WebCore::Node> m_gestureTargetNode;
#elif PLATFORM(GTK)
GRefPtr<WebPageAccessibilityObject> m_accessibilityObject;
bool m_willGoToBackForwardItemCallbackEnabled;
-#if PLATFORM(WIN)
- bool m_gestureReachedScrollingLimit;
-#endif
#if PLATFORM(QT)
HashMap<String, QtNetworkReply*> m_applicationSchemeReplies;
#endif
CountStringMatches(WTF::String string, uint32_t findOptions, unsigned maxMatchCount)
# Drag and drop.
-#if PLATFORM(WIN) && ENABLE(DRAG_SUPPORT)
- PerformDragControllerAction(uint64_t action, WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, uint64_t draggingSourceOperationMask, HashMap<UINT,Vector<String>> dataMap, uint32_t flags)
-#endif
#if (PLATFORM(QT) || PLATFORM(GTK)) && ENABLE(DRAG_SUPPORT)
PerformDragControllerAction(uint64_t action, WebCore::DragData dragData)
#endif
-#if !PLATFORM(WIN) && !PLATFORM(QT) && !PLATFORM(GTK) && ENABLE(DRAG_SUPPORT)
+#if !PLATFORM(QT) && !PLATFORM(GTK) && ENABLE(DRAG_SUPPORT)
PerformDragControllerAction(uint64_t action, WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, uint64_t draggingSourceOperationMask, WTF::String dragStorageName, uint32_t flags, WebKit::SandboxExtension::Handle sandboxExtensionHandle, WebKit::SandboxExtension::HandleArray sandboxExtensionsForUpload)
#endif
#if ENABLE(DRAG_SUPPORT)
BeginPrinting(uint64_t frameID, WebKit::PrintInfo printInfo)
EndPrinting()
ComputePagesForPrinting(uint64_t frameID, WebKit::PrintInfo printInfo, uint64_t callbackID)
-#if PLATFORM(MAC) || PLATFORM(WIN)
+#if PLATFORM(MAC)
DrawRectToImage(uint64_t frameID, WebKit::PrintInfo printInfo, WebCore::IntRect rect, WebCore::IntSize imageSize, uint64_t callbackID)
DrawPagesToPDF(uint64_t frameID, WebKit::PrintInfo printInfo, uint32_t first, uint32_t count, uint64_t callbackID)
#endif
AcceptsFirstMouse(int eventNumber, WebKit::WebMouseEvent event) -> (bool result)
InsertDictatedText(WTF::String text, uint64_t replacementRangeStart, uint64_t replacementRangeEnd, WTF::Vector<WebCore::DictationAlternative> dictationAlternatives) -> (bool handled, WebKit::EditorState newState)
#endif
-#if PLATFORM(WIN)
- // FIXME: Unify with Mac counterparts.
- ConfirmComposition(WTF::String compositionString)
- SetComposition(WTF::String compositionString, WTF::Vector<WebCore::CompositionUnderline> underlines, uint64_t cursorPosition)
- FirstRectForCharacterInSelectedRange(uint64_t characterPosition) -> (WebCore::IntRect resultRect)
- GetSelectedText() -> (WTF::String text)
-
- GestureWillBegin(WebCore::IntPoint point) -> (bool canBeginPanning)
- GestureDidScroll(WebCore::IntSize size)
- GestureDidEnd()
-#endif
#if PLATFORM(EFL)
ConfirmComposition(WTF::String compositionString)
SetComposition(WTF::String compositionString, WTF::Vector<WebCore::CompositionUnderline> underlines, uint64_t cursorPosition)
if (parameters.shouldUseFontSmoothing)
setShouldUseFontSmoothing(true);
-#if (PLATFORM(MAC) || USE(CFNETWORK)) && !PLATFORM(WIN)
+#if PLATFORM(MAC) || USE(CFNETWORK)
WebFrameNetworkingContext::setPrivateBrowsingStorageSessionIdentifierBase(parameters.uiProcessBundleIdentifier);
#endif
void WebProcess::ensurePrivateBrowsingSession()
{
-#if (PLATFORM(MAC) || USE(CFNETWORK)) && !PLATFORM(WIN)
+#if PLATFORM(MAC) || USE(CFNETWORK)
WebFrameNetworkingContext::ensurePrivateBrowsingSession();
#endif
}
void WebProcess::destroyPrivateBrowsingSession()
{
-#if (PLATFORM(MAC) || USE(CFNETWORK)) && !PLATFORM(WIN)
+#if PLATFORM(MAC) || USE(CFNETWORK)
WebFrameNetworkingContext::destroyPrivateBrowsingSession();
#endif
}
void setShouldUseFontSmoothing(bool);
void userPreferredLanguagesChanged(const Vector<String>&) const;
void fullKeyboardAccessModeChanged(bool fullKeyboardAccessEnabled);
-#if PLATFORM(WIN)
- void setShouldPaintNativeControls(bool);
-#endif
void setVisitedLinkTable(const SharedMemory::Handle&);
void visitedLinkStateChanged(const Vector<WebCore::LinkHash>& linkHashes);
virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&);
virtual void didClose(CoreIPC::Connection*);
virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName) OVERRIDE;
-#if PLATFORM(WIN)
- virtual Vector<HWND> windowsToReceiveSentMessagesWhileWaitingForSyncReply();
-#endif
// CoreIPC::Connection::QueueClient
virtual void didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&, bool& didHandleMessage) OVERRIDE;
SetShouldUseFontSmoothing(bool useFontSmoothing)
UserPreferredLanguagesChanged(Vector<WTF::String> languages)
FullKeyboardAccessModeChanged(bool fullKeyboardAccessEnabled)
-#if PLATFORM(WIN)
- SetShouldPaintNativeControls(bool shouldPaintNativeControls)
-#endif
#if USE(SOUP)
SetIgnoreTLSErrors(bool ignoreTLSErrors)
#endif
#ifndef PLUGIN_ARCHITECTURE_UNSUPPORTED
#if PLATFORM(MAC)
#define PLUGIN_ARCHITECTURE_MAC 1
-#elif PLATFORM(WIN)
-#define PLUGIN_ARCHITECTURE_WIN 1
#elif (PLATFORM(GTK) || PLATFORM(EFL)) && (OS(UNIX) && !OS(MAC_OS_X))
#define PLUGIN_ARCHITECTURE_X11 1
#elif PLATFORM(QT)
git://git.webkit.org / WebKit-https.git / commitdiff