2010-06-21 Simon Fraser <simon.fraser@apple.com>
authorsimon.fraser@apple.com <simon.fraser@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 21 Jun 2010 23:29:39 +0000 (23:29 +0000)
committersimon.fraser@apple.com <simon.fraser@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 21 Jun 2010 23:29:39 +0000 (23:29 +0000)
        Reviewed by Anders Carlsson.

        Rename DrawingAreaProxyUpdateChunk to ChunkedUpdateDrawingArea
        https://bugs.webkit.org/show_bug.cgi?id=40948

        Rename UIProcess version of DrawingAreaUpdateChunk to ChunkedUpdateDrawingAreaProxy,
        and rename the Mac/Win versions of the various DrawingArea files too.

        Also rename the DrawingAreaUpdateChunkType enum to ChunkedUpdateDrawingAreaType.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@61589 268f45cc-cd09-0410-ab3c-d52691b4dbfc

16 files changed:
WebKit2/ChangeLog
WebKit2/UIProcess/API/mac/WKView.mm
WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.cpp [moved from WebKit2/UIProcess/ChunkedUpdateDrawingArea.cpp with 85% similarity]
WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.h [moved from WebKit2/UIProcess/ChunkedUpdateDrawingArea.h with 95% similarity]
WebKit2/UIProcess/DrawingAreaProxy.h
WebKit2/UIProcess/mac/ChunkedUpdateDrawingAreaProxyMac.mm [moved from WebKit2/UIProcess/mac/DrawingAreaProxyUpdateChunkMac.mm with 87% similarity]
WebKit2/UIProcess/win/ChunkedUpdateDrawingAreaProxyWin.cpp [moved from WebKit2/UIProcess/win/DrawingAreaProxyUpdateChunkWin.cpp with 90% similarity]
WebKit2/UIProcess/win/WebView.cpp
WebKit2/WebKit2.xcodeproj/project.pbxproj
WebKit2/WebProcess/WebPage/ChunkedUpdateDrawingArea.cpp [moved from WebKit2/WebProcess/WebPage/DrawingAreaUpdateChunk.cpp with 78% similarity]
WebKit2/WebProcess/WebPage/ChunkedUpdateDrawingArea.h [moved from WebKit2/WebProcess/WebPage/DrawingAreaUpdateChunk.h with 89% similarity]
WebKit2/WebProcess/WebPage/DrawingArea.cpp
WebKit2/WebProcess/WebPage/DrawingArea.h
WebKit2/WebProcess/WebPage/mac/ChunkedUpdateDrawingAreaMac.cpp [moved from WebKit2/WebProcess/WebPage/mac/DrawingAreaUpdateChunkMac.cpp with 95% similarity]
WebKit2/WebProcess/WebPage/win/ChunkedUpdateDrawingAreaWin.cpp [moved from WebKit2/WebProcess/WebPage/win/DrawingAreaUpdateChunkWin.cpp with 95% similarity]
WebKit2/win/WebKit2.vcproj

index a9710af..6c25b4b 100644 (file)
 
         Rename DrawingAreaProxyUpdateChunk to ChunkedUpdateDrawingArea
         https://bugs.webkit.org/show_bug.cgi?id=40948
