Commit e76b0101 authored by adele's avatar adele

WebCore:

        Reviewed by Hyatt 

        Added support for cross-platform resize property.

        * platform/PlatformMouseEvent.h: Removed isMouseButtonDown, since we
        already cache this info when we handle mouse down and mouse up.
        * platform/mac/MouseEventMac.mm: ditto.
        * platform/win/TemporaryLinkStubs.cpp: ditto.

        * page/Frame.cpp:
        (WebCore::Frame::autoscrollTimerFired): Use d->m_bMousePressed instead of isMouseButtonDown.
        * page/FrameView.cpp:
        (WebCore::FrameView::handleMouseMoveEvent): Passes event to layer resize method.
        (WebCore::FrameView::mousePressed): Added.
        * page/FrameView.h: Added mousePressed.

        * rendering/RenderTheme.h: Removed paintResizeControl.
        Since its not dependent on the theme, the layer can just paint this.
        * rendering/RenderTheme.cpp: ditto.
        * rendering/RenderLayer.cpp:
        (WebCore::RenderLayer::RenderLayer): Initializes m_resizeCornerImage.
        (WebCore::RenderLayer::~RenderLayer): Deletes m_resizeCornerImage.
        (WebCore::RenderLayer::resize): Uses passed in event instead of creating a new one.
        (WebCore::RenderLayer::paintResizeControl): Now loads and paints the resize image.
        * rendering/RenderLayer.h: Added m_resizeCornerImage.  Important to have one per-layer for when we allow
        more customization.

        * platform/cairo/ImageCairo.cpp:
        (WebCore::Image::loadResource): Loads image resources.

WebKit:

        Reviewed by Hyatt. 

        Added resources for missingImage and textAreaResizeCorner.

        * COM/WebKitDLL.cpp:
        (loadResourceIntoArray): Added. Returns a DeprecatedByteArray with the resource's data.
        * WebKit.vcproj/WebKit.rc: Added missing image and resize pngs as resources. 
        * WebKit.vcproj/WebKit.vcproj: Added pngs.
        * WebKit.vcproj/missingImage.png: Added.
        * WebKit.vcproj/resource.h: Added entries for pngs.
        * WebKit.vcproj/textAreaResizeCorner.png: Added.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@14765 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent c07fee0a
