WebCore:
authoradele <adele@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 8 Jun 2006 01:25:48 +0000 (01:25 +0000)
committeradele <adele@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 8 Jun 2006 01:25:48 +0000 (01:25 +0000)
        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: https://svn.webkit.org/repository/webkit/trunk@14765 268f45cc-cd09-0410-ab3c-d52691b4dbfc

19 files changed:
WebCore/ChangeLog
WebCore/page/Frame.cpp
WebCore/page/FrameView.cpp
WebCore/page/FrameView.h
WebCore/platform/PlatformMouseEvent.h
WebCore/platform/cairo/ImageCairo.cpp
WebCore/platform/mac/MouseEventMac.mm
WebCore/platform/win/TemporaryLinkStubs.cpp
WebCore/rendering/RenderLayer.cpp
WebCore/rendering/RenderLayer.h
WebCore/rendering/RenderTheme.cpp
WebCore/rendering/RenderTheme.h
WebKit/COM/WebKitDLL.cpp
WebKit/ChangeLog
WebKit/WebKit.vcproj/WebKit.rc
WebKit/WebKit.vcproj/WebKit.vcproj
WebKit/WebKit.vcproj/missingImage.png [new file with mode: 0644]
WebKit/WebKit.vcproj/resource.h
WebKit/WebKit.vcproj/textAreaResizeCorner.png [new file with mode: 0644]

index 86574b2..762da8b 100644 (file)
@@ -1,3 +1,35 @@
+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
index 4880206..971a328 100644 (file)
@@ -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;
     }
index c8d9fc8..b2af5da 100644 (file)
@@ -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())
index 234bf52..01a23d5 100644 (file)
@@ -137,6 +137,8 @@ public:
     void handleMouseReleaseEvent(const PlatformMouseEvent&);
     void handleWheelEvent(PlatformWheelEvent&);
 
+    bool mousePressed();
+
     void doAutoScroll();
 
     bool updateDragAndDrop(const PlatformMouseEvent&, Clipboard*);
index 102871b..8ae285e 100644 (file)
@@ -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
index d6d1e09..9893af2 100644 (file)
@@ -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)
index 01babda..39be2f3 100644 (file)
@@ -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))
index 3514f7a..4da9d10 100644 (file)
@@ -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; }
index 1d8c871..c7c23e8 100644 (file)
@@ -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)
index 8f9f627..431272a 100644 (file)
@@ -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
index 3127404..2eb1daf 100644 (file)
@@ -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();
index 9d6815e..7fb4e32 100644 (file)
@@ -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.
index 529759c..7d2d647 100644 (file)
@@ -1,33 +1,38 @@
-/*
- * 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. 
- */
+/*\r
+ * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.\r
+ *\r
+ * Redistribution and use in source and binary forms, with or without\r
+ * modification, are permitted provided that the following conditions\r
+ * are met:\r
+ * 1. Redistributions of source code must retain the above copyright\r
+ *    notice, this list of conditions and the following disclaimer.\r
+ * 2. Redistributions in binary form must reproduce the above copyright\r
+ *    notice, this list of conditions and the following disclaimer in the\r
+ *    documentation and/or other materials provided with the distribution.\r
+ *\r
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY\r
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\r
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\r
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR\r
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,\r
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,\r
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR\r
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY\r
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\r
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\r
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \r
+ */\r
 \r
 #include "WebKitDLL.h"\r
 #include "IWebURLResponse.h"\r
+#include "resource.h"\r
 #include "WebKit.h"\r
 #include "WebKitClassFactory.h"\r
 \r
+#pragma warning( push, 0 )\r
+#include "DeprecatedArray.h"\r
+#pragma warning(pop)\r
+\r
 #include <tchar.h>\r
 #include <olectl.h>\r
 \r
@@ -154,3 +159,31 @@ STDAPI DllRegisterServer(void)
 \r
     return hr;\r
 }\r