+
+        Rename UIProcess version of DrawingAreaUpdateChunk to ChunkedUpdateDrawingAreaProxy,
+        and rename the Mac/Win versions of the various DrawingArea files too.
+        
+        Also rename the DrawingAreaUpdateChunkType enum to ChunkedUpdateDrawingAreaType.
+
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView initWithFrame:pageNamespaceRef:]):
+        * UIProcess/ChunkedUpdateDrawingArea.cpp: Removed.
+        * UIProcess/ChunkedUpdateDrawingArea.h: Removed.
+        * UIProcess/ChunkedUpdateDrawingAreaProxy.cpp: Added.
+        (WebKit::ChunkedUpdateDrawingAreaProxy::ChunkedUpdateDrawingAreaProxy):
+        (WebKit::ChunkedUpdateDrawingAreaProxy::~ChunkedUpdateDrawingAreaProxy):
+        (WebKit::ChunkedUpdateDrawingAreaProxy::paint):
+        (WebKit::ChunkedUpdateDrawingAreaProxy::setSize):
+        (WebKit::ChunkedUpdateDrawingAreaProxy::setPageIsVisible):
+        (WebKit::ChunkedUpdateDrawingAreaProxy::didSetSize):
+        (WebKit::ChunkedUpdateDrawingAreaProxy::update):
+        (WebKit::ChunkedUpdateDrawingAreaProxy::didReceiveMessage):
+        * UIProcess/ChunkedUpdateDrawingAreaProxy.h: Added.
+        (WebKit::ChunkedUpdateDrawingAreaProxy::encode):
+        * UIProcess/DrawingAreaProxy.h:
+        (WebKit::DrawingAreaProxy::):
+        * UIProcess/mac/ChunkedUpdateDrawingAreaProxyMac.mm: Added.
+        (WebKit::ChunkedUpdateDrawingAreaProxy::page):
+        (WebKit::ChunkedUpdateDrawingAreaProxy::ensureBackingStore):
+        (WebKit::ChunkedUpdateDrawingAreaProxy::invalidateBackingStore):
+        (WebKit::ChunkedUpdateDrawingAreaProxy::platformPaint):
+        (WebKit::ChunkedUpdateDrawingAreaProxy::drawUpdateChunkIntoBackingStore):
+        * UIProcess/mac/DrawingAreaProxyUpdateChunkMac.mm: Removed.
+        * UIProcess/win/ChunkedUpdateDrawingAreaProxyWin.cpp: Added.
+        (WebKit::ChunkedUpdateDrawingAreaProxy::page):
+        (WebKit::ChunkedUpdateDrawingAreaProxy::ensureBackingStore):
+        (WebKit::ChunkedUpdateDrawingAreaProxy::invalidateBackingStore):
+        (WebKit::ChunkedUpdateDrawingAreaProxy::platformPaint):
+        (WebKit::ChunkedUpdateDrawingAreaProxy::drawUpdateChunkIntoBackingStore):
+        * UIProcess/win/DrawingAreaProxyUpdateChunkWin.cpp: Removed.
+        * UIProcess/win/WebView.cpp:
+        (WebKit::WebView::WebView):
+        * WebKit2.xcodeproj/project.pbxproj:
+        * WebProcess/WebPage/ChunkedUpdateDrawingArea.cpp: Added.
+        (WebKit::ChunkedUpdateDrawingArea::ChunkedUpdateDrawingArea):
+        (WebKit::ChunkedUpdateDrawingArea::~ChunkedUpdateDrawingArea):
+        (WebKit::ChunkedUpdateDrawingArea::invalidateWindow):
+        (WebKit::ChunkedUpdateDrawingArea::invalidateContentsAndWindow):
+        (WebKit::ChunkedUpdateDrawingArea::invalidateContentsForSlowScroll):
+        (WebKit::ChunkedUpdateDrawingArea::scroll):
+        (WebKit::ChunkedUpdateDrawingArea::setNeedsDisplay):
+        (WebKit::ChunkedUpdateDrawingArea::display):
+        (WebKit::ChunkedUpdateDrawingArea::scheduleDisplay):
+        (WebKit::ChunkedUpdateDrawingArea::setSize):
+        (WebKit::ChunkedUpdateDrawingArea::suspendPainting):
+        (WebKit::ChunkedUpdateDrawingArea::resumePainting):
+        (WebKit::ChunkedUpdateDrawingArea::didUpdate):
+        (WebKit::ChunkedUpdateDrawingArea::didReceiveMessage):
+        * WebProcess/WebPage/ChunkedUpdateDrawingArea.h: Added.
+        * WebProcess/WebPage/DrawingArea.cpp:
+        (WebKit::DrawingArea::create):
+        * WebProcess/WebPage/DrawingArea.h:
+        (WebKit::DrawingArea::):
+        * WebProcess/WebPage/DrawingAreaUpdateChunk.cpp: Removed.
+        * WebProcess/WebPage/DrawingAreaUpdateChunk.h: Removed.
+        * WebProcess/WebPage/mac/ChunkedUpdateDrawingAreaMac.cpp: Added.
+        (WebKit::ChunkedUpdateDrawingArea::paintIntoUpdateChunk):
+        * WebProcess/WebPage/mac/DrawingAreaUpdateChunkMac.cpp: Removed.
+        * WebProcess/WebPage/win/ChunkedUpdateDrawingAreaWin.cpp: Added.
+        (WebKit::ChunkedUpdateDrawingArea::paintIntoUpdateChunk):
+        * WebProcess/WebPage/win/DrawingAreaUpdateChunkWin.cpp: Removed.
+        * win/WebKit2.vcproj:
+
+2010-06-21  Simon Fraser  <simon.fraser@apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        Rename DrawingAreaProxyUpdateChunk to ChunkedUpdateDrawingArea
+        https://bugs.webkit.org/show_bug.cgi?id=40948
         
         Rename DrawingAreaUpdateChunk to ChunkedUpdateDrawingArea.
 
index 801c670..614b808 100644 (file)
@@ -29,7 +29,7 @@
 #import "WKAPICast.h"
 
 // Implementation
-#import "ChunkedUpdateDrawingArea.h"
+#import "ChunkedUpdateDrawingAreaProxy.h"
 #import "PageClientImpl.h"
 #import "RunLoop.h"
 #import "WebContext.h"
@@ -81,7 +81,7 @@ using namespace WebCore;
 
     _data->_page = toWK(pageNamespaceRef)->createWebPage();
     _data->_page->setPageClient(new PageClientImpl(self));
-    _data->_page->initializeWebPage(IntSize(frame.size), new ChunkedUpdateDrawingArea(self));
+    _data->_page->initializeWebPage(IntSize(frame.size), new ChunkedUpdateDrawingAreaProxy(self));
 
     return self;
 }
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "ChunkedUpdateDrawingArea.h"
+#include "ChunkedUpdateDrawingAreaProxy.h"
 
 #include "DrawingAreaMessageKinds.h"
 #include "DrawingAreaProxyMessageKinds.h"