2006-06-07 Adele Peterson <adele@apple.com>
Reviewed by Hyatt
Added support for cross-platform resize property.
* platform/PlatformMouseEvent.h: Removed isMouseButtonDown, since we
already cache this info when we handle mouse down and mouse up.
* platform/mac/MouseEventMac.mm: ditto.
* platform/win/TemporaryLinkStubs.cpp: ditto.
* page/Frame.cpp:
(WebCore::Frame::autoscrollTimerFired): Use d->m_bMousePressed instead of isMouseButtonDown.
* page/FrameView.cpp:
(WebCore::FrameView::handleMouseMoveEvent): Passes event to layer resize method.
(WebCore::FrameView::mousePressed): Added.
* page/FrameView.h: Added mousePressed.
* rendering/RenderTheme.h: Removed paintResizeControl.
Since its not dependent on the theme, the layer can just paint this.
* rendering/RenderTheme.cpp: ditto.
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::RenderLayer): Initializes m_resizeCornerImage.
(WebCore::RenderLayer::~RenderLayer): Deletes m_resizeCornerImage.
(WebCore::RenderLayer::resize): Uses passed in event instead of creating a new one.
(WebCore::RenderLayer::paintResizeControl): Now loads and paints the resize image.
* rendering/RenderLayer.h: Added m_resizeCornerImage. Important to have one per-layer for when we allow
more customization.
* platform/cairo/ImageCairo.cpp:
(WebCore::Image::loadResource): Loads image resources.
2006-06-07 David Hyatt <hyatt@apple.com>
Add support for a new property for custom highlighting. This patch just
......
......@@ -2731,8 +2731,7 @@ void Frame::handleAutoscroll(RenderLayer* layer)
void Frame::autoscrollTimerFired(Timer<Frame>*)
{
bool isStillDown = PlatformMouseEvent::isMouseButtonDown(LeftButton);
if (!isStillDown){
if (!d->m_bMousePressed){
stopAutoscrollTimer();
return;
}
......
......@@ -668,7 +668,7 @@ void FrameView::handleMouseMoveEvent(const PlatformMouseEvent& mouseEvent)
bool swallowEvent = dispatchMouseEvent(mousemoveEvent, mev.targetNode(), false, 0, mouseEvent, true);
if (d->m_resizeLayer && d->m_resizeLayer->inResizeMode())
d->m_resizeLayer->resize();
d->m_resizeLayer->resize(mouseEvent);
if (!swallowEvent)
m_frame->handleMouseMoveEvent(mev);
......@@ -689,6 +689,11 @@ void FrameView::invalidateClick()
d->clickNode = 0;
}
bool FrameView::mousePressed()
{
return d->mousePressed;
}
void FrameView::handleMouseReleaseEvent(const PlatformMouseEvent& mouseEvent)
{
if (!m_frame->document())
......
......@@ -137,6 +137,8 @@ public:
void handleMouseReleaseEvent(const PlatformMouseEvent&);
void handleWheelEvent(PlatformWheelEvent&);
bool mousePressed();
void doAutoScroll();
bool updateDragAndDrop(const PlatformMouseEvent&, Clipboard*);
......
......@@ -69,7 +69,6 @@ namespace WebCore {
bool altKey() const { return m_altKey; }
bool metaKey() const { return m_metaKey; }
static bool isMouseButtonDown(MouseButton);
#if __APPLE__
PlatformMouseEvent(NSEvent*);
#endif
......
......@@ -31,6 +31,9 @@
#include <cairo.h>
#include <math.h>
// This function loads resources from WebKit
DeprecatedByteArray loadResourceIntoArray(const char*);
namespace WebCore {
void FrameData::clear()
......@@ -61,8 +64,10 @@ void Image::invalidateNativeData()
Image* Image::loadResource(const char *name)
{
// FIXME: Read the error image from disk.
return new Image();
DeprecatedByteArray arr = loadResourceIntoArray(name);
Image* img = new Image;
img->setData(arr, true);
return img;
}
bool Image::supportsType(const String& type)
......
......@@ -111,24 +111,6 @@ static int clickCountForEvent(NSEvent *event)
}
}
bool PlatformMouseEvent::isMouseButtonDown(MouseButton b)
{
CGMouseButton button;
switch (b) {
case MiddleButton:
button = kCGMouseButtonCenter;
break;
case RightButton:
button = kCGMouseButtonRight;
break;
case LeftButton:
default:
button = kCGMouseButtonLeft;
}
return CGEventSourceButtonState(kCGEventSourceStateCombinedSessionState, button);
}
PlatformMouseEvent::PlatformMouseEvent(NSEvent* event)
: m_position(positionForEvent(event))
, m_globalPosition(globalPositionForEvent(event))
......
......@@ -155,7 +155,6 @@ Widget::FocusPolicy QLineEdit::focusPolicy() const { notImplemented(); return No
Cursor::Cursor(Image*) { notImplemented(); }
PlatformMouseEvent::PlatformMouseEvent() { notImplemented(); }
bool PlatformMouseEvent::isMouseButtonDown(MouseButton) { notImplemented(); return false; }
String WebCore::searchableIndexIntroduction() { notImplemented(); return String(); }
int WebCore::findNextSentenceFromIndex(UChar const*,int,int,bool) { notImplemented(); return 0; }
......
......@@ -134,6 +134,7 @@ m_scrollHeight(0),
m_hBar(0),
m_vBar(0),
m_inResizeMode(false),
m_resizeCornerImage(0),
m_posZOrderList(0),
m_negZOrderList(0),
m_overflowList(0),
......@@ -155,6 +156,7 @@ RenderLayer::~RenderLayer()
// our destructor doesn't have to do anything.
delete m_hBar;
delete m_vBar;
delete m_resizeCornerImage;
delete m_posZOrderList;
delete m_negZOrderList;
delete m_overflowList;
......@@ -796,13 +798,12 @@ bool RenderLayer::shouldAutoscroll()
return false;
}
void RenderLayer::resize()
void RenderLayer::resize(const PlatformMouseEvent& evt)
{
if (!inResizeMode() || !renderer()->hasOverflowClip() || m_object->style()->resize() == RESIZE_NONE)
return;
PlatformMouseEvent* evt = new PlatformMouseEvent();
if (!evt->isMouseButtonDown(LeftButton))
if (!m_object->document()->frame()->view()->mousePressed())
return;
// FIXME Radar 4118559: This behaves very oddly for textareas that are in blocks with right-aligned text; you have
......@@ -810,7 +811,7 @@ void RenderLayer::resize()
// FIXME Radar 4118564: ideally we'd autoscroll the window as necessary to keep the point under
// the cursor in view.
IntPoint currentPoint = m_object->document()->view()->viewportToContents(evt->pos());
IntPoint currentPoint = m_object->document()->view()->viewportToContents(evt.pos());
int x;
int y;
......@@ -839,8 +840,6 @@ void RenderLayer::resize()
m_object->node()->shadowAncestorNode()->renderer()->setNeedsLayout(true);
m_object->document()->updateLayout();
}
delete evt;
}
void RenderLayer::valueChanged(Widget*)
......@@ -1116,8 +1115,14 @@ RenderLayer::paintScrollbars(GraphicsContext* p, const IntRect& damageRect)
void RenderLayer::paintResizeControl(GraphicsContext* c)
{
if (!resizeControlRect().isEmpty())
theme()->paintResizeControl(c, resizeControlRect());
if (resizeControlRect().isEmpty())
return;
if (!m_resizeCornerImage)
m_resizeCornerImage = Image::loadResource("textAreaResizeCorner");
IntPoint imagePoint(resizeControlRect().right() - m_resizeCornerImage->width(), resizeControlRect().bottom() - m_resizeCornerImage->height());
c->drawImage(m_resizeCornerImage, imagePoint);
}
bool RenderLayer::scroll(KWQScrollDirection direction, KWQScrollGranularity granularity, float multiplier)
......
......@@ -251,7 +251,7 @@ public:
bool shouldAutoscroll();
IntRect resizeControlRect() { return m_resizeControlRect; }
void setResizeControlRect(const IntRect& r) { m_resizeControlRect = r; }
void resize();
void resize(const PlatformMouseEvent&);
bool inResizeMode() const { return m_inResizeMode; }
void setInResizeMode(bool b) { m_inResizeMode = b; }
......@@ -388,6 +388,7 @@ protected:
IntRect m_resizeControlRect;
// Keeps track of whether the layer is currently resizing, so events can cause resizing to start and stop.
bool m_inResizeMode;
Image* m_resizeCornerImage;
// For layers that establish stacking contexts, m_posZOrderList holds a sorted list of all the
// descendant layers within the stacking context that have z-indices of 0 or greater
......
......@@ -120,10 +120,6 @@ bool RenderTheme::paintBorderOnly(RenderObject* o, const RenderObject::PaintInfo
return false;
}
void RenderTheme::paintResizeControl(GraphicsContext*, const IntRect&)
{
}
short RenderTheme::baselinePosition(const RenderObject* o) const
{
return o->height() + o->marginTop();
......
......@@ -47,7 +47,6 @@ public:
// whether the CSS border/background should also be painted.
bool paint(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r);
bool paintBorderOnly(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r);
virtual void paintResizeControl(GraphicsContext*, const IntRect&);
// The remaining methods should be implemented by the platform-specific portion of the theme, e.g.,
// RenderThemeMac.cpp for Mac OS X.
......
/*
* Copyright (C) 2006 Apple Computer, 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 COMPUTER, 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 COMPUTER, 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.
*/
/*
* Copyright (C) 2006 Apple Computer, 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 COMPUTER, 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 COMPUTER, 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 "WebKitDLL.h"
#include "IWebURLResponse.h"
#include "resource.h"
#include "WebKit.h"
#include "WebKitClassFactory.h"
#pragma warning( push, 0 )
#include "DeprecatedArray.h"
#pragma warning(pop)
#include <tchar.h>
#include <olectl.h>
......@@ -154,3 +159,31 @@ STDAPI DllRegisterServer(void)
return hr;
}
//FIXME: We should consider moving this to a new file for cross-project functionality
DeprecatedByteArray loadResourceIntoArray(const char* name)
{
int idr;
// temporary hack to get resource id
if (!strcmp(name, "textAreaResizeCorner"))
idr = IDR_RESIZE_CORNER;
else if (!strcmp(name, "missingImage"))
idr = IDR_MISSING_IMAGE;
else
return DeprecatedByteArray();
HRSRC resInfo = FindResource(gInstance, MAKEINTRESOURCE(idr), L"PNG");
if (!resInfo)
return DeprecatedByteArray();
HANDLE res = LoadResource(gInstance, resInfo);
if (!res)
return DeprecatedByteArray();
void* resource = LockResource(res);
if (!resource)
return DeprecatedByteArray();
int size = SizeofResource(gInstance, resInfo);
DeprecatedByteArray arr(size);
memcpy(arr.data(), resource, size);
return arr;
}
2006-06-07 Adele Peterson <adele@apple.com>
Reviewed by Hyatt.
Added resources for missingImage and textAreaResizeCorner.
* COM/WebKitDLL.cpp:
(loadResourceIntoArray): Added. Returns a DeprecatedByteArray with the resource's data.
* WebKit.vcproj/WebKit.rc: Added missing image and resize pngs as resources.
* WebKit.vcproj/WebKit.vcproj: Added pngs.
* WebKit.vcproj/missingImage.png: Added.
* WebKit.vcproj/resource.h: Added entries for pngs.
* WebKit.vcproj/textAreaResizeCorner.png: Added.
2006-06-07 David Hyatt <hyatt@apple.com>
Add SPI for setting and removing custom highlighters.
......
// Microsoft Visual C++ generated resource script.
//
#include "resource.h"
#include "autoversion.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
......@@ -59,7 +58,7 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,0,0,BUILD_NUMBER
FILEVERSION 3,0,0,1
PRODUCTVERSION 3,0,0,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
......@@ -92,6 +91,13 @@ BEGIN
END
/////////////////////////////////////////////////////////////////////////////
//
// PNG
//
IDR_RESIZE_CORNER PNG "textAreaResizeCorner.png"
IDR_MISSING_IMAGE PNG "missingImage.png"
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
......
......@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\COM&quot;;&quot;$(ProjectDir)\..\..\WebCore&quot;;&quot;$(ProjectDir)\..\..\WebCore\loader&quot;;&quot;$(ProjectDir)\..\..\WebCore\khtml\dom&quot;;&quot;$(ProjectDir)\..\..\WebCore\khtml\ecma&quot;;&quot;$(ProjectDir)\..\..\WebCore\html&quot;;&quot;$(ProjectDir)\..\..\WebCore\khtml&quot;;&quot;$(ProjectDir)\..\..\WebCore\css&quot;;&quot;$(ProjectDir)\..\..\WebCore\khtml\misc&quot;;&quot;$(ProjectDir)\..\..\WebCore\platform&quot;;&quot;$(ProjectDir)\..\..\WebCore\bridge\win&quot;;&quot;$(ProjectDir)\..\..\WebCore\page&quot;;&quot;$(ProjectDir)\..\..\WebCore\bridge&quot;;&quot;$(ProjectDir)\..\..\WebCore\platform\cairo\cairo\src&quot;;&quot;$(ProjectDir)\..\..\WebCore\platform\win&quot;;&quot;$(ProjectDir)\..\..\WebCore\rendering&quot;;&quot;$(ProjectDir)\..\..\WebCore\editing&quot;;&quot;$(ProjectDir)\..\..\WebCore\dom&quot;;&quot;$(ProjectDir)\..\..\WebCore\xml&quot;;&quot;$(ProjectDir)\..\..\WebCore\kwq&quot;;&quot;$(ProjectDir)\..\..\iconv&quot;;&quot;$(ProjectDir)\..\..\libxml2&quot;;&quot;$(ProjectDir)\..\..\icu\include&quot;;&quot;$(ProjectDir)\..\..\JavaScriptCore&quot;;&quot;$(ProjectDir)\..\..\JavaScriptCore\os-win32&quot;;&quot;$(ProjectDir)\..\..\JavaScriptCore\wtf&quot;;&quot;$(ProjectDir)\..\..\WebCore\ForwardingHeaders&quot;;&quot;$(WebKitOutputDir)\$(ConfigurationName)\WebKitWin&quot;"
AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\COM&quot;;&quot;$(ProjectDir)\..\..\WebCore&quot;;&quot;$(ProjectDir)\..\..\WebCore\loader&quot;;&quot;$(ProjectDir)\..\..\WebCore\khtml\dom&quot;;&quot;$(ProjectDir)\..\..\WebCore\khtml\ecma&quot;;&quot;$(ProjectDir)\..\..\WebCore\html&quot;;&quot;$(ProjectDir)\..\..\WebCore\khtml&quot;;&quot;$(ProjectDir)\..\..\WebCore\css&quot;;&quot;$(ProjectDir)\..\..\WebCore\khtml\misc&quot;;&quot;$(ProjectDir)\..\..\WebCore\platform&quot;;&quot;$(ProjectDir)\..\..\WebCore\bridge\win&quot;;&quot;$(ProjectDir)\..\..\WebCore\page&quot;;&quot;$(ProjectDir)\..\..\WebCore\bridge&quot;;&quot;$(ProjectDir)\..\..\WebCore\platform\cairo\cairo\src&quot;;&quot;$(ProjectDir)\..\..\WebCore\platform\win&quot;;&quot;$(ProjectDir)\..\..\WebCore\rendering&quot;;&quot;$(ProjectDir)\..\..\WebCore\editing&quot;;&quot;$(ProjectDir)\..\..\WebCore\dom&quot;;&quot;$(ProjectDir)\..\..\WebCore\xml&quot;;&quot;$(ProjectDir)\..\..\WebCore\kwq&quot;;&quot;$(ProjectDir)\..\..\iconv&quot;;&quot;$(ProjectDir)\..\..\libxml2&quot;;&quot;$(ProjectDir)\..\..\icu\include&quot;;&quot;$(ProjectDir)\..\..\JavaScriptCore&quot;;&quot;$(ProjectDir)\..\..\JavaScriptCore\os-win32&quot;;&quot;$(ProjectDir)\..\..\JavaScriptCore\wtf&quot;;&quot;$(ProjectDir)\..\..\WebCore\ForwardingHeaders&quot;;&quot;$(WebKitOutputDir)\$(ConfigurationName)\WebKitWin&quot;;&quot;$(ProjectDir)&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WEBKIT_EXPORTS;_WIN32_WINNT=0x500"
MinimalRebuild="true"
ExceptionHandling="0"
......@@ -126,7 +126,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\COM&quot;;&quot;$(ProjectDir)\..\..\WebCore&quot;;&quot;$(ProjectDir)\..\..\WebCore\loader&quot;;&quot;$(ProjectDir)\..\..\WebCore\khtml\dom&quot;;&quot;$(ProjectDir)\..\..\WebCore\khtml\ecma&quot;;&quot;$(ProjectDir)\..\..\WebCore\html&quot;;&quot;$(ProjectDir)\..\..\WebCore\khtml&quot;;&quot;$(ProjectDir)\..\..\WebCore\css&quot;;&quot;$(ProjectDir)\..\..\WebCore\khtml\misc&quot;;&quot;$(ProjectDir)\..\..\WebCore\platform&quot;;&quot;$(ProjectDir)\..\..\WebCore\bridge\win&quot;;&quot;$(ProjectDir)\..\..\WebCore\page&quot;;&quot;$(ProjectDir)\..\..\WebCore\bridge&quot;;&quot;$(ProjectDir)\..\..\WebCore\platform\cairo\cairo\src&quot;;&quot;$(ProjectDir)\..\..\WebCore\platform\win&quot;;&quot;$(ProjectDir)\..\..\WebCore\rendering&quot;;&quot;$(ProjectDir)\..\..\WebCore\editing&quot;;&quot;$(ProjectDir)\..\..\WebCore\dom&quot;;&quot;$(ProjectDir)\..\..\WebCore\xml&quot;;&quot;$(ProjectDir)\..\..\WebCore\kwq&quot;;&quot;$(ProjectDir)\..\..\iconv&quot;;&quot;$(ProjectDir)\..\..\libxml2&quot;;&quot;$(ProjectDir)\..\..\icu\include&quot;;&quot;$(ProjectDir)\..\..\JavaScriptCore&quot;;&quot;$(ProjectDir)\..\..\JavaScriptCore\os-win32&quot;;&quot;$(ProjectDir)\..\..\JavaScriptCore\wtf&quot;;&quot;$(ProjectDir)\..\..\WebCore\ForwardingHeaders&quot;;&quot;$(WebKitOutputDir)\$(ConfigurationName)\WebKitWin&quot;"
AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\COM&quot;;&quot;$(ProjectDir)\..\..\WebCore&quot;;&quot;$(ProjectDir)\..\..\WebCore\loader&quot;;&quot;$(ProjectDir)\..\..\WebCore\khtml\dom&quot;;&quot;$(ProjectDir)\..\..\WebCore\khtml\ecma&quot;;&quot;$(ProjectDir)\..\..\WebCore\html&quot;;&quot;$(ProjectDir)\..\..\WebCore\khtml&quot;;&quot;$(ProjectDir)\..\..\WebCore\css&quot;;&quot;$(ProjectDir)\..\..\WebCore\khtml\misc&quot;;&quot;$(ProjectDir)\..\..\WebCore\platform&quot;;&quot;$(ProjectDir)\..\..\WebCore\bridge\win&quot;;&quot;$(ProjectDir)\..\..\WebCore\page&quot;;&quot;$(ProjectDir)\..\..\WebCore\bridge&quot;;&quot;$(ProjectDir)\..\..\WebCore\platform\cairo\cairo\src&quot;;&quot;$(ProjectDir)\..\..\WebCore\platform\win&quot;;&quot;$(ProjectDir)\..\..\WebCore\rendering&quot;;&quot;$(ProjectDir)\..\..\WebCore\editing&quot;;&quot;$(ProjectDir)\..\..\WebCore\dom&quot;;&quot;$(ProjectDir)\..\..\WebCore\xml&quot;;&quot;$(ProjectDir)\..\..\WebCore\kwq&quot;;&quot;$(ProjectDir)\..\..\iconv&quot;;&quot;$(ProjectDir)\..\..\libxml2&quot;;&quot;$(ProjectDir)\..\..\icu\include&quot;;&quot;$(ProjectDir)\..\..\JavaScriptCore&quot;;&quot;$(ProjectDir)\..\..\JavaScriptCore\os-win32&quot;;&quot;$(ProjectDir)\..\..\JavaScriptCore\wtf&quot;;&quot;$(ProjectDir)\..\..\WebCore\ForwardingHeaders&quot;;&quot;$(WebKitOutputDir)\$(ConfigurationName)\WebKitWin&quot;;&quot;$(ProjectDir)&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WEBKIT_EXPORTS;_WIN32_WINNT=0x500"
ExceptionHandling="0"
RuntimeLibrary="2"
......@@ -293,6 +293,14 @@
<Filter
Name="Resources"
>
<File
RelativePath=".\missingImage.png"
>
</File>
<File
RelativePath=".\textAreaResizeCorner.png"
>
</File>
<File
RelativePath=".\WebKit.rc"
>
......@@ -302,6 +310,10 @@
>
</File>
</Filter>
<File
RelativePath=".\png1.bin"
>
</File>
</Files>
<Globals>
</Globals>
......
......@@ -3,12 +3,16 @@
// Used by WebKit.rc
//
#define IDR_WEBKIT 1
#define IDR_RESIZE_CORNER 2
#define IDR_MISSING_IMAGE 3
#define BUILD_NUMBER 1
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 2
#define _APS_NEXT_RESOURCE_VALUE 4
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1000
#define _APS_NEXT_SYMED_VALUE 101
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment