[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
abarth at webkit.org
abarth at webkit.org
Sun Feb 20 23:05:23 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 93df65cb4ce3d8f2b909108c4e8fe3dbbf72f2b9
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jan 17 07:37:01 2011 +0000
2011-01-16 Adam Barth <abarth at webkit.org>
Update more include paths to reflect WebKit move.
* DumpRenderTree/chromium/EventSender.cpp:
(EventSender::keyDown):
(EventSender::needsShiftModifier):
* DumpRenderTree/chromium/WebThemeEngineDRTMac.h:
* DumpRenderTree/chromium/WebThemeEngineDRTMac.mm:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75918 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index d378922..2a01e81 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-16 Adam Barth <abarth at webkit.org>
+
+ Update more include paths to reflect WebKit move.
+
+ * DumpRenderTree/chromium/EventSender.cpp:
+ (EventSender::keyDown):
+ (EventSender::needsShiftModifier):
+ * DumpRenderTree/chromium/WebThemeEngineDRTMac.h:
+ * DumpRenderTree/chromium/WebThemeEngineDRTMac.mm:
+
2011-01-16 Kent Tamura <tkent at chromium.org>
Unreviewed, Chromium build fix.
diff --git a/Tools/DumpRenderTree/chromium/EventSender.cpp b/Tools/DumpRenderTree/chromium/EventSender.cpp
index 6104a90..77760ba 100644
--- a/Tools/DumpRenderTree/chromium/EventSender.cpp
+++ b/Tools/DumpRenderTree/chromium/EventSender.cpp
@@ -553,7 +553,7 @@ void EventSender::keyDown(const CppArgumentList& arguments, CppVariant* result)
}
// For one generated keyboard event, we need to generate a keyDown/keyUp
- // pair; refer to EventSender.cpp in WebKit/WebKitTools/DumpRenderTree/win.
+ // pair; refer to EventSender.cpp in Tools/DumpRenderTree/win.
// On Windows, we might also need to generate a char event to mimic the
// Windows event flow; on other platforms we create a merged event and test
// the event flow that that platform provides.
@@ -590,7 +590,7 @@ void EventSender::keyDown(const CppArgumentList& arguments, CppVariant* result)
// the command will be dispatched to the renderer just before dispatching
// the keyboard event, and then it will be executed in the
// RenderView::handleCurrentKeyboardEvent() method, which is called from
- // third_party/WebKit/WebKit/chromium/src/EditorClientImpl.cpp.
+ // third_party/WebKit/Source/WebKit/chromium/src/EditorClientImpl.cpp.
// We just simulate the same behavior here.
string editCommand;
if (getEditCommand(eventDown, &editCommand))
@@ -637,7 +637,7 @@ bool EventSender::needsShiftModifier(int keyCode)
{
// If code is an uppercase letter, assign a SHIFT key to
// eventDown.modifier, this logic comes from
- // WebKit/WebKitTools/DumpRenderTree/Win/EventSender.cpp
+ // Tools/DumpRenderTree/win/EventSender.cpp
return (keyCode & 0xFF) >= 'A' && (keyCode & 0xFF) <= 'Z';
}
diff --git a/Tools/DumpRenderTree/chromium/WebThemeEngineDRTMac.h b/Tools/DumpRenderTree/chromium/WebThemeEngineDRTMac.h
index a59e207..5b54394 100644
--- a/Tools/DumpRenderTree/chromium/WebThemeEngineDRTMac.h
+++ b/Tools/DumpRenderTree/chromium/WebThemeEngineDRTMac.h
@@ -30,7 +30,7 @@
#ifndef WebThemeEngineDRTMac_h
#define WebThemeEngineDRTMac_h
-#include "third_party/WebKit/WebKit/chromium/public/mac/WebThemeEngine.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebThemeEngine.h"
class WebThemeEngineDRTMac : public WebKit::WebThemeEngine {
public:
diff --git a/Tools/DumpRenderTree/chromium/WebThemeEngineDRTMac.mm b/Tools/DumpRenderTree/chromium/WebThemeEngineDRTMac.mm
index 6333a37..2165f0d 100644
--- a/Tools/DumpRenderTree/chromium/WebThemeEngineDRTMac.mm
+++ b/Tools/DumpRenderTree/chromium/WebThemeEngineDRTMac.mm
@@ -30,8 +30,8 @@
#include "WebThemeEngineDRTMac.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebCanvas.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebRect.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebCanvas.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h"
#import <AppKit/NSAffineTransform.h>
#import <AppKit/NSGraphicsContext.h>
#import <AppKit/NSScroller.h>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list