@@ -37,19 +37,19 @@ using namespace WebCore;
 
 namespace WebKit {
 
-ChunkedUpdateDrawingArea::ChunkedUpdateDrawingArea(PlatformWebView* webView)
-    : DrawingAreaProxy(DrawingAreaUpdateChunkType)
+ChunkedUpdateDrawingAreaProxy::ChunkedUpdateDrawingAreaProxy(PlatformWebView* webView)
+    : DrawingAreaProxy(ChunkedUpdateDrawingAreaType)
     , m_isWaitingForDidSetFrameNotification(false)
     , m_isVisible(true)
     , m_webView(webView)
 {
 }
 
-ChunkedUpdateDrawingArea::~ChunkedUpdateDrawingArea()
+ChunkedUpdateDrawingAreaProxy::~ChunkedUpdateDrawingAreaProxy()
 {
 }
 
-void ChunkedUpdateDrawingArea::paint(const IntRect& rect, PlatformDrawingContext context)
+void ChunkedUpdateDrawingAreaProxy::paint(const IntRect& rect, PlatformDrawingContext context)
 {
     if (m_isWaitingForDidSetFrameNotification) {
         WebPageProxy* page = this->page();
@@ -64,7 +64,7 @@ void ChunkedUpdateDrawingArea::paint(const IntRect& rect, PlatformDrawingContext
     platformPaint(rect, context);
 }
 
-void ChunkedUpdateDrawingArea::setSize(const IntSize& viewSize)
+void ChunkedUpdateDrawingAreaProxy::setSize(const IntSize& viewSize)
 {
     WebPageProxy* page = this->page();
     if (!page->isValid())
@@ -84,7 +84,7 @@ void ChunkedUpdateDrawingArea::setSize(const IntSize& viewSize)
     page->process()->connection()->send(DrawingAreaMessage::SetSize, page->pageID(), CoreIPC::In(viewSize));
 }
 
-void ChunkedUpdateDrawingArea::setPageIsVisible(bool isVisible)
+void ChunkedUpdateDrawingAreaProxy::setPageIsVisible(bool isVisible)
 {
     WebPageProxy* page = this->page();
 
@@ -107,7 +107,7 @@ void ChunkedUpdateDrawingArea::setPageIsVisible(bool isVisible)
     // FIXME: We should request a full repaint here if needed.
 }
     
-void ChunkedUpdateDrawingArea::didSetSize(UpdateChunk* updateChunk)
+void ChunkedUpdateDrawingAreaProxy::didSetSize(UpdateChunk* updateChunk)
 {
     ASSERT(m_isWaitingForDidSetFrameNotification);
     m_isWaitingForDidSetFrameNotification = false;
@@ -124,7 +124,7 @@ void ChunkedUpdateDrawingArea::didSetSize(UpdateChunk* updateChunk)
     page->process()->responsivenessTimer()->stop();
 }
 
-void ChunkedUpdateDrawingArea::update(UpdateChunk* updateChunk)
+void ChunkedUpdateDrawingAreaProxy::update(UpdateChunk* updateChunk)
 {
     drawUpdateChunkIntoBackingStore(updateChunk);
 
@@ -132,7 +132,7 @@ void ChunkedUpdateDrawingArea::update(UpdateChunk* updateChunk)
     page->process()->connection()->send(DrawingAreaMessage::DidUpdate, page->pageID(), CoreIPC::In());
 }
 
-void ChunkedUpdateDrawingArea::didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder& arguments)
+void ChunkedUpdateDrawingAreaProxy::didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder& arguments)
 {
     switch (messageID.get<DrawingAreaProxyMessage::Kind>()) {
         case DrawingAreaProxyMessage::Update: {
@@ -50,10 +50,10 @@ class WebView;
 typedef WebView PlatformWebView;
 #endif
 
-class ChunkedUpdateDrawingArea : public DrawingAreaProxy {
+class ChunkedUpdateDrawingAreaProxy : public DrawingAreaProxy {
 public:
-    ChunkedUpdateDrawingArea(PlatformWebView*);
-    virtual ~ChunkedUpdateDrawingArea();
+    ChunkedUpdateDrawingAreaProxy(PlatformWebView*);
+    virtual ~ChunkedUpdateDrawingAreaProxy();
 
     // The DrawingAreaProxy should never be decoded itself. Instead, the DrawingArea should be decoded.
     virtual void encode(CoreIPC::ArgumentEncoder& encoder) const
index ca6bf1d..f475a67 100644 (file)
@@ -50,7 +50,7 @@ typedef HDC PlatformDrawingContext;
 class DrawingAreaProxy {
 public:
     enum Type {
-        DrawingAreaUpdateChunkType
+        ChunkedUpdateDrawingAreaType
     };
 
     virtual ~DrawingAreaProxy();
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "ChunkedUpdateDrawingArea.h"
+#include "ChunkedUpdateDrawingAreaProxy.h"
 
 #include "DrawingAreaMessageKinds.h"
 #include "DrawingAreaProxyMessageKinds.h"
@@ -36,12 +36,12 @@ using namespace WebCore;
 
 namespace WebKit {
 
-WebPageProxy* ChunkedUpdateDrawingArea::page()
+WebPageProxy* ChunkedUpdateDrawingAreaProxy::page()
 {
     return toWK([m_webView pageRef]);
 }
 
-void ChunkedUpdateDrawingArea::ensureBackingStore()
+void ChunkedUpdateDrawingAreaProxy::ensureBackingStore()
 {
     if (m_bitmapContext)
         return;
@@ -54,12 +54,12 @@ void ChunkedUpdateDrawingArea::ensureBackingStore()
     CGContextScaleCTM(m_bitmapContext.get(), 1, -1);
 }
 
-void ChunkedUpdateDrawingArea::invalidateBackingStore()
+void ChunkedUpdateDrawingAreaProxy::invalidateBackingStore()
 {
     m_bitmapContext = 0;
 }
 
-void ChunkedUpdateDrawingArea::platformPaint(const IntRect& rect, CGContextRef context)
+void ChunkedUpdateDrawingAreaProxy::platformPaint(const IntRect& rect, CGContextRef context)
 {
     if (!m_bitmapContext)
         return;
@@ -68,7 +68,7 @@ void ChunkedUpdateDrawingArea::platformPaint(const IntRect& rect, CGContextRef c
     CGContextDrawImage(context, CGRectMake(0, 0, CGImageGetWidth(image.get()), CGImageGetHeight(image.get())), image.get());
 }
 
-void ChunkedUpdateDrawingArea::drawUpdateChunkIntoBackingStore(UpdateChunk* updateChunk)
+void ChunkedUpdateDrawingAreaProxy::drawUpdateChunkIntoBackingStore(UpdateChunk* updateChunk)
 {
     ensureBackingStore();
 
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "ChunkedUpdateDrawingArea.h"
+#include "ChunkedUpdateDrawingAreaProxy.h"
 
 #include "UpdateChunk.h"
 #include "WebProcessProxy.h"
@@ -34,12 +34,12 @@ using namespace WebCore;
 
 namespace WebKit {
 
-WebPageProxy* ChunkedUpdateDrawingArea::page()
+WebPageProxy* ChunkedUpdateDrawingAreaProxy::page()
 {
     return m_webView->page();
 }
 
-void ChunkedUpdateDrawingArea::ensureBackingStore()
+void ChunkedUpdateDrawingAreaProxy::ensureBackingStore()
 {
     if (m_backingStoreBitmap)
         return;
@@ -59,12 +59,12 @@ void ChunkedUpdateDrawingArea::ensureBackingStore()
     ::SelectObject(m_backingStoreDC.get(), m_backingStoreBitmap.get());
 }
 
-void ChunkedUpdateDrawingArea::invalidateBackingStore()
+void ChunkedUpdateDrawingAreaProxy::invalidateBackingStore()
 {
     m_backingStoreBitmap.clear();
 }
 
-void ChunkedUpdateDrawingArea::platformPaint(const IntRect& rect, HDC hdc)
+void ChunkedUpdateDrawingAreaProxy::platformPaint(const IntRect& rect, HDC hdc)
 {
     if (!m_backingStoreBitmap)
         return;
@@ -73,7 +73,7 @@ void ChunkedUpdateDrawingArea::platformPaint(const IntRect& rect, HDC hdc)
     ::BitBlt(hdc, rect.x(), rect.y(), rect.width(), rect.height(), m_backingStoreDC.get(), rect.x(), rect.y(), SRCCOPY);
 }
 
-void ChunkedUpdateDrawingArea::drawUpdateChunkIntoBackingStore(UpdateChunk* updateChunk)
+void ChunkedUpdateDrawingAreaProxy::drawUpdateChunkIntoBackingStore(UpdateChunk* updateChunk)
 {
     ensureBackingStore();
 
index 2585bfa..b0c481a 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "WebView.h"
 
-#include "ChunkedUpdateDrawingArea.h"
+#include "ChunkedUpdateDrawingAreaProxy.h"
 #include "RunLoop.h"
 #include "WebEventFactory.h"
 #include "WebPageNamespace.h"
@@ -177,7 +177,7 @@ WebView::WebView(RECT rect, WebPageNamespace* pageNamespace, HWND hostWindow)
 
     m_page = pageNamespace->createWebPage();
     m_page->setPageClient(this);
-    m_page->initializeWebPage(IntRect(rect).size(), new ChunkedUpdateDrawingArea(this));
+    m_page->initializeWebPage(IntRect(rect).size(), new ChunkedUpdateDrawingAreaProxy(this));
 
     m_window = ::CreateWindowEx(0, kWebKit2WebViewWindowClassName, 0, WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN,
         rect.top, rect.left, rect.right - rect.left, rect.bottom - rect.top, m_hostWindow ? m_hostWindow : HWND_MESSAGE, 0, instanceHandle(), this);
index ede4bf5..995255e 100644 (file)
                BC20EC07116EF7FF00094A50 /* WKStringCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC20EC05116EF7FF00094A50 /* WKStringCF.cpp */; };
                BC20ED66116F971100094A50 /* WKURLCF.h in Headers */ = {isa = PBXBuildFile; fileRef = BC20ED64116F971100094A50 /* WKURLCF.h */; settings = {ATTRIBUTES = (Public, ); }; };
                BC20ED67116F971100094A50 /* WKURLCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC20ED65116F971100094A50 /* WKURLCF.cpp */; };
-               BC2651F611825EF800243E12 /* DrawingAreaProxyUpdateChunkMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC2651F511825EF800243E12 /* DrawingAreaProxyUpdateChunkMac.mm */; };
+               BC2651F611825EF800243E12 /* ChunkedUpdateDrawingAreaProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC2651F511825EF800243E12 /* ChunkedUpdateDrawingAreaProxyMac.mm */; };
                BC2652161182608100243E12 /* DrawingAreaProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC2652121182608100243E12 /* DrawingAreaProxy.cpp */; };
                BC2652171182608100243E12 /* DrawingAreaProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = BC2652131182608100243E12 /* DrawingAreaProxy.h */; };
-               BC2652181182608100243E12 /* ChunkedUpdateDrawingArea.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC2652141182608100243E12 /* ChunkedUpdateDrawingArea.cpp */; };
-               BC2652191182608100243E12 /* ChunkedUpdateDrawingArea.h in Headers */ = {isa = PBXBuildFile; fileRef = BC2652151182608100243E12 /* ChunkedUpdateDrawingArea.h */; };
+               BC2652181182608100243E12 /* ChunkedUpdateDrawingAreaProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC2652141182608100243E12 /* ChunkedUpdateDrawingAreaProxy.cpp */; };
+               BC2652191182608100243E12 /* ChunkedUpdateDrawingAreaProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = BC2652151182608100243E12 /* ChunkedUpdateDrawingAreaProxy.h */; };
                BC2E6E871141971500A63B1E /* RunLoop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC2E6E771141970C00A63B1E /* RunLoop.cpp */; };
                BC2E6E881141971500A63B1E /* RunLoop.h in Headers */ = {isa = PBXBuildFile; fileRef = BC2E6E781141970C00A63B1E /* RunLoop.h */; };
                BC2E6E8C1141971500A63B1E /* WorkItem.h in Headers */ = {isa = PBXBuildFile; fileRef = BC2E6E7C1141970C00A63B1E /* WorkItem.h */; };
                BC2E6E8E1141971500A63B1E /* WorkQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = BC2E6E7E1141970C00A63B1E /* WorkQueue.h */; };
                BC59534210FC04520098F82D /* WebLoaderClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BC59534010FC04520098F82D /* WebLoaderClient.h */; };
                BC597075116591D000551FCA /* ProcessModel.h in Headers */ = {isa = PBXBuildFile; fileRef = BC597074116591D000551FCA /* ProcessModel.h */; };