+\r
+//FIXME: We should consider moving this to a new file for cross-project functionality\r
+DeprecatedByteArray loadResourceIntoArray(const char* name)\r
+{\r
+    int idr;\r
+    // temporary hack to get resource id\r
+    if (!strcmp(name, "textAreaResizeCorner"))\r
+        idr = IDR_RESIZE_CORNER;\r
+    else if (!strcmp(name, "missingImage"))\r
+        idr = IDR_MISSING_IMAGE;\r
+    else\r
+        return DeprecatedByteArray();\r
+\r
+    HRSRC resInfo = FindResource(gInstance, MAKEINTRESOURCE(idr), L"PNG");\r
+    if (!resInfo)\r
+        return DeprecatedByteArray();\r
+    HANDLE res = LoadResource(gInstance, resInfo);\r
+    if (!res)\r
+        return DeprecatedByteArray();\r
+    void* resource = LockResource(res);\r
+    if (!resource)\r
+        return DeprecatedByteArray();\r
+    int size = SizeofResource(gInstance, resInfo);\r
+\r
+    DeprecatedByteArray arr(size);\r
+    memcpy(arr.data(), resource, size);\r
+    return arr;\r
+}\r
index 88defc8..4d405b7 100644 (file)
@@ -1,3 +1,17 @@
+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.
index 75e2c0e..85ff2fd 100644 (file)
@@ -1,7 +1,6 @@
 // Microsoft Visual C++ generated resource script.\r
 //\r
 #include "resource.h"\r
-#include "autoversion.h"\r
 \r
 #define APSTUDIO_READONLY_SYMBOLS\r
 /////////////////////////////////////////////////////////////////////////////\r
@@ -59,7 +58,7 @@ END
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 3,0,0,BUILD_NUMBER\r
+ FILEVERSION 3,0,0,1\r
  PRODUCTVERSION 3,0,0,0\r
  FILEFLAGSMASK 0x17L\r
 #ifdef _DEBUG\r
@@ -92,6 +91,13 @@ BEGIN
 END\r
 \r
 \r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// PNG\r
+//\r
+\r
+IDR_RESIZE_CORNER                PNG                     "textAreaResizeCorner.png"\r
+IDR_MISSING_IMAGE                PNG                     "missingImage.png"\r
 #endif    // English (U.S.) resources\r
 /////////////////////////////////////////////////////////////////////////////\r
 \r
index eebf697..9a3e5e4 100644 (file)
@@ -40,7 +40,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               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;"\r
+                               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;"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WEBKIT_EXPORTS;_WIN32_WINNT=0x500"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="0"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               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;"\r
+                               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;"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WEBKIT_EXPORTS;_WIN32_WINNT=0x500"\r
                                ExceptionHandling="0"\r
                                RuntimeLibrary="2"\r
                        Name="Resources"\r
                        >\r
                        <File\r
+                               RelativePath=".\missingImage.png"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\textAreaResizeCorner.png"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\WebKit.rc"\r
                                >\r
                        </File>\r
                                >\r
                        </File>\r
                </Filter>\r
+               <File\r
+                       RelativePath=".\png1.bin"\r
+                       >\r
+               </File>\r
        </Files>\r
        <Globals>\r
        </Globals>\r
diff --git a/WebKit/WebKit.vcproj/missingImage.png b/WebKit/WebKit.vcproj/missingImage.png
new file mode 100644 (file)
index 0000000..f49a98d
Binary files /dev/null and b/WebKit/WebKit.vcproj/missingImage.png differ
index d4e19d4..0e35d13 100644 (file)
@@ -3,12 +3,16 @@
 // Used by WebKit.rc\r
 //\r
 #define IDR_WEBKIT                      1\r
+#define IDR_RESIZE_CORNER               2\r
+#define IDR_MISSING_IMAGE               3\r
+\r
+#define BUILD_NUMBER                    1\r
 \r
 // Next default values for new objects\r
 // \r
 #ifdef APSTUDIO_INVOKED\r
 #ifndef APSTUDIO_READONLY_SYMBOLS\r
-#define _APS_NEXT_RESOURCE_VALUE        2\r
+#define _APS_NEXT_RESOURCE_VALUE        4\r
 #define _APS_NEXT_COMMAND_VALUE         40001\r
 #define _APS_NEXT_CONTROL_VALUE         1000\r
 #define _APS_NEXT_SYMED_VALUE           101\r
diff --git a/WebKit/WebKit.vcproj/textAreaResizeCorner.png b/WebKit/WebKit.vcproj/textAreaResizeCorner.png
new file mode 100644 (file)
index 0000000..777eff0
Binary files /dev/null and b/WebKit/WebKit.vcproj/textAreaResizeCorner.png differ