[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
andersca at apple.com
andersca at apple.com
Sun Feb 20 23:07:06 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 59b33d656bfd30b5a04e3578e61f1f523e0b4cf0
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jan 17 20:01:28 2011 +0000
2011-01-17 Anders Carlsson <andersca at apple.com>
Reviewed by Sam Weinig.
Factor bitmap context drawing code out into a shared function
https://bugs.webkit.org/show_bug.cgi?id=52589
* Platform/cg/CGUtilities.h: Added.
* Platform/cg/CGUtilities.cpp: Added.
(WebKit::paintBitmapContext):
New function that will paint a bitmap context into a CGContext.
* Shared/cg/ShareableBitmapCG.cpp:
(WebKit::ShareableBitmap::paint):
Use paintBitmapContext.
* UIProcess/mac/BackingStoreMac.mm:
(WebKit::BackingStore::paint):
(WebKit::BackingStore::scroll):
Use paintBitmapContext.
* WebKit2.xcodeproj/project.pbxproj:
* win/WebKit2.vcproj:
* win/WebKit2Common.vsprops:
Add CGUtilities.{cpp|h}.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75962 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index b1ff12e..e6af6af 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,29 @@
+2011-01-17 Anders Carlsson <andersca at apple.com>
+
+ Reviewed by Sam Weinig.
+
+ Factor bitmap context drawing code out into a shared function
+ https://bugs.webkit.org/show_bug.cgi?id=52589
+
+ * Platform/cg/CGUtilities.h: Added.
+ * Platform/cg/CGUtilities.cpp: Added.
+ (WebKit::paintBitmapContext):
+ New function that will paint a bitmap context into a CGContext.
+
+ * Shared/cg/ShareableBitmapCG.cpp:
+ (WebKit::ShareableBitmap::paint):
+ Use paintBitmapContext.
+
+ * UIProcess/mac/BackingStoreMac.mm:
+ (WebKit::BackingStore::paint):
+ (WebKit::BackingStore::scroll):
+ Use paintBitmapContext.
+
+ * WebKit2.xcodeproj/project.pbxproj:
+ * win/WebKit2.vcproj:
+ * win/WebKit2Common.vsprops:
+ Add CGUtilities.{cpp|h}.
+
2011-01-17 Dan Bernstein <mitz at apple.com>
Rubber-stamped by Mark Rowe.
diff --git a/Source/WebKit2/Platform/cg/CGUtilities.cpp b/Source/WebKit2/Platform/cg/CGUtilities.cpp
new file mode 100644
index 0000000..1e5dd33
--- /dev/null
+++ b/Source/WebKit2/Platform/cg/CGUtilities.cpp
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2011 Apple 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 INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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 "CGUtilities.h"
+
+#include <wtf/RetainPtr.h>
+
+namespace WebKit {
+
+void paintBitmapContext(CGContextRef context, CGContextRef bitmapContext, CGPoint destination, CGRect source)
+{
+ void* bitmapData = CGBitmapContextGetData(bitmapContext);
+ ASSERT(bitmapData);
+
+ size_t imageWidth = CGBitmapContextGetWidth(bitmapContext);
+ size_t imageHeight = CGBitmapContextGetHeight(bitmapContext);
+
+ size_t bytesPerRow = CGBitmapContextGetBytesPerRow(bitmapContext);
+
+ RetainPtr<CGDataProviderRef> dataProvider(AdoptCF, CGDataProviderCreateWithData(0, bitmapData, bytesPerRow * imageHeight, 0));
+ RetainPtr<CGImageRef> image(AdoptCF, CGImageCreate(imageWidth, imageHeight,
+ CGBitmapContextGetBitsPerComponent(bitmapContext),
+ CGBitmapContextGetBitsPerPixel(bitmapContext),
+ bytesPerRow,
+ CGBitmapContextGetColorSpace(bitmapContext),
+ CGBitmapContextGetBitmapInfo(bitmapContext),
+ dataProvider.get(), 0, false, kCGRenderingIntentDefault));
+
+ CGContextSaveGState(context);
+
+ CGContextClipToRect(context, CGRectMake(destination.x, destination.y, source.size.width, source.size.height));
+ CGContextScaleCTM(context, 1, -1);
+
+ CGFloat destX = destination.x - source.origin.x;
+ CGFloat destY = -static_cast<CGFloat>(imageHeight) - destination.y + source.origin.y;
+
+ CGContextDrawImage(context, CGRectMake(destX, destY, imageWidth, imageHeight), image.get());
+ CGContextRestoreGState(context);
+}
+
+} // namespace WebKit
+
diff --git a/Source/WebKit2/Platform/cg/CGUtilities.h b/Source/WebKit2/Platform/cg/CGUtilities.h
new file mode 100644
index 0000000..3dca654
--- /dev/null
+++ b/Source/WebKit2/Platform/cg/CGUtilities.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2011 Apple 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 INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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.
+ */
+
+#ifndef CGUtilities_h
+#define CGUtilities_h
+
+namespace WebKit {
+
+void paintBitmapContext(CGContextRef, CGContextRef bitmapContext, CGPoint destination, CGRect source);
+
+} // namespace WebKit
+
+#endif // CGUtilities_h
diff --git a/Source/WebKit2/Shared/cg/ShareableBitmapCG.cpp b/Source/WebKit2/Shared/cg/ShareableBitmapCG.cpp
index 286923b..08c5dc3 100644
--- a/Source/WebKit2/Shared/cg/ShareableBitmapCG.cpp
+++ b/Source/WebKit2/Shared/cg/ShareableBitmapCG.cpp
@@ -27,6 +27,7 @@
#include <WebCore/GraphicsContext.h>
#include <wtf/RetainPtr.h>
+#include "CGUtilities.h"
using namespace WebCore;
@@ -45,37 +46,11 @@ PassOwnPtr<GraphicsContext> ShareableBitmap::createGraphicsContext()
return adoptPtr(new GraphicsContext(bitmapContext.get()));
}
-void ShareableBitmap::paint(WebCore::GraphicsContext& context, const WebCore::IntPoint& dstPoint, const WebCore::IntRect& srcRect)
+void ShareableBitmap::paint(WebCore::GraphicsContext& context, const IntPoint& dstPoint, const IntRect& srcRect)
{
OwnPtr<GraphicsContext> sourceContext(createGraphicsContext());
- CGContextRef sourceCGContext = sourceContext->platformContext();
-
- RetainPtr<CGDataProviderRef> dataProvider(AdoptCF, CGDataProviderCreateWithData(0, data(), sizeInBytes(), 0));
- RetainPtr<CGImageRef> image(AdoptCF, CGImageCreate(CGBitmapContextGetWidth(sourceCGContext),
- CGBitmapContextGetHeight(sourceCGContext),
- CGBitmapContextGetBitsPerComponent(sourceCGContext),
- CGBitmapContextGetBitsPerPixel(sourceCGContext),
- CGBitmapContextGetBytesPerRow(sourceCGContext),
- CGBitmapContextGetColorSpace(sourceCGContext),
- CGBitmapContextGetBitmapInfo(sourceCGContext),
- dataProvider.get(), 0, false, kCGRenderingIntentDefault));
-
- CGContextRef cgContext = context.platformContext();
-
- CGContextSaveGState(cgContext);
-
- CGContextClipToRect(cgContext, CGRectMake(dstPoint.x(), dstPoint.y(), srcRect.width(), srcRect.height()));
- CGContextScaleCTM(cgContext, 1, -1);
-
- CGFloat imageHeight = CGImageGetHeight(image.get());
- CGFloat imageWidth = CGImageGetWidth(image.get());
-
- CGFloat destX = dstPoint.x() - srcRect.x();
- CGFloat destY = -imageHeight - dstPoint.y() + srcRect.y();
-
- CGContextDrawImage(cgContext, CGRectMake(destX, destY, imageWidth, imageHeight), image.get());
- CGContextRestoreGState(cgContext);
+ paintBitmapContext(context.platformContext(), sourceContext->platformContext(), dstPoint, srcRect);
}
} // namespace WebKit
diff --git a/Source/WebKit2/UIProcess/mac/BackingStoreMac.mm b/Source/WebKit2/UIProcess/mac/BackingStoreMac.mm
index 5128dc3..979f755 100644
--- a/Source/WebKit2/UIProcess/mac/BackingStoreMac.mm
+++ b/Source/WebKit2/UIProcess/mac/BackingStoreMac.mm
@@ -25,6 +25,7 @@
#include "BackingStore.h"
+#include "CGUtilities.h"
#include "ShareableBitmap.h"
#include "UpdateInfo.h"
#include <WebCore/GraphicsContext.h>
@@ -37,28 +38,7 @@ void BackingStore::paint(PlatformGraphicsContext context, const IntRect& rect)
{
ASSERT(m_bitmapContext);
- // FIXME: This code should be shared with ShareableBitmap::paint.
- size_t sizeInBytes = CGBitmapContextGetBytesPerRow(m_bitmapContext.get()) * CGBitmapContextGetHeight(m_bitmapContext.get());
- RetainPtr<CGDataProviderRef> dataProvider(AdoptCF, CGDataProviderCreateWithData(0, CGBitmapContextGetData(m_bitmapContext.get()), sizeInBytes, 0));
- RetainPtr<CGImageRef> image(AdoptCF, CGImageCreate(CGBitmapContextGetWidth(m_bitmapContext.get()),
- CGBitmapContextGetHeight(m_bitmapContext.get()),
- CGBitmapContextGetBitsPerComponent(m_bitmapContext.get()),
- CGBitmapContextGetBitsPerPixel(m_bitmapContext.get()),
- CGBitmapContextGetBytesPerRow(m_bitmapContext.get()),
- CGBitmapContextGetColorSpace(m_bitmapContext.get()),
- CGBitmapContextGetBitmapInfo(m_bitmapContext.get()),
- dataProvider.get(), 0, false, kCGRenderingIntentDefault));
-
- CGFloat imageWidth = CGImageGetWidth(image.get());
- CGFloat imageHeight = CGImageGetHeight(image.get());
-
- CGContextSaveGState(context);
-
- CGContextClipToRect(context, rect);
- CGContextScaleCTM(context, 1, -1);
-
- CGContextDrawImage(context, CGRectMake(0, -imageHeight, imageWidth, imageHeight), image.get());
- CGContextRestoreGState(context);
+ paintBitmapContext(context, m_bitmapContext.get(), rect.location(), rect);
}
void BackingStore::incorporateUpdate(const UpdateInfo& updateInfo)
@@ -100,27 +80,13 @@ void BackingStore::scroll(const IntRect& scrollRect, const IntSize& scrollDelta)
if (scrollDelta.isZero())
return;
- // FIXME: This code should be shared with ShareableBitmap::paint.
- size_t sizeInBytes = CGBitmapContextGetBytesPerRow(m_bitmapContext.get()) * CGBitmapContextGetHeight(m_bitmapContext.get());
- RetainPtr<CGDataProviderRef> dataProvider(AdoptCF, CGDataProviderCreateWithData(0, CGBitmapContextGetData(m_bitmapContext.get()), sizeInBytes, 0));
- RetainPtr<CGImageRef> image(AdoptCF, CGImageCreate(CGBitmapContextGetWidth(m_bitmapContext.get()),
- CGBitmapContextGetHeight(m_bitmapContext.get()),
- CGBitmapContextGetBitsPerComponent(m_bitmapContext.get()),
- CGBitmapContextGetBitsPerPixel(m_bitmapContext.get()),
- CGBitmapContextGetBytesPerRow(m_bitmapContext.get()),
- CGBitmapContextGetColorSpace(m_bitmapContext.get()),
- CGBitmapContextGetBitmapInfo(m_bitmapContext.get()),
- dataProvider.get(), 0, false, kCGRenderingIntentDefault));
-
- CGFloat imageWidth = CGImageGetWidth(image.get());
- CGFloat imageHeight = CGImageGetHeight(image.get());
-
CGContextSaveGState(m_bitmapContext.get());
-
+
CGContextClipToRect(m_bitmapContext.get(), scrollRect);
- CGContextScaleCTM(m_bitmapContext.get(), 1, -1);
-
- CGContextDrawImage(m_bitmapContext.get(), CGRectMake(scrollDelta.width(), - imageHeight - scrollDelta.height(), imageWidth, imageHeight), image.get());
+
+ CGPoint destination = CGPointMake(scrollRect.x() + scrollDelta.width(), scrollRect.y() + scrollDelta.height());
+ paintBitmapContext(m_bitmapContext.get(), m_bitmapContext.get(), destination, scrollRect);
+
CGContextRestoreGState(m_bitmapContext.get());
}
diff --git a/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj b/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
index 3b021b3..80cb9f3 100644
--- a/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
+++ b/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
@@ -173,6 +173,8 @@
1A91010B1268C8CA001842F5 /* FindIndicatorWindow.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A9101091268C8CA001842F5 /* FindIndicatorWindow.mm */; };
1AA1CC5D100FA1A10078DEBC /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AA1CC5C100FA1A10078DEBC /* QuartzCore.framework */; };
1AA1CD07100FA1BA0078DEBC /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AA1CD06100FA1BA0078DEBC /* Carbon.framework */; };
+ 1AA2E51D12E4C05E00BC4966 /* CGUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA2E51B12E4C05E00BC4966 /* CGUtilities.h */; };
+ 1AA2E51E12E4C05E00BC4966 /* CGUtilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AA2E51C12E4C05E00BC4966 /* CGUtilities.cpp */; };
1AA417CB12C00CCA002BE67B /* TextChecker.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA417C912C00CCA002BE67B /* TextChecker.h */; };
1AA417EF12C00D87002BE67B /* TextCheckerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AA417ED12C00D87002BE67B /* TextCheckerMac.mm */; };
1AA41AB512C02EC4002BE67B /* SelectionState.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA41AB412C02EC4002BE67B /* SelectionState.h */; };
@@ -899,6 +901,8 @@
1AA1C7DE100E846E0078DEBC /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = JavaScriptCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
1AA1CC5C100FA1A10078DEBC /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = /System/Library/Frameworks/QuartzCore.framework; sourceTree = "<absolute>"; };
1AA1CD06100FA1BA0078DEBC /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
+ 1AA2E51B12E4C05E00BC4966 /* CGUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CGUtilities.h; sourceTree = "<group>"; };
+ 1AA2E51C12E4C05E00BC4966 /* CGUtilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CGUtilities.cpp; sourceTree = "<group>"; };
1AA417C912C00CCA002BE67B /* TextChecker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextChecker.h; sourceTree = "<group>"; };
1AA417ED12C00D87002BE67B /* TextCheckerMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TextCheckerMac.mm; sourceTree = "<group>"; };
1AA41AB412C02EC4002BE67B /* SelectionState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelectionState.h; sourceTree = "<group>"; };
@@ -1710,6 +1714,15 @@
path = mac;
sourceTree = "<group>";
};
+ 1AA2E51A12E4C05600BC4966 /* cg */ = {
+ isa = PBXGroup;
+ children = (
+ 1AA2E51C12E4C05E00BC4966 /* CGUtilities.cpp */,
+ 1AA2E51B12E4C05E00BC4966 /* CGUtilities.h */,
+ );
+ path = cg;
+ sourceTree = "<group>";
+ };
1AADDF4B10D82AF000D3D63D /* Shared */ = {
isa = PBXGroup;
children = (
@@ -2415,6 +2428,7 @@
BC2E6E74114196F000A63B1E /* Platform */ = {
isa = PBXGroup;
children = (
+ 1AA2E51A12E4C05600BC4966 /* cg */,
1AB5A1BA10E021D30040F6CF /* CoreIPC */,
1A7E814E1152D2240003695B /* mac */,
51A7F2F4125BF8D4008AEB1D /* Logging.cpp */,
@@ -3032,6 +3046,7 @@
1A64245E12DE29A100CAAE2C /* UpdateInfo.h in Headers */,
1A64256812DE42EC00CAAE2C /* BackingStore.h in Headers */,
C517388112DF8F4F00EE3F47 /* DragControllerAction.h in Headers */,
+ 1AA2E51D12E4C05E00BC4966 /* CGUtilities.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -3488,6 +3503,7 @@
1A64245F12DE29A100CAAE2C /* UpdateInfo.cpp in Sources */,
1A64256912DE42EC00CAAE2C /* BackingStore.cpp in Sources */,
1A64292D12DE5F9800CAAE2C /* BackingStoreMac.mm in Sources */,
+ 1AA2E51E12E4C05E00BC4966 /* CGUtilities.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/Source/WebKit2/win/WebKit2.vcproj b/Source/WebKit2/win/WebKit2.vcproj
index 372ae04..2c548c3 100755
--- a/Source/WebKit2/win/WebKit2.vcproj
+++ b/Source/WebKit2/win/WebKit2.vcproj
@@ -2835,6 +2835,18 @@
>
</File>
<Filter
+ Name="cg"
+ >
+ <File
+ RelativePath="..\Platform\cg\CGUtilities.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\Platform\cg\CGUtilities.h"
+ >
+ </File>
+ </Filter>
+ <Filter
Name="win"
>
<File
diff --git a/Source/WebKit2/win/WebKit2Common.vsprops b/Source/WebKit2/win/WebKit2Common.vsprops
index d1467c9..ab53421 100755
--- a/Source/WebKit2/win/WebKit2Common.vsprops
+++ b/Source/WebKit2/win/WebKit2Common.vsprops
@@ -6,7 +6,7 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(ProjectDir)\..\Platform";"$(ProjectDir)\..\Platform\CoreIPC";"$(ProjectDir)\..\PluginProcess";"$(ProjectDir)\..\Shared";"$(ProjectDir)\..\Shared\win";"$(ProjectDir)\..\Shared\cf";"$(ProjectDir)\..\Shared\API\c";"$(ProjectDir)\..\Shared\API\c\cf";"$(ProjectDir)\..\Shared\API\c\win";"$(ProjectDir)\..\Shared\CoreIPCSupport";"$(ProjectDir)\..\Shared\Plugins";"$(ProjectDir)\..\Shared\Plugins\Netscape";"$(ProjectDir)\..\UIProcess";"$(ProjectDir)\..\UIProcess\API\C";"$(ProjectDir)\..\UIProcess\API\C\win";"$(ProjectDir)\..\UIProcess\API\cpp";"$(ProjectDir)\..\UIProcess\API\win";"$(ProjectDir)\..\UIProcess\Authentication";"$(ProjectDir)\..\UIProcess\Downloads";"$(ProjectDir)\..\UIProcess\Launcher";"$(ProjectDir)\..\UIProcess\Plugins";"$(ProjectDir)\..\UIProcess\win";"$(ProjectDir)\..\WebProcess";"$(ProjectDir)\..\WebProcess\WebCoreSupport";"$(ProjectDir)\..\WebProcess\WebCoreSupport\win";"$(ProjectDir)\..\WebProcess\WebPage";"$(ProjectDir)\..\WebProcess\WebPage\win";"$(ProjectDir)\..\WebProcess\InjectedBundle";"$(ProjectDir)\..\WebProcess\InjectedBundle\API\c";"$(ProjectDir)\..\WebProcess\InjectedBundle\DOM";"$(ProjectDir)\..\WebProcess\InjectedBundle\win";"$(ProjectDir)\..\WebProcess\Plugins";"$(ProjectDir)\..\WebProcess\Plugins\Netscape";"$(ProjectDir)\..\WebProcess\win";"$(ProjectDir)\..\WebProcess\Authentication";"$(ProjectDir)\..\WebProcess\Downloads";"$(ProjectDir)\..\WebProcess\Downloads\cf";"$(ProjectDir)\..\WebProcess\Geolocation";"$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources";"$(ConfigurationBuildDir)\Include";"$(ConfigurationBuildDir)\Include\private";"$(WebKitLibrariesDir)\Include";"$(WebKitLibrariesDir)\Include\private";"$(WebKitLibrariesDir)\Include\pthreads";"$(ConfigurationBuildDir)\Include\JavaScriptCore";"$(ConfigurationBuildDir)\Include\private\JavaScriptCore";"$(WebKitLibrariesDir)\Include\JavaScriptCore";"$(WebKitLibrariesDir)\Include\private\JavaScriptCore";"$(ConfigurationBuildDir)\Include\WebCore\ForwardingHeaders";"$(WebKitLibrariesDir)\Include\WebCore\ForwardingHeaders""
+ AdditionalIncludeDirectories=""$(ProjectDir)\..\Platform";"$(ProjectDir)\..\Platform\cg";"$(ProjectDir)\..\Platform\CoreIPC";"$(ProjectDir)\..\PluginProcess";"$(ProjectDir)\..\Shared";"$(ProjectDir)\..\Shared\win";"$(ProjectDir)\..\Shared\cf";"$(ProjectDir)\..\Shared\API\c";"$(ProjectDir)\..\Shared\API\c\cf";"$(ProjectDir)\..\Shared\API\c\win";"$(ProjectDir)\..\Shared\CoreIPCSupport";"$(ProjectDir)\..\Shared\Plugins";"$(ProjectDir)\..\Shared\Plugins\Netscape";"$(ProjectDir)\..\UIProcess";"$(ProjectDir)\..\UIProcess\API\C";"$(ProjectDir)\..\UIProcess\API\C\win";"$(ProjectDir)\..\UIProcess\API\cpp";"$(ProjectDir)\..\UIProcess\API\win";"$(ProjectDir)\..\UIProcess\Authentication";"$(ProjectDir)\..\UIProcess\Downloads";"$(ProjectDir)\..\UIProcess\Launcher";"$(ProjectDir)\..\UIProcess\Plugins";"$(ProjectDir)\..\UIProcess\win";"$(ProjectDir)\..\WebProcess";"$(ProjectDir)\..\WebProcess\WebCoreSupport";"$(ProjectDir)\..\WebProcess\WebCoreSupport\win";"$(ProjectDir)\..\WebProcess\WebPage";"$(ProjectDir)\..\WebProcess\WebPage\win";"$(ProjectDir)\..\WebProcess\InjectedBundle";"$(ProjectDir)\..\WebProcess\InjectedBundle\API\c";"$(ProjectDir)\..\WebProcess\InjectedBundle\DOM";"$(ProjectDir)\..\WebProcess\InjectedBundle\win";"$(ProjectDir)\..\WebProcess\Plugins";"$(ProjectDir)\..\WebProcess\Plugins\Netscape";"$(ProjectDir)\..\WebProcess\win";"$(ProjectDir)\..\WebProcess\Authentication";"$(ProjectDir)\..\WebProcess\Downloads";"$(ProjectDir)\..\WebProcess\Downloads\cf";"$(ProjectDir)\..\WebProcess\Geolocation";"$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources";"$(ConfigurationBuildDir)\Include";"$(ConfigurationBuildDir)\Include\private";"$(WebKitLibrariesDir)\Include";"$(WebKitLibrariesDir)\Include\private";"$(WebKitLibrariesDir)\Include\pthreads";"$(ConfigurationBuildDir)\Include\JavaScriptCore";"$(ConfigurationBuildDir)\Include\private\JavaScriptCore";"$(WebKitLibrariesDir)\Include\JavaScriptCore";"$(WebKitLibrariesDir)\Include\private\JavaScriptCore";"$(ConfigurationBuildDir)\Include\WebCore\ForwardingHeaders";"$(WebKitLibrariesDir)\Include\WebCore\ForwardingHeaders""
PreprocessorDefinitions="_USRDLL;WEBKIT_EXPORTS;FRAMEWORK_NAME=WebKit;BUILDING_WEBKIT"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="WebKit2Prefix.h"
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list