-               BC5F7BB41182376C0052C02C /* DrawingAreaUpdateChunk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC5F7BB21182376C0052C02C /* DrawingAreaUpdateChunk.cpp */; };
-               BC5F7BB51182376C0052C02C /* DrawingAreaUpdateChunk.h in Headers */ = {isa = PBXBuildFile; fileRef = BC5F7BB31182376C0052C02C /* DrawingAreaUpdateChunk.h */; };
-               BC5F7BB9118237990052C02C /* DrawingAreaUpdateChunkMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC5F7BB8118237990052C02C /* DrawingAreaUpdateChunkMac.cpp */; };
+               BC5F7BB41182376C0052C02C /* ChunkedUpdateDrawingArea.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC5F7BB21182376C0052C02C /* ChunkedUpdateDrawingArea.cpp */; };
+               BC5F7BB51182376C0052C02C /* ChunkedUpdateDrawingArea.h in Headers */ = {isa = PBXBuildFile; fileRef = BC5F7BB31182376C0052C02C /* ChunkedUpdateDrawingArea.h */; };
+               BC5F7BB9118237990052C02C /* ChunkedUpdateDrawingAreaMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC5F7BB8118237990052C02C /* ChunkedUpdateDrawingAreaMac.cpp */; };
                BC617EE8104CB34700FB3FE1 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AA1C7DE100E846E0078DEBC /* JavaScriptCore.framework */; };
                BC6EDAA6111271C600E7678B /* PageClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BC6EDAA5111271C600E7678B /* PageClient.h */; };
                BC8452A71162C80900CAB9B5 /* DrawingArea.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC8452A51162C80900CAB9B5 /* DrawingArea.cpp */; };
                BC20EC05116EF7FF00094A50 /* WKStringCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKStringCF.cpp; sourceTree = "<group>"; };
                BC20ED64116F971100094A50 /* WKURLCF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKURLCF.h; sourceTree = "<group>"; };
                BC20ED65116F971100094A50 /* WKURLCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKURLCF.cpp; sourceTree = "<group>"; };
-               BC2651F511825EF800243E12 /* DrawingAreaProxyUpdateChunkMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DrawingAreaProxyUpdateChunkMac.mm; sourceTree = "<group>"; };
+               BC2651F511825EF800243E12 /* ChunkedUpdateDrawingAreaProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ChunkedUpdateDrawingAreaProxyMac.mm; sourceTree = "<group>"; };
                BC2652121182608100243E12 /* DrawingAreaProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DrawingAreaProxy.cpp; sourceTree = "<group>"; };
                BC2652131182608100243E12 /* DrawingAreaProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingAreaProxy.h; sourceTree = "<group>"; };
-               BC2652141182608100243E12 /* ChunkedUpdateDrawingArea.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ChunkedUpdateDrawingArea.cpp; sourceTree = "<group>"; };
-               BC2652151182608100243E12 /* ChunkedUpdateDrawingArea.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChunkedUpdateDrawingArea.h; sourceTree = "<group>"; };
+               BC2652141182608100243E12 /* ChunkedUpdateDrawingAreaProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ChunkedUpdateDrawingAreaProxy.cpp; sourceTree = "<group>"; };
+               BC2652151182608100243E12 /* ChunkedUpdateDrawingAreaProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChunkedUpdateDrawingAreaProxy.h; sourceTree = "<group>"; };
                BC2E6E771141970C00A63B1E /* RunLoop.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RunLoop.cpp; sourceTree = "<group>"; };
                BC2E6E781141970C00A63B1E /* RunLoop.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RunLoop.h; sourceTree = "<group>"; };
                BC2E6E7C1141970C00A63B1E /* WorkItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkItem.h; sourceTree = "<group>"; };
                BC2E6E7E1141970C00A63B1E /* WorkQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkQueue.h; sourceTree = "<group>"; };
                BC59534010FC04520098F82D /* WebLoaderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebLoaderClient.h; sourceTree = "<group>"; };
                BC597074116591D000551FCA /* ProcessModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProcessModel.h; sourceTree = "<group>"; };
-               BC5F7BB21182376C0052C02C /* DrawingAreaUpdateChunk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DrawingAreaUpdateChunk.cpp; sourceTree = "<group>"; };
-               BC5F7BB31182376C0052C02C /* DrawingAreaUpdateChunk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingAreaUpdateChunk.h; sourceTree = "<group>"; };
-               BC5F7BB8118237990052C02C /* DrawingAreaUpdateChunkMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DrawingAreaUpdateChunkMac.cpp; sourceTree = "<group>"; };
+               BC5F7BB21182376C0052C02C /* ChunkedUpdateDrawingArea.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ChunkedUpdateDrawingArea.cpp; sourceTree = "<group>"; };
+               BC5F7BB31182376C0052C02C /* ChunkedUpdateDrawingArea.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChunkedUpdateDrawingArea.h; sourceTree = "<group>"; };
+               BC5F7BB8118237990052C02C /* ChunkedUpdateDrawingAreaMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ChunkedUpdateDrawingAreaMac.cpp; sourceTree = "<group>"; };
                BC6EDAA5111271C600E7678B /* PageClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageClient.h; sourceTree = "<group>"; };
                BC8452A51162C80900CAB9B5 /* DrawingArea.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DrawingArea.cpp; sourceTree = "<group>"; };
                BC8452A61162C80900CAB9B5 /* DrawingArea.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingArea.h; sourceTree = "<group>"; };
                                BC963D6C113DD19500574BE2 /* mac */,
                                BC8452A51162C80900CAB9B5 /* DrawingArea.cpp */,
                                BC8452A61162C80900CAB9B5 /* DrawingArea.h */,
-                               BC5F7BB21182376C0052C02C /* DrawingAreaUpdateChunk.cpp */,
-                               BC5F7BB31182376C0052C02C /* DrawingAreaUpdateChunk.h */,
+                               BC5F7BB21182376C0052C02C /* ChunkedUpdateDrawingArea.cpp */,
+                               BC5F7BB31182376C0052C02C /* ChunkedUpdateDrawingArea.h */,
                                BC111ADC112F5B9300337BAB /* WebFrame.cpp */,
                                BC032D8910F437A00058C15A /* WebFrame.h */,
                                BC963D6A113DD19200574BE2 /* WebPage.cpp */,
                                BCCF085C113F3B7500C650C5 /* mac */,
                                BC2652121182608100243E12 /* DrawingAreaProxy.cpp */,
                                BC2652131182608100243E12 /* DrawingAreaProxy.h */,
-                               BC2652141182608100243E12 /* ChunkedUpdateDrawingArea.cpp */,
-                               BC2652151182608100243E12 /* ChunkedUpdateDrawingArea.h */,
+                               BC2652141182608100243E12 /* ChunkedUpdateDrawingAreaProxy.cpp */,
+                               BC2652151182608100243E12 /* ChunkedUpdateDrawingAreaProxy.h */,
                                BC17753E118BABF0007D9E9A /* GenericCallback.h */,
                                BC6EDAA5111271C600E7678B /* PageClient.h */,
                                BC597074116591D000551FCA /* ProcessModel.h */,
                BC963D6C113DD19500574BE2 /* mac */ = {
                        isa = PBXGroup;
                        children = (
-                               BC5F7BB8118237990052C02C /* DrawingAreaUpdateChunkMac.cpp */,
+                               BC5F7BB8118237990052C02C /* ChunkedUpdateDrawingAreaMac.cpp */,
                                BC963D6D113DD1A500574BE2 /* WebPageMac.mm */,
                        );
                        path = mac;
                BCCF085C113F3B7500C650C5 /* mac */ = {
                        isa = PBXGroup;
                        children = (
-                               BC2651F511825EF800243E12 /* DrawingAreaProxyUpdateChunkMac.mm */,
+                               BC2651F511825EF800243E12 /* ChunkedUpdateDrawingAreaProxyMac.mm */,
                        );
                        path = mac;
                        sourceTree = "<group>";
                                BCF69FA21176D01400471A52 /* WebNavigationData.h in Headers */,
                                BCF69FA91176D1CB00471A52 /* WKNavigationData.h in Headers */,
                                BCC938E11180DE440085E5FE /* WKContextPrivate.h in Headers */,
-                               BC5F7BB51182376C0052C02C /* DrawingAreaUpdateChunk.h in Headers */,
+                               BC5F7BB51182376C0052C02C /* ChunkedUpdateDrawingArea.h in Headers */,
                                BC2652171182608100243E12 /* DrawingAreaProxy.h in Headers */,
-                               BC2652191182608100243E12 /* ChunkedUpdateDrawingArea.h in Headers */,
+                               BC2652191182608100243E12 /* ChunkedUpdateDrawingAreaProxy.h in Headers */,
                                BC177465118B9FF4007D9E9A /* WKPagePrivate.h in Headers */,
                                BC17753F118BABF0007D9E9A /* GenericCallback.h in Headers */,
                                BC204EE311C83E98008F3375 /* InjectedBundle.h in Headers */,
                                BCF69F861176CD6F00471A52 /* WebHistoryClient.cpp in Sources */,
                                BCF69FA31176D01400471A52 /* WebNavigationData.cpp in Sources */,
                                BCF69FAA1176D1CB00471A52 /* WKNavigationData.cpp in Sources */,
-                               BC5F7BB41182376C0052C02C /* DrawingAreaUpdateChunk.cpp in Sources */,
-                               BC5F7BB9118237990052C02C /* DrawingAreaUpdateChunkMac.cpp in Sources */,
-                               BC2651F611825EF800243E12 /* DrawingAreaProxyUpdateChunkMac.mm in Sources */,
+                               BC5F7BB41182376C0052C02C /* ChunkedUpdateDrawingArea.cpp in Sources */,
+                               BC5F7BB9118237990052C02C /* ChunkedUpdateDrawingAreaMac.cpp in Sources */,
+                               BC2651F611825EF800243E12 /* ChunkedUpdateDrawingAreaProxyMac.mm in Sources */,
                                BC2652161182608100243E12 /* DrawingAreaProxy.cpp in Sources */,
-                               BC2652181182608100243E12 /* ChunkedUpdateDrawingArea.cpp in Sources */,
+                               BC2652181182608100243E12 /* ChunkedUpdateDrawingAreaProxy.cpp in Sources */,
                                BC204EE211C83E98008F3375 /* InjectedBundle.cpp in Sources */,
                                BC204EE611C83EA9008F3375 /* InjectedBundleMac.cpp in Sources */,
                                BC204EEE11C83EC8008F3375 /* WKBundle.cpp in Sources */,
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "DrawingAreaUpdateChunk.h"
+#include "ChunkedUpdateDrawingArea.h"
 
 #include "DrawingAreaMessageKinds.h"
 #include "DrawingAreaProxyMessageKinds.h"
@@ -37,39 +37,39 @@ using namespace WebCore;
 
 namespace WebKit {
 
-DrawingAreaUpdateChunk::DrawingAreaUpdateChunk(WebPage* webPage)
-    : DrawingArea(DrawingAreaUpdateChunkType, webPage)
+ChunkedUpdateDrawingArea::ChunkedUpdateDrawingArea(WebPage* webPage)
+    : DrawingArea(ChunkedUpdateDrawingAreaType, webPage)
     , m_isWaitingForUpdate(false)
     , m_shouldPaint(true)
-    , m_displayTimer(WebProcess::shared().runLoop(), this, &DrawingAreaUpdateChunk::display)
+    , m_displayTimer(WebProcess::shared().runLoop(), this, &ChunkedUpdateDrawingArea::display)
 {
 }
 
-DrawingAreaUpdateChunk::~DrawingAreaUpdateChunk()
+ChunkedUpdateDrawingArea::~ChunkedUpdateDrawingArea()
 {
 }
 
-void DrawingAreaUpdateChunk::invalidateWindow(const IntRect& rect, bool immediate)
+void ChunkedUpdateDrawingArea::invalidateWindow(const IntRect& rect, bool immediate)
 {
 }
 
-void DrawingAreaUpdateChunk::invalidateContentsAndWindow(const IntRect& rect, bool immediate)
+void ChunkedUpdateDrawingArea::invalidateContentsAndWindow(const IntRect& rect, bool immediate)
 {
     setNeedsDisplay(rect);
 }
 
-void DrawingAreaUpdateChunk::invalidateContentsForSlowScroll(const IntRect& rect, bool immediate)
+void ChunkedUpdateDrawingArea::invalidateContentsForSlowScroll(const IntRect& rect, bool immediate)
 {
     setNeedsDisplay(rect);
 }
 
-void DrawingAreaUpdateChunk::scroll(const IntSize& scrollDelta, const IntRect& rectToScroll, const IntRect& clipRect)
+void ChunkedUpdateDrawingArea::scroll(const IntSize& scrollDelta, const IntRect& rectToScroll, const IntRect& clipRect)
 {
     // FIXME: Do something much smarter.
     setNeedsDisplay(rectToScroll);
 }
 
-void DrawingAreaUpdateChunk::setNeedsDisplay(const IntRect& rect)
+void ChunkedUpdateDrawingArea::setNeedsDisplay(const IntRect& rect)
 {
     // FIXME: Collect a set of rects/region instead of just the union
     // of all rects.
@@ -77,7 +77,7 @@ void DrawingAreaUpdateChunk::setNeedsDisplay(const IntRect& rect)
     scheduleDisplay();
 }
 
-void DrawingAreaUpdateChunk::display()
+void ChunkedUpdateDrawingArea::display()
 {
     ASSERT(!m_isWaitingForUpdate);
  
@@ -103,7 +103,7 @@ void DrawingAreaUpdateChunk::display()
     m_displayTimer.stop();
 }
 
-void DrawingAreaUpdateChunk::scheduleDisplay()
+void ChunkedUpdateDrawingArea::scheduleDisplay()
 {
     if (!m_shouldPaint)
         return;
@@ -117,7 +117,7 @@ void DrawingAreaUpdateChunk::scheduleDisplay()
     m_displayTimer.startOneShot(0);
 }
 
-void DrawingAreaUpdateChunk::setSize(const IntSize& viewSize)
+void ChunkedUpdateDrawingArea::setSize(const IntSize& viewSize)
 {
     ASSERT(m_shouldPaint);
     ASSERT_ARG(viewSize, !viewSize.isEmpty());
@@ -139,7 +139,7 @@ void DrawingAreaUpdateChunk::setSize(const IntSize& viewSize)
     WebProcess::shared().connection()->send(DrawingAreaProxyMessage::DidSetSize, m_webPage->pageID(), CoreIPC::In(updateChunk));
 }
 
-void DrawingAreaUpdateChunk::suspendPainting()
+void ChunkedUpdateDrawingArea::suspendPainting()
 {
     ASSERT(m_shouldPaint);
     
@@ -147,7 +147,7 @@ void DrawingAreaUpdateChunk::suspendPainting()
     m_displayTimer.stop();
 }
 
-void DrawingAreaUpdateChunk::resumePainting()
+void ChunkedUpdateDrawingArea::resumePainting()
 {
     ASSERT(!m_shouldPaint);
     
@@ -157,7 +157,7 @@ void DrawingAreaUpdateChunk::resumePainting()
     display();
 }
 
-void DrawingAreaUpdateChunk::didUpdate()
+void ChunkedUpdateDrawingArea::didUpdate()
 {
     m_isWaitingForUpdate = false;
 
@@ -165,7 +165,7 @@ void DrawingAreaUpdateChunk::didUpdate()
     display();
 }
 
-void DrawingAreaUpdateChunk::didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder& arguments)
+void ChunkedUpdateDrawingArea::didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder& arguments)
 {
     switch (messageID.get<DrawingAreaMessage::Kind>()) {
         case DrawingAreaMessage::SetSize: {
@@ -23,8 +23,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef DrawingAreaUpdateChunk_h
-#define DrawingAreaUpdateChunk_h
+#ifndef ChunkedUpdateDrawingArea_h
+#define ChunkedUpdateDrawingArea_h
 
 #include "DrawingArea.h"
 #include "RunLoop.h"
@@ -34,10 +34,10 @@ namespace WebKit {
 
 class UpdateChunk;
 
-class DrawingAreaUpdateChunk : public DrawingArea {
+class ChunkedUpdateDrawingArea : public DrawingArea {
 public:
-    DrawingAreaUpdateChunk(WebPage*);
-    virtual ~DrawingAreaUpdateChunk();
+    ChunkedUpdateDrawingArea(WebPage*);
+    virtual ~ChunkedUpdateDrawingArea();
 
     virtual void invalidateWindow(const WebCore::IntRect& rect, bool immediate);
     virtual void invalidateContentsAndWindow(const WebCore::IntRect& rect, bool immediate);
@@ -63,9 +63,9 @@ private:
     WebCore::IntRect m_dirtyRect;
     bool m_isWaitingForUpdate;
     bool m_shouldPaint;
-    RunLoop::Timer<DrawingAreaUpdateChunk> m_displayTimer;
+    RunLoop::Timer<ChunkedUpdateDrawingArea> m_displayTimer;
 };
 
 } // namespace WebKit
 
-#endif // DrawingAreaUpdateChunk_h
+#endif // ChunkedUpdateDrawingArea_h
index d6d3061..4eb04dc 100644 (file)
@@ -26,7 +26,7 @@
 #include "DrawingArea.h"
 
 // Subclasses
-#include "DrawingAreaUpdateChunk.h"
+#include "ChunkedUpdateDrawingArea.h"
 
 namespace WebKit {
 
@@ -34,8 +34,8 @@ DrawingArea* DrawingArea::create(Type type, WebPage* webPage)
 {
     DrawingArea* drawingArea = 0;
     switch (type) {
-        case DrawingAreaUpdateChunkType:
-            drawingArea = new DrawingAreaUpdateChunk(webPage);
+        case ChunkedUpdateDrawingAreaType:
+            drawingArea = new ChunkedUpdateDrawingArea(webPage);
             break;
     }
 
index 706ac08..2dea320 100644 (file)
@@ -46,7 +46,7 @@ class WebPage;
 class DrawingArea {
 public:
     enum Type {
-        DrawingAreaUpdateChunkType
+        ChunkedUpdateDrawingAreaType
     };
 
     // FIXME: It might make sense to move this create function into a factory style class. 
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "DrawingAreaUpdateChunk.h"
+#include "ChunkedUpdateDrawingArea.h"
 
 #include "UpdateChunk.h"
 #include "WebPage.h"
@@ -34,7 +34,7 @@ using namespace WebCore;
 
 namespace WebKit {
 
-void DrawingAreaUpdateChunk::paintIntoUpdateChunk(UpdateChunk* updateChunk)
+void ChunkedUpdateDrawingArea::paintIntoUpdateChunk(UpdateChunk* updateChunk)
 {
     RetainPtr<CGColorSpaceRef> colorSpace(AdoptCF, CGColorSpaceCreateDeviceRGB());
     RetainPtr<CGContextRef> bitmapContext(AdoptCF, CGBitmapContextCreate(updateChunk->data(), updateChunk->rect().width(), updateChunk->rect().height(), 8, updateChunk->rect().width() * 4, colorSpace.get(), kCGImageAlphaPremultipliedLast));
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "DrawingAreaUpdateChunk.h"
+#include "ChunkedUpdateDrawingArea.h"
 
 #include "UpdateChunk.h"
 #include "WebPage.h"
@@ -34,7 +34,7 @@ using namespace WebCore;
 
 namespace WebKit {
 
-void DrawingAreaUpdateChunk::paintIntoUpdateChunk(UpdateChunk* updateChunk)
+void ChunkedUpdateDrawingArea::paintIntoUpdateChunk(UpdateChunk* updateChunk)
 {
     OwnPtr<HDC> hdc(::CreateCompatibleDC(0));
 
index 4d53a27..3e8fcd7 100755 (executable)
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\WebProcess\WebPage\DrawingAreaUpdateChunk.cpp"\r
+                                       RelativePath="..\WebProcess\WebPage\ChunkedUpdateDrawingArea.cpp"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\WebProcess\WebPage\DrawingAreaUpdateChunk.h"\r
+                                       RelativePath="..\WebProcess\WebPage\ChunkedUpdateDrawingArea.h"\r
                                        >\r
                                </File>\r
                                <File\r
                                        Name="win"\r
                                        >\r
                                        <File\r
-                                               RelativePath="..\WebProcess\WebPage\win\DrawingAreaUpdateChunkWin.cpp"\r
+                                               RelativePath="..\WebProcess\WebPage\win\ChunkedUpdateDrawingAreaWin.cpp"\r
                                                >\r
                                        </File>\r
                                        <File\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\UIProcess\ChunkedUpdateDrawingArea.cpp"\r
+                               RelativePath="..\UIProcess\ChunkedUpdateDrawingAreaProxy.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\UIProcess\ChunkedUpdateDrawingArea.h"\r
+                               RelativePath="..\UIProcess\ChunkedUpdateDrawingAreaProxy.h"\r
                                >\r
                        </File>\r
                        <File\r
                                Name="win"\r
                                >\r
                                <File\r
-                                       RelativePath="..\UIProcess\win\DrawingAreaProxyUpdateChunkWin.cpp"\r
+                                       RelativePath="..\UIProcess\win\ChunkedUpdateDrawingAreaProxyWin.cpp"\r
                                        >\r
                                </File>\r
                                <File